"user-destdir" is default these days

26 files changed, 26 insertions, 70 deletions

diff --git a/shells/ast-ksh/Makefile b/shells/ast-ksh/Makefile
index c72775d8bc8..b31c567853e 100644
--- a/shells/ast-ksh/Makefile
+++ b/shells/ast-ksh/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.19 2008/06/20 01:09:35 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2012/09/11 23:25:07 asau Exp $
 #
-PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "Makefile.common"
 
diff --git a/shells/bash-completion/Makefile b/shells/bash-completion/Makefile
index 1fd57f38f52..04d3be6c480 100644
--- a/shells/bash-completion/Makefile
+++ b/shells/bash-completion/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/09/29 17:19:11 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2012/09/11 23:25:07 asau Exp $
 #
 # Note to packagers:
 # packages installing additional completion files should drop
@@ -15,8 +15,6 @@ HOMEPAGE=	http://bash-completion.alioth.debian.org/
 COMMENT=	Programmable completion specifications for bash
 LICENSE=	gnu-gpl-v2
 
-PKG_DESTDIR_SUPPORT=	user-destdir
-
 USE_TOOLS+=	bash:run
 
 USE_LANGUAGES=	# none
diff --git a/shells/bash/Makefile b/shells/bash/Makefile
index 1d1c533818f..e999f946245 100644
--- a/shells/bash/Makefile
+++ b/shells/bash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2012/08/20 06:41:48 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2012/09/11 23:25:07 asau Exp $
 
 BASH_VERSION=		4.2
 
@@ -20,7 +20,6 @@ LICENSE=	gnu-gpl-v3
 CONFLICTS=	static-bash-[0-9]*
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
-PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_TOOLS+=		makeinfo bison
 USE_PKGLOCALEDIR=	yes
diff --git a/shells/bash2-doc/Makefile b/shells/bash2-doc/Makefile
index 4e3e966e479..bb77e2ca656 100644
--- a/shells/bash2-doc/Makefile
+++ b/shells/bash2-doc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2008/06/20 01:09:35 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2012/09/11 23:25:07 asau Exp $
 
 DISTNAME=	bash-doc-2.05b
 PKGNAME=	bash-doc-2.05.2
@@ -10,8 +10,6 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/bash/bash.html
 COMMENT=	Documentation for the GNU Bourne Again Shell
 
-PKG_DESTDIR_SUPPORT=	user-destdir
-
 CONFLICTS=	bash<=2.05nb1
 
 WRKSRC=		${WRKDIR}/doc
diff --git a/shells/bash2/Makefile b/shells/bash2/Makefile
index 2d0f4bd055e..c7dbb341cef 100644
--- a/shells/bash2/Makefile
+++ b/shells/bash2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.81 2011/04/22 13:44:39 obache Exp $
+# $NetBSD: Makefile,v 1.82 2012/09/11 23:25:07 asau Exp $
 #
 
 DISTNAME=	bash-2.05b
@@ -18,7 +18,6 @@ COMMENT=	The GNU Bourne Again Shell (version 2)
 
 CONFLICTS=	static-bash-[0-9]*
 
-PKG_DESTDIR_SUPPORT=	user-destdir
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_GNU_READLINE=	yes
diff --git a/shells/dash/Makefile b/shells/dash/Makefile
index 6bfb07f91b9..f0e971fbd66 100644
--- a/shells/dash/Makefile
+++ b/shells/dash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2012/05/30 20:33:26 cheusov Exp $
+# $NetBSD: Makefile,v 1.8 2012/09/11 23:25:07 asau Exp $
 #
 
 DISTNAME=	dash-0.5.7
@@ -10,8 +10,6 @@ HOMEPAGE=	http://gondor.apana.org.au/~herbert/dash/files/
 COMMENT=	Debian Almquist shell, POSIX-compliant shell faster than bash
 LICENSE=	modified-bsd AND gnu-gpl-v2
 
