summaryrefslogtreecommitdiff
path: root/pkgtools
diff options
context:
space:
mode:
Diffstat (limited to 'pkgtools')
-rw-r--r--pkgtools/autoswc/Makefile4
-rw-r--r--pkgtools/binpatch/Makefile4
-rw-r--r--pkgtools/bootstrap-extras/Makefile3
-rw-r--r--pkgtools/bootstrap-mk-files/Makefile4
-rw-r--r--pkgtools/cdpack/Makefile4
-rw-r--r--pkgtools/compat_headers/Makefile3
-rw-r--r--pkgtools/createbuildlink/Makefile3
-rw-r--r--pkgtools/dfdisk/Makefile4
-rw-r--r--pkgtools/digest/Makefile3
-rw-r--r--pkgtools/distbb/Makefile4
-rw-r--r--pkgtools/genrpm/Makefile4
-rw-r--r--pkgtools/gensolpkg/Makefile4
-rw-r--r--pkgtools/gnome-packagekit/Makefile4
-rw-r--r--pkgtools/libkver/Makefile3
-rw-r--r--pkgtools/libnbcompat/Makefile4
-rw-r--r--pkgtools/lintpkgsrc/Makefile4
-rw-r--r--pkgtools/mksandbox/Makefile4
-rw-r--r--pkgtools/mtree/Makefile4
-rw-r--r--pkgtools/nih/Makefile4
-rw-r--r--pkgtools/p5-pkgsrc-Dewey/Makefile3
-rw-r--r--pkgtools/packagekit/Makefile4
-rw-r--r--pkgtools/pbulk-base/Makefile4
-rw-r--r--pkgtools/pbulk/Makefile4
-rw-r--r--pkgtools/pkg_alternatives/Makefile3
-rw-r--r--pkgtools/pkg_chk/Makefile3
-rw-r--r--pkgtools/pkg_comp/Makefile3
-rw-r--r--pkgtools/pkg_distinst/Makefile4
-rw-r--r--pkgtools/pkg_filecheck/Makefile4
-rw-r--r--pkgtools/pkg_install-info/Makefile3
-rw-r--r--pkgtools/pkg_install/Makefile3
-rw-r--r--pkgtools/pkg_leaves/Makefile4
-rw-r--r--pkgtools/pkg_notify/Makefile3
-rw-r--r--pkgtools/pkg_online-server/Makefile.common4
-rw-r--r--pkgtools/pkg_p5up2date/Makefile3
-rw-r--r--pkgtools/pkg_regress/Makefile3
-rw-r--r--pkgtools/pkg_rolling-replace/Makefile3
-rw-r--r--pkgtools/pkg_select/Makefile3
-rw-r--r--pkgtools/pkg_summary-utils/Makefile3
-rw-r--r--pkgtools/pkg_tarup/Makefile4
-rw-r--r--pkgtools/pkgclean/Makefile3
-rw-r--r--pkgtools/pkgdep/Makefile4
-rw-r--r--pkgtools/pkgdepgraph/Makefile4
-rw-r--r--pkgtools/pkgdiff/Makefile3
-rw-r--r--pkgtools/pkgfind/Makefile3
-rw-r--r--pkgtools/pkgin/Makefile4
-rw-r--r--pkgtools/pkglint/Makefile3
-rw-r--r--pkgtools/pkgse/Makefile3
-rw-r--r--pkgtools/pkgsrc-todo/Makefile4
-rw-r--r--pkgtools/pkgsurvey/Makefile4
-rw-r--r--pkgtools/port2pkg/Makefile4
-rw-r--r--pkgtools/rc.subr/Makefile4
-rw-r--r--pkgtools/rcorder/Makefile4
-rw-r--r--pkgtools/revbump/Makefile3
-rw-r--r--pkgtools/rpm2pkg/Makefile4
-rw-r--r--pkgtools/shlock/Makefile3
-rw-r--r--pkgtools/tinderbox-dragonfly/Makefile3
-rw-r--r--pkgtools/url2pkg/Makefile3
-rw-r--r--pkgtools/verifypc/Makefile3
-rw-r--r--pkgtools/x11-links/Makefile3
-rw-r--r--pkgtools/xpkgwedge/Makefile3
60 files changed, 60 insertions, 151 deletions
diff --git a/pkgtools/autoswc/Makefile b/pkgtools/autoswc/Makefile
index 3ade4b88f31..ab12f5b94f7 100644
--- a/pkgtools/autoswc/Makefile
+++ b/pkgtools/autoswc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2009/04/09 00:48:10 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2012/09/11 23:19:33 asau Exp $
DISTNAME= autoswc-1.6
CATEGORIES= pkgtools sysutils
@@ -8,8 +8,6 @@ DISTFILES= # empty
MAINTAINER= jmmv@NetBSD.org
COMMENT= Generates system wide cache files for GNU autoconf
-PKG_DESTDIR_SUPPORT= user-destdir
-
DEPENDS+= autoconf>=2.59:../../devel/autoconf
DEPENDS+= automake>=1.8.2:../../devel/automake
DEPENDS+= libtool-base>=1.5.2:../../devel/libtool-base
diff --git a/pkgtools/binpatch/Makefile b/pkgtools/binpatch/Makefile
index 901962b5829..458236743f0 100644
--- a/pkgtools/binpatch/Makefile
+++ b/pkgtools/binpatch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2010/03/21 16:29:41 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2012/09/11 23:19:33 asau Exp $
#
DISTNAME= binpatch-1.0
@@ -10,8 +10,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= ftp://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/doc/pkgsrc.html
COMMENT= Trivial binary patch applicator
-PKG_DESTDIR_SUPPORT= user-destdir
-
.include "../../mk/bsd.prefs.mk"
INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
diff --git a/pkgtools/bootstrap-extras/Makefile b/pkgtools/bootstrap-extras/Makefile
index 2be2280da75..01a72f7b713 100644
--- a/pkgtools/bootstrap-extras/Makefile
+++ b/pkgtools/bootstrap-extras/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2010/02/06 10:26:09 obache Exp $
+# $NetBSD: Makefile,v 1.11 2012/09/11 23:19:34 asau Exp $
DISTNAME= bootstrap-extra-files-20070702
CATEGORIES= pkgtools
@@ -8,7 +8,6 @@ DISTFILES= # empty
MAINTAINER= pkgsrc-users@NetBSD.org
COMMENT= Extra bootstrap files and scripts for ${OPSYS}
-PKG_DESTDIR_SUPPORT= user-destdir
BOOTSTRAP_PKG= yes
NO_CONFIGURE= yes
diff --git a/pkgtools/bootstrap-mk-files/Makefile b/pkgtools/bootstrap-mk-files/Makefile
index e9f9814a592..645f2f15bb5 100644
--- a/pkgtools/bootstrap-mk-files/Makefile
+++ b/pkgtools/bootstrap-mk-files/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2012/04/15 13:03:11 obache Exp $
+# $NetBSD: Makefile,v 1.32 2012/09/11 23:19:34 asau Exp $
DISTNAME= bootstrap-mk-files-20120415
CATEGORIES= pkgtools
@@ -11,8 +11,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.pkgsrc.org/
COMMENT= *.mk files for the bootstrap bmake utility
-PKG_DESTDIR_SUPPORT= user-destdir
-
NO_PKGTOOLS_REQD_CHECK= # defined
BOOTSTRAP_PKG= yes
diff --git a/pkgtools/cdpack/Makefile b/pkgtools/cdpack/Makefile
index 305a2c37106..7764b3a0e4b 100644
--- a/pkgtools/cdpack/Makefile
+++ b/pkgtools/cdpack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2009/04/09 00:48:11 joerg Exp $
+# $NetBSD: Makefile,v 1.31 2012/09/11 23:19:34 asau Exp $
#
DISTNAME= cdpack-1.9
@@ -10,8 +10,6 @@ MAINTAINER= dmcmahill@NetBSD.org
HOMEPAGE= http://www.NetBSD.org/
COMMENT= Utility to create multi-cd/dvd binary package collections
-PKG_DESTDIR_SUPPORT= user-destdir
-
# for mkisofs
DEPENDS+= cdrtools-[0-9]*:../../sysutils/cdrtools
diff --git a/pkgtools/compat_headers/Makefile b/pkgtools/compat_headers/Makefile
index d3b666e3572..7e95a62c923 100644
--- a/pkgtools/compat_headers/Makefile
+++ b/pkgtools/compat_headers/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2009/05/02 16:21:45 reed Exp $
+# $NetBSD: Makefile,v 1.6 2012/09/11 23:19:34 asau Exp $
DISTNAME= compat_headers-0.2
CATEGORIES= pkgtools
@@ -14,7 +14,6 @@ SUPERSEDES= posix_headers-[0-9]*
CHECK_PERMS= no
GNU_CONFIGURE= yes
-PKG_DESTDIR_SUPPORT= user-destdir
PLIST_SRC+= ${WRKSRC}/PLIST
diff --git a/pkgtools/createbuildlink/Makefile b/pkgtools/createbuildlink/Makefile
index 5f32c2d29b4..0d7d429f447 100644
--- a/pkgtools/createbuildlink/Makefile
+++ b/pkgtools/createbuildlink/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2010/01/13 15:27:52 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2012/09/11 23:19:34 asau Exp $
DISTNAME= createbuildlink-3.16
CATEGORIES= pkgtools sysutils
@@ -9,7 +9,6 @@ MAINTAINER= rh@NetBSD.org
COMMENT= Shell script to help creating buildlink3.mk files
PKG_INSTALLATION_TYPES= overwrite pkgviews
-PKG_DESTDIR_SUPPORT= user-destdir
WRKSRC= ${WRKDIR}
USE_LANGUAGES= # empty
diff --git a/pkgtools/dfdisk/Makefile b/pkgtools/dfdisk/Makefile
index 652aee9d8e4..3cb7f6ae06d 100644
--- a/pkgtools/dfdisk/Makefile
+++ b/pkgtools/dfdisk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2009/04/09 00:48:11 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2012/09/11 23:19:34 asau Exp $
#
DISTNAME= dfdisk-1.0
@@ -9,8 +9,6 @@ DISTFILES= # empty
MAINTAINER= jmmv@NetBSD.org
COMMENT= Fetch distfiles from multiple locations
-PKG_DESTDIR_SUPPORT= user-destdir
-
WRKSRC= ${WRKDIR}
NO_CONFIGURE= yes
NO_BUILD= yes
diff --git a/pkgtools/digest/Makefile b/pkgtools/digest/Makefile
index 567ac9e3459..8689af59a95 100644
--- a/pkgtools/digest/Makefile
+++ b/pkgtools/digest/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2009/05/19 08:59:29 wiz Exp $
+# $NetBSD: Makefile,v 1.59 2012/09/11 23:19:34 asau Exp $
#
# When adding new digest algorithms, please use rmd160 as the template,
# and bump the VERSION definition.
@@ -14,7 +14,6 @@ COMMENT?= Message digest wrapper utility
LICENSE= original-bsd
PKG_INSTALLATION_TYPES= overwrite pkgviews
-PKG_DESTDIR_SUPPORT= user-destdir
CHECK_PERMS= no
diff --git a/pkgtools/distbb/Makefile b/pkgtools/distbb/Makefile
index c5aebc894b6..d72e9ebf77c 100644
--- a/pkgtools/distbb/Makefile
+++ b/pkgtools/distbb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2012/09/08 18:20:04 cheusov Exp $
+# $NetBSD: Makefile,v 1.15 2012/09/11 23:19:34 asau Exp $
#
DISTNAME= distbb-0.45.1
@@ -30,8 +30,6 @@ REPLACE.runawk.new= ${PREFIX}/bin/runawk
REPLACE_FILES.runawk= gen_weights.in pkg_summary2build_deps.in \
distbb_grep.in gen_queue.in
-PKG_DESTDIR_SUPPORT= user-destdir
-
EGDIR= ${PREFIX}/share/examples/distbb
DOCDIR= ${PREFIX}/share/doc/distbb
diff --git a/pkgtools/genrpm/Makefile b/pkgtools/genrpm/Makefile
index d8f4b04a3e3..0e7b07cefff 100644
--- a/pkgtools/genrpm/Makefile
+++ b/pkgtools/genrpm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2012/03/08 01:09:35 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2012/09/11 23:19:34 asau Exp $
DISTNAME= genrpm-1.2
CATEGORIES= pkgtools
@@ -14,8 +14,6 @@ DEPENDS+= rpm-[0-9]*:../../misc/rpm
PKG_INSTALLATION_TYPES= overwrite pkgviews
-PKG_DESTDIR_SUPPORT= user-destdir
-
WRKSRC= ${WRKDIR}
INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbin
diff --git a/pkgtools/gensolpkg/Makefile b/pkgtools/gensolpkg/Makefile
index 2d33ac7c26d..2b759dbc82f 100644
--- a/pkgtools/gensolpkg/Makefile
+++ b/pkgtools/gensolpkg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2011/05/28 17:27:08 cheusov Exp $
+# $NetBSD: Makefile,v 1.22 2012/09/11 23:19:35 asau Exp $
#
DISTNAME= gensolpkg-1.10
@@ -10,8 +10,6 @@ MAINTAINER= agc@NetBSD.org
COMMENT= Utility to generate a Solaris package
LICENSE= original-bsd
-PKG_DESTDIR_SUPPORT= user-destdir
-
USE_BSD_MAKEFILE= yes
ONLY_FOR_PLATFORM= SunOS-*-* # uses Solaris pkgmk(1)
diff --git a/pkgtools/gnome-packagekit/Makefile b/pkgtools/gnome-packagekit/Makefile
index 31eaffe5771..91ac28f7a4d 100644
--- a/pkgtools/gnome-packagekit/Makefile
+++ b/pkgtools/gnome-packagekit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2012/09/07 19:17:24 adam Exp $
+# $NetBSD: Makefile,v 1.24 2012/09/11 23:19:35 asau Exp $
#
DISTNAME= gnome-packagekit-0.4.0
@@ -10,8 +10,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.packagekit.org/
COMMENT= GNOME frontend for PackageKit
-PKG_DESTDIR_SUPPORT= user-destdir
-
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_TOOLS+= pkg-config gmake intltool perl msgfmt
diff --git a/pkgtools/libkver/Makefile b/pkgtools/libkver/Makefile
index 231fa2fbaba..ed7095be0c7 100644
--- a/pkgtools/libkver/Makefile
+++ b/pkgtools/libkver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2009/02/10 00:13:34 joerg Exp $
+# $NetBSD: Makefile,v 1.31 2012/09/11 23:19:35 asau Exp $
DISTNAME= libkver-${VERSION}
CATEGORIES= pkgtools
@@ -10,7 +10,6 @@ MAINTAINER= seb@NetBSD.org
COMMENT= Shared library and sysctl(1) replacement to override system version
PKG_INSTALLATION_TYPES= overwrite pkgviews
-PKG_DESTDIR_SUPPORT= user-destdir
.include "../../mk/bsd.prefs.mk"
diff --git a/pkgtools/libnbcompat/Makefile b/pkgtools/libnbcompat/Makefile
index 77b25cc16aa..80de26c2ec9 100644
--- a/pkgtools/libnbcompat/Makefile
+++ b/pkgtools/libnbcompat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.77 2012/07/02 16:02:53 joerg Exp $
+# $NetBSD: Makefile,v 1.78 2012/09/11 23:19:35 asau Exp $
#
# NOTE: If you update this package, it is *mandatory* that you update
# pkgsrc/pkgtools/libnbcompat/files/README to reflect the actual
@@ -14,8 +14,6 @@ MAINTAINER= joerg@NetBSD.org
HOMEPAGE= http://www.NetBSD.org/
COMMENT= Portable NetBSD compatibility library
-PKG_DESTDIR_SUPPORT= user-destdir
-
GNU_CONFIGURE= yes
MAKE_ENV+= LIBMODE=${LIBMODE}
diff --git a/pkgtools/lintpkgsrc/Makefile b/pkgtools/lintpkgsrc/Makefile
index dac1a3944cd..f1bd2e3ee74 100644
--- a/pkgtools/lintpkgsrc/Makefile
+++ b/pkgtools/lintpkgsrc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2012/09/09 20:18:46 dholland Exp $
+# $NetBSD: Makefile,v 1.9 2012/09/11 23:19:35 asau Exp $
DISTNAME= lintpkgsrc-4.85
CATEGORIES= pkgtools
@@ -33,8 +33,6 @@ SUBST_SED.lp+= -e s\|@PREFIX@\|${PREFIX}\|g
SUBST_SED.lp+= -e s\|@MAKE@\|${MAKE:Q}\|g
SUBST_SED.lp+= -e s\|@PERL@\|${PERL5:Q}\|g
-PKG_DESTDIR_SUPPORT= user-destdir
-
.include "../../mk/bsd.prefs.mk"
do-extract:
diff --git a/pkgtools/mksandbox/Makefile b/pkgtools/mksandbox/Makefile
index f88abdd77c3..396ed15e7f0 100644
--- a/pkgtools/mksandbox/Makefile
+++ b/pkgtools/mksandbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2012/08/26 22:13:18 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2012/09/11 23:19:35 asau Exp $
DISTNAME= mksandbox-1.0
CATEGORIES= pkgtools
@@ -10,8 +10,6 @@ HOMEPAGE= http://www.NetBSD.org/docs/pkgsrc/bulk.html#setting-up-a-sandbox
COMMENT= Tool for creating sandboxes
LICENSE= 2-clause-bsd
-PKG_DESTDIR_SUPPORT= user-destdir
-
WRKSRC= ${WRKDIR}
NO_BUILD= yes
USE_LANGUAGES= # none
diff --git a/pkgtools/mtree/Makefile b/pkgtools/mtree/Makefile
index 8d71cf0df56..fe4f04692ba 100644
--- a/pkgtools/mtree/Makefile
+++ b/pkgtools/mtree/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2012/03/08 01:11:21 joerg Exp $
+# $NetBSD: Makefile,v 1.26 2012/09/11 23:19:35 asau Exp $
#
DISTNAME= mtree-20120308
@@ -10,8 +10,6 @@ MAINTAINER= sbd@NetBSD.org
HOMEPAGE= http://www.NetBSD.org/
COMMENT= Utility for mapping and checking directory hierarchies
-PKG_DESTDIR_SUPPORT= user-destdir
-
GNU_CONFIGURE= yes
USE_FEATURES= nbcompat
diff --git a/pkgtools/nih/Makefile b/pkgtools/nih/Makefile
index 8366bc96a80..345dd99dbe5 100644
--- a/pkgtools/nih/Makefile
+++ b/pkgtools/nih/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2012/09/08 17:52:49 cheusov Exp $
+# $NetBSD: Makefile,v 1.18 2012/09/11 23:19:35 asau Exp $
DISTNAME= pkgnih-0.10.1
PKGREVISION= 1
@@ -21,8 +21,6 @@ BUILD_DEPENDS+= mk-configure>=0.21.0:../../devel/mk-configure
CONFLICTS= pkg_status-[0-9]*
SUPERSEDES= pkgnih-[0-9]*
-PKG_DESTDIR_SUPPORT= user-destdir
-
BUILD_TARGET= all all-doc
INSTALL_TARGET= install install-doc
diff --git a/pkgtools/p5-pkgsrc-Dewey/Makefile b/pkgtools/p5-pkgsrc-Dewey/Makefile
index 570a80f1d1f..96f4521a1bb 100644
--- a/pkgtools/p5-pkgsrc-Dewey/Makefile
+++ b/pkgtools/p5-pkgsrc-Dewey/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2011/10/11 22:16:52 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2012/09/11 23:19:35 asau Exp $
DISTNAME= p5-pkgsrc-Dewey-1.1
PKGREVISION= 2
@@ -12,7 +12,6 @@ COMMENT= Perl module to compare pkgsrc Dewey numbers
LICENSE= ${PERL5_LICENSE} OR 2-clause-bsd
PKG_INSTALLATION_TYPES= overwrite pkgviews
-PKG_DESTDIR_SUPPORT= user-destdir
CPPFLAGS+= -DHAVE_CTYPE_H -DHAVE_STDLIB_H -DHAVE_STRING_H
CPPFLAGS.NetBSD+= -DHAVE_ERR_H
diff --git a/pkgtools/packagekit/Makefile b/pkgtools/packagekit/Makefile
index 01d07482696..c401abb6e6f 100644
--- a/pkgtools/packagekit/Makefile
+++ b/pkgtools/packagekit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2012/09/07 19:17:24 adam Exp $
+# $NetBSD: Makefile,v 1.24 2012/09/11 23:19:36 asau Exp $
#
DISTNAME= PackageKit-0.4.0
@@ -11,8 +11,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.packagekit.org/
COMMENT= System activated daemon for managing software updates
-PKG_DESTDIR_SUPPORT= user-destdir
-
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_TOOLS+= pkg-config gmake intltool msgfmt autoconf
diff --git a/pkgtools/pbulk-base/Makefile b/pkgtools/pbulk-base/Makefile
index 8fce933e648..ceb100e7072 100644
--- a/pkgtools/pbulk-base/Makefile
+++ b/pkgtools/pbulk-base/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2012/03/19 12:17:15 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2012/09/11 23:19:36 asau Exp $
DISTNAME= pbulk-base-0.45
COMMENT= Core components of the modular bulk build framework
-PKG_DESTDIR_SUPPORT= user-destdir
-
.include "../../pkgtools/pbulk/Makefile.common"
USE_FEATURES= nbcompat
diff --git a/pkgtools/pbulk/Makefile b/pkgtools/pbulk/Makefile
index 49d0cdcf24f..60397f54676 100644
--- a/pkgtools/pbulk/Makefile
+++ b/pkgtools/pbulk/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.64 2012/06/19 13:40:07 jperkin Exp $
+# $NetBSD: Makefile,v 1.65 2012/09/11 23:19:36 asau Exp $
DISTNAME= pbulk-0.50
COMMENT= Modular bulk build framework
-PKG_DESTDIR_SUPPORT= user-destdir
-
.include "../../pkgtools/pbulk/Makefile.common"
USE_TOOLS+= awk:run bzip2:run digest:run gzip:run make:run \
diff --git a/pkgtools/pkg_alternatives/Makefile b/pkgtools/pkg_alternatives/Makefile
index 1410b2eb1ee..3d1412b30cd 100644
--- a/pkgtools/pkg_alternatives/Makefile
+++ b/pkgtools/pkg_alternatives/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2012/06/13 15:35:32 jperkin Exp $
+# $NetBSD: Makefile,v 1.19 2012/09/11 23:19:36 asau Exp $
#
DISTNAME= pkg_alternatives-1.6
@@ -10,7 +10,6 @@ MAINTAINER= jmmv@NetBSD.org
COMMENT= Generic wrappers for programs with similar interfaces
PKG_INSTALLATION_TYPES= overwrite pkgviews
-PKG_DESTDIR_SUPPORT= user-destdir
NO_BUILD= YES
WRKSRC= ${WRKDIR}
diff --git a/pkgtools/pkg_chk/Makefile b/pkgtools/pkg_chk/Makefile
index 630acb6e472..16a6d3ffde1 100644
--- a/pkgtools/pkg_chk/Makefile
+++ b/pkgtools/pkg_chk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.81 2012/09/01 17:52:09 abs Exp $
+# $NetBSD: Makefile,v 1.82 2012/09/11 23:19:36 asau Exp $
DISTNAME= pkg_chk-2.0.6
CATEGORIES= pkgtools
@@ -11,7 +11,6 @@ COMMENT= Check installed package versions against pkgsrc
LICENSE= 2-clause-bsd
PKG_INSTALLATION_TYPES= overwrite pkgviews
-PKG_DESTDIR_SUPPORT= user-destdir
WRKSRC= ${WRKDIR}
USE_LANGUAGES= # empty
diff --git a/pkgtools/pkg_comp/Makefile b/pkgtools/pkg_comp/Makefile
index 2ebd61c8fed..8c677cc9e3b 100644
--- a/pkgtools/pkg_comp/Makefile
+++ b/pkgtools/pkg_comp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2012/05/19 10:54:39 jmmv Exp $
+# $NetBSD: Makefile,v 1.50 2012/09/11 23:19:36 asau Exp $
DISTNAME= pkg_comp-1.37
CATEGORIES= pkgtools
@@ -9,7 +9,6 @@ MAINTAINER= jmmv@NetBSD.org
COMMENT= Build packages inside a chroot jail
PKG_INSTALLATION_TYPES= overwrite pkgviews
-PKG_DESTDIR_SUPPORT= user-destdir
ONLY_FOR_PLATFORM= NetBSD-*-*
diff --git a/pkgtools/pkg_distinst/Makefile b/pkgtools/pkg_distinst/Makefile
index 057f6dd9c22..826c8c108c2 100644
--- a/pkgtools/pkg_distinst/Makefile
+++ b/pkgtools/pkg_distinst/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2010/03/20 21:32:41 adrianp Exp $
+# $NetBSD: Makefile,v 1.5 2012/09/11 23:19:36 asau Exp $
DISTNAME= pkg_distinst-0.02
CATEGORIES= pkgtools
@@ -8,8 +8,6 @@ DISTFILES= # empty
MAINTAINER= pkgsrc-users@NetBSD.org
COMMENT= Remove any distfiles not belonging to an installed package
-PKG_DESTDIR_SUPPORT= user-destdir
-
WRKSRC= ${WRKDIR}
USE_TOOLS+= perl:run
NO_BUILD= yes
diff --git a/pkgtools/pkg_filecheck/Makefile b/pkgtools/pkg_filecheck/Makefile
index 2a3a6bb1bb8..df7540a6df8 100644
--- a/pkgtools/pkg_filecheck/Makefile
+++ b/pkgtools/pkg_filecheck/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2012/03/01 16:31:55 hans Exp $
+# $NetBSD: Makefile,v 1.33 2012/09/11 23:19:36 asau Exp $
#
DISTNAME= pkg_filecheck-0.4
@@ -10,8 +10,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org
#HOMEPAGE= http://www.NetBSD.org/docs/pkgsrc/
COMMENT= Check for files not owned by any package
-PKG_DESTDIR_SUPPORT= user-destdir
-
WRKSRC= ${WRKDIR}
USE_TOOLS+= perl:run
USE_FEATURES= fts_open
diff --git a/pkgtools/pkg_install-info/Makefile b/pkgtools/pkg_install-info/Makefile
index 3297b4bc108..531c40495b9 100644
--- a/pkgtools/pkg_install-info/Makefile
+++ b/pkgtools/pkg_install-info/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2009/04/09 00:48:12 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2012/09/11 23:19:37 asau Exp $
#
DISTNAME= pkg_install-info-${VERSION}
@@ -12,7 +12,6 @@ HOMEPAGE= http://www.gnu.org/software/texinfo/texinfo.html
COMMENT= Standalone GNU info file installation utility
PKG_INSTALLATION_TYPES= overwrite pkgviews
-PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= yes
diff --git a/pkgtools/pkg_install/Makefile b/pkgtools/pkg_install/Makefile
index 2e86c8edd22..26a57a36d60 100644
--- a/pkgtools/pkg_install/Makefile
+++ b/pkgtools/pkg_install/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.186 2012/07/27 14:26:36 jperkin Exp $
+# $NetBSD: Makefile,v 1.187 2012/09/11 23:19:36 asau Exp $
# Notes to package maintainers:
#
@@ -16,7 +16,6 @@ HOMEPAGE= http://www.pkgsrc.org/
COMMENT= Package management and administration tools for pkgsrc
LICENSE= modified-bsd
-PKG_DESTDIR_SUPPORT= user-destdir
BOOTSTRAP_PKG= yes
SKIP_LICENSE_CHECK= yes
diff --git a/pkgtools/pkg_leaves/Makefile b/pkgtools/pkg_leaves/Makefile
index 12bfc7f4576..56956a46e4d 100644
--- a/pkgtools/pkg_leaves/Makefile
+++ b/pkgtools/pkg_leaves/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/04/09 00:48:12 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2012/09/11 23:19:37 asau Exp $
DISTNAME= pkg_leaves-1.2
CATEGORIES= pkgtools
@@ -8,8 +8,6 @@ DISTFILES= # empty
MAINTAINER= joerg@NetBSD.org
COMMENT= Print leaf packages
-PKG_DESTDIR_SUPPORT= user-destdir
-
WRKSRC= ${WRKDIR}
NO_BUILD= yes
USE_LANGUAGES= # none
diff --git a/pkgtools/pkg_notify/Makefile b/pkgtools/pkg_notify/Makefile
index d885d98e4f4..f9da50a66e6 100644
--- a/pkgtools/pkg_notify/Makefile
+++ b/pkgtools/pkg_notify/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2009/04/09 00:48:12 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2012/09/11 23:19:37 asau Exp $
#
DISTNAME= pkg_notify-0.4.3
@@ -13,7 +13,6 @@ COMMENT= Notifies package maintainer when a new version is available
DEPENDS+= p5-libwww>=5.76:../../www/p5-libwww
PKG_INSTALLATION_TYPES= overwrite pkgviews
-PKG_DESTDIR_SUPPORT= user-destdir
NO_BUILD= yes
NO_CONFIGURE= yes
diff --git a/pkgtools/pkg_online-server/Makefile.common b/pkgtools/pkg_online-server/Makefile.common
index e59aa6ce4e8..967a2a532c9 100644
--- a/pkgtools/pkg_online-server/Makefile.common
+++ b/pkgtools/pkg_online-server/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2012/08/26 10:06:46 cheusov Exp $
+# $NetBSD: Makefile.common,v 1.7 2012/09/11 23:19:37 asau Exp $
#
# used by pkgtools/pkg_online-client/Makefile
# used by pkgtools/pkg_online-server/Makefile
@@ -13,8 +13,6 @@ COMMENT= Client/Server package searcher for pkgsrc
LICENSE= 2-clause-bsd
-PKG_DESTDIR_SUPPORT= user-destdir
-
DISTINFO_FILE= ${.CURDIR}/../../pkgtools/pkg_online-server/distinfo
PATCHDIR= ${.CURDIR}/../../pkgtools/pkg_online-server/patches
diff --git a/pkgtools/pkg_p5up2date/Makefile b/pkgtools/pkg_p5up2date/Makefile
index 9f38ff67b7f..6e55be9e5af 100644
--- a/pkgtools/pkg_p5up2date/Makefile
+++ b/pkgtools/pkg_p5up2date/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2012/02/16 13:09:26 sno Exp $
+# $NetBSD: Makefile,v 1.3 2012/09/11 23:19:37 asau Exp $
DISTNAME= pkg_p5up2date-0.04
CATEGORIES= pkgtools
@@ -9,7 +9,6 @@ MAINTAINER= pkgsrc-p5-people@NetBSD.org
COMMENT= check p5-* pkgsrc packages requiring updates
PKG_INSTALLATION_TYPES= overwrite pkgviews
-PKG_DESTDIR_SUPPORT= user-destdir
USE_TOOLS+= perl:run
diff --git a/pkgtools/pkg_regress/Makefile b/pkgtools/pkg_regress/Makefile
index 147939a6080..4a55cfe394e 100644
--- a/pkgtools/pkg_regress/Makefile
+++ b/pkgtools/pkg_regress/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2012/03/01 22:42:31 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2012/09/11 23:19:37 asau Exp $
DISTNAME= pkg_regress-0.2
CATEGORIES= pkgtools
@@ -8,7 +8,6 @@ DISTFILES= # empty
MAINTAINER= pkgsrc-users@NetBSD.org
COMMENT= Run pkgsrc infrastructure regression test suite
-PKG_DESTDIR_SUPPORT= user-destdir
PKG_INSTALLATION_TYPES= overwrite pkgviews
WRKSRC= ${WRKDIR}
diff --git a/pkgtools/pkg_rolling-replace/Makefile b/pkgtools/pkg_rolling-replace/Makefile
index 1ea10f6f4b8..d7fbe0d0ca3 100644
--- a/pkgtools/pkg_rolling-replace/Makefile
+++ b/pkgtools/pkg_rolling-replace/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2012/04/30 13:59:38 gdt Exp $
+# $NetBSD: Makefile,v 1.34 2012/09/11 23:19:37 asau Exp $
DISTNAME= pkg_rolling-replace-0.24.1
CATEGORIES= pkgtools
@@ -12,7 +12,6 @@ DEPENDS+= pkg_chk>=1.76:../../pkgtools/pkg_chk
DEPENDS+= pkg_tarup>=1.6.6:../../pkgtools/pkg_tarup
PKG_INSTALLATION_TYPES= overwrite pkgviews
-PKG_DESTDIR_SUPPORT= user-destdir
USE_TOOLS+= patch
diff --git a/pkgtools/pkg_select/Makefile b/pkgtools/pkg_select/Makefile
index 254f56a67c4..b752d1f9a93 100644
--- a/pkgtools/pkg_select/Makefile
+++ b/pkgtools/pkg_select/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2012/03/02 16:36:57 hans Exp $
+# $NetBSD: Makefile,v 1.17 2012/09/11 23:19:37 asau Exp $
#
DISTNAME= pkg_select-20090308
@@ -10,7 +10,6 @@ MAINTAINER= imil@gcu.info
COMMENT= Curses based pkgsrc system browser / manager
PKG_INSTALLATION_TYPES= overwrite pkgviews
-PKG_DESTDIR_SUPPORT= user-destdir
USE_FEATURES+= cdefs
diff --git a/pkgtools/pkg_summary-utils/Makefile b/pkgtools/pkg_summary-utils/Makefile
index f679adc3730..1e6025b1afb 100644
--- a/pkgtools/pkg_summary-utils/Makefile
+++ b/pkgtools/pkg_summary-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2012/09/07 15:17:35 cheusov Exp $
+# $NetBSD: Makefile,v 1.22 2012/09/11 23:19:38 asau Exp $
DISTNAME= pkg_summary-utils-0.58.4
CATEGORIES= pkgtools
@@ -34,7 +34,6 @@ USE_LANGUAGES= #empty
USE_TOOLS+= gzip:run
PKG_INSTALLATION_TYPES= overwrite pkgviews
-PKG_DESTDIR_SUPPORT= user-destdir
EGDIR= ${PREFIX}/share/examples/pkg_summary-utils
diff --git a/pkgtools/pkg_tarup/Makefile b/pkgtools/pkg_tarup/Makefile
index 8801abfc461..2a985670eaf 100644
--- a/pkgtools/pkg_tarup/Makefile
+++ b/pkgtools/pkg_tarup/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2011/03/19 09:44:16 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2012/09/11 23:19:38 asau Exp $
DISTNAME= pkg_tarup-1.9
CATEGORIES= pkgtools
@@ -8,8 +8,6 @@ DISTFILES= # empty
MAINTAINER= hubertf@NetBSD.org
COMMENT= Generates binary package(s) from installed pkg(s)
-PKG_DESTDIR_SUPPORT= user-destdir
-
WRKSRC= ${WRKDIR}
NO_BUILD= yes
USE_LANGUAGES= # none
diff --git a/pkgtools/pkgclean/Makefile b/pkgtools/pkgclean/Makefile
index 5145e391182..374ec9a02d9 100644
--- a/pkgtools/pkgclean/Makefile
+++ b/pkgtools/pkgclean/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2009/04/09 00:48:13 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2012/09/11 23:19:38 asau Exp $
DISTNAME= pkgclean-20051116
CATEGORIES= pkgtools
@@ -9,7 +9,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org
COMMENT= Quickly clean up all work directories in pkgsrc
PKG_INSTALLATION_TYPES= overwrite pkgviews
-PKG_DESTDIR_SUPPORT= user-destdir
NO_CONFIGURE= yes
NO_BUILD= yes
diff --git a/pkgtools/pkgdep/Makefile b/pkgtools/pkgdep/Makefile
index 0498ab6d65e..3493a184d16 100644
--- a/pkgtools/pkgdep/Makefile
+++ b/pkgtools/pkgdep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2011/05/23 08:28:42 cheusov Exp $
+# $NetBSD: Makefile,v 1.16 2012/09/11 23:19:38 asau Exp $
#
DISTNAME= pkgdep-1.0
@@ -9,8 +9,6 @@ DISTFILES= # empty
MAINTAINER= pkgsrc-users@NetBSD.org
COMMENT= Script for displaying dependence information on software packages
-PKG_DESTDIR_SUPPORT= user-destdir
-
WRKSRC= ${WRKDIR}/files
USE_TOOLS+= perl:run
diff --git a/pkgtools/pkgdepgraph/Makefile b/pkgtools/pkgdepgraph/Makefile
index c530384eca6..1389e92d877 100644
--- a/pkgtools/pkgdepgraph/Makefile
+++ b/pkgtools/pkgdepgraph/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2010/03/21 16:29:42 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2012/09/11 23:19:38 asau Exp $
#
DISTNAME= pkgdepgraph-2.8
@@ -10,8 +10,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= ftp://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/doc/pkgsrc.html
COMMENT= Visual representation of installed NetBSD packages
-PKG_DESTDIR_SUPPORT= user-destdir
-
# removed so that pkgdepgraph can be used on "client" machines -- @@@
# DEPENDS+= graphviz-[0-9]*:../../graphics/graphviz
diff --git a/pkgtools/pkgdiff/Makefile b/pkgtools/pkgdiff/Makefile
index 2f6c65fc896..0f1923c90cd 100644
--- a/pkgtools/pkgdiff/Makefile
+++ b/pkgtools/pkgdiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.76 2012/05/29 22:58:52 cheusov Exp $
+# $NetBSD: Makefile,v 1.77 2012/09/11 23:19:38 asau Exp $
#
DISTNAME= pkgdiff-1.3
@@ -12,7 +12,6 @@ COMMENT= Tools to create, maintain, and send back patches for pkgsrc
LICENSE= 2-clause-bsd AND original-bsd
PKG_INSTALLATION_TYPES= overwrite pkgviews
-PKG_DESTDIR_SUPPORT= user-destdir
NO_CONFIGURE= yes
diff --git a/pkgtools/pkgfind/Makefile b/pkgtools/pkgfind/Makefile
index 8100e432850..c33fdbf5b13 100644
--- a/pkgtools/pkgfind/Makefile
+++ b/pkgtools/pkgfind/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2011/11/07 20:27:30 shattered Exp $
+# $NetBSD: Makefile,v 1.24 2012/09/11 23:19:38 asau Exp $
DISTNAME= pkgfind-20111022
CATEGORIES= pkgtools
@@ -9,7 +9,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org
COMMENT= Find packages by package name in pkgsrc
PKG_INSTALLATION_TYPES= overwrite pkgviews
-PKG_DESTDIR_SUPPORT= user-destdir
USE_FEATURES= err getprogname setprogname snprintf warn
diff --git a/pkgtools/pkgin/Makefile b/pkgtools/pkgin/Makefile
index 0b03cec1258..0de7319eb60 100644
--- a/pkgtools/pkgin/Makefile
+++ b/pkgtools/pkgin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2012/08/22 16:55:27 jperkin Exp $
+# $NetBSD: Makefile,v 1.28 2012/09/11 23:19:38 asau Exp $
#
DISTNAME= pkgin-0.6.2.2
@@ -11,8 +11,6 @@ HOMEPAGE= http://pkgin.net/
COMMENT= Apt / yum like tool for managing pkgsrc binary packages
LICENSE= modified-bsd
-PKG_DESTDIR_SUPPORT= user-destdir
-
EGDIR= ${PREFIX}/share/examples/${PKGBASE}
CONF_FILES= ${EGDIR}/repositories.conf.example \
${PKG_SYSCONFDIR}/${PKGBASE}/repositories.conf
diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile
index 3d6c1149869..33300cc1ae6 100644
--- a/pkgtools/pkglint/Makefile
+++ b/pkgtools/pkglint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.416 2012/08/26 13:47:16 wiz Exp $
+# $NetBSD: Makefile,v 1.417 2012/09/11 23:19:38 asau Exp $
#
# Note: if you update the version number, please have a look at the
@@ -18,7 +18,6 @@ DEPENDS+= p5-enum>=1.016:../../devel/p5-enum
DEPENDS+= p5-pkgsrc-Dewey>=1.0:../../pkgtools/p5-pkgsrc-Dewey
PKG_INSTALLATION_TYPES= overwrite pkgviews
-PKG_DESTDIR_SUPPORT= user-destdir
WRKSRC= ${WRKDIR}
NO_CHECKSUM= yes
diff --git a/pkgtools/pkgse/Makefile b/pkgtools/pkgse/Makefile
index 1a2a4d35174..96a562feb4d 100644
--- a/pkgtools/pkgse/Makefile
+++ b/pkgtools/pkgse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2008/06/12 02:14:42 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2012/09/11 23:19:39 asau Exp $
#
DISTNAME= pkgse-0.3
@@ -14,7 +14,6 @@ COMMENT= Fetch informations about a NetBSD package from pkgsrc.netbsd.se
DEPENDS+= p5-libwww>=5.76:../../www/p5-libwww
PKG_INSTALLATION_TYPES= overwrite pkgviews
-PKG_DESTDIR_SUPPORT= user-destdir
NO_BUILD= yes
USE_TOOLS+= perl:run
diff --git a/pkgtools/pkgsrc-todo/Makefile b/pkgtools/pkgsrc-todo/Makefile
index f1b80b9bafa..f91e11b5860 100644
--- a/pkgtools/pkgsrc-todo/Makefile
+++ b/pkgtools/pkgsrc-todo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/12/18 17:09:07 ryoon Exp $
+# $NetBSD: Makefile,v 1.3 2012/09/11 23:19:39 asau Exp $
#
DISTNAME= pkgsrc-todo-1.1
@@ -12,8 +12,6 @@ COMMENT= Tools for maintaing pkgsrc/doc/TODO
DEPENDS+= p5-pkgsrc-Dewey-[0-9]*:../../pkgtools/p5-pkgsrc-Dewey
-PKG_DESTDIR_SUPPORT= user-destdir
-
WRKSRC= ${WRKDIR}
NO_BUILD= yes
USE_LANGUAGES= # none
diff --git a/pkgtools/pkgsurvey/Makefile b/pkgtools/pkgsurvey/Makefile
index e32b14d5d8f..600a88a77a3 100644
--- a/pkgtools/pkgsurvey/Makefile
+++ b/pkgtools/pkgsurvey/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2009/04/09 00:48:13 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2012/09/11 23:19:39 asau Exp $
#
DISTNAME= pkgsurvey-0.0
@@ -15,8 +15,6 @@ NO_BUILD= yes
INSTALLATION_DIRS= bin
-PKG_DESTDIR_SUPPORT= user-destdir
-
do-install:
${INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin
${SED} -e 's|\$${PKG_INFO}|${PKG_INFO}|' \
diff --git a/pkgtools/port2pkg/Makefile b/pkgtools/port2pkg/Makefile
index e9f197cacc6..12f975cd1ae 100644
--- a/pkgtools/port2pkg/Makefile
+++ b/pkgtools/port2pkg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2012/03/26 14:05:36 joerg Exp $
+# $NetBSD: Makefile,v 1.38 2012/09/11 23:19:39 asau Exp $
#
DISTNAME= port2pkg-1.13
@@ -9,8 +9,6 @@ DISTFILES= # empty
MAINTAINER= pkgsrc-users@NetBSD.org
COMMENT= Convert from a FreeBSD port to a NetBSD package
-PKG_DESTDIR_SUPPORT= user-destdir
-
DEPENDS+= pkglint-[0-9]*:../../pkgtools/pkglint
WRKSRC= ${WRKDIR}
diff --git a/pkgtools/rc.subr/Makefile b/pkgtools/rc.subr/Makefile
index 0c1df221d67..ce7a8ca714a 100644
--- a/pkgtools/rc.subr/Makefile
+++ b/pkgtools/rc.subr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2010/03/23 00:27:11 sbd Exp $
+# $NetBSD: Makefile,v 1.25 2012/09/11 23:19:39 asau Exp $
#
DISTNAME= rc.subr-20090118
@@ -10,8 +10,6 @@ MAINTAINER= sbd@NetBSD.org
HOMEPAGE= http://www.NetBSD.org/
COMMENT= Portable NetBSD rc.subr implementation for pkgsrc
-PKG_DESTDIR_SUPPORT= user-destdir
-
ONLY_FOR_PLATFORM= Darwin-*-* FreeBSD-[0-4].*-* Interix-*-*
ONLY_FOR_PLATFORM+= Linux-*-* SunOS-*-*
ONLY_FOR_PLATFORM+= QNX-*-*
diff --git a/pkgtools/rcorder/Makefile b/pkgtools/rcorder/Makefile
index 4970d949a57..4fc5ea6f375 100644
--- a/pkgtools/rcorder/Makefile
+++ b/pkgtools/rcorder/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2012/03/10 16:10:56 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2012/09/11 23:19:39 asau Exp $
#
DISTNAME= rcorder-20120310
@@ -10,8 +10,6 @@ MAINTAINER= schmonz@NetBSD.org
HOMEPAGE= http://www.NetBSD.org/
COMMENT= Print a dependency ordering of interdependent files
-PKG_DESTDIR_SUPPORT= user-destdir
-
GNU_CONFIGURE= yes
USE_FEATURES= nbcompat
diff --git a/pkgtools/revbump/Makefile b/pkgtools/revbump/Makefile
index b5e754bd2a6..fff99079314 100644
--- a/pkgtools/revbump/Makefile
+++ b/pkgtools/revbump/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2012/02/08 09:53:01 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2012/09/11 23:19:39 asau Exp $
DISTNAME= revbump-2.2
CATEGORIES= pkgtools
@@ -11,7 +11,6 @@ COMMENT= Tools for bumping PKGREVISIONs (for pkgsrc developers)
LICENSE= modified-bsd
PKG_INSTALLATION_TYPES= overwrite pkgviews
-PKG_DESTDIR_SUPPORT= user-destdir
WRKSRC= ${WRKDIR}
NO_CONFIGURE= yes
diff --git a/pkgtools/rpm2pkg/Makefile b/pkgtools/rpm2pkg/Makefile
index 6abbcda8158..2c655103a92 100644
--- a/pkgtools/rpm2pkg/Makefile
+++ b/pkgtools/rpm2pkg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2012/08/29 19:12:07 tron Exp $
+# $NetBSD: Makefile,v 1.62 2012/09/11 23:19:40 asau Exp $
DISTNAME= rpm2pkg-3.2.3
CATEGORIES= pkgtools
@@ -13,8 +13,6 @@ LICENSE= modified-bsd
CONFLICTS+= suse-base<=6.4
-PKG_DESTDIR_SUPPORT= user-destdir
-
MANCOMPRESSED_IF_MANZ= yes
USE_BSD_MAKEFILE= yes
USE_LANGUAGES= c99
diff --git a/pkgtools/shlock/Makefile b/pkgtools/shlock/Makefile
index 3ec9fb8e7fa..1eac7815d0f 100644
--- a/pkgtools/shlock/Makefile
+++ b/pkgtools/shlock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2012/04/23 03:41:28 mspo Exp $
+# $NetBSD: Makefile,v 1.25 2012/09/11 23:19:40 asau Exp $
#
DISTNAME= shlock-20080529
@@ -10,7 +10,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org
#HOMEPAGE=
COMMENT= Shell utility to perform dot-locking
-PKG_DESTDIR_SUPPORT= user-destdir
USE_BSD_MAKEFILE= yes
INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/cat1
diff --git a/pkgtools/tinderbox-dragonfly/Makefile b/pkgtools/tinderbox-dragonfly/Makefile
index 2e45dc5d6ff..efe6b18cbd7 100644
--- a/pkgtools/tinderbox-dragonfly/Makefile
+++ b/pkgtools/tinderbox-dragonfly/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2012/08/05 10:02:13 obache Exp $
+# $NetBSD: Makefile,v 1.8 2012/09/11 23:19:40 asau Exp $
#
DISTNAME= tinderbox-dragonfly-${TBOX_VERSION}
@@ -17,7 +17,6 @@ DEPENDS+= csup>=20100101:../../net/csup
DEPENDS+= scmgit>1.6:../../devel/scmgit
TBOX_VERSION= 3.4.1
-PKG_DESTDIR_SUPPORT= user-destdir
ONLY_FOR_PLATFORM= DragonFly-*-*
USE_TOOLS+= perl perl:run
diff --git a/pkgtools/url2pkg/Makefile b/pkgtools/url2pkg/Makefile
index 9d9a09610ea..6508fff3359 100644
--- a/pkgtools/url2pkg/Makefile
+++ b/pkgtools/url2pkg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2012/03/01 22:42:31 wiz Exp $
+# $NetBSD: Makefile,v 1.64 2012/09/11 23:19:40 asau Exp $
#
DISTNAME= url2pkg-2.14
@@ -12,7 +12,6 @@ COMMENT= Tool to automate initial steps in building a package
LICENSE= original-bsd
PKG_INSTALLATION_TYPES= overwrite pkgviews
-PKG_DESTDIR_SUPPORT= user-destdir
WRKSRC= ${WRKDIR}
NO_BUILD= yes
diff --git a/pkgtools/verifypc/Makefile b/pkgtools/verifypc/Makefile
index 66d7aa6d69e..5b508cd9b65 100644
--- a/pkgtools/verifypc/Makefile
+++ b/pkgtools/verifypc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2011/10/26 08:03:34 sbd Exp $
+# $NetBSD: Makefile,v 1.12 2012/09/11 23:19:40 asau Exp $
#
DISTNAME= verifypc-1.6
@@ -10,7 +10,6 @@ MAINTAINER= jmmv@NetBSD.org
COMMENT= Sanity check package dependencies according to pkg-config
PKG_INSTALLATION_TYPES= overwrite pkgviews
-PKG_DESTDIR_SUPPORT= user-destdir
NO_BUILD= YES
WRKSRC= ${WRKDIR}
diff --git a/pkgtools/x11-links/Makefile b/pkgtools/x11-links/Makefile
index 16a25b0e1cc..f7d8d5f120a 100644
--- a/pkgtools/x11-links/Makefile
+++ b/pkgtools/x11-links/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.133 2012/07/20 20:30:19 marino Exp $
+# $NetBSD: Makefile,v 1.134 2012/09/11 23:19:40 asau Exp $
#
# NOTE: If you update this package, then you'll likely need to also update
# the x11-links dependency in buildlink3.mk to the correct version,
@@ -14,7 +14,6 @@ HOMEPAGE= http://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/doc/pkgsrc.html
COMMENT= Shadow tree of links to native X11 headers and libraries
LICENSE= original-bsd
-PKG_DESTDIR_SUPPORT= user-destdir
PKG_INSTALLATION_TYPES= overwrite pkgviews
NOT_FOR_PLATFORM= DragonFly-*-*
diff --git a/pkgtools/xpkgwedge/Makefile b/pkgtools/xpkgwedge/Makefile
index ed9dd190e47..6bfb21a7211 100644
--- a/pkgtools/xpkgwedge/Makefile
+++ b/pkgtools/xpkgwedge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.79 2010/06/06 03:45:17 dholland Exp $
+# $NetBSD: Makefile,v 1.80 2012/09/11 23:19:40 asau Exp $
DISTNAME= xpkgwedge-1.17
CATEGORIES= pkgtools devel x11
@@ -11,7 +11,6 @@ COMMENT= Allows X11 pkgs to be built and used outside of $${X11BASE}
LICENSE= original-bsd
PKG_INSTALLATION_TYPES= overwrite pkgviews
-PKG_DESTDIR_SUPPORT= user-destdir
WRKSRC= ${WRKDIR}
USE_LANGUAGES= # empty