svn commit: r367902 - in head: devel/log4cpp devel/seed mail/dspam sysutils/bsdconfig

[Adam Weinberger]

Author: adamw
Date: Wed Sep 10 22:27:47 2014
New Revision: 367902
URL: http://svnweb.freebsd.org/changeset/ports/367902
QAT: https://qat.redports.org/buildarchive/r367902/

Log:
  Change the words NOPORTDOCS and NOPORTEXAMPLES in a couple comments so that
  future updates won't trigger the NOPORT* commit hook checks.

Modified:
  head/devel/log4cpp/Makefile
  head/devel/seed/Makefile
  head/mail/dspam/Makefile
  head/sysutils/bsdconfig/Makefile

Modified: head/devel/log4cpp/Makefile
==============================================================================
--- head/devel/log4cpp/Makefile	Wed Sep 10 22:23:26 2014	(r367901)
+++ head/devel/log4cpp/Makefile	Wed Sep 10 22:27:47 2014	(r367902)
@@ -17,18 +17,18 @@ USE_LDCONFIG=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 # doxygen build is BROKEN atm
-#.if exists (${LOCALBASE}/bin/doxygen) || !defined (NOPORTDOCS)
+#.if exists (${LOCALBASE}/bin/doxygen) || ${PORT_OPTIONS:MDOCS}
 #BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
 #.else
 CONFIGURE_ARGS+=	--disable-doxygen
 #.endif
 
-#.if !exists (${LOCALBASE}/bin/doxygen) && !defined (NOPORTDOCS)
+#.if !exists (${LOCALBASE}/bin/doxygen) && ${PORT_OPTIONS:MDOCS}
 #pre-everything::
 #	@${ECHO_CMD}
 #	@${ECHO_CMD} By default, this port uses doxygen to build its documentation.\
 #It currently is not present your system, and if you do not want to install it, abort\
-#this build by hitting CTRL+C and re-run the installation with -DNOPORTDOCS | ${FMT} 74
+#this build by hitting CTRL+C and re-run the installation with OPTIONS_UNSET=DOCS | ${FMT} 74
 #	@${ECHO_CMD}
 #	@sleep 3
 #.endif

Modified: head/devel/seed/Makefile
==============================================================================
--- head/devel/seed/Makefile	Wed Sep 10 22:23:26 2014	(r367901)
+++ head/devel/seed/Makefile	Wed Sep 10 22:27:47 2014	(r367902)
@@ -42,7 +42,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|reference||g' ${WRKSRC}/doc/Makefile.in
 #	@${FIND} ${WRKSRC}/examples -name Makefile.in -type f | ${XARGS} ${REINPLACE_CMD} -e \
 #		's|$$(datadir)/doc/seed/examples|${EXAMPLESDIR}|g'
-#.if defined(NOPORTEXAMPLES)
+#.if empty(PORT_OPTIONS:MEXAMPLES)
 #	@${REINPLACE_CMD} -e 's|examples||g' \
 #		${WRKSRC}/Makefile.in
 #.endif

Modified: head/mail/dspam/Makefile
==============================================================================
--- head/mail/dspam/Makefile	Wed Sep 10 22:23:26 2014	(r367901)
+++ head/mail/dspam/Makefile	Wed Sep 10 22:27:47 2014	(r367902)
@@ -503,7 +503,7 @@ post-install:
 	cd ${WRKSRC}/src/tools.sqlite_drv && \
 		${INSTALL_DATA} *.sql ${STAGEDIR}${EXAMPLESDIR}/sqlite
 .endif
-.endif	# NOPORTEXAMPLES
+.endif	# PORT_OPTIONS:MEXAMPLES
 
 .if ${PORT_OPTIONS:MWEBUI}
 	${MV} ${WRKSRC}/webui/cgi-bin/configure.pl ${WRKSRC}/webui/cgi-bin/configure.pl.sample

Modified: head/sysutils/bsdconfig/Makefile
==============================================================================
--- head/sysutils/bsdconfig/Makefile	Wed Sep 10 22:23:26 2014	(r367901)
+++ head/sysutils/bsdconfig/Makefile	Wed Sep 10 22:27:47 2014	(r367902)
@@ -30,7 +30,7 @@ MAKE_ARGS+=	LIBEXECDIR="${PREFIX}/libexe
 
 OPTIONS_DEFINE=	EXAMPLES
 
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
 
 .if ${OPSYS} == FreeBSD
 .  if ${OSVERSION} < 900030
@@ -51,4 +51,4 @@ post-patch:
 		-e 's|^\(BSDCONFIG=\).*|\1${PREFIX}/sbin/${PORTNAME}|' \
 		${WRKSRC}/dot/dot
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>