Remove the test to create ${PREFIX}/share/info/dir as it is now

in bsd.port.mk and this helps to unify the check and install.

14 files changed, 7 insertions, 42 deletions

diff --git a/shells/bash/Makefile b/shells/bash/Makefile
index ffa738a9ff4e..211c8940b7a2 100644
--- a/shells/bash/Makefile
+++ b/shells/bash/Makefile
@@ -3,7 +3,7 @@
 # Date created:		21 August 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.33 1999/04/19 08:42:20 cracauer Exp $
+# $Id: Makefile,v 1.35 1999/05/28 05:16:08 ache Exp $
 #
 
 DISTNAME=       bash-2.03
@@ -21,11 +21,6 @@ GNU_CONFIGURE=	Yes
 CONFIGURE_ARGS= --with-installed-readline
 MAN1=		bash.1 bashbug.1
 
-pre-install:
-	if [ ! -s ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \
-	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
-
 post-install:
 	${CP} /etc/shells /etc/shells.bak
 	(${GREP} -v ${PREFIX}/bin/bash /etc/shells.bak; echo ${PREFIX}/bin/bash) >/etc/shells
diff --git a/shells/bash/pkg-plist b/shells/bash/pkg-plist
index cc0addc5710d..a35ec68f292c 100644
--- a/shells/bash/pkg-plist
+++ b/shells/bash/pkg-plist
@@ -4,7 +4,6 @@ bin/bash
 bin/bashbug
 @unexec install-info --delete %D/info/bash.info %D/info/dir
 info/bash.info
-@exec [ -f %D/info/dir -o ! -f /usr/share/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 share/doc/bash/article.ps.gz
 share/doc/bash/bashref.ps.gz
 share/doc/bash/article.txt
diff --git a/shells/bash1/Makefile b/shells/bash1/Makefile
index 4132c89a7adc..0861405d4e0a 100644
--- a/shells/bash1/Makefile
+++ b/shells/bash1/Makefile
@@ -4,7 +4,7 @@
 # Date created:		21 August 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.28 1999/01/27 07:41:26 fenner Exp $
+# $Id: Makefile,v 1.30 1999/03/30 01:31:42 obrien Exp $
 #
 
 DISTNAME=       bash-1.14.7
@@ -21,9 +21,6 @@ NOMANCOMPRESS=	yes
 MAN1=		bash.1 bash_builtins.1
 
 post-install:
-	@if [ ! -f ${PREFIX}/info/dir ]; then \
-	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	 fi
 	@install-info ${PREFIX}/info/bash.info ${PREFIX}/info/dir
 
 .include <bsd.port.mk>
diff --git a/shells/bash1/pkg-plist b/shells/bash1/pkg-plist
index 23adcc6bb7b4..fcb5fca0ab20 100644
--- a/shells/bash1/pkg-plist
+++ b/shells/bash1/pkg-plist
@@ -4,5 +4,4 @@ bin/bash
 bin/bashbug
 @unexec install-info --delete %D/info/bash.info %D/info/dir
 info/bash.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/bash.info %D/info/dir
diff --git a/shells/bash2/Makefile b/shells/bash2/Makefile
index ffa738a9ff4e..211c8940b7a2 100644
--- a/shells/bash2/Makefile
+++ b/shells/bash2/Makefile
@@ -3,7 +3,7 @@
 # Date created:		21 August 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.33 1999/04/19 08:42:20 cracauer Exp $
+# $Id: Makefile,v 1.35 1999/05/28 05:16:08 ache Exp $
 #
 
 DISTNAME=       bash-2.03
@@ -21,11 +21,6 @@ GNU_CONFIGURE=	Yes
 CONFIGURE_ARGS= --with-installed-readline
 MAN1=		bash.1 bashbug.1
 
-pre-install:
-	if [ ! -s ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \
-	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
-
 post-install:
 	${CP} /etc/shells /etc/shells.bak
 	(${GREP} -v ${PREFIX}/bin/bash /etc/shells.bak; echo ${PREFIX}/bin/bash) >/etc/shells
diff --git a/shells/bash2/pkg-plist b/shells/bash2/pkg-plist
index cc0addc5710d..a35ec68f292c 100644
--- a/shells/bash2/pkg-plist
+++ b/shells/bash2/pkg-plist
@@ -4,7 +4,6 @@ bin/bash
 bin/bashbug
 @unexec install-info --delete %D/info/bash.info %D/info/dir
 info/bash.info
-@exec [ -f %D/info/dir -o ! -f /usr/share/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 share/doc/bash/article.ps.gz
 share/doc/bash/bashref.ps.gz
 share/doc/bash/article.txt
diff --git a/shells/bash3/Makefile b/shells/bash3/Makefile
index ffa738a9ff4e..211c8940b7a2 100644
--- a/shells/bash3/Makefile
+++ b/shells/bash3/Makefile
@@ -3,7 +3,7 @@
 # Date created:		21 August 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.33 1999/04/19 08:42:20 cracauer Exp $
+# $Id: Makefile,v 1.35 1999/05/28 05:16:08 ache Exp $
 #
 
 DISTNAME=       bash-2.03
@@ -21,11 +21,6 @@ GNU_CONFIGURE=	Yes
 CONFIGURE_ARGS= --with-installed-readline
 MAN1=		bash.1 bashbug.1
 
-pre-install:
-	if [ ! -s ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \
-	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
-
 post-install:
 	${CP} /etc/shells /etc/shells.bak
 	(${GREP} -v ${PREFIX}/bin/bash /etc/shells.bak; echo ${PREFIX}/bin/bash) >/etc/shells
diff --git a/shells/bash3/pkg-plist b/shells/bash3/pkg-plist
index cc0addc5710d..a35ec68f292c 100644
--- a/shells/bash3/pkg-plist
+++ b/shells/bash3/pkg-plist
@@ -4,7 +4,6 @@ bin/bash
 bin/bashbug
 @unexec install-info --delete %D/info/bash.info %D/info/dir
 info/bash.info
-@exec [ -f %D/info/dir -o ! -f /usr/share/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 share/doc/bash/article.ps.gz
 share/doc/bash/bashref.ps.gz
 share/doc/bash/article.txt
diff --git a/shells/esh/Makefile b/shells/esh/Makefile
index 7340a1033db4..1adc6fd9ffd5 100644
--- a/shells/esh/Makefile
+++ b/shells/esh/Makefile
@@ -3,7 +3,7 @@
 # Date created:				05/20/1999
 # Whom:					nectar@FreeBSD.ORG
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1999/05/28 21:01:50 nectar Exp $
 #
 
 DISTNAME=		esh-0.8
@@ -23,10 +23,6 @@ do-install:
 	  ${ECHO} ${PREFIX}/bin/esh) > /etc/shells
 	@${RM} /etc/shells.bak
 .if !defined(NOPORTDOCS)
-	if [ -f ${PREFIX}/info/dir ]; then                             \
-	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir >                \
-	    ${PREFIX}/info/dir;                                        \
-	fi
 	${INSTALL_DATA} ${WRKSRC}/doc/esh.info ${PREFIX}/info/esh.info
 	install-info ${PREFIX}/info/esh.info ${PREFIX}/info/dir
 .endif
diff --git a/shells/esh/pkg-plist b/shells/esh/pkg-plist
index d325c90e3646..85dea259589a 100644
--- a/shells/esh/pkg-plist
+++ b/shells/esh/pkg-plist
@@ -3,5 +3,4 @@ bin/esh
 @unexec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells
 @unexec install-info --delete %D/info/esh.info %D/info/dir
 info/esh.info
-@exec test -f %D/info/dir || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/esh.info %D/info/dir
diff --git a/shells/zsh-devel/Makefile b/shells/zsh-devel/Makefile
index 5804e5cc16f4..779bf7ab1581 100644
--- a/shells/zsh-devel/Makefile
+++ b/shells/zsh-devel/Makefile
@@ -3,7 +3,7 @@
 # Date created:			31 October 1998
 # Whom:				shige
 #
-# $Id: Makefile,v 1.29 1998/12/24 08:01:22 steve Exp $
+# $Id: Makefile,v 1.30 1999/03/01 09:38:19 shige Exp $
 #
 
 DISTNAME=	zsh-3.1.5
@@ -29,9 +29,6 @@ MAN1=		zsh.1 zshbuiltins.1 zshcompctl.1 zshexpn.1 zshmisc.1 \
 #LDFLAGS+=-static
 
 post-install:
-	@if [ ! -f ${PREFIX}/info/dir ]; then \
-	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	 fi
 	@install-info ${PREFIX}/info/zsh.info ${PREFIX}/info/dir
 	@${ECHO} "Updating /etc/shells"
 	@${CP} /etc/shells /etc/shells.bak
diff --git a/shells/zsh-devel/pkg-plist b/shells/zsh-devel/pkg-plist
index defb84dff95c..43d5a6f22e95 100644
--- a/shells/zsh-devel/pkg-plist
+++ b/shells/zsh-devel/pkg-plist
@@ -4,5 +4,4 @@ bin/zsh
 bin/zsh-3.1.5
 @unexec install-info --delete %D/info/zsh.info %D/info/dir
 info/zsh.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/zsh.info %D/info/dir
diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile
index e34b675202e7..e7f64ffc3739 100644
--- a/shells/zsh/Makefile
+++ b/shells/zsh/Makefile
@@ -3,7 +3,7 @@
 # Date created:			11 Feb. 1995
 # Whom:				torstenb
 #
-# $Id: Makefile,v 1.26 1997/09/26 08:23:14 torstenb Exp $
+# $Id: Makefile,v 1.27 1998/08/27 02:33:51 max Exp $
 #
 
 DISTNAME=       zsh-3.0.5
@@ -28,9 +28,6 @@ MAN1=		zsh.1 zshbuiltins.1 zshcompctl.1 zshexpn.1 zshmisc.1 \
 #LDFLAGS+=-static
 
 post-install:
-	@if [ ! -f ${PREFIX}/info/dir ]; then \
-	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	 fi
 	@install-info ${PREFIX}/info/zsh.info ${PREFIX}/info/dir
 	@${ECHO} "Updating /etc/shells"
 	@${CP} /etc/shells /etc/shells.bak
diff --git a/shells/zsh/pkg-plist b/shells/zsh/pkg-plist
index 5086482c444e..e49ae44837dc 100644
--- a/shells/zsh/pkg-plist
+++ b/shells/zsh/pkg-plist
@@ -4,6 +4,5 @@ bin/zsh
 bin/zsh-3.0.5
 @unexec install-info --delete %D/info/zsh.info %D/info/dir
 info/zsh.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/zsh.info %D/info/dir
 info/dir