-PKG_DESTDIR_SUPPORT=	user-destdir
-
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake
 PKG_SHELL=		bin/dash
diff --git a/shells/eltclsh/Makefile b/shells/eltclsh/Makefile
index 8571f984c82..f17e4cb77a3 100644
--- a/shells/eltclsh/Makefile
+++ b/shells/eltclsh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2012/08/21 23:49:25 marino Exp $
+# $NetBSD: Makefile,v 1.6 2012/09/11 23:25:08 asau Exp $
 
 DISTNAME=	eltclsh-1.9
 PKGREVISION=	1
@@ -9,8 +9,6 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://softs.laas.fr/openrobots/wiki/eltclsh
 COMMENT=	Interactive TCL shell with editline facilities
 
-PKG_DESTDIR_SUPPORT=	user-destdir
-
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-tcl=${BUILDLINK_PREFIX.tcl}/lib
 
diff --git a/shells/es/Makefile b/shells/es/Makefile
index bb9145d7df2..ef714ff72e3 100644
--- a/shells/es/Makefile
+++ b/shells/es/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2010/05/07 12:02:44 jmmv Exp $
+# $NetBSD: Makefile,v 1.24 2012/09/11 23:25:08 asau Exp $
 
 DISTNAME=	es-0.9-alpha1
 PKGNAME=	es-0.9a1
@@ -10,8 +10,6 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://hawkwind.cs.toronto.edu:8001/mlists/es.html
 COMMENT=	Extensible shell, derived from plan9's rc
 
-PKG_DESTDIR_SUPPORT=	user-destdir
-
 USE_TOOLS+=	yacc
 
 PKG_SHELL=	bin/es
diff --git a/shells/esh/Makefile b/shells/esh/Makefile
index 90d3d9844eb..26cc1cadba4 100644
--- a/shells/esh/Makefile
+++ b/shells/esh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2010/05/07 12:02:44 jmmv Exp $
+# $NetBSD: Makefile,v 1.28 2012/09/11 23:25:08 asau Exp $
 
 DISTNAME=		esh-0.8
 PKGREVISION=		3
@@ -8,8 +8,6 @@ MASTER_SITES=		${MASTER_SITE_BACKUP}
 MAINTAINER=		pkgsrc-users@NetBSD.org
 COMMENT=		Unix shell with Lisp-like syntax
 
-PKG_DESTDIR_SUPPORT=	user-destdir
-
 WRKSRC=			${WRKDIR}/esh
 PKG_SHELL=		bin/esh
 INFO_FILES=		# PLIST
diff --git a/shells/heirloom-sh/Makefile b/shells/heirloom-sh/Makefile
index 3c3b111bcd2..d3807acd560 100644
--- a/shells/heirloom-sh/Makefile
+++ b/shells/heirloom-sh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/10/09 10:02:45 cheusov Exp $
+# $NetBSD: Makefile,v 1.3 2012/09/11 23:25:08 asau Exp $
 #
 
 DISTNAME=		heirloom-sh-050706
@@ -12,8 +12,6 @@ HOMEPAGE=		http://heirloom.sourceforge.net/
 COMMENT=		Traditional Unix shell derived from OpenSolaris code
 LICENSE=		cddl-1.0
 
-PKG_DESTDIR_SUPPORT=	user-destdir
-
 .include "../../mk/bsd.prefs.mk"
 
 CPPFLAGS.Linux+=	-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64L
diff --git a/shells/lshell/Makefile b/shells/lshell/Makefile
index 195e694f020..c1e53a5a75e 100644
--- a/shells/lshell/Makefile
+++ b/shells/lshell/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2012/04/12 19:44:21 gls Exp $
+# $NetBSD: Makefile,v 1.10 2012/09/11 23:25:08 asau Exp $
 #
 
 DISTNAME=	lshell-0.9.15.1
@@ -13,8 +13,6 @@ LICENSE=	gnu-gpl-v3
 PKG_GROUPS=	lshellg
 PKG_SHELL=	bin/lshell
 
