Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 3 Aug 2012 15:34:46 +0000 (UTC)
From:      Renato Botelho <garga@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r301957 - in head: archivers/arj archivers/sharutils converters/tnef devel/libslang2 editors/jed ftp/ftpmirror mail/qmail-contrib mail/qmhandle mail/queue-fix math/slgrace net/rinetd ne...
Message-ID:  <201208031534.q73FYkMH039102@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: garga
Date: Fri Aug  3 15:34:45 2012
New Revision: 301957
URL: http://svn.freebsd.org/changeset/ports/301957

Log:
  Add DOCS, EXAMPLES and NLS to OPTIONS_DEFINE to my ports

Modified:
  head/archivers/arj/Makefile
  head/archivers/sharutils/Makefile
  head/converters/tnef/Makefile
  head/devel/libslang2/Makefile
  head/editors/jed/Makefile
  head/ftp/ftpmirror/Makefile
  head/mail/qmail-contrib/Makefile
  head/mail/qmhandle/Makefile
  head/mail/queue-fix/Makefile
  head/math/slgrace/Makefile
  head/net/rinetd/Makefile
  head/net/wmnd/Makefile
  head/security/checkpassword/Makefile
  head/security/clamav-devel/Makefile
  head/security/clamav/Makefile
  head/security/cmd5checkpw/Makefile
  head/security/keychain/Makefile
  head/security/scanhill/Makefile
  head/sysutils/wmcube-gdk/Makefile
  head/sysutils/wmcube/Makefile
  head/www/dansguardian-devel/Makefile
  head/www/dansguardian/Makefile
  head/www/sarg/Makefile
  head/x11-wm/awesome/Makefile
  head/x11/gmrun/Makefile

Modified: head/archivers/arj/Makefile
==============================================================================
--- head/archivers/arj/Makefile	Fri Aug  3 15:28:08 2012	(r301956)
+++ head/archivers/arj/Makefile	Fri Aug  3 15:34:45 2012	(r301957)
@@ -14,6 +14,9 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
 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 re
 
 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

Modified: head/archivers/sharutils/Makefile
==============================================================================
--- head/archivers/sharutils/Makefile	Fri Aug  3 15:28:08 2012	(r301956)
+++ head/archivers/sharutils/Makefile	Fri Aug  3 15:34:45 2012	(r301957)
@@ -16,6 +16,9 @@ COMMENT=	Pack, send, and unpack shell ar
 
 LICENSE=	GPLv3
 
+OPTIONS_DEFINE=	NLS
+OPTIONS_DEFAULT=NLS
+
 USE_BZIP2=	yes
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes

Modified: head/converters/tnef/Makefile
==============================================================================
--- head/converters/tnef/Makefile	Fri Aug  3 15:28:08 2012	(r301956)
+++ head/converters/tnef/Makefile	Fri Aug  3 15:34:45 2012	(r301957)
@@ -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>

Modified: head/devel/libslang2/Makefile
==============================================================================
--- head/devel/libslang2/Makefile	Fri Aug  3 15:28:08 2012	(r301956)
+++ head/devel/libslang2/Makefile	Fri Aug  3 15:34:45 2012	(r301957)
@@ -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
 

Modified: head/editors/jed/Makefile
==============================================================================
--- head/editors/jed/Makefile	Fri Aug  3 15:28:08 2012	(r301956)
+++ head/editors/jed/Makefile	Fri Aug  3 15:34:45 2012	(r301957)
@@ -21,8 +21,8 @@ LIB_DEPENDS=	slang:${PORTSDIR}/devel/lib
 
 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

Modified: head/ftp/ftpmirror/Makefile
==============================================================================
--- head/ftp/ftpmirror/Makefile	Fri Aug  3 15:28:08 2012	(r301956)
+++ head/ftp/ftpmirror/Makefile	Fri Aug  3 15:34:45 2012	(r301957)
@@ -16,15 +16,16 @@ COMMENT=	An utility to mirror directory 
 
 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>

Modified: head/mail/qmail-contrib/Makefile
==============================================================================
--- head/mail/qmail-contrib/Makefile	Fri Aug  3 15:28:08 2012	(r301956)
+++ head/mail/qmail-contrib/Makefile	Fri Aug  3 15:34:45 2012	(r301957)
@@ -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

Modified: head/mail/qmhandle/Makefile
==============================================================================
--- head/mail/qmhandle/Makefile	Fri Aug  3 15:28:08 2012	(r301956)
+++ head/mail/qmhandle/Makefile	Fri Aug  3 15:34:45 2012	(r301957)
@@ -14,6 +14,9 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
 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>

Modified: head/mail/queue-fix/Makefile
==============================================================================
--- head/mail/queue-fix/Makefile	Fri Aug  3 15:28:08 2012	(r301956)
+++ head/mail/queue-fix/Makefile	Fri Aug  3 15:34:45 2012	(r301957)
@@ -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
 

Modified: head/math/slgrace/Makefile
==============================================================================
--- head/math/slgrace/Makefile	Fri Aug  3 15:28:08 2012	(r301956)
+++ head/math/slgrace/Makefile	Fri Aug  3 15:34:45 2012	(r301957)
@@ -20,6 +20,9 @@ COMMENT=	A SLang module to plot graphs w
 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

