Introduce USE_GTEXINFO and INFO_FILES definitions to bsd.pkg.mk, and use them.

9 files changed, 20 insertions, 72 deletions

diff --git a/devel/autoconf/Makefile b/devel/autoconf/Makefile
index 2b15ff2fc12..b659ebc06af 100644
--- a/devel/autoconf/Makefile
+++ b/devel/autoconf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 1998/04/15 10:38:19 agc Exp $
+# $NetBSD: Makefile,v 1.14 1998/04/17 09:37:22 agc Exp $
 # FreeBSD Id: Makefile,v 1.12 1997/06/13 20:00:47 max Exp
 #
 
@@ -8,16 +8,12 @@ MASTER_SITES=	${MASTER_SITE_GNU}
 
 MAINTAINER=	packages@netbsd.org
 
-BUILD_DEPENDS=	${PREFIX}/bin/install-info:${PORTSDIR}/devel/gtexinfo
 RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 USE_PERL5=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	M4=${PREFIX}/bin/gm4
-
-post-install:
-	@install-info ${PREFIX}/info/autoconf.info ${PREFIX}/info/dir
-	@install-info ${PREFIX}/info/standards.info ${PREFIX}/info/dir
+INFO_FILES=	autoconf standards
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/automake/Makefile b/devel/automake/Makefile
index b3b6fc9bf45..e81ef9edf95 100644
--- a/devel/automake/Makefile
+++ b/devel/automake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 1998/04/15 10:38:19 agc Exp $
+# $NetBSD: Makefile,v 1.12 1998/04/17 09:37:22 agc Exp $
 # FreeBSD Id: Makefile,v 1.5 1997/09/19 09:29:04 max Exp
 #
 
@@ -8,18 +8,9 @@ MASTER_SITES=	${MASTER_SITE_GNU}
 
 MAINTAINER=	fujimoto@oscar.elec.waseda.ac.jp
 
-OPSYS!= 	uname -s
-.if (${OPSYS} == "NetBSD")
-BUILD_DEPENDS=	${PREFIX}/bin/install-info:${PORTSDIR}/devel/gtexinfo
-.endif
-
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	PERL=${PREFIX}/bin/perl
 STRIPFLAG=	# none
-
-pre-install:
-	@if [ ! -f ${PREFIX}/info/dir ]; then \
-	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	 fi
+USE_GTEXINFO=	yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/bison/Makefile b/devel/bison/Makefile
index ce3402a7fce..0178b416fce 100644
--- a/devel/bison/Makefile
+++ b/devel/bison/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:19 agc Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/17 09:37:23 agc Exp $
 
 DISTNAME=	bison-1.25
 CATEGORIES=	devel
@@ -6,12 +6,8 @@ MASTER_SITES=	${MASTER_SITE_GNU}
 
 MAINTAINER=	thorpej@netbsd.org
 
-BUILD_DEPENDS=	${PREFIX}/bin/install-info:${PORTSDIR}/devel/gtexinfo
-
 GNU_CONFIGURE=	yes
 MAN1=		bison.1
-
-post-install:
-		@install-info ${PREFIX}/info/bison.info ${PREFIX}/info/dir
+INFO_FILES=	bison
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/cvs/Makefile b/devel/cvs/Makefile
index 96ce99e0264..be572ac3fc4 100644
--- a/devel/cvs/Makefile
+++ b/devel/cvs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1998/04/15 10:38:19 agc Exp $
+# $NetBSD: Makefile,v 1.9 1998/04/17 09:37:23 agc Exp $
 #
 
 DISTNAME=       cvs-1.9
@@ -7,9 +7,6 @@ MASTER_SITES=   ${MASTER_SITE_GNU}
 
 MAINTAINER=	lamj@stat.cmu.edu
 
-BUILD_DEPENDS=	${PREFIX}/bin/install-info:${PORTSDIR}/devel/gtexinfo
-RUN_DEPENDS=	${PREFIX}/bin/install-info:${PORTSDIR}/devel/gtexinfo
-
 GNU_CONFIGURE=	yes
 
 .if exists(/usr/lib/libkrb.a)
@@ -21,12 +18,11 @@ MAKE_ENV+=	INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 MAN1=		cvs.1
 MAN5=		cvs.5
 MAN8=		cvsbug.8
+INFO_FILES=	cvs cvsclient
 
 post-install:
 	${RM} -f ${PREFIX}/bin/cvs
 	${INSTALL_PROGRAM} ${WRKSRC}/src/cvs ${PREFIX}/bin/
-	install-info --info-dir=${PREFIX}/info ${PREFIX}/info/cvs.info
-	install-info --info-dir=${PREFIX}/info ${PREFIX}/info/cvsclient.info
 	${SH} ${PKGDIR}/INSTALL ${DISTNAME} POST-INSTALL
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/gindent/Makefile b/devel/gindent/Makefile
index c5739f7e6b0..a4dfcabbc04 100644
--- a/devel/gindent/Makefile
+++ b/devel/gindent/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1998/04/15 10:38:20 agc Exp $
+# $NetBSD: Makefile,v 1.8 1998/04/17 09:37:23 agc Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1997/08/29 09:20:00 obrien Exp
 #
 
@@ -8,14 +8,10 @@ MASTER_SITES=	${MASTER_SITE_GNU}
 
 MAINTAINER=	kchowksey@hss.hns.com
 
