From 9e675b852ad2f7b30ad413c4cf140777c4a22881 Mon Sep 17 00:00:00 2001
From: Adam Weinberger <adamw@FreeBSD.org>
Date: Sat, 5 Jul 2014 00:20:38 +0000
Subject: [PATCH] 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)
---
 french/dico/Makefile      | 6 +++++-
 french/facturier/Makefile | 7 ++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/french/dico/Makefile b/french/dico/Makefile
index 115d99fb4fe8..4db1596c19a8 100644
--- a/french/dico/Makefile
+++ b/french/dico/Makefile
@@ -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
 
diff --git a/french/facturier/Makefile b/french/facturier/Makefile
index 9fc2345e12cd..71a0913d6645 100644
--- a/french/facturier/Makefile
+++ b/french/facturier/Makefile
@@ -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}."