svn commit: r349563 - head/sysutils/monit

[Sunpoet Po-Chuan Hsieh]

Author: sunpoet
Date: Sat Mar 29 16:37:14 2014
New Revision: 349563
URL: http://svnweb.freebsd.org/changeset/ports/349563
QAT: https://qat.redports.org/buildarchive/r349563/

Log:
  - Update to 5.8
  - While I'm here:
    - Fix LICENSE
    - Remove LICENSE_FILE for well-known licenses
    - Update OPTIONS_DEFINE: add DOCS
    - Convert to new options helper
    - Simplify Makefile
  
  Changes:	https://bitbucket.org/tildeslash/monit/src/master/CHANGES
  PR:		ports/188029
  Submitted by:	Martin Pala <martinp at tildeslash.com> (maintainer)

Modified:
  head/sysutils/monit/Makefile
  head/sysutils/monit/distinfo

Modified: head/sysutils/monit/Makefile
==============================================================================
--- head/sysutils/monit/Makefile	Sat Mar 29 16:37:09 2014	(r349562)
+++ head/sysutils/monit/Makefile	Sat Mar 29 16:37:14 2014	(r349563)
@@ -2,25 +2,24 @@
 # $FreeBSD$
 
 PORTNAME=	monit
-PORTVERSION=	5.7
+PORTVERSION=	5.8
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.mmonit.com/monit/dist/
 
 MAINTAINER=	martinp at tildeslash.com
 COMMENT=	Unix system management and proactive monitoring
 
-LICENSE=	GPLv3
-LICENSE_FILE=	${WRKSRC}/COPYING
+LICENSE=	AGPLv3
 
 GNU_CONFIGURE=	yes
-USES=	bison gmake
+USES=		bison gmake
 USE_RC_SUBR=	${PORTNAME}
 
 CONFIGURE_ENV=	CONFIG_SHELL="${SH}" \
 		LOCALBASE="${LOCALBASE}"
 
-OPTIONS_DEFINE=	SSL
-OPTIONS_DEFAULT=	SSL
+OPTIONS_DEFINE=	DOCS SSL
+OPTIONS_DEFAULT=SSL
 
 PLIST_FILES=	bin/monit \
 		etc/monitrc.sample \
@@ -30,18 +29,11 @@ SUB_FILES=	pkg-message
 
 PORTDOCS=	CHANGES COPYING README
 
-.include <bsd.port.options.mk>
-
-.if ! ${PORT_OPTIONS:MSSL}
-CONFIGURE_ARGS+=	--without-ssl
-.endif
+SSL_CONFIGURE_OFF=	--without-ssl
 
 post-install:
 	${INSTALL} -m 600 ${WRKSRC}/monitrc ${STAGEDIR}${PREFIX}/etc/monitrc.sample
-.if ${PORT_OPTIONS:MDOCS}
 	${INSTALL} -d ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL} -m 644 ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-.endif
-	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>

Modified: head/sysutils/monit/distinfo
==============================================================================
--- head/sysutils/monit/distinfo	Sat Mar 29 16:37:09 2014	(r349562)
+++ head/sysutils/monit/distinfo	Sat Mar 29 16:37:14 2014	(r349563)
@@ -1,2 +1,2 @@
-SHA256 (monit-5.7.tar.gz) = bb250ab011d805b5693972afdf95509e79bb3b390caa763275c9501f74b598a2
-SIZE (monit-5.7.tar.gz) = 1266763
+SHA256 (monit-5.8.tar.gz) = 0c00573ebc0156c534a5952f392c2a7bedde194f8261c05497322055938847f5
+SIZE (monit-5.8.tar.gz) = 1237958