svn commit: r365357 - in head: Mk/Uses devel/abi-compliance-checker devel/cppcheck games/sauerbraten www/uzbl

[Antoine Brodin]

Author: antoine
Date: Mon Aug 18 22:10:39 2014
New Revision: 365357
URL: http://svnweb.freebsd.org/changeset/ports/365357
QAT: https://qat.redports.org/buildarchive/r365357/

Log:
  Remove a few remaining NOPORTDATA
  
  With hat:	portmgr

Modified:
  head/Mk/Uses/cran.mk
  head/devel/abi-compliance-checker/Makefile
  head/devel/cppcheck/Makefile
  head/games/sauerbraten/Makefile
  head/www/uzbl/Makefile

Modified: head/Mk/Uses/cran.mk
==============================================================================
--- head/Mk/Uses/cran.mk	Mon Aug 18 21:58:23 2014	(r365356)
+++ head/Mk/Uses/cran.mk	Mon Aug 18 22:10:39 2014	(r365357)
@@ -65,11 +65,7 @@ regression-test: build
 
 .if !target(do-install)
 R_POSTCMD_INSTALL_OPTIONS+=	-l ${STAGEDIR}${PREFIX}/${R_LIB_DIR}
-.if defined(NOPORTDATA)
-R_POSTCMD_INSTALL_OPTIONS+=	--no-data --no-demo
-.else
 R_POSTCMD_INSTALL_OPTIONS+=	--install-tests
-.endif
 
 .if defined(NOPORTDOCS)
 R_POSTCMD_INSTALL_OPTIONS+=	--no-docs --no-html

Modified: head/devel/abi-compliance-checker/Makefile
==============================================================================
--- head/devel/abi-compliance-checker/Makefile	Mon Aug 18 21:58:23 2014	(r365356)
+++ head/devel/abi-compliance-checker/Makefile	Mon Aug 18 22:10:39 2014	(r365357)
@@ -45,9 +45,7 @@ PICFLAG?=	-fPIC
 PICFLAG?=	-fpic
 .endif
 
-.ifndef(NOPORTDATA)
 PORTDATA=	*
-.endif
 
 PORTDOCS=	*
 
@@ -70,11 +68,9 @@ do-install:
 	@${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.pl ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR})
-.ifndef(NOPORTDATA)
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	@(cd ${WRKSRC} && ${COPYTREE_SHARE} \
 	"modules/Internals modules/*.xml modules/Targets/unix" ${STAGEDIR}${DATADIR})
-.endif
 
 .if defined(MAINTAINER_MODE) || defined(PACKAGE_BUILDING)
 check regression-test test: build

Modified: head/devel/cppcheck/Makefile
==============================================================================
--- head/devel/cppcheck/Makefile	Mon Aug 18 21:58:23 2014	(r365356)
+++ head/devel/cppcheck/Makefile	Mon Aug 18 22:10:39 2014	(r365357)
@@ -29,10 +29,8 @@ PLIST_FILES=	bin/cppcheck bin/cppcheck-h
 
 .include <bsd.port.options.mk>
 
-.ifndef(NOPORTDATA)
 MAKE_ENV+=	CFGDIR="${DATADIR}/cfg"
 PORTDATA=	*
-.endif
 
 .if ${PORT_OPTIONS:MMANPAGES}
 ALL_TARGET+=	man
@@ -80,10 +78,8 @@ post-patch:
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/cppcheck ${STAGEDIR}${PREFIX}/bin
 	@${INSTALL_SCRIPT} ${WRKSRC}/htmlreport/cppcheck-htmlreport ${STAGEDIR}${PREFIX}/bin
-.ifndef(NOPORTDATA)
 	@${MKDIR} ${STAGEDIR}${DATADIR}/cfg
 	@cd ${WRKSRC}/cfg; ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/cfg/
-.endif
 
 check regression-test test: build
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test

Modified: head/games/sauerbraten/Makefile
==============================================================================
--- head/games/sauerbraten/Makefile	Mon Aug 18 21:58:23 2014	(r365356)
+++ head/games/sauerbraten/Makefile	Mon Aug 18 22:10:39 2014	(r365357)
@@ -73,10 +73,8 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/sauer_${f} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/sauer_${f} ${STAGEDIR}${PREFIX}/libexec
 .endfor
-.if !defined(NOPORTDATA)
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDATA}" ${STAGEDIR}${DATADIR}
-.endif
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 

Modified: head/www/uzbl/Makefile
==============================================================================
--- head/www/uzbl/Makefile	Mon Aug 18 21:58:23 2014	(r365356)
+++ head/www/uzbl/Makefile	Mon Aug 18 22:10:39 2014	(r365357)
@@ -36,9 +36,7 @@ PORTDOCS=	AUTHORS README COMMUNITY CONTR
 		multiple-instances-management performance url-editing config.h vim
 .endif
 
-.if !defined(NOPORTDATA)
 PORTDATA=	examples
-.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|/usr/local|${PREFIX}|" \
@@ -74,7 +72,6 @@ do-install:
 .endfor
 	(cd ${WRKSRC}/extras && ${COPYTREE_SHARE} vim ${STAGEDIR}${DOCSDIR})
 .endif
-.if !defined(NOPORTDATA)
 	${MKDIR} ${STAGEDIR}${DATADIR}/examples/data/dforms ${STAGEDIR}${DATADIR}/examples/config
 .for f in data/bookmarks \
 	data/dforms/bbs.archlinux.org \
@@ -86,6 +83,5 @@ do-install:
 		${COPYTREE_BIN} plugins ${STAGEDIR}${DATADIR}/examples/data/)
 	(cd ${WRKSRC}/examples/data && \
 		${COPYTREE_BIN} scripts ${STAGEDIR}${DATADIR}/examples/data/)
-.endif
 
 .include <bsd.port.mk>