aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--archivers/arj/Makefile9
-rw-r--r--archivers/sharutils/Makefile3
-rw-r--r--converters/tnef/Makefile9
-rw-r--r--devel/libslang2/Makefile4
-rw-r--r--editors/jed/Makefile4
-rw-r--r--ftp/ftpmirror/Makefile11
-rw-r--r--mail/qmail-contrib/Makefile5
-rw-r--r--mail/qmhandle/Makefile9
-rw-r--r--mail/queue-fix/Makefile3
-rw-r--r--math/slgrace/Makefile5
-rw-r--r--net/rinetd/Makefile9
-rw-r--r--net/wmnd/Makefile9
-rw-r--r--security/checkpassword/Makefile9
-rw-r--r--security/clamav-devel/Makefile4
-rw-r--r--security/clamav/Makefile4
-rw-r--r--security/cmd5checkpw/Makefile9
-rw-r--r--security/keychain/Makefile9
-rw-r--r--security/scanhill/Makefile3
-rw-r--r--sysutils/wmcube-gdk/Makefile11
-rw-r--r--sysutils/wmcube/Makefile9
-rw-r--r--www/dansguardian-devel/Makefile4
-rw-r--r--www/dansguardian/Makefile4
-rw-r--r--www/sarg/Makefile4
-rw-r--r--x11-wm/awesome/Makefile4
-rw-r--r--x11/gmrun/Makefile5
25 files changed, 113 insertions, 46 deletions
diff --git a/archivers/arj/Makefile b/archivers/arj/Makefile
index 81c5b9d11d0f..dd4ec297cc20 100644
--- a/archivers/arj/Makefile
+++ b/archivers/arj/Makefile
@@ -14,6 +14,9 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/2.78_3.10%20build%2022
MAINTAINER= garga@FreeBSD.org
COMMENT= Open-source ARJ
+OPTIONS_DEFINE= DOCS
+OPTIONS_DEFAULT=DOCS
+
USE_AUTOTOOLS= autoconf
USE_GMAKE= yes
MAKE_JOBS_UNSAFE= yes
@@ -36,6 +39,8 @@ MAN1= arj-register.1 arj.1 arjdisp.1 rearj.1
PORTSCOUT= skipv:3.10g
+.include <bsd.port.pre.mk>
+
post-patch:
@${REINPLACE_CMD} -e 's!/etc!${LOCALBASE}/etc!' \
${WRKSRC}/arj.c ${WRKSRC}/file_reg.c ${WRKSRC}/rearj.c
@@ -47,15 +52,13 @@ pre-build:
@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} prepare)
post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}
cd ${WRKSRC}/doc && ${INSTALL_DATA} COPYING debug.txt ${DOCSDIR}
cd ${WRKSRC}/resource/en && \
${INSTALL_DATA} arjl.txt arjs.txt history.txt readme.txt unix.txt ${DOCSDIR}
.endif
-.include <bsd.port.pre.mk>
-
.if ${ARCH} == "powerpc"
BROKEN= Does not install on powerpc
.endif
diff --git a/archivers/sharutils/Makefile b/archivers/sharutils/Makefile
index 532a3692dcb4..ecd9e21a88cf 100644
--- a/archivers/sharutils/Makefile
+++ b/archivers/sharutils/Makefile
@@ -16,6 +16,9 @@ COMMENT= Pack, send, and unpack shell archives; synchronize via e-mail
LICENSE= GPLv3
+OPTIONS_DEFINE= NLS
+OPTIONS_DEFAULT=NLS
+
USE_BZIP2= yes
USE_PERL5= yes
GNU_CONFIGURE= yes
diff --git a/converters/tnef/Makefile b/converters/tnef/Makefile
index b7c8b00149b6..8019748d71cf 100644
--- a/converters/tnef/Makefile
+++ b/converters/tnef/Makefile
@@ -13,6 +13,9 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/
MAINTAINER= garga@FreeBSD.org
COMMENT= Unpack data in MS Outlook TNEF format
+OPTIONS_DEFINE= DOCS
+OPTIONS_DEFAULT=DOCS
+
GNU_CONFIGURE= yes
MAKE_JOBS_SAFE= yes
@@ -20,8 +23,10 @@ MAN1= tnef.1
PORTDOCS= AUTHORS NEWS README THANKS TODO
PLIST_FILES= bin/tnef
+.include <bsd.port.pre.mk>
+
post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}
cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
.endif
@@ -32,4 +37,4 @@ x-test: build
@cd ${WRKSRC}/tests/${dir} && ${MAKE} check-TESTS
.endfor
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/devel/libslang2/Makefile b/devel/libslang2/Makefile
index 6758c13d8ed2..698c3de63a64 100644
--- a/devel/libslang2/Makefile
+++ b/devel/libslang2/Makefile
@@ -34,8 +34,8 @@ MAN1= slsh.1
DOCSDIR= ${PREFIX}/share/doc/slang
DATADIR= ${PREFIX}/share/slsh
-OPTIONS_DEFINE= PCRE PNG ICONV ONIG
-OPTIONS_DEFAULT=PCRE PNG ICONV
+OPTIONS_DEFINE= PCRE PNG ICONV ONIG DOCS
+OPTIONS_DEFAULT=PCRE PNG ICONV DOCS
ONIG_DESC= Oniguruma support
diff --git a/editors/jed/Makefile b/editors/jed/Makefile
index a2e645bd8b46..a5e454d05607 100644
--- a/editors/jed/Makefile
+++ b/editors/jed/Makefile
@@ -21,8 +21,8 @@ LIB_DEPENDS= slang:${PORTSDIR}/devel/libslang2
CONFLICTS= jed-devel-[0-9]*
-OPTIONS_DEFINE= X11 PERMS HOSTLOOKUP
-OPTIONS_DEFAULT=X11 HOSTLOOKUP
+OPTIONS_DEFINE= X11 PERMS HOSTLOOKUP DOCS
+OPTIONS_DEFAULT=X11 HOSTLOOKUP DOCS
PERMS_DESC= Respect permissions by Root
HOSTLOOKUP_DESC=Look-up for hostname
diff --git a/ftp/ftpmirror/Makefile b/ftp/ftpmirror/Makefile
index 61ce3fa19a3b..9ffa431e02e5 100644
--- a/ftp/ftpmirror/Makefile
+++ b/ftp/ftpmirror/Makefile
@@ -16,15 +16,16 @@ COMMENT= An utility to mirror directory hierarchy with FTP
RUN_DEPENDS= p5-Socket6>=0:${PORTSDIR}/net/p5-Socket6
+OPTIONS_DEFINE= DOCS
+OPTIONS_DEFAULT=DOCS
+
USE_PERL5= yes
GNU_CONFIGURE= yes
MAKE_JOBS_SAFE= yes
CONFIGURE_ENV+= PERL="${PERL}" INSTALL_PROGRAM="${INSTALL_SCRIPT}"
-.if !defined (NOPORTDOCS)
PORTDOCS= README.jis RELEASE.jis
-.endif
post-configure:
@${PERL} -i.bak -pe 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/Fan/Fan.pm
@@ -32,12 +33,14 @@ post-configure:
@${PERL} -i.bak -pe 's,^#!.*$$,#!${PERL}, if $$. == 1' ${WRKSRC}/${f}
.endfor
+.include <bsd.port.pre.mk>
+
post-install:
-.if !defined (NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}
.for i in ${PORTDOCS}
@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
.endfor
.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/mail/qmail-contrib/Makefile b/mail/qmail-contrib/Makefile
index b512b9763ead..07c7ff99d423 100644
--- a/mail/qmail-contrib/Makefile
+++ b/mail/qmail-contrib/Makefile
@@ -18,6 +18,9 @@ DISTFILES= dot-forward-${DF_VER}.tar.gz \
MAINTAINER= garga@FreeBSD.org
COMMENT= Contributed programs for qmail
+OPTIONS_DEFINE= DOCS
+OPTIONS_DEFAULT=DOCS
+
USE_QMAIL_RUN= yes
MAKE_JOBS_SAFE= yes
@@ -59,7 +62,7 @@ post-patch:
@${REINPLACE_CMD} -e "s|-O2|${CFLAGS}|" \
${WRKFF}/conf-cc \
${WRKDF}/conf-cc
-.if defined(NOPORTDOCS)
+.if empty(PORT_OPTIONS:MDOCS)
@${REINPLACE_CMD} -E 's|^(.*${DOCSDIR})|// \1|g' \
${WRKFF}/hier.c
.endif
diff --git a/mail/qmhandle/Makefile b/mail/qmhandle/Makefile
index 343acef14f04..e7cecc4d3693 100644
--- a/mail/qmhandle/Makefile
+++ b/mail/qmhandle/Makefile
@@ -14,6 +14,9 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-1.3/${PORTNAME}-${PORTVERSION}
MAINTAINER= garga@FreeBSD.org
COMMENT= Tool to view and manage a qmail queue
+OPTIONS_DEFINE= DOCS
+OPTIONS_DEFAULT=DOCS
+
USE_QMAIL_RUN= yes
NO_BUILD= yes
@@ -22,6 +25,8 @@ USE_BZIP2= yes
PORTDOCS= HISTORY README
+.include <bsd.port.pre.mk>
+
post-patch:
@${REINPLACE_CMD} -e 's,^#!/usr/bin/perl,#!${PERL},g' \
-e 's,%%LOCALBASE%%,${LOCALBASE},g' \
@@ -35,11 +40,11 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/qmHandle.conf.sample ${PREFIX}/etc
[ -f ${PREFIX}/etc/qmHandle.conf ] || \
${INSTALL_DATA} -m 0644 ${WRKSRC}/qmHandle.conf.sample ${PREFIX}/etc/qmHandle.conf
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}
.for file in ${PORTDOCS}
${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
.endfor
.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/mail/queue-fix/Makefile b/mail/queue-fix/Makefile
index 807dc7845fe6..6f53a706df0c 100644
--- a/mail/queue-fix/Makefile
+++ b/mail/queue-fix/Makefile
@@ -16,6 +16,9 @@ MASTER_SITE_SUBDIR= distfiles
MAINTAINER= garga@FreeBSD.org
COMMENT= Repairs or generates a qmail queue structure
+OPTIONS_DEFINE= DOCS
+OPTIONS_DEFAULT=DOCS
+
USE_QMAIL_RUN= yes
MAKE_JOBS_SAFE= yes
diff --git a/math/slgrace/Makefile b/math/slgrace/Makefile
index 92428a729387..8229c740a656 100644
--- a/math/slgrace/Makefile
+++ b/math/slgrace/Makefile
@@ -20,6 +20,9 @@ COMMENT= A SLang module to plot graphs with grace
LIB_DEPENDS= slang:${PORTSDIR}/devel/libslang2
RUN_DEPENDS= grace:${PORTSDIR}/math/grace
+OPTIONS_DEFINE= DOCS
+OPTIONS_DEFAULT=DOCS
+
SLANG_VER= 2.1
GNU_CONFIGURE= yes
@@ -28,7 +31,7 @@ PORTDOCS= *
PLIST_SUB= VERSION=${PORTVERSION}
post-patch:
-.if defined(NOPORTDOCS)
+.if empty(PORT_OPTIONS:MDOCS)
@${REINPLACE_CMD} -e 's, install_docfiles,,' \
-e '/MKINSDIR.*DEST_DOC_FILES_INSTALL_DIR/d' \
${WRKSRC}/src/Makefile.in
diff --git a/net/rinetd/Makefile b/net/rinetd/Makefile
index dac10b5a8a63..c4b2c0709bd1 100644
--- a/net/rinetd/Makefile
+++ b/net/rinetd/Makefile
@@ -17,6 +17,9 @@ DISTNAME= rinetd
MAINTAINER= garga@FreeBSD.org
COMMENT= A simple TCP port redirector
+OPTIONS_DEFINE= DOCS
+OPTIONS_DEFAULT=DOCS
+
WRKSRC= ${WRKDIR}/rinetd/
MAKE_JOBS_SAFE= yes
@@ -28,6 +31,8 @@ PLIST_FILES= sbin/rinetd
USE_RC_SUBR= rinetd.sh
+.include <bsd.port.pre.mk>
+
post-patch:
@${REINPLACE_CMD} -E "s,(/etc/rinetd.conf),${PREFIX}\1," \
${WRKSRC}/rinetd.[8c]
@@ -36,10 +41,10 @@ post-patch:
@${REINPLACE_CMD} -e "s/cc /${CC} /g" ${WRKSRC}/Makefile
post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
${MKDIR} ${DOCSDIR}
cd ${WRKSRC} ; ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
.endif
@${CAT} ${PKGMESSAGE}
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net/wmnd/Makefile b/net/wmnd/Makefile
index 3b1ab9fa1b57..775dbf35c2da 100644
--- a/net/wmnd/Makefile
+++ b/net/wmnd/Makefile
@@ -16,6 +16,9 @@ COMMENT= Improved network monitoring dock app (with tons of features)
LICENSE= GPLv2
+OPTIONS_DEFINE= EXAMPLES
+OPTIONS_DEFAULT=EXAMPLES
+
USE_XORG= ice sm x11 xext xpm
USE_GMAKE= yes
GNU_CONFIGURE= yes
@@ -26,13 +29,15 @@ MAN1= wmnd.1
PORTEXAMPLES= wmndrc
PLIST_FILES= bin/wmnd
+.include <bsd.port.pre.mk>
+
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/src/wmnd ${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/doc/wmnd.1 ${MANPREFIX}/man/man1
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
@${MKDIR} ${EXAMPLESDIR}
${INSTALL_DATA} ${WRKSRC}/examples/wmndrc ${EXAMPLESDIR}
.endif
@${CAT} ${PKGMESSAGE}
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/security/checkpassword/Makefile b/security/checkpassword/Makefile
index 7a52e6a84e01..26a50c3a2703 100644
--- a/security/checkpassword/Makefile
+++ b/security/checkpassword/Makefile
@@ -15,6 +15,9 @@ MASTER_SITE_SUBDIR= distfiles
MAINTAINER= garga@FreeBSD.org
COMMENT= A simple password-checking interface
+OPTIONS_DEFINE= DOCS
+OPTIONS_DEFAULT=DOCS
+
ALL_TARGET= it
INSTALL_TARGET= setup
@@ -23,6 +26,8 @@ MAKE_JOBS_SAFE= yes
PLIST_FILES= bin/checkpassword
PORTDOCS= CHANGES FILES README SYSDEPS TARGETS TODO VERSION
+.include <bsd.port.pre.mk>
+
post-patch:
@${REINPLACE_CMD} -e "s,gcc,${CC},g" ${WRKSRC}/find-systype.sh
@@ -32,11 +37,11 @@ do-configure:
@${ECHO_CMD} ${PREFIX} >${WRKSRC}/conf-home
post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
${MKDIR} ${DOCSDIR}
.for f in ${PORTDOCS}
${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
.endfor
.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/security/clamav-devel/Makefile b/security/clamav-devel/Makefile
index 6048fa0e9f05..eff0f0c787ac 100644
--- a/security/clamav-devel/Makefile
+++ b/security/clamav-devel/Makefile
@@ -18,7 +18,7 @@ COMMENT= Command line virus scanner written entirely in C
LICENSE= GPLv2
-OPTIONS_DEFINE= ARC ARJ LHA UNZOO UNRAR LLVM TESTS MILTER LDAP ICONV STDERR
+OPTIONS_DEFINE= ARC ARJ LHA UNZOO UNRAR LLVM TESTS MILTER LDAP ICONV STDERR DOCS
ARC_DESC= Enable arch archives support
ARJ_DESC= Enable arj archives support
@@ -30,7 +30,7 @@ TESTS_DESC= Run compile-time tests (req. python)
MILTER_DESC= Compile the milter interface
STDERR_DESC= Print logs to stderr instead of stdout
-OPTIONS_DEFAULT= ARC ARJ LHA UNZOO UNRAR LLVM TESTS
+OPTIONS_DEFAULT= ARC ARJ LHA UNZOO UNRAR LLVM TESTS DOCS
GNU_CONFIGURE= yes
MAKE_JOBS_SAFE= yes
diff --git a/security/clamav/Makefile b/security/clamav/Makefile
index e693e4356fc9..3e163e6e9a8b 100644
--- a/security/clamav/Makefile
+++ b/security/clamav/Makefile
@@ -17,7 +17,7 @@ COMMENT= Command line virus scanner written entirely in C
LICENSE= GPLv2
OPTIONS_DEFINE= ARC ARJ LHA UNZOO UNRAR LLVM TESTS MILTER LDAP ICONV STDERR \
- EXPERIMENTAL
+ EXPERIMENTAL DOCS
ARC_DESC= Enable arch archives support
ARJ_DESC= Enable arj archives support
@@ -30,7 +30,7 @@ MILTER_DESC= Compile the milter interface
STDERR_DESC= Print logs to stderr instead of stdout
EXPERIMENTAL_DESC= Build experimental code
-OPTIONS_DEFAULT= ARC ARJ LHA UNZOO UNRAR LLVM TESTS
+OPTIONS_DEFAULT= ARC ARJ LHA UNZOO UNRAR LLVM TESTS DOCS
GNU_CONFIGURE= yes
MAKE_JOBS_SAFE= yes
diff --git a/security/cmd5checkpw/Makefile b/security/cmd5checkpw/Makefile
index ee20f31e2256..437180ecfbc3 100644
--- a/security/cmd5checkpw/Makefile
+++ b/security/cmd5checkpw/Makefile
@@ -13,11 +13,16 @@ MASTER_SITES= http://beautytech.googlecode.com/svn-history/r6/trunk/src/qmail/ta
MAINTAINER= garga@FreeBSD.org
COMMENT= Checkpassword compatible authentication program that uses CRAM-MD5
+OPTIONS_DEFINE= DOCS
+OPTIONS_DEFAULT=DOCS
+
MAN8= cmd5checkpw.8
PORTDOCS= CHANGES CREDITS INSTALL README rfc1321.txt rfc2104.txt
PLIST_FILES= bin/cmd5checkpw etc/poppasswd.dist
+.include <bsd.port.pre.mk>
+
post-patch:
@${REINPLACE_CMD} -e 's|/etc/poppasswd|${LOCALBASE}/etc/poppasswd|' \
${WRKSRC}/main.c
@@ -29,11 +34,11 @@ do-install:
@${INSTALL_PROGRAM} ${WRKSRC}/cmd5checkpw ${PREFIX}/bin
@${INSTALL_DATA} ${WRKSRC}/poppasswd ${PREFIX}/etc/poppasswd.dist
@${INSTALL_MAN} ${WRKSRC}/cmd5checkpw.8 ${MANPREFIX}/man/man8
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}
. for f in ${PORTDOCS}
@${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
. endfor
.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/security/keychain/Makefile b/security/keychain/Makefile
index 6a73d666a3d3..5cfcb4fdb67d 100644
--- a/security/keychain/Makefile
+++ b/security/keychain/Makefile
@@ -15,6 +15,9 @@ MASTER_SITE_SUBDIR= distfiles
MAINTAINER= garga@FreeBSD.org
COMMENT= A user-friendly front-end to ssh-agent(1)
+OPTIONS_DEFINE= DOCS
+OPTIONS_DEFAULT=DOCS
+
USE_BZIP2= yes
USE_GMAKE= yes
USE_PERL5_BUILD= yes
@@ -25,6 +28,8 @@ PLIST_FILES= bin/keychain
PORTDOCS= ChangeLog README.rst
+.include <bsd.port.pre.mk>
+
.if !exists(${LOCALBASE}/bin/ssh-agent) && !exists(/usr/bin/ssh-agent)
RUN_DEPENDS+= ssh-agent:${PORTSDIR}/security/openssh-portable
.endif
@@ -32,11 +37,11 @@ RUN_DEPENDS+= ssh-agent:${PORTSDIR}/security/openssh-portable
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/keychain ${PREFIX}/bin/keychain
${INSTALL_MAN} ${WRKSRC}/keychain.1 ${PREFIX}/man/man1
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}
.for f in ${PORTDOCS}
${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
.endfor
.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/security/scanhill/Makefile b/security/scanhill/Makefile
index 2a38a431e5ee..baa7e7f8a528 100644
--- a/security/scanhill/Makefile
+++ b/security/scanhill/Makefile
@@ -23,7 +23,8 @@ MAKE_JOBS_SAFE= yes
PORTDOCS= README.txt INSTALL.txt mysql.sql
-OPTIONS_DEFINE= MYSQL
+OPTIONS_DEFINE= MYSQL DOCS
+OPTIONS_DEFAULT=DOCS
.include <bsd.port.pre.mk>
diff --git a/sysutils/wmcube-gdk/Makefile b/sysutils/wmcube-gdk/Makefile
index 75642f4b4ecb..ff20cf49270f 100644
--- a/sysutils/wmcube-gdk/Makefile
+++ b/sysutils/wmcube-gdk/Makefile
@@ -16,6 +16,9 @@ DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
MAINTAINER= garga@FreeBSD.org
COMMENT= A modified version of the dockapp wmCube
+OPTIONS_DEFINE= DOCS
+OPTIONS_DEFAULT=DOCS
+
USE_XORG= xpm
USE_GNOME= gtk12
MAKEFILE= Makefile.FREEBSD
@@ -26,6 +29,8 @@ DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
PORTDOCS= CHANGES README README.GDK TODO
+.include <bsd.port.pre.mk>
+
do-install:
@${INSTALL_PROGRAM} -m 2755 -o root -g kmem ${WRKSRC}/wmcube \
${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX}
@@ -35,12 +40,12 @@ post-install:
@${MKDIR} ${DATADIR}
@${INSTALL_DATA} ${WRKSRC}/3dObjects/${files} ${DATADIR}
.endfor
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}
. for doc in ${PORTDOCS}
@${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
. endfor
-.endif #NOPORTDOCS
+.endif
@${CAT} ${PKGMESSAGE}
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/sysutils/wmcube/Makefile b/sysutils/wmcube/Makefile
index c349cef8016a..2d7c1e6a8739 100644
--- a/sysutils/wmcube/Makefile
+++ b/sysutils/wmcube/Makefile
@@ -17,6 +17,9 @@ MASTER_SITE_SUBDIR= x11/dock
MAINTAINER= garga@FreeBSD.org
COMMENT= Window Maker dockapp that displays cpu load and a realtime 3D object
+OPTIONS_DEFINE= DOCS
+OPTIONS_DEFAULT=DOCS
+
WRKSRC= ${WRKDIR}/${PORTNAME}/${PORTNAME}
USE_XORG= xpm
MAKEFILE= Makefile.FREEBSD
@@ -25,6 +28,8 @@ SUB_FILES= pkg-message
USE_CSTD= gnu89
MAKE_JOBS_UNSAFE= yes
+.include <bsd.port.pre.mk>
+
do-install:
@${INSTALL_PROGRAM} ${WRKSRC}/wmcube ${PREFIX}/bin
@${CHMOD} g+s ${PREFIX}/bin/wmcube
@@ -36,7 +41,7 @@ post-install:
@${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} -m 555 ${DATADIR}
@${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/3dObjects/${file} ${DATADIR}
.endfor
-.ifndef(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${ECHO} "===> Installing README in ${PREFIX}/share/doc/${PORTNAME}"
@${ECHO} "===> Please Read pkg-descr and README for usage information"
@${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} -m 555 ${DOCSDIR}
@@ -46,4 +51,4 @@ post-install:
.endif
@${CAT} ${PKGMESSAGE}
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/dansguardian-devel/Makefile b/www/dansguardian-devel/Makefile
index df101f97f3d0..02d5455f8270 100644
--- a/www/dansguardian-devel/Makefile
+++ b/www/dansguardian-devel/Makefile
@@ -34,8 +34,8 @@ MAN8= dansguardian.8
PORTDOCS= *
-OPTIONS_DEFINE= APACHE TRICKLE CLISCAN CLAMD ICAP KAV NTLM EMAIL DEBUG SSL
-OPTIONS_DEFAULT=APACHE TRICKLE
+OPTIONS_DEFINE= APACHE TRICKLE CLISCAN CLAMD ICAP KAV NTLM EMAIL DEBUG SSL DOCS
+OPTIONS_DEFAULT=APACHE TRICKLE DOCS
APACHE_DESC= Enable Apache support for access denied page
TRICKLE_DESC= Enable the trickle download manager
diff --git a/www/dansguardian/Makefile b/www/dansguardian/Makefile
index d5abe304d5d1..0218377f95b0 100644
--- a/www/dansguardian/Makefile
+++ b/www/dansguardian/Makefile
@@ -34,8 +34,8 @@ MAN8= dansguardian.8
PORTDOCS= *
-OPTIONS_DEFINE= APACHE TRICKLE CLISCAN CLAMD ICAP KAV NTLM EMAIL DEBUG
-OPTIONS_DEFAULT=APACHE TRICKLE
+OPTIONS_DEFINE= APACHE TRICKLE CLISCAN CLAMD ICAP KAV NTLM EMAIL DEBUG DOCS
+OPTIONS_DEFAULT=APACHE TRICKLE DOCS
APACHE_DESC= Enable Apache support for access denied page
TRICKLE_DESC= Enable the trickle download manager
diff --git a/www/sarg/Makefile b/www/sarg/Makefile
index 2df58e773b8c..3574624948e9 100644
--- a/www/sarg/Makefile
+++ b/www/sarg/Makefile
@@ -17,8 +17,8 @@ COMMENT= Squid log analyzer and HTML report generator
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE
-OPTIONS_DEFINE= GD PHP
-OPTIONS_DEFAULT=GD PHP
+OPTIONS_DEFINE= GD PHP NLS
+OPTIONS_DEFAULT=GD PHP NLS
GD_DESC= Enable GD support
PHP_DESC= Install PHP for reporting generating
diff --git a/x11-wm/awesome/Makefile b/x11-wm/awesome/Makefile
index e62868041ada..48c3f571fecf 100644
--- a/x11-wm/awesome/Makefile
+++ b/x11-wm/awesome/Makefile
@@ -52,8 +52,8 @@ MANLANG= "" de es fr
MANCOMPRESSED= yes
PORTDOCS= AUTHORS BUGS LICENSE README
-OPTIONS_DEFINE= DBUS
-OPTIONS_DEFAULT=DBUS
+OPTIONS_DEFINE= DBUS DOCS
+OPTIONS_DEFAULT=DBUS DOCS
.include <bsd.port.pre.mk>
diff --git a/x11/gmrun/Makefile b/x11/gmrun/Makefile
index 554b8626208a..96cec3ec6a11 100644
--- a/x11/gmrun/Makefile
+++ b/x11/gmrun/Makefile
@@ -16,6 +16,9 @@ COMMENT= A customizable program to run programs, with tab-completion
LIB_DEPENDS= popt:${PORTSDIR}/devel/popt
+OPTIONS_DEFINE= DOCS
+OPTIONS_DEFAULT=DOCS
+
USE_GNOME= gtk20
USE_GMAKE= yes
GNU_CONFIGURE= yes
@@ -40,7 +43,7 @@ post-patch:
.endif
post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
.endif