svn commit: r360690 - in head: biology/garlic databases/cyrus-imspd databases/db4 databases/db44 databases/db4o-mono databases/firebird21-server databases/firebird25-server databases/frontbase data...

Fri Jul 4 23:46:57 UTC 2014

Author: adamw
Date: Fri Jul  4 23:46:52 2014
New Revision: 360690
URL: http://svnweb.freebsd.org/changeset/ports/360690
QAT: https://qat.redports.org/buildarchive/r360690/

Log:
  Remove NOPORTDOCS and NOPORTEXAMPLES from unstaged ports. Stage a couple while
  we're here. Remove any other references to NOPORT*.
  
  Approved by:	portmgr (blanket for modernization)

Modified:
  head/biology/garlic/Makefile
  head/databases/cyrus-imspd/Makefile
  head/databases/db4/Makefile
  head/databases/db44/Makefile
  head/databases/db4o-mono/Makefile
  head/databases/firebird21-server/Makefile
  head/databases/firebird25-server/Makefile
  head/databases/frontbase/Makefile
  head/databases/gnats4/Makefile
  head/databases/gnatsweb4/Makefile
  head/databases/lsdb/Makefile
  head/databases/msql3/Makefile
  head/databases/pecl-drizzle/Makefile
  head/databases/pg_filedump/Makefile
  head/databases/pgaccess/Makefile
  head/databases/ruby-msql/Makefile
  head/databases/ruby-oci8/Makefile
  head/databases/slony1/files/pkg-message.in
  head/databases/yasql/Makefile

Modified: head/biology/garlic/Makefile
==============================================================================

--- head/biology/garlic/Makefile	Fri Jul  4 23:27:46 2014	(r360689)
+++ head/biology/garlic/Makefile	Fri Jul  4 23:46:52 2014	(r360690)
@@ -18,38 +18,36 @@ USES=		gmake
 USE_XORG=	x11
 ALL_TARGET=	# empty
 
-.if defined(WITH_OPTIMIZED_FLAGS)
+OPTIONS_DEFINE=	DOCS EXAMPLES OPTIMIZED_CFLAGS
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
 CFLAGS+=	-O3 -ffast-math -finline-functions -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -malign-double
 .if (${ARCH} == "i386")
 CFLAGS+=	-mfancy-math-387 -mpreferred-stack-boundary=3
 .endif # i386
 .endif
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g ;\
 	s|%%CC%%|${CC}|g ; \
 	s|%%CFLAGS%%|${CFLAGS}|g'  ${WRKSRC}/Makefile
-.if !defined(WITH_OPTIMIZED_FLAGS)
-	@${ECHO} "You can optimize by setting WITH_OPTIMIZED_FLAGS=yes."
-.endif
 
 do-install:
