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.

309 files changed, 151 insertions, 767 deletions

diff --git a/archivers/gshar+gunshar/Makefile b/archivers/gshar+gunshar/Makefile
index e6ce7505aed5..8f9bd80108b2 100644
--- a/archivers/gshar+gunshar/Makefile
+++ b/archivers/gshar+gunshar/Makefile
@@ -3,7 +3,7 @@
 # Date created:         28 Dec 1994
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.12 1998/01/23 00:43:26 jseger Exp $
+# $Id: Makefile,v 1.13 1999/01/27 07:41:03 fenner Exp $
 #
 
 DISTNAME=       sharutils-4.2
@@ -25,9 +25,6 @@ post-install:
 .for file in gshar gunshar
 	strip ${PREFIX}/bin/${file}
 .endfor
-	if [ ! -f ${PREFIX}/info/dir ]; then \
-	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 .for info in remsync.info sharutils.info
 	install-info ${PREFIX}/info/${info} ${PREFIX}/info/dir
 .endfor
diff --git a/archivers/gshar+gunshar/pkg-plist b/archivers/gshar+gunshar/pkg-plist
index cf2b1b8e64f5..cf4a2c1169c8 100644
--- a/archivers/gshar+gunshar/pkg-plist
+++ b/archivers/gshar+gunshar/pkg-plist
@@ -7,7 +7,6 @@ bin/gunshar
 @unexec install-info --delete %D/info/remsync.info %D/info/dir
 info/sharutils.info
 info/remsync.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/sharutils.info %D/info/dir
 @exec install-info %D/info/remsync.info %D/info/dir
 lib/locale/de/LC_MESSAGES/sharutils.cat
diff --git a/archivers/gtar/Makefile b/archivers/gtar/Makefile
index e7e0926e3342..b84f7ea54ab9 100644
--- a/archivers/gtar/Makefile
+++ b/archivers/gtar/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Sa   6 Jun 1998 10:24:51 CEST
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.3 1998/12/24 19:16:27 asami Exp $
+# $Id: Makefile,v 1.4 1999/01/27 07:41:27 fenner Exp $
 #
 
 DISTNAME=	tar-1.12
@@ -16,9 +16,4 @@ MAINTAINER=	andreas@FreeBSD.ORG
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=--program-prefix=g
 
-pre-install:
-	if [ ! -f ${PREFIX}/info/dir ]; then \
-	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
-
 .include <bsd.port.mk>
diff --git a/archivers/gtar/pkg-plist b/archivers/gtar/pkg-plist
index e0e7c37bbc6c..e82dcfb64109 100644
--- a/archivers/gtar/pkg-plist
+++ b/archivers/gtar/pkg-plist
@@ -20,5 +20,4 @@ info/tar.info-4
 info/tar.info-5
 info/tar.info-6
 info/tar.info-7
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/tar.info %D/info/dir
diff --git a/archivers/sharutils/Makefile b/archivers/sharutils/Makefile
index e6ce7505aed5..8f9bd80108b2 100644
--- a/archivers/sharutils/Makefile
+++ b/archivers/sharutils/Makefile
@@ -3,7 +3,7 @@
 # Date created:         28 Dec 1994
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.12 1998/01/23 00:43:26 jseger Exp $
+# $Id: Makefile,v 1.13 1999/01/27 07:41:03 fenner Exp $
 #
 
 DISTNAME=       sharutils-4.2
@@ -25,9 +25,6 @@ post-install:
 .for file in gshar gunshar
 	strip ${PREFIX}/bin/${file}
 .endfor
-	if [ ! -f ${PREFIX}/info/dir ]; then \
-	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 .for info in remsync.info sharutils.info
 	install-info ${PREFIX}/info/${info} ${PREFIX}/info/dir
 .endfor
diff --git a/archivers/sharutils/pkg-plist b/archivers/sharutils/pkg-plist
index cf2b1b8e64f5..cf4a2c1169c8 100644
--- a/archivers/sharutils/pkg-plist
+++ b/archivers/sharutils/pkg-plist
@@ -7,7 +7,6 @@ bin/gunshar
 @unexec install-info --delete %D/info/remsync.info %D/info/dir
 info/sharutils.info
 info/remsync.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/sharutils.info %D/info/dir
 @exec install-info %D/info/remsync.info %D/info/dir
 lib/locale/de/LC_MESSAGES/sharutils.cat
diff --git a/comms/mgetty+sendfax/pkg-plist b/comms/mgetty+sendfax/pkg-plist
index b22819424393..4c89c021b2ab 100644
--- a/comms/mgetty+sendfax/pkg-plist
+++ b/comms/mgetty+sendfax/pkg-plist
@@ -40,7 +40,6 @@ etc/mgetty+sendfax/login.config
 @unexec rm -f %D/etc/mgetty+sendfax/faxheader %D/etc/mgetty+sendfax/mgetty.config* %D/etc/mgetty+sendfax/sendfax.config*
 @unexec install-info --delete %D/info/mgetty.info %D/info/dir
 info/mgetty.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/mgetty.info %D/info/dir
 lib/mgetty+sendfax/cour25.pbm
 lib/mgetty+sendfax/cour25n.pbm
diff --git a/databases/gdbm/Makefile b/databases/gdbm/Makefile
index ff8a8b0ad6a0..6fd66f12b6b4 100644
--- a/databases/gdbm/Makefile
+++ b/databases/gdbm/Makefile
@@ -3,7 +3,7 @@
 # Date created:		8 Apr 1996
 # Whom:			Brent J. Nordquist <bjn@visi.com>
 #
-# $Id: Makefile,v 1.5 1998/02/15 17:00:57 steve Exp $
+# $Id: Makefile,v 1.6 1999/01/17 04:01:49 fenner Exp $
 #
 
 DISTNAME=          gdbm-1.7.3
@@ -18,9 +18,6 @@ MAKE_FLAGS=        CFLAGS="${CFLAGS}" LDFLAGS=-s -f
 MAN3=		   gdbm.3
 
 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/gdbm.info ${PREFIX}/info/dir
 
 .include <bsd.port.mk>
diff --git a/databases/gdbm/pkg-plist b/databases/gdbm/pkg-plist
index abc58d7f6079..8380765019e0 100644
--- a/databases/gdbm/pkg-plist
+++ b/databases/gdbm/pkg-plist
@@ -1,6 +1,5 @@
 include/gdbm.h
 @unexec install-info --delete %D/info/gdbm.info %D/info/dir
 info/gdbm.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/gdbm.info %D/info/dir
 lib/libgdbm.a
diff --git a/databases/gnats/Makefile b/databases/gnats/Makefile
index a14186c38830..b1e7e24083b0 100644
--- a/databases/gnats/Makefile
+++ b/databases/gnats/Makefile
@@ -3,7 +3,7 @@
 # Date created:		10 November 1995
 # Whom:			pst
 #
-# $Id: Makefile,v 1.20 1999/04/09 05:42:36 pst Exp $
+# $Id: Makefile,v 1.21 1999/04/14 00:02:46 scrappy Exp $
 #
 
 DISTNAME=	gnats-3.110
@@ -45,9 +45,6 @@ pre-install:
 post-install:
 	(cd ${WRKSRC}/gnats;   ${MAKE} install-info)
 	(cd ${WRKSRC}/send-pr; ${MAKE} install-info)
-	if [ ! -f ${PREFIX}/info/dir ]; then \
-	  sed -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 	install-info ${PREFIX}/info/gnats.info   ${PREFIX}/info/dir
 	install-info ${PREFIX}/info/send-pr.info ${PREFIX}/info/dir
 
diff --git a/databases/gnats/pkg-plist b/databases/gnats/pkg-plist
index 7833e485e619..527350ca8842 100644
--- a/databases/gnats/pkg-plist
+++ b/databases/gnats/pkg-plist
@@ -14,7 +14,6 @@ info/gnats.info-2
 info/gnats.info-3
 info/gnats.info-4
 info/send-pr.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu://' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/gnats.info %D/info/dir
 @exec install-info %D/info/send-pr.info %D/info/dir
 libexec/gnats/at-pr
diff --git a/databases/mysql322-client/Makefile b/databases/mysql322-client/Makefile
index b6bceb059f5e..2046ef3e2a4c 100644
--- a/databases/mysql322-client/Makefile
+++ b/databases/mysql322-client/Makefile
@@ -3,7 +3,7 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.51 1999/05/25 06:47:33 peter Exp $
+# $Id: Makefile,v 1.52 1999/06/05 19:00:17 mharo Exp $
 #
 
 DISTNAME=	mysql-3.22.22