-PKG_DESTDIR_SUPPORT=	user-destdir
-
 USE_LANGUAGES=		# none
 
 PYDISTUTILSPKG=		yes
diff --git a/shells/mksh/Makefile b/shells/mksh/Makefile
index 9a2441e1cef..eda413fb2cb 100644
--- a/shells/mksh/Makefile
+++ b/shells/mksh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2012/05/13 18:46:35 bsiegert Exp $
+# $NetBSD: Makefile,v 1.20 2012/09/11 23:25:08 asau Exp $
 
 DISTNAME=			mksh-R40f
 PKGNAME=			${DISTNAME:S/-R/-/}
@@ -16,7 +16,6 @@ WRKSRC=				${WRKDIR}/mksh
 WRKBUILD?=			${WRKSRC}
 
 PKG_INSTALLATION_TYPES=		pkgviews overwrite
-PKG_DESTDIR_SUPPORT=		user-destdir
 
 PKG_SHELL=			bin/mksh
 
diff --git a/shells/mudsh/Makefile b/shells/mudsh/Makefile
index 9181ceccc8c..a11f9a54fcd 100644
--- a/shells/mudsh/Makefile
+++ b/shells/mudsh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2010/01/27 14:53:31 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2012/09/11 23:25:08 asau Exp $
 #
 
 DISTNAME=	mudsh
@@ -11,8 +11,6 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.xirium.com/tech/mud-shell/index.html
 COMMENT=	M.U.D. game-like shell
 
-PKG_DESTDIR_SUPPORT=	user-destdir
-
 WRKSRC=		${WRKDIR}
 USE_TOOLS+=	perl:run
 
diff --git a/shells/nologinmsg/Makefile b/shells/nologinmsg/Makefile
index 7e932964ce7..abac9d24cac 100644
--- a/shells/nologinmsg/Makefile
+++ b/shells/nologinmsg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2010/02/26 10:28:34 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2012/09/11 23:25:08 asau Exp $
 
 DISTNAME=	nologinmsg-1.0
 PKGREVISION=	2
@@ -9,8 +9,6 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 #HOMEPAGE=
 COMMENT=	More functional native binary replacement for /sbin/nologin
 
-PKG_DESTDIR_SUPPORT=	user-destdir
-
 USE_FEATURES=	getprogname
 
 SUBST_CLASSES+=		nlm
diff --git a/shells/osh/Makefile b/shells/osh/Makefile
index 63752f0c6ba..41220a8bfc9 100644
--- a/shells/osh/Makefile
+++ b/shells/osh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2012/02/16 19:44:57 hans Exp $
+# $NetBSD: Makefile,v 1.30 2012/09/11 23:25:08 asau Exp $
 
 DISTNAME=	osh-20100430
 PKGREVISION=	1
@@ -10,7 +10,6 @@ HOMEPAGE=	http://v6shell.org/
 COMMENT=	Port of the Sixth Edition UNIX shell
 LICENSE=	original-bsd
 
-PKG_DESTDIR_SUPPORT=	user-destdir
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 PKG_SHELL=		bin/osh
diff --git a/shells/pdksh/Makefile b/shells/pdksh/Makefile
index 3fa03a11637..ecdcf7f9777 100644
--- a/shells/pdksh/Makefile
+++ b/shells/pdksh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2010/05/07 12:02:44 jmmv Exp $
+# $NetBSD: Makefile,v 1.21 2012/09/11 23:25:09 asau Exp $
 #
 
 DISTNAME=	pdksh-5.2.14
@@ -15,7 +15,6 @@ MAINTAINER=	schmonz@NetBSD.org
 HOMEPAGE=	http://web.cs.mun.ca/~michael/pdksh/
 COMMENT=	Free clone of the AT&T Korn shell
 
-PKG_DESTDIR_SUPPORT=	user-destdir
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 BOOTSTRAP_PKG=	yes
 