-OPSYS!= 	uname -s
-.if (${OPSYS} == "NetBSD")
-BUILD_DEPENDS=	${PREFIX}/bin/install-info:${PORTSDIR}/devel/gtexinfo
-.endif
-
 GNU_CONFIGURE=	yes
 
 MAN1=		indent.1
+INFO_FILES=	indent
 
 MAKEFILE=	makefile
 
@@ -25,15 +21,5 @@ pre-install:
 
 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 "../../mk/bsd.pkg.mk"
diff --git a/devel/gmake/Makefile b/devel/gmake/Makefile
index 587b0817436..edbf7f6e820 100644
--- a/devel/gmake/Makefile
+++ b/devel/gmake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1998/04/15 10:38:20 agc Exp $
+# $NetBSD: Makefile,v 1.10 1998/04/17 09:37:23 agc Exp $
 # FreeBSD Id: Makefile,v 1.16 1997/06/13 20:00:47 max Exp
 #
 
@@ -9,13 +9,9 @@ MASTER_SITES=   ${MASTER_SITE_GNU}
 
 MAINTAINER=	packages@netbsd.org
 
-OPSYS!= 	uname -s
-.if (${OPSYS} == "NetBSD")
-BUILD_DEPENDS=	${PREFIX}/bin/install-info:${PORTSDIR}/devel/gtexinfo
-.endif
-
 GNU_CONFIGURE=	yes
 MAN1=		gmake.1
+USE_GTEXINFO=	yes
 
 # joerg@freebsd.org says FreeBSD getloadavg() no longer requires setgid kmem
 post-install:
diff --git a/devel/libg++/Makefile b/devel/libg++/Makefile
index 9b39f18283b..4265f6938f5 100644
--- a/devel/libg++/Makefile
+++ b/devel/libg++/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:20 agc Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/17 09:37:23 agc Exp $
 #
 
 GXXVERSION=	2.8.1.1a	# used by internal Makefile
@@ -8,14 +8,13 @@ MASTER_SITES=	${MASTER_SITE_GNU}
 
 MAINTAINER=	tv@netbsd.org
 
-BUILD_DEPENDS=	${PREFIX}/bin/install-info:${PORTSDIR}/devel/gtexinfo
-RUN_DEPENDS=	${PREFIX}/bin/install-info:${PORTSDIR}/devel/gtexinfo
 LIB_DEPENDS=	stdc++.1.:	# only from NetBSD's source tree
 
 MAKE_ENV+=	GXXVERSION="${GXXVERSION}"
 PLIST_SRC=	${WRKSRC}/.PLIST
 
-MAN1=	gperf.1
+MAN1=		gperf.1
+INFO_FILES=	gperf libg++
 
 do-configure:
 	@${CP} ${FILESDIR}/Makefile ${WRKSRC}
@@ -27,8 +26,6 @@ post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/genclass ${PREFIX}/bin/
 	${INSTALL_PROGRAM} ${WRKSRC}/gperf ${PREFIX}/bin/
 	${INSTALL_DATA} ${WRKSRC}/gperf.info ${WRKSRC}/libg++.info ${PREFIX}/info/
-	@install-info ${PREFIX}/info/gperf.info ${PREFIX}/info/dir
-	@install-info ${PREFIX}/info/libg++.info ${PREFIX}/info/dir
 	${INSTALL_DATA} ${WRKSRC}/libg++/gperf/gperf.1 ${PREFIX}/man/man1/
 	@(${CAT} ${PKGDIR}/PLIST.pre; cd ${PREFIX}; \
 		/bin/ls 2>/dev/null -1d lib/libg++*.a lib/libg++.so*) \
diff --git a/devel/m4/Makefile b/devel/m4/Makefile
index ddb9e22d919..50634fc4650 100644
--- a/devel/m4/Makefile
+++ b/devel/m4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1998/04/15 10:38:20 agc Exp $
+# $NetBSD: Makefile,v 1.8 1998/04/17 09:37:23 agc Exp $
 # FreeBSD Id: Makefile,v 1.7 1997/06/16 08:22:35 max Exp
 #
 
@@ -8,20 +8,12 @@ MASTER_SITES=   ${MASTER_SITE_GNU}
 
 MAINTAINER=	packages@netbsd.org
 
-OPSYS!= uname -s
-.if (${OPSYS} == "NetBSD")
-BUILD_DEPENDS=	${PREFIX}/bin/install-info:${PORTSDIR}/devel/gtexinfo
-.endif
-
-GNU_CONFIGURE=yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS= --program-prefix=g
+INFO_FILES=	m4
 
 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 "../../mk/bsd.pkg.mk"
diff --git a/devel/readline/Makefile b/devel/readline/Makefile
index 68c747fa87f..f86b7b196e6 100644
--- a/devel/readline/Makefile
+++ b/devel/readline/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:21 agc Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/17 09:37:24 agc Exp $
 #
 
 DISTNAME=	readline-2.1
@@ -7,10 +7,8 @@ MASTER_SITES=	${MASTER_SITE_GNU}
 
 MAINTAINER=	packages@netbsd.org
 
-BUILD_DEPENDS=	${PREFIX}/bin/install-info:${PORTSDIR}/devel/gtexinfo
-RUN_DEPENDS=    ${PREFIX}/bin/install-info:${PORTSDIR}/devel/gtexinfo
-
 GNU_CONFIGURE=	yes
+USE_GTEXINFO=	yes
 
 MAN3=		readline.3