Modified: head/net/rinetd/Makefile
==============================================================================
--- head/net/rinetd/Makefile	Fri Aug  3 15:28:08 2012	(r301956)
+++ head/net/rinetd/Makefile	Fri Aug  3 15:34:45 2012	(r301957)
@@ -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>

Modified: head/net/wmnd/Makefile
==============================================================================
--- head/net/wmnd/Makefile	Fri Aug  3 15:28:08 2012	(r301956)
+++ head/net/wmnd/Makefile	Fri Aug  3 15:34:45 2012	(r301957)
@@ -16,6 +16,9 @@ COMMENT=	Improved network monitoring doc
 
 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>

Modified: head/security/checkpassword/Makefile
==============================================================================
--- head/security/checkpassword/Makefile	Fri Aug  3 15:28:08 2012	(r301956)
+++ head/security/checkpassword/Makefile	Fri Aug  3 15:34:45 2012	(r301957)
@@ -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>

Modified: head/security/clamav-devel/Makefile
==============================================================================
--- head/security/clamav-devel/Makefile	Fri Aug  3 15:28:08 2012	(r301956)
+++ head/security/clamav-devel/Makefile	Fri Aug  3 15:34:45 2012	(r301957)
@@ -18,7 +18,7 @@ COMMENT=	Command line virus scanner writ
 
 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.
 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

Modified: head/security/clamav/Makefile
==============================================================================
--- head/security/clamav/Makefile	Fri Aug  3 15:28:08 2012	(r301956)
+++ head/security/clamav/Makefile	Fri Aug  3 15:34:45 2012	(r301957)
@@ -17,7 +17,7 @@ COMMENT=	Command line virus scanner writ
 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 interfa
 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

Modified: head/security/cmd5checkpw/Makefile
==============================================================================
--- head/security/cmd5checkpw/Makefile	Fri Aug  3 15:28:08 2012	(r301956)
+++ head/security/cmd5checkpw/Makefile	Fri Aug  3 15:34:45 2012	(r301957)
@@ -13,11 +13,16 @@ MASTER_SITES=	http://beautytech.googleco
 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>

Modified: head/security/keychain/Makefile
==============================================================================
--- head/security/keychain/Makefile	Fri Aug  3 15:28:08 2012	(r301956)
+++ head/security/keychain/Makefile	Fri Aug  3 15:34:45 2012	(r301957)
@@ -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}/secu
 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>

Modified: head/security/scanhill/Makefile
==============================================================================
--- head/security/scanhill/Makefile	Fri Aug  3 15:28:08 2012	(r301956)
+++ head/security/scanhill/Makefile	Fri Aug  3 15:34:45 2012	(r301957)
@@ -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>
 

Modified: head/sysutils/wmcube-gdk/Makefile
==============================================================================
--- head/sysutils/wmcube-gdk/Makefile	Fri Aug  3 15:28:08 2012	(r301956)
+++ head/sysutils/wmcube-gdk/Makefile	Fri Aug  3 15:34:45 2012	(r301957)
@@ -16,6 +16,9 @@ DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}-${
 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}${PK
 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>

Modified: head/sysutils/wmcube/Makefile
==============================================================================
--- head/sysutils/wmcube/Makefile	Fri Aug  3 15:28:08 2012	(r301956)
+++ head/sysutils/wmcube/Makefile	Fri Aug  3 15:34:45 2012	(r301957)
@@ -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>

Modified: head/www/dansguardian-devel/Makefile
==============================================================================
--- head/www/dansguardian-devel/Makefile	Fri Aug  3 15:28:08 2012	(r301956)
+++ head/www/dansguardian-devel/Makefile	Fri Aug  3 15:34:45 2012	(r301957)
@@ -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

Modified: head/www/dansguardian/Makefile
==============================================================================
--- head/www/dansguardian/Makefile	Fri Aug  3 15:28:08 2012	(r301956)
+++ head/www/dansguardian/Makefile	Fri Aug  3 15:34:45 2012	(r301957)
@@ -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

Modified: head/www/sarg/Makefile
==============================================================================
--- head/www/sarg/Makefile	Fri Aug  3 15:28:08 2012	(r301956)
+++ head/www/sarg/Makefile	Fri Aug  3 15:34:45 2012	(r301957)
@@ -17,8 +17,8 @@ COMMENT=	Squid log analyzer and HTML rep
 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

Modified: head/x11-wm/awesome/Makefile
==============================================================================
--- head/x11-wm/awesome/Makefile	Fri Aug  3 15:28:08 2012	(r301956)
+++ head/x11-wm/awesome/Makefile	Fri Aug  3 15:34:45 2012	(r301957)
@@ -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>
 

Modified: head/x11/gmrun/Makefile
==============================================================================
--- head/x11/gmrun/Makefile	Fri Aug  3 15:28:08 2012	(r301956)
+++ head/x11/gmrun/Makefile	Fri Aug  3 15:34:45 2012	(r301957)
@@ -16,6 +16,9 @@ COMMENT=	A customizable program to run p
 
 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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208031534.q73FYkMH039102>