diff --git a/shells/perlsh/Makefile b/shells/perlsh/Makefile
index 70e3daa4b16..91cdefe6080 100644
--- a/shells/perlsh/Makefile
+++ b/shells/perlsh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2011/08/14 14:45:16 obache Exp $
+# $NetBSD: Makefile,v 1.21 2012/09/11 23:25:09 asau Exp $
 
 DISTNAME=	psh-1.8
 PKGNAME=	perlsh-1.8
@@ -10,8 +10,6 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.focusresearch.com/gregor/sw/psh/
 COMMENT=	The Perl Shell
 
-PKG_DESTDIR_SUPPORT=	user-destdir
-
 DEPENDS+=	p5-Term-ReadKey>=2.21:../../devel/p5-Term-ReadKey
 DEPENDS+=	p5-Term-ReadLine>=1.12:../../devel/p5-Term-ReadLine
 DEPENDS+=	p5-BSD-Resource>=1.15:../../devel/p5-BSD-Resource
diff --git a/shells/posh/Makefile b/shells/posh/Makefile
index ab7576e59ef..8d19e9f5ed8 100644
--- a/shells/posh/Makefile
+++ b/shells/posh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2010/05/07 12:02:44 jmmv Exp $
+# $NetBSD: Makefile,v 1.13 2012/09/11 23:25:09 asau Exp $
 #
 
 DISTNAME=	posh_0.3.14
@@ -12,7 +12,6 @@ HOMEPAGE=	http://packages.debian.org/posh
 COMMENT=	Debian Policy-compliant Ordinary SHell
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
-PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		YES
 PKG_SHELL=		bin/posh
diff --git a/shells/rc/Makefile b/shells/rc/Makefile
index 7b4de54e124..94a44287947 100644
--- a/shells/rc/Makefile
+++ b/shells/rc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2010/05/07 12:02:44 jmmv Exp $
+# $NetBSD: Makefile,v 1.27 2012/09/11 23:25:09 asau Exp $
 
 DISTNAME=       rc-1.7
 PKGREVISION=	1
@@ -9,8 +9,6 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://plan9.bell-labs.com/sys/doc/rc.html
 COMMENT=	Unix incarnation of the plan9 shell
 
-PKG_DESTDIR_SUPPORT=	user-destdir
-
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-history
 
diff --git a/shells/rssh/Makefile b/shells/rssh/Makefile
index 9846a864702..5db15689c86 100644
--- a/shells/rssh/Makefile
+++ b/shells/rssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2011/05/31 11:08:09 obache Exp $
+# $NetBSD: Makefile,v 1.14 2012/09/11 23:25:09 asau Exp $
 
 DISTNAME=	rssh-2.3.3
 CATEGORIES=	shells security
@@ -8,8 +8,6 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.pizzashack.org/rssh/
 COMMENT=	Restricted shell allowing only scp and/or sftp
 
-PKG_DESTDIR_SUPPORT=	user-destdir
-
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 
diff --git a/shells/scponly/Makefile b/shells/scponly/Makefile
index 9bfb8a72680..08d5658c6b0 100644
--- a/shells/scponly/Makefile
+++ b/shells/scponly/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2010/05/07 12:02:44 jmmv Exp $
+# $NetBSD: Makefile,v 1.15 2012/09/11 23:25:09 asau Exp $
 
 DISTNAME=	scponly-4.8
 PKGREVISION=	1
@@ -12,8 +12,6 @@ COMMENT=	Shell that only permits sftp
 
 GNU_CONFIGURE=	yes
 
-PKG_DESTDIR_SUPPORT=	user-destdir
-
 USE_TOOLS+=		chgrp chmod chown echo id ln ls mkdir mv pwd rm rmdir
 CONFIGURE_ENV+=		scponly_PROG_CHGRP=${TOOLS_CHGRP:Q}
 CONFIGURE_ENV+=		PROG_CHMOD=${TOOLS_CHMOD:Q}
