Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 5 Jul 2014 00:20:38 +0000 (UTC)
From:      Adam Weinberger <adamw@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r360708 - in head/french: dico facturier
Message-ID:  <201407050020.s650KcsB080764@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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}."



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