Date: Wed, 17 Aug 2016 12:16:24 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r420340 - head/Mk Message-ID: <201608171216.u7HCGOkE017601@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Wed Aug 17 12:16:24 2016 New Revision: 420340 URL: https://svnweb.freebsd.org/changeset/ports/420340 Log: Move USE_BDB and PLIST_DIRSTRY to the unsupported section, all the ports have been converted. Sponsored by: Absolight Modified: head/Mk/bsd.options.mk (contents, props changed) head/Mk/bsd.port.mk (contents, props changed) head/Mk/bsd.sanity.mk (contents, props changed) head/Mk/bsd.tex.mk (contents, props changed) Modified: head/Mk/bsd.options.mk ============================================================================== --- head/Mk/bsd.options.mk Wed Aug 17 12:10:09 2016 (r420339) +++ head/Mk/bsd.options.mk Wed Aug 17 12:16:24 2016 (r420340) @@ -138,7 +138,7 @@ # CONFLICTS_INSTALL CPPFLAGS CXXFLAGS DESKTOP_ENTRIES DISTFILES EXTRA_PATCHES # EXTRACT_ONLY GH_ACCOUNT GH_PROJECT GH_TAGNAME IGNORE INFO INSTALL_TARGET # LDFLAGS LIBS MAKE_ARGS MAKE_ENV PATCHFILES PATCH_SITES PLIST_DIRS -# PLIST_DIRSTRY PLIST_FILES PLIST_SUB PORTDOCS PORTEXAMPLES SUB_FILES SUB_LIST +# PLIST_FILES PLIST_SUB PORTDOCS PORTEXAMPLES SUB_FILES SUB_LIST # TEST_TARGET USES, # defining ${opt}_${variable} will add its content to the actual variable when # the option is enabled. Defining ${opt}_${variable}_OFF will add its content @@ -165,7 +165,7 @@ _OPTIONS_FLAGS= ALL_TARGET BROKEN CATEGO DESKTOP_ENTRIES DISTFILES EXTRA_PATCHES EXTRACT_ONLY \ GH_ACCOUNT GH_PROJECT GH_TAGNAME GH_TUPLE IGNORE INFO \ INSTALL_TARGET LDFLAGS LIBS MAKE_ARGS MAKE_ENV MASTER_SITES \ - PATCHFILES PATCH_SITES PLIST_DIRS PLIST_DIRSTRY PLIST_FILES \ + PATCHFILES PATCH_SITES PLIST_DIRS PLIST_FILES \ PLIST_SUB PORTDOCS PORTEXAMPLES SUB_FILES SUB_LIST \ TEST_TARGET USES _OPTIONS_DEPENDS= PKG FETCH EXTRACT PATCH BUILD LIB RUN Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Wed Aug 17 12:10:09 2016 (r420339) +++ head/Mk/bsd.port.mk Wed Aug 17 12:16:24 2016 (r420340) @@ -1404,10 +1404,6 @@ USES+= gnome USES+= mate .endif -.if defined(USE_BDB) -USES+=bdb:${USE_BDB} -.endif - .if defined(USE_MYSQL) USE_MYSQL:= ${USE_MYSQL:N[yY][eE][sS]:Nclient} .if defined(WANT_MYSQL_VER) @@ -4461,11 +4457,6 @@ generate-plist: ${WRKDIR} ${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} ${PLIST} >> ${TMPPLIST}; \ fi -# Keep PLIST_DIRSTRY as compatibility -.for dir in ${PLIST_DIRS} ${PLIST_DIRSTRY} - @${ECHO_CMD} ${dir} | ${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} -e 's,^,@dir ,' >> ${TMPPLIST} -.endfor - .if defined(USE_LINUX_PREFIX) .if defined(USE_LDCONFIG) @${ECHO_CMD} "@postexec ${LDCONFIG_CMD}" >> ${TMPPLIST} Modified: head/Mk/bsd.sanity.mk ============================================================================== --- head/Mk/bsd.sanity.mk Wed Aug 17 12:10:09 2016 (r420339) +++ head/Mk/bsd.sanity.mk Wed Aug 17 12:16:24 2016 (r420340) @@ -177,9 +177,9 @@ SANITY_UNSUPPORTED= USE_OPENAL USE_FAM U PYDISTUTILS_AUTOPLIST PYTHON_PY3K_PLIST_HACK PYDISTUTILS_NOEGGINFO \ USE_PYTHON_PREFIX USE_BZIP2 USE_XZ USE_PGSQL NEED_ROOT \ UNIQUENAME LATEST_LINK USE_SQLITE USE_FIREBIRD USE_PHPEXT \ - USE_ZENDEXT USE_PHP_BUILD -SANITY_DEPRECATED= PYTHON_PKGNAMESUFFIX USE_AUTOTOOLS PLIST_DIRSTRY \ - USE_BDB USE_MYSQL WANT_MYSQL_VER USE_OPENSSL \ + USE_ZENDEXT USE_PHP_BUILD USE_BDB PLIST_DIRSTRY +SANITY_DEPRECATED= PYTHON_PKGNAMESUFFIX USE_AUTOTOOLS \ + USE_MYSQL WANT_MYSQL_VER USE_OPENSSL \ USE_PHPIZE WANT_PHP_CLI WANT_PHP_CGI WANT_PHP_MOD \ WANT_PHP_WEB WANT_PHP_EMB SANITY_NOTNEEDED= WX_UNICODE Modified: head/Mk/bsd.tex.mk ============================================================================== --- head/Mk/bsd.tex.mk Wed Aug 17 12:10:09 2016 (r420339) +++ head/Mk/bsd.tex.mk Wed Aug 17 12:16:24 2016 (r420340) @@ -271,12 +271,12 @@ do-fmtutil-$F: ${RMDIR} ${STAGEDIR}${PREFIX}/${TEXMFDISTDIR}/web2c || ${TRUE} ${RMDIR} ${STAGEDIR}${PREFIX}/${TEXMFDISTDIR} || ${TRUE} _PLIST_FILES+= ${TEX_FORMAT_${F:tu}_FILES} -_PLIST_DIRSTRY+=${TEX_FORMAT_${F:tu}_DIRS} +_PLIST_DIRS+=${TEX_FORMAT_${F:tu}_DIRS} _PLIST_FILES+= ${TEX_FORMAT_${F:tu}_BIN} . endfor post-install-script: do-fmtutil PLIST_FILES= ${_PLIST_FILES:O:u} -PLIST_DIRSTRY= ${_PLIST_DIRSTRY:O:u} ${TEXMFVARDIR}/web2c +PLIST_DIRS= ${_PLIST_DIRS:O:u} ${TEXMFVARDIR}/web2c .endif .if !empty(USE_TEX:Mupdmap)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201608171216.u7HCGOkE017601>