svn commit: r361969 - in head/net-mgmt: devmon kismet nagios-check_email_delivery net-snmp phpweathermap spectools weathermap

[Adam Weinberger]

Author: adamw
Date: Tue Jul 15 16:44:50 2014
New Revision: 361969
URL: http://svnweb.freebsd.org/changeset/ports/361969
QAT: https://qat.redports.org/buildarchive/r361969/

Log:
  Add DOCS to OPTIONS_DEFINE to ports that check for PORT_OPTIONS:MDOCS.

Modified:
  head/net-mgmt/devmon/Makefile
  head/net-mgmt/kismet/Makefile
  head/net-mgmt/nagios-check_email_delivery/Makefile
  head/net-mgmt/net-snmp/Makefile
  head/net-mgmt/phpweathermap/Makefile
  head/net-mgmt/spectools/Makefile
  head/net-mgmt/weathermap/Makefile
  head/net-mgmt/weathermap/pkg-plist

Modified: head/net-mgmt/devmon/Makefile
==============================================================================
--- head/net-mgmt/devmon/Makefile	Tue Jul 15 16:40:58 2014	(r361968)
+++ head/net-mgmt/devmon/Makefile	Tue Jul 15 16:44:50 2014	(r361969)
@@ -25,7 +25,7 @@ GROUPS=	devmon
 SUB_LIST=	USERS=${USERS} \
 		GROUPS=${GROUPS}
 
-OPTIONS_DEFINE=	MYSQL
+OPTIONS_DEFINE=	MYSQL DOCS
 
 REINPLACE_ARGS=	-i ''
 

Modified: head/net-mgmt/kismet/Makefile
==============================================================================
--- head/net-mgmt/kismet/Makefile	Tue Jul 15 16:40:58 2014	(r361968)
+++ head/net-mgmt/kismet/Makefile	Tue Jul 15 16:44:50 2014	(r361969)
@@ -21,7 +21,7 @@ USES=		gmake tar:xz
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS_DEFINE=		PCRE PLUGINS SETUID
+OPTIONS_DEFINE=		PCRE PLUGINS SETUID DOCS EXAMPLES
 OPTIONS_DEFAULT=	PCRE PLUGINS SETUID
 SETUID_DESC=		Use privilege separation
 

Modified: head/net-mgmt/nagios-check_email_delivery/Makefile
==============================================================================
--- head/net-mgmt/nagios-check_email_delivery/Makefile	Tue Jul 15 16:40:58 2014	(r361968)
+++ head/net-mgmt/nagios-check_email_delivery/Makefile	Tue Jul 15 16:44:50 2014	(r361969)
@@ -35,6 +35,8 @@ DOC_FILES=	check_email_delivery.html che
 
 PORTSCOUT=	ignore:1
 
+OPTIONS_DEFINE=	DOCS
+
 .include <bsd.port.pre.mk>
 
 do-install:

Modified: head/net-mgmt/net-snmp/Makefile
==============================================================================
--- head/net-mgmt/net-snmp/Makefile	Tue Jul 15 16:40:58 2014	(r361968)
+++ head/net-mgmt/net-snmp/Makefile	Tue Jul 15 16:44:50 2014	(r361969)
@@ -21,7 +21,7 @@ LIB_DEPENDS=	libpkg.so:${PORTSDIR}/ports
 .endif
 
 OPTIONS_DEFINE=	IPV6 MFD_REWRITES PERL PERL_EMBEDDED PYTHON DUMMY TKMIB \
-		DMALLOC MYSQL AX_SOCKONLY UNPRIVILEGED SMUX
+		DMALLOC MYSQL AX_SOCKONLY UNPRIVILEGED SMUX DOCS
 OPTIONS_DEFAULT=IPV6 PERL PERL_EMBEDDED DUMMY SMUX
 
 MFD_REWRITES_DESC=	Build with 64-bit Interface Counters

Modified: head/net-mgmt/phpweathermap/Makefile
==============================================================================
--- head/net-mgmt/phpweathermap/Makefile	Tue Jul 15 16:40:58 2014	(r361968)
+++ head/net-mgmt/phpweathermap/Makefile	Tue Jul 15 16:44:50 2014	(r361969)
@@ -34,7 +34,9 @@ WRKSRC=		${WRKDIR}/weathermap
 
 SUB_FILES=	pkg-message
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
+.include <bsd.port.options.mk>
 post-patch:
 	${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|g' ${WRKSRC}/editor.php
 	${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|g' \
@@ -66,4 +68,4 @@ post-install:
 .endif
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/net-mgmt/spectools/Makefile
==============================================================================
--- head/net-mgmt/spectools/Makefile	Tue Jul 15 16:40:58 2014	(r361968)
+++ head/net-mgmt/spectools/Makefile	Tue Jul 15 16:44:50 2014	(r361969)
@@ -22,7 +22,7 @@ USES=		gmake pkgconfig
 
 PORTDOCS=	README
 
-OPTIONS_DEFINE=	GTK2 NCURSES
+OPTIONS_DEFINE=	GTK2 NCURSES DOCS
 OPTIONS_DEFAULT=	GTK2 NCURSES
 
 ALL_TARGET=	spectool_net spectool_raw

Modified: head/net-mgmt/weathermap/Makefile
==============================================================================
--- head/net-mgmt/weathermap/Makefile	Tue Jul 15 16:40:58 2014	(r361968)
+++ head/net-mgmt/weathermap/Makefile	Tue Jul 15 16:44:50 2014	(r361969)
@@ -18,7 +18,7 @@ USES=		perl5 shebangfix
 NO_BUILD=	yes
 SHEBANG_FILES=	weathermap
 
-OPTIONS_DEFINE=	WGET
+OPTIONS_DEFINE=	WGET DOCS EXAMPLES
 WGET_DESC=	WGET support
 
 PORTDOCS=	README LICENSE INSTALL
@@ -28,7 +28,7 @@ CONFIGURE_ARGS=	--with-gd-lib=${LOCALBAS
 
 SUB_FILES=	pkg-message
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MWGET}
 RUN_DEPENDS+=	wget:${PORTSDIR}/ftp/wget
@@ -50,4 +50,4 @@ do-install:
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/net-mgmt/weathermap/pkg-plist
==============================================================================
--- head/net-mgmt/weathermap/pkg-plist	Tue Jul 15 16:40:58 2014	(r361968)
+++ head/net-mgmt/weathermap/pkg-plist	Tue Jul 15 16:44:50 2014	(r361969)
@@ -1,10 +1,10 @@
 bin/weathermap
-%%EXAMPLESDIR%%/weathermap.conf
-%%EXAMPLESDIR%%/weathermap.html
-%%EXAMPLESDIR%%/weathermap.png
-%%EXAMPLESDIR%%/overlib_mini.js
-%%EXAMPLESDIR%%/weathermap-background.png
-%%EXAMPLESDIR%%/weathermap-overlib.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/weathermap.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/weathermap.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/weathermap.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/overlib_mini.js
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/weathermap-background.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/weathermap-overlib.html
 @sample etc/weathermap/weathermap.conf.sample
 @dirrmtry etc/weathermap
- at dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%