9 files changed, 16 insertions, 11 deletions

diff --git a/sysutils/cdrdao/Makefile b/sysutils/cdrdao/Makefile
index 0cc8d268147d..392097a89e66 100644
--- a/sysutils/cdrdao/Makefile
+++ b/sysutils/cdrdao/Makefile
@@ -20,7 +20,10 @@ MP3OGG_LIB_DEPENDS=	libao.so:${PORTSDIR}/audio/libao \
 			libmad.so:${PORTSDIR}/audio/libmad \
 			libvorbis.so:${PORTSDIR}/audio/libvorbis
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	DOCS TOC2MP3 MP3OGG
+OPTIONS_DEFAULT=MP3OGG
+TOC2MP3_DESC=	Build with toc2mp3
+MP3OGG_DESC=	MP3 and Ogg Vorbis support
 
 .if ${PORTNAME} == "gcdmaster"
 USES+=			pkgconfig
diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile
index 73ef9135c289..3f20063cf638 100644
--- a/sysutils/hal/Makefile
+++ b/sysutils/hal/Makefile
@@ -65,7 +65,7 @@ SUB_LIST=	RC_FILES="${RC_FILES}"
 
 INSTALL_TARGET=	install-strip
 
-OPTIONS_DEFINE=	FIXED_MOUNTPOINTS
+OPTIONS_DEFINE=	FIXED_MOUNTPOINTS DOCS
 FIXED_MOUNTPOINTS_DESC=	use fixed mountpoints
 FIXED_MOUNTPOINTS_EXTRA_PATCHES=	${FILESDIR}/extra-patch-tools_hal-storage-mount.c
 
diff --git a/sysutils/heartbeat/Makefile b/sysutils/heartbeat/Makefile
index f21b7aab0542..51d9195d716d 100644
--- a/sysutils/heartbeat/Makefile
+++ b/sysutils/heartbeat/Makefile
@@ -59,7 +59,7 @@ PKGDEINSTALL=	${PKGINSTALL}
 
 PLIST_SUB=	USER=${USERS} GROUP=${GROUPS}
 
-OPTIONS_DEFINE=		MGMT LDIRECTORD APCSNMP DRAC3
+OPTIONS_DEFINE=		MGMT LDIRECTORD APCSNMP DRAC3 DOCS
 MGMT_DESC=		Enable X11 Management Utilities
 LDIRECTORD_DESC=	Enable Linux Director Daemon
 APCSNMP_DESC=		Enable APC SNMP Stonith Device
diff --git a/sysutils/hoz/Makefile b/sysutils/hoz/Makefile
index a788b88556aa..a7c7d7ec798e 100644
--- a/sysutils/hoz/Makefile
+++ b/sysutils/hoz/Makefile
@@ -18,7 +18,7 @@ MAKE_ARGS=	CC="${CC}"
 
 PORTDOCS=	README
 
-OPTIONS_DEFINE=	CLI GTK2 LANG_ES LANG_EN LANG_FR
+OPTIONS_DEFINE=	CLI GTK2 LANG_ES LANG_EN LANG_FR DOCS
 OPTIONS_DEFAULT=	CLI GTK2 LANG_EN
 LANG_EN_DESC=	language support
 
diff --git a/sysutils/ipmitool/Makefile b/sysutils/ipmitool/Makefile
index de37fed92f03..23e151603714 100644
--- a/sysutils/ipmitool/Makefile
+++ b/sysutils/ipmitool/Makefile
@@ -27,7 +27,7 @@ PORTDOCS=	AUTHORS COPYING ChangeLog README
 
 PERIODIC_DIR=	etc/periodic/daily
 
-OPTIONS_DEFINE=	FREEIPMI
+OPTIONS_DEFINE=	FREEIPMI DOCS
 FREEIPMI_DESC=	Enable support for freeipmi
 
 .if defined(WITH_DEBUG)
