svn commit: r360702 - in head/x11-toolkits: mowitz mowitz/files py-kiwi

[Adam Weinberger]

Author: adamw
Date: Sat Jul  5 00:06:55 2014
New Revision: 360702
URL: http://svnweb.freebsd.org/changeset/ports/360702
QAT: https://qat.redports.org/buildarchive/r360702/

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/x11-toolkits/mowitz/Makefile
  head/x11-toolkits/mowitz/files/patch-doc
  head/x11-toolkits/py-kiwi/Makefile

Modified: head/x11-toolkits/mowitz/Makefile
==============================================================================
--- head/x11-toolkits/mowitz/Makefile	Sat Jul  5 00:03:38 2014	(r360701)
+++ head/x11-toolkits/mowitz/Makefile	Sat Jul  5 00:06:55 2014	(r360702)
@@ -19,4 +19,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-xawm=Xaw3d
 INSTALL_TARGET=	install-strip
 
+OPTIONS_DEFINE=	DOCS
+DOCS_MAKE_ENV=	PORTDOCS=yes
+
 .include <bsd.port.mk>

Modified: head/x11-toolkits/mowitz/files/patch-doc
==============================================================================
--- head/x11-toolkits/mowitz/files/patch-doc	Sat Jul  5 00:03:38 2014	(r360701)
+++ head/x11-toolkits/mowitz/files/patch-doc	Sat Jul  5 00:06:55 2014	(r360702)
@@ -4,7 +4,7 @@
  
 -SUBDIRS = Mowitz examples doc
 +SUBDIRS = Mowitz examples
-+.ifndef NOPORTDOCS
++.ifdef PORTDOCS
 +SUBDIRS+= doc
 +.endif
  

Modified: head/x11-toolkits/py-kiwi/Makefile
==============================================================================
--- head/x11-toolkits/py-kiwi/Makefile	Sat Jul  5 00:03:38 2014	(r360701)
+++ head/x11-toolkits/py-kiwi/Makefile	Sat Jul  5 00:06:55 2014	(r360702)
@@ -24,12 +24,17 @@ USE_XZ=	yes
 DOCSDIR=	${PREFIX}/share/doc/${PYTHON_PKGNAMEPREFIX}${PORTNAME}
 EXAMPLESDIR=	${PREFIX}/share/examples/${PYTHON_PKGNAMEPREFIX}${PORTNAME}
 
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
 NO_STAGE=	yes
+
+.include <bsd.port.options.mk>
+
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${DOCSDIR}
 .endif
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${EXAMPLESDIR}
 .endif