@@ -90,9 +90,6 @@ post-install:
 .for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi
 	${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql
 .endfor
-	@if [ ! -f ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \
-		${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 	${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
 	@install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir
 .endif
diff --git a/databases/mysql322-server/Makefile b/databases/mysql322-server/Makefile
index b6bceb059f5e..2046ef3e2a4c 100644
--- a/databases/mysql322-server/Makefile
+++ b/databases/mysql322-server/Makefile
@@ -3,7 +3,7 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.51 1999/05/25 06:47:33 peter Exp $
+# $Id: Makefile,v 1.52 1999/06/05 19:00:17 mharo Exp $
 #
 
 DISTNAME=	mysql-3.22.22
@@ -90,9 +90,6 @@ post-install:
 .for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi
 	${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql
 .endfor
-	@if [ ! -f ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \
-		${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 	${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
 	@install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir
 .endif
diff --git a/databases/mysql322-server/pkg-plist b/databases/mysql322-server/pkg-plist
index 5cfc474e98bf..c647c5cff847 100644
--- a/databases/mysql322-server/pkg-plist
+++ b/databases/mysql322-server/pkg-plist
@@ -30,7 +30,6 @@ include/mysql/mysql_version.h
 include/mysql/mysqld_error.h
 @unexec install-info --delete %D/info/mysql.info %D/info/dir
 info/mysql.info
-@exec [ -f %D/info/dir -o ! -f /usr/share/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/mysql.info %D/info/dir
 lib/mysql/libdbug.a
 lib/mysql/libheap.a
diff --git a/databases/mysql323-client/Makefile b/databases/mysql323-client/Makefile
index b6bceb059f5e..2046ef3e2a4c 100644
--- a/databases/mysql323-client/Makefile
+++ b/databases/mysql323-client/Makefile
@@ -3,7 +3,7 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.51 1999/05/25 06:47:33 peter Exp $
+# $Id: Makefile,v 1.52 1999/06/05 19:00:17 mharo Exp $
 #
 
 DISTNAME=	mysql-3.22.22
@@ -90,9 +90,6 @@ post-install:
 .for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi
 	${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql
 .endfor
-	@if [ ! -f ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \
-		${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 	${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
 	@install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir
 .endif
diff --git a/databases/mysql323-server/Makefile b/databases/mysql323-server/Makefile
index b6bceb059f5e..2046ef3e2a4c 100644
--- a/databases/mysql323-server/Makefile
+++ b/databases/mysql323-server/Makefile
@@ -3,7 +3,7 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.51 1999/05/25 06:47:33 peter Exp $
+# $Id: Makefile,v 1.52 1999/06/05 19:00:17 mharo Exp $
 #
 
 DISTNAME=	mysql-3.22.22
@@ -90,9 +90,6 @@ post-install:
 .for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi
 	${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql
 .endfor
-	@if [ ! -f ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \
-		${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 	${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
 	@install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir
 .endif
diff --git a/databases/mysql323-server/pkg-plist b/databases/mysql323-server/pkg-plist
index 5cfc474e98bf..c647c5cff847 100644
--- a/databases/mysql323-server/pkg-plist
+++ b/databases/mysql323-server/pkg-plist
@@ -30,7 +30,6 @@ include/mysql/mysql_version.h
 include/mysql/mysqld_error.h
 @unexec install-info --delete %D/info/mysql.info %D/info/dir
 info/mysql.info
-@exec [ -f %D/info/dir -o ! -f /usr/share/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/mysql.info %D/info/dir
 lib/mysql/libdbug.a
 lib/mysql/libheap.a
diff --git a/databases/mysql40-client/Makefile b/databases/mysql40-client/Makefile
index b6bceb059f5e..2046ef3e2a4c 100644
--- a/databases/mysql40-client/Makefile
+++ b/databases/mysql40-client/Makefile
@@ -3,7 +3,7 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.51 1999/05/25 06:47:33 peter Exp $
+# $Id: Makefile,v 1.52 1999/06/05 19:00:17 mharo Exp $
 #
 
 DISTNAME=	mysql-3.22.22
@@ -90,9 +90,6 @@ post-install:
 .for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi
 	${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql
 .endfor
-	@if [ ! -f ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \
-		${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 	${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
 	@install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir
 .endif
diff --git a/databases/mysql40-server/Makefile b/databases/mysql40-server/Makefile
index b6bceb059f5e..2046ef3e2a4c 100644
--- a/databases/mysql40-server/Makefile
+++ b/databases/mysql40-server/Makefile
@@ -3,7 +3,7 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.51 1999/05/25 06:47:33 peter Exp $
+# $Id: Makefile,v 1.52 1999/06/05 19:00:17 mharo Exp $
 #
 
 DISTNAME=	mysql-3.22.22
@@ -90,9 +90,6 @@ post-install:
 .for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi
 	${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql
 .endfor
-	@if [ ! -f ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \
-		${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 	${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
 	@install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir
 .endif
diff --git a/databases/mysql40-server/pkg-plist b/databases/mysql40-server/pkg-plist
index 5cfc474e98bf..c647c5cff847 100644
--- a/databases/mysql40-server/pkg-plist
+++ b/databases/mysql40-server/pkg-plist
@@ -30,7 +30,6 @@ include/mysql/mysql_version.h
 include/mysql/mysqld_error.h
 @unexec install-info --delete %D/info/mysql.info %D/info/dir
 info/mysql.info
-@exec [ -f %D/info/dir -o ! -f /usr/share/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/mysql.info %D/info/dir
 lib/mysql/libdbug.a
 lib/mysql/libheap.a
diff --git a/databases/mysql41-client/Makefile b/databases/mysql41-client/Makefile
index b6bceb059f5e..2046ef3e2a4c 100644
--- a/databases/mysql41-client/Makefile
+++ b/databases/mysql41-client/Makefile
@@ -3,7 +3,7 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.51 1999/05/25 06:47:33 peter Exp $
+# $Id: Makefile,v 1.52 1999/06/05 19:00:17 mharo Exp $
 #
 
 DISTNAME=	mysql-3.22.22
@@ -90,9 +90,6 @@ post-install:
 .for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi
 	${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql
 .endfor
-	@if [ ! -f ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \
-		${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 	${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
 	@install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir
 .endif
diff --git a/databases/mysql41-server/Makefile b/databases/mysql41-server/Makefile
index b6bceb059f5e..2046ef3e2a4c 100644
--- a/databases/mysql41-server/Makefile
+++ b/databases/mysql41-server/Makefile
@@ -3,7 +3,7 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.51 1999/05/25 06:47:33 peter Exp $
+# $Id: Makefile,v 1.52 1999/06/05 19:00:17 mharo Exp $
 #
 
 DISTNAME=	mysql-3.22.22
@@ -90,9 +90,6 @@ post-install:
 .for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi
 	${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql
 .endfor
-	@if [ ! -f ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \
-		${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 	${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
 	@install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir
 .endif
diff --git a/databases/mysql41-server/pkg-plist b/databases/mysql41-server/pkg-plist
index 5cfc474e98bf..c647c5cff847 100644
--- a/databases/mysql41-server/pkg-plist
+++ b/databases/mysql41-server/pkg-plist
@@ -30,7 +30,6 @@ include/mysql/mysql_version.h
 include/mysql/mysqld_error.h
 @unexec install-info --delete %D/info/mysql.info %D/info/dir
 info/mysql.info
-@exec [ -f %D/info/dir -o ! -f /usr/share/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/mysql.info %D/info/dir
 lib/mysql/libdbug.a
 lib/mysql/libheap.a
diff --git a/databases/mysql50-client/Makefile b/databases/mysql50-client/Makefile
index b6bceb059f5e..2046ef3e2a4c 100644
--- a/databases/mysql50-client/Makefile
+++ b/databases/mysql50-client/Makefile
@@ -3,7 +3,7 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.51 1999/05/25 06:47:33 peter Exp $
+# $Id: Makefile,v 1.52 1999/06/05 19:00:17 mharo Exp $
 #
 
 DISTNAME=	mysql-3.22.22
@@ -90,9 +90,6 @@ post-install:
 .for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi
 	${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql
 .endfor
-	@if [ ! -f ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \
-		${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 	${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
 	@install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir
 .endif
diff --git a/databases/mysql50-server/Makefile b/databases/mysql50-server/Makefile
index b6bceb059f5e..2046ef3e2a4c 100644
--- a/databases/mysql50-server/Makefile
+++ b/databases/mysql50-server/Makefile
@@ -3,7 +3,7 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.51 1999/05/25 06:47:33 peter Exp $
+# $Id: Makefile,v 1.52 1999/06/05 19:00:17 mharo Exp $
 #
 
 DISTNAME=	mysql-3.22.22
@@ -90,9 +90,6 @@ post-install:
 .for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi
 	${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql
 .endfor
-	@if [ ! -f ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \
-		${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 	${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
 	@install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir
 .endif
diff --git a/databases/mysql50-server/pkg-plist b/databases/mysql50-server/pkg-plist
index 5cfc474e98bf..c647c5cff847 100644
--- a/databases/mysql50-server/pkg-plist
+++ b/databases/mysql50-server/pkg-plist
@@ -30,7 +30,6 @@ include/mysql/mysql_version.h
 include/mysql/mysqld_error.h
 @unexec install-info --delete %D/info/mysql.info %D/info/dir
 info/mysql.info
-@exec [ -f %D/info/dir -o ! -f /usr/share/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/mysql.info %D/info/dir
 lib/mysql/libdbug.a
 lib/mysql/libheap.a
diff --git a/databases/mysql51-client/Makefile b/databases/mysql51-client/Makefile
index b6bceb059f5e..2046ef3e2a4c 100644
--- a/databases/mysql51-client/Makefile
+++ b/databases/mysql51-client/Makefile
@@ -3,7 +3,7 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.51 1999/05/25 06:47:33 peter Exp $
+# $Id: Makefile,v 1.52 1999/06/05 19:00:17 mharo Exp $
 #
 
 DISTNAME=	mysql-3.22.22
@@ -90,9 +90,6 @@ post-install:
 .for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi
 	${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql
 .endfor
-	@if [ ! -f ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \
-		${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 	${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
 	@install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir
 .endif
diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile
index b6bceb059f5e..2046ef3e2a4c 100644
--- a/databases/mysql51-server/Makefile
+++ b/databases/mysql51-server/Makefile
@@ -3,7 +3,7 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.51 1999/05/25 06:47:33 peter Exp $
+# $Id: Makefile,v 1.52 1999/06/05 19:00:17 mharo Exp $
 #
 
 DISTNAME=	mysql-3.22.22
@@ -90,9 +90,6 @@ post-install:
 .for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi
 	${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql
 .endfor
-	@if [ ! -f ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \
-		${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 	${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
 	@install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir
 .endif
diff --git a/databases/mysql51-server/pkg-plist b/databases/mysql51-server/pkg-plist
index 5cfc474e98bf..c647c5cff847 100644
--- a/databases/mysql51-server/pkg-plist
+++ b/databases/mysql51-server/pkg-plist
@@ -30,7 +30,6 @@ include/mysql/mysql_version.h
 include/mysql/mysqld_error.h
 @unexec install-info --delete %D/info/mysql.info %D/info/dir
 info/mysql.info
-@exec [ -f %D/info/dir -o ! -f /usr/share/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/mysql.info %D/info/dir
 lib/mysql/libdbug.a
 lib/mysql/libheap.a
diff --git a/databases/mysql54-client/Makefile b/databases/mysql54-client/Makefile
index b6bceb059f5e..2046ef3e2a4c 100644
--- a/databases/mysql54-client/Makefile
+++ b/databases/mysql54-client/Makefile
@@ -3,7 +3,7 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.51 1999/05/25 06:47:33 peter Exp $
+# $Id: Makefile,v 1.52 1999/06/05 19:00:17 mharo Exp $
 #
 
 DISTNAME=	mysql-3.22.22
@@ -90,9 +90,6 @@ post-install:
 .for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi
 	${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql
 .endfor
-	@if [ ! -f ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \
-		${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 	${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
 	@install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir
 .endif
diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile
index b6bceb059f5e..2046ef3e2a4c 100644
--- a/databases/mysql54-server/Makefile
+++ b/databases/mysql54-server/Makefile
@@ -3,7 +3,7 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.51 1999/05/25 06:47:33 peter Exp $
+# $Id: Makefile,v 1.52 1999/06/05 19:00:17 mharo Exp $
 #
 
 DISTNAME=	mysql-3.22.22
@@ -90,9 +90,6 @@ post-install:
 .for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi
 	${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql
 .endfor
-	@if [ ! -f ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \
-		${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 	${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
 	@install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir
 .endif
diff --git a/databases/mysql54-server/pkg-plist b/databases/mysql54-server/pkg-plist
index 5cfc474e98bf..c647c5cff847 100644
--- a/databases/mysql54-server/pkg-plist
+++ b/databases/mysql54-server/pkg-plist
@@ -30,7 +30,6 @@ include/mysql/mysql_version.h
 include/mysql/mysqld_error.h
 @unexec install-info --delete %D/info/mysql.info %D/info/dir
 info/mysql.info
-@exec [ -f %D/info/dir -o ! -f /usr/share/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/mysql.info %D/info/dir
 lib/mysql/libdbug.a
 lib/mysql/libheap.a
diff --git a/databases/mysql55-client/Makefile b/databases/mysql55-client/Makefile
index b6bceb059f5e..2046ef3e2a4c 100644
--- a/databases/mysql55-client/Makefile
+++ b/databases/mysql55-client/Makefile
@@ -3,7 +3,7 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.51 1999/05/25 06:47:33 peter Exp $
+# $Id: Makefile,v 1.52 1999/06/05 19:00:17 mharo Exp $
 #
 
 DISTNAME=	mysql-3.22.22
@@ -90,9 +90,6 @@ post-install:
 .for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi
 	${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql
 .endfor
-	@if [ ! -f ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \
-		${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 	${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
 	@install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir
 .endif
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index b6bceb059f5e..2046ef3e2a4c 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -3,7 +3,7 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.51 1999/05/25 06:47:33 peter Exp $
+# $Id: Makefile,v 1.52 1999/06/05 19:00:17 mharo Exp $
 #
 
 DISTNAME=	mysql-3.22.22
@@ -90,9 +90,6 @@ post-install:
 .for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi
 	${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql
 .endfor
-	@if [ ! -f ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \
-		${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 	${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
 	@install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir
 .endif
diff --git a/databases/mysql55-server/pkg-plist b/databases/mysql55-server/pkg-plist
index 5cfc474e98bf..c647c5cff847 100644
--- a/databases/mysql55-server/pkg-plist
+++ b/databases/mysql55-server/pkg-plist
@@ -30,7 +30,6 @@ include/mysql/mysql_version.h
 include/mysql/mysqld_error.h
 @unexec install-info --delete %D/info/mysql.info %D/info/dir
 info/mysql.info
-@exec [ -f %D/info/dir -o ! -f /usr/share/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/mysql.info %D/info/dir
 lib/mysql/libdbug.a
 lib/mysql/libheap.a
diff --git a/databases/mysql60-client/Makefile b/databases/mysql60-client/Makefile
index b6bceb059f5e..2046ef3e2a4c 100644
--- a/databases/mysql60-client/Makefile
+++ b/databases/mysql60-client/Makefile
@@ -3,7 +3,7 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.51 1999/05/25 06:47:33 peter Exp $
+# $Id: Makefile,v 1.52 1999/06/05 19:00:17 mharo Exp $
 #
 
 DISTNAME=	mysql-3.22.22
@@ -90,9 +90,6 @@ post-install:
 .for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi
 	${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql
 .endfor
-	@if [ ! -f ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \
-		${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 	${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
 	@install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir
 .endif
diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile
index b6bceb059f5e..2046ef3e2a4c 100644
--- a/databases/mysql60-server/Makefile
+++ b/databases/mysql60-server/Makefile
@@ -3,7 +3,7 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.51 1999/05/25 06:47:33 peter Exp $
+# $Id: Makefile,v 1.52 1999/06/05 19:00:17 mharo Exp $
 #
 
 DISTNAME=	mysql-3.22.22
@@ -90,9 +90,6 @@ post-install:
 .for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi
 	${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql
 .endfor
-	@if [ ! -f ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \
-		${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 	${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
 	@install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir
 .endif
diff --git a/databases/mysql60-server/pkg-plist b/databases/mysql60-server/pkg-plist
index 5cfc474e98bf..c647c5cff847 100644
--- a/databases/mysql60-server/pkg-plist
+++ b/databases/mysql60-server/pkg-plist
@@ -30,7 +30,6 @@ include/mysql/mysql_version.h
 include/mysql/mysqld_error.h
 @unexec install-info --delete %D/info/mysql.info %D/info/dir
 info/mysql.info
-@exec [ -f %D/info/dir -o ! -f /usr/share/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/mysql.info %D/info/dir
 lib/mysql/libdbug.a
 lib/mysql/libheap.a
diff --git a/databases/percona55-client/Makefile b/databases/percona55-client/Makefile
index b6bceb059f5e..2046ef3e2a4c 100644
--- a/databases/percona55-client/Makefile
+++ b/databases/percona55-client/Makefile
@@ -3,7 +3,7 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.51 1999/05/25 06:47:33 peter Exp $
+# $Id: Makefile,v 1.52 1999/06/05 19:00:17 mharo Exp $
 #
 
 DISTNAME=	mysql-3.22.22
@@ -90,9 +90,6 @@ post-install:
 .for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi
 	${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql
 .endfor
-	@if [ ! -f ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \
-		${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 	${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
 	@install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir
 .endif
diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile
index b6bceb059f5e..2046ef3e2a4c 100644
--- a/databases/percona55-server/Makefile
+++ b/databases/percona55-server/Makefile
@@ -3,7 +3,7 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.51 1999/05/25 06:47:33 peter Exp $
+# $Id: Makefile,v 1.52 1999/06/05 19:00:17 mharo Exp $
 #
 
 DISTNAME=	mysql-3.22.22
@@ -90,9 +90,6 @@ post-install:
 .for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi
 	${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql
 .endfor
-	@if [ ! -f ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \
-		${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 	${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
 	@install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir
 .endif
diff --git a/databases/percona55-server/pkg-plist b/databases/percona55-server/pkg-plist
index 5cfc474e98bf..c647c5cff847 100644
--- a/databases/percona55-server/pkg-plist
+++ b/databases/percona55-server/pkg-plist
@@ -30,7 +30,6 @@ include/mysql/mysql_version.h
 include/mysql/mysqld_error.h
 @unexec install-info --delete %D/info/mysql.info %D/info/dir
 info/mysql.info
-@exec [ -f %D/info/dir -o ! -f /usr/share/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/mysql.info %D/info/dir
 lib/mysql/libdbug.a
 lib/mysql/libheap.a
diff --git a/devel/autoconf/Makefile b/devel/autoconf/Makefile
index d5ebb8d877f6..7e2d8c2b60a1 100644
--- a/devel/autoconf/Makefile
+++ b/devel/autoconf/Makefile
@@ -3,7 +3,7 @@
 # Date created:		7 October 1995
 # Whom:			torstenb@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.16 1999/01/26 01:54:49 steve Exp $
+# $Id: Makefile,v 1.17 1999/02/11 12:04:27 obrien Exp $
 #
 
 DISTNAME=       autoconf-2.13
@@ -20,9 +20,6 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	M4=${PREFIX}/bin/gm4
 
 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/autoconf.info ${PREFIX}/info/dir
 	@install-info ${PREFIX}/info/standards.info ${PREFIX}/info/dir
 
diff --git a/devel/autoconf/pkg-plist b/devel/autoconf/pkg-plist
index 233bb347b661..da3d5de5423d 100644
--- a/devel/autoconf/pkg-plist
+++ b/devel/autoconf/pkg-plist
@@ -8,7 +8,6 @@ bin/ifnames
 @unexec install-info --delete %D/info/standards.info %D/info/dir
 info/autoconf.info
 info/standards.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/autoconf.info %D/info/dir
 @exec install-info %D/info/standards.info %D/info/dir
 share/autoconf/acconfig.h
diff --git a/devel/autoconf213/Makefile b/devel/autoconf213/Makefile
index d5ebb8d877f6..7e2d8c2b60a1 100644
--- a/devel/autoconf213/Makefile
+++ b/devel/autoconf213/Makefile
@@ -3,7 +3,7 @@
 # Date created:		7 October 1995
 # Whom:			torstenb@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.16 1999/01/26 01:54:49 steve Exp $
+# $Id: Makefile,v 1.17 1999/02/11 12:04:27 obrien Exp $
 #
 
 DISTNAME=       autoconf-2.13
@@ -20,9 +20,6 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	M4=${PREFIX}/bin/gm4
 
 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/autoconf.info ${PREFIX}/info/dir
 	@install-info ${PREFIX}/info/standards.info ${PREFIX}/info/dir
 
diff --git a/devel/autoconf213/pkg-plist b/devel/autoconf213/pkg-plist
index 233bb347b661..da3d5de5423d 100644
--- a/devel/autoconf213/pkg-plist
+++ b/devel/autoconf213/pkg-plist
@@ -8,7 +8,6 @@ bin/ifnames
 @unexec install-info --delete %D/info/standards.info %D/info/dir
 info/autoconf.info
 info/standards.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/autoconf.info %D/info/dir
 @exec install-info %D/info/standards.info %D/info/dir
 share/autoconf/acconfig.h
diff --git a/devel/autoconf253/Makefile b/devel/autoconf253/Makefile
index d5ebb8d877f6..7e2d8c2b60a1 100644
--- a/devel/autoconf253/Makefile
+++ b/devel/autoconf253/Makefile
@@ -3,7 +3,7 @@
 # Date created:		7 October 1995
 # Whom:			torstenb@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.16 1999/01/26 01:54:49 steve Exp $
+# $Id: Makefile,v 1.17 1999/02/11 12:04:27 obrien Exp $
 #
 
 DISTNAME=       autoconf-2.13
@@ -20,9 +20,6 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	M4=${PREFIX}/bin/gm4
 
 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/autoconf.info ${PREFIX}/info/dir
 	@install-info ${PREFIX}/info/standards.info ${PREFIX}/info/dir
 
diff --git a/devel/autoconf253/pkg-plist b/devel/autoconf253/pkg-plist
index 233bb347b661..da3d5de5423d 100644
--- a/devel/autoconf253/pkg-plist
+++ b/devel/autoconf253/pkg-plist
@@ -8,7 +8,6 @@ bin/ifnames
 @unexec install-info --delete %D/info/standards.info %D/info/dir
 info/autoconf.info
 info/standards.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/autoconf.info %D/info/dir
 @exec install-info %D/info/standards.info %D/info/dir
 share/autoconf/acconfig.h
diff --git a/devel/autoconf254/Makefile b/devel/autoconf254/Makefile
index d5ebb8d877f6..7e2d8c2b60a1 100644
--- a/devel/autoconf254/Makefile
+++ b/devel/autoconf254/Makefile
@@ -3,7 +3,7 @@
 # Date created:		7 October 1995
 # Whom:			torstenb@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.16 1999/01/26 01:54:49 steve Exp $
+# $Id: Makefile,v 1.17 1999/02/11 12:04:27 obrien Exp $
 #
 
 DISTNAME=       autoconf-2.13
@@ -20,9 +20,6 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	M4=${PREFIX}/bin/gm4
 
 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/autoconf.info ${PREFIX}/info/dir
 	@install-info ${PREFIX}/info/standards.info ${PREFIX}/info/dir
 
diff --git a/devel/autoconf254/pkg-plist b/devel/autoconf254/pkg-plist
index 233bb347b661..da3d5de5423d 100644
--- a/devel/autoconf254/pkg-plist
+++ b/devel/autoconf254/pkg-plist
@@ -8,7 +8,6 @@ bin/ifnames
 @unexec install-info --delete %D/info/standards.info %D/info/dir
 info/autoconf.info
 info/standards.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/autoconf.info %D/info/dir
 @exec install-info %D/info/standards.info %D/info/dir
 share/autoconf/acconfig.h
diff --git a/devel/autoconf257/Makefile b/devel/autoconf257/Makefile
index d5ebb8d877f6..7e2d8c2b60a1 100644
--- a/devel/autoconf257/Makefile
+++ b/devel/autoconf257/Makefile
@@ -3,7 +3,7 @@
 # Date created:		7 October 1995
 # Whom:			torstenb@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.16 1999/01/26 01:54:49 steve Exp $
+# $Id: Makefile,v 1.17 1999/02/11 12:04:27 obrien Exp $
 #
 
 DISTNAME=       autoconf-2.13
@@ -20,9 +20,6 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	M4=${PREFIX}/bin/gm4
 
 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/autoconf.info ${PREFIX}/info/dir
 	@install-info ${PREFIX}/info/standards.info ${PREFIX}/info/dir
 
diff --git a/devel/autoconf257/pkg-plist b/devel/autoconf257/pkg-plist
index 233bb347b661..da3d5de5423d 100644
--- a/devel/autoconf257/pkg-plist
+++ b/devel/autoconf257/pkg-plist
@@ -8,7 +8,6 @@ bin/ifnames
 @unexec install-info --delete %D/info/standards.info %D/info/dir
 info/autoconf.info
 info/standards.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/autoconf.info %D/info/dir
 @exec install-info %D/info/standards.info %D/info/dir
 share/autoconf/acconfig.h
diff --git a/devel/autoconf259/Makefile b/devel/autoconf259/Makefile
index d5ebb8d877f6..7e2d8c2b60a1 100644
--- a/devel/autoconf259/Makefile
+++ b/devel/autoconf259/Makefile
@@ -3,7 +3,7 @@
 # Date created:		7 October 1995
 # Whom:			torstenb@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.16 1999/01/26 01:54:49 steve Exp $
+# $Id: Makefile,v 1.17 1999/02/11 12:04:27 obrien Exp $
 #
 
 DISTNAME=       autoconf-2.13
@@ -20,9 +20,6 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	M4=${PREFIX}/bin/gm4
 
 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/autoconf.info ${PREFIX}/info/dir
 	@install-info ${PREFIX}/info/standards.info ${PREFIX}/info/dir
 
diff --git a/devel/autoconf259/pkg-plist b/devel/autoconf259/pkg-plist
index 233bb347b661..da3d5de5423d 100644
--- a/devel/autoconf259/pkg-plist
+++ b/devel/autoconf259/pkg-plist
@@ -8,7 +8,6 @@ bin/ifnames
 @unexec install-info --delete %D/info/standards.info %D/info/dir
 info/autoconf.info
 info/standards.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/autoconf.info %D/info/dir
 @exec install-info %D/info/standards.info %D/info/dir
 share/autoconf/acconfig.h
diff --git a/devel/autoconf26/Makefile b/devel/autoconf26/Makefile
index d5ebb8d877f6..7e2d8c2b60a1 100644
--- a/devel/autoconf26/Makefile
+++ b/devel/autoconf26/Makefile
@@ -3,7 +3,7 @@
 # Date created:		7 October 1995
 # Whom:			torstenb@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.16 1999/01/26 01:54:49 steve Exp $
+# $Id: Makefile,v 1.17 1999/02/11 12:04:27 obrien Exp $
 #
 
 DISTNAME=       autoconf-2.13
@@ -20,9 +20,6 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	M4=${PREFIX}/bin/gm4
 
 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/autoconf.info ${PREFIX}/info/dir
 	@install-info ${PREFIX}/info/standards.info ${PREFIX}/info/dir
 
diff --git a/devel/autoconf26/pkg-plist b/devel/autoconf26/pkg-plist
index 233bb347b661..da3d5de5423d 100644
--- a/devel/autoconf26/pkg-plist
+++ b/devel/autoconf26/pkg-plist
@@ -8,7 +8,6 @@ bin/ifnames
 @unexec install-info --delete %D/info/standards.info %D/info/dir
 info/autoconf.info
 info/standards.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/autoconf.info %D/info/dir
 @exec install-info %D/info/standards.info %D/info/dir
 share/autoconf/acconfig.h
diff --git a/devel/autoconf261/Makefile b/devel/autoconf261/Makefile
index d5ebb8d877f6..7e2d8c2b60a1 100644
--- a/devel/autoconf261/Makefile
+++ b/devel/autoconf261/Makefile
@@ -3,7 +3,7 @@
 # Date created:		7 October 1995
 # Whom:			torstenb@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.16 1999/01/26 01:54:49 steve Exp $
+# $Id: Makefile,v 1.17 1999/02/11 12:04:27 obrien Exp $
 #
 
 DISTNAME=       autoconf-2.13
@@ -20,9 +20,6 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	M4=${PREFIX}/bin/gm4
 
 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/autoconf.info ${PREFIX}/info/dir
 	@install-info ${PREFIX}/info/standards.info ${PREFIX}/info/dir
 
diff --git a/devel/autoconf261/pkg-plist b/devel/autoconf261/pkg-plist
index 233bb347b661..da3d5de5423d 100644
--- a/devel/autoconf261/pkg-plist
+++ b/devel/autoconf261/pkg-plist
@@ -8,7 +8,6 @@ bin/ifnames
 @unexec install-info --delete %D/info/standards.info %D/info/dir
 info/autoconf.info
 info/standards.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/autoconf.info %D/info/dir
 @exec install-info %D/info/standards.info %D/info/dir
 share/autoconf/acconfig.h
diff --git a/devel/autoconf262/Makefile b/devel/autoconf262/Makefile
index d5ebb8d877f6..7e2d8c2b60a1 100644
--- a/devel/autoconf262/Makefile
+++ b/devel/autoconf262/Makefile
@@ -3,7 +3,7 @@
 # Date created:		7 October 1995
 # Whom:			torstenb@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.16 1999/01/26 01:54:49 steve Exp $
+# $Id: Makefile,v 1.17 1999/02/11 12:04:27 obrien Exp $
 #
 
 DISTNAME=       autoconf-2.13
@@ -20,9 +20,6 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	M4=${PREFIX}/bin/gm4
 
 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/autoconf.info ${PREFIX}/info/dir
 	@install-info ${PREFIX}/info/standards.info ${PREFIX}/info/dir
 
diff --git a/devel/autoconf262/pkg-plist b/devel/autoconf262/pkg-plist
index 233bb347b661..da3d5de5423d 100644
--- a/devel/autoconf262/pkg-plist
+++ b/devel/autoconf262/pkg-plist
@@ -8,7 +8,6 @@ bin/ifnames
 @unexec install-info --delete %D/info/standards.info %D/info/dir
 info/autoconf.info
 info/standards.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/autoconf.info %D/info/dir
 @exec install-info %D/info/standards.info %D/info/dir
 share/autoconf/acconfig.h
diff --git a/devel/autoconf267/Makefile b/devel/autoconf267/Makefile
index d5ebb8d877f6..7e2d8c2b60a1 100644
--- a/devel/autoconf267/Makefile
+++ b/devel/autoconf267/Makefile
@@ -3,7 +3,7 @@
 # Date created:		7 October 1995
 # Whom:			torstenb@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.16 1999/01/26 01:54:49 steve Exp $
+# $Id: Makefile,v 1.17 1999/02/11 12:04:27 obrien Exp $
 #
 
 DISTNAME=       autoconf-2.13
@@ -20,9 +20,6 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	M4=${PREFIX}/bin/gm4
 
 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/autoconf.info ${PREFIX}/info/dir
 	@install-info ${PREFIX}/info/standards.info ${PREFIX}/info/dir
 
diff --git a/devel/autoconf267/pkg-plist b/devel/autoconf267/pkg-plist
index 233bb347b661..da3d5de5423d 100644
--- a/devel/autoconf267/pkg-plist
+++ b/devel/autoconf267/pkg-plist
@@ -8,7 +8,6 @@ bin/ifnames
 @unexec install-info --delete %D/info/standards.info %D/info/dir
 info/autoconf.info
 info/standards.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/autoconf.info %D/info/dir
 @exec install-info %D/info/standards.info %D/info/dir
 share/autoconf/acconfig.h
diff --git a/devel/autoconf268/Makefile b/devel/autoconf268/Makefile
index d5ebb8d877f6..7e2d8c2b60a1 100644
--- a/devel/autoconf268/Makefile
+++ b/devel/autoconf268/Makefile
@@ -3,7 +3,7 @@
 # Date created:		7 October 1995
 # Whom:			torstenb@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.16 1999/01/26 01:54:49 steve Exp $
+# $Id: Makefile,v 1.17 1999/02/11 12:04:27 obrien Exp $
 #
 
 DISTNAME=       autoconf-2.13
@@ -20,9 +20,6 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	M4=${PREFIX}/bin/gm4
 
 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/autoconf.info ${PREFIX}/info/dir
 	@install-info ${PREFIX}/info/standards.info ${PREFIX}/info/dir
 
diff --git a/devel/autoconf268/pkg-plist b/devel/autoconf268/pkg-plist
index 233bb347b661..da3d5de5423d 100644
--- a/devel/autoconf268/pkg-plist
+++ b/devel/autoconf268/pkg-plist
@@ -8,7 +8,6 @@ bin/ifnames
 @unexec install-info --delete %D/info/standards.info %D/info/dir
 info/autoconf.info
 info/standards.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/autoconf.info %D/info/dir
 @exec install-info %D/info/standards.info %D/info/dir
 share/autoconf/acconfig.h
diff --git a/devel/automake/Makefile b/devel/automake/Makefile
index 0b13df776ce9..78cd160b2e11 100644
--- a/devel/automake/Makefile
+++ b/devel/automake/Makefile
@@ -3,7 +3,7 @@
 # Date created:		15 March 1997
 # Whom:			FUJIMOTO Kensaku <fujimoto@oscar.elec.waseda.ac.jp>
 #
-# $Id: Makefile,v 1.9 1999/01/27 07:41:06 fenner Exp $
+# $Id: Makefile,v 1.10 1999/01/30 19:11:20 sada Exp $
 #
 
 DISTNAME=	automake-1.4
@@ -20,9 +20,6 @@ USE_PERL5=	yes
 STRIP=		 # none
 
 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/automake.info ${PREFIX}/info/dir
 
 .include <bsd.port.mk>
diff --git a/devel/automake/pkg-plist b/devel/automake/pkg-plist
index 88ef141d4d24..ddf6c79d97cb 100644
--- a/devel/automake/pkg-plist
+++ b/devel/automake/pkg-plist
@@ -2,7 +2,6 @@ bin/aclocal
 bin/automake
 @unexec install-info --delete %D/info/automake.info %D/info/dir
 info/automake.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/automake.info %D/info/dir
 share/aclocal/ccstdc.m4
 share/aclocal/cond.m4
diff --git a/devel/automake110/Makefile b/devel/automake110/Makefile
index 0b13df776ce9..78cd160b2e11 100644
--- a/devel/automake110/Makefile
+++ b/devel/automake110/Makefile
@@ -3,7 +3,7 @@
 # Date created:		15 March 1997
 # Whom:			FUJIMOTO Kensaku <fujimoto@oscar.elec.waseda.ac.jp>
 #
-# $Id: Makefile,v 1.9 1999/01/27 07:41:06 fenner Exp $
+# $Id: Makefile,v 1.10 1999/01/30 19:11:20 sada Exp $
 #
 
 DISTNAME=	automake-1.4
@@ -20,9 +20,6 @@ USE_PERL5=	yes
 STRIP=		 # none
 
 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/automake.info ${PREFIX}/info/dir
 
 .include <bsd.port.mk>
diff --git a/devel/automake110/pkg-plist b/devel/automake110/pkg-plist
index 88ef141d4d24..ddf6c79d97cb 100644
--- a/devel/automake110/pkg-plist
+++ b/devel/automake110/pkg-plist
@@ -2,7 +2,6 @@ bin/aclocal
 bin/automake
 @unexec install-info --delete %D/info/automake.info %D/info/dir
 info/automake.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/automake.info %D/info/dir
 share/aclocal/ccstdc.m4
 share/aclocal/cond.m4
diff --git a/devel/automake14/Makefile b/devel/automake14/Makefile
index 0b13df776ce9..78cd160b2e11 100644
--- a/devel/automake14/Makefile
+++ b/devel/automake14/Makefile
@@ -3,7 +3,7 @@
 # Date created:		15 March 1997
 # Whom:			FUJIMOTO Kensaku <fujimoto@oscar.elec.waseda.ac.jp>
 #
-# $Id: Makefile,v 1.9 1999/01/27 07:41:06 fenner Exp $
+# $Id: Makefile,v 1.10 1999/01/30 19:11:20 sada Exp $
 #
 
 DISTNAME=	automake-1.4
@@ -20,9 +20,6 @@ USE_PERL5=	yes
 STRIP=		 # none
 
 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/automake.info ${PREFIX}/info/dir
 
 .include <bsd.port.mk>
diff --git a/devel/automake14/pkg-plist b/devel/automake14/pkg-plist
index 88ef141d4d24..ddf6c79d97cb 100644
--- a/devel/automake14/pkg-plist
+++ b/devel/automake14/pkg-plist
@@ -2,7 +2,6 @@ bin/aclocal
 bin/automake
 @unexec install-info --delete %D/info/automake.info %D/info/dir
 info/automake.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/automake.info %D/info/dir
 share/aclocal/ccstdc.m4
 share/aclocal/cond.m4
diff --git a/devel/automake15/Makefile b/devel/automake15/Makefile
index 0b13df776ce9..78cd160b2e11 100644
--- a/devel/automake15/Makefile
+++ b/devel/automake15/Makefile
@@ -3,7 +3,7 @@
 # Date created:		15 March 1997
 # Whom:			FUJIMOTO Kensaku <fujimoto@oscar.elec.waseda.ac.jp>
 #
-# $Id: Makefile,v 1.9 1999/01/27 07:41:06 fenner Exp $
+# $Id: Makefile,v 1.10 1999/01/30 19:11:20 sada Exp $
 #
 
 DISTNAME=	automake-1.4
@@ -20,9 +20,6 @@ USE_PERL5=	yes
 STRIP=		 # none
 
 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/automake.info ${PREFIX}/info/dir
 
 .include <bsd.port.mk>
diff --git a/devel/automake15/pkg-plist b/devel/automake15/pkg-plist
index 88ef141d4d24..ddf6c79d97cb 100644
--- a/devel/automake15/pkg-plist
+++ b/devel/automake15/pkg-plist
@@ -2,7 +2,6 @@ bin/aclocal
 bin/automake
 @unexec install-info --delete %D/info/automake.info %D/info/dir
 info/automake.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/automake.info %D/info/dir
 share/aclocal/ccstdc.m4
 share/aclocal/cond.m4
diff --git a/devel/automake16/Makefile b/devel/automake16/Makefile
index 0b13df776ce9..78cd160b2e11 100644
--- a/devel/automake16/Makefile
+++ b/devel/automake16/Makefile
@@ -3,7 +3,7 @@
 # Date created:		15 March 1997
 # Whom:			FUJIMOTO Kensaku <fujimoto@oscar.elec.waseda.ac.jp>
 #
-# $Id: Makefile,v 1.9 1999/01/27 07:41:06 fenner Exp $
+# $Id: Makefile,v 1.10 1999/01/30 19:11:20 sada Exp $
 #
 
 DISTNAME=	automake-1.4
@@ -20,9 +20,6 @@ USE_PERL5=	yes
 STRIP=		 # none
 
 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/automake.info ${PREFIX}/info/dir
 
 .include <bsd.port.mk>
diff --git a/devel/automake16/pkg-plist b/devel/automake16/pkg-plist
index 88ef141d4d24..ddf6c79d97cb 100644
--- a/devel/automake16/pkg-plist
+++ b/devel/automake16/pkg-plist
@@ -2,7 +2,6 @@ bin/aclocal
 bin/automake
 @unexec install-info --delete %D/info/automake.info %D/info/dir
 info/automake.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/automake.info %D/info/dir
 share/aclocal/ccstdc.m4
 share/aclocal/cond.m4
diff --git a/devel/automake17/Makefile b/devel/automake17/Makefile
index 0b13df776ce9..78cd160b2e11 100644
--- a/devel/automake17/Makefile
+++ b/devel/automake17/Makefile
@@ -3,7 +3,7 @@
 # Date created:		15 March 1997
 # Whom:			FUJIMOTO Kensaku <fujimoto@oscar.elec.waseda.ac.jp>
 #
-# $Id: Makefile,v 1.9 1999/01/27 07:41:06 fenner Exp $
+# $Id: Makefile,v 1.10 1999/01/30 19:11:20 sada Exp $
 #
 
 DISTNAME=	automake-1.4
@@ -20,9 +20,6 @@ USE_PERL5=	yes
 STRIP=		 # none
 
 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/automake.info ${PREFIX}/info/dir
 
 .include <bsd.port.mk>
diff --git a/devel/automake17/pkg-plist b/devel/automake17/pkg-plist
index 88ef141d4d24..ddf6c79d97cb 100644
--- a/devel/automake17/pkg-plist
+++ b/devel/automake17/pkg-plist
@@ -2,7 +2,6 @@ bin/aclocal
 bin/automake
 @unexec install-info --delete %D/info/automake.info %D/info/dir
 info/automake.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/automake.info %D/info/dir
 share/aclocal/ccstdc.m4
 share/aclocal/cond.m4
diff --git a/devel/automake18/Makefile b/devel/automake18/Makefile
index 0b13df776ce9..78cd160b2e11 100644
--- a/devel/automake18/Makefile
+++ b/devel/automake18/Makefile
@@ -3,7 +3,7 @@
 # Date created:		15 March 1997
 # Whom:			FUJIMOTO Kensaku <fujimoto@oscar.elec.waseda.ac.jp>
 #
-# $Id: Makefile,v 1.9 1999/01/27 07:41:06 fenner Exp $
+# $Id: Makefile,v 1.10 1999/01/30 19:11:20 sada Exp $
 #
 
 DISTNAME=	automake-1.4
@@ -20,9 +20,6 @@ USE_PERL5=	yes
 STRIP=		 # none
 
 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/automake.info ${PREFIX}/info/dir
 
 .include <bsd.port.mk>
diff --git a/devel/automake18/pkg-plist b/devel/automake18/pkg-plist
index 88ef141d4d24..ddf6c79d97cb 100644
--- a/devel/automake18/pkg-plist
+++ b/devel/automake18/pkg-plist
@@ -2,7 +2,6 @@ bin/aclocal
 bin/automake
 @unexec install-info --delete %D/info/automake.info %D/info/dir
 info/automake.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/automake.info %D/info/dir
 share/aclocal/ccstdc.m4
 share/aclocal/cond.m4
diff --git a/devel/automake19/Makefile b/devel/automake19/Makefile
index 0b13df776ce9..78cd160b2e11 100644
--- a/devel/automake19/Makefile
+++ b/devel/automake19/Makefile
@@ -3,7 +3,7 @@
 # Date created:		15 March 1997
 # Whom:			FUJIMOTO Kensaku <fujimoto@oscar.elec.waseda.ac.jp>
 #
-# $Id: Makefile,v 1.9 1999/01/27 07:41:06 fenner Exp $
+# $Id: Makefile,v 1.10 1999/01/30 19:11:20 sada Exp $
 #
 
 DISTNAME=	automake-1.4
@@ -20,9 +20,6 @@ USE_PERL5=	yes
 STRIP=		 # none
 
 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/automake.info ${PREFIX}/info/dir
 
 .include <bsd.port.mk>
diff --git a/devel/automake19/pkg-plist b/devel/automake19/pkg-plist
index 88ef141d4d24..ddf6c79d97cb 100644
--- a/devel/automake19/pkg-plist
+++ b/devel/automake19/pkg-plist
@@ -2,7 +2,6 @@ bin/aclocal
 bin/automake
 @unexec install-info --delete %D/info/automake.info %D/info/dir
 info/automake.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/automake.info %D/info/dir
 share/aclocal/ccstdc.m4
 share/aclocal/cond.m4
diff --git a/devel/bison-devel/pkg-plist b/devel/bison-devel/pkg-plist
index 31531e1afffa..0d1ee55684dc 100644
--- a/devel/bison-devel/pkg-plist
+++ b/devel/bison-devel/pkg-plist
@@ -3,4 +3,3 @@ share/bison.hairy
 share/bison.simple
 @unexec install-info --delete %D/info/bison.info %D/info/dir
 info/bison.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
diff --git a/devel/bison/pkg-plist b/devel/bison/pkg-plist
index 31531e1afffa..0d1ee55684dc 100644
--- a/devel/bison/pkg-plist
+++ b/devel/bison/pkg-plist
@@ -3,4 +3,3 @@ share/bison.hairy
 share/bison.simple
 @unexec install-info --delete %D/info/bison.info %D/info/dir
 info/bison.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
diff --git a/devel/bison175/pkg-plist b/devel/bison175/pkg-plist
index 31531e1afffa..0d1ee55684dc 100644
--- a/devel/bison175/pkg-plist
+++ b/devel/bison175/pkg-plist
@@ -3,4 +3,3 @@ share/bison.hairy
 share/bison.simple
 @unexec install-info --delete %D/info/bison.info %D/info/dir
 info/bison.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
diff --git a/devel/bison1875/pkg-plist b/devel/bison1875/pkg-plist
index 31531e1afffa..0d1ee55684dc 100644
--- a/devel/bison1875/pkg-plist
+++ b/devel/bison1875/pkg-plist
@@ -3,4 +3,3 @@ share/bison.hairy
 share/bison.simple
 @unexec install-info --delete %D/info/bison.info %D/info/dir
 info/bison.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
diff --git a/devel/bison2/pkg-plist b/devel/bison2/pkg-plist
index 31531e1afffa..0d1ee55684dc 100644
--- a/devel/bison2/pkg-plist
+++ b/devel/bison2/pkg-plist
@@ -3,4 +3,3 @@ share/bison.hairy
 share/bison.simple
 @unexec install-info --delete %D/info/bison.info %D/info/dir
 info/bison.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
diff --git a/devel/bison20/pkg-plist b/devel/bison20/pkg-plist
index 31531e1afffa..0d1ee55684dc 100644
--- a/devel/bison20/pkg-plist
+++ b/devel/bison20/pkg-plist
@@ -3,4 +3,3 @@ share/bison.hairy
 share/bison.simple
 @unexec install-info --delete %D/info/bison.info %D/info/dir
 info/bison.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
diff --git a/devel/cssc/Makefile b/devel/cssc/Makefile
index f65172f200d9..a5c74deb3114 100644
--- a/devel/cssc/Makefile
+++ b/devel/cssc/Makefile
@@ -3,7 +3,7 @@
 # Date created:         31 Mar 1999
 # Whom:                 Oliver Fromme
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1999/03/31 05:33:17 jkoshy Exp $
 #
 
 DISTNAME=	CSSC-0.10beta.pl1
@@ -16,12 +16,6 @@ MAINTAINER=	olli@fromme.com
 GNU_CONFIGURE=	yes
 MAN1=		sccs.1
 
-#
-#   NOTE:
-#   portlint will warn about the absolute pathname "/usr/share/info/dir",
-#   although it is OK in this case (see the FreeBSD Handbook, section
-#   "Making a port yourself", subsection "Info files").
-#
 post-install:
 	@strip ${PREFIX}/bin/sccs
 	@for FILE in ${PREFIX}/libexec/cssc/*; do \
@@ -29,9 +23,6 @@ post-install:
 		strip $$FILE; \
 	    fi; \
 	done
-	@if [ ! -f ${PREFIX}/info/dir ]; then \
-	    ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 	@install-info ${PREFIX}/info/cssc.info ${PREFIX}/info/dir
 
 .include <bsd.port.mk>
diff --git a/devel/cssc/pkg-plist b/devel/cssc/pkg-plist
index 68ce3d20587e..91167a116b3f 100644
--- a/devel/cssc/pkg-plist
+++ b/devel/cssc/pkg-plist
@@ -17,4 +17,3 @@ info/cssc.info
 info/cssc.info-1
 info/cssc.info-2
 info/cssc.info-3
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
diff --git a/devel/gettext-devel/Makefile b/devel/gettext-devel/Makefile
index 5d9360d3d3ac..607500520d43 100644
--- a/devel/gettext-devel/Makefile
+++ b/devel/gettext-devel/Makefile
@@ -3,7 +3,7 @@
 # Date created:        16 March 1998
 # Whom:                Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.9 1999/03/09 09:11:26 asami Exp $
+# $Id: Makefile,v 1.10 1999/06/05 18:59:40 mharo Exp $
 #
 
 DISTNAME=	gettext-0.10.35
@@ -21,9 +21,6 @@ pre-configure:
 	${RM} ${WRKSRC}/doc/gettext.info*
 
 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/gettext.info ${PREFIX}/info/dir
 	${INSTALL_DATA} ${WRKSRC}/misc/po-mode.el \
 		${PREFIX}/share/gettext/po-mode.el
diff --git a/devel/gettext-devel/pkg-plist b/devel/gettext-devel/pkg-plist
index d799f7939a58..88b598cad226 100644
--- a/devel/gettext-devel/pkg-plist
+++ b/devel/gettext-devel/pkg-plist
@@ -8,7 +8,6 @@ bin/msgunfmt
 bin/xgettext
 @unexec install-info --delete %D/info/gettext.info %D/info/dir
 info/gettext.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/gettext.info %D/info/dir
 include/libintl.h
 lib/libintl.a
diff --git a/devel/gettext-old/Makefile b/devel/gettext-old/Makefile
index 5d9360d3d3ac..607500520d43 100644
--- a/devel/gettext-old/Makefile
+++ b/devel/gettext-old/Makefile
@@ -3,7 +3,7 @@
 # Date created:        16 March 1998
 # Whom:                Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.9 1999/03/09 09:11:26 asami Exp $
+# $Id: Makefile,v 1.10 1999/06/05 18:59:40 mharo Exp $
 #
 
 DISTNAME=	gettext-0.10.35
@@ -21,9 +21,6 @@ pre-configure:
 	${RM} ${WRKSRC}/doc/gettext.info*
 
 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/gettext.info ${PREFIX}/info/dir
 	${INSTALL_DATA} ${WRKSRC}/misc/po-mode.el \
 		${PREFIX}/share/gettext/po-mode.el
diff --git a/devel/gettext-old/pkg-plist b/devel/gettext-old/pkg-plist
index d799f7939a58..88b598cad226 100644
--- a/devel/gettext-old/pkg-plist
+++ b/devel/gettext-old/pkg-plist
@@ -8,7 +8,6 @@ bin/msgunfmt
 bin/xgettext
 @unexec install-info --delete %D/info/gettext.info %D/info/dir
 info/gettext.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/gettext.info %D/info/dir
 include/libintl.h
 lib/libintl.a
diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile
index 5d9360d3d3ac..607500520d43 100644
--- a/devel/gettext/Makefile
+++ b/devel/gettext/Makefile
@@ -3,7 +3,7 @@
 # Date created:        16 March 1998
 # Whom:                Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.9 1999/03/09 09:11:26 asami Exp $
+# $Id: Makefile,v 1.10 1999/06/05 18:59:40 mharo Exp $
 #
 
 DISTNAME=	gettext-0.10.35
@@ -21,9 +21,6 @@ pre-configure:
 	${RM} ${WRKSRC}/doc/gettext.info*
 
 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/gettext.info ${PREFIX}/info/dir
 	${INSTALL_DATA} ${WRKSRC}/misc/po-mode.el \
 		${PREFIX}/share/gettext/po-mode.el
diff --git a/devel/gettext/pkg-plist b/devel/gettext/pkg-plist
index d799f7939a58..88b598cad226 100644
--- a/devel/gettext/pkg-plist
+++ b/devel/gettext/pkg-plist
@@ -8,7 +8,6 @@ bin/msgunfmt
 bin/xgettext
 @unexec install-info --delete %D/info/gettext.info %D/info/dir
 info/gettext.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/gettext.info %D/info/dir
 include/libintl.h
 lib/libintl.a
diff --git a/devel/gindent/Makefile b/devel/gindent/Makefile
index 440e49130aa7..e5812ddd142d 100644
--- a/devel/gindent/Makefile
+++ b/devel/gindent/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 August 1997
 # Whom:                Kapil Chowksey <kchowksey@hss.hns.com>
 #
-# $Id: Makefile,v 1.1.1.1 1997/08/29 09:20:00 obrien Exp $
+# $Id: Makefile,v 1.2 1999/01/27 07:41:06 fenner Exp $
 #
         
 DISTNAME=      indent-1.9.1
@@ -20,13 +20,6 @@ post-install:
 	@strip ${PREFIX}/bin/indent
 	@test -d ${PREFIX}/info || ${MKDIR} ${PREFIX}/info  \
 		&& chmod a+rx ${PREFIX}/info
-	@if [ ! -f ${PREFIX}/info/dir ]; then \
-	  if [ -f /usr/share/info/dir ]; then \
-	    ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	  else \
-	    touch ${PREFIX}/info/dir ; \
-	  fi ; \
-	fi
 	@install-info ${PREFIX}/info/indent.info ${PREFIX}/info/dir
 
 .include <bsd.port.mk>
diff --git a/devel/gindent/pkg-plist b/devel/gindent/pkg-plist
index 34b7a1677540..3b7849a6fadb 100644
--- a/devel/gindent/pkg-plist
+++ b/devel/gindent/pkg-plist
@@ -1,5 +1,4 @@
 bin/indent
 @unexec install-info --delete %D/info/indent.info %D/info/dir
 info/indent.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/indent.info %D/info/dir
diff --git a/devel/gmake/Makefile b/devel/gmake/Makefile
index d62e6f44cddd..dcb8fb97ab6d 100644
--- a/devel/gmake/Makefile
+++ b/devel/gmake/Makefile
@@ -3,7 +3,7 @@
 # Date created:		11 September 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.21 1999/01/29 21:51:44 sada Exp $
+# $Id: Makefile,v 1.22 1999/03/11 21:47:09 scrappy Exp $
 #
 
 DISTNAME=       make-3.77
@@ -21,11 +21,6 @@ CONFIGURE_ARGS=	--program-prefix=g
 MAN1=		gmake.1
 
 # joerg@freebsd.org says our getloadavg() no longer requires setgid kmem
-pre-install:
-	@if [ ! -f ${PREFIX}/info/dir ]; then \
-	  ${MKDIR} ${PREFIX}/info; \
-	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	 fi
 
 post-install:
 	chmod g-s ${PREFIX}/bin/gmake
diff --git a/devel/gmake/pkg-plist b/devel/gmake/pkg-plist
index 0b40d46fee98..9899eb5dbcdd 100644
--- a/devel/gmake/pkg-plist
+++ b/devel/gmake/pkg-plist
@@ -1,5 +1,4 @@
 bin/gmake
 @unexec install-info --delete %D/info/make.info %D/info/dir
 info/make.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/make.info %D/info/dir
diff --git a/devel/gmake381/Makefile b/devel/gmake381/Makefile
index d62e6f44cddd..dcb8fb97ab6d 100644
--- a/devel/gmake381/Makefile
+++ b/devel/gmake381/Makefile
@@ -3,7 +3,7 @@
 # Date created:		11 September 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.21 1999/01/29 21:51:44 sada Exp $
+# $Id: Makefile,v 1.22 1999/03/11 21:47:09 scrappy Exp $
 #
 
 DISTNAME=       make-3.77
@@ -21,11 +21,6 @@ CONFIGURE_ARGS=	--program-prefix=g
 MAN1=		gmake.1
 
 # joerg@freebsd.org says our getloadavg() no longer requires setgid kmem
-pre-install:
-	@if [ ! -f ${PREFIX}/info/dir ]; then \
-	  ${MKDIR} ${PREFIX}/info; \
-	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	 fi
 
 post-install:
 	chmod g-s ${PREFIX}/bin/gmake
diff --git a/devel/gmake381/pkg-plist b/devel/gmake381/pkg-plist
index 0b40d46fee98..9899eb5dbcdd 100644
--- a/devel/gmake381/pkg-plist
+++ b/devel/gmake381/pkg-plist
@@ -1,5 +1,4 @@
 bin/gmake
 @unexec install-info --delete %D/info/make.info %D/info/dir
 info/make.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/make.info %D/info/dir
diff --git a/devel/gnu-autoconf/Makefile b/devel/gnu-autoconf/Makefile
index d5ebb8d877f6..7e2d8c2b60a1 100644
--- a/devel/gnu-autoconf/Makefile
+++ b/devel/gnu-autoconf/Makefile
@@ -3,7 +3,7 @@
 # Date created:		7 October 1995
 # Whom:			torstenb@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.16 1999/01/26 01:54:49 steve Exp $
+# $Id: Makefile,v 1.17 1999/02/11 12:04:27 obrien Exp $
 #
 
 DISTNAME=       autoconf-2.13
@@ -20,9 +20,6 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	M4=${PREFIX}/bin/gm4
 
 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/autoconf.info ${PREFIX}/info/dir
 	@install-info ${PREFIX}/info/standards.info ${PREFIX}/info/dir
 
diff --git a/devel/gnu-autoconf/pkg-plist b/devel/gnu-autoconf/pkg-plist
index 233bb347b661..da3d5de5423d 100644
--- a/devel/gnu-autoconf/pkg-plist
+++ b/devel/gnu-autoconf/pkg-plist
@@ -8,7 +8,6 @@ bin/ifnames
 @unexec install-info --delete %D/info/standards.info %D/info/dir
 info/autoconf.info
 info/standards.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/autoconf.info %D/info/dir
 @exec install-info %D/info/standards.info %D/info/dir
 share/autoconf/acconfig.h
diff --git a/devel/gnu-automake/Makefile b/devel/gnu-automake/Makefile
index 0b13df776ce9..78cd160b2e11 100644
--- a/devel/gnu-automake/Makefile
+++ b/devel/gnu-automake/Makefile
@@ -3,7 +3,7 @@
 # Date created:		15 March 1997
 # Whom:			FUJIMOTO Kensaku <fujimoto@oscar.elec.waseda.ac.jp>
 #
-# $Id: Makefile,v 1.9 1999/01/27 07:41:06 fenner Exp $
+# $Id: Makefile,v 1.10 1999/01/30 19:11:20 sada Exp $
 #
 
 DISTNAME=	automake-1.4
@@ -20,9 +20,6 @@ USE_PERL5=	yes
 STRIP=		 # none
 
 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/automake.info ${PREFIX}/info/dir
 
 .include <bsd.port.mk>
diff --git a/devel/gnu-automake/pkg-plist b/devel/gnu-automake/pkg-plist
index 88ef141d4d24..ddf6c79d97cb 100644
--- a/devel/gnu-automake/pkg-plist
+++ b/devel/gnu-automake/pkg-plist
@@ -2,7 +2,6 @@ bin/aclocal
 bin/automake
 @unexec install-info --delete %D/info/automake.info %D/info/dir
 info/automake.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/automake.info %D/info/dir
 share/aclocal/ccstdc.m4
 share/aclocal/cond.m4
diff --git a/devel/m4/Makefile b/devel/m4/Makefile
index 5faa091515b8..a207298c7e47 100644
--- a/devel/m4/Makefile
+++ b/devel/m4/Makefile
@@ -3,7 +3,7 @@
 # Date created:		25 October 1994
 # Whom:			mr
 #
-# $Id: Makefile,v 1.9 1999/01/27 07:41:08 fenner Exp $
+# $Id: Makefile,v 1.10 1999/03/11 21:47:09 scrappy Exp $
 #
 
 DISTNAME=       m4-1.4
@@ -21,9 +21,6 @@ CONFIGURE_ARGS= --program-prefix=g
 post-install:
 	@${MKDIR} ${PREFIX}/share/examples/gm4
 	${INSTALL_DATA} ${WRKSRC}/examples/*.m4 ${PREFIX}/share/examples/gm4
-	@if [ ! -f ${PREFIX}/info/dir ]; then \
-	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	 fi
 	@install-info ${PREFIX}/info/m4.info ${PREFIX}/info/dir
 
 .include <bsd.port.mk>
diff --git a/devel/m4/pkg-plist b/devel/m4/pkg-plist
index 3a5b4e7e35b6..bf5520f1ec1f 100644
--- a/devel/m4/pkg-plist
+++ b/devel/m4/pkg-plist
@@ -1,7 +1,6 @@
 bin/gm4
 @unexec install-info --delete %D/info/m4.info %D/info/dir
 info/m4.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/m4.info %D/info/dir
 share/examples/gm4/capitalize.m4
 share/examples/gm4/comments.m4
diff --git a/devel/nana/Makefile b/devel/nana/Makefile
index 3ef70e28c6e1..0df73e32c930 100644
--- a/devel/nana/Makefile
+++ b/devel/nana/Makefile
@@ -3,7 +3,7 @@
 # Date created:         20th April 1997
 # Whom:                 Phil Maker <pjm@cs.ntu.edu.au>
 #
-# $Id: Makefile,v 1.1.1.1 1997/10/15 19:58:51 max Exp $
+# $Id: Makefile,v 1.2 1999/05/12 10:00:14 asami Exp $
 #
 
 DISTNAME=	nana-1.09
@@ -18,9 +18,4 @@ USE_GMAKE=	yes
 MAN1=		nana.1 nana-clg.1
 MAN3= 		nana.3 I.3 DI.3 L.3 DL.3 Q.3 Qstl.3
 
-pre-install:
-	@if [ ! -f ${PREFIX}/info/dir ]; then \
-	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	 fi
-
 .include <bsd.port.mk>
diff --git a/devel/nana/pkg-plist b/devel/nana/pkg-plist
index 6f9d55c5cd6a..4b3f8dc30ea7 100644
--- a/devel/nana/pkg-plist
+++ b/devel/nana/pkg-plist
@@ -21,7 +21,6 @@ include/now.h
 info/nana.info
 info/nana.info-1
 info/nana.info-2
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/nana.info %D/info/dir
 lib/libnana.a
 libexec/nana-trace.gdb
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index 99f83e2f2059..5e3ef7f9bc72 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -3,7 +3,7 @@
 # Date created:		29 October 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.37 1999/03/08 07:28:22 asami Exp $
+# $Id: Makefile,v 1.38 1999/03/11 21:47:10 scrappy Exp $
 #
 
 DISTNAME=	emacs-19.34b
@@ -32,9 +32,6 @@ post-install:
 .for file in emacs-19.34 emacsclient etags ctags b2m
 	strip ${PREFIX}/bin/${file}
 .endfor
-	if [ ! -f ${PREFIX}/info/dir ]; then \
-	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 .for info in emacs vip viper forms gnus mh-e cl sc dired-x ediff ccmode message
 	install-info ${PREFIX}/info/${info} ${PREFIX}/info/dir
 .endfor
diff --git a/editors/emacs/pkg-plist b/editors/emacs/pkg-plist
index 2284811017d7..bd28773b2034 100644
--- a/editors/emacs/pkg-plist
+++ b/editors/emacs/pkg-plist
@@ -100,7 +100,6 @@ info/viper-1
 info/viper-2
 info/viper-3
 info/viper-4
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/emacs %D/info/dir
 @exec install-info %D/info/vip %D/info/dir
 @exec install-info %D/info/viper %D/info/dir
diff --git a/editors/emacs19/Makefile b/editors/emacs19/Makefile
index 99f83e2f2059..5e3ef7f9bc72 100644
--- a/editors/emacs19/Makefile
+++ b/editors/emacs19/Makefile
@@ -3,7 +3,7 @@
 # Date created:		29 October 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.37 1999/03/08 07:28:22 asami Exp $
+# $Id: Makefile,v 1.38 1999/03/11 21:47:10 scrappy Exp $
 #
 
 DISTNAME=	emacs-19.34b
@@ -32,9 +32,6 @@ post-install:
 .for file in emacs-19.34 emacsclient etags ctags b2m
 	strip ${PREFIX}/bin/${file}
 .endfor
-	if [ ! -f ${PREFIX}/info/dir ]; then \
-	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 .for info in emacs vip viper forms gnus mh-e cl sc dired-x ediff ccmode message
 	install-info ${PREFIX}/info/${info} ${PREFIX}/info/dir
 .endfor
diff --git a/editors/emacs19/pkg-plist b/editors/emacs19/pkg-plist
index 2284811017d7..bd28773b2034 100644
--- a/editors/emacs19/pkg-plist
+++ b/editors/emacs19/pkg-plist
@@ -100,7 +100,6 @@ info/viper-1
 info/viper-2
 info/viper-3
 info/viper-4
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/emacs %D/info/dir
 @exec install-info %D/info/vip %D/info/dir
 @exec install-info %D/info/viper %D/info/dir
diff --git a/editors/emacs20/pkg-plist b/editors/emacs20/pkg-plist
index 3d30edd452e4..511e7700920a 100644
--- a/editors/emacs20/pkg-plist
+++ b/editors/emacs20/pkg-plist
@@ -35,7 +35,6 @@ info/sc
 info/vip
 info/viper
 info/widget
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/ccmode %D/info/dir
 @exec install-info %D/info/cl %D/info/dir
 @exec install-info %D/info/customize %D/info/dir
diff --git a/editors/emacs22/Makefile b/editors/emacs22/Makefile
index 99f83e2f2059..5e3ef7f9bc72 100644
--- a/editors/emacs22/Makefile
+++ b/editors/emacs22/Makefile
@@ -3,7 +3,7 @@
 # Date created:		29 October 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.37 1999/03/08 07:28:22 asami Exp $
+# $Id: Makefile,v 1.38 1999/03/11 21:47:10 scrappy Exp $
 #
 
 DISTNAME=	emacs-19.34b
@@ -32,9 +32,6 @@ post-install:
 .for file in emacs-19.34 emacsclient etags ctags b2m
 	strip ${PREFIX}/bin/${file}
 .endfor
-	if [ ! -f ${PREFIX}/info/dir ]; then \
-	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 .for info in emacs vip viper forms gnus mh-e cl sc dired-x ediff ccmode message
 	install-info ${PREFIX}/info/${info} ${PREFIX}/info/dir
 .endfor
diff --git a/editors/emacs22/pkg-plist b/editors/emacs22/pkg-plist
index 2284811017d7..bd28773b2034 100644
--- a/editors/emacs22/pkg-plist
+++ b/editors/emacs22/pkg-plist
@@ -100,7 +100,6 @@ info/viper-1
 info/viper-2
 info/viper-3
 info/viper-4
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/emacs %D/info/dir
 @exec install-info %D/info/vip %D/info/dir
 @exec install-info %D/info/viper %D/info/dir
diff --git a/editors/emacs23/Makefile b/editors/emacs23/Makefile
index 99f83e2f2059..5e3ef7f9bc72 100644
--- a/editors/emacs23/Makefile
+++ b/editors/emacs23/Makefile
@@ -3,7 +3,7 @@
 # Date created:		29 October 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.37 1999/03/08 07:28:22 asami Exp $
+# $Id: Makefile,v 1.38 1999/03/11 21:47:10 scrappy Exp $
 #
 
 DISTNAME=	emacs-19.34b
@@ -32,9 +32,6 @@ post-install:
 .for file in emacs-19.34 emacsclient etags ctags b2m
 	strip ${PREFIX}/bin/${file}
 .endfor
-	if [ ! -f ${PREFIX}/info/dir ]; then \
-	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 .for info in emacs vip viper forms gnus mh-e cl sc dired-x ediff ccmode message
 	install-info ${PREFIX}/info/${info} ${PREFIX}/info/dir
 .endfor
diff --git a/editors/emacs23/pkg-plist b/editors/emacs23/pkg-plist
index 2284811017d7..bd28773b2034 100644
--- a/editors/emacs23/pkg-plist
+++ b/editors/emacs23/pkg-plist
@@ -100,7 +100,6 @@ info/viper-1
 info/viper-2
 info/viper-3
 info/viper-4
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/emacs %D/info/dir
 @exec install-info %D/info/vip %D/info/dir
 @exec install-info %D/info/viper %D/info/dir
diff --git a/editors/flim-emacs-current/pkg-plist b/editors/flim-emacs-current/pkg-plist
index f5fa7444b2e5..e303dd6b448b 100644
--- a/editors/flim-emacs-current/pkg-plist
+++ b/editors/flim-emacs-current/pkg-plist
@@ -44,6 +44,5 @@
 @unexec install-info --delete %D/info/mime-ja.info %D/info/dir
 info/mime-en.info
 info/mime-ja.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/mime-en.info %D/info/dir
 @exec install-info %D/info/mime-ja.info %D/info/dir
diff --git a/editors/flim-emacs/pkg-plist b/editors/flim-emacs/pkg-plist
index adbcc2c700cf..cc7ef050ace7 100644
--- a/editors/flim-emacs/pkg-plist
+++ b/editors/flim-emacs/pkg-plist
@@ -35,6 +35,5 @@
 @unexec install-info --delete %D/info/mime-ja.info %D/info/dir
 info/mime-en.info
 info/mime-ja.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/mime-en.info %D/info/dir
 @exec install-info %D/info/mime-ja.info %D/info/dir
diff --git a/editors/flim-emacs20-current/pkg-plist b/editors/flim-emacs20-current/pkg-plist
index 0479ca0eb1ae..66c37b78d741 100644
--- a/editors/flim-emacs20-current/pkg-plist
+++ b/editors/flim-emacs20-current/pkg-plist
@@ -47,6 +47,5 @@
 @unexec install-info --delete %D/info/mime-ja.info %D/info/dir
 info/mime-en.info
 info/mime-ja.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/mime-en.info %D/info/dir
 @exec install-info %D/info/mime-ja.info %D/info/dir
diff --git a/editors/flim-emacs20/pkg-plist b/editors/flim-emacs20/pkg-plist
index bbd6c04d516d..d5276737f5f7 100644
--- a/editors/flim-emacs20/pkg-plist
+++ b/editors/flim-emacs20/pkg-plist
@@ -30,7 +30,6 @@
 %%FLIMDOCDIR%%/ChangeLog
 %%FLIMDOCDIR%%/README.en
 @dirrm %%FLIMDOCDIR%%
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @unexec install-info --delete %D/info/mime-en.info %D/info/dir
 @unexec install-info --delete %D/info/mime-ja.info %D/info/dir
 info/mime-en.info
diff --git a/editors/flim-mule-current/pkg-plist b/editors/flim-mule-current/pkg-plist
index 16239dedbe2b..7661d9e3cda8 100644
--- a/editors/flim-mule-current/pkg-plist
+++ b/editors/flim-mule-current/pkg-plist
@@ -48,6 +48,5 @@
 @unexec install-info --delete %D/info/mime-ja.info %D/info/dir
 info/mime-en.info
 info/mime-ja.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/mime-en.info %D/info/dir
 @exec install-info %D/info/mime-ja.info %D/info/dir
diff --git a/editors/flim-mule/pkg-plist b/editors/flim-mule/pkg-plist
index 588ccbf78e95..cc7ef050ace7 100644
--- a/editors/flim-mule/pkg-plist
+++ b/editors/flim-mule/pkg-plist
@@ -31,7 +31,6 @@
 %%FLIMDOCDIR%%/ChangeLog
 %%FLIMDOCDIR%%/README.en
 @dirrm %%FLIMDOCDIR%%
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @unexec install-info --delete %D/info/mime-en.info %D/info/dir
 @unexec install-info --delete %D/info/mime-ja.info %D/info/dir
 info/mime-en.info
diff --git a/editors/flim/pkg-plist b/editors/flim/pkg-plist
index f5fa7444b2e5..e303dd6b448b 100644
--- a/editors/flim/pkg-plist
+++ b/editors/flim/pkg-plist
@@ -44,6 +44,5 @@
 @unexec install-info --delete %D/info/mime-ja.info %D/info/dir
 info/mime-en.info
 info/mime-ja.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/mime-en.info %D/info/dir
 @exec install-info %D/info/mime-ja.info %D/info/dir
diff --git a/editors/flim/pkg-plist.emacs20 b/editors/flim/pkg-plist.emacs20
index f5fa7444b2e5..e303dd6b448b 100644
--- a/editors/flim/pkg-plist.emacs20
+++ b/editors/flim/pkg-plist.emacs20
@@ -44,6 +44,5 @@
 @unexec install-info --delete %D/info/mime-ja.info %D/info/dir
 info/mime-en.info
 info/mime-ja.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/mime-en.info %D/info/dir
 @exec install-info %D/info/mime-ja.info %D/info/dir
diff --git a/editors/flim/pkg-plist.emacs21 b/editors/flim/pkg-plist.emacs21
index f5fa7444b2e5..e303dd6b448b 100644
--- a/editors/flim/pkg-plist.emacs21
+++ b/editors/flim/pkg-plist.emacs21
@@ -44,6 +44,5 @@
 @unexec install-info --delete %D/info/mime-ja.info %D/info/dir
 info/mime-en.info
 info/mime-ja.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/mime-en.info %D/info/dir
 @exec install-info %D/info/mime-ja.info %D/info/dir
diff --git a/editors/flim113-emacs/pkg-plist b/editors/flim113-emacs/pkg-plist
index f5fa7444b2e5..e303dd6b448b 100644
--- a/editors/flim113-emacs/pkg-plist
+++ b/editors/flim113-emacs/pkg-plist
@@ -44,6 +44,5 @@
 @unexec install-info --delete %D/info/mime-ja.info %D/info/dir
 info/mime-en.info
 info/mime-ja.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/mime-en.info %D/info/dir
 @exec install-info %D/info/mime-ja.info %D/info/dir
diff --git a/editors/flim113-emacs20/pkg-plist b/editors/flim113-emacs20/pkg-plist
index 0479ca0eb1ae..66c37b78d741 100644
--- a/editors/flim113-emacs20/pkg-plist
+++ b/editors/flim113-emacs20/pkg-plist
@@ -47,6 +47,5 @@
 @unexec install-info --delete %D/info/mime-ja.info %D/info/dir
 info/mime-en.info
 info/mime-ja.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/mime-en.info %D/info/dir
 @exec install-info %D/info/mime-ja.info %D/info/dir
diff --git a/editors/flim113-mule/pkg-plist b/editors/flim113-mule/pkg-plist
index 16239dedbe2b..7661d9e3cda8 100644
--- a/editors/flim113-mule/pkg-plist
+++ b/editors/flim113-mule/pkg-plist
@@ -48,6 +48,5 @@
 @unexec install-info --delete %D/info/mime-ja.info %D/info/dir
 info/mime-en.info
 info/mime-ja.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/mime-en.info %D/info/dir
 @exec install-info %D/info/mime-ja.info %D/info/dir
diff --git a/editors/flim113/pkg-plist b/editors/flim113/pkg-plist
index f5fa7444b2e5..e303dd6b448b 100644
--- a/editors/flim113/pkg-plist
+++ b/editors/flim113/pkg-plist
@@ -44,6 +44,5 @@
 @unexec install-info --delete %D/info/mime-ja.info %D/info/dir
 info/mime-en.info
 info/mime-ja.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/mime-en.info %D/info/dir
 @exec install-info %D/info/mime-ja.info %D/info/dir
diff --git a/editors/flim113/pkg-plist.emacs19 b/editors/flim113/pkg-plist.emacs19
index f5fa7444b2e5..e303dd6b448b 100644
--- a/editors/flim113/pkg-plist.emacs19
+++ b/editors/flim113/pkg-plist.emacs19
@@ -44,6 +44,5 @@
 @unexec install-info --delete %D/info/mime-ja.info %D/info/dir
 info/mime-en.info
 info/mime-ja.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/mime-en.info %D/info/dir
 @exec install-info %D/info/mime-ja.info %D/info/dir
diff --git a/editors/flim113/pkg-plist.emacs20 b/editors/flim113/pkg-plist.emacs20
index 0479ca0eb1ae..66c37b78d741 100644
--- a/editors/flim113/pkg-plist.emacs20
+++ b/editors/flim113/pkg-plist.emacs20
@@ -47,6 +47,5 @@
 @unexec install-info --delete %D/info/mime-ja.info %D/info/dir
 info/mime-en.info
 info/mime-ja.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/mime-en.info %D/info/dir
 @exec install-info %D/info/mime-ja.info %D/info/dir
diff --git a/editors/flim113/pkg-plist.mule b/editors/flim113/pkg-plist.mule
index 16239dedbe2b..7661d9e3cda8 100644
--- a/editors/flim113/pkg-plist.mule
+++ b/editors/flim113/pkg-plist.mule
@@ -48,6 +48,5 @@
 @unexec install-info --delete %D/info/mime-ja.info %D/info/dir
 info/mime-en.info
 info/mime-ja.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/mime-en.info %D/info/dir
 @exec install-info %D/info/mime-ja.info %D/info/dir
diff --git a/editors/flim114-emacs20/pkg-plist b/editors/flim114-emacs20/pkg-plist
index f5fa7444b2e5..e303dd6b448b 100644
--- a/editors/flim114-emacs20/pkg-plist
+++ b/editors/flim114-emacs20/pkg-plist
@@ -44,6 +44,5 @@
 @unexec install-info --delete %D/info/mime-ja.info %D/info/dir
 info/mime-en.info
 info/mime-ja.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/mime-en.info %D/info/dir
 @exec install-info %D/info/mime-ja.info %D/info/dir
diff --git a/editors/jed/Makefile b/editors/jed/Makefile
index a5159e82f3b7..3146365f3921 100644
--- a/editors/jed/Makefile
+++ b/editors/jed/Makefile
@@ -3,7 +3,7 @@
 # Date created:         22 APR 1997
 # Whom:                 eric
 #
-# $Id: Makefile,v 1.7 1998/10/14 04:13:40 jseger Exp $
+# $Id: Makefile,v 1.8 1998/11/29 12:43:08 asami Exp $
 #
 
 DISTNAME=       jed0.98-7
@@ -50,9 +50,6 @@ post-install:
 	${MKDIR} ${PREFIX}/share/doc/jed
 	${INSTALL_DATA} ${WRKSRC}/doc/README ${WRKSRC}/doc/*.txt \
 		${PREFIX}/share/doc/jed
-	if [ ! -f ${PREFIX}/info/dir ]; then \
-	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 	install-info --section="Miscellaneous" \
 		--entry="* JED: (jed).			JED editor documentation." \
 		${PREFIX}/info/jed.info ${PREFIX}/info/dir
diff --git a/editors/jed/pkg-plist b/editors/jed/pkg-plist
index 5bc7ba43bbf3..69994d4d0da7 100644
--- a/editors/jed/pkg-plist
+++ b/editors/jed/pkg-plist
@@ -6,7 +6,6 @@ info/jed.1in
 info/jed.2in
 info/jed.3in
 info/jed.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info --section="Miscellaneous" --entry="* JED: (jed).			JED editor documentation." %D/info/jed.info %D/info/dir
 lib/jed/bin/getmail
 lib/jed/lib/abbrev.sl
diff --git a/editors/mule-common/Makefile b/editors/mule-common/Makefile
index b91778c10bdf..424233d190fd 100644
--- a/editors/mule-common/Makefile
+++ b/editors/mule-common/Makefile
@@ -3,7 +3,7 @@
 # Date created:		7 July 1997
 # Whom:			Satoshi Taoka <taoka@FreeBSD.org>
 #
-# $Id: Makefile,v 1.39 1999/03/29 07:50:59 asami Exp $
+# $Id: Makefile,v 1.40 1999/05/01 04:00:14 taoka Exp $
 #
 
 DISTNAME=	mule-2.3
@@ -126,9 +126,6 @@ post-install:
 .for file in b2m coco ctags emacsclient etags m2ps
 	strip ${PREFIX}/bin/${file}
 .endfor
-	if [ ! -f ${PREFIX}/info/dir ]; then \
-	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 	if [ ! -f ${PREFIX}/share/mule/19.34/info/dir ]; then \
 	  ${MKDIR} ${PREFIX}/share/mule/19.34/info; \
 	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/share/mule/19.34/info/dir; \
diff --git a/editors/mule-common/pkg-plist b/editors/mule-common/pkg-plist
index 5d9c87dc6ada..af0d3bd81ad5 100644
--- a/editors/mule-common/pkg-plist
+++ b/editors/mule-common/pkg-plist
@@ -133,7 +133,6 @@ info/mule-jp-2
 info/mule-jp-3
 info/quail
 info/terminology
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/emacs %D/info/dir
 @exec install-info %D/info/vip %D/info/dir
 @exec install-info %D/info/forms %D/info/dir
diff --git a/editors/psgml-emacs/pkg-plist b/editors/psgml-emacs/pkg-plist
index d7b1b23628d6..6822a9f06eb8 100644
--- a/editors/psgml-emacs/pkg-plist
+++ b/editors/psgml-emacs/pkg-plist
@@ -21,6 +21,5 @@
 @unexec install-info --delete %D/info/psgml-api.info %D/info/dir
 info/psgml.info
 info/psgml-api.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/psgml.info %D/info/dir
 @exec install-info %D/info/psgml-api.info %D/info/dir
diff --git a/editors/psgml-emacs20/pkg-plist b/editors/psgml-emacs20/pkg-plist
index 5b35bd905856..f99d7073877c 100644
--- a/editors/psgml-emacs20/pkg-plist
+++ b/editors/psgml-emacs20/pkg-plist
@@ -20,6 +20,5 @@
 @unexec install-info --delete %D/info/psgml-api.info %D/info/dir
 info/psgml.info
 info/psgml-api.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/psgml.info %D/info/dir
 @exec install-info %D/info/psgml-api.info %D/info/dir
diff --git a/editors/psgml-mule/pkg-plist b/editors/psgml-mule/pkg-plist
index d7b1b23628d6..6822a9f06eb8 100644
--- a/editors/psgml-mule/pkg-plist
+++ b/editors/psgml-mule/pkg-plist
@@ -21,6 +21,5 @@
 @unexec install-info --delete %D/info/psgml-api.info %D/info/dir
 info/psgml.info
 info/psgml-api.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/psgml.info %D/info/dir
 @exec install-info %D/info/psgml-api.info %D/info/dir
diff --git a/editors/psgml-xemacs21-mule/pkg-plist b/editors/psgml-xemacs21-mule/pkg-plist
index ed3be402af9d..e65754c35c65 100644
--- a/editors/psgml-xemacs21-mule/pkg-plist
+++ b/editors/psgml-xemacs21-mule/pkg-plist
@@ -21,6 +21,5 @@
 @unexec install-info --delete %D/info/psgml-api.info %D/info/dir
 info/psgml.info
 info/psgml-api.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/psgml.info %D/info/dir
 @exec install-info %D/info/psgml-api.info %D/info/dir
diff --git a/editors/psgml/pkg-plist b/editors/psgml/pkg-plist
index d7b1b23628d6..6822a9f06eb8 100644
--- a/editors/psgml/pkg-plist
+++ b/editors/psgml/pkg-plist
@@ -21,6 +21,5 @@
 @unexec install-info --delete %D/info/psgml-api.info %D/info/dir
 info/psgml.info
 info/psgml-api.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/psgml.info %D/info/dir
 @exec install-info %D/info/psgml-api.info %D/info/dir
diff --git a/editors/semi-emacs-current/pkg-plist b/editors/semi-emacs-current/pkg-plist
index 939942ba695b..051d24139c8e 100644
--- a/editors/semi-emacs-current/pkg-plist
+++ b/editors/semi-emacs-current/pkg-plist
@@ -32,6 +32,5 @@
 @unexec install-info --delete %D/info/mime-ui-ja.info %D/info/dir
 info/mime-ui-en.info
 info/mime-ui-ja.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/mime-ui-en.info %D/info/dir
 @exec install-info %D/info/mime-ui-ja.info %D/info/dir
diff --git a/editors/semi-emacs/pkg-plist b/editors/semi-emacs/pkg-plist
index 503e3598bce4..166805523f07 100644
--- a/editors/semi-emacs/pkg-plist
+++ b/editors/semi-emacs/pkg-plist
@@ -34,6 +34,5 @@
 @unexec install-info --delete %D/info/mime-ui-ja.info %D/info/dir
 info/mime-ui-en.info
 info/mime-ui-ja.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/mime-ui-en.info %D/info/dir
 @exec install-info %D/info/mime-ui-ja.info %D/info/dir
diff --git a/editors/semi-emacs20-current/pkg-plist b/editors/semi-emacs20-current/pkg-plist
index 3974d12dcfe4..319d4d2f30f4 100644
--- a/editors/semi-emacs20-current/pkg-plist
+++ b/editors/semi-emacs20-current/pkg-plist
@@ -33,6 +33,5 @@
 @unexec install-info --delete %D/info/mime-ui-ja.info %D/info/dir
 info/mime-ui-en.info
 info/mime-ui-ja.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/mime-ui-en.info %D/info/dir
 @exec install-info %D/info/mime-ui-ja.info %D/info/dir
diff --git a/editors/semi-emacs20/pkg-plist b/editors/semi-emacs20/pkg-plist
index 5255d2f415db..b353aaf754d8 100644
--- a/editors/semi-emacs20/pkg-plist
+++ b/editors/semi-emacs20/pkg-plist
@@ -35,6 +35,5 @@
 @unexec install-info --delete %D/info/mime-ui-ja.info %D/info/dir
 info/mime-ui-en.info
 info/mime-ui-ja.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/mime-ui-en.info %D/info/dir
 @exec install-info %D/info/mime-ui-ja.info %D/info/dir
diff --git a/editors/semi-mule-current/pkg-plist b/editors/semi-mule-current/pkg-plist
index 7d9bdae1379f..39297deb05f8 100644
--- a/editors/semi-mule-current/pkg-plist
+++ b/editors/semi-mule-current/pkg-plist
@@ -34,6 +34,5 @@
 @unexec install-info --delete %D/info/mime-ui-ja.info %D/info/dir
 info/mime-ui-en.info
 info/mime-ui-ja.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/mime-ui-en.info %D/info/dir
 @exec install-info %D/info/mime-ui-ja.info %D/info/dir
diff --git a/editors/semi-mule/pkg-plist b/editors/semi-mule/pkg-plist
index 2ed921df2ba9..930d26a0db3b 100644
--- a/editors/semi-mule/pkg-plist
+++ b/editors/semi-mule/pkg-plist
@@ -36,6 +36,5 @@
 @unexec install-info --delete %D/info/mime-ui-ja.info %D/info/dir
 info/mime-ui-en.info
 info/mime-ui-ja.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/mime-ui-en.info %D/info/dir
 @exec install-info %D/info/mime-ui-ja.info %D/info/dir
diff --git a/editors/semi/pkg-plist.emacs20 b/editors/semi/pkg-plist.emacs20
index 939942ba695b..051d24139c8e 100644
--- a/editors/semi/pkg-plist.emacs20
+++ b/editors/semi/pkg-plist.emacs20
@@ -32,6 +32,5 @@
 @unexec install-info --delete %D/info/mime-ui-ja.info %D/info/dir
 info/mime-ui-en.info
 info/mime-ui-ja.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/mime-ui-en.info %D/info/dir
 @exec install-info %D/info/mime-ui-ja.info %D/info/dir
diff --git a/editors/semi/pkg-plist.emacs21 b/editors/semi/pkg-plist.emacs21
index 939942ba695b..051d24139c8e 100644
--- a/editors/semi/pkg-plist.emacs21
+++ b/editors/semi/pkg-plist.emacs21
@@ -32,6 +32,5 @@
 @unexec install-info --delete %D/info/mime-ui-ja.info %D/info/dir
 info/mime-ui-en.info
 info/mime-ui-ja.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/mime-ui-en.info %D/info/dir
 @exec install-info %D/info/mime-ui-ja.info %D/info/dir
diff --git a/editors/semi113-emacs/pkg-plist b/editors/semi113-emacs/pkg-plist
index 939942ba695b..051d24139c8e 100644
--- a/editors/semi113-emacs/pkg-plist
+++ b/editors/semi113-emacs/pkg-plist
@@ -32,6 +32,5 @@
 @unexec install-info --delete %D/info/mime-ui-ja.info %D/info/dir
 info/mime-ui-en.info
 info/mime-ui-ja.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/mime-ui-en.info %D/info/dir
 @exec install-info %D/info/mime-ui-ja.info %D/info/dir
diff --git a/editors/semi113-emacs20/pkg-plist b/editors/semi113-emacs20/pkg-plist
index 3974d12dcfe4..319d4d2f30f4 100644
--- a/editors/semi113-emacs20/pkg-plist
+++ b/editors/semi113-emacs20/pkg-plist
@@ -33,6 +33,5 @@
 @unexec install-info --delete %D/info/mime-ui-ja.info %D/info/dir
 info/mime-ui-en.info
 info/mime-ui-ja.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/mime-ui-en.info %D/info/dir
 @exec install-info %D/info/mime-ui-ja.info %D/info/dir
diff --git a/editors/semi113-mule/pkg-plist b/editors/semi113-mule/pkg-plist
index 7d9bdae1379f..39297deb05f8 100644
--- a/editors/semi113-mule/pkg-plist
+++ b/editors/semi113-mule/pkg-plist
@@ -34,6 +34,5 @@
 @unexec install-info --delete %D/info/mime-ui-ja.info %D/info/dir
 info/mime-ui-en.info
 info/mime-ui-ja.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/mime-ui-en.info %D/info/dir
 @exec install-info %D/info/mime-ui-ja.info %D/info/dir
diff --git a/editors/semi113/pkg-plist.emacs19 b/editors/semi113/pkg-plist.emacs19
index 939942ba695b..051d24139c8e 100644
--- a/editors/semi113/pkg-plist.emacs19
+++ b/editors/semi113/pkg-plist.emacs19
@@ -32,6 +32,5 @@
 @unexec install-info --delete %D/info/mime-ui-ja.info %D/info/dir
 info/mime-ui-en.info
 info/mime-ui-ja.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/mime-ui-en.info %D/info/dir
 @exec install-info %D/info/mime-ui-ja.info %D/info/dir
diff --git a/editors/semi113/pkg-plist.emacs20 b/editors/semi113/pkg-plist.emacs20
index 3974d12dcfe4..319d4d2f30f4 100644
--- a/editors/semi113/pkg-plist.emacs20
+++ b/editors/semi113/pkg-plist.emacs20
@@ -33,6 +33,5 @@
 @unexec install-info --delete %D/info/mime-ui-ja.info %D/info/dir
 info/mime-ui-en.info
 info/mime-ui-ja.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/mime-ui-en.info %D/info/dir
 @exec install-info %D/info/mime-ui-ja.info %D/info/dir
diff --git a/editors/semi113/pkg-plist.emacs21 b/editors/semi113/pkg-plist.emacs21
index 3974d12dcfe4..319d4d2f30f4 100644
--- a/editors/semi113/pkg-plist.emacs21
+++ b/editors/semi113/pkg-plist.emacs21
@@ -33,6 +33,5 @@
 @unexec install-info --delete %D/info/mime-ui-ja.info %D/info/dir
 info/mime-ui-en.info
 info/mime-ui-ja.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/mime-ui-en.info %D/info/dir
 @exec install-info %D/info/mime-ui-ja.info %D/info/dir
diff --git a/editors/semi113/pkg-plist.mule b/editors/semi113/pkg-plist.mule
index 7d9bdae1379f..39297deb05f8 100644
--- a/editors/semi113/pkg-plist.mule
+++ b/editors/semi113/pkg-plist.mule
@@ -34,6 +34,5 @@
 @unexec install-info --delete %D/info/mime-ui-ja.info %D/info/dir
 info/mime-ui-en.info
 info/mime-ui-ja.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/mime-ui-en.info %D/info/dir
 @exec install-info %D/info/mime-ui-ja.info %D/info/dir
diff --git a/editors/semi114-emacs20/pkg-plist b/editors/semi114-emacs20/pkg-plist
index 939942ba695b..051d24139c8e 100644
--- a/editors/semi114-emacs20/pkg-plist
+++ b/editors/semi114-emacs20/pkg-plist
@@ -32,6 +32,5 @@
 @unexec install-info --delete %D/info/mime-ui-ja.info %D/info/dir
 info/mime-ui-en.info
 info/mime-ui-ja.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/mime-ui-en.info %D/info/dir
 @exec install-info %D/info/mime-ui-ja.info %D/info/dir
diff --git a/editors/wemi-emacs-current/pkg-plist b/editors/wemi-emacs-current/pkg-plist
index 9697a3d97269..4bcd8ca37d9d 100644
--- a/editors/wemi-emacs-current/pkg-plist
+++ b/editors/wemi-emacs-current/pkg-plist
@@ -32,6 +32,5 @@
 @unexec install-info --delete %D/info/mime-ui-ja.info %D/info/dir
 info/mime-ui-en.info
 info/mime-ui-ja.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/mime-ui-en.info %D/info/dir
 @exec install-info %D/info/mime-ui-ja.info %D/info/dir
diff --git a/editors/wemi-emacs/pkg-plist b/editors/wemi-emacs/pkg-plist
index d086def7fa33..945ddc1918c7 100644
--- a/editors/wemi-emacs/pkg-plist
+++ b/editors/wemi-emacs/pkg-plist
@@ -34,6 +34,5 @@
 @unexec install-info --delete %D/info/mime-ui-ja.info %D/info/dir
 info/mime-ui-en.info
 info/mime-ui-ja.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/mime-ui-en.info %D/info/dir
 @exec install-info %D/info/mime-ui-ja.info %D/info/dir
diff --git a/editors/wemi-emacs20-current/pkg-plist b/editors/wemi-emacs20-current/pkg-plist
index 24bb109363c8..feada6335715 100644
--- a/editors/wemi-emacs20-current/pkg-plist
+++ b/editors/wemi-emacs20-current/pkg-plist
@@ -33,6 +33,5 @@
 @unexec install-info --delete %D/info/mime-ui-ja.info %D/info/dir
 info/mime-ui-en.info
 info/mime-ui-ja.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/mime-ui-en.info %D/info/dir
 @exec install-info %D/info/mime-ui-ja.info %D/info/dir
diff --git a/editors/wemi-emacs20/pkg-plist b/editors/wemi-emacs20/pkg-plist
index 0af935a59cf1..38cb223ccc58 100644
--- a/editors/wemi-emacs20/pkg-plist
+++ b/editors/wemi-emacs20/pkg-plist
@@ -35,6 +35,5 @@
 @unexec install-info --delete %D/info/mime-ui-ja.info %D/info/dir
 info/mime-ui-en.info
 info/mime-ui-ja.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/mime-ui-en.info %D/info/dir
 @exec install-info %D/info/mime-ui-ja.info %D/info/dir
diff --git a/editors/wemi-mule-current/pkg-plist b/editors/wemi-mule-current/pkg-plist
index 1f0a37a3f973..67e4b5834057 100644
--- a/editors/wemi-mule-current/pkg-plist
+++ b/editors/wemi-mule-current/pkg-plist
@@ -34,6 +34,5 @@
 @unexec install-info --delete %D/info/mime-ui-ja.info %D/info/dir
 info/mime-ui-en.info
 info/mime-ui-ja.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/mime-ui-en.info %D/info/dir
 @exec install-info %D/info/mime-ui-ja.info %D/info/dir
diff --git a/editors/wemi-mule/pkg-plist b/editors/wemi-mule/pkg-plist
index 5ed8532a7848..a6717f4eb22b 100644
--- a/editors/wemi-mule/pkg-plist
+++ b/editors/wemi-mule/pkg-plist
@@ -36,6 +36,5 @@
 @unexec install-info --delete %D/info/mime-ui-ja.info %D/info/dir
 info/mime-ui-en.info
 info/mime-ui-ja.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/mime-ui-en.info %D/info/dir
 @exec install-info %D/info/mime-ui-ja.info %D/info/dir
diff --git a/emulators/mtools/Makefile b/emulators/mtools/Makefile
index 779e4a3ba23f..a8c9de7940e3 100644
--- a/emulators/mtools/Makefile
+++ b/emulators/mtools/Makefile
@@ -3,7 +3,7 @@
 # Date created:         5 October 1994
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.26 1999/01/31 12:31:06 obrien Exp $
+# $Id: Makefile,v 1.27 1999/04/18 12:03:49 jmz Exp $
 #
 
 DISTNAME=	mtools-3.9.4
@@ -45,9 +45,6 @@ post-install:
 	@ln -sf ${PREFIX}/man/man1/mcopy.1.gz ${PREFIX}/man/man1/mwrite.1.gz
 	@${INSTALL_DATA} ${WRKSRC}/mtools.conf ${PREFIX}/etc
 	@${ECHO} "Please verify ${PREFIX}/etc/mtools.conf for your machine."
-	@if [ ! -f ${PREFIX}/info/dir ]; then \
-	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	 fi
 	@install-info ${PREFIX}/info/mtools.info ${PREFIX}/info/dir
 
 .include <bsd.port.mk>
diff --git a/emulators/mtools/pkg-plist b/emulators/mtools/pkg-plist
index c8fa4d71422f..e082a669eefd 100644
--- a/emulators/mtools/pkg-plist
+++ b/emulators/mtools/pkg-plist
@@ -53,7 +53,6 @@ bin/mkmanifest
 bin/mxtar
 @unexec install-info --delete %D/info/mtools.info %D/info/dir
 info/mtools.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/mtools.info %D/info/dir
 etc/mtools.conf
 @exec ln -fs %D/man/man1/mcopy.1.gz %D/man/man1/mwrite.1.gz
diff --git a/ftp/cftp/Makefile b/ftp/cftp/Makefile
index 99a0b4ed23ec..e031073891c3 100644
--- a/ftp/cftp/Makefile
+++ b/ftp/cftp/Makefile
@@ -3,7 +3,7 @@
 # Date created:				14 October 1997
 # Whom:					Andrey Zakhvatov
 #
-# $Id: Makefile,v 1.1.1.1 1998/05/14 07:27:51 tg Exp $
+# $Id: Makefile,v 1.2 1999/04/05 23:44:25 jseger Exp $
 #
 
 DISTNAME=	cftp-0.9.3
@@ -14,11 +14,6 @@ MAINTAINER=	andy@icc.surw.chel.su
 
 GNU_CONFIGURE=	yes
 
-pre-install:
-	@if [ -f /usr/share/info/dir ] && [ ! -f ${PREFIX}/info/dir ]; then \
-	    ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
-
 post-install:
 .if !defined(NOPORTDOCS)
 	@ ${MKDIR} ${PREFIX}/share/doc/cftp
diff --git a/ftp/cftp/pkg-plist b/ftp/cftp/pkg-plist
index 6ce18f0a303f..0c6041546425 100644
--- a/ftp/cftp/pkg-plist
+++ b/ftp/cftp/pkg-plist
@@ -1,7 +1,6 @@
 bin/cftp
 @unexec install-info --delete %D/info/cftp.info %D/info/dir
 info/cftp.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/cftp.info %D/info/dir
 share/doc/cftp/AUTHORS
 share/doc/cftp/ChangeLog
diff --git a/ftp/wget-devel/Makefile b/ftp/wget-devel/Makefile
index 3f428ac9585a..155404ca0138 100644
--- a/ftp/wget-devel/Makefile
+++ b/ftp/wget-devel/Makefile
@@ -3,7 +3,7 @@
 # Date created:		31 December 1996
 # Whom:			Thomas Gellekum <tg@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.12 1999/03/20 17:18:04 nectar Exp $
+# $Id: Makefile,v 1.13 1999/05/01 02:31:46 steve Exp $
 #
 
 DISTNAME=	wget-1.5.3
@@ -24,9 +24,6 @@ GNU_CONFIGURE=	yes
 INFOFILES=	wget.info
 
 post-install:
-	if [ ! -f ${PREFIX}/info/dir ]; then \
-		${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 .for i in ${INFOFILES}
 	install-info ${PREFIX}/info/${i} ${PREFIX}/info/dir
 .endfor
diff --git a/ftp/wget-devel/pkg-plist b/ftp/wget-devel/pkg-plist
index 8acca37db174..9d7f52b521f6 100644
--- a/ftp/wget-devel/pkg-plist
+++ b/ftp/wget-devel/pkg-plist
@@ -5,5 +5,4 @@ info/wget.info
 info/wget.info-1
 info/wget.info-2
 info/wget.info-3
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/wget.info %D/info/dir
diff --git a/ftp/wget/Makefile b/ftp/wget/Makefile
index 3f428ac9585a..155404ca0138 100644
--- a/ftp/wget/Makefile
+++ b/ftp/wget/Makefile
@@ -3,7 +3,7 @@
 # Date created:		31 December 1996
 # Whom:			Thomas Gellekum <tg@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.12 1999/03/20 17:18:04 nectar Exp $
+# $Id: Makefile,v 1.13 1999/05/01 02:31:46 steve Exp $
 #
 
 DISTNAME=	wget-1.5.3
@@ -24,9 +24,6 @@ GNU_CONFIGURE=	yes
 INFOFILES=	wget.info
 
 post-install:
-	if [ ! -f ${PREFIX}/info/dir ]; then \
-		${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 .for i in ${INFOFILES}
 	install-info ${PREFIX}/info/${i} ${PREFIX}/info/dir
 .endfor
diff --git a/ftp/wget/pkg-plist b/ftp/wget/pkg-plist
index 8acca37db174..9d7f52b521f6 100644
--- a/ftp/wget/pkg-plist
+++ b/ftp/wget/pkg-plist
@@ -5,5 +5,4 @@ info/wget.info
 info/wget.info-1
 info/wget.info-2
 info/wget.info-3
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/wget.info %D/info/dir
diff --git a/games/xboard/pkg-plist b/games/xboard/pkg-plist
index fc421621abb8..e747b267d812 100644
--- a/games/xboard/pkg-plist
+++ b/games/xboard/pkg-plist
@@ -4,5 +4,4 @@ bin/pxboard
 bin/zic2xpm
 @unexec install-info --delete %D/info/xboard.info %D/info/dir
 info/xboard.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/xboard.info %D/info/dir
diff --git a/games/xconq/Makefile b/games/xconq/Makefile
index a8ac9e438da3..2d94a2ac743a 100644
--- a/games/xconq/Makefile
+++ b/games/xconq/Makefile
@@ -3,7 +3,7 @@
 # Date created:         2 Jun 1998
 # Whom:                 Don Croyle <croyle@gelemna.ft-wayne.in.us>
 #
-# $Id: Makefile,v 1.6 1998/09/28 02:17:56 steve Exp $
+# $Id: Makefile,v 1.7 1998/10/01 06:09:56 steve Exp $
 #
 
 DISTNAME=	xconq-7.2.2
@@ -29,9 +29,6 @@ post-install:
 	strip ${PREFIX}/bin/${file}
 .endfor
 	cd ${WRKSRC}/doc && make install-info
-	if [ ! -f ${PREFIX}/info/dir ]; then \
-		${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 .for info in xconq xcdesign
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
diff --git a/games/xconq/pkg-plist b/games/xconq/pkg-plist
index f12611ec02d0..fe1343716a91 100644
--- a/games/xconq/pkg-plist
+++ b/games/xconq/pkg-plist
@@ -171,7 +171,6 @@ info/xconq.info-2
 info/xconq.info-3
 info/xconq.info-4
 info/xconq.info-5
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/xcdesign.info %D/info/dir
 @exec install-info %D/info/xconq.info %D/info/dir
 @dirrm lib/xconqdir/lib
diff --git a/graphics/xaos/Makefile b/graphics/xaos/Makefile
index 0bf57baf5332..0ab5bce230bb 100644
--- a/graphics/xaos/Makefile
+++ b/graphics/xaos/Makefile
@@ -3,7 +3,7 @@
 # Date created:				24 February 1996
 # Whom:					Joseph Koshy <koshy@india.hp.com>
 #
-# $Id: Makefile,v 1.9 1998/11/29 12:43:08 asami Exp $
+# $Id: Makefile,v 1.10 1999/01/23 07:05:31 vanilla Exp $
 #
 
 DISTNAME=	XaoS-3.0
@@ -33,9 +33,6 @@ MAN6=		xaos.6
 
 post-install:
 	strip ${PREFIX}/bin/xaos
-	if [ ! -f ${PREFIX}/info/dir ]; then \
-		${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 	install-info ${PREFIX}/info/xaos.info ${PREFIX}/info/dir
 
 .include <bsd.port.mk>
diff --git a/graphics/xaos/pkg-plist b/graphics/xaos/pkg-plist
index 05578da30760..7516b5707106 100644
--- a/graphics/xaos/pkg-plist
+++ b/graphics/xaos/pkg-plist
@@ -115,7 +115,6 @@ share/XaoS/doc/PROBLEMS
 share/XaoS/doc/tutorial.txt
 @unexec install-info --delete %D/info/xaos.info %D/info/dir
 info/xaos.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/xaos.info %D/info/dir
 @dirrm share/XaoS/catalogs
 @dirrm share/XaoS/examples
diff --git a/japanese/ddskk/Makefile b/japanese/ddskk/Makefile
index dfb6cc3d1b79..faed04b97f18 100644
--- a/japanese/ddskk/Makefile
+++ b/japanese/ddskk/Makefile
@@ -3,7 +3,7 @@
 # Date created:		31 Oct 1998
 # Whom:			Shigeyuki FUKUSHIMA <shige@kuis.kyoto-u.ac.jp>
 #
-# $Id: Makefile,v 1.2 1998/12/23 08:50:12 kuriyama Exp $
+# $Id: Makefile,v 1.3 1998/12/23 12:02:16 asami Exp $
 #
 
 DISTNAME=	skk9.6
@@ -38,9 +38,6 @@ post-install:
 	(cd ${WRKSRC}; make SUBDIRS='doc' install)
 	(cd ${WRKSRC}; make SUBDIRS='etc' install)
 
-	@if [ ! -f ${PREFIX}/info/dir ]; then \
-		${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 	install-info ${PREFIX}/info/skk.info ${PREFIX}/info/dir
 
 .include <bsd.port.mk>
diff --git a/japanese/ddskk/pkg-plist b/japanese/ddskk/pkg-plist
index 00a8003c2345..09e91810fb03 100644
--- a/japanese/ddskk/pkg-plist
+++ b/japanese/ddskk/pkg-plist
@@ -45,5 +45,4 @@ info/skk.info-3
 info/skk.info-4
 info/skk.info-5
 info/skk.info-6
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/skk.info %D/info/dir
diff --git a/japanese/dvipsk-vflib/Makefile b/japanese/dvipsk-vflib/Makefile
index cf320878707c..e5b668c4f7ab 100644
--- a/japanese/dvipsk-vflib/Makefile
+++ b/japanese/dvipsk-vflib/Makefile
@@ -3,7 +3,7 @@
 # Date created:         25 Aug 1997
 # Whom:                 Makoto WATANABE <watanabe@zlab.phys.nagoya-u.ac.jp>
 #
-# $Id: Makefile,v 1.2 1998/10/07 06:11:41 asami Exp $
+# $Id: Makefile,v 1.3 1999/02/02 09:32:09 asami Exp $
 #
 
 DISTNAME=	dvipsk-5.78a
@@ -58,9 +58,6 @@ post-build:
 	)
 
 pre-install:
-	@if [ ! -f ${PREFIX}/info/dir ] ; then \
-	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir ; \
-	fi
 	@for i in ${BACKUP_FILES} ; do \
 	  if [ -f ${DVIPSDIR}/$$i ] ; then \
 	    ${MV} ${DVIPSDIR}/$$i ${DVIPSDIR}/$$i.bak ; \
diff --git a/japanese/dvipsk-vflib/pkg-plist b/japanese/dvipsk-vflib/pkg-plist
index 834ad438e450..30ca4eb10c48 100644
--- a/japanese/dvipsk-vflib/pkg-plist
+++ b/japanese/dvipsk-vflib/pkg-plist
@@ -6,7 +6,6 @@ info/dvips.info-1
 info/dvips.info-2
 info/dvips.info-3
 info/dvips.info-4
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/dvips.info %D/info/dir
 @exec for i in base/asex.enc base/psfonts.map config/config.ps ; do if [ -f %D/share/texmf/dvips/$i ] ; then mv %D/share/texmf/dvips/$i %D/share/texmf/dvips/$i.bak ; fi ; done
 share/texmf/dvips/base/vffonts.pro
diff --git a/japanese/dvipsk/Makefile b/japanese/dvipsk/Makefile
index 46e276e322c2..4aff1503443a 100644
--- a/japanese/dvipsk/Makefile
+++ b/japanese/dvipsk/Makefile
@@ -3,7 +3,7 @@
 # Date created:         25 Aug 1997
 # Whom:                 Makoto WATANABE <watanabe@zlab.phys.nagoya-u.ac.jp>
 #
-# $Id: Makefile,v 1.1.1.1 1998/05/02 22:35:08 max Exp $
+# $Id: Makefile,v 1.2 1998/07/20 02:55:30 steve Exp $
 #
 
 DISTNAME=	dvipsk-5.78a
@@ -53,9 +53,6 @@ post-build:
 	)
 
 pre-install:
-	@if [ ! -f ${PREFIX}/info/dir ] ; then \
-	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir ; \
-	fi
 	@for i in ${BACKUP_FILES} ; do \
 	  if [ -f ${DVIPSDIR}/$$i ] ; then \
 	    ${MV} ${DVIPSDIR}/$$i ${DVIPSDIR}/$$i.bak ; \
diff --git a/japanese/dvipsk/pkg-plist b/japanese/dvipsk/pkg-plist
index de25cb0ffc8b..6b6fbd97c928 100644
--- a/japanese/dvipsk/pkg-plist
+++ b/japanese/dvipsk/pkg-plist
@@ -6,7 +6,6 @@ info/dvips.info-1
 info/dvips.info-2
 info/dvips.info-3
 info/dvips.info-4
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/dvips.info %D/info/dir
 @exec for i in base/asex.enc base/psfonts.map config/config.ps ; do if [ -f %D/share/texmf/dvips/$i ] ; then mv %D/share/texmf/dvips/$i %D/share/texmf/dvips/$i.bak ; fi ; done
 share/texmf/dvips/base/asex.enc
diff --git a/japanese/eb/Makefile b/japanese/eb/Makefile
index 937b36b6425a..7522dc643e53 100644
--- a/japanese/eb/Makefile
+++ b/japanese/eb/Makefile
@@ -3,7 +3,7 @@
 # Date created:			20 Jan 1999
 # Whom:				Motoyuki Kasahara <m-kasahr@sra.co.jp>
 #
-# $Id: Makefile,v 1.1.1.1 1999/01/26 03:03:44 steve Exp $
+# $Id: Makefile,v 1.2 1999/03/13 07:35:40 taoka Exp $
 #
 
 DISTNAME=	eb-2.2.2
@@ -57,9 +57,6 @@ post-install:
 	    (cd ${APPENDIXDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
 		${DISTDIR}/${DIST_SUBDIR}/$$i ${EXTRACT_AFTER_ARGS}); \
 	done
-	if [ ! -f ${PREFIX}/info/dir ]; then \
-	    ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 	${INSTALL_DATA} ${FILESDIR}/LIST ${APPENDIXDIR}/LIST
 	${INSTALL_DATA} ${FILESDIR}/LIST-ja ${APPENDIXDIR}/LIST-ja
 .for info in eb ebinfo ebfont ebrefile ebzip
diff --git a/japanese/eb/pkg-plist b/japanese/eb/pkg-plist
index b83fb074883f..59f0a9db676e 100644
--- a/japanese/eb/pkg-plist
+++ b/japanese/eb/pkg-plist
@@ -38,7 +38,6 @@ info/ebfont-ja.info
 info/ebinfo-ja.info
 info/ebrefile-ja.info
 info/ebzip-ja.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/eb.info %D/info/dir
 @exec install-info %D/info/ebfont.info %D/info/dir
 @exec install-info %D/info/ebinfo.info %D/info/dir
diff --git a/japanese/eb2/Makefile b/japanese/eb2/Makefile
index 937b36b6425a..7522dc643e53 100644
--- a/japanese/eb2/Makefile
+++ b/japanese/eb2/Makefile
@@ -3,7 +3,7 @@
 # Date created:			20 Jan 1999
 # Whom:				Motoyuki Kasahara <m-kasahr@sra.co.jp>
 #
-# $Id: Makefile,v 1.1.1.1 1999/01/26 03:03:44 steve Exp $
+# $Id: Makefile,v 1.2 1999/03/13 07:35:40 taoka Exp $
 #
 
 DISTNAME=	eb-2.2.2
@@ -57,9 +57,6 @@ post-install:
 	    (cd ${APPENDIXDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
 		${DISTDIR}/${DIST_SUBDIR}/$$i ${EXTRACT_AFTER_ARGS}); \
 	done
-	if [ ! -f ${PREFIX}/info/dir ]; then \
-	    ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 	${INSTALL_DATA} ${FILESDIR}/LIST ${APPENDIXDIR}/LIST
 	${INSTALL_DATA} ${FILESDIR}/LIST-ja ${APPENDIXDIR}/LIST-ja
 .for info in eb ebinfo ebfont ebrefile ebzip
diff --git a/japanese/eb2/pkg-plist b/japanese/eb2/pkg-plist
index b83fb074883f..59f0a9db676e 100644
--- a/japanese/eb2/pkg-plist
+++ b/japanese/eb2/pkg-plist
@@ -38,7 +38,6 @@ info/ebfont-ja.info
 info/ebinfo-ja.info
 info/ebrefile-ja.info
 info/ebzip-ja.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/eb.info %D/info/dir
 @exec install-info %D/info/ebfont.info %D/info/dir
 @exec install-info %D/info/ebinfo.info %D/info/dir
diff --git a/japanese/eb3/Makefile b/japanese/eb3/Makefile
index 937b36b6425a..7522dc643e53 100644
--- a/japanese/eb3/Makefile
+++ b/japanese/eb3/Makefile
@@ -3,7 +3,7 @@
 # Date created:			20 Jan 1999
 # Whom:				Motoyuki Kasahara <m-kasahr@sra.co.jp>
 #
-# $Id: Makefile,v 1.1.1.1 1999/01/26 03:03:44 steve Exp $
+# $Id: Makefile,v 1.2 1999/03/13 07:35:40 taoka Exp $
 #
 
 DISTNAME=	eb-2.2.2
@@ -57,9 +57,6 @@ post-install:
 	    (cd ${APPENDIXDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
 		${DISTDIR}/${DIST_SUBDIR}/$$i ${EXTRACT_AFTER_ARGS}); \
 	done
-	if [ ! -f ${PREFIX}/info/dir ]; then \
-	    ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 	${INSTALL_DATA} ${FILESDIR}/LIST ${APPENDIXDIR}/LIST
 	${INSTALL_DATA} ${FILESDIR}/LIST-ja ${APPENDIXDIR}/LIST-ja
 .for info in eb ebinfo ebfont ebrefile ebzip
diff --git a/japanese/eb3/pkg-plist b/japanese/eb3/pkg-plist
index b83fb074883f..59f0a9db676e 100644
--- a/japanese/eb3/pkg-plist
+++ b/japanese/eb3/pkg-plist
@@ -38,7 +38,6 @@ info/ebfont-ja.info
 info/ebinfo-ja.info
 info/ebrefile-ja.info
 info/ebzip-ja.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/eb.info %D/info/dir
 @exec install-info %D/info/ebfont.info %D/info/dir
 @exec install-info %D/info/ebinfo.info %D/info/dir
diff --git a/japanese/ebnetd/Makefile b/japanese/ebnetd/Makefile
index 9b1410dcea24..69d6fae290e9 100644
--- a/japanese/ebnetd/Makefile
+++ b/japanese/ebnetd/Makefile
@@ -3,7 +3,7 @@
 # Date created:			4 Aug 1998
 # Whom:				Motoyuki Kasahara <m-kasahr@sra.co.jp>
 #
-# $Id: Makefile,v 1.6 1999/01/26 03:06:43 steve Exp $
+# $Id: Makefile,v 1.7 1999/03/15 13:00:35 taoka Exp $
 #
 
 DISTNAME=	ndtpd-2.2.2
@@ -28,9 +28,6 @@ IS_INTERACTIVE=	Maybe_interactive_at_install_stage
 .endif
 
 post-install:
-	if [ ! -f ${PREFIX}/info/dir ]; then \
-	    ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 .for info in ndtpd ndtpd-ja
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
diff --git a/japanese/ebnetd/pkg-plist b/japanese/ebnetd/pkg-plist
index bbc0a8195848..cce8ec65312b 100644
--- a/japanese/ebnetd/pkg-plist
+++ b/japanese/ebnetd/pkg-plist
@@ -8,6 +8,5 @@ etc/ndtpd.sample
 @unexec install-info --delete %D/info/ndtpd-ja.info %D/info/dir
 info/ndtpd.info
 info/ndtpd-ja.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/ndtpd.info %D/info/dir
 @exec install-info %D/info/ndtpd-ja.info %D/info/dir
diff --git a/japanese/mtools/Makefile b/japanese/mtools/Makefile
index 1e940fe3556a..ed74c69d23e9 100644
--- a/japanese/mtools/Makefile
+++ b/japanese/mtools/Makefile
@@ -3,7 +3,7 @@
 # Date created:		6 October 1997
 # Whom:			WATANABE junya <junya-w@remus.dti.ne.jp>
 #
-# $Id: Makefile,v 1.1.1.1 1998/04/28 15:19:54 kuriyama Exp $
+# $Id: Makefile,v 1.2 1999/03/08 07:28:27 asami Exp $
 #
 
 DISTNAME=	mtools-3.6
@@ -40,9 +40,6 @@ post-patch:
 
 post-install:
 	@install -c ${WRKSRC}/mtools.conf ${PREFIX}/etc
-	@if [ ! -f ${PREFIX}/info/dir ]; then \
-	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	 fi
 	@install-info ${PREFIX}/info/mtools.info ${PREFIX}/info/dir
 
 .include <bsd.port.mk>
diff --git a/japanese/mtools/pkg-plist b/japanese/mtools/pkg-plist
index 2d51a05fa247..8b127774f83d 100644
--- a/japanese/mtools/pkg-plist
+++ b/japanese/mtools/pkg-plist
@@ -48,6 +48,5 @@ bin/xcopy
 bin/mcomp
 @unexec install-info --delete %D/info/mtools.info %D/info/dir
 info/mtools.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/mtools.info %D/info/dir
 etc/mtools.conf
diff --git a/japanese/ndtpd/Makefile b/japanese/ndtpd/Makefile
index 9b1410dcea24..69d6fae290e9 100644
--- a/japanese/ndtpd/Makefile
+++ b/japanese/ndtpd/Makefile
@@ -3,7 +3,7 @@
 # Date created:			4 Aug 1998
 # Whom:				Motoyuki Kasahara <m-kasahr@sra.co.jp>
 #
-# $Id: Makefile,v 1.6 1999/01/26 03:06:43 steve Exp $
+# $Id: Makefile,v 1.7 1999/03/15 13:00:35 taoka Exp $
 #
 
 DISTNAME=	ndtpd-2.2.2
@@ -28,9 +28,6 @@ IS_INTERACTIVE=	Maybe_interactive_at_install_stage
 .endif
 
 post-install:
-	if [ ! -f ${PREFIX}/info/dir ]; then \
-	    ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 .for info in ndtpd ndtpd-ja
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
diff --git a/japanese/ndtpd/pkg-plist b/japanese/ndtpd/pkg-plist
index bbc0a8195848..cce8ec65312b 100644
--- a/japanese/ndtpd/pkg-plist
+++ b/japanese/ndtpd/pkg-plist
@@ -8,6 +8,5 @@ etc/ndtpd.sample
 @unexec install-info --delete %D/info/ndtpd-ja.info %D/info/dir
 info/ndtpd.info
 info/ndtpd-ja.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/ndtpd.info %D/info/dir
 @exec install-info %D/info/ndtpd-ja.info %D/info/dir
diff --git a/japanese/ptex-base/Makefile b/japanese/ptex-base/Makefile
index d2caf641e82c..ac59e2afe996 100644
--- a/japanese/ptex-base/Makefile
+++ b/japanese/ptex-base/Makefile
@@ -3,7 +3,7 @@
 # Date created:		05 Oct 1997
 # Whom:			max
 #
-# $Id: Makefile,v 1.24 1998/06/24 01:14:27 max Exp $
+# $Id: Makefile,v 1.25 1999/02/03 11:11:49 asami Exp $
 #
 
 DISTNAME=	web2c-7.2
@@ -47,9 +47,6 @@ pre-install:
 	@${TAR} --exclude 'texmf/tex/latex/base/*' -C ${PREFIX}/share \
 	  -zxf ${DISTDIR}/${DIST_SUBDIR}/texmflib-7.3.tar.gz
 	#@${RMDIR} ${PREFIX}/share/texmf/tex/generic/images ${PREFIX}/share/texmf/bibtex/bib/misc
-	@if [ ! -f ${PREFIX}/info/dir ]; then \
-	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	 fi
 
 post-install:
 	@${LDCONFIG} -m ${PREFIX}/lib
diff --git a/japanese/ptex-base/pkg-plist b/japanese/ptex-base/pkg-plist
index 63741eed9f06..3f6ff18d217c 100644
--- a/japanese/ptex-base/pkg-plist
+++ b/japanese/ptex-base/pkg-plist
@@ -96,7 +96,6 @@ info/web2c.info-1
 info/web2c.info-2
 info/web2c.info-3
 info/web2c.info-4
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/kpathsea.info %D/info/dir
 @exec install-info %D/info/web2c.info %D/info/dir
 lib/libkpathsea.so.3
diff --git a/japanese/ptex-common/Makefile b/japanese/ptex-common/Makefile
index d2caf641e82c..ac59e2afe996 100644
--- a/japanese/ptex-common/Makefile
+++ b/japanese/ptex-common/Makefile
@@ -3,7 +3,7 @@
 # Date created:		05 Oct 1997
 # Whom:			max
 #
-# $Id: Makefile,v 1.24 1998/06/24 01:14:27 max Exp $
+# $Id: Makefile,v 1.25 1999/02/03 11:11:49 asami Exp $
 #
 
 DISTNAME=	web2c-7.2
@@ -47,9 +47,6 @@ pre-install:
 	@${TAR} --exclude 'texmf/tex/latex/base/*' -C ${PREFIX}/share \
 	  -zxf ${DISTDIR}/${DIST_SUBDIR}/texmflib-7.3.tar.gz
 	#@${RMDIR} ${PREFIX}/share/texmf/tex/generic/images ${PREFIX}/share/texmf/bibtex/bib/misc
-	@if [ ! -f ${PREFIX}/info/dir ]; then \
-	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	 fi
 
 post-install:
 	@${LDCONFIG} -m ${PREFIX}/lib
diff --git a/japanese/ptex-common/pkg-plist b/japanese/ptex-common/pkg-plist
index 63741eed9f06..3f6ff18d217c 100644
--- a/japanese/ptex-common/pkg-plist
+++ b/japanese/ptex-common/pkg-plist
@@ -96,7 +96,6 @@ info/web2c.info-1
 info/web2c.info-2
 info/web2c.info-3
 info/web2c.info-4
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/kpathsea.info %D/info/dir
 @exec install-info %D/info/web2c.info %D/info/dir
 lib/libkpathsea.so.3
diff --git a/japanese/skk-elisp/Makefile b/japanese/skk-elisp/Makefile
index dfb6cc3d1b79..faed04b97f18 100644
--- a/japanese/skk-elisp/Makefile
+++ b/japanese/skk-elisp/Makefile
@@ -3,7 +3,7 @@
 # Date created:		31 Oct 1998
 # Whom:			Shigeyuki FUKUSHIMA <shige@kuis.kyoto-u.ac.jp>
 #
-# $Id: Makefile,v 1.2 1998/12/23 08:50:12 kuriyama Exp $
+# $Id: Makefile,v 1.3 1998/12/23 12:02:16 asami Exp $
 #
 
 DISTNAME=	skk9.6
@@ -38,9 +38,6 @@ post-install:
 	(cd ${WRKSRC}; make SUBDIRS='doc' install)
 	(cd ${WRKSRC}; make SUBDIRS='etc' install)
 
-	@if [ ! -f ${PREFIX}/info/dir ]; then \
-		${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 	install-info ${PREFIX}/info/skk.info ${PREFIX}/info/dir
 
 .include <bsd.port.mk>
diff --git a/japanese/skk-elisp/pkg-plist b/japanese/skk-elisp/pkg-plist
index 00a8003c2345..09e91810fb03 100644
--- a/japanese/skk-elisp/pkg-plist
+++ b/japanese/skk-elisp/pkg-plist
@@ -45,5 +45,4 @@ info/skk.info-3
 info/skk.info-4
 info/skk.info-5
 info/skk.info-6
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/skk.info %D/info/dir
diff --git a/korean/hanemacs/Makefile b/korean/hanemacs/Makefile
index 9516c721a0d0..6083f527a8ca 100644
--- a/korean/hanemacs/Makefile
+++ b/korean/hanemacs/Makefile
@@ -3,7 +3,7 @@
 # Date created:		12 Mar 1998
 # Whom:			CHOI Junho <junker@jazz.snu.ac.kr>
 #
-# $Id: Makefile,v 1.3 1999/01/18 03:21:43 steve Exp $
+# $Id: Makefile,v 1.4 1999/03/08 07:28:27 asami Exp $
 #
 
 DISTNAME=	hanemacs-19.34b-1
@@ -36,9 +36,6 @@ post-install:
 .for file in hanemacs-19.34 emacsclient etags ctags b2m
 	strip ${PREFIX}/bin/${file}
 .endfor
-	if [ ! -f ${PREFIX}/info/dir ]; then \
-	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 .for info in emacs vip viper forms gnus mh-e cl sc dired-x ediff ccmode message
 	install-info ${PREFIX}/info/${info} ${PREFIX}/info/dir
 .endfor
diff --git a/korean/hanemacs/pkg-plist b/korean/hanemacs/pkg-plist
index 133170498d9e..2c8d711c0e93 100644
--- a/korean/hanemacs/pkg-plist
+++ b/korean/hanemacs/pkg-plist
@@ -101,7 +101,6 @@ info/viper-1
 info/viper-2
 info/viper-3
 info/viper-4
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/emacs %D/info/dir
 @exec install-info %D/info/vip %D/info/dir
 @exec install-info %D/info/viper %D/info/dir
diff --git a/lang/cim/Makefile b/lang/cim/Makefile
index 1d66b84418f4..23780a49ddb3 100644
--- a/lang/cim/Makefile
+++ b/lang/cim/Makefile
@@ -3,7 +3,7 @@
 # Date created:			21 Sept 1996
 # Whom:				giffunip
 #
-# $Id: Makefile,v 1.7 1998/10/13 23:51:41 jseger Exp $
+# $Id: Makefile,v 1.8 1999/03/15 01:22:57 steve Exp $
 #
 
 DISTNAME=	cim-3.29
@@ -18,9 +18,4 @@ MAINTAINER=	ports@FreeBSD.ORG
 GNU_CONFIGURE= 	yes
 MAN1=		cim.1
 
-pre-install:
-	if [ ! -f ${PREFIX}/info/dir ]; then \
-		${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
-
 .include <bsd.port.mk>
diff --git a/lang/cim/pkg-plist b/lang/cim/pkg-plist
index 15f7efc6c715..a28f63d49442 100644
--- a/lang/cim/pkg-plist
+++ b/lang/cim/pkg-plist
@@ -12,5 +12,4 @@ lib/libcim.so.3
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @unexec install-info --delete %D/info/cim.info %D/info/dir
 info/cim.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/cim.info %D/info/dir
diff --git a/lang/egcs/Makefile b/lang/egcs/Makefile
index 47544115a1d7..2788cbf79dff 100644
--- a/lang/egcs/Makefile
+++ b/lang/egcs/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.54 1999/04/08 21:12:34 billf Exp $
+# $Id: Makefile,v 1.55 1999/04/22 00:17:00 scrappy Exp $
 #
 
 DISTNAME=	egcs-1.1.2
@@ -96,9 +96,6 @@ post-install:
 	${MV} -f ${PREFIX}/lib/libstdc++.so*  \
 		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
 .endif
-	if [ ! -f ${PREFIX}/info/dir ]; then \
-	    ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 .for info in cpp g77 gcc
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
diff --git a/lang/egcs/pkg-plist b/lang/egcs/pkg-plist
index 85e5aea5a688..0c1c86753fa7 100644
--- a/lang/egcs/pkg-plist
+++ b/lang/egcs/pkg-plist
@@ -1,4 +1,4 @@
-@comment $Id: PLIST,v 1.20 1998/12/02 09:41:28 obrien Exp $
+@comment $Id: PLIST,v 1.21 1998/12/26 20:10:02 obrien Exp $
 bin/g++filt
 bin/g++
 bin/eg++
@@ -207,7 +207,6 @@ info/gcc.info-6
 info/gcc.info-7
 info/gcc.info-8
 info/gcc.info-9
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/cpp.info %D/info/dir
 @exec install-info %D/info/g77.info %D/info/dir
 @exec install-info %D/info/gcc.info %D/info/dir
diff --git a/lang/elisp-manual/Makefile b/lang/elisp-manual/Makefile
index 7a59230c08c7..5420cf2f3ca9 100644
--- a/lang/elisp-manual/Makefile
+++ b/lang/elisp-manual/Makefile
@@ -3,7 +3,7 @@
 # Date created:		18 November 1997
 # Whom:			Don Croyle <croyle@gelemna.ft-wayne.in.us>
 #
-# $Id: Makefile,v 1.2 1998/09/18 21:51:42 vanilla Exp $
+# $Id: Makefile,v 1.3 1999/01/25 12:42:57 kuriyama Exp $
 #
 
 DISTNAME=	elisp-manual-20-2.5
@@ -17,9 +17,4 @@ GNU_CONFIGURE=	yes
 
 ALL_TARGET=	elisp
 
-pre-install:
-	@if [ ! -f ${PREFIX}/info/dir ]; then \
-	${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
-
 .include <bsd.port.mk>
diff --git a/lang/elisp-manual/pkg-plist b/lang/elisp-manual/pkg-plist
index 7a56beec8566..b867cad0d254 100644
--- a/lang/elisp-manual/pkg-plist
+++ b/lang/elisp-manual/pkg-plist
@@ -1,4 +1,3 @@
 @unexec install-info --delete %D/info/elisp %D/info/dir
 info/elisp
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/elisp %D/info/dir
diff --git a/lang/emacs-lisp-intro/Makefile b/lang/emacs-lisp-intro/Makefile
index 2026a09ed298..55dab89a3e90 100644
--- a/lang/emacs-lisp-intro/Makefile
+++ b/lang/emacs-lisp-intro/Makefile
@@ -3,7 +3,7 @@
 # Date created:		18 November 1997
 # Whom:			Don Croyle <croyle@gelemna.ft-wayne.in.us>
 #
-# $Id: Makefile,v 1.2 1998/09/18 22:28:04 vanilla Exp $
+# $Id: Makefile,v 1.3 1999/01/25 12:43:24 kuriyama Exp $
 #
 
 DISTNAME=	emacs-lisp-intro-1.05
@@ -13,9 +13,4 @@ MASTER_SITE_SUBDIR=	emacs
 
 MAINTAINER=	croyle@gelemna.ft-wayne.in.us
 
-pre-install:
-	if [ ! -f ${PREFIX}/info/dir ]; then \
-	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
-
 .include <bsd.port.mk>
diff --git a/lang/emacs-lisp-intro/pkg-plist b/lang/emacs-lisp-intro/pkg-plist
index 63b01914b222..b4a5081ec61a 100644
--- a/lang/emacs-lisp-intro/pkg-plist
+++ b/lang/emacs-lisp-intro/pkg-plist
@@ -1,4 +1,3 @@
 @unexec install-info --delete %D/info/emacs-lisp-intro.info %D/info/dir
 info/emacs-lisp-intro.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/emacs-lisp-intro.info %D/info/dir
diff --git a/lang/gcc-devel/Makefile b/lang/gcc-devel/Makefile
index af671fc9fee1..33fc0c5253ef 100644
--- a/lang/gcc-devel/Makefile
+++ b/lang/gcc-devel/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.59 1999/05/24 17:13:47 obrien Exp $
+# $Id: Makefile,v 1.60 1999/05/26 10:26:19 obrien Exp $
 #
 
 SNAPDATE=	1999-05-24
@@ -108,9 +108,6 @@ post-install:
 	${MV} -f ${PREFIX}/lib/libstdc++.so*  \
 		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
 .endif
-	if [ ! -f ${PREFIX}/info/dir ]; then \
-	    ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 .for info in cpp g77 gcc
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
diff --git a/lang/gcc-devel/pkg-plist b/lang/gcc-devel/pkg-plist
index cee2e1f00000..99e8f8916a91 100644
--- a/lang/gcc-devel/pkg-plist
+++ b/lang/gcc-devel/pkg-plist
@@ -1,4 +1,4 @@
-@comment $Id: PLIST,v 1.19 1998/09/26 18:17:13 obrien Exp $
+@comment $Id: PLIST,v 1.22 1999/04/21 07:48:59 obrien Exp $
 bin/chill
 bin/eg++filt
 bin/eg++
@@ -212,7 +212,6 @@ info/gcc.info-6
 info/gcc.info-7
 info/gcc.info-8
 info/gcc.info-9
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/chill.info %D/info/dir
 @exec install-info %D/info/cpp.info %D/info/dir
 @exec install-info %D/info/g77.info %D/info/dir
diff --git a/lang/gcc-ooo/Makefile b/lang/gcc-ooo/Makefile
index af671fc9fee1..33fc0c5253ef 100644
--- a/lang/gcc-ooo/Makefile
+++ b/lang/gcc-ooo/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.59 1999/05/24 17:13:47 obrien Exp $
+# $Id: Makefile,v 1.60 1999/05/26 10:26:19 obrien Exp $
 #
 
 SNAPDATE=	1999-05-24
@@ -108,9 +108,6 @@ post-install:
 	${MV} -f ${PREFIX}/lib/libstdc++.so*  \
 		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
 .endif
-	if [ ! -f ${PREFIX}/info/dir ]; then \
-	    ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 .for info in cpp g77 gcc
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
diff --git a/lang/gcc-ooo/pkg-plist b/lang/gcc-ooo/pkg-plist
index cee2e1f00000..99e8f8916a91 100644
--- a/lang/gcc-ooo/pkg-plist
+++ b/lang/gcc-ooo/pkg-plist
@@ -1,4 +1,4 @@
-@comment $Id: PLIST,v 1.19 1998/09/26 18:17:13 obrien Exp $
+@comment $Id: PLIST,v 1.22 1999/04/21 07:48:59 obrien Exp $
 bin/chill
 bin/eg++filt
 bin/eg++
@@ -212,7 +212,6 @@ info/gcc.info-6
 info/gcc.info-7
 info/gcc.info-8
 info/gcc.info-9
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/chill.info %D/info/dir
 @exec install-info %D/info/cpp.info %D/info/dir
 @exec install-info %D/info/g77.info %D/info/dir
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index af671fc9fee1..33fc0c5253ef 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.59 1999/05/24 17:13:47 obrien Exp $
+# $Id: Makefile,v 1.60 1999/05/26 10:26:19 obrien Exp $
 #
 
 SNAPDATE=	1999-05-24
@@ -108,9 +108,6 @@ post-install:
 	${MV} -f ${PREFIX}/lib/libstdc++.so*  \
 		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
 .endif
-	if [ ! -f ${PREFIX}/info/dir ]; then \
-	    ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 .for info in cpp g77 gcc
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
diff --git a/lang/gcc/pkg-plist b/lang/gcc/pkg-plist
index cee2e1f00000..99e8f8916a91 100644
--- a/lang/gcc/pkg-plist
+++ b/lang/gcc/pkg-plist
@@ -1,4 +1,4 @@
-@comment $Id: PLIST,v 1.19 1998/09/26 18:17:13 obrien Exp $
+@comment $Id: PLIST,v 1.22 1999/04/21 07:48:59 obrien Exp $
 bin/chill
 bin/eg++filt
 bin/eg++
@@ -212,7 +212,6 @@ info/gcc.info-6
 info/gcc.info-7
 info/gcc.info-8
 info/gcc.info-9
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/chill.info %D/info/dir
 @exec install-info %D/info/cpp.info %D/info/dir
 @exec install-info %D/info/g77.info %D/info/dir
diff --git a/lang/gcc295/Makefile b/lang/gcc295/Makefile
index 47544115a1d7..2788cbf79dff 100644
--- a/lang/gcc295/Makefile
+++ b/lang/gcc295/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.54 1999/04/08 21:12:34 billf Exp $
+# $Id: Makefile,v 1.55 1999/04/22 00:17:00 scrappy Exp $
 #
 
 DISTNAME=	egcs-1.1.2
@@ -96,9 +96,6 @@ post-install:
 	${MV} -f ${PREFIX}/lib/libstdc++.so*  \
 		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
 .endif
-	if [ ! -f ${PREFIX}/info/dir ]; then \
-	    ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 .for info in cpp g77 gcc
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
diff --git a/lang/gcc295/pkg-plist b/lang/gcc295/pkg-plist
index 85e5aea5a688..0c1c86753fa7 100644
--- a/lang/gcc295/pkg-plist
+++ b/lang/gcc295/pkg-plist
@@ -1,4 +1,4 @@
-@comment $Id: PLIST,v 1.20 1998/12/02 09:41:28 obrien Exp $
+@comment $Id: PLIST,v 1.21 1998/12/26 20:10:02 obrien Exp $
 bin/g++filt
 bin/g++
 bin/eg++
@@ -207,7 +207,6 @@ info/gcc.info-6
 info/gcc.info-7
 info/gcc.info-8
 info/gcc.info-9
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/cpp.info %D/info/dir
 @exec install-info %D/info/g77.info %D/info/dir
 @exec install-info %D/info/gcc.info %D/info/dir
diff --git a/lang/gcc30/Makefile b/lang/gcc30/Makefile
index af671fc9fee1..33fc0c5253ef 100644
--- a/lang/gcc30/Makefile
+++ b/lang/gcc30/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.59 1999/05/24 17:13:47 obrien Exp $
+# $Id: Makefile,v 1.60 1999/05/26 10:26:19 obrien Exp $
 #
 
 SNAPDATE=	1999-05-24
@@ -108,9 +108,6 @@ post-install:
 	${MV} -f ${PREFIX}/lib/libstdc++.so*  \
 		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
 .endif
-	if [ ! -f ${PREFIX}/info/dir ]; then \
-	    ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 .for info in cpp g77 gcc
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
diff --git a/lang/gcc30/pkg-plist b/lang/gcc30/pkg-plist
index cee2e1f00000..99e8f8916a91 100644
--- a/lang/gcc30/pkg-plist
+++ b/lang/gcc30/pkg-plist
@@ -1,4 +1,4 @@
-@comment $Id: PLIST,v 1.19 1998/09/26 18:17:13 obrien Exp $
+@comment $Id: PLIST,v 1.22 1999/04/21 07:48:59 obrien Exp $
 bin/chill
 bin/eg++filt
 bin/eg++
@@ -212,7 +212,6 @@ info/gcc.info-6
 info/gcc.info-7
 info/gcc.info-8
 info/gcc.info-9
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/chill.info %D/info/dir
 @exec install-info %D/info/cpp.info %D/info/dir
 @exec install-info %D/info/g77.info %D/info/dir
diff --git a/lang/gcc31/Makefile b/lang/gcc31/Makefile
index af671fc9fee1..33fc0c5253ef 100644
--- a/lang/gcc31/Makefile
+++ b/lang/gcc31/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.59 1999/05/24 17:13:47 obrien Exp $
+# $Id: Makefile,v 1.60 1999/05/26 10:26:19 obrien Exp $
 #
 
 SNAPDATE=	1999-05-24
@@ -108,9 +108,6 @@ post-install:
 	${MV} -f ${PREFIX}/lib/libstdc++.so*  \
 		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
 .endif
-	if [ ! -f ${PREFIX}/info/dir ]; then \
-	    ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 .for info in cpp g77 gcc
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
diff --git a/lang/gcc31/pkg-plist b/lang/gcc31/pkg-plist
index cee2e1f00000..99e8f8916a91 100644
--- a/lang/gcc31/pkg-plist
+++ b/lang/gcc31/pkg-plist
@@ -1,4 +1,4 @@
-@comment $Id: PLIST,v 1.19 1998/09/26 18:17:13 obrien Exp $
+@comment $Id: PLIST,v 1.22 1999/04/21 07:48:59 obrien Exp $
 bin/chill
 bin/eg++filt
 bin/eg++
@@ -212,7 +212,6 @@ info/gcc.info-6
 info/gcc.info-7
 info/gcc.info-8
 info/gcc.info-9
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/chill.info %D/info/dir
 @exec install-info %D/info/cpp.info %D/info/dir
 @exec install-info %D/info/g77.info %D/info/dir
diff --git a/lang/gcc32/Makefile b/lang/gcc32/Makefile
index af671fc9fee1..33fc0c5253ef 100644
--- a/lang/gcc32/Makefile
+++ b/lang/gcc32/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.59 1999/05/24 17:13:47 obrien Exp $
+# $Id: Makefile,v 1.60 1999/05/26 10:26:19 obrien Exp $
 #
 
 SNAPDATE=	1999-05-24
@@ -108,9 +108,6 @@ post-install:
 	${MV} -f ${PREFIX}/lib/libstdc++.so*  \
 		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
 .endif
-	if [ ! -f ${PREFIX}/info/dir ]; then \
-	    ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 .for info in cpp g77 gcc
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
diff --git a/lang/gcc32/pkg-plist b/lang/gcc32/pkg-plist
index cee2e1f00000..99e8f8916a91 100644
--- a/lang/gcc32/pkg-plist
+++ b/lang/gcc32/pkg-plist
@@ -1,4 +1,4 @@
-@comment $Id: PLIST,v 1.19 1998/09/26 18:17:13 obrien Exp $
+@comment $Id: PLIST,v 1.22 1999/04/21 07:48:59 obrien Exp $
 bin/chill
 bin/eg++filt
 bin/eg++
@@ -212,7 +212,6 @@ info/gcc.info-6
 info/gcc.info-7
 info/gcc.info-8
 info/gcc.info-9
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/chill.info %D/info/dir
 @exec install-info %D/info/cpp.info %D/info/dir
 @exec install-info %D/info/g77.info %D/info/dir
diff --git a/lang/gcc33/Makefile b/lang/gcc33/Makefile
index af671fc9fee1..33fc0c5253ef 100644
--- a/lang/gcc33/Makefile
+++ b/lang/gcc33/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.59 1999/05/24 17:13:47 obrien Exp $
+# $Id: Makefile,v 1.60 1999/05/26 10:26:19 obrien Exp $
 #
 
 SNAPDATE=	1999-05-24
@@ -108,9 +108,6 @@ post-install:
 	${MV} -f ${PREFIX}/lib/libstdc++.so*  \
 		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
 .endif
-	if [ ! -f ${PREFIX}/info/dir ]; then \
-	    ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 .for info in cpp g77 gcc
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
diff --git a/lang/gcc33/pkg-plist b/lang/gcc33/pkg-plist
index cee2e1f00000..99e8f8916a91 100644
--- a/lang/gcc33/pkg-plist
+++ b/lang/gcc33/pkg-plist
@@ -1,4 +1,4 @@
-@comment $Id: PLIST,v 1.19 1998/09/26 18:17:13 obrien Exp $
+@comment $Id: PLIST,v 1.22 1999/04/21 07:48:59 obrien Exp $
 bin/chill
 bin/eg++filt
 bin/eg++
@@ -212,7 +212,6 @@ info/gcc.info-6
 info/gcc.info-7
 info/gcc.info-8
 info/gcc.info-9
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/chill.info %D/info/dir
 @exec install-info %D/info/cpp.info %D/info/dir
 @exec install-info %D/info/g77.info %D/info/dir
diff --git a/lang/gcc34/Makefile b/lang/gcc34/Makefile
index af671fc9fee1..33fc0c5253ef 100644
--- a/lang/gcc34/Makefile
+++ b/lang/gcc34/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.59 1999/05/24 17:13:47 obrien Exp $
+# $Id: Makefile,v 1.60 1999/05/26 10:26:19 obrien Exp $
 #
 
 SNAPDATE=	1999-05-24
@@ -108,9 +108,6 @@ post-install:
 	${MV} -f ${PREFIX}/lib/libstdc++.so*  \
 		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
 .endif
-	if [ ! -f ${PREFIX}/info/dir ]; then \
-	    ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 .for info in cpp g77 gcc
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
diff --git a/lang/gcc34/pkg-plist b/lang/gcc34/pkg-plist
index cee2e1f00000..99e8f8916a91 100644
--- a/lang/gcc34/pkg-plist
+++ b/lang/gcc34/pkg-plist
@@ -1,4 +1,4 @@
-@comment $Id: PLIST,v 1.19 1998/09/26 18:17:13 obrien Exp $
+@comment $Id: PLIST,v 1.22 1999/04/21 07:48:59 obrien Exp $
 bin/chill
 bin/eg++filt
 bin/eg++
@@ -212,7 +212,6 @@ info/gcc.info-6
 info/gcc.info-7
 info/gcc.info-8
 info/gcc.info-9
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/chill.info %D/info/dir
 @exec install-info %D/info/cpp.info %D/info/dir
 @exec install-info %D/info/g77.info %D/info/dir
diff --git a/lang/gcc35/Makefile b/lang/gcc35/Makefile
index af671fc9fee1..33fc0c5253ef 100644
--- a/lang/gcc35/Makefile
+++ b/lang/gcc35/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.59 1999/05/24 17:13:47 obrien Exp $
+# $Id: Makefile,v 1.60 1999/05/26 10:26:19 obrien Exp $
 #
 
 SNAPDATE=	1999-05-24
@@ -108,9 +108,6 @@ post-install:
 	${MV} -f ${PREFIX}/lib/libstdc++.so*  \
 		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
 .endif
-	if [ ! -f ${PREFIX}/info/dir ]; then \
-	    ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 .for info in cpp g77 gcc
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
diff --git a/lang/gcc35/pkg-plist b/lang/gcc35/pkg-plist
index cee2e1f00000..99e8f8916a91 100644
--- a/lang/gcc35/pkg-plist
+++ b/lang/gcc35/pkg-plist
@@ -1,4 +1,4 @@
-@comment $Id: PLIST,v 1.19 1998/09/26 18:17:13 obrien Exp $
+@comment $Id: PLIST,v 1.22 1999/04/21 07:48:59 obrien Exp $
 bin/chill
 bin/eg++filt
 bin/eg++
@@ -212,7 +212,6 @@ info/gcc.info-6
 info/gcc.info-7
 info/gcc.info-8
 info/gcc.info-9
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/chill.info %D/info/dir
 @exec install-info %D/info/cpp.info %D/info/dir
 @exec install-info %D/info/g77.info %D/info/dir
diff --git a/lang/gcc40/Makefile b/lang/gcc40/Makefile
index af671fc9fee1..33fc0c5253ef 100644
--- a/lang/gcc40/Makefile
+++ b/lang/gcc40/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.59 1999/05/24 17:13:47 obrien Exp $
+# $Id: Makefile,v 1.60 1999/05/26 10:26:19 obrien Exp $
 #
 
 SNAPDATE=	1999-05-24
@@ -108,9 +108,6 @@ post-install:
 	${MV} -f ${PREFIX}/lib/libstdc++.so*  \
 		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
 .endif
-	if [ ! -f ${PREFIX}/info/dir ]; then \
-	    ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 .for info in cpp g77 gcc
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
diff --git a/lang/gcc40/pkg-plist b/lang/gcc40/pkg-plist
index cee2e1f00000..99e8f8916a91 100644
--- a/lang/gcc40/pkg-plist
+++ b/lang/gcc40/pkg-plist
@@ -1,4 +1,4 @@
-@comment $Id: PLIST,v 1.19 1998/09/26 18:17:13 obrien Exp $
+@comment $Id: PLIST,v 1.22 1999/04/21 07:48:59 obrien Exp $
 bin/chill
 bin/eg++filt
 bin/eg++
@@ -212,7 +212,6 @@ info/gcc.info-6
 info/gcc.info-7
 info/gcc.info-8
 info/gcc.info-9
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/chill.info %D/info/dir
 @exec install-info %D/info/cpp.info %D/info/dir
 @exec install-info %D/info/g77.info %D/info/dir
diff --git a/lang/gcc41/Makefile b/lang/gcc41/Makefile
index af671fc9fee1..33fc0c5253ef 100644
--- a/lang/gcc41/Makefile
+++ b/lang/gcc41/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.59 1999/05/24 17:13:47 obrien Exp $
+# $Id: Makefile,v 1.60 1999/05/26 10:26:19 obrien Exp $
 #
 
 SNAPDATE=	1999-05-24
@@ -108,9 +108,6 @@ post-install:
 	${MV} -f ${PREFIX}/lib/libstdc++.so*  \
 		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
 .endif
-	if [ ! -f ${PREFIX}/info/dir ]; then \
-	    ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 .for info in cpp g77 gcc
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
diff --git a/lang/gcc41/pkg-plist b/lang/gcc41/pkg-plist
index cee2e1f00000..99e8f8916a91 100644
--- a/lang/gcc41/pkg-plist
+++ b/lang/gcc41/pkg-plist
@@ -1,4 +1,4 @@
-@comment $Id: PLIST,v 1.19 1998/09/26 18:17:13 obrien Exp $
+@comment $Id: PLIST,v 1.22 1999/04/21 07:48:59 obrien Exp $
 bin/chill
 bin/eg++filt
 bin/eg++
@@ -212,7 +212,6 @@ info/gcc.info-6
 info/gcc.info-7
 info/gcc.info-8
 info/gcc.info-9
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/chill.info %D/info/dir
 @exec install-info %D/info/cpp.info %D/info/dir
 @exec install-info %D/info/g77.info %D/info/dir
diff --git a/lang/gcc42/Makefile b/lang/gcc42/Makefile
index af671fc9fee1..33fc0c5253ef 100644
--- a/lang/gcc42/Makefile
+++ b/lang/gcc42/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.59 1999/05/24 17:13:47 obrien Exp $
+# $Id: Makefile,v 1.60 1999/05/26 10:26:19 obrien Exp $
 #
 
 SNAPDATE=	1999-05-24
@@ -108,9 +108,6 @@ post-install:
 	${MV} -f ${PREFIX}/lib/libstdc++.so*  \
 		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
 .endif
-	if [ ! -f ${PREFIX}/info/dir ]; then \
-	    ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 .for info in cpp g77 gcc
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
diff --git a/lang/gcc42/pkg-plist b/lang/gcc42/pkg-plist
index cee2e1f00000..99e8f8916a91 100644
--- a/lang/gcc42/pkg-plist
+++ b/lang/gcc42/pkg-plist
@@ -1,4 +1,4 @@
-@comment $Id: PLIST,v 1.19 1998/09/26 18:17:13 obrien Exp $
+@comment $Id: PLIST,v 1.22 1999/04/21 07:48:59 obrien Exp $
 bin/chill
 bin/eg++filt
 bin/eg++
@@ -212,7 +212,6 @@ info/gcc.info-6
 info/gcc.info-7
 info/gcc.info-8
 info/gcc.info-9
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/chill.info %D/info/dir
 @exec install-info %D/info/cpp.info %D/info/dir
 @exec install-info %D/info/g77.info %D/info/dir
diff --git a/lang/gcc43/Makefile b/lang/gcc43/Makefile
index af671fc9fee1..33fc0c5253ef 100644
--- a/lang/gcc43/Makefile
+++ b/lang/gcc43/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.59 1999/05/24 17:13:47 obrien Exp $
+# $Id: Makefile,v 1.60 1999/05/26 10:26:19 obrien Exp $
 #
 
 SNAPDATE=	1999-05-24
@@ -108,9 +108,6 @@ post-install:
 	${MV} -f ${PREFIX}/lib/libstdc++.so*  \
 		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
 .endif
-	if [ ! -f ${PREFIX}/info/dir ]; then \
-	    ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 .for info in cpp g77 gcc
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
diff --git a/lang/gcc43/pkg-plist b/lang/gcc43/pkg-plist
index cee2e1f00000..99e8f8916a91 100644
--- a/lang/gcc43/pkg-plist
+++ b/lang/gcc43/pkg-plist
@@ -1,4 +1,4 @@
-@comment $Id: PLIST,v 1.19 1998/09/26 18:17:13 obrien Exp $
+@comment $Id: PLIST,v 1.22 1999/04/21 07:48:59 obrien Exp $
 bin/chill
 bin/eg++filt
 bin/eg++
@@ -212,7 +212,6 @@ info/gcc.info-6
 info/gcc.info-7
 info/gcc.info-8
 info/gcc.info-9
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/chill.info %D/info/dir
 @exec install-info %D/info/cpp.info %D/info/dir
 @exec install-info %D/info/g77.info %D/info/dir
diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile
index af671fc9fee1..33fc0c5253ef 100644
--- a/lang/gcc44/Makefile
+++ b/lang/gcc44/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.59 1999/05/24 17:13:47 obrien Exp $
+# $Id: Makefile,v 1.60 1999/05/26 10:26:19 obrien Exp $
 #
 
 SNAPDATE=	1999-05-24
@@ -108,9 +108,6 @@ post-install:
 	${MV} -f ${PREFIX}/lib/libstdc++.so*  \
 		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
 .endif
-	if [ ! -f ${PREFIX}/info/dir ]; then \
-	    ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 .for info in cpp g77 gcc
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
diff --git a/lang/gcc44/pkg-plist b/lang/gcc44/pkg-plist
index cee2e1f00000..99e8f8916a91 100644
--- a/lang/gcc44/pkg-plist
+++ b/lang/gcc44/pkg-plist
@@ -1,4 +1,4 @@
-@comment $Id: PLIST,v 1.19 1998/09/26 18:17:13 obrien Exp $
+@comment $Id: PLIST,v 1.22 1999/04/21 07:48:59 obrien Exp $
 bin/chill
 bin/eg++filt
 bin/eg++
@@ -212,7 +212,6 @@ info/gcc.info-6
 info/gcc.info-7
 info/gcc.info-8
 info/gcc.info-9
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/chill.info %D/info/dir
 @exec install-info %D/info/cpp.info %D/info/dir
 @exec install-info %D/info/g77.info %D/info/dir
diff --git a/lang/gcc45/Makefile b/lang/gcc45/Makefile
index af671fc9fee1..33fc0c5253ef 100644
--- a/lang/gcc45/Makefile
+++ b/lang/gcc45/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.59 1999/05/24 17:13:47 obrien Exp $
+# $Id: Makefile,v 1.60 1999/05/26 10:26:19 obrien Exp $
 #
 
 SNAPDATE=	1999-05-24
@@ -108,9 +108,6 @@ post-install:
 	${MV} -f ${PREFIX}/lib/libstdc++.so*  \
 		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
 .endif
-	if [ ! -f ${PREFIX}/info/dir ]; then \
-	    ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 .for info in cpp g77 gcc
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
diff --git a/lang/gcc45/pkg-plist b/lang/gcc45/pkg-plist
index cee2e1f00000..99e8f8916a91 100644
--- a/lang/gcc45/pkg-plist
+++ b/lang/gcc45/pkg-plist
@@ -1,4 +1,4 @@
-@comment $Id: PLIST,v 1.19 1998/09/26 18:17:13 obrien Exp $
+@comment $Id: PLIST,v 1.22 1999/04/21 07:48:59 obrien Exp $
 bin/chill
 bin/eg++filt
 bin/eg++
@@ -212,7 +212,6 @@ info/gcc.info-6
 info/gcc.info-7
 info/gcc.info-8
 info/gcc.info-9
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/chill.info %D/info/dir
 @exec install-info %D/info/cpp.info %D/info/dir
 @exec install-info %D/info/g77.info %D/info/dir
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index af671fc9fee1..33fc0c5253ef 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.59 1999/05/24 17:13:47 obrien Exp $
+# $Id: Makefile,v 1.60 1999/05/26 10:26:19 obrien Exp $
 #
 
 SNAPDATE=	1999-05-24
@@ -108,9 +108,6 @@ post-install:
 	${MV} -f ${PREFIX}/lib/libstdc++.so*  \
 		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
 .endif
-	if [ ! -f ${PREFIX}/info/dir ]; then \
-	    ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 .for info in cpp g77 gcc
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
diff --git a/lang/gcc46/pkg-plist b/lang/gcc46/pkg-plist
index cee2e1f00000..99e8f8916a91 100644
--- a/lang/gcc46/pkg-plist
+++ b/lang/gcc46/pkg-plist
@@ -1,4 +1,4 @@
-@comment $Id: PLIST,v 1.19 1998/09/26 18:17:13 obrien Exp $
+@comment $Id: PLIST,v 1.22 1999/04/21 07:48:59 obrien Exp $
 bin/chill
 bin/eg++filt
 bin/eg++
@@ -212,7 +212,6 @@ info/gcc.info-6
 info/gcc.info-7
 info/gcc.info-8
 info/gcc.info-9
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/chill.info %D/info/dir
 @exec install-info %D/info/cpp.info %D/info/dir
 @exec install-info %D/info/g77.info %D/info/dir
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index af671fc9fee1..33fc0c5253ef 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.59 1999/05/24 17:13:47 obrien Exp $
+# $Id: Makefile,v 1.60 1999/05/26 10:26:19 obrien Exp $
 #
 
 SNAPDATE=	1999-05-24
@@ -108,9 +108,6 @@ post-install:
 	${MV} -f ${PREFIX}/lib/libstdc++.so*  \
 		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
 .endif
-	if [ ! -f ${PREFIX}/info/dir ]; then \
-	    ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 .for info in cpp g77 gcc
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
diff --git a/lang/gcc47/pkg-plist b/lang/gcc47/pkg-plist
index cee2e1f00000..99e8f8916a91 100644
--- a/lang/gcc47/pkg-plist
+++ b/lang/gcc47/pkg-plist
@@ -1,4 +1,4 @@
-@comment $Id: PLIST,v 1.19 1998/09/26 18:17:13 obrien Exp $
+@comment $Id: PLIST,v 1.22 1999/04/21 07:48:59 obrien Exp $
 bin/chill
 bin/eg++filt
 bin/eg++
@@ -212,7 +212,6 @@ info/gcc.info-6
 info/gcc.info-7
 info/gcc.info-8
 info/gcc.info-9
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/chill.info %D/info/dir
 @exec install-info %D/info/cpp.info %D/info/dir
 @exec install-info %D/info/g77.info %D/info/dir
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index af671fc9fee1..33fc0c5253ef 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.59 1999/05/24 17:13:47 obrien Exp $
+# $Id: Makefile,v 1.60 1999/05/26 10:26:19 obrien Exp $
 #
 
 SNAPDATE=	1999-05-24
@@ -108,9 +108,6 @@ post-install:
 	${MV} -f ${PREFIX}/lib/libstdc++.so*  \
 		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
 .endif
-	if [ ! -f ${PREFIX}/info/dir ]; then \
-	    ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 .for info in cpp g77 gcc
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
diff --git a/lang/gcc48/pkg-plist b/lang/gcc48/pkg-plist
index cee2e1f00000..99e8f8916a91 100644
--- a/lang/gcc48/pkg-plist
+++ b/lang/gcc48/pkg-plist
@@ -1,4 +1,4 @@
-@comment $Id: PLIST,v 1.19 1998/09/26 18:17:13 obrien Exp $
+@comment $Id: PLIST,v 1.22 1999/04/21 07:48:59 obrien Exp $
 bin/chill
 bin/eg++filt
 bin/eg++
@@ -212,7 +212,6 @@ info/gcc.info-6
 info/gcc.info-7
 info/gcc.info-8
 info/gcc.info-9
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/chill.info %D/info/dir
 @exec install-info %D/info/cpp.info %D/info/dir
 @exec install-info %D/info/g77.info %D/info/dir
diff --git a/lang/gcl/Makefile b/lang/gcl/Makefile
index a0303751ff0f..682e2753a942 100644
--- a/lang/gcl/Makefile
+++ b/lang/gcl/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Wed Feb  8 01:49:11  1995
 # Whom:                 hsu
 #
-# $Id: Makefile,v 1.11 1998/10/14 01:17:50 jseger Exp $
+# $Id: Makefile,v 1.12 1999/01/27 07:41:20 fenner Exp $
 #
 
 DISTNAME=       gcl-2.2.2
@@ -23,9 +23,6 @@ pre-build:
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/info/gcl-si.info ${PREFIX}/info
-	@if [ ! -f ${PREFIX}/info/dir ]; then \
-	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	 fi
 	@install-info ${PREFIX}/info/gcl-si.info ${PREFIX}/info/dir
 
 .include <bsd.port.mk>
diff --git a/lang/gcl/pkg-plist b/lang/gcl/pkg-plist
index a8923ff43e14..b6690aa890c2 100644
--- a/lang/gcl/pkg-plist
+++ b/lang/gcl/pkg-plist
@@ -2,7 +2,6 @@ bin/gcl
 bin/gcl.exe
 @unexec install-info --delete %D/info/gcl-si.info %D/info/dir
 info/gcl-si.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/gcl-si.info %D/info/dir
 lib/gcl-2.2.2/cmpnew/collectfn.o
 lib/gcl-2.2.2/lsp/gprof.lsp
diff --git a/lang/gnat/pkg-plist b/lang/gnat/pkg-plist
index bcb43fd35c40..897806d6880c 100644
--- a/lang/gnat/pkg-plist
+++ b/lang/gnat/pkg-plist
@@ -45,7 +45,6 @@ info/gcc.info-6
 info/gcc.info-7
 info/gcc.info-8
 info/gcc.info-9
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/cpp.info %D/info/dir
 @exec install-info %D/info/gcc.info $D/info/dir
 lib/adainclude/a-astaco.adb
diff --git a/lang/guile/Makefile b/lang/guile/Makefile
index 9c395145c6ee..08024d0e81b5 100644
--- a/lang/guile/Makefile
+++ b/lang/guile/Makefile
@@ -3,7 +3,7 @@
 # Date created:		2 November 1997
 # Whom:			jseger@FreeBSD.org
 #
-# $Id: Makefile,v 1.14 1998/10/26 13:09:35 vanilla Exp $
+# $Id: Makefile,v 1.15 1999/01/27 07:41:21 fenner Exp $
 #
 
 DISTNAME=	guile-1.3
@@ -17,9 +17,6 @@ GNU_CONFIGURE=	YES
 MAKE_ENV+=	INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
 post-install:
-	@if [ ! -f ${PREFIX}/info/dir ]; then \
-	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	 fi
 	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/lang/guile/pkg-plist b/lang/guile/pkg-plist
index d5066db7722e..32edfc773a1a 100644
--- a/lang/guile/pkg-plist
+++ b/lang/guile/pkg-plist
@@ -82,7 +82,6 @@ include/libguile/weaks.h
 include/libguile.h
 @unexec install-info --delete %D/info/data-rep.info %D/info/dir
 info/data-rep.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/data-rep.info %D/info/dir
 lib/libguile.a
 lib/libguile.la
diff --git a/lang/pgcc/Makefile b/lang/pgcc/Makefile
index 1aa8e460f886..d23800d0fcd9 100644
--- a/lang/pgcc/Makefile
+++ b/lang/pgcc/Makefile
@@ -4,7 +4,7 @@
 # Date created:				10 Dec 1998
 # Whom:					David O'Brien <obrien@NUXI.com>
 #
-# $Id: Makefile,v 1.15 1999/03/08 07:28:30 asami Exp $
+# $Id: Makefile,v 1.16 1999/05/24 17:12:49 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.2
@@ -104,9 +104,6 @@ post-install:
 	${MV} -f ${PREFIX}/lib/libstdc++.so*  \
 		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
 .endif
-	if [ ! -f ${PREFIX}/info/dir ]; then \
-	    ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 .for info in cpp g77 gcc
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
diff --git a/lang/pgcc/pkg-plist b/lang/pgcc/pkg-plist
index 6060cf2adf99..046a3622a287 100644
--- a/lang/pgcc/pkg-plist
+++ b/lang/pgcc/pkg-plist
@@ -1,4 +1,4 @@
-@comment $Id: PLIST,v 1.6 1998/12/13 09:40:49 obrien Exp $
+@comment $Id: PLIST,v 1.7 1999/05/24 17:13:07 obrien Exp $
 bin/pg++filt
 bin/pg++
 bin/pg77
@@ -205,7 +205,6 @@ info/gcc.info-6
 info/gcc.info-7
 info/gcc.info-8
 info/gcc.info-9
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/cpp.info %D/info/dir
 @exec install-info %D/info/g77.info %D/info/dir
 @exec install-info %D/info/gcc.info %D/info/dir
diff --git a/lang/scm/pkg-plist b/lang/scm/pkg-plist
index 16ae6a703561..c7f5d1da3a1e 100644
--- a/lang/scm/pkg-plist
+++ b/lang/scm/pkg-plist
@@ -5,7 +5,6 @@ info/slib.info-1
 info/slib.info-2
 info/slib.info-3
 info/slib.info-4
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/slib.info %D/info/dir
 lib/scm/COPYING
 lib/scm/Init.scm
diff --git a/mail/exim-devel/Makefile b/mail/exim-devel/Makefile
index adb9c584b4a8..8af6805bed41 100644
--- a/mail/exim-devel/Makefile
+++ b/mail/exim-devel/Makefile
@@ -3,7 +3,7 @@
 # Date created:		23 June 1996
 # Whom:			markm@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.26 1999/01/27 14:07:07 markm Exp $
+# $Id: Makefile,v 1.27 1999/02/10 16:09:48 markm Exp $
 #
 
 DISTNAME=	exim-2.12
@@ -48,9 +48,4 @@ post-build:
 	${TOUCH} ${WRKSRC}/build-FreeBSD-i386/eximon.bin
 	${TOUCH} ${WRKSRC}/build-FreeBSD-i386/eximon
 
-pre-install:
-	if [ ! -f ${PREFIX}/info/dir ]; then \
-	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
-
 .include <bsd.port.mk>
diff --git a/mail/exim-devel/pkg-plist b/mail/exim-devel/pkg-plist
index 377d081a4f58..908d6b1db1be 100644
--- a/mail/exim-devel/pkg-plist
+++ b/mail/exim-devel/pkg-plist
@@ -20,7 +20,6 @@ etc/rc.d/exim.sh
 info/exim_overview.info
 info/exim.info
 info/exim_filter.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info --section="Exim" --entry "* Overview: (exim_overview).    Overview of the Exim system" %D/info/exim_overview.info %D/info/dir
 @exec install-info --section="Exim" --entry "* User guide: (exim).           Exim manual" %D/info/exim.info %D/info/dir
 @exec install-info --section="Exim" --entry "* Filtering: (exim_filter).     Filtering mail with Exim" %D/info/exim_filter.info %D/info/dir
diff --git a/mail/exim-old/Makefile b/mail/exim-old/Makefile
index adb9c584b4a8..8af6805bed41 100644
--- a/mail/exim-old/Makefile
+++ b/mail/exim-old/Makefile
@@ -3,7 +3,7 @@
 # Date created:		23 June 1996
 # Whom:			markm@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.26 1999/01/27 14:07:07 markm Exp $
+# $Id: Makefile,v 1.27 1999/02/10 16:09:48 markm Exp $
 #
 
 DISTNAME=	exim-2.12
@@ -48,9 +48,4 @@ post-build:
 	${TOUCH} ${WRKSRC}/build-FreeBSD-i386/eximon.bin
 	${TOUCH} ${WRKSRC}/build-FreeBSD-i386/eximon
 
-pre-install:
-	if [ ! -f ${PREFIX}/info/dir ]; then \
-	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
-
 .include <bsd.port.mk>
diff --git a/mail/exim-old/pkg-plist b/mail/exim-old/pkg-plist
index 377d081a4f58..908d6b1db1be 100644
--- a/mail/exim-old/pkg-plist
+++ b/mail/exim-old/pkg-plist
@@ -20,7 +20,6 @@ etc/rc.d/exim.sh
 info/exim_overview.info
 info/exim.info
 info/exim_filter.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info --section="Exim" --entry "* Overview: (exim_overview).    Overview of the Exim system" %D/info/exim_overview.info %D/info/dir
 @exec install-info --section="Exim" --entry "* User guide: (exim).           Exim manual" %D/info/exim.info %D/info/dir
 @exec install-info --section="Exim" --entry "* Filtering: (exim_filter).     Filtering mail with Exim" %D/info/exim_filter.info %D/info/dir
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index adb9c584b4a8..8af6805bed41 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -3,7 +3,7 @@
 # Date created:		23 June 1996
 # Whom:			markm@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.26 1999/01/27 14:07:07 markm Exp $
+# $Id: Makefile,v 1.27 1999/02/10 16:09:48 markm Exp $
 #
 
 DISTNAME=	exim-2.12
@@ -48,9 +48,4 @@ post-build:
 	${TOUCH} ${WRKSRC}/build-FreeBSD-i386/eximon.bin
 	${TOUCH} ${WRKSRC}/build-FreeBSD-i386/eximon
 
-pre-install:
-	if [ ! -f ${PREFIX}/info/dir ]; then \
-	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
-
 .include <bsd.port.mk>
diff --git a/mail/exim/pkg-plist b/mail/exim/pkg-plist
index 377d081a4f58..908d6b1db1be 100644
--- a/mail/exim/pkg-plist
+++ b/mail/exim/pkg-plist
@@ -20,7 +20,6 @@ etc/rc.d/exim.sh
 info/exim_overview.info
 info/exim.info
 info/exim_filter.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info --section="Exim" --entry "* Overview: (exim_overview).    Overview of the Exim system" %D/info/exim_overview.info %D/info/dir
 @exec install-info --section="Exim" --entry "* User guide: (exim).           Exim manual" %D/info/exim.info %D/info/dir
 @exec install-info --section="Exim" --entry "* Filtering: (exim_filter).     Filtering mail with Exim" %D/info/exim_filter.info %D/info/dir
diff --git a/math/fftw/pkg-plist b/math/fftw/pkg-plist
index 33aea15032d0..7b9282b46e45 100644
--- a/math/fftw/pkg-plist
+++ b/math/fftw/pkg-plist
@@ -7,7 +7,6 @@ info/fftw.info-2
 info/fftw.info-3
 info/fftw.info-4
 info/fftw.info-5
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/fftw.info %D/info/dir
 lib/libfftw.a
 lib/libfftw.la
diff --git a/math/fftw3/pkg-plist b/math/fftw3/pkg-plist
index 33aea15032d0..7b9282b46e45 100644
--- a/math/fftw3/pkg-plist
+++ b/math/fftw3/pkg-plist
@@ -7,7 +7,6 @@ info/fftw.info-2
 info/fftw.info-3
 info/fftw.info-4
 info/fftw.info-5
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/fftw.info %D/info/dir
 lib/libfftw.a
 lib/libfftw.la
diff --git a/misc/screen/Makefile b/misc/screen/Makefile
index 141dc508cb09..fd0d3bf49deb 100644
--- a/misc/screen/Makefile
+++ b/misc/screen/Makefile
@@ -3,7 +3,7 @@
 # Date created:         25 Nov 1994
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.19 1998/12/30 00:16:37 ache Exp $
+# $Id: Makefile,v 1.20 1999/01/27 07:41:23 fenner Exp $
 #
 
 DISTNAME=       screen-3.7.6
@@ -18,9 +18,6 @@ GNU_CONFIGURE=	yes
 MAN1=		screen.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/screen.info ${PREFIX}/info/dir
 
 .include <bsd.port.mk>
diff --git a/misc/screen/pkg-plist b/misc/screen/pkg-plist
index e9f15022ba1b..c5a09162ee02 100644
--- a/misc/screen/pkg-plist
+++ b/misc/screen/pkg-plist
@@ -2,5 +2,4 @@ bin/screen
 bin/screen-3.7.6
 @unexec install-info --delete %D/info/screen.info %D/info/dir
 info/screen.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/screen.info %D/info/dir
diff --git a/misc/vera/Makefile b/misc/vera/Makefile
index bf8c3f886587..64c6ac9f8575 100644
--- a/misc/vera/Makefile
+++ b/misc/vera/Makefile
@@ -3,7 +3,7 @@
 # Date created:		9 March 1999
 # Whom:			Dima Sivachenko	<dima@chg.ru>
 #
-# $Id$
+# $Id: Makefile,v 1.2 1999/04/30 07:55:34 taoka Exp $
 #
 
 DISTNAME=	vera-1.5
@@ -20,9 +20,6 @@ do-install:
 		@ ${INSTALL_DATA} ${WRKSRC}/vera.info* ${PREFIX}/info
 
 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/vera.info ${PREFIX}/info/dir
 
 .include <bsd.port.mk>
diff --git a/misc/vera/pkg-plist b/misc/vera/pkg-plist
index 274bcd9661cb..74008928fcb9 100644
--- a/misc/vera/pkg-plist
+++ b/misc/vera/pkg-plist
@@ -11,5 +11,4 @@ info/vera.info-8
 info/vera.info-9
 info/vera.info-10
 info/vera.info-11
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/vera.info %D/info/dir
diff --git a/net/libsocket++/Makefile b/net/libsocket++/Makefile
index 781a5ce5c85c..84a1dc997fdd 100644
--- a/net/libsocket++/Makefile
+++ b/net/libsocket++/Makefile
@@ -5,7 +5,7 @@
 # Whom:				  Narvi <narvi@haldjas.folklore.ee>
 #				  David O'Brien (obrien@FreeBSD.org)
 #
-# $Id: Makefile,v 1.4 1998/10/10 03:23:40 steve Exp $
+# $Id: Makefile,v 1.5 1998/11/22 02:01:55 kuriyama Exp $
 #
 
 DISTNAME=	socket++-1.10
@@ -23,11 +23,6 @@ GNU_CONFIGURE=	yes
 post-configure:
 	@${CP} ${FILESDIR}/Makefile.lib ${WRKSRC}/Makefile
 
-pre-install:
-	@if [ ! -f ${PREFIX}/info/dir ]; then \
-	 ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	 fi
-
 post-install:
 	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 .if !defined(NOPORTDOCS)
diff --git a/net/libsocket++/pkg-plist b/net/libsocket++/pkg-plist
index a7e88b0b5780..cf1a4e4f4c62 100644
--- a/net/libsocket++/pkg-plist
+++ b/net/libsocket++/pkg-plist
@@ -14,7 +14,6 @@ include/sockstream.h
 include/sockunix.h
 @unexec install-info --delete %D/info/socket++.info %D/info/dir
 info/socket++.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/socket++.info %D/info/dir
 share/doc/libsocket++/README
 share/doc/libsocket++/socket++.ps
diff --git a/print/hp2xx/Makefile b/print/hp2xx/Makefile
index 0c44e25416b8..e44d46b278db 100644
--- a/print/hp2xx/Makefile
+++ b/print/hp2xx/Makefile
@@ -3,7 +3,7 @@
 # Date created:         17 Jan 1999
 # Whom:                 Lars Koeller
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1999/01/26 03:30:26 steve Exp $
 #
 
 DISTNAME=	hp2xx-3.20-png
@@ -22,9 +22,6 @@ MAKEFILE=	makefile
 MAN1=		hp2xx.1
 
 post-install:
-	if [ ! -f ${PREFIX}/info/dir ]; then \
-		${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 .for info in hp2xx.info
 	install-info ${PREFIX}/info/${info} ${PREFIX}/info/dir
 .endfor
diff --git a/print/hp2xx/pkg-plist b/print/hp2xx/pkg-plist
index 60e1d92e1a3a..2bf99c409c3b 100644
--- a/print/hp2xx/pkg-plist
+++ b/print/hp2xx/pkg-plist
@@ -1,5 +1,4 @@
 bin/hp2xx
 @unexec install-info --delete %D/info/hp2xx.info %D/info/dir
 info/hp2xx.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/hp2xx.info %D/info/dir
diff --git a/print/teTeX-base/pkg-plist b/print/teTeX-base/pkg-plist
index 4c9f4ffc4b9b..de822b6fac4a 100644
--- a/print/teTeX-base/pkg-plist
+++ b/print/teTeX-base/pkg-plist
@@ -111,7 +111,6 @@ info/dvips.info-1
 info/fontname.info-4
 info/kpathsea.info-1
 info/texinfo-12
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/latex %D/info/dir
 @exec install-info %D/info/kpathsea.info %D/info/dir
 @exec install-info %D/info/dvips.info %D/info/dir
diff --git a/print/teTeX/pkg-plist b/print/teTeX/pkg-plist
index 4c9f4ffc4b9b..de822b6fac4a 100644
--- a/print/teTeX/pkg-plist
+++ b/print/teTeX/pkg-plist
@@ -111,7 +111,6 @@ info/dvips.info-1
 info/fontname.info-4
 info/kpathsea.info-1
 info/texinfo-12
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/latex %D/info/dir
 @exec install-info %D/info/kpathsea.info %D/info/dir
 @exec install-info %D/info/dvips.info %D/info/dir
diff --git a/print/yatex/Makefile b/print/yatex/Makefile
index fbcbefb9a255..3c59613e11d1 100644
--- a/print/yatex/Makefile
+++ b/print/yatex/Makefile
@@ -3,7 +3,7 @@
 # Date created:		98/11/17
 # Whom:			Satoshi Taoka <taoka@FreeBSD.org>
 #
-# $Id: Makefile,v 1.8 1999/03/17 06:57:36 taoka Exp $
+# $Id: Makefile,v 1.9 1999/05/01 04:03:29 taoka Exp $
 #
 
 DISTNAME=	yatex1.66
@@ -116,9 +116,6 @@ do-install:
 .endif
 
 post-install:
-	if [ ! -f ${INFODIR}/dir ]; then \
-		${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${INFODIR}/dir; \
-	fi
 	@${SETENV} TOUCH=${TOUCH} INFODIR=${INFODIR} \
 		ELISPDIR=${ELISPDIR} DIRSECTION="${DIRSECTION}" \
 		INFOFILES="${INFOFILES}" \
diff --git a/security/krb5-16/Makefile b/security/krb5-16/Makefile
index 44cb7e499d5f..c6a442bee79e 100644
--- a/security/krb5-16/Makefile
+++ b/security/krb5-16/Makefile
@@ -3,7 +3,7 @@
 # Date created:				6/5/1998
 # Whom:					nectar@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.8 1998/11/14 09:43:28 asami Exp $
+# $Id: Makefile,v 1.9 1999/05/27 02:08:13 nectar Exp $
 #
 
 DISTNAME=		krb5-1.0.6
@@ -183,10 +183,6 @@ post-install:
 	${CHOWN} ${SUPERUSER} ${PREFIX}/${setuid}
 .endfor
 # handle info files
-	if [ ! -f ${PREFIX}/info/dir ]; then \
-		${SED} -ne '1,/Menu:/p' /usr/share/info/dir > \
-			${PREFIX}/info/dir; \
-	fi
 .for info in ${INFO_FILES}
 	${INSTALL_MAN} ${WRKSRC}/../doc/${info} ${PREFIX}/info/${info}
 .endfor
diff --git a/security/krb5-16/pkg-plist b/security/krb5-16/pkg-plist
index 2f984b9e344a..7b23d1f3ab37 100644
--- a/security/krb5-16/pkg-plist
+++ b/security/krb5-16/pkg-plist
@@ -112,7 +112,6 @@ info/krb5-install.info
 info/krb5-install.info-1
 info/krb5-install.info-2
 info/krb5-user.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/krb425.info %D/info/dir
 @exec install-info %D/info/krb5-admin.info %D/info/dir
 @exec install-info %D/info/krb5-install.info %D/info/dir
diff --git a/security/krb5-17/Makefile b/security/krb5-17/Makefile
index 44cb7e499d5f..c6a442bee79e 100644
--- a/security/krb5-17/Makefile
+++ b/security/krb5-17/Makefile
@@ -3,7 +3,7 @@
 # Date created:				6/5/1998
 # Whom:					nectar@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.8 1998/11/14 09:43:28 asami Exp $
+# $Id: Makefile,v 1.9 1999/05/27 02:08:13 nectar Exp $
 #
 
 DISTNAME=		krb5-1.0.6
@@ -183,10 +183,6 @@ post-install:
 	${CHOWN} ${SUPERUSER} ${PREFIX}/${setuid}
 .endfor
 # handle info files
-	if [ ! -f ${PREFIX}/info/dir ]; then \
-		${SED} -ne '1,/Menu:/p' /usr/share/info/dir > \
-			${PREFIX}/info/dir; \
-	fi
 .for info in ${INFO_FILES}
 	${INSTALL_MAN} ${WRKSRC}/../doc/${info} ${PREFIX}/info/${info}
 .endfor
diff --git a/security/krb5-17/pkg-plist b/security/krb5-17/pkg-plist
index 2f984b9e344a..7b23d1f3ab37 100644
--- a/security/krb5-17/pkg-plist
+++ b/security/krb5-17/pkg-plist
@@ -112,7 +112,6 @@ info/krb5-install.info
 info/krb5-install.info-1
 info/krb5-install.info-2
 info/krb5-user.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/krb425.info %D/info/dir
 @exec install-info %D/info/krb5-admin.info %D/info/dir
 @exec install-info %D/info/krb5-install.info %D/info/dir
diff --git a/security/krb5-appl/Makefile b/security/krb5-appl/Makefile
index 44cb7e499d5f..c6a442bee79e 100644
--- a/security/krb5-appl/Makefile
+++ b/security/krb5-appl/Makefile
@@ -3,7 +3,7 @@
 # Date created:				6/5/1998
 # Whom:					nectar@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.8 1998/11/14 09:43:28 asami Exp $
+# $Id: Makefile,v 1.9 1999/05/27 02:08:13 nectar Exp $
 #
 
 DISTNAME=		krb5-1.0.6
@@ -183,10 +183,6 @@ post-install:
 	${CHOWN} ${SUPERUSER} ${PREFIX}/${setuid}
 .endfor
 # handle info files
-	if [ ! -f ${PREFIX}/info/dir ]; then \
-		${SED} -ne '1,/Menu:/p' /usr/share/info/dir > \
-			${PREFIX}/info/dir; \
-	fi
 .for info in ${INFO_FILES}
 	${INSTALL_MAN} ${WRKSRC}/../doc/${info} ${PREFIX}/info/${info}
 .endfor
diff --git a/security/krb5-appl/pkg-plist b/security/krb5-appl/pkg-plist
index 2f984b9e344a..7b23d1f3ab37 100644
--- a/security/krb5-appl/pkg-plist
+++ b/security/krb5-appl/pkg-plist
@@ -112,7 +112,6 @@ info/krb5-install.info
 info/krb5-install.info-1
 info/krb5-install.info-2
 info/krb5-user.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/krb425.info %D/info/dir
 @exec install-info %D/info/krb5-admin.info %D/info/dir
 @exec install-info %D/info/krb5-install.info %D/info/dir
diff --git a/security/krb5/Makefile b/security/krb5/Makefile
index 44cb7e499d5f..c6a442bee79e 100644
--- a/security/krb5/Makefile
+++ b/security/krb5/Makefile
@@ -3,7 +3,7 @@
 # Date created:				6/5/1998
 # Whom:					nectar@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.8 1998/11/14 09:43:28 asami Exp $
+# $Id: Makefile,v 1.9 1999/05/27 02:08:13 nectar Exp $
 #
 
 DISTNAME=		krb5-1.0.6
@@ -183,10 +183,6 @@ post-install:
 	${CHOWN} ${SUPERUSER} ${PREFIX}/${setuid}
 .endfor
 # handle info files
-	if [ ! -f ${PREFIX}/info/dir ]; then \
-		${SED} -ne '1,/Menu:/p' /usr/share/info/dir > \
-			${PREFIX}/info/dir; \
-	fi
 .for info in ${INFO_FILES}
 	${INSTALL_MAN} ${WRKSRC}/../doc/${info} ${PREFIX}/info/${info}
 .endfor
diff --git a/security/krb5/pkg-plist b/security/krb5/pkg-plist
index 2f984b9e344a..7b23d1f3ab37 100644
--- a/security/krb5/pkg-plist
+++ b/security/krb5/pkg-plist
@@ -112,7 +112,6 @@ info/krb5-install.info
 info/krb5-install.info-1
 info/krb5-install.info-2
 info/krb5-user.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/krb425.info %D/info/dir
 @exec install-info %D/info/krb5-admin.info %D/info/dir
 @exec install-info %D/info/krb5-install.info %D/info/dir
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
diff --git a/sysutils/gtar/Makefile b/sysutils/gtar/Makefile
index e7e0926e3342..b84f7ea54ab9 100644
--- a/sysutils/gtar/Makefile
+++ b/sysutils/gtar/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Sa   6 Jun 1998 10:24:51 CEST
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.3 1998/12/24 19:16:27 asami Exp $
+# $Id: Makefile,v 1.4 1999/01/27 07:41:27 fenner Exp $
 #
 
 DISTNAME=	tar-1.12
@@ -16,9 +16,4 @@ MAINTAINER=	andreas@FreeBSD.ORG
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=--program-prefix=g
 
-pre-install:
-	if [ ! -f ${PREFIX}/info/dir ]; then \
-	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
-
 .include <bsd.port.mk>
diff --git a/sysutils/gtar/pkg-plist b/sysutils/gtar/pkg-plist
index e0e7c37bbc6c..e82dcfb64109 100644
--- a/sysutils/gtar/pkg-plist
+++ b/sysutils/gtar/pkg-plist
@@ -20,5 +20,4 @@ info/tar.info-4
 info/tar.info-5
 info/tar.info-6
 info/tar.info-7
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/tar.info %D/info/dir
diff --git a/sysutils/screen/Makefile b/sysutils/screen/Makefile
index 141dc508cb09..fd0d3bf49deb 100644
--- a/sysutils/screen/Makefile
+++ b/sysutils/screen/Makefile
@@ -3,7 +3,7 @@
 # Date created:         25 Nov 1994
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.19 1998/12/30 00:16:37 ache Exp $
+# $Id: Makefile,v 1.20 1999/01/27 07:41:23 fenner Exp $
 #
 
 DISTNAME=       screen-3.7.6
@@ -18,9 +18,6 @@ GNU_CONFIGURE=	yes
 MAN1=		screen.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/screen.info ${PREFIX}/info/dir
 
 .include <bsd.port.mk>
diff --git a/sysutils/screen/pkg-plist b/sysutils/screen/pkg-plist
index e9f15022ba1b..c5a09162ee02 100644
--- a/sysutils/screen/pkg-plist
+++ b/sysutils/screen/pkg-plist
@@ -2,5 +2,4 @@ bin/screen
 bin/screen-3.7.6
 @unexec install-info --delete %D/info/screen.info %D/info/dir
 info/screen.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/screen.info %D/info/dir
diff --git a/textproc/coco/Makefile b/textproc/coco/Makefile
index b91778c10bdf..424233d190fd 100644
--- a/textproc/coco/Makefile
+++ b/textproc/coco/Makefile
@@ -3,7 +3,7 @@
 # Date created:		7 July 1997
 # Whom:			Satoshi Taoka <taoka@FreeBSD.org>
 #
-# $Id: Makefile,v 1.39 1999/03/29 07:50:59 asami Exp $
+# $Id: Makefile,v 1.40 1999/05/01 04:00:14 taoka Exp $
 #
 
 DISTNAME=	mule-2.3
@@ -126,9 +126,6 @@ post-install:
 .for file in b2m coco ctags emacsclient etags m2ps
 	strip ${PREFIX}/bin/${file}
 .endfor
-	if [ ! -f ${PREFIX}/info/dir ]; then \
-	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 	if [ ! -f ${PREFIX}/share/mule/19.34/info/dir ]; then \
 	  ${MKDIR} ${PREFIX}/share/mule/19.34/info; \
 	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/share/mule/19.34/info/dir; \
diff --git a/textproc/coco/pkg-plist b/textproc/coco/pkg-plist
index 5d9c87dc6ada..af0d3bd81ad5 100644
--- a/textproc/coco/pkg-plist
+++ b/textproc/coco/pkg-plist
@@ -133,7 +133,6 @@ info/mule-jp-2
 info/mule-jp-3
 info/quail
 info/terminology
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/emacs %D/info/dir
 @exec install-info %D/info/vip %D/info/dir
 @exec install-info %D/info/forms %D/info/dir
diff --git a/textproc/textutils/Makefile b/textproc/textutils/Makefile
index eca073fcfe75..39f8d4987493 100644
--- a/textproc/textutils/Makefile
+++ b/textproc/textutils/Makefile
@@ -3,7 +3,7 @@
 # Date created:		14 May 1998
 # Whom:			Adrian Wontroba <aw1@stade.co.uk>
 #
-# $Id: Makefile,v 1.3 1999/01/28 09:47:07 asami Exp $
+# $Id: Makefile,v 1.4 1999/02/13 07:25:42 asami Exp $
 #
 
 DISTNAME=	textutils-1.22
@@ -25,9 +25,6 @@ MAN1=	gcat.1 gcksum.1 gcomm.1 gcsplit.1 gcut.1 gexpand.1\
 		gtail.1 gtr.1 gunexpand.1 guniq.1 gwc.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/textutils.info ${PREFIX}/info/dir
 
 .include <bsd.port.mk>
diff --git a/textproc/textutils/pkg-plist b/textproc/textutils/pkg-plist
index 3705d3463ea7..e47136a9c0b2 100644
--- a/textproc/textutils/pkg-plist
+++ b/textproc/textutils/pkg-plist
@@ -24,7 +24,6 @@ bin/guniq
 bin/gwc
 @unexec install-info --delete %D/info/textutils.info %D/info/dir
 info/textutils.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/textutils.info %D/info/dir
 share/locale/de/LC_MESSAGES/textutils.mo
 share/locale/es/LC_MESSAGES/textutils.mo
diff --git a/textproc/wdiff/Makefile b/textproc/wdiff/Makefile
index a618fa8dab4b..2f68ba7965b4 100644
--- a/textproc/wdiff/Makefile
+++ b/textproc/wdiff/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Sep 15, 1997
 # Whom:			Yoshiro MIHIRA <sanpei@yy.cs.keio.ac.jp>
 #
-# $Id: Makefile,v 1.1.1.1 1997/10/01 07:05:08 max Exp $
+# $Id: Makefile,v 1.2 1999/01/27 07:41:28 fenner Exp $
 #
 
 DISTNAME=	wdiff-0.5
@@ -18,9 +18,6 @@ GNU_CONFIGURE=	yes
 MAN1=		wdiff.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/wdiff.info ${PREFIX}/info/dir
 
 .include <bsd.port.mk>
diff --git a/textproc/wdiff/pkg-plist b/textproc/wdiff/pkg-plist
index 4455a607e5a3..6e4b18a13ca3 100644
--- a/textproc/wdiff/pkg-plist
+++ b/textproc/wdiff/pkg-plist
@@ -1,6 +1,5 @@
 bin/wdiff
 @unexec install-info --delete %D/info/wdiff.info %D/info/dir
 info/wdiff.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/wdiff.info %D/info/dir
 info/dir
diff --git a/x11-wm/scwm/pkg-plist b/x11-wm/scwm/pkg-plist
index 5d1cfcfd3970..14fb854c8a22 100644
--- a/x11-wm/scwm/pkg-plist
+++ b/x11-wm/scwm/pkg-plist
@@ -4,7 +4,6 @@ bin/scwmrepl
 include/scwmexec.h
 @unexec install-info --delete %D/info/scwm.info %D/info/dir
 info/scwm.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/scwm.info %D/info/dir
 lib/X11/scwm/decor.scwmrc
 lib/X11/scwm/gjb.scwmrc