Adjust checks for _USE_DESTDIR != no or incorrect references to

USE_DESTDIR.

14 files changed, 25 insertions, 69 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}"
diff --git a/mail/mhonarc/Makefile b/mail/mhonarc/Makefile
index 88a1e286f08..ecdfc7c0399 100644
--- a/mail/mhonarc/Makefile
+++ b/mail/mhonarc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2015/09/26 14:30:24 bouyer Exp $
+# $NetBSD: Makefile,v 1.40 2016/04/10 16:39:28 joerg Exp $
 
 DISTNAME=	MHonArc-2.6.19
 PKGNAME=	mhonarc-2.6.19
@@ -25,9 +25,7 @@ MY_INSTALL_FLAGS+=	-binpath ${PREFIX}/bin
 MY_INSTALL_FLAGS+=	-libpath ${PREFIX}/lib/mhonarc
 MY_INSTALL_FLAGS+=	-docpath ${PREFIX}/share/doc/mhonarc
 MY_INSTALL_FLAGS+=	-manpath ${PREFIX}/${PKGMANDIR}
-.if defined(_USE_DESTDIR) && ${_USE_DESTDIR} != "no"
 MY_INSTALL_FLAGS+=	-root ${DESTDIR}
-.endif
 MY_INSTALL_FLAGS+=	-batch
 
 do-install:
diff --git a/mail/postfix/Makefile.common b/mail/postfix/Makefile.common
index 1d9d796a083..115e76356eb 100644
--- a/mail/postfix/Makefile.common
+++ b/mail/postfix/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1 2015/09/07 09:47:01 fhajny Exp $
+# $NetBSD: Makefile.common,v 1.2 2016/04/10 16:39:28 joerg Exp $
 # used by mail/postfix/Makefile
 # used by mail/postfix/Makefile.module
 
@@ -115,9 +115,7 @@ CCARGS+=		-DNO_NISPLUS
 
 CFLAGS.SunOS+=		-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
 
-.if !empty(USE_DESTDIR:M[Yy][Ee][Ss])
 DESTDIR_INSTALLOPTIONS=-package install_root="${DESTDIR}"
-.endif
 
 do-configure:
 	cd ${WRKSRC} &&							\
diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
index 8a717df18a5..fba3ed10319 100644
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2016/03/05 11:28:50 jperkin Exp $
+# $NetBSD: Makefile,v 1.76 2016/04/10 16:39:28 joerg Exp $
 #
 
 DISTNAME=		${PKGNAME_NOREV}
@@ -146,19 +146,17 @@ post-extract: post-extract-viruscan
 .endif
 
 pre-install:
-.	if ${USE_DESTDIR} != "no"
-	  ${MKDIR} ${DESTDIR}${QMAILDIR}
-	  ${MKDIR} ${DESTDIR}${QMAIL_QUEUE_DIR}
-	  # keep in sync with INSTALL:PRE-INSTALL
-	  ${LN} -s ${DESTDIR}${EGDIR}/alias	${DESTDIR}${QMAILDIR}/alias
-	  ${LN} -s ${DESTDIR}${PREFIX}/bin	${DESTDIR}${QMAILDIR}/bin
-	  ${LN} -s ${DESTDIR}${EGDIR}/boot	${DESTDIR}${QMAILDIR}/boot
-	  ${LN} -s ${DESTDIR}${EGDIR}/control	${DESTDIR}${QMAILDIR}/control
-	  ${LN} -s ${DESTDIR}${DOCDIR}		${DESTDIR}${QMAILDIR}/doc
-	  ${LN} -s ${DESTDIR}${PREFIX}/${PKGMANDIR} ${DESTDIR}${QMAILDIR}/man
-	  ${LN} -s ${DESTDIR}${QMAIL_QUEUE_DIR}	${DESTDIR}${QMAILDIR}/queue
-	  ${LN} -s ${DESTDIR}${EGDIR}/users	${DESTDIR}${QMAILDIR}/users
-.	endif
+	${MKDIR} ${DESTDIR}${QMAILDIR}
+	${MKDIR} ${DESTDIR}${QMAIL_QUEUE_DIR}
+	# keep in sync with INSTALL:PRE-INSTALL
+	${LN} -s ${DESTDIR}${EGDIR}/alias	${DESTDIR}${QMAILDIR}/alias
+	${LN} -s ${DESTDIR}${PREFIX}/bin	${DESTDIR}${QMAILDIR}/bin
+	${LN} -s ${DESTDIR}${EGDIR}/boot	${DESTDIR}${QMAILDIR}/boot
+	${LN} -s ${DESTDIR}${EGDIR}/control	${DESTDIR}${QMAILDIR}/control
+	${LN} -s ${DESTDIR}${DOCDIR}		${DESTDIR}${QMAILDIR}/doc
+	${LN} -s ${DESTDIR}${PREFIX}/${PKGMANDIR} ${DESTDIR}${QMAILDIR}/man
+	${LN} -s ${DESTDIR}${QMAIL_QUEUE_DIR}	${DESTDIR}${QMAILDIR}/queue
+	${LN} -s ${DESTDIR}${EGDIR}/users	${DESTDIR}${QMAILDIR}/users
 
 post-install: post-install-viruscan
 	# allow packaging as non-root, fix at install time with SPECIAL_PERMS
