13 files changed, 21 insertions, 14 deletions

diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile
index bbb59ed52e6a..cfd9787fe074 100644
--- a/www/bluefish/Makefile
+++ b/www/bluefish/Makefile
@@ -33,7 +33,7 @@ CONFIGURE_ARGS=	--with-gtk2 \
 		--with-freedesktop_org-mime=${PREFIX}/share/mime \
 		--with-icon-path=${PREFIX}/share/pixmaps
 
-OPTIONS_DEFINE=	DEBUG NLS TIDY WEBLINT
+OPTIONS_DEFINE=	DEBUG NLS TIDY WEBLINT DOCS
 
 DEBUG_DESC=	Enable debugging output
 TIDY_DESC=	Include Tidy HTML cleanup program
diff --git a/www/codeigniter/Makefile b/www/codeigniter/Makefile
index 703148c4bf7c..b4409bcaeaf8 100644
--- a/www/codeigniter/Makefile
+++ b/www/codeigniter/Makefile
@@ -63,7 +63,7 @@ STD_BITS=	${CI_CONF_DIR}/index.html \
 		${CI_SYS_DIR}/language \
 		${CI_SYS_DIR}/libraries
 
-OPTIONS_DEFINE=	APACHE MSSQL MYSQL MYSQLI ODBC PGSQL SQLITE
+OPTIONS_DEFINE=	APACHE MSSQL MYSQL MYSQLI ODBC PGSQL SQLITE DOCS
 
 APACHE_DESC=	Configure for Apache-2.x
 MSSQL_DESC=	Install MSSQL support for PHP
diff --git a/www/dillo2/Makefile b/www/dillo2/Makefile
index 0e339ce892a1..54631791c5b8 100644
--- a/www/dillo2/Makefile
+++ b/www/dillo2/Makefile
@@ -28,7 +28,7 @@ CONFLICTS=	dillo-i18n-[0-9]* \
 		dillo-0*
 LATEST_LINK=	dillo2
 
-OPTIONS_DEFINE=		COOKIES HYPHENATION IPV6 SSL THREADS
+OPTIONS_DEFINE=		COOKIES HYPHENATION IPV6 SSL THREADS DOCS
 OPTIONS_DEFAULT=	COOKIES HYPHENATION IPV6 SSL THREADS
 
 COOKIES_DESC=		Cookie support
diff --git a/www/eaccelerator/Makefile b/www/eaccelerator/Makefile
index a883a8ef3439..91cf91e76bc6 100644
--- a/www/eaccelerator/Makefile
+++ b/www/eaccelerator/Makefile
@@ -17,7 +17,7 @@ GH_ACCOUNT=	${PORTNAME}
 GH_TAGNAME=	${GH_COMMIT}
 GH_COMMIT=	42067ac
 
-OPTIONS_DEFINE=	DOCCOMM
+OPTIONS_DEFINE=	DOCCOMM DOCS EXAMPLES
 
 DOCCOMM_DESC=	Retain doc-comments in internal php structures
 DOCCOMM_CONFIGURE_WITH=	eaccelerator-doc-comment-inclusion
diff --git a/www/eaccelerator/pkg-plist b/www/eaccelerator/pkg-plist
index b9ec391c4956..8b216f30d4ac 100644
--- a/www/eaccelerator/pkg-plist
+++ b/www/eaccelerator/pkg-plist
@@ -1,6 +1,6 @@
 lib/php/%%PHP_EXT_DIR%%/eaccelerator.so
 @dirrmtry lib/php/%%PHP_EXT_DIR%%
-%%EXAMPLESDIR%%/control.php
-%%EXAMPLESDIR%%/dasm.php
-%%EXAMPLESDIR%%/eaccelerator.ini
-@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/control.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dasm.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/eaccelerator.ini
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
diff --git a/www/helma/Makefile b/www/helma/Makefile
index 4267c1b1f088..5b80bbb21b48 100644
--- a/www/helma/Makefile
+++ b/www/helma/Makefile
@@ -36,9 +36,9 @@ PLIST_SUB=	DBDIR="${DBDIR}" \
 		HELMA_USER="${HELMA_USER}" \
 		HELMA_GROUP="${HELMA_GROUP}"
 
-OPTIONS_DEFINE=	MYSQL
+OPTIONS_DEFINE=	MYSQL DOCS
 OPTIONS_SUB=	yes
-OPTIONS_DESC=	"Install MySQL Connector for Java"
+OPTIONS_DESC=	Install MySQL Connector for Java
 
 MYSQL_RUN_DEPENDS=	${JAVALIBDIR}/mysql-connector-java.jar:${PORTSDIR}/databases/mysql-connector-java
 