-	${MKDIR} ${DATADIR}
-	${INSTALL_PROGRAM} ${WRKSRC}/garlic       ${PREFIX}/bin
-	${INSTALL_DATA}    ${WRKSRC}/.garlicrc    ${DATADIR}
-	${INSTALL_DATA}    ${WRKSRC}/residues.pdb ${DATADIR}
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${EXAMPLESDIR}
-	@${INSTALL_DATA}    ${WRKSRC}/*.pdb        ${EXAMPLESDIR}
-	@${INSTALL_DATA}    ${WRKSRC}/*.script     ${EXAMPLESDIR}
-	@${MKDIR} ${DOCSDIR}
-	@${MKDIR} ${WRKDIR}/doc
-	@(cd ${WRKDIR}/doc ; ${TAR} xfz ${DISTDIR}/${DISTNAME}-doc${EXTRACT_SUFX} )
-	@${TAR} -C ${WRKDIR}/doc/${DISTNAME} -cf - .  | \
-		${TAR} -C ${DOCSDIR} -xf -
-	@${FIND} ${DOCSDIR} | ${XARGS} ${CHOWN} ${SHAREOWN}:${SHAREGRP}
-	@${FIND} ${DOCSDIR} -type f | ${XARGS} ${CHMOD} ${SHAREMODE}
-.endif
+	${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/garlic       ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_DATA}    ${WRKSRC}/.garlicrc    ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA}    ${WRKSRC}/residues.pdb ${STAGEDIR}${DATADIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA}    ${WRKSRC}/*.pdb        ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA}    ${WRKSRC}/*.script     ${STAGEDIR}${EXAMPLESDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${WRKDIR}/doc
+	(cd ${WRKDIR}/doc ; ${TAR} xfz ${DISTDIR}/${DISTNAME}-doc${EXTRACT_SUFX} )
+	${TAR} -C ${WRKDIR}/doc/${DISTNAME} -cf - .  | \
+		${TAR} -C ${STAGEDIR}${DOCSDIR} -xf -
+	${FIND} ${STAGEDIR}${DOCSDIR} | ${XARGS} ${CHOWN} ${SHAREOWN}:${SHAREGRP}
+	${FIND} ${STAGEDIR}${DOCSDIR} -type f | ${XARGS} ${CHMOD} ${SHAREMODE}
 
 .include <bsd.port.mk>

Modified: head/databases/cyrus-imspd/Makefile
==============================================================================
--- head/databases/cyrus-imspd/Makefile	Fri Jul  4 23:27:46 2014	(r360689)
+++ head/databases/cyrus-imspd/Makefile	Fri Jul  4 23:46:52 2014	(r360690)
@@ -24,6 +24,8 @@ CONFIGURE_ARGS=	--prefix=${PREFIX} \
 USE_RC_SUBR=	imspd
 DOCSDIR=	${PREFIX}/share/doc/imspd
 
+OPTIONS_DEFINE=	DOCS
+
 NO_STAGE=	yes
 post-patch:
 		${REINPLACE_CMD} -e "s|<sasl.h>|<sasl2/sasl.h>|" \
@@ -35,7 +37,6 @@ post-install:
 		${MKDIR} /var/imsp
 		${INSTALL_DATA} ${WRKSRC}/imsp/options.sample \
 			/var/imsp/options.dist
-.if !defined(NOPORTDOCS)
 		${MKDIR} ${DOCSDIR}
 		${INSTALL_DATA} ${WRKSRC}/notes/Setup-instructions \
 				${WRKSRC}/notes/option.registry \
@@ -43,7 +44,6 @@ post-install:
 				${WRKSRC}/notes/imsp.implementation \
 				${WRKSRC}/notes/imsp.implementation.updates \
 			${DOCSDIR}
-.endif
 		@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>

Modified: head/databases/db4/Makefile
==============================================================================
--- head/databases/db4/Makefile	Fri Jul  4 23:27:46 2014	(r360689)
+++ head/databases/db4/Makefile	Fri Jul  4 23:46:52 2014	(r360690)
@@ -24,7 +24,11 @@ CONFIGURE_ARGS=	--enable-compat185 --ena
 		--includedir=${PREFIX}/include/db4
 USE_LDCONFIG=	yes
 
-.if !defined(NOPORTDOCS)
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
 INSTALL_TARGET=	install install_docs
 PORTDOCS=	*
 .endif
@@ -32,7 +36,7 @@ PORTDOCS=	*
 # the db install_docs target installs an empty directory, kill it
 NO_STAGE=	yes
 # (it's not packaged and it's not needed):
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 post-install:
 	@${RMDIR} ${PREFIX}/share/doc/db4/ref/splash
 .endif

Modified: head/databases/db44/Makefile
==============================================================================
--- head/databases/db44/Makefile	Fri Jul  4 23:27:46 2014	(r360689)
+++ head/databases/db44/Makefile	Fri Jul  4 23:46:52 2014	(r360690)
@@ -29,12 +29,16 @@ CONFIGURE_ARGS=		--enable-compat185 --en
 			--libdir=${PREFIX}/lib/${PORTNAME} \
 			--bindir=${PREFIX}/bin/${PORTNAME}
 INSTALL_TARGET=		install_include install_lib install_utilities
-.if !defined(NOPORTDOCS)
-INSTALL_TARGET+=	install_docs docdir=${DOCSDIR}
+
+OPTIONS_DEFINE=	DOCS
+
+DOCS_INSTALL_TARGET=	${INSTALL_TARGET} install_docs docdir=${DOCSDIR}
 PORTDOCS=		*
-.endif
 
 NO_STAGE=	yes
+
+.include <bsd.port.options.mk>
+
 pre-patch:
 	@${REINPLACE_CMD} -Ee 's|-l?pthread|${PTHREAD_LIBS}|g' ${WRKSRC}/${CONFIGURE_SCRIPT}
 
@@ -49,7 +53,7 @@ post-install:
 	${LN} -s -f ${PORTNAME}/${i}-${BDBVER}.so.0 ${PREFIX}/lib
 	${LN} -s -f ${i}-${BDBVER}.so.0 ${PREFIX}/lib/${i}-${BDBVER}.so
 .endfor
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${RMDIR} ${DOCSDIR}/ref/splash 2>/dev/null || :
 .endif
 	cd ${PREFIX}/bin/${PORTNAME} ; \

Modified: head/databases/db4o-mono/Makefile
==============================================================================
--- head/databases/db4o-mono/Makefile	Fri Jul  4 23:27:46 2014	(r360689)
+++ head/databases/db4o-mono/Makefile	Fri Jul  4 23:46:52 2014	(r360690)
@@ -20,18 +20,18 @@ REALVERSION=	5.5
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${REALVERSION}
 
+OPTIONS_DEFINE=	DOCS
+
 NO_STAGE=	yes
 do-install:
 	@(cd ${WRKSRC}/dll ; ${SETENV} MONO_SHARED_DIR=${WRKDIR} ${LOCALBASE}/bin/gacutil /root ${PREFIX}/lib /gacdir ${PREFIX}/lib /package 1.0 /i db4o.dll)
 
 post-install:
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@cd ${WRKSRC}/doc/; ${FIND} api \
 		| ${CPIO} -pdmv -R ${DOCOWN}:${DOCGRP} ${DOCSDIR}
 	@cd ${WRKSRC}/doc/; ${FIND} tutorial \
 		| ${CPIO} -pdmv -R ${DOCOWN}:${DOCGRP} ${DOCSDIR}
 	@${CHMOD} -R ugo-w,ugo+rX ${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>

Modified: head/databases/firebird21-server/Makefile
==============================================================================
--- head/databases/firebird21-server/Makefile	Fri Jul  4 23:27:46 2014	(r360689)
+++ head/databases/firebird21-server/Makefile	Fri Jul  4 23:46:52 2014	(r360690)
@@ -86,7 +86,9 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV+=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
-.if !defined(NOPORTDOCS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
 PORTDOCS=	*
 FB_DOCS_FILES=	WhatsNew README.* Firebird* ReleaseNotes.pdf ambiguity.txt \
 		ods11-index-structure.html
@@ -96,6 +98,8 @@ FB_DOCS_DIRS=	sql.extensions license upg
 
 MAKE_ENV+=	FIREBIRD_TMP="${WRKDIR}" FIREBIRD_LOCK="${WRKDIR}"
 
+OPTIONS_DEFINE=	DOCS
+
 NO_STAGE=	yes
 post-extract:
 	@${RM} -rf ${WRKSRC}/extern/icu
@@ -216,7 +220,7 @@ do-install:
 	@${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/gen/firebird/*.msg ${DATADIR}
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${ECHO_MSG} "===>   Installing documentation for ${PKGNAME}"
 	@${MKDIR} ${FB_DOCS_DIRS:S!^!${DOCSDIR}/!}
 	@${INSTALL_DATA} ${FB_DOCS_FILES:S!^!${WRKSRC}/doc/!} ${DOCSDIR}

Modified: head/databases/firebird25-server/Makefile
==============================================================================
--- head/databases/firebird25-server/Makefile	Fri Jul  4 23:27:46 2014	(r360689)
+++ head/databases/firebird25-server/Makefile	Fri Jul  4 23:46:52 2014	(r360690)
@@ -95,7 +95,9 @@ ALL_TARGET=	firebird_basic libfbembed li
 USE_LDCONFIG=	yes
 CLIENT_BIN=	gpre isql-fb qli
 
-.if !defined(NOPORTDOCS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
 PORTDOCS=	*
 FB_DOCS_FILES=	WhatsNew README.* Firebird* ReleaseNotes.pdf ambiguity.txt \
 		ods11-index-structure.html
@@ -105,6 +107,8 @@ FB_DOCS_DIRS=	sql.extensions license upg
 
 MAKE_ENV+=	FIREBIRD_TMP="${WRKDIR}" FIREBIRD_LOCK="${WRKDIR}"
 
+OPTIONS_DEFINE=	DOCS
+
 NO_STAGE=	yes
 post-extract:
 	@${RM} -rf ${WRKSRC}/extern/icu
@@ -215,7 +219,7 @@ do-install:
 	@${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/gen/firebird/*.msg ${DATADIR}
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${ECHO_MSG} "===>   Installing documentation for ${PKGNAME}"
 	@${MKDIR} ${FB_DOCS_DIRS:S!^!${DOCSDIR}/!}
 	@${INSTALL_DATA} ${FB_DOCS_FILES:S!^!${WRKSRC}/doc/!} ${DOCSDIR}

Modified: head/databases/frontbase/Makefile
==============================================================================
--- head/databases/frontbase/Makefile	Fri Jul  4 23:27:46 2014	(r360689)
+++ head/databases/frontbase/Makefile	Fri Jul  4 23:46:52 2014	(r360690)
@@ -24,6 +24,8 @@ SUB_FILES+=	pkg-message
 
 ONLY_FOR_ARCHS=	i386
 
+OPTIONS_DEFINE=	DOCS
+
 NO_STAGE=	yes
 # Binary is built for 5.X :
 LIB_DEPENDS+=	libc.so.5:${PORTSDIR}/misc/compat5x
@@ -47,10 +49,8 @@ do-install:
 .endfor
 	@(cd ${WRKSRC}/FrontBase/bin && ${COPYTREE_BIN} \* \
 		${PREFIX}/FrontBase/bin/)
-.if !defined(NOPORTDOCS)
 	@(cd ${WRKSRC}/FrontBase/Documentation && \
 		${COPYTREE_SHARE} \* ${DOCSDIR})
-.endif
 	@(cd ${WRKSRC}/FrontBase/include && ${CP} -R * \
 		${PREFIX}/include)
 	@(cd ${WRKSRC}/FrontBase/lib && ${CP} -R * \

Modified: head/databases/gnats4/Makefile
==============================================================================
--- head/databases/gnats4/Makefile	Fri Jul  4 23:27:46 2014	(r360689)
+++ head/databases/gnats4/Makefile	Fri Jul  4 23:46:52 2014	(r360690)
@@ -77,6 +77,8 @@ PLIST_SUB+=		SERVER=""
 CONFLICTS+=		${PKGNAMEPREFIX}${PORTNAME}-client-4.*
 .endif
 
+OPTIONS_DEFINE=	DOCS
+
 NO_STAGE=	yes
 pre-everything::
 .if !defined(PACKAGE_BUILDING) && !defined(WANT_FREEFALL_CFG)
@@ -114,12 +116,10 @@ post-install:
 		|| ${CP} ${PREFIX}/etc/gnats/$${conf}.default ${PREFIX}/etc/gnats/$${conf}; \
 	done
 .endif
-.ifndef NOPORTDOCS
 	@${MKDIR} ${DOCSDIR}
 	@for doc in ${DOCFILES}; do \
 		${INSTALL_DATA} ${WRKSRC}/$${doc} ${DOCSDIR}; \
 	done
-.endif
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>

Modified: head/databases/gnatsweb4/Makefile
==============================================================================
--- head/databases/gnatsweb4/Makefile	Fri Jul  4 23:27:46 2014	(r360689)
+++ head/databases/gnatsweb4/Makefile	Fri Jul  4 23:46:52 2014	(r360690)
@@ -27,27 +27,23 @@ PORTDOCS=	CUSTOMIZE CUSTOMIZE.cb CUSTOMI
 
 PORTEXAMPLESS=	gnatsweb-site-example.pl
 
-NO_STAGE=	yes
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
 do-install:
-	@${MKDIR} ${ETCDIR}/
-	@${INSTALL_DATA} ${WRKSRC}/gnatsweb-site.pl  ${ETCDIR}/gnatsweb-site.pl.default
-	@[ -f ${ETCDIR}/gnatsweb-site.pl ] || \
-		${INSTALL_DATA} ${WRKSRC}/gnatsweb-site.pl ${ETCDIR}/
-	@${MKDIR} ${CGI_DIR}/
-	@${INSTALL_SCRIPT} ${WRKSRC}/gnatsweb.pl ${CGI_DIR}/
-	@${LN} -s  ${ETCDIR}/gnatsweb-site.pl ${CGI_DIR}/
-	@${INSTALL_DATA} ${WRKSRC}/gnatsweb.html ${CGI_DIR}/
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}/
-	@for doc in ${PORTDOCS}; do \
-		${INSTALL_DATA} ${WRKSRC}/$${doc} ${DOCSDIR}/; \
+	@${MKDIR} ${STAGEDIR}${ETCDIR}
+	${INSTALL_DATA} ${WRKSRC}/gnatsweb-site.pl  ${STAGEDIR}${ETCDIR}/gnatsweb-site.pl.default
+	${INSTALL_DATA} ${WRKSRC}/gnatsweb-site.pl ${STAGEDIR}${ETCDIR}/gnatsweb-site.pl.sample
+	@${MKDIR} ${STAGEDIR}${CGI_DIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/gnatsweb.pl ${STAGEDIR}${CGI_DIR}
+	${LN} -s  ${ETCDIR}/gnatsweb-site.pl ${STAGEDIR}${CGI_DIR}
+	${INSTALL_DATA} ${WRKSRC}/gnatsweb.html ${STAGEDIR}${CGI_DIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	for doc in ${PORTDOCS}; do \
+		${INSTALL_DATA} ${WRKSRC}/$${doc} ${STAGEDIR}${DOCSDIR}; \
 	done
-.endif
-.if !defined(NOPORTEXAMPLES)
-	@${MKDIR} ${EXAMPLESDIR}/
-	@for example in ${EXAMPLEFILES}; do \
-		${INSTALL_DATA} ${WRKSRC}/$${example} ${EXAMPLESDIR}/; \
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	for example in ${EXAMPLEFILES}; do \
+		${INSTALL_DATA} ${WRKSRC}/$${example} ${STAGEDIR}${EXAMPLESDIR}; \
 	done
-.endif
 
 .include <bsd.port.mk>

Modified: head/databases/lsdb/Makefile
==============================================================================
--- head/databases/lsdb/Makefile	Fri Jul  4 23:27:46 2014	(r360689)
+++ head/databases/lsdb/Makefile	Fri Jul  4 23:46:52 2014	(r360690)
@@ -21,6 +21,8 @@ ALL_TARGET=	elc
 
 FLIM_COOKIE=   flim-${EMACS_PORT_NAME}-1.14.FreeBSD-packages
 
+OPTIONS_DEFINE=	DOCS
+
 NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
@@ -37,9 +39,7 @@ post-patch:
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/bbdb-to-lsdb.el ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
-.if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA}	${WRKSRC}/README ${DOCSDIR}
-.endif
 
 .include <bsd.port.post.mk>

Modified: head/databases/msql3/Makefile
==============================================================================
--- head/databases/msql3/Makefile	Fri Jul  4 23:27:46 2014	(r360689)
+++ head/databases/msql3/Makefile	Fri Jul  4 23:46:52 2014	(r360690)
@@ -29,6 +29,8 @@ MSQLDATA=	directory.mm dll_os2.mm instal
 DOCS=		README RELEASE_NOTES BUGS doc/License doc/Manual \
 		doc/Perl doc/acl.txt
 
+OPTIONS_DEFINE=	DOCS
+
 NO_STAGE=	yes
 post-patch:
 		cd ${FILESDIR}; \
@@ -58,12 +60,10 @@ post-install:
 	    ${INSTALL_SCRIPT} ${WRKSRC}/src/makegen/${i} ${DATADIR}/makegen
 .endfor
 	    ${INSTALL_SCRIPT} ${WRKSRC}/src/site.mm ${DATADIR}/makegen
-.if !defined(NOPORTDOCS)
 	    ${MKDIR} ${DOCSDIR}
 .for i in ${DOCS}
 	    ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
-.endif
 
 .include <bsd.port.pre.mk>
 

Modified: head/databases/pecl-drizzle/Makefile
==============================================================================
--- head/databases/pecl-drizzle/Makefile	Fri Jul  4 23:27:46 2014	(r360689)
+++ head/databases/pecl-drizzle/Makefile	Fri Jul  4 23:46:52 2014	(r360690)
@@ -22,24 +22,15 @@ DEFAULT_PHP_VER=53
 IGNORE_WITH_PHP=5
 NO_STAGE=	yes
 
-.if !defined(NOPORTDOCS)
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
 PORTDOCS=	README EXPERIMENTAL ChangeLog CREDITS
+PORTEXAMPLES=	drizzle.php
 
-post-install::
+post-install:
 		@${MKDIR} ${DOCSDIR}
 		@cd ${WRKSRC} && ${INSTALL} ${PORTDOCS} ${DOCSDIR}
-.else
-PORTDOCS=
-.endif
-
-.if !defined(NOPORTEXAMPLES)
-PORTEXAMPLES=	drizzle.php
-
-post-install::
 		@${MKDIR} ${EXAMPLESDIR}
 		@cd ${WRKSRC} && ${INSTALL} ${PORTEXAMPLES} ${EXAMPLESDIR}
-.else
-PORTEXAMPLES=
-.endif
 
 .include <bsd.port.mk>

Modified: head/databases/pg_filedump/Makefile
==============================================================================
--- head/databases/pg_filedump/Makefile	Fri Jul  4 23:27:46 2014	(r360689)
+++ head/databases/pg_filedump/Makefile	Fri Jul  4 23:46:52 2014	(r360690)
@@ -14,7 +14,6 @@ BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR
 
 WRKSRC=	${WRKDIR}/${PORTNAME}-8.4.0
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 BROKEN=		Does not compile
@@ -25,11 +24,9 @@ post-patch:
 	${REINPLACE_CMD} -e "s|8.4.0|${PG84VER}|" ${WRKSRC}/Makefile
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/pg_filedump ${PREFIX}/bin
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README.pg_filedump ${DOCSDIR}
-.endif
+	${INSTALL_PROGRAM} ${WRKSRC}/pg_filedump ${STAGEDIR}${PREFIX}/bin
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.pg_filedump ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.post.mk>

Modified: head/databases/pgaccess/Makefile
==============================================================================
--- head/databases/pgaccess/Makefile	Fri Jul  4 23:27:46 2014	(r360689)
+++ head/databases/pgaccess/Makefile	Fri Jul  4 23:46:52 2014	(r360690)
@@ -24,6 +24,8 @@ TCLVERSION?=	8.4
 DOCSDIR=	${PREFIX}/share/doc/postgresql/${PORTNAME}
 PGACCESSDIR=	${PREFIX}/share/postgresql/${PORTNAME}
 
+OPTIONS_DEFINE=	DOCS
+
 NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e "s,/usr/bin,${PREFIX}/bin,g ; " ${WRKSRC}/lib/mainlib.tcl
@@ -47,12 +49,10 @@ do-install:
 .for targetfile in pgaccess pgmonitor
 	${INSTALL_SCRIPT} ${WRKDIR}/${targetfile}.sh ${PREFIX}/bin/${targetfile}
 .endfor
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR} ; \
 	 cd ${WRKSRC}/doc/html ;\
 	 ${TAR} cf - * | \
 	 ( cd ${DOCSDIR}; ${TAR} xf - ) ; \
 	 ${CHOWN} -R 0:0 ${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>

Modified: head/databases/ruby-msql/Makefile
==============================================================================
--- head/databases/ruby-msql/Makefile	Fri Jul  4 23:27:46 2014	(r360689)
+++ head/databases/ruby-msql/Makefile	Fri Jul  4 23:46:52 2014	(r360690)
@@ -29,11 +29,12 @@ DOCS_EN=	readme.en.txt doc/en/*
 DOCS_JA=	readme.ja.txt
 
 NO_STAGE=	yes
+OPTIONS_DEFINE=	DOCS
+
 post-configure:
 	${ECHO_CMD} '#define INST_DIR "${LOCALBASE}"' >> ${WRKSRC}/site.h
 
 post-install:
-.if !defined(NOPORTDOCS)
 	${MKDIR} ${RUBY_MODEXAMPLESDIR}
 .for f in ${EXAMPLES_EN}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODEXAMPLESDIR}/
@@ -45,6 +46,5 @@ post-install:
 .for f in ${DOCS_JA}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/ja/
 .endfor
-.endif
 
 .include <bsd.port.mk>

Modified: head/databases/ruby-oci8/Makefile
==============================================================================
--- head/databases/ruby-oci8/Makefile	Fri Jul  4 23:27:46 2014	(r360689)
+++ head/databases/ruby-oci8/Makefile	Fri Jul  4 23:46:52 2014	(r360690)
@@ -30,12 +30,13 @@ INSTALL_TARGET=	site-install
 DOCS_EN=	ChangeLog README
 
 NO_STAGE=	yes
+
+OPTIONS_DEFINE=	DOCS
+
 post-install:
-.if !defined(NOPORTDOCS)
 	${MKDIR} ${RUBY_MODDOCDIR}
 .for f in ${DOCS_EN}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
-.endif
 
 .include <bsd.port.mk>

Modified: head/databases/slony1/files/pkg-message.in
==============================================================================
--- head/databases/slony1/files/pkg-message.in	Fri Jul  4 23:27:46 2014	(r360689)
+++ head/databases/slony1/files/pkg-message.in	Fri Jul  4 23:46:52 2014	(r360690)
@@ -1,8 +1,8 @@
 **********************************************************************
 
 
-Please read the docs on configuring and running slony-1.  Unless you specified
-NOPORTDOCS, they are in the %%LOCALBASE%%/share/doc/slony1 directory.
+Please read the docs on configuring and running slony-1.  Unless you deselected
+DOCS, they are in the %%LOCALBASE%%/share/doc/slony1 directory.
 
 If you are upgrading from a prior version of slony, please read the UPGRADING
 file in the above docs directory.

Modified: head/databases/yasql/Makefile
==============================================================================
--- head/databases/yasql/Makefile	Fri Jul  4 23:27:46 2014	(r360689)
+++ head/databases/yasql/Makefile	Fri Jul  4 23:46:52 2014	(r360690)
@@ -45,6 +45,8 @@ MAN1=		yasql.1
 
 PORTDOCS=	README yasql.html
 
+OPTIONS_DEFINE=	DOCS
+
 NO_STAGE=	yes
 pre-everything::
 	@${ECHO_MSG}
@@ -66,10 +68,8 @@ pre-install:
 
 post-install:
 	${MV} ${PREFIX}/etc/yasql.conf ${PREFIX}/etc/yasql.conf.sample
-.if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
-.endif
 	@if [ -f ${PREFIX}/etc/yasql.conf.precious ] ; then \
 		${MV} ${PREFIX}/etc/yasql.conf.precious ${PREFIX}/etc/yasql.conf ; \
 	else \
