From owner-svn-ports-head@FreeBSD.ORG  Tue Mar  5 07:40:46 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 6EBF8853;
 Tue,  5 Mar 2013 07:40:46 +0000 (UTC) (envelope-from jgh@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 61B19734;
 Tue,  5 Mar 2013 07:40:46 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r257ekDY081466;
 Tue, 5 Mar 2013 07:40:46 GMT (envelope-from jgh@svn.freebsd.org)
Received: (from jgh@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r257ek99081465;
 Tue, 5 Mar 2013 07:40:46 GMT (envelope-from jgh@svn.freebsd.org)
Message-Id: <201303050740.r257ek99081465@svn.freebsd.org>
From: Jason Helfman <jgh@FreeBSD.org>
Date: Tue, 5 Mar 2013 07:40:46 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r313441 - head/sysutils/bsdadminscripts
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 05 Mar 2013 07:40:46 -0000

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@gid0.org
  Approved by:	maintainer timeout, kamikaze@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@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>