* Separate out the shell registration into a separately unpacked script

  +SHELL.

* Turn PKG_REGISTER_SHELLS into a variable that can be set in the shell
  environment so that admins can make a choice when installing from
  binary packages.

* PKG_SHELL is now a list of paths, and if the path is relative, then it
  is taken to be relative to ${PREFIX}.  Convert packages that set
  PKG_SHELL to take advantage of this new feature by changing the full
  paths to the shells into relative paths.

18 files changed, 35 insertions, 37 deletions

diff --git a/shells/ast-ksh/Makefile.common b/shells/ast-ksh/Makefile.common
index aef5337ccae..1a560de7b55 100644
--- a/shells/ast-ksh/Makefile.common
+++ b/shells/ast-ksh/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.14 2005/06/17 03:50:33 jlam Exp $
+# $NetBSD: Makefile.common,v 1.15 2005/07/29 18:32:17 jlam Exp $
 
 DISTNAME=	ast-ksh-${ASTKSH_VERSION}
 PKGNAME=	ast-ksh-${ASTKSH_VERSION:S/-//g}
@@ -34,7 +34,7 @@ MAKE_FLAGS=	CC="${CC}" CCFLAGS="${CFLAGS}"
 PDKSH=		/bin/ksh
 .endif
 
-PKG_SHELL=	${PREFIX}/bin/ksh93
+PKG_SHELL=	bin/ksh93
 
 INSTALLATION_DIRS=	bin man/man1
 
diff --git a/shells/bash/Makefile b/shells/bash/Makefile
index d307b6138de..8f7843c543a 100644
--- a/shells/bash/Makefile
+++ b/shells/bash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/07/07 21:30:54 tron Exp $
+# $NetBSD: Makefile,v 1.11 2005/07/29 18:32:17 jlam Exp $
 
 DISTNAME=	bash-3.0
 PKGNAME=	bash-3.0pl16
@@ -30,7 +30,7 @@ TEST_TARGET=		test
 
 INFO_FILES=		bash.info
 
-PKG_SHELL=		${PREFIX}/bin/bash
+PKG_SHELL=		bin/bash
 
 # All features enabled by default.
 CONFIGURE_ARGS+=	--enable-readline
diff --git a/shells/bash2/Makefile b/shells/bash2/Makefile
index 3853b2d3c54..c3a14eb5c81 100644
--- a/shells/bash2/Makefile
+++ b/shells/bash2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2005/07/01 16:11:05 minskim Exp $
+# $NetBSD: Makefile,v 1.65 2005/07/29 18:32:17 jlam Exp $
 #
 
 DISTNAME=	bash-2.05b
@@ -27,7 +27,7 @@ CONFIGURE_ARGS+=	--with-installed-readline
 MAKE_ENV+=		INSTALL_SCRIPT='${INSTALL_SCRIPT}'
 TEST_TARGET=		test
 
-PKG_SHELL=		${PREFIX}/bin/bash
+PKG_SHELL=		bin/bash
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/shells/es/Makefile b/shells/es/Makefile
index c3e04d8b735..dff56d63da3 100644
--- a/shells/es/Makefile
+++ b/shells/es/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/03/24 21:13:00 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2005/07/29 18:32:17 jlam Exp $
 
 DISTNAME=       es-0.9-alpha1
 PKGNAME=	es-0.9a1
@@ -11,6 +11,6 @@ HOMEPAGE=	http://hawkwind.utcs.utoronto.ca:8001/mlists/es.html
 COMMENT=	Extensible shell, derived from plan9's rc
 
 USE_PKGINSTALL=	yes
-PKG_SHELL=	${PREFIX}/bin/es
+PKG_SHELL=	bin/es
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/shells/esh/Makefile b/shells/esh/Makefile
index f5012fc93ad..65f216986ba 100644
--- a/shells/esh/Makefile
+++ b/shells/esh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/06/17 03:50:33 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2005/07/29 18:32:17 jlam Exp $
 
 DISTNAME=		esh-0.8
 CATEGORIES=		shells
@@ -11,7 +11,7 @@ INFO_FILES=		esh.info
 
 WRKSRC=			${WRKDIR}/esh
 USE_PKGINSTALL=		yes
-PKG_SHELL=		${PREFIX}/bin/esh
+PKG_SHELL=		bin/esh
 INSTALLATION_DIRS=	bin info
 
 do-install:
diff --git a/shells/osh/Makefile b/shells/osh/Makefile
index 4c8e74f05a7..34bcbb2341b 100644
--- a/shells/osh/Makefile
+++ b/shells/osh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:47:21 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/07/29 18:32:17 jlam Exp $
 
 DISTNAME=	osh-050131
 CATEGORIES=	shells
@@ -11,7 +11,7 @@ COMMENT=	Implementation of the UNIX 6th Edition shell
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_PKGINSTALL=		yes
-PKG_SHELL=		${PREFIX}/bin/osh
+PKG_SHELL=		bin/osh
 
 TEST_TARGET=	check
 
diff --git a/shells/pdksh/Makefile b/shells/pdksh/Makefile
index 419e616387a..139a4cb6015 100644
--- a/shells/pdksh/Makefile
+++ b/shells/pdksh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/04/11 21:47:21 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/07/29 18:32:18 jlam Exp $
 #
 
 DISTNAME=	pdksh-5.2.14
@@ -21,6 +21,6 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--program-prefix=pd
 
 USE_PKGINSTALL=	yes
-PKG_SHELL=	${PREFIX}/bin/pdksh
+PKG_SHELL=	bin/pdksh
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/shells/perlsh/Makefile b/shells/perlsh/Makefile
index 7b7127d1ba6..cca7fb581cc 100644
--- a/shells/perlsh/Makefile
+++ b/shells/perlsh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/07/13 18:01:40 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2005/07/29 18:32:18 jlam Exp $
 # Cjep: Makefile,v 1.3 2003/04/20 16:21:44 cjep Exp
 
 DISTNAME=	psh-1.8
@@ -16,7 +16,7 @@ DEPENDS+=	p5-Term-ReadLine>=1.12:../../devel/p5-Term-ReadLine
 DEPENDS+=	p5-BSD-Resource>=1.15:../../devel/p5-BSD-Resource
 
 USE_PKGINSTALL=	yes
-PKG_SHELL=	${PREFIX}/bin/psh
+PKG_SHELL=	bin/psh
 
 PERL5_PACKLIST=	auto/psh/.packlist
 
diff --git a/shells/posh/Makefile b/shells/posh/Makefile
index 06092e556a4..5146c5a6802 100644
--- a/shells/posh/Makefile
+++ b/shells/posh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:47:21 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/07/29 18:32:18 jlam Exp $
 #
 
 DISTNAME=	posh_0.3.14
@@ -13,7 +13,7 @@ COMMENT=	Debian Policy-compliant Ordinary SHell
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 GNU_CONFIGURE=		YES
-PKG_SHELL=		${PREFIX}/bin/posh
+PKG_SHELL=		bin/posh
 USE_PKGINSTALL=		YES
 WRKSRC=			${WRKDIR}/${PKGNAME}
 
diff --git a/shells/rc/Makefile b/shells/rc/Makefile
index f8ebbc47f4d..b8baa9cc5b2 100644
--- a/shells/rc/Makefile
+++ b/shells/rc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/03/24 21:13:00 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2005/07/29 18:32:18 jlam Exp $
 
 DISTNAME=       rc-1.6
 CATEGORIES=	shells plan9
@@ -12,6 +12,6 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-history
 
 USE_PKGINSTALL=	yes
-PKG_SHELL=	${PREFIX}/bin/rc
+PKG_SHELL=	bin/rc
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/shells/rssh/Makefile b/shells/rssh/Makefile
index 1ea24be42cd..3317d3c364b 100644
--- a/shells/rssh/Makefile
+++ b/shells/rssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/04/20 16:21:15 seb Exp $
+# $NetBSD: Makefile,v 1.2 2005/07/29 18:32:18 jlam Exp $
 #
 
 DISTNAME=		rssh-2.2.3
@@ -21,7 +21,7 @@ PKG_SKIP_REASON+=	"${PKGNAME} requires wordexp(3)"
 EGDIR=			${PREFIX}/share/examples/rssh
 INSTALLATION_DIRS=	share/examples/rssh
 CONF_FILES=		${EGDIR}/rssh.conf ${PKG_SYSCONFDIR}/rssh.conf
-PKG_SHELL?=		${PREFIX}/bin/rssh
+PKG_SHELL?=		bin/rssh
 
 SPECIAL_PERMS+=	${PREFIX}/libexec/rssh_chroot_helper ${SETUID_ROOT_PERMS}
 
diff --git a/shells/scponly/Makefile b/shells/scponly/Makefile
index 1886694d033..6a9b784a74e 100644
--- a/shells/scponly/Makefile
+++ b/shells/scponly/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/06/24 19:52:06 kristerw Exp $
+# $NetBSD: Makefile,v 1.5 2005/07/29 18:32:18 jlam Exp $
 
 DISTNAME=	scponly-4.0
 PKGREVISION=	1
@@ -29,7 +29,7 @@ CONFIGURE_ENV+=		scponly_PROG_RM="${TOOLS_RM}"
 CONFIGURE_ENV+=		scponly_PROG_RMDIR="${TOOLS_RMDIR}"
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 USE_PKGINSTALL=		yes
-PKG_SHELL=		${PREFIX}/bin/scponly
+PKG_SHELL=		bin/scponly
 PKG_SYSCONFSUBDIR=	scponly
 
 EGDIR=		${PREFIX}/share/examples/scponly
diff --git a/shells/scsh/Makefile b/shells/scsh/Makefile
index 79cc5a1698f..84be450d68d 100644
--- a/shells/scsh/Makefile
+++ b/shells/scsh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/07/17 15:11:36 kristerw Exp $
+# $NetBSD: Makefile,v 1.31 2005/07/29 18:32:18 jlam Exp $
 
 DISTNAME=		scsh-0.6.6
 CATEGORIES=		shells lang
@@ -16,7 +16,7 @@ BUILD_TARGET=		enough
 TEST_TARGET=		check
 
 USE_PKGINSTALL=		yes
-PKG_SHELL=		${PREFIX}/bin/scsh
+PKG_SHELL=		bin/scsh
 
 # Build references from dumped environment variables is not a problem.
 CHECK_WRKREF_SKIP+=	${PREFIX}/lib/scsh/scsh.image
diff --git a/shells/standalone-tcsh/Makefile b/shells/standalone-tcsh/Makefile
index 22c6df7d5a8..80f2e668a8f 100644
--- a/shells/standalone-tcsh/Makefile
+++ b/shells/standalone-tcsh/Makefile
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.15 2005/02/24 12:19:13 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2005/07/29 18:32:18 jlam Exp $
 #
 
 NO_MTREE=		YES
 
 PKGNAME=		standalone-${DISTNAME}
 
-PKG_SHELL=		/bin/tcsh
-
 WRKSRC=			${WRKDIR}/${DISTNAME}
 PATCHDIR=		${.CURDIR}/../../shells/tcsh/patches
 
diff --git a/shells/tcsh/Makefile b/shells/tcsh/Makefile
index 525b0db199e..92310281318 100644
--- a/shells/tcsh/Makefile
+++ b/shells/tcsh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2005/04/28 23:29:06 jlam Exp $
+# $NetBSD: Makefile,v 1.51 2005/07/29 18:32:18 jlam Exp $
 #
 
 DISTNAME=	tcsh-6.14.00
@@ -32,7 +32,7 @@ OS_VER_cmd=	${ECHO} ${OS_VERSION} | ${SED} -e 's|5\.|2.|'
 LOWER_OPSYS=	solaris${OS_VER_cmd:sh}
 .endif
 
-PKG_SHELL?=	${PREFIX}/bin/tcsh
+PKG_SHELL?=	bin/tcsh
 
 post-install:
 	@${ECHO} "Installing message catalogues"
diff --git a/shells/xsh/Makefile b/shells/xsh/Makefile
index c1470f6ffef..68201f2d8f2 100644
--- a/shells/xsh/Makefile
+++ b/shells/xsh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/07/16 01:19:20 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/07/29 18:32:18 jlam Exp $
 
 DISTNAME=	XML-XSH-1.8.2
 PKGNAME=	${DISTNAME:S/XML-XSH/xsh/}
@@ -17,7 +17,7 @@ DEPENDS+=	p5-XML-NodeFilter-[0-9]*:../../textproc/p5-XML-NodeFilter
 DEPENDS+=	p5-XML-LibXML-XPathContext-[0-9]*:../../textproc/p5-XML-LibXML-XPathContext
 
 USE_TOOLS+=	gmake
-PKG_SHELL=	${PREFIX}/bin/xsh
+PKG_SHELL=	bin/xsh
 
 PERL5_PACKLIST= auto/XML/XSH/.packlist
 
diff --git a/shells/zsh/Makefile.common b/shells/zsh/Makefile.common
index 8b8a95a62b2..4dcdcc23992 100644
--- a/shells/zsh/Makefile.common
+++ b/shells/zsh/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.24 2005/06/14 18:39:29 minskim Exp $
+# $NetBSD: Makefile.common,v 1.25 2005/07/29 18:32:18 jlam Exp $
 
 DISTNAME=       zsh-${ZSH_VERSION}
 CATEGORIES=	shells
@@ -74,7 +74,7 @@ CONFIGURE_ARGS+=--with-tcsetpgrp
 
 .undef MANZ
 
-PKG_SHELL=	${PREFIX}/bin/zsh
+PKG_SHELL=	bin/zsh
 
 INSTALL_TARGET=	install install.info
 
diff --git a/shells/zsh3/Makefile b/shells/zsh3/Makefile
index d48fd0d7eec..d870afb75f2 100644
--- a/shells/zsh3/Makefile
+++ b/shells/zsh3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/04/11 21:47:21 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/07/29 18:32:18 jlam Exp $
 #
 
 DISTNAME=       zsh-3.0.8
@@ -27,6 +27,6 @@ BUILD_DEFS+=	ZSH_STATIC
 LDFLAGS+=	-static
 .endif
 
-PKG_SHELL=	${PREFIX}/bin/zsh
+PKG_SHELL=	bin/zsh
 
 .include "../../mk/bsd.pkg.mk"