summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--shells/ast-ksh/Makefile5
-rw-r--r--shells/bash2/Makefile9
-rw-r--r--shells/bash2/PLIST4
-rw-r--r--shells/es/Makefile5
-rw-r--r--shells/esh/Makefile5
-rw-r--r--shells/osh/Makefile10
-rw-r--r--shells/osh/PLIST4
-rw-r--r--shells/rc/Makefile5
-rw-r--r--shells/scsh/Makefile5
-rw-r--r--shells/standalone-tcsh/Makefile4
-rw-r--r--shells/standalone-tcsh/PLIST4
-rw-r--r--shells/tcsh/Makefile18
-rw-r--r--shells/tcsh/PLIST4
-rw-r--r--shells/zsh/Makefile9
-rw-r--r--shells/zsh/PLIST4
-rw-r--r--shells/zsh3/Makefile9
-rw-r--r--shells/zsh3/PLIST4
17 files changed, 47 insertions, 61 deletions
diff --git a/shells/ast-ksh/Makefile b/shells/ast-ksh/Makefile
index bd0007e8efc..56df8f36e9b 100644
--- a/shells/ast-ksh/Makefile
+++ b/shells/ast-ksh/Makefile
@@ -1,5 +1,5 @@
# $OpenBSD: Makefile,v 1.5 2001/11/21 01:17:43 naddy Exp $
-# $NetBSD: Makefile,v 1.2 2002/10/08 14:18:56 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2002/11/17 09:01:59 salo Exp $
DISTNAME= ast-ksh-${ASTKSH_VERSION}
PKGNAME= ast-ksh-${ASTKSH_VERSION:S/-//g}
@@ -25,6 +25,8 @@ NO_BUILDLINK2= # arcane build procedure causes buildlink2 to not work
WRKSRC= ${WRKDIR}
MAKE_FLAGS= CC="${BUILDLINK_CC}" CCFLAGS="${CFLAGS}"
+PKG_SHELL= ${PREFIX}/bin/ksh93
+
do-build:
cd ${WRKSRC}; \
${SETENV} SHELL=${SH} ${SH} ./bin/package ${MAKE_PROGRAM} ${MAKE_FLAGS}
@@ -36,4 +38,5 @@ do-install:
${INSTALL_MAN} ${WRKSRC}/arch/$${arch}/man/man1/sh.1 \
${PREFIX}/man/man1/ksh93.1
+.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/shells/bash2/Makefile b/shells/bash2/Makefile
index c9299ed1f22..88f3fa52794 100644
--- a/shells/bash2/Makefile
+++ b/shells/bash2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2002/09/26 22:06:29 jlam Exp $
+# $NetBSD: Makefile,v 1.36 2002/11/17 09:02:00 salo Exp $
#
DISTNAME= bash-2.05
@@ -17,6 +17,8 @@ USE_BUILDLINK2= no
GNU_CONFIGURE= yes
MAKE_ENV+= INSTALL_SCRIPT='${INSTALL_SCRIPT}'
+PKG_SHELL= ${PREFIX}/bin/bash
+
.include "../../mk/bsd.prefs.mk"
.if defined(BASH_STATIC) && ${BASH_STATIC} == YES
@@ -57,11 +59,8 @@ pre-configure:
post-install:
${INSTALL_MAN} ${WRKSRC}/doc/bash.1 ${PREFIX}/man/man1
${INSTALL_MAN} ${WRKSRC}/doc/bashbug.1 ${PREFIX}/man/man1
- ${TOUCH} /etc/shells
- ${CP} /etc/shells /etc/shells.bak
- (${GREP} -v ${PREFIX}/bin/bash /etc/shells.bak || ${TRUE}; ${ECHO} ${PREFIX}/bin/bash) >/etc/shells
- ${RM} /etc/shells.bak
+.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
CPPFLAGS:= -I${GETTEXTDIR}/include ${CPPFLAGS}
diff --git a/shells/bash2/PLIST b/shells/bash2/PLIST
index 26f9e75a3b9..706ba24ce77 100644
--- a/shells/bash2/PLIST
+++ b/shells/bash2/PLIST
@@ -1,7 +1,5 @@
-@comment $NetBSD: PLIST,v 1.3 2002/09/26 22:06:30 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/11/17 09:02:00 salo Exp $
bin/bash
-@exec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak || true; echo %D/%F) >/etc/shells
-@unexec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak || true) >/etc/shells
bin/bashbug
man/man1/bash.1
man/man1/bashbug.1
diff --git a/shells/es/Makefile b/shells/es/Makefile
index ee42658d3e1..3b5f439e88c 100644
--- a/shells/es/Makefile
+++ b/shells/es/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/02/17 17:40:19 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2002/11/17 09:02:00 salo Exp $
# FreeBSD Id: Makefile,v 1.4 1996/11/18 11:39:46 asami Exp
#
@@ -13,4 +13,7 @@ COMMENT= Extensible shell, derived from plan9's rc
MANCOMPRESSED= yes
+PKG_SHELL= ${PREFIX}/bin/es
+
+.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/shells/esh/Makefile b/shells/esh/Makefile
index 60aec5abb24..2ead43facf1 100644
--- a/shells/esh/Makefile
+++ b/shells/esh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2002/02/18 15:14:40 seb Exp $
+# $NetBSD: Makefile,v 1.11 2002/11/17 09:02:00 salo Exp $
DISTNAME= esh-0.8
CATEGORIES= shells
@@ -10,6 +10,8 @@ COMMENT= Unix shell with Lisp-like syntax
WRKSRC= ${WRKDIR}/esh
INFO_FILES= esh.info
+PKG_SHELL= ${PREFIX}/bin/esh
+
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/esh ${PREFIX}/bin
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/esh
@@ -24,4 +26,5 @@ do-install:
${PREFIX}/share/doc/esh/
.include "../../mk/texinfo.mk"
+.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/shells/osh/Makefile b/shells/osh/Makefile
index 7a1e4670425..58075ebe5de 100644
--- a/shells/osh/Makefile
+++ b/shells/osh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/08/20 20:52:29 cjep Exp $
+# $NetBSD: Makefile,v 1.2 2002/11/17 09:02:01 salo Exp $
# FreeBSD Id: ports/shells/osh/Makefile,v 1.3 2002/01/29 11:58:43 knu Exp
DISTNAME= osh-020214
@@ -10,11 +10,7 @@ COMMENT= Implementation of the UNIX 6th Edition shell
MAKEFILE= makefile
-post-install:
- @${ECHO} "updating /etc/shells"; \
- ${TOUCH} /etc/shells; \
- ${CP} /etc/shells /etc/shells.bak; \
- (${GREP} -v '${PREFIX}/bin/osh' /etc/shells.bak || ${TRUE}; \
- ${ECHO} "${PREFIX}/bin/osh") > /etc/shells
+PKG_SHELL= ${PREFIX}/bin/osh
+.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/shells/osh/PLIST b/shells/osh/PLIST
index 1f69f65ba59..555970aefa2 100644
--- a/shells/osh/PLIST
+++ b/shells/osh/PLIST
@@ -1,9 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/08/20 20:52:29 cjep Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/11/17 09:02:01 salo Exp $
bin/goto
bin/if
bin/osh
-@exec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells
-@unexec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells
man/man1/goto.1
man/man1/if.1
man/man1/osh.1
diff --git a/shells/rc/Makefile b/shells/rc/Makefile
index f377ee40c04..95de4cf25db 100644
--- a/shells/rc/Makefile
+++ b/shells/rc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2001/02/17 17:40:20 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2002/11/17 09:02:01 salo Exp $
# FreeBSD Id: Makefile,v 1.3 1996/11/12 02:19:38 obrien Exp
#
@@ -13,4 +13,7 @@ COMMENT= Unix incarnation of the plan9 shell
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-history
+PKG_SHELL= ${PREFIX}/bin/rc
+
+.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/shells/scsh/Makefile b/shells/scsh/Makefile
index 7f611a178fd..ae9d4351922 100644
--- a/shells/scsh/Makefile
+++ b/shells/scsh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2002/04/01 03:13:41 uebayasi Exp $
+# $NetBSD: Makefile,v 1.18 2002/11/17 09:02:01 salo Exp $
# FreeBSD Id: Makefile,v 1.4 1997/07/15 15:00:30 cracauer Exp
#
@@ -19,6 +19,8 @@ MAKE_ENV= INSTALL_PROGRAM='${INSTALL_PROGRAM}' \
INSTALL_SCRIPT='${INSTALL_SCRIPT}' \
INSTALL_DATA='${INSTALL_DATA}'
+PKG_SHELL= ${PREFIX}/bin/scsh
+
post-configure:
cd ${WRKSRC}; ${SED} -e '/LIBGEN/d' sysdep.h >xx ; ${MV} xx sysdep.h
@@ -29,4 +31,5 @@ post-install:
${RM} -f ${PREFIX}/share/doc/scsh
${LN} -fs ${PREFIX}/lib/scsh/doc ${PREFIX}/share/doc/scsh
+.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/shells/standalone-tcsh/Makefile b/shells/standalone-tcsh/Makefile
index 723b9b23397..bec103afd7c 100644
--- a/shells/standalone-tcsh/Makefile
+++ b/shells/standalone-tcsh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/10/31 11:55:30 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2002/11/17 09:02:01 salo Exp $
#
NO_MTREE= YES
@@ -6,6 +6,8 @@ NO_MTREE= YES
WRKSRC= ${WRKDIR}/${DISTNAME}
PKGNAME= standalone-${DISTNAME}
+PKG_SHELL= /bin/tcsh
+
.include "../../shells/tcsh/Makefile"
COMMENT:= Standalone version of the ${COMMENT}
diff --git a/shells/standalone-tcsh/PLIST b/shells/standalone-tcsh/PLIST
index c4286d245d9..17d26995f3e 100644
--- a/shells/standalone-tcsh/PLIST
+++ b/shells/standalone-tcsh/PLIST
@@ -1,5 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:27:01 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/11/17 09:02:01 salo Exp $
bin/tcsh
-@exec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v '^%D%F$' /etc/shells.bak || true; echo %D%F) >/etc/shells
-@unexec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v '^%D%F$' /etc/shells.bak || true) >/etc/shells
usr/share/man/man1/tcsh.1
diff --git a/shells/tcsh/Makefile b/shells/tcsh/Makefile
index 5a5476df6fd..a79422cdcb8 100644
--- a/shells/tcsh/Makefile
+++ b/shells/tcsh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2002/09/30 23:54:07 jlam Exp $
+# $NetBSD: Makefile,v 1.40 2002/11/17 09:02:01 salo Exp $
#
DISTNAME= tcsh-6.12.00
@@ -27,6 +27,8 @@ OS_VERSION!= ${ECHO} ${OS_VERSION} | ${SED} -e 's|5\.|2.|'
LOWER_OPSYS= solaris${OS_VERSION}
.endif
+PKG_SHELL?= ${PREFIX}/bin/tcsh
+
post-install:
@${ECHO} "Installing message catalogues"
@[ -d ${PREFIX}/${NLSDIR}/C ] || \
@@ -72,18 +74,6 @@ post-install:
shift 1; \
done; \
done
- @${ECHO} "updating /etc/shells"; \
- ${TOUCH} /etc/shells; \
- ${CP} /etc/shells /etc/shells.bak; \
- if [ "${PREFIX}" = / ];then \
- TCSHPATH=/bin/tcsh; \
- else \
- TCSHPATH=${PREFIX}/bin/tcsh; \
- fi; \
- ( \
- ${GREP} -v '^$${TCSHPATH}$$' /etc/shells.bak || \
- ${TRUE}; \
- ${ECHO} $${TCSHPATH} \
- ) >/etc/shells
+.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/shells/tcsh/PLIST b/shells/tcsh/PLIST
index eff5a459874..3142a370ac3 100644
--- a/shells/tcsh/PLIST
+++ b/shells/tcsh/PLIST
@@ -1,5 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:27:01 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/11/17 09:02:02 salo Exp $
bin/tcsh
-@exec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak || true; echo %D/%F) >/etc/shells
-@unexec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak || true) >/etc/shells
man/man1/tcsh.1
diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile
index a31d4c8a362..66096deb700 100644
--- a/shells/zsh/Makefile
+++ b/shells/zsh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2002/08/25 21:50:50 jlam Exp $
+# $NetBSD: Makefile,v 1.36 2002/11/17 09:02:02 salo Exp $
DISTNAME= zsh-4.0.6
CATEGORIES= shells
@@ -34,15 +34,14 @@ PLIST_SRC= ${PKGDIR}/PLIST.shlibs ${PKGDIR}/PLIST.dynamic ${PKGDIR}/PLIST
.undef MANZ
+PKG_SHELL= ${PREFIX}/bin/zsh
+
post-install:
@cd ${WRKSRC}/Doc; ${MAKE} install.info
@${INSTALL_DATA_DIR} ${PREFIX}/share/doc/zsh
@cd ${WRKSRC}/Etc; ${INSTALL_DATA} BUGS FAQ FEATURES NEWS \
${PREFIX}/share/doc/zsh
- ${TOUCH} /etc/shells
- ${CP} /etc/shells /etc/shells.bak
- (${GREP} -v ${PREFIX}/bin/zsh /etc/shells.bak || ${TRUE}; ${ECHO} ${PREFIX}/bin/zsh) >/etc/shells
- ${RM} /etc/shells.bak
.include "../../mk/texinfo.mk"
+.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/shells/zsh/PLIST b/shells/zsh/PLIST
index d73d6822228..4cc10397397 100644
--- a/shells/zsh/PLIST
+++ b/shells/zsh/PLIST
@@ -1,7 +1,5 @@
-@comment $NetBSD: PLIST,v 1.6 2002/08/25 21:50:51 jlam Exp $
+@comment $NetBSD: PLIST,v 1.7 2002/11/17 09:02:02 salo Exp $
bin/zsh
-@exec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak || true; echo %D/%F) >/etc/shells
-@unexec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak || true) >/etc/shells
bin/${PKGNAME}
@unexec ${INSTALL_INFO} --delete %D/info/zsh.info %D/info/dir
info/zsh.info
diff --git a/shells/zsh3/Makefile b/shells/zsh3/Makefile
index a64d4e57dbe..175575a71e1 100644
--- a/shells/zsh3/Makefile
+++ b/shells/zsh3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/02/18 15:14:40 seb Exp $
+# $NetBSD: Makefile,v 1.4 2002/11/17 09:02:02 salo Exp $
DISTNAME= zsh-3.0.8
CATEGORIES= shells
@@ -22,11 +22,8 @@ TEXINFO_OVERRIDE= YES
LDFLAGS+= -static
.endif
-post-install:
- ${TOUCH} /etc/shells
- ${CP} /etc/shells /etc/shells.bak
- (${GREP} -v ${PREFIX}/bin/zsh /etc/shells.bak || ${TRUE}; ${ECHO} ${PREFIX}/bin/zsh) >/etc/shells
- ${RM} /etc/shells.bak
+PKG_SHELL= ${PREFIX}/bin/zsh
+.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/texinfo.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/shells/zsh3/PLIST b/shells/zsh3/PLIST
index 89b72ba52af..a39698b2466 100644
--- a/shells/zsh3/PLIST
+++ b/shells/zsh3/PLIST
@@ -1,7 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:40 seb Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/11/17 09:02:02 salo Exp $
bin/zsh
-@exec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak || true; echo %D/%F) >/etc/shells
-@unexec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak || true) >/etc/shells
bin/${PKGNAME}
@unexec ${INSTALL_INFO} --delete %D/info/zsh.info %D/info/dir
info/zsh.info
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-11 10:39:05 +0000