diff --git a/misc/rubygems/Makefile b/misc/rubygems/Makefile
index cd03b37987f..ca800429776 100644
--- a/misc/rubygems/Makefile
+++ b/misc/rubygems/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2015/01/25 16:13:13 taca Exp $
+# $NetBSD: Makefile,v 1.59 2016/04/10 16:39:28 joerg Exp $
 
 DISTNAME=	rubygems-${RUBY_GEMS_PKGSRC_VERS}
 CATEGORIES=	misc ruby
@@ -59,9 +59,7 @@ INSTALL_ENV+=		GEM_PATH=${DESTDIR}${PREFIX}/${GEM_HOME}
 
 INSTALL_TARGET=		install
 INSTALL_TARGET+=	--vendor --no-rdoc --no-ri
-.if ${_USE_DESTDIR} != "no"
 INSTALL_TARGET+=	--destdir=${DESTDIR:Q}
-.endif
 
 # rubygem's setup.rb is not the typical setup.rb -- manually run the
 # command to install.
diff --git a/news/inn/Makefile b/news/inn/Makefile
index 4fabfca9590..ee3511b4a6a 100644
--- a/news/inn/Makefile
+++ b/news/inn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.121 2016/03/05 11:29:15 jperkin Exp $
+# $NetBSD: Makefile,v 1.122 2016/04/10 16:39:28 joerg Exp $
 
 DISTNAME=		inn-2.5.5
 PKGREVISION=		1
@@ -64,9 +64,6 @@ DEPENDS+=		p5-MIME-tools-[0-9]*:../../mail/p5-MIME-tools
 DEPENDS+=		p5-GD-[0-9]*:../../graphics/p5-GD
 DEPENDS+=		gnupg-[0-9]*:../../security/gnupg
 
-## Please note that USE_DESTDIR=yes only works for this package if the user
-## and group already exist
-
 USERGROUP_PHASE=	pre-install
 PKG_USERS_VARS+=	INN_USER
 PKG_GROUPS_VARS+=	INN_GROUP
diff --git a/sysutils/bacula/Makefile b/sysutils/bacula/Makefile
index 75f44d5904f..0c1bfef2e8e 100644
--- a/sysutils/bacula/Makefile
+++ b/sysutils/bacula/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2016/03/05 11:29:28 jperkin Exp $
+# $NetBSD: Makefile,v 1.65 2016/04/10 16:39:28 joerg Exp $
 
 PKGREVISION=		9
 
@@ -38,9 +38,7 @@ REPLACE_PERL+=		src/cats/make_catalog_backup.pl.in
 
 .include "Makefile.common"
 
-.if !empty(USE_DESTDIR:M[Yy][Ee][Ss])
 INSTALL_MAKE_FLAGS+=	dir_user= dir_group= sd_group=
-.endif
 
 post-install:
 	${INSTALL_SCRIPT} ${FILESDIR}/chio-changer \
diff --git a/www/curl/Makefile b/www/curl/Makefile
index 3f33743cfa8..26875bcf5eb 100644
--- a/www/curl/Makefile
+++ b/www/curl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.162 2016/04/07 11:03:15 adam Exp $
+# $NetBSD: Makefile,v 1.163 2016/04/10 16:39:28 joerg Exp $
 
 DISTNAME=	curl-7.48.0
 CATEGORIES=	www
@@ -32,10 +32,6 @@ TEST_TARGET=		check
 USE_TOOLS+=		perl
 .endif
 
-.if ${_USE_DESTDIR} == "no"
-PRIVILEGED_STAGES+=	clean
-.endif
-
 .include "options.mk"
 
 post-install: