svn commit: r360687 - in head/x11-toolkits: gai hs-wxc slingshot

[Adam Weinberger]

Author: adamw
Date: Fri Jul  4 23:23:36 2014
New Revision: 360687
URL: http://svnweb.freebsd.org/changeset/ports/360687
QAT: https://qat.redports.org/buildarchive/r360687/

Log:
  Remove NOPORTDOCS.

Modified:
  head/x11-toolkits/gai/Makefile
  head/x11-toolkits/hs-wxc/Makefile
  head/x11-toolkits/slingshot/Makefile

Modified: head/x11-toolkits/gai/Makefile
==============================================================================
--- head/x11-toolkits/gai/Makefile	Fri Jul  4 23:20:13 2014	(r360686)
+++ head/x11-toolkits/gai/Makefile	Fri Jul  4 23:23:36 2014	(r360687)
@@ -29,16 +29,16 @@ PLIST_DIRS=	include/gai
 PORTDOCS=	*
 USE_LDCONFIG=	yes
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	@${REINPLACE_CMD} -e "s|sdl-config --|${SDL_CONFIG} --|g; \
 		s|/usr/X11R6|${LOCALBASE}|g" ${WRKSRC}/configure
 
 post-install:
-.if !defined(NOPORTDOCS)
 	cd ${WRKSRC}/docs && \
 	${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${DOCSDIR}/{}" \; && \
 	${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${STAGEDIR}${DOCSDIR}/{}" \;
-.endif
 .for dir in docking examples templates
 	cd ${WRKSRC} && \
 	${FIND} ${dir} -type d -exec ${MKDIR} "${STAGEDIR}${EXAMPLESDIR}/{}" \; && \

Modified: head/x11-toolkits/hs-wxc/Makefile
==============================================================================
--- head/x11-toolkits/hs-wxc/Makefile	Fri Jul  4 23:20:13 2014	(r360686)
+++ head/x11-toolkits/hs-wxc/Makefile	Fri Jul  4 23:23:36 2014	(r360687)
@@ -17,7 +17,7 @@ USE_WX=		3.0
 WX_COMPS=	wx
 WX_UNICODE=	yes
 
-NOPORTDOCS=	yes
+OPTIONS_EXCLUDE=DOCS
 
 post-patch::
 	@${REINPLACE_CMD} 's|"wx-config"|"wxgtk2u-2.9-config"| ; \

Modified: head/x11-toolkits/slingshot/Makefile
==============================================================================
--- head/x11-toolkits/slingshot/Makefile	Fri Jul  4 23:20:13 2014	(r360686)
+++ head/x11-toolkits/slingshot/Makefile	Fri Jul  4 23:23:36 2014	(r360687)
@@ -24,17 +24,19 @@ USES=		gmake
 MAKE_JOBS_UNSAFE=	yes
 MAKE_ENV=	OPENWINHOME=${LOCALBASE}
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
 
 IMAKECPPFLAGS+=	-DXVDestDir=${STAGEDIR}${PREFIX}
 MAKE_ARGS=	STAGEDIR=${STAGEDIR}
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/*.ps ${STAGEDIR}${DOCSDIR}
 	${GZIP_CMD} ${STAGEDIR}${DOCSDIR}/README ${STAGEDIR}${DOCSDIR}/*.ps
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>