Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 6 Aug 2014 04:34:23 +0000 (UTC)
From:      Adam Weinberger <adamw@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r364152 - in head: chinese/bg5pdf databases/py-psycopg databases/sqlite2 devel/cvs devel/elfio devel/gazpacho dns/ez-ipupdate graphics/cuttlefish lang/execline mail/ask mail/dspam mail/...
Message-ID:  <53e1b050.5859.55cb43e0@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: adamw
Date: Wed Aug  6 04:34:23 2014
New Revision: 364152
URL: http://svnweb.freebsd.org/changeset/ports/364152
QAT: https://qat.redports.org/buildarchive/r364152/

Log:
  In some straightforward situations, protect examples behind PORTEXAMPLES,
  adding EXAMPLES to OPTIONS_DEFINE where necessary. In a couple instances,
  correct examples being controlled by the DOCS option.

Modified:
  head/chinese/bg5pdf/Makefile
  head/chinese/bg5pdf/pkg-plist
  head/databases/py-psycopg/Makefile
  head/databases/py-psycopg/pkg-plist
  head/databases/sqlite2/Makefile
  head/databases/sqlite2/pkg-plist
  head/devel/cvs/Makefile
  head/devel/cvs/pkg-plist
  head/devel/elfio/pkg-plist
  head/devel/gazpacho/Makefile
  head/devel/gazpacho/pkg-plist
  head/dns/ez-ipupdate/Makefile
  head/dns/ez-ipupdate/pkg-plist
  head/graphics/cuttlefish/Makefile
  head/graphics/cuttlefish/pkg-plist
  head/lang/execline/Makefile
  head/lang/execline/pkg-plist
  head/mail/ask/Makefile
  head/mail/ask/pkg-plist
  head/mail/dspam-devel/Makefile
  head/mail/dspam-devel/pkg-plist
  head/mail/dspam/pkg-plist
  head/mail/libspf/Makefile
  head/mail/libspf/pkg-plist
  head/mail/pymsgauth/Makefile
  head/mail/pymsgauth/pkg-plist
  head/mail/qmail-notify/Makefile
  head/mail/qmail-notify/pkg-plist
  head/math/tvmet/pkg-plist
  head/net-p2p/rtorrent/Makefile
  head/net-p2p/rtorrent/pkg-plist
  head/net/java-beepcore/Makefile
  head/net/java-beepcore/pkg-plist
  head/net/spread-j/Makefile
  head/net/spread-j/pkg-plist
  head/net/wakeonlan/Makefile
  head/net/wakeonlan/pkg-plist
  head/security/libgnomesu/Makefile
  head/security/libgnomesu/pkg-plist
  head/security/snort-rep/Makefile
  head/security/snort-rep/pkg-plist
  head/sysutils/gosa/Makefile
  head/textproc/gastex/Makefile
  head/textproc/gastex/pkg-plist
  head/textproc/ppower4/Makefile
  head/textproc/ppower4/pkg-plist
  head/textproc/saxon/Makefile
  head/textproc/saxon/pkg-plist
  head/textproc/xt/Makefile
  head/textproc/xt/pkg-plist
  head/www/zen-cart/Makefile
  head/www/zen-cart/pkg-plist

Modified: head/chinese/bg5pdf/Makefile
==============================================================================
--- head/chinese/bg5pdf/Makefile	Wed Aug  6 03:49:28 2014	(r364151)
+++ head/chinese/bg5pdf/Makefile	Wed Aug  6 04:34:23 2014	(r364152)
@@ -17,6 +17,8 @@ CFLAGS+=	-fPIC
 USE_PYTHON=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
+OPTIONS_DEFINE=	EXAMPLES
+
 post-patch:
 	${REINPLACE_CMD} -e 's,/usr/bin/python,python,g'  ${WRKSRC}/bg5pdf
 

Modified: head/chinese/bg5pdf/pkg-plist
==============================================================================
--- head/chinese/bg5pdf/pkg-plist	Wed Aug  6 03:49:28 2014	(r364151)
+++ head/chinese/bg5pdf/pkg-plist	Wed Aug  6 04:34:23 2014	(r364152)
@@ -1,7 +1,7 @@
 bin/bg5pdf
 bin/gbpdf
 %%PYTHON_SITELIBDIR%%/bg5pdflib.so
-%%EXAMPLESDIR%%/genTest.py
-%%EXAMPLESDIR%%/test.big5
-%%EXAMPLESDIR%%/test.big5.pdf
-@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/genTest.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test.big5
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test.big5.pdf
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%