diff --git a/shells/scsh/Makefile b/shells/scsh/Makefile
index 3a657d840f3..ac5bdd8f229 100644
--- a/shells/scsh/Makefile
+++ b/shells/scsh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2011/12/22 04:37:51 dholland Exp $
+# $NetBSD: Makefile,v 1.43 2012/09/11 23:25:09 asau Exp $
 
 DISTNAME=		scsh-0.6.7
 PKGREVISION=		1
@@ -13,8 +13,6 @@ LICENSE=		modified-bsd
 
 NOT_FOR_PLATFORM=	${LP64PLATFORMS}	# Not 64-bit clean.
 
-PKG_DESTDIR_SUPPORT=	user-destdir
-
 GNU_CONFIGURE=		yes
 
 BUILD_TARGET=		enough
diff --git a/shells/static-ast-ksh/Makefile b/shells/static-ast-ksh/Makefile
index 31b1dfe1083..70cb300a848 100644
--- a/shells/static-ast-ksh/Makefile
+++ b/shells/static-ast-ksh/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.11 2008/06/20 01:09:35 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2012/09/11 23:25:09 asau Exp $
 #
-PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../shells/ast-ksh/Makefile.common"
 
diff --git a/shells/tcsh/Makefile b/shells/tcsh/Makefile
index 58b00b6c018..a00a10c4b9a 100644
--- a/shells/tcsh/Makefile
+++ b/shells/tcsh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2012/05/26 15:15:21 he Exp $
+# $NetBSD: Makefile,v 1.72 2012/09/11 23:25:09 asau Exp $
 
 DISTNAME=	tcsh-6.18.01
 PKGREVISION=	2
@@ -11,8 +11,6 @@ HOMEPAGE=	http://www.tcsh.org/Welcome
 COMMENT=	Extended C-shell with many useful features
 LICENSE=	original-bsd
 
-PKG_DESTDIR_SUPPORT=	user-destdir
-
 CONFLICTS?=	static-tcsh-[0-9]*
 
 GNU_CONFIGURE=	yes
diff --git a/shells/xsh/Makefile b/shells/xsh/Makefile
index 990ddb7fbb9..f2364dabc4d 100644
--- a/shells/xsh/Makefile
+++ b/shells/xsh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2011/08/14 14:45:16 obache Exp $
+# $NetBSD: Makefile,v 1.18 2012/09/11 23:25:10 asau Exp $
 
 DISTNAME=	XML-XSH-1.8.2
 PKGNAME=	${DISTNAME:S/XML-XSH/xsh/}
@@ -10,8 +10,6 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://xsh.sourceforge.net/
 COMMENT=	XML Editing Shell
 
-PKG_DESTDIR_SUPPORT=	user-destdir
-
 DEPENDS+=	p5-Parse-RecDescent>=1.94:../../devel/p5-Parse-RecDescent
 DEPENDS+=	p5-Term-ReadLine>=1.12:../../devel/p5-Term-ReadLine
 DEPENDS+=	p5-XML-LibXML>=1.31:../../textproc/p5-XML-LibXML
diff --git a/shells/zsh/Makefile.common b/shells/zsh/Makefile.common
index f819de0206f..c088f4dfdd4 100644
--- a/shells/zsh/Makefile.common
+++ b/shells/zsh/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.66 2012/08/16 13:30:27 wiz Exp $
+# $NetBSD: Makefile.common,v 1.67 2012/09/11 23:25:10 asau Exp $
 # used by shells/zsh/Makefile
 # used by shells/zsh-current/Makefile
 
@@ -14,8 +14,6 @@ MAINTAINER=	${ZSH_MAINTAINER}
 HOMEPAGE=	http://zsh.sourceforge.net/
 COMMENT=	The Z shell
 
-PKG_DESTDIR_SUPPORT=	user-destdir
-
 GNU_CONFIGURE=		yes
 
 CONFIGURE_ARGS+=	--enable-etcdir=${PKG_SYSCONFDIR:Q}