diff --git a/www/lighttpd/Makefile b/www/lighttpd/Makefile
index 81d6de476cdf..48d178c1921e 100644
--- a/www/lighttpd/Makefile
+++ b/www/lighttpd/Makefile
@@ -31,7 +31,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 .if !defined(_BUILDING_LIGHTTPD_MODULE)
 USE_RC_SUBR=	lighttpd
 
-OPTIONS_DEFINE=	BZIP2 FAM GDBM IPV6 LIBEV LUA MEMCACHE MYSQL MYSQLAUTH \
+OPTIONS_DEFINE=	BZIP2 DOCS FAM GDBM IPV6 LIBEV LUA MEMCACHE MYSQL MYSQLAUTH \
 		NODELAY LDAP OPENSSL SPAWNFCGI VALGRIND WEBDAV
 
 OPTIONS_DEFAULT=	IPV6 OPENSSL
diff --git a/www/piwigo/Makefile b/www/piwigo/Makefile
index 196a965ba7a8..f8a2f4cadcda 100644
--- a/www/piwigo/Makefile
+++ b/www/piwigo/Makefile
@@ -30,7 +30,7 @@ SUB_LIST+=	CP="${CP}" \
 		WWWOWN="${WWWOWN}" \
 		WWWGRP="${WWWGRP}"
 
-OPTIONS_DEFINE=	IMAGICK
+OPTIONS_DEFINE=	IMAGICK X11 DOCS EXAMPLES
 OPTIONS_DEFAULT=IMAGICK
 IMAGICK_DESC=	${IMAGEMAGICK_DESC}
 
diff --git a/www/suphp/Makefile b/www/suphp/Makefile
index 5bcc6ac39b86..3bda26a96c78 100644
--- a/www/suphp/Makefile
+++ b/www/suphp/Makefile
@@ -38,6 +38,8 @@ CONFIGURE_ARGS=	CFLAGS="${CFLAGS}" --with-apxs=${APXS}
 WITH_SETID_MODE?=	owner
 CONFIGURE_ARGS+=	--with-setid-mode=${WITH_SETID_MODE}
 
+OPTIONS_DEFINE=	DOCS
+
 .include <bsd.port.options.mk>
 
 CONFIGURE_ARGS+=	--with-apr=${LOCALBASE}
diff --git a/www/tidy-devel/Makefile b/www/tidy-devel/Makefile
index 333c94fc88c9..6e85f8531c1f 100644
--- a/www/tidy-devel/Makefile
+++ b/www/tidy-devel/Makefile
@@ -40,6 +40,8 @@ DESCR=		${.CURDIR}/pkg-descr
 
 BIN2STRIP=	tidy tab2space
 
+OPTIONS_DEFINE=	DOCS
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
diff --git a/www/trac-email2trac/Makefile b/www/trac-email2trac/Makefile
index 89558433ca57..a17fe73a25dd 100644
--- a/www/trac-email2trac/Makefile
+++ b/www/trac-email2trac/Makefile
@@ -15,7 +15,7 @@ LICENSE_COMB=	dual
 
 RUN_DEPENDS+=	tracd:${PORTSDIR}/www/trac
 
-OPTIONS_DEFINE=	POSTFIX
+OPTIONS_DEFINE=	POSTFIX DOCS
 POSTFIX_DESC=	Configure suid script for postfix
 
 TRACUSER?=	${WWWOWN}
diff --git a/www/vdr-plugin-live/Makefile b/www/vdr-plugin-live/Makefile
index d646eec7682e..828e132e1518 100644
--- a/www/vdr-plugin-live/Makefile
+++ b/www/vdr-plugin-live/Makefile
@@ -24,6 +24,8 @@ MAKE_ARGS+=	INCLUDES="-I$(LOCALBASE)/include -I${WRKSRC}"
 MAKE_ARGS+=	PREFIX="${PREFIX}"
 USES=		compiler:features
 
+OPTIONS_DEFINE=	DOCS
+
 .include	"${.CURDIR}/../../multimedia/vdr/Makefile.plugins"
 
 .include <bsd.port.pre.mk>
diff --git a/www/webalizer/Makefile b/www/webalizer/Makefile
index 0f1a459a0424..8b170669ff09 100644
--- a/www/webalizer/Makefile
+++ b/www/webalizer/Makefile
@@ -30,7 +30,8 @@ WEBALIZER_LANG?=english
 .endif
 
 OPTIONS_DEFINE=	GEOIP GEODB BDB1 BDB WEBALIZER_CONV \
-		FULL_CGI_REFS CLICKABLE_REFERER LARGE_URL
+		FULL_CGI_REFS CLICKABLE_REFERER LARGE_URL \
+		DOCS EXAMPLES
 OPTIONS_DEFAULT?=
 NO_OPTIONS_SORT=yes
 GEODB_DESC=Enable Webalizers IP-Database support