Modified: head/databases/py-psycopg/Makefile
==============================================================================
--- head/databases/py-psycopg/Makefile	Wed Aug  6 03:49:28 2014	(r364151)
+++ head/databases/py-psycopg/Makefile	Wed Aug  6 04:34:23 2014	(r364152)
@@ -28,7 +28,7 @@ CONFIGURE_ARGS=	--with-python=${PYTHON_C
 		--with-postgres-includes=${LOCALBASE}/include \
 		--with-mxdatetime-includes=${DATETIME_INC}
 
-OPTIONS_DEFINE=	ZOPE DOCS
+OPTIONS_DEFINE=	ZOPE DOCS EXAMPLES
 OPTIONS_SUB=	yes
 
 ZOPE_USES=	zope

Modified: head/databases/py-psycopg/pkg-plist
==============================================================================
--- head/databases/py-psycopg/pkg-plist	Wed Aug  6 03:49:28 2014	(r364151)
+++ head/databases/py-psycopg/pkg-plist	Wed Aug  6 04:34:23 2014	(r364152)
@@ -10,26 +10,26 @@
 %%PORTDOCS%%%%DOCSDIR%%/RELEASE-1.0
 %%PORTDOCS%%%%DOCSDIR%%/SUCCESS
 %%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%EXAMPLESDIR%%/binary.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/bool.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/bounded.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/commit.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/copy_from.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/copy_from2.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/copy_to.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/dictfetch.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/dt.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/first.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/integrity.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/interval.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/notify.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/oid.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/somehackers.jpg
-%%PORTDOCS%%%%EXAMPLESDIR%%/threads.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/usercast.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/whereareyou.jpg
-%%PORTDOCS%%%%EXAMPLESDIR%%/work.py
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/binary.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bool.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bounded.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/commit.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/copy_from.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/copy_from2.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/copy_to.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dictfetch.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dt.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/first.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/integrity.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/interval.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/notify.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/oid.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/somehackers.jpg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/threads.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/usercast.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/whereareyou.jpg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/work.py
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%ZOPE%%%%ZOPEPRODUCTDIR%%/ZPsycopgDA/DA.py
 %%ZOPE%%%%ZOPEPRODUCTDIR%%/ZPsycopgDA/DA.pyc

Modified: head/databases/sqlite2/Makefile
==============================================================================
--- head/databases/sqlite2/Makefile	Wed Aug  6 03:49:28 2014	(r364151)
+++ head/databases/sqlite2/Makefile	Wed Aug  6 04:34:23 2014	(r364152)
@@ -21,7 +21,7 @@ EXAMPLESDIR=	${PREFIX}/share/examples/sq
 
 EXTRACT_AFTER_ARGS=	--exclude CVS
 
-OPTIONS_DEFINE=	TCL THREADS DOCS
+OPTIONS_DEFINE=	TCL THREADS DOCS EXAMPLES
 
 .if !exists(/usr/lib/libreadline.so)
 MAKE_ARGS=	READLINE_FLAGS="-DHAVE_READLINE=1 -I${LOCALBASE}/include -L${LOCALBASE}/lib"

Modified: head/databases/sqlite2/pkg-plist
==============================================================================
--- head/databases/sqlite2/pkg-plist	Wed Aug  6 03:49:28 2014	(r364151)
+++ head/databases/sqlite2/pkg-plist	Wed Aug  6 04:34:23 2014	(r364152)
@@ -7,5 +7,5 @@ libdata/pkgconfig/sqlite.pc
 %%WITH_TCLWRAPPER%%lib/sqlite/libtclsqlite.so
 %%WITH_TCLWRAPPER%%lib/sqlite/pkgIndex.tcl
 %%WITH_TCLWRAPPER%%@dirrm lib/sqlite
-%%EXAMPLESDIR%%/example.tcl
-@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example.tcl
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%

Modified: head/devel/cvs/Makefile
==============================================================================
--- head/devel/cvs/Makefile	Wed Aug  6 03:49:28 2014	(r364151)
+++ head/devel/cvs/Makefile	Wed Aug  6 04:34:23 2014	(r364152)
@@ -11,8 +11,8 @@ COMMENT=	Version control system
 
 LICENSE=	GPLv2
 
-OPTIONS_DEFINE=		KERBEROS
-OPTIONS_DEFAULT=	KERBEROS
+OPTIONS_DEFINE=	KERBEROS EXAMPLES
+OPTIONS_DEFAULT=KERBEROS
 
 USES=		makeinfo tar:xz uidfix
 WRKSRC=		${WRKDIR}/call/cvs-build
@@ -37,6 +37,6 @@ BROKEN=	does not link
 .endif
 
 pre-install:
-	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/contrib
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/contrib
 
 .include <bsd.port.post.mk>

Modified: head/devel/cvs/pkg-plist
==============================================================================
--- head/devel/cvs/pkg-plist	Wed Aug  6 03:49:28 2014	(r364151)
+++ head/devel/cvs/pkg-plist	Wed Aug  6 04:34:23 2014	(r364152)
@@ -2,24 +2,24 @@ bin/cvs
 bin/cvsbug
 man/man1/cvs.1.gz
 man/man8/cvsbug.8.gz
-%%EXAMPLESDIR%%/contrib/README
-%%EXAMPLESDIR%%/contrib/clmerge
-%%EXAMPLESDIR%%/contrib/cln_hist
-%%EXAMPLESDIR%%/contrib/commit_prep
-%%EXAMPLESDIR%%/contrib/cvs2vendor
-%%EXAMPLESDIR%%/contrib/cvs_acls
-%%EXAMPLESDIR%%/contrib/cvscheck
-%%EXAMPLESDIR%%/contrib/intro.doc
-%%EXAMPLESDIR%%/contrib/log
-%%EXAMPLESDIR%%/contrib/log_accum
-%%EXAMPLESDIR%%/contrib/mfpipe
-%%EXAMPLESDIR%%/contrib/rcs-to-cvs
-%%EXAMPLESDIR%%/contrib/rcslock
-%%EXAMPLESDIR%%/contrib/sccs2rcs
-%%EXAMPLESDIR%%/contrib/rcs2log
-%%EXAMPLESDIR%%/contrib/easy-import
-%%EXAMPLESDIR%%/contrib/cvscheck.man
-%%EXAMPLESDIR%%/contrib/cvshelp.man
-%%EXAMPLESDIR%%/contrib/descend.man
-@dirrm %%EXAMPLESDIR%%/contrib
-@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/clmerge
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/cln_hist
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/commit_prep
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/cvs2vendor
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/cvs_acls
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/cvscheck
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/intro.doc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/log
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/log_accum
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/mfpipe
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/rcs-to-cvs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/rcslock
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/sccs2rcs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/rcs2log
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/easy-import
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/cvscheck.man
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/cvshelp.man
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/descend.man
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/contrib
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%

Modified: head/devel/elfio/pkg-plist
==============================================================================
--- head/devel/elfio/pkg-plist	Wed Aug  6 03:49:28 2014	(r364151)
+++ head/devel/elfio/pkg-plist	Wed Aug  6 04:34:23 2014	(r364152)
@@ -7,10 +7,10 @@ lib/libELFIO.a
 lib/libELFIO.la
 lib/libELFIO.so
 lib/libELFIO.so.0
-%%EXAMPLES%%%%EXAMPLESDIR%%/ELFDump.cpp
-%%EXAMPLES%%%%EXAMPLESDIR%%/RelocationTable.cpp
-%%EXAMPLES%%%%EXAMPLESDIR%%/Write.cpp
-%%EXAMPLES%%%%EXAMPLESDIR%%/WriteObj.cpp
-%%EXAMPLES%%%%EXAMPLESDIR%%/WriteObj2.cpp
-%%EXAMPLES%%%%EXAMPLESDIR%%/tutorial.cpp
-%%EXAMPLES%%@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ELFDump.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RelocationTable.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Write.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/WriteObj.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/WriteObj2.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial.cpp
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%

Modified: head/devel/gazpacho/Makefile
==============================================================================
--- head/devel/gazpacho/Makefile	Wed Aug  6 03:49:28 2014	(r364151)
+++ head/devel/gazpacho/Makefile	Wed Aug  6 04:34:23 2014	(r364152)
@@ -21,7 +21,7 @@ USE_PYDISTUTILS=yes
 USES=		gettext
 DOCS=		AUTHORS ChangeLog CONTRIBUTORS COPYING README NEWS
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|share/doc/gazpacho/examples|${EXAMPLESDIR}|g' ${WRKSRC}/setup.py

Modified: head/devel/gazpacho/pkg-plist
==============================================================================
--- head/devel/gazpacho/pkg-plist	Wed Aug  6 03:49:28 2014	(r364151)
+++ head/devel/gazpacho/pkg-plist	Wed Aug  6 04:34:23 2014	(r364152)
@@ -246,10 +246,10 @@ share/applications/gazpacho.desktop
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%EXAMPLESDIR%%/helloworld.glade
-%%EXAMPLESDIR%%/helloworld.py
-%%EXAMPLESDIR%%/uimanager.glade
-%%EXAMPLESDIR%%/uimanager.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/helloworld.glade
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/helloworld.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/uimanager.glade
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/uimanager.py
 %%DATADIR%%/catalogs/base.xml
 %%DATADIR%%/glade/dummy.glade
 %%DATADIR%%/glade/preferences.glade
@@ -344,7 +344,7 @@ share/locale/zh_CN/LC_MESSAGES/gazpacho.
 @dirrm %%DATADIR%%/glade
 @dirrmtry %%DATADIR%%/catalogs
 @dirrmtry %%DATADIR%%
-@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 @dirrm %%PYTHON_SITELIBDIR%%/gazpacho/widgets/base/menueditor
 @dirrm %%PYTHON_SITELIBDIR%%/gazpacho/widgets/base
 @dirrmtry %%PYTHON_SITELIBDIR%%/gazpacho/widgets

Modified: head/dns/ez-ipupdate/Makefile
==============================================================================
--- head/dns/ez-ipupdate/Makefile	Wed Aug  6 03:49:28 2014	(r364151)
+++ head/dns/ez-ipupdate/Makefile	Wed Aug  6 04:34:23 2014	(r364152)
@@ -15,6 +15,8 @@ COMMENT=	Update your host name on any dy
 USE_RC_SUBR=	ez-ipupdate
 GNU_CONFIGURE=	yes
 
+OPTIONS_DEFINE=	EXAMPLES
+
 post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} example-*.conf ${STAGEDIR}${EXAMPLESDIR})

