From owner-svn-ports-all@FreeBSD.ORG  Sat Jul  5 00:20:39 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 728E4D37;
 Sat,  5 Jul 2014 00:20:39 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4750D21E3;
 Sat,  5 Jul 2014 00:20:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s650Kd8B080768;
 Sat, 5 Jul 2014 00:20:39 GMT (envelope-from adamw@svn.freebsd.org)
Received: (from adamw@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s650KcsB080764;
 Sat, 5 Jul 2014 00:20:38 GMT (envelope-from adamw@svn.freebsd.org)
Message-Id: <201407050020.s650KcsB080764@svn.freebsd.org>
From: Adam Weinberger <adamw@FreeBSD.org>
Date: Sat, 5 Jul 2014 00:20:38 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r360708 - in head/french: dico facturier
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 05 Jul 2014 00:20:39 -0000

Author: adamw
Date: Sat Jul  5 00:20:38 2014
New Revision: 360708
URL: http://svnweb.freebsd.org/changeset/ports/360708
QAT: https://qat.redports.org/buildarchive/r360708/

Log:
  Remove NOPORTDOCS and NOPORTEXAMPLES from unstaged ports. Stage a couple while
  we're here. Remove any other references to NOPORT*.
  
  Approved by:	portmgr (blanket for modernization)

Modified:
  head/french/dico/Makefile
  head/french/facturier/Makefile

Modified: head/french/dico/Makefile
==============================================================================
--- head/french/dico/Makefile	Sat Jul  5 00:19:11 2014	(r360707)
+++ head/french/dico/Makefile	Sat Jul  5 00:20:38 2014	(r360708)
@@ -28,6 +28,8 @@ REINPLACE_SUB=	PREFIX=${PREFIX}
 # Post-patch
 #
 
+OPTIONS_DEFINE=	DOCS
+
 NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} ${REINPLACE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
@@ -42,8 +44,10 @@ pre-configure:
 # Post-install
 #
 
+.include <bsd.port.options.mk>
+
 post-install:
-.if defined(NOPORTDOCS)
+.if empty(PORT_OPTIONS:MDOCS)
 	@${RM} -rf ${DOCSDIR}
 .endif
 

Modified: head/french/facturier/Makefile
==============================================================================
--- head/french/facturier/Makefile	Sat Jul  5 00:19:11 2014	(r360707)
+++ head/french/facturier/Makefile	Sat Jul  5 00:20:38 2014	(r360708)
@@ -46,7 +46,12 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 TRASHFILES=	lib/Conf.pm~ cgi-bin/.articlemodif.cgi.swp lib/.Conf.pm.swp	\
 		html/UNGI/Editfacturemaj.pm.back html/temp/log_facture.gif.back
 
+OPTIONS_DEFINE=	DOCS
+
 NO_STAGE=	yes
+
+.include <bsd.port.options.mk>
+
 pre-everything::
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "Vous pouvez définir trois variables :"
@@ -102,7 +107,7 @@ do-install:
 		${ECHO_CMD} "Include ${ETCDIR}" >> ${APACHE_CONF} ; \
 	fi)
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}/
 	@${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}/
 	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."