summaryrefslogtreecommitdiff
path: root/shells
diff options
context:
space:
mode:
authoragc <agc@pkgsrc.org>1998-04-17 09:37:21 +0000
committeragc <agc@pkgsrc.org>1998-04-17 09:37:21 +0000
commit5201e684973709478cd0e0f268310adadacc4284 (patch)
tree4de4a4b8d8e63fa381b709cba28651c135f8773b /shells
parent9f424e887024bd828f9677f6a93441bdf95c2e6f (diff)
downloadpkgsrc-5201e684973709478cd0e0f268310adadacc4284.tar.gz
Introduce USE_GTEXINFO and INFO_FILES definitions to bsd.pkg.mk, and use them.
Diffstat (limited to 'shells')
-rw-r--r--shells/bash2/Makefile9
-rw-r--r--shells/zsh/Makefile13
2 files changed, 4 insertions, 18 deletions
diff --git a/shells/bash2/Makefile b/shells/bash2/Makefile
index 2cc0a70b2ae..52cb96975f4 100644
--- a/shells/bash2/Makefile
+++ b/shells/bash2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:48 agc Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/17 09:37:25 agc Exp $
# FreeBSD Id: Makefile,v 1.26 1997/06/27 23:03:27 ache Exp
#
@@ -12,17 +12,12 @@ DISTFILES= bash-2.01.tar.gz bash-doc-2.01.tar.gz
MAINTAINER= ache@FreeBSD.ORG
-BUILD_DEPENDS= ${PREFIX}/bin/install-info:${PORTSDIR}/devel/gtexinfo
-RUN_DEPENDS= ${PREFIX}/bin/install-info:${PORTSDIR}/devel/gtexinfo
-
GNU_CONFIGURE= Yes
MAN1= bash.1 bashbug.1
+USE_GTEXINFO= yes
pre-install:
strip ${WRKSRC}/bash
- if [ ! -s ${PREFIX}/info/dir ]; then \
- ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
- fi
post-install:
${CP} /etc/shells /etc/shells.bak
diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile
index babdf4d7450..3c118a1cd7f 100644
--- a/shells/zsh/Makefile
+++ b/shells/zsh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1998/04/15 10:38:48 agc Exp $
+# $NetBSD: Makefile,v 1.7 1998/04/17 09:37:25 agc Exp $
# FreeBSD Id: Makefile,v 1.26 1997/09/26 08:23:14 torstenb Exp
#
@@ -16,15 +16,10 @@ MASTER_SITES= ftp://ftp.math.gatech.edu/pub/zsh/ \
MAINTAINER= torstenb@FreeBSD.ORG
-OPSYS!= uname -s
-.if (${OPSYS} == "NetBSD")
-BUILD_DEPENDS= ${PREFIX}/bin/install-info:${PORTSDIR}/devel/gtexinfo
-RUN_DEPENDS= ${PREFIX}/bin/install-info:${PORTSDIR}/devel/gtexinfo
-.endif
-
GNU_CONFIGURE= yes
MAN1= zsh.1 zshbuiltins.1 zshcompctl.1 zshexpn.1 zshmisc.1 \
zshoptions.1 zshall.1 zshparam.1 zshzle.1
+INFO_FILES= zsh
# If you want to build a static binary, uncomment the following line
#LDFLAGS+=-static
@@ -33,9 +28,5 @@ post-install:
${CP} /etc/shells /etc/shells.bak
(${GREP} -v ${PREFIX}/bin/zsh /etc/shells.bak; ${ECHO} ${PREFIX}/bin/zsh) >/etc/shells
${RM} /etc/shells.bak
- @if [ ! -f ${PREFIX}/info/dir ]; then \
- ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
- fi
- @${PREFIX}/bin/install-info ${PREFIX}/info/zsh.info ${PREFIX}/info/dir
.include "../../mk/bsd.pkg.mk"