Modified: head/dns/ez-ipupdate/pkg-plist
==============================================================================
--- head/dns/ez-ipupdate/pkg-plist	Wed Aug  6 03:49:28 2014	(r364151)
+++ head/dns/ez-ipupdate/pkg-plist	Wed Aug  6 04:34:23 2014	(r364152)
@@ -1,13 +1,13 @@
 bin/ez-ipupdate
 etc/ez-ipupdate.conf.sample
-%%EXAMPLESDIR%%/example-dhs.conf
-%%EXAMPLESDIR%%/example-dyndns.conf
-%%EXAMPLESDIR%%/example-dyns.conf
-%%EXAMPLESDIR%%/example-easydns.conf
-%%EXAMPLESDIR%%/example-gnudip.conf
-%%EXAMPLESDIR%%/example-heipv6tb.conf
-%%EXAMPLESDIR%%/example-justlinux.conf
-%%EXAMPLESDIR%%/example-ods.conf
-%%EXAMPLESDIR%%/example-pgpow.conf
-%%EXAMPLESDIR%%/example-tzo.conf
-@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-dhs.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-dyndns.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-dyns.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-easydns.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-gnudip.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-heipv6tb.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-justlinux.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-ods.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-pgpow.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-tzo.conf
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%

Modified: head/graphics/cuttlefish/Makefile
==============================================================================
--- head/graphics/cuttlefish/Makefile	Wed Aug  6 03:49:28 2014	(r364151)
+++ head/graphics/cuttlefish/Makefile	Wed Aug  6 04:34:23 2014	(r364152)
@@ -27,6 +27,8 @@ EXAMPLES=	japan-traces-small.config japa
 		nyxem-hosts-both.config \
 		witty-combined-small.config witty-combined.config
 
+OPTIONS_DEFINE=	EXAMPLES
+
 post-patch:
 	@${REINPLACE_CMD} -e "s|../lib|../lib/cuttlefish|" \
 		${WRKSRC}/bin/cuttlefish.pl
@@ -36,18 +38,18 @@ post-patch:
 .endfor
 
 do-install:
-	@${INSTALL_SCRIPT} ${WRKSRC}/bin/cuttlefish.pl ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/cuttlefish.pl ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/cuttlefish
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 .for f in Canvas.pm Control.pm Histogram.pm Image.pm Legend.pm Map.pm Util.pm
-	@${INSTALL_DATA} ${WRKSRC}/lib/${f} ${STAGEDIR}${PREFIX}/lib/cuttlefish/${f}
+	${INSTALL_DATA} ${WRKSRC}/lib/${f} ${STAGEDIR}${PREFIX}/lib/cuttlefish/${f}
 .endfor
 .for f in ${EXAMPLES}
-	@${INSTALL_DATA} ${WRKSRC}/configs/${f} ${STAGEDIR}${EXAMPLESDIR}/${f}
+	${INSTALL_DATA} ${WRKSRC}/configs/${f} ${STAGEDIR}${EXAMPLESDIR}/${f}
 .endfor
 .for f in ${IMAGES}
-	@${INSTALL_DATA} ${WRKSRC}/images/${f} ${STAGEDIR}${DATADIR}/${f}
+	${INSTALL_DATA} ${WRKSRC}/images/${f} ${STAGEDIR}${DATADIR}/${f}
 .endfor
 
 .include <bsd.port.mk>

Modified: head/graphics/cuttlefish/pkg-plist
==============================================================================
--- head/graphics/cuttlefish/pkg-plist	Wed Aug  6 03:49:28 2014	(r364151)
+++ head/graphics/cuttlefish/pkg-plist	Wed Aug  6 04:34:23 2014	(r364152)
@@ -12,11 +12,11 @@ lib/cuttlefish/Util.pm
 %%DATADIR%%/japan-water.jpg
 %%DATADIR%%/world-day.jpg
 %%DATADIR%%/world-water.jpg
-%%EXAMPLESDIR%%/japan-traces-small.config
-%%EXAMPLESDIR%%/japan-traces.config
-%%EXAMPLESDIR%%/nyxem-hosts-both.config
-%%EXAMPLESDIR%%/witty-combined-small.config
-%%EXAMPLESDIR%%/witty-combined.config
-@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/japan-traces-small.config
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/japan-traces.config
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/nyxem-hosts-both.config
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/witty-combined-small.config
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/witty-combined.config
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 @dirrm %%DATADIR%%
 @dirrm lib/cuttlefish

