diff options
author | joerg <joerg@pkgsrc.org> | 2016-04-10 16:39:27 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2016-04-10 16:39:27 +0000 |
commit | 2cbd07f178c453f1addd2e6952430600e9ef8b97 (patch) | |
tree | ea1bcebaf94574f134b87b95b393c7c2a0a9b785 /lang | |
parent | 0479365b0022911c26a39da3ce8d6bd1a1894dd1 (diff) | |
download | pkgsrc-2cbd07f178c453f1addd2e6952430600e9ef8b97.tar.gz |
Adjust checks for _USE_DESTDIR != no or incorrect references to
USE_DESTDIR.
Diffstat (limited to 'lang')
-rw-r--r-- | lang/ghc7/Makefile | 9 | ||||
-rw-r--r-- | lang/hugs/package.mk | 8 | ||||
-rw-r--r-- | lang/php/pear.mk | 6 | ||||
-rw-r--r-- | lang/python/egg.mk | 5 | ||||
-rw-r--r-- | lang/python/extension.mk | 4 | ||||
-rw-r--r-- | lang/python27/Makefile | 5 | ||||
-rw-r--r-- | lang/ruby/modules.mk | 4 |
7 files changed, 7 insertions, 34 deletions
diff --git a/lang/ghc7/Makefile b/lang/ghc7/Makefile index e76b6a4109e..815f62216fb 100644 --- a/lang/ghc7/Makefile +++ b/lang/ghc7/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2015/08/18 07:31:01 wiz Exp $ +# $NetBSD: Makefile,v 1.23 2016/04/10 16:39:27 joerg Exp $ # ----------------------------------------------------------------------------- # Package metadata # @@ -150,16 +150,9 @@ PRINT_PLIST_AWK+= /lib\/${PKGNAME_NOREV}\/package\.conf\.d/ { next; } # If we were lucky we could just use "PLIST_TYPE = dynamic", but the # feature has seemingly bitrotted. .include "../../mk/bsd.prefs.mk" -.if empty(USE_DESTDIR:M[Yy][Ee][Ss]) GENERATE_PLIST+= \ cd ${PREFIX:Q} && \ ${FIND} lib/${PKGNAME_NOREV}/package.conf.d -xdev -newer ${_COOKIE.extract} \! -type d -print | ${SORT} -d; -.else -GENERATE_PLIST+= \ - cd ${DESTDIR:Q}${PREFIX:Q} && \ - ${FIND} lib/${PKGNAME_NOREV}/package.conf.d -xdev \! -type d -print | ${SORT} -d; -.endif - # ----------------------------------------------------------------------------- # Sanity checks diff --git a/lang/hugs/package.mk b/lang/hugs/package.mk index 3b27682ca58..a8d7cea980a 100644 --- a/lang/hugs/package.mk +++ b/lang/hugs/package.mk @@ -1,4 +1,4 @@ -# $NetBSD: package.mk,v 1.5 2013/04/06 14:58:19 rodent Exp $ +# $NetBSD: package.mk,v 1.6 2016/04/10 16:39:27 joerg Exp $ # PKGNAME= hugs98-${DISTNAME} @@ -28,7 +28,6 @@ do-build: build \ --verbose -.if ${_USE_DESTDIR} != "no" do-install: cd ${WRKSRC} && ${HUGS_RUN} -98 Setup.hs \ copy --verbose --destdir=${DESTDIR} @@ -39,8 +38,3 @@ do-install: ${DESTDIR}${PREFIX}/lib/hugs/packages/$$pkg/packages/$$pkg && \ ${INSTALL_DATA} .installed-pkg-config \ ${DESTDIR}${PREFIX}/lib/hugs/packages/$$pkg/packages/$$pkg/package.conf -.else -do-install: - cd ${WRKSRC} && ${HUGS_RUN} -98 Setup.hs \ - install --verbose -.endif diff --git a/lang/php/pear.mk b/lang/php/pear.mk index 93c4b75f342..542b86f19e6 100644 --- a/lang/php/pear.mk +++ b/lang/php/pear.mk @@ -1,4 +1,4 @@ -# $NetBSD: pear.mk,v 1.29 2016/04/02 08:22:03 jperkin Exp $ +# $NetBSD: pear.mk,v 1.30 2016/04/10 16:39:27 joerg Exp $ # # This Makefile fragment is intended to be included by packages that build # and install pear packages. @@ -44,9 +44,7 @@ DEPENDS+= ${PHP_PKG_PREFIX}-pear-[0-9]*:../../lang/pear PEAR_CMD= ${PREFIX}/bin/pear PEAR_LIB= lib/php -.if ${_USE_DESTDIR} != "no" PEAR_DESTDIR= -P ${DESTDIR} -f -.endif NO_BUILD= yes @@ -63,7 +61,6 @@ PEAR_GENERATE_PLIST= \ ${RM} -f ${PEAR_FILES_SKIP:S/^/${DESTDIR}&/}; GENERATE_PLIST+= ${PEAR_GENERATE_PLIST} -.if ${_USE_DESTDIR} != "no" PEAR_FILES_SKIP+= ${PREFIX}/lib/php/\.channels/\.alias/.*\.txt PEAR_FILES_SKIP+= ${PREFIX}/lib/php/\.channels/.*\.reg PEAR_FILES_SKIP+= ${PREFIX}/lib/php/\.depdb @@ -71,7 +68,6 @@ PEAR_FILES_SKIP+= ${PREFIX}/lib/php/\.depdblock PEAR_FILES_SKIP+= ${PREFIX}/lib/php/\.filemap PEAR_FILES_SKIP+= ${PREFIX}/lib/php/\.lock CHECK_FILES_SKIP+= ${PEAR_FILES_SKIP} -.endif post-extract: @cd ${WRKSRC} && ${LN} -s ${WRKDIR}/package.xml package.xml diff --git a/lang/python/egg.mk b/lang/python/egg.mk index 5da8dd6836e..a93ae10a197 100644 --- a/lang/python/egg.mk +++ b/lang/python/egg.mk @@ -1,4 +1,4 @@ -# $NetBSD: egg.mk,v 1.20 2014/12/31 13:57:28 wiz Exp $ +# $NetBSD: egg.mk,v 1.21 2016/04/10 16:39:28 joerg Exp $ # # Common logic to handle Python Eggs # @@ -34,9 +34,6 @@ PRINT_PLIST_AWK+= { gsub(/${EGG_NAME}-py${PYVERSSUFFIX}-nspkg.pth/, \ "$${EGG_NAME}-nspkg.pth") } _PYSETUPTOOLSINSTALLARGS= --single-version-externally-managed -.if ${_USE_DESTDIR} == "no" -_PYSETUPTOOLSINSTALLARGS+= --root=/ -.endif DEPENDS+= ${PYPKGPREFIX}-setuptools>=0.8:../../devel/py-setuptools diff --git a/lang/python/extension.mk b/lang/python/extension.mk index 92305a74b04..bbb7514bc5a 100644 --- a/lang/python/extension.mk +++ b/lang/python/extension.mk @@ -1,4 +1,4 @@ -# $NetBSD: extension.mk,v 1.41 2015/12/27 21:08:45 wiz Exp $ +# $NetBSD: extension.mk,v 1.42 2016/04/10 16:39:28 joerg Exp $ .include "../../lang/python/pyversion.mk" @@ -21,9 +21,7 @@ PYSETUPARGS?= #empty PYSETUPINSTALLARGS?= #empty PYSETUPOPTARGS?= -c -O1 _PYSETUPINSTALLARGS= ${PYSETUPINSTALLARGS} ${PYSETUPOPTARGS} ${_PYSETUPTOOLSINSTALLARGS} -.if ${_USE_DESTDIR} != "no" _PYSETUPINSTALLARGS+= --root=${DESTDIR:Q} -.endif PY_PATCHPLIST?= yes PYSETUPINSTALLARGS?= #empty PYSETUPTESTTARGET?= test diff --git a/lang/python27/Makefile b/lang/python27/Makefile index 4947e1d48ae..d614b08da83 100644 --- a/lang/python27/Makefile +++ b/lang/python27/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.57 2016/03/05 11:28:44 jperkin Exp $ +# $NetBSD: Makefile,v 1.58 2016/04/10 16:39:27 joerg Exp $ .include "dist.mk" @@ -60,9 +60,6 @@ PLIST_SRC+= ${.CURDIR}/../../lang/python27/PLIST.${OPSYS} PLIST_SRC+= ${.CURDIR}/../../lang/python27/PLIST.common_end .if ${OPSYS} == "NetBSD" -. if !defined(USE_DESTDIR) || empty(USE_DESTDIR:M[Yy][Ee][Ss]) -PRIVILEGED_STAGES+= clean -. endif # XXX work around a botched autoconf check which ignores libintl CONFIGURE_ENV+= ac_cv_func_bind_textdomain_codeset=yes .endif diff --git a/lang/ruby/modules.mk b/lang/ruby/modules.mk index 0946123052b..6da78601f4a 100644 --- a/lang/ruby/modules.mk +++ b/lang/ruby/modules.mk @@ -1,4 +1,4 @@ -# $NetBSD: modules.mk,v 1.36 2015/11/25 12:51:17 jperkin Exp $ +# $NetBSD: modules.mk,v 1.37 2016/04/10 16:39:28 joerg Exp $ .if !defined(_RUBY_MODULE_MK) _RUBY_MODULE_MK= # defined @@ -149,9 +149,7 @@ ruby-setup-build: do-install: ruby-setup-install _RUBY_SETUP_INSTALLARGS= ${INSTALL_TARGET} -.if ${_USE_DESTDIR} != "no" _RUBY_SETUP_INSTALLARGS+= --prefix=${DESTDIR:Q} -.endif ruby-setup-install: @${ECHO_MSG} "===> Running ${RUBY_SETUP} to ${INSTALL_TARGET}" |