svn commit: r313441 - head/sysutils/bsdadminscripts

[Jason Helfman]

Author: jgh
Date: Tue Mar  5 07:40:45 2013
New Revision: 313441
URL: http://svnweb.freebsd.org/changeset/ports/313441

Log:
  - fix NOPORTDOCS installation
  - while here tighten COMMENT and adoption of optionsNG for DOCS
  
  PR:		174590
  PR:		170542
  Submitted by:	olivier at gid0.org
  Approved by:	maintainer timeout, kamikaze at bsdforen.de ( 75 days )

Modified:
  head/sysutils/bsdadminscripts/Makefile

Modified: head/sysutils/bsdadminscripts/Makefile
==============================================================================
--- head/sysutils/bsdadminscripts/Makefile	Tue Mar  5 07:26:03 2013	(r313440)
+++ head/sysutils/bsdadminscripts/Makefile	Tue Mar  5 07:40:45 2013	(r313441)
@@ -8,15 +8,15 @@ CATEGORIES=	sysutils ports-mgmt
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
 
 MAINTAINER=	kamikaze at bsdforen.de
-COMMENT=	A collection of administration scripts
+COMMENT=	Collection of administration scripts
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
 NO_BUILD=	yes
 MANCOMPRESSED=	yes
 
-.if defined(NOPORTDOCS)
-NOPORTDOCS=	-nodoc
-.else
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
 MAN1=		bsdadminscripts.1 \
 		buildflags.mk.1 buildflags.conf.1 buildflags.awk.1 \
 		distviper.1 \
@@ -32,6 +32,8 @@ PORT_SCRIPTS=	build clean fetch package 
 		config-recursive fetch-recursive
 MLINKS+=	${RC_SCRIPTS:S,^,rc,:S,$,.1,:S,^,rcstart.1 ,} \
 		${PORT_SCRIPTS:S,^,port,:S,$,.1,:S,^,portconfig.1 ,}
+.else
+EVALDOCS=           -nodoc
 .endif
 
 plist: patch
@@ -41,6 +43,6 @@ plist: patch
 do-install:
 	@cd ${WRKSRC}; ./install.sh \
 		-prefix=${PREFIX} -ports=${PORTSDIR} -distdir=${DISTDIR}  \
-		-datadir=${DATADIR} ${NOPORTDOCS}
+		-datadir=${DATADIR} ${EVALDOCS}
 
 .include <bsd.port.mk>