Modified: head/lang/execline/Makefile
==============================================================================
--- head/lang/execline/Makefile	Wed Aug  6 03:49:28 2014	(r364151)
+++ head/lang/execline/Makefile	Wed Aug  6 04:34:23 2014	(r364152)
@@ -16,7 +16,7 @@ WRKSRC=		${WRKDIR}/admin/${DISTNAME}
 DOCS=		package/CHANGES package/README package/THANKS package/TODO \
 		doc/*.html
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
 do-configure:
 	${ECHO_CMD} "FreeBSD"	> ${WRKSRC}/src/sys/systype
@@ -31,7 +31,7 @@ do-configure:
 		${WRKSRC}/conf-compile/conf-ld
 
 do-build:
-	cd ${WRKSRC} && package/compile
+	(cd ${WRKSRC} && package/compile)
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/command/* ${STAGEDIR}${PREFIX}/bin

Modified: head/lang/execline/pkg-plist
==============================================================================
--- head/lang/execline/pkg-plist	Wed Aug  6 03:49:28 2014	(r364151)
+++ head/lang/execline/pkg-plist	Wed Aug  6 04:34:23 2014	(r364152)
@@ -98,7 +98,7 @@ lib/libexls1.a
 %%PORTDOCS%%%%DOCSDIR%%/upgrade.html
 %%PORTDOCS%%%%DOCSDIR%%/wait.html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%EXAMPLESDIR%%/execline-shell
-%%EXAMPLESDIR%%/execline-startup
-@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/execline-shell
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/execline-startup
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 @dirrm include/execline

Modified: head/mail/ask/Makefile
==============================================================================
--- head/mail/ask/Makefile	Wed Aug  6 03:49:28 2014	(r364151)
+++ head/mail/ask/Makefile	Wed Aug  6 04:34:23 2014	(r364152)
@@ -17,7 +17,7 @@ BINS=		askfilter asksetup utils/asksende
 SUB_FILES=	pkg-message
 PORTDOCS=	*
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-extract:
 	@${REINPLACE_CMD} -E \

Modified: head/mail/ask/pkg-plist
==============================================================================
--- head/mail/ask/pkg-plist	Wed Aug  6 03:49:28 2014	(r364151)
+++ head/mail/ask/pkg-plist	Wed Aug  6 04:34:23 2014	(r364152)
@@ -13,17 +13,17 @@ lib/ask/test.py
 man/man1/askfilter.1.gz
 man/man1/asksenders.1.gz
 man/man1/asksetup.1.gz
-%%EXAMPLESDIR%%/ask.rc
-%%EXAMPLESDIR%%/confirm_da.txt
-%%EXAMPLESDIR%%/confirm_de.txt
-%%EXAMPLESDIR%%/confirm_en.txt
-%%EXAMPLESDIR%%/confirm_es.txt
-%%EXAMPLESDIR%%/confirm_fi.txt
-%%EXAMPLESDIR%%/confirm_fr.txt
-%%EXAMPLESDIR%%/confirm_it.txt
-%%EXAMPLESDIR%%/confirm_nl.txt
-%%EXAMPLESDIR%%/confirm_ptbr.txt
-%%EXAMPLESDIR%%/ignorelist.txt
-%%EXAMPLESDIR%%/whitelist.txt
-@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ask.rc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/confirm_da.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/confirm_de.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/confirm_en.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/confirm_es.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/confirm_fi.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/confirm_fr.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/confirm_it.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/confirm_nl.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/confirm_ptbr.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ignorelist.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/whitelist.txt
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 @dirrm lib/ask

Modified: head/mail/dspam-devel/Makefile
==============================================================================
--- head/mail/dspam-devel/Makefile	Wed Aug  6 03:49:28 2014	(r364151)
+++ head/mail/dspam-devel/Makefile	Wed Aug  6 04:34:23 2014	(r364152)
@@ -40,7 +40,7 @@ OPTIONS_DEFINE=	SYSLOG DEBUG VERBOSE_DEB
 		MYSQL_LOCAL PGSQL_LOCAL HASH EXTERNAL_LOOKUP \
 		USER_HOMEDIR TRUSTED_USERS VIRT_USERS LONG_USERNAMES \
 		LARGE_SCALE DOMAIN_SCALE NICESENDMAIL POSTFIX_MBC \
-		QMAIL WEBUI LIGHTTPD DOCS
+		QMAIL WEBUI LIGHTTPD DOCS EXAMPLES
 
 OPTIONS_MULTI=	DB
 OPTIONS_MULTI_DB=	MYSQL51 MYSQL55 PGSQL SQLITE2 SQLITE3

Modified: head/mail/dspam-devel/pkg-plist
==============================================================================
--- head/mail/dspam-devel/pkg-plist	Wed Aug  6 03:49:28 2014	(r364151)
+++ head/mail/dspam-devel/pkg-plist	Wed Aug  6 04:34:23 2014	(r364152)
@@ -106,23 +106,23 @@ libdata/pkgconfig/dspam.pc
 %%PORTDOCS%%%%DOCSDIR%%/UPDATING
 %%PORTDOCS%%%%DOCSDIR%%/UPGRADING
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%MYSQL%%%%EXAMPLESDIR%%/mysql/mysql_objects-4.1.sql
-%%MYSQL%%%%EXAMPLESDIR%%/mysql/mysql_objects-space.sql
-%%MYSQL%%%%EXAMPLESDIR%%/mysql/mysql_objects-speed.sql
-%%MYSQL%%%%EXAMPLESDIR%%/mysql/purge-4.1.sql
-%%MYSQL%%%%EXAMPLESDIR%%/mysql/purge.sql
-%%MYSQL%%%%EXAMPLESDIR%%/mysql/virtual_user_aliases.sql
-%%MYSQL%%%%EXAMPLESDIR%%/mysql/virtual_users.sql
-%%MYSQL%%@dirrm %%EXAMPLESDIR%%/mysql
-%%PGSQL%%%%EXAMPLESDIR%%/pgsql/pgsql_objects.sql
-%%PGSQL%%%%EXAMPLESDIR%%/pgsql/purge.sql
-%%PGSQL%%%%EXAMPLESDIR%%/pgsql/purge-pe.sql
-%%PGSQL%%%%EXAMPLESDIR%%/pgsql/virtual_users.sql
-%%PGSQL%%@dirrm %%EXAMPLESDIR%%/pgsql
-%%SQLITE%%%%EXAMPLESDIR%%/sqlite/purge-2.sql
-%%SQLITE%%%%EXAMPLESDIR%%/sqlite/purge-3.sql
-%%SQLITE%%@dirrm %%EXAMPLESDIR%%/sqlite
-@dirrmtry %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%MYSQL%%%%EXAMPLESDIR%%/mysql/mysql_objects-4.1.sql
+%%PORTEXAMPLES%%%%MYSQL%%%%EXAMPLESDIR%%/mysql/mysql_objects-space.sql
+%%PORTEXAMPLES%%%%MYSQL%%%%EXAMPLESDIR%%/mysql/mysql_objects-speed.sql
+%%PORTEXAMPLES%%%%MYSQL%%%%EXAMPLESDIR%%/mysql/purge-4.1.sql
+%%PORTEXAMPLES%%%%MYSQL%%%%EXAMPLESDIR%%/mysql/purge.sql
+%%PORTEXAMPLES%%%%MYSQL%%%%EXAMPLESDIR%%/mysql/virtual_user_aliases.sql
+%%PORTEXAMPLES%%%%MYSQL%%%%EXAMPLESDIR%%/mysql/virtual_users.sql
+%%PORTEXAMPLES%%%%MYSQL%%@dirrm %%EXAMPLESDIR%%/mysql
+%%PORTEXAMPLES%%%%PGSQL%%%%EXAMPLESDIR%%/pgsql/pgsql_objects.sql
+%%PORTEXAMPLES%%%%PGSQL%%%%EXAMPLESDIR%%/pgsql/purge.sql
+%%PORTEXAMPLES%%%%PGSQL%%%%EXAMPLESDIR%%/pgsql/purge-pe.sql
+%%PORTEXAMPLES%%%%PGSQL%%%%EXAMPLESDIR%%/pgsql/virtual_users.sql
+%%PORTEXAMPLES%%%%PGSQL%%@dirrm %%EXAMPLESDIR%%/pgsql
+%%PORTEXAMPLES%%%%SQLITE%%%%EXAMPLESDIR%%/sqlite/purge-2.sql
+%%PORTEXAMPLES%%%%SQLITE%%%%EXAMPLESDIR%%/sqlite/purge-3.sql
+%%PORTEXAMPLES%%%%SQLITE%%@dirrm %%EXAMPLESDIR%%/sqlite
+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
 %%WebUI%%%%WWWDIR%%/admins.sample
 %%WebUI%%%%WWWDIR%%/admin.cgi
 %%WebUI%%%%WWWDIR%%/admingraph.cgi

Modified: head/mail/dspam/pkg-plist
==============================================================================
--- head/mail/dspam/pkg-plist	Wed Aug  6 03:49:28 2014	(r364151)
+++ head/mail/dspam/pkg-plist	Wed Aug  6 04:34:23 2014	(r364152)
@@ -92,23 +92,23 @@ libdata/pkgconfig/dspam.pc
 %%PORTDOCS%%%%DOCSDIR%%/UPDATING
 %%PORTDOCS%%%%DOCSDIR%%/UPGRADING
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%MYSQL%%%%EXAMPLESDIR%%/mysql/mysql_objects-4.1.sql
-%%MYSQL%%%%EXAMPLESDIR%%/mysql/mysql_objects-space.sql
-%%MYSQL%%%%EXAMPLESDIR%%/mysql/mysql_objects-speed.sql
-%%MYSQL%%%%EXAMPLESDIR%%/mysql/purge-4.1.sql
-%%MYSQL%%%%EXAMPLESDIR%%/mysql/purge.sql
-%%MYSQL%%%%EXAMPLESDIR%%/mysql/virtual_user_aliases.sql
-%%MYSQL%%%%EXAMPLESDIR%%/mysql/virtual_users.sql
-%%MYSQL%%@dirrm %%EXAMPLESDIR%%/mysql
-%%PGSQL%%%%EXAMPLESDIR%%/pgsql/pgsql_objects.sql
-%%PGSQL%%%%EXAMPLESDIR%%/pgsql/purge.sql
-%%PGSQL%%%%EXAMPLESDIR%%/pgsql/purge-pe.sql
-%%PGSQL%%%%EXAMPLESDIR%%/pgsql/virtual_users.sql
-%%PGSQL%%@dirrm %%EXAMPLESDIR%%/pgsql
-%%SQLITE%%%%EXAMPLESDIR%%/sqlite/purge-2.sql
-%%SQLITE%%%%EXAMPLESDIR%%/sqlite/purge-3.sql
-%%SQLITE%%@dirrm %%EXAMPLESDIR%%/sqlite
-@dirrmtry %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%MYSQL%%%%EXAMPLESDIR%%/mysql/mysql_objects-4.1.sql
+%%PORTEXAMPLES%%%%MYSQL%%%%EXAMPLESDIR%%/mysql/mysql_objects-space.sql
+%%PORTEXAMPLES%%%%MYSQL%%%%EXAMPLESDIR%%/mysql/mysql_objects-speed.sql
+%%PORTEXAMPLES%%%%MYSQL%%%%EXAMPLESDIR%%/mysql/purge-4.1.sql
+%%PORTEXAMPLES%%%%MYSQL%%%%EXAMPLESDIR%%/mysql/purge.sql
+%%PORTEXAMPLES%%%%MYSQL%%%%EXAMPLESDIR%%/mysql/virtual_user_aliases.sql
+%%PORTEXAMPLES%%%%MYSQL%%%%EXAMPLESDIR%%/mysql/virtual_users.sql
+%%PORTEXAMPLES%%%%MYSQL%%@dirrm %%EXAMPLESDIR%%/mysql
+%%PORTEXAMPLES%%%%PGSQL%%%%EXAMPLESDIR%%/pgsql/pgsql_objects.sql
+%%PORTEXAMPLES%%%%PGSQL%%%%EXAMPLESDIR%%/pgsql/purge.sql
+%%PORTEXAMPLES%%%%PGSQL%%%%EXAMPLESDIR%%/pgsql/purge-pe.sql
+%%PORTEXAMPLES%%%%PGSQL%%%%EXAMPLESDIR%%/pgsql/virtual_users.sql
+%%PORTEXAMPLES%%%%PGSQL%%@dirrm %%EXAMPLESDIR%%/pgsql
+%%PORTEXAMPLES%%%%SQLITE%%%%EXAMPLESDIR%%/sqlite/purge-2.sql
+%%PORTEXAMPLES%%%%SQLITE%%%%EXAMPLESDIR%%/sqlite/purge-3.sql
+%%PORTEXAMPLES%%%%SQLITE%%@dirrm %%EXAMPLESDIR%%/sqlite
+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
 %%WebUI%%%%WWWDIR%%/admins.sample
 %%WebUI%%%%WWWDIR%%/admin.cgi
 %%WebUI%%%%WWWDIR%%/admingraph.cgi

Modified: head/mail/libspf/Makefile
==============================================================================
--- head/mail/libspf/Makefile	Wed Aug  6 03:49:28 2014	(r364151)
+++ head/mail/libspf/Makefile	Wed Aug  6 04:34:23 2014	(r364152)
@@ -21,7 +21,7 @@ USE_LDCONFIG=	yes
 
 PORTDOCS=	*
 
-OPTIONS_DEFINE=	RFC_RECURSION LOGFILE_STATS DEBUG DOCS
+OPTIONS_DEFINE=	RFC_RECURSION LOGFILE_STATS DEBUG DOCS EXAMPLES
 RFC_RECURSION_DESC=	Change SPF recursion to 20 (as per RFC)
 LOGFILE_STATS_DESC=	Enables logfile stats
 

Modified: head/mail/libspf/pkg-plist
==============================================================================
--- head/mail/libspf/pkg-plist	Wed Aug  6 03:49:28 2014	(r364151)
+++ head/mail/libspf/pkg-plist	Wed Aug  6 04:34:23 2014	(r364152)
@@ -7,20 +7,20 @@ lib/libspf-1.0.so
 lib/libspf-1.0.so.0
 lib/libspf.a
 lib/libspf.la
-%%EXAMPLESDIR%%/examples/Sendmail/sendmail.cf
-%%EXAMPLESDIR%%/examples/Sendmail/sendmail.mc.example
-%%EXAMPLESDIR%%/examples/Sendmail/spf.m4
-%%EXAMPLESDIR%%/examples/qmail/control/spfaction
-%%EXAMPLESDIR%%/examples/qmail/control/spfbestguess
-%%EXAMPLESDIR%%/examples/qmail/control/spfdebugstate
-%%EXAMPLESDIR%%/examples/qmail/control/spfexplainstate
-%%EXAMPLESDIR%%/examples/qmail/control/spfexplanation
-%%EXAMPLESDIR%%/examples/qmail/control/spfguessstate
-%%EXAMPLESDIR%%/examples/qmail/control/spfheaderstate
-%%EXAMPLESDIR%%/examples/qmail/control/spftarpit
-%%EXAMPLESDIR%%/examples/qmail/control/spftarpittime
-%%EXAMPLESDIR%%/examples/qmail/control/spftrustedforwarder
-%%EXAMPLESDIR%%/examples/qmail/control/spftrustedstate
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/Sendmail/sendmail.cf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/Sendmail/sendmail.mc.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/Sendmail/spf.m4
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/qmail/control/spfaction
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/qmail/control/spfbestguess
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/qmail/control/spfdebugstate
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/qmail/control/spfexplainstate
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/qmail/control/spfexplanation
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/qmail/control/spfguessstate
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/qmail/control/spfheaderstate
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/qmail/control/spftarpit
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/qmail/control/spftarpittime
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/qmail/control/spftrustedforwarder
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/qmail/control/spftrustedstate
 %%DATADIR%%/patches/Courier-MTA/courier-0.45.4-spf.diff
 %%DATADIR%%/patches/Postfix/2.1.x/postfix-2.1.4-libspf-1.0-RC6.diff
 %%DATADIR%%/patches/Postfix/README
@@ -51,8 +51,8 @@ lib/libspf.la
 @dirrm %%DATADIR%%/patches/Courier-MTA
 @dirrm %%DATADIR%%/patches
 @dirrm %%DATADIR%%
-@dirrm %%EXAMPLESDIR%%/examples/qmail/control
-@dirrm %%EXAMPLESDIR%%/examples/qmail
-@dirrm %%EXAMPLESDIR%%/examples/Sendmail
-@dirrm %%EXAMPLESDIR%%/examples
-@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/examples/qmail/control
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/examples/qmail
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/examples/Sendmail
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/examples
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%

Modified: head/mail/pymsgauth/Makefile
==============================================================================
--- head/mail/pymsgauth/Makefile	Wed Aug  6 03:49:28 2014	(r364151)
+++ head/mail/pymsgauth/Makefile	Wed Aug  6 04:34:23 2014	(r364152)
@@ -20,7 +20,7 @@ SUB_FILES=	pkg-message
 DOCS=		BUGS CHANGELOG pymsgauth.txt pymsgauth.html
 EXAMPLES=	pymsgauthrc-example
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}

Modified: head/mail/pymsgauth/pkg-plist
==============================================================================
--- head/mail/pymsgauth/pkg-plist	Wed Aug  6 03:49:28 2014	(r364151)
+++ head/mail/pymsgauth/pkg-plist	Wed Aug  6 04:34:23 2014	(r364152)
@@ -11,6 +11,6 @@ bin/pymsgauth-mail
 %%PORTDOCS%%%%DOCSDIR%%/pymsgauth.html
 %%PORTDOCS%%%%DOCSDIR%%/pymsgauth.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%EXAMPLESDIR%%/pymsgauthrc-example
-@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pymsgauthrc-example
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 @dirrm %%DATADIR%%

Modified: head/mail/qmail-notify/Makefile
==============================================================================
--- head/mail/qmail-notify/Makefile	Wed Aug  6 03:49:28 2014	(r364151)
+++ head/mail/qmail-notify/Makefile	Wed Aug  6 04:34:23 2014	(r364152)
@@ -23,10 +23,10 @@ do-configure:
 	${ECHO_CMD} "${CC} ${STRIP} ${LDFLAGS}"	> ${WRKSRC}/conf-ld
 
 do-install:
-	cd ${WRKSRC} && ./installer
+	(cd ${WRKSRC} && ./installer)
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${STAGEDIR}${EXAMPLESDIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${STAGEDIR}${EXAMPLESDIR})
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>

Modified: head/mail/qmail-notify/pkg-plist
==============================================================================
--- head/mail/qmail-notify/pkg-plist	Wed Aug  6 03:49:28 2014	(r364151)
+++ head/mail/qmail-notify/pkg-plist	Wed Aug  6 04:34:23 2014	(r364152)
@@ -1,7 +1,7 @@
 bin/qmail-notify
-%%EXAMPLESDIR%%/cron.hourly
-%%EXAMPLESDIR%%/message.txt
-@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cron.hourly
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/message.txt
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO

Modified: head/math/tvmet/pkg-plist
==============================================================================
--- head/math/tvmet/pkg-plist	Wed Aug  6 03:49:28 2014	(r364151)
+++ head/math/tvmet/pkg-plist	Wed Aug  6 04:34:23 2014	(r364152)
@@ -100,29 +100,29 @@ share/aclocal/tvmet.m4
 %%PORTDOCS%%%%DOCSDIR%%/tvmet.css
 %%PORTDOCS%%%%DOCSDIR%%/usage.dox
 %%PORTDOCS%%%%DOCSDIR%%/works.dox
-%%PORTDOCS%%%%EXAMPLESDIR%%/alias.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/aliasing.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/cmm.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/cmv.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/diag.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/frob_matrix_norm.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/hspiess.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/matrix_col.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/mm.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/mv.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/ray.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/redwards.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/xpr_print_m1.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/xpr_print_m2.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/xpr_print_m3.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/xpr_print_m4.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/xpr_print_mv1.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/xpr_print_mv2.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/xpr_print_v1.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/xpr_print_v2.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/xpr_print_v3.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/xpr_print_v4.cc
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/alias.cc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/aliasing.cc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cmm.cc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cmv.cc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/diag.cc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/frob_matrix_norm.cc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hspiess.cc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/matrix_col.cc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mm.cc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mv.cc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ray.cc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/redwards.cc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xpr_print_m1.cc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xpr_print_m2.cc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xpr_print_m3.cc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xpr_print_m4.cc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xpr_print_mv1.cc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xpr_print_mv2.cc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xpr_print_v1.cc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xpr_print_v2.cc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xpr_print_v3.cc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xpr_print_v4.cc
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm include/tvmet/xpr
 @dirrm include/tvmet/util

Modified: head/net-p2p/rtorrent/Makefile
==============================================================================
--- head/net-p2p/rtorrent/Makefile	Wed Aug  6 03:49:28 2014	(r364151)
+++ head/net-p2p/rtorrent/Makefile	Wed Aug  6 04:34:23 2014	(r364152)
@@ -22,8 +22,8 @@ SUB_FILES=	pkg-message
 
 PORTDOCS=	README
 
-OPTIONS_DEFINE=	XMLRPC IPV6 DOCS
-OPTIONS_DEFAULT=	XMLRPC
+OPTIONS_DEFINE=	XMLRPC IPV6 DOCS EXAMPLES
+OPTIONS_DEFAULT=XMLRPC
 XMLRPC_DESC=	Compile with xmlrpc-c support
 
 .include <bsd.port.options.mk>
@@ -60,9 +60,9 @@ post-patch:
 .endif
 
 post-install:
-	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/rtorrent.rc ${STAGEDIR}${EXAMPLESDIR}
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/net-p2p/rtorrent/pkg-plist
==============================================================================
--- head/net-p2p/rtorrent/pkg-plist	Wed Aug  6 03:49:28 2014	(r364151)
+++ head/net-p2p/rtorrent/pkg-plist	Wed Aug  6 04:34:23 2014	(r364152)
@@ -1,3 +1,3 @@
 bin/rtorrent
-%%EXAMPLESDIR%%/rtorrent.rc
-@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rtorrent.rc
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%

Modified: head/net/java-beepcore/Makefile
==============================================================================
--- head/net/java-beepcore/Makefile	Wed Aug  6 03:49:28 2014	(r364151)
+++ head/net/java-beepcore/Makefile	Wed Aug  6 04:34:23 2014	(r364152)
@@ -18,13 +18,13 @@ USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/lib/beep*.jar ${STAGEDIR}${JAVAJARDIR}
-	cd ${WRKSRC}/example \
+	(cd ${WRKSRC}/example \
 	  && ${FIND} -s . -type d -exec ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/{} \; \
-	  && ${FIND} -s . -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${EXAMPLESDIR}/{} \;
+	  && ${FIND} -s . -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${EXAMPLESDIR}/{} \;)
 	${INSTALL_DATA} ${WRKSRC}/lib/example.jar ${STAGEDIR}${EXAMPLESDIR}
 
 post-install:

Modified: head/net/java-beepcore/pkg-plist
==============================================================================
--- head/net/java-beepcore/pkg-plist	Wed Aug  6 03:49:28 2014	(r364151)
+++ head/net/java-beepcore/pkg-plist	Wed Aug  6 04:34:23 2014	(r364152)
@@ -6,15 +6,15 @@
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
 %%PORTDOCS%%%%DOCSDIR%%/README.txt
 %%PORTDOCS%%%%DOCSDIR%%/README_SASL.htm
-%%EXAMPLESDIR%%/example.jar
-%%EXAMPLESDIR%%/org/beepcore/beep/example/Beepd.java
-%%EXAMPLESDIR%%/org/beepcore/beep/example/Bing.java
-%%EXAMPLESDIR%%/org/beepcore/beep/example/README_EXAMPLE
-%%EXAMPLESDIR%%/org/beepcore/beep/example/beepd-config.xml
-@dirrm %%EXAMPLESDIR%%/org/beepcore/beep/util
-@dirrm %%EXAMPLESDIR%%/org/beepcore/beep/example
-@dirrm %%EXAMPLESDIR%%/org/beepcore/beep
-@dirrm %%EXAMPLESDIR%%/org/beepcore
-@dirrm %%EXAMPLESDIR%%/org
-@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example.jar
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/org/beepcore/beep/example/Beepd.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/org/beepcore/beep/example/Bing.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/org/beepcore/beep/example/README_EXAMPLE
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/org/beepcore/beep/example/beepd-config.xml
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/org/beepcore/beep/util
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/org/beepcore/beep/example
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/org/beepcore/beep
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/org/beepcore
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/org
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%

Modified: head/net/spread-j/Makefile
==============================================================================
--- head/net/spread-j/Makefile	Wed Aug  6 03:49:28 2014	(r364151)
+++ head/net/spread-j/Makefile	Wed Aug  6 04:34:23 2014	(r364152)
@@ -18,7 +18,7 @@ USE_JAVA=	YES
 JAVA_VERSION=	1.6+
 PKGMESSAGE=	${WRKSRC}/../license.txt
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
 ANT?=		${LOCALBASE}/bin/ant
 ANT_PARAMS+=	-Dlib.dir=${STAGEDIR}${JAVAJARDIR} -Djavadoc.destdir=docs -Dversion=${PORTVERSION}
@@ -36,12 +36,11 @@ PORTDOCS+=	java
 .endif
 
 do-build:
-	cd ${WRKSRC} && \
-		${SETENV} JAVA_HOME=${JAVA_HOME} ${ANT} ${ANT_TARGET} ${ANT_PARAMS}
+	(cd ${WRKSRC} && \
+		${SETENV} JAVA_HOME=${JAVA_HOME} ${ANT} ${ANT_TARGET} ${ANT_PARAMS})
 
 do-install:
-	cd ${WRKSRC} && ${ANT} install ${ANT_PARAMS}
-.if ${PORT_OPTIONS:MDOCS}
+	(cd ${WRKSRC} && ${ANT} install ${ANT_PARAMS})
 	${INSTALL} -d -o root -g wheel -m 0755 ${STAGEDIR}${EXAMPLESDIR}/java
 	${INSTALL_DATA} ${WRKSRC}/recThread.java ${STAGEDIR}${EXAMPLESDIR}/java
 	${INSTALL_DATA} ${WRKSRC}/Flooder.java ${STAGEDIR}${EXAMPLESDIR}/java
@@ -55,6 +54,5 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/docs/stylesheet.css ${STAGEDIR}${DOCSDIR}/java/html
 	${INSTALL_DATA} ${WRKSRC}/docs/spread/*.html ${STAGEDIR}${DOCSDIR}/java/html/spread
 	${INSTALL_DATA} ${WRKSRC}/docs/spread/class-use/*.html ${STAGEDIR}${DOCSDIR}/java/html/spread/class-use
-.endif
 
 .include <bsd.port.mk>

Modified: head/net/spread-j/pkg-plist
==============================================================================
--- head/net/spread-j/pkg-plist	Wed Aug  6 03:49:28 2014	(r364151)
+++ head/net/spread-j/pkg-plist	Wed Aug  6 04:34:23 2014	(r364152)
@@ -1,6 +1,6 @@
 %%JAVAJARDIR%%/%%PORTNAME%%-%%PORTVERSION%%.jar
-%%PORTDOCS%%%%EXAMPLESDIR%%/java/Flooder.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/java/recThread.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/java/User.java
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/java
-%%PORTDOCS%%@dirrmtry %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/Flooder.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/recThread.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/User.java
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/java
+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%

Modified: head/net/wakeonlan/Makefile
==============================================================================
--- head/net/wakeonlan/Makefile	Wed Aug  6 03:49:28 2014	(r364151)
+++ head/net/wakeonlan/Makefile	Wed Aug  6 04:34:23 2014	(r364152)
@@ -12,6 +12,8 @@ COMMENT=	Sends magic packets to WOL enab
 USES=		perl5
 USE_PERL5=	configure
 
+OPTIONS_DEFINE=	EXAMPLES
+
 post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/lab001.wol ${STAGEDIR}${EXAMPLESDIR}

Modified: head/net/wakeonlan/pkg-plist
==============================================================================
--- head/net/wakeonlan/pkg-plist	Wed Aug  6 03:49:28 2014	(r364151)
+++ head/net/wakeonlan/pkg-plist	Wed Aug  6 04:34:23 2014	(r364152)
@@ -1,6 +1,6 @@
 bin/wakeonlan
 man/man1/wakeonlan.1.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/wakeonlan/.packlist
-%%EXAMPLESDIR%%/lab001.wol
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lab001.wol
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/wakeonlan
-@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%

Modified: head/security/libgnomesu/Makefile
==============================================================================
--- head/security/libgnomesu/Makefile	Wed Aug  6 03:49:28 2014	(r364151)
+++ head/security/libgnomesu/Makefile	Wed Aug  6 04:34:23 2014	(r364152)
@@ -27,9 +27,9 @@ post-patch:
 		${WRKSRC}/src/Makefile.in
 
 post-install:
-	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${FILESDIR}/gnomesu-pam.sample ${STAGEDIR}${EXAMPLESDIR}
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/api.html ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/libgnomesu.css ${STAGEDIR}${DOCSDIR}
 

Modified: head/security/libgnomesu/pkg-plist
==============================================================================
--- head/security/libgnomesu/pkg-plist	Wed Aug  6 03:49:28 2014	(r364151)
+++ head/security/libgnomesu/pkg-plist	Wed Aug  6 04:34:23 2014	(r364152)
@@ -9,7 +9,7 @@ libexec/gnomesu-backend
 libexec/gnomesu-pam-backend
 %%PORTDOCS%%%%DOCSDIR%%/api.html
 %%PORTDOCS%%%%DOCSDIR%%/libgnomesu.css
-%%EXAMPLESDIR%%/gnomesu-pam.sample
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnomesu-pam.sample
 share/application-registry/gnomesu-nautilus.applications
 share/mime-info/gnomesu-nautilus.keys
 share/locale/az/LC_MESSAGES/libgnomesu-1.0.mo
@@ -51,5 +51,5 @@ share/locale/zh_CN/LC_MESSAGES/libgnomes
 share/locale/zh_TW/LC_MESSAGES/libgnomesu-1.0.mo
 @dirrm include/libgnomesu-1.0/libgnomesu
 @dirrm include/libgnomesu-1.0
-@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%

Modified: head/security/snort-rep/Makefile
==============================================================================
--- head/security/snort-rep/Makefile	Wed Aug  6 03:49:28 2014	(r364151)
+++ head/security/snort-rep/Makefile	Wed Aug  6 04:34:23 2014	(r364152)
@@ -16,7 +16,7 @@ SHEBANG_FILES=	snort-rep snort-rep-mail
 OPTIONS_DEFINE=	EXAMPLES
 
 do-build:
-	cd ${BUILD_WRKSRC} ; pod2man --lax snort-rep > snort-rep.1
+	(cd ${BUILD_WRKSRC} ; pod2man --lax snort-rep > snort-rep.1)
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/snort-rep ${STAGEDIR}${PREFIX}/bin

Modified: head/security/snort-rep/pkg-plist
==============================================================================
--- head/security/snort-rep/pkg-plist	Wed Aug  6 03:49:28 2014	(r364151)
+++ head/security/snort-rep/pkg-plist	Wed Aug  6 04:34:23 2014	(r364152)
@@ -1,4 +1,4 @@
 bin/snort-rep
 man/man1/snort-rep.1.gz
-%%EXAMPLESDIR%%/snort-rep-mail
-@dirrm share/examples/snort-rep
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/snort-rep-mail
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%

Modified: head/sysutils/gosa/Makefile
==============================================================================
--- head/sysutils/gosa/Makefile	Wed Aug  6 03:49:28 2014	(r364151)
+++ head/sysutils/gosa/Makefile	Wed Aug  6 04:34:23 2014	(r364152)
@@ -55,9 +55,9 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/update-gosa.1 ${STAGEDIR}${MANPREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/gosa.conf.5 ${STAGEDIR}${MANPREFIX}/man/man5
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	(cd ${WRKSRC} && ${COPYTREE_SHARE} "contrib" ${STAGEDIR}${EXAMPLESDIR})
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} contrib ${STAGEDIR}${EXAMPLESDIR})
 	@${MKDIR} ${STAGEDIR}${ETCDIR} ${STAGEDIR}${DOCSDIR}
-	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} "*" ${STAGEDIR}${DOCSDIR})
+	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 	(cd ${WRKSRC} && ${INSTALL_DATA} AUTHORS COPYING Changelog FAQ \
 		INSTALL README README.safemode ${STAGEDIR}${DOCSDIR})
 

Modified: head/textproc/gastex/Makefile
==============================================================================
--- head/textproc/gastex/Makefile	Wed Aug  6 03:49:28 2014	(r364151)
+++ head/textproc/gastex/Makefile	Wed Aug  6 04:34:23 2014	(r364152)
@@ -20,6 +20,8 @@ TEXMFDIR?=	share/texmf
 GASTEXDIR=	${PREFIX}/${TEXMFDIR}/tex/latex/gastex
 GASDVIDIR=	${PREFIX}/${TEXMFDIR}/dvips/gastex
 
+OPTIONS_DEFINE=	EXAMPLES
+
 do-install:
 	@${MKDIR} ${STAGEDIR}${GASTEXDIR}
 	@${MKDIR} ${STAGEDIR}${GASDVIDIR}

Modified: head/textproc/gastex/pkg-plist
==============================================================================
--- head/textproc/gastex/pkg-plist	Wed Aug  6 03:49:28 2014	(r364151)
+++ head/textproc/gastex/pkg-plist	Wed Aug  6 04:34:23 2014	(r364152)
@@ -1,8 +1,8 @@
 share/texmf/tex/latex/gastex/gastex.sty
 share/texmf/dvips/gastex/gastex.pro
-%%EXAMPLESDIR%%/ex-gastex.tex
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-gastex.tex
 @dirrm share/texmf/tex/latex/gastex
 @dirrm share/texmf/dvips/gastex
-@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 @exec %D/bin/mktexlsr
 @unexec %D/bin/mktexlsr

Modified: head/textproc/ppower4/Makefile
==============================================================================
--- head/textproc/ppower4/Makefile	Wed Aug  6 03:49:28 2014	(r364151)
+++ head/textproc/ppower4/Makefile	Wed Aug  6 04:34:23 2014	(r364152)
@@ -35,7 +35,7 @@ PLIST_SUB=	STY_DIR="${STY_DIR:S,^${PREFI
 SUB_FILES=	ppower4.sh
 SUB_LIST=	JARFILE=${JAR_DIR}/pp4p.jar
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}

Modified: head/textproc/ppower4/pkg-plist
==============================================================================
--- head/textproc/ppower4/pkg-plist	Wed Aug  6 03:49:28 2014	(r364151)
+++ head/textproc/ppower4/pkg-plist	Wed Aug  6 04:34:23 2014	(r364152)
@@ -1,19 +1,19 @@
 bin/ppower4
 %%PORTDOCS%%%%DOCSDIR%%/manual.pdf
-%%PORTDOCS%%%%EXAMPLESDIR%%/leveldemo.tex
-%%PORTDOCS%%%%EXAMPLESDIR%%/example.1
-%%PORTDOCS%%%%EXAMPLESDIR%%/example.2
-%%PORTDOCS%%%%EXAMPLESDIR%%/example.3
-%%PORTDOCS%%%%EXAMPLESDIR%%/example.4
-%%PORTDOCS%%%%EXAMPLESDIR%%/example.5
-%%PORTDOCS%%%%EXAMPLESDIR%%/example.6
-%%PORTDOCS%%%%EXAMPLESDIR%%/example.7
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/leveldemo.tex
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example.1
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example.2
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example.3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example.4
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example.5
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example.6
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example.7
 %%JAR_DIR%%/pp4p.jar
 %%STY_DIR%%/pause.sty
 %%STY_DIR%%/background.sty
 %%STY_DIR%%/pp4link.sty
 %%STY_DIR%%/mpmulti.sty
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 @dirrm %%JAR_DIR%%
 @dirrm %%STY_DIR%%

Modified: head/textproc/saxon/Makefile
==============================================================================
--- head/textproc/saxon/Makefile	Wed Aug  6 03:49:28 2014	(r364151)
+++ head/textproc/saxon/Makefile	Wed Aug  6 04:34:23 2014	(r364152)
@@ -22,7 +22,7 @@ NO_BUILD=	yes
 
 CONFLICTS=	saxon-devel-8.*
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
 JARFILES=	saxon-jdom.jar saxon.jar
 PLIST_FILES+=	${JARFILES:S,^,%%JAVAJARDIR%%/,} bin/saxon
@@ -43,14 +43,14 @@ do-install:
 .endfor
 	@${ECHO_MSG} " [ DONE ]"
 	@${ECHO_MSG} -n ">> Installing samples in ${EXAMPLESDIR}..."
-	cd ${WRKSRC}/samples/ && \
+	(cd ${WRKSRC}/samples/ && \
 	  ${FIND} . -type d -exec ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/{} \; && \
-	  ${FIND} . -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${EXAMPLESDIR}/{} \;
+	  ${FIND} . -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${EXAMPLESDIR}/{} \;)
 	@${ECHO_MSG} " [ DONE ]"
 	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..."
-	cd ${WRKSRC}/doc/ && \
+	(cd ${WRKSRC}/doc/ && \
 	  ${FIND} ${PORTDOCS} -type d -exec ${MKDIR} ${STAGEDIR}${DOCSDIR}/{} \; && \
-	  ${FIND} ${PORTDOCS} -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR}/{} \;
+	  ${FIND} ${PORTDOCS} -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR}/{} \;)
 	@${ECHO_MSG} " [ DONE ]"
 	@${ECHO_MSG} -n ">> Installing script in ${PREFIX}/bin..."
 	${INSTALL_SCRIPT} ${WRKDIR}/saxon.sh ${STAGEDIR}${PREFIX}/bin/saxon

Modified: head/textproc/saxon/pkg-plist
==============================================================================
--- head/textproc/saxon/pkg-plist	Wed Aug  6 03:49:28 2014	(r364151)
+++ head/textproc/saxon/pkg-plist	Wed Aug  6 04:34:23 2014	(r364152)
@@ -1,57 +1,57 @@
-%%EXAMPLESDIR%%/data/books.dtd
-%%EXAMPLESDIR%%/data/books.xml
-%%EXAMPLESDIR%%/data/othello.xml
-%%EXAMPLESDIR%%/data/play.dtd
-%%EXAMPLESDIR%%/java/ExampleContentHandler.class
-%%EXAMPLESDIR%%/java/ExampleContentHandler.java
-%%EXAMPLESDIR%%/java/JDOMExample.class
-%%EXAMPLESDIR%%/java/JDOMExample.java
-%%EXAMPLESDIR%%/java/SaxonServlet.class
-%%EXAMPLESDIR%%/java/SaxonServlet.java
-%%EXAMPLESDIR%%/java/ShowBooks$1.class
-%%EXAMPLESDIR%%/java/ShowBooks$BookListHandler.class
-%%EXAMPLESDIR%%/java/ShowBooks$BooksHandler.class
-%%EXAMPLESDIR%%/java/ShowBooks$CategoryHandler.class
-%%EXAMPLESDIR%%/java/ShowBooks$ItemHandler.class
-%%EXAMPLESDIR%%/java/ShowBooks.class
-%%EXAMPLESDIR%%/java/ShowBooks.java
-%%EXAMPLESDIR%%/java/TraxExamples$1.class

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?53e1b050.5859.55cb43e0>