diff --git a/sysutils/nut/Makefile b/sysutils/nut/Makefile
index f9b9fa3cd1a3..26ab14ac55aa 100644
--- a/sysutils/nut/Makefile
+++ b/sysutils/nut/Makefile
@@ -24,7 +24,7 @@ PLIST_SUB+=	NUT_USER=${NUT_USER}
 PLIST_SUB+=	NUT_GROUP=${NUT_GROUP}
 
 OPTIONS_DEFAULT=SERIAL USB SNMP NEON IPMI_OFF
-OPTIONS_DEFINE=	SERIAL USB SNMP NEON PDU CGI BASH AVAHI OPENSSL
+OPTIONS_DEFINE=	SERIAL USB SNMP NEON PDU CGI BASH AVAHI OPENSSL DOCS
 OPTIONS_SINGLE=	IPMI
 OPTIONS_SINGLE_IPMI=	IPMI_OFF IPMIPSU FREEIPMI
 
diff --git a/sysutils/password-store/Makefile b/sysutils/password-store/Makefile
index 8e9f979b9873..0caf6457e616 100644
--- a/sysutils/password-store/Makefile
+++ b/sysutils/password-store/Makefile
@@ -16,7 +16,7 @@ RUN_DEPENDS=	bash>=0:${PORTSDIR}/shells/bash \
 		pwgen>=0:${PORTSDIR}/sysutils/pwgen \
 		tree>=1.7:${PORTSDIR}/sysutils/tree
 
-OPTIONS_DEFINE=		GIT XCLIP CONTRIB
+OPTIONS_DEFINE=		GIT XCLIP CONTRIB EXAMPLES
 OPTIONS_SUB=	yes
 
 GIT_DESC=		Enable git storage
@@ -58,10 +58,10 @@ do-install:
 	@(cd ${WRKSRC}/contrib && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
 	@(cd ${WRKSRC}/src/completion && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
 .endif
-.if ${PORT_OPTIONS:MDOCS}
+.if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	@${INSTALL_MAN} ${WRKSRC}/man/example-filter.sh ${STAGEDIR}${EXAMPLESDIR}
-	@${INSTALL_MAN} ${WRKSRC}/man/pass.1 ${STAGEDIR}${MANPREFIX}/man/man1/pass.1
+	@${INSTALL_DATA} ${WRKSRC}/man/example-filter.sh ${STAGEDIR}${EXAMPLESDIR}
 .endif
+	@${INSTALL_MAN} ${WRKSRC}/man/pass.1 ${STAGEDIR}${MANPREFIX}/man/man1/pass.1
 
 .include <bsd.port.mk>
diff --git a/sysutils/password-store/pkg-plist b/sysutils/password-store/pkg-plist
index e54bb4854f98..3e7f1b732722 100644
--- a/sysutils/password-store/pkg-plist
+++ b/sysutils/password-store/pkg-plist
@@ -22,8 +22,8 @@
 %%CONTRIB%%@dirrmtry %%DATADIR%%/dmenu
 %%CONTRIB%%@dirrmtry %%DATADIR%%/emacs
 %%CONTRIB%%@dirrmtry %%DATADIR%%/importers
-%%PORTDOCS%%man/man1/pass.1.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-filter.sh
 %%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
 bin/pass
 libexec/pass
+man/man1/pass.1.gz
diff --git a/sysutils/ucspi-ipc/Makefile b/sysutils/ucspi-ipc/Makefile
index bd76218bded7..696dcceabafe 100644
--- a/sysutils/ucspi-ipc/Makefile
+++ b/sysutils/ucspi-ipc/Makefile
@@ -17,6 +17,8 @@ DOCS=		CHANGES
 
 WRKSRC=		${WRKDIR}/host/superscript.com/net/${DISTNAME}
 
+OPTIONS_DEFINE=	DOCS
+
 .include <bsd.port.options.mk>
 
 do-configure: