GNU texinfo >= 4.1 is required to build the info files shipped, fix wrong

check for MAKEINFO version too.  Addresses PR pkg/20930.
Make it PKGREVISION resilent.
G/C unused variables, delint.

5 files changed, 39 insertions, 16 deletions

diff --git a/lang/gcc3/MESSAGE b/lang/gcc3/MESSAGE
index e6c2bc5ae3f..03dd9b75b85 100644
--- a/lang/gcc3/MESSAGE
+++ b/lang/gcc3/MESSAGE
@@ -1,7 +1,7 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2003/01/06 07:42:26 uebayasi Exp $
+$NetBSD: MESSAGE,v 1.2 2003/04/14 04:30:21 salo Exp $
 
-To use ${PKGNAME} include "${PREFIX}/etc/${PKGNAME}.mk" in your
+To use ${PKGNAME} include "${PREFIX}/etc/${PKGNAME_NOREV}.mk" in your
 BSD style makefile.
 
 ===========================================================================
diff --git a/lang/gcc3/Makefile b/lang/gcc3/Makefile
index bc355bbea61..82b6ad16e93 100644
--- a/lang/gcc3/Makefile
+++ b/lang/gcc3/Makefile
@@ -1,18 +1,20 @@
-# $NetBSD: Makefile,v 1.8 2003/04/13 10:51:19 grant Exp $
+# $NetBSD: Makefile,v 1.9 2003/04/14 04:30:21 salo Exp $
+#
 
-# Make sure that the version number in "Makefile.gcc" matches this.
 DISTNAME=		gcc-3.2.2
 CATEGORIES=		lang
 MASTER_SITES=		${MASTER_SITE_GNU:=gcc/}
+
 MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.gnu.org/software/gcc/gcc.html
 COMMENT=		GNU Compiler Collection
 
-NOT_FOR_PLATFORM=	Darwin-*-*
-
 BUILD_DEPENDS+=		bison-[0-9]*:../../devel/bison
+
 CONFLICTS+=		pgcc-[0-9]*
 
+NOT_FOR_PLATFORM=	Darwin-*-*
+
 USE_BUILDLINK2=		YES
 USE_PKGINSTALL=		YES
 USE_GMAKE=		YES
@@ -22,9 +24,10 @@ CONFIGURE_ARGS=		--host=${MACHINE_GNU_PLATFORM}
 CONFIGURE_ARGS+=	--infodir=${PREFIX}/info
 CONFIGURE_ARGS+=	--prefix=${GCC_PREFIX}
 
-FILES_SUBST+=		GCC_PREFIX=${GCC_PREFIX}
-FILES_SUBST+=		PKGNAME=${PKGNAME}
-PLIST_SUBST+=		PKGNAME=${PKGNAME}
+FILES_SUBST+=		PKGNAME_NOREV=${PKGNAME_NOREV} GCC_PREFIX=${GCC_PREFIX}
+MESSAGE_SUBST+=		PKGNAME_NOREV=${PKGNAME_NOREV}
+
+TEXINFO_REQD=		4.1
 
 INFO_FILES=		cpp.info g77.info gcc.info gcj.info
 
@@ -43,11 +46,9 @@ ALL_TARGET=		bootstrap
 .  endif
 .endif
 
-GCC_PREFIX=		${PREFIX}/${PKGNAME}
+GCC_PREFIX=		${PREFIX}/${PKGNAME_NOREV}
 PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
 
-GCC_ARCHDIR=	${GCC_PREFIX}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}
-
 pre-configure:
 	${MKDIR} ${BUILD_DIRS}
 	${TOUCH} ${TOUCH_FLAGS}	${WRKSRC}/gcc/c-gperf.h
@@ -57,7 +58,7 @@ post-build:
 	@${SED} ${FILES_SUBST_SED} ${FILESDIR}/gcc3.mk > ${WRKDIR}/gcc3.mk
 
 post-install:
-	${INSTALL_DATA} ${WRKDIR}/gcc3.mk ${PREFIX}/etc/${PKGNAME}.mk
+	${INSTALL_DATA} ${WRKDIR}/gcc3.mk ${PREFIX}/etc/${PKGNAME_NOREV}.mk
 	${LN} -f ${GCC_PREFIX}/bin/gcc ${GCC_PREFIX}/bin/cc
 #	${LN} -f ${GCC_PREFIX}/bin/g77 ${GCC_PREFIX}/bin/f77
 	${CP} -f ${PKGDIR}/PLIST ${PLIST_SRC}
diff --git a/lang/gcc3/distinfo b/lang/gcc3/distinfo
index 189692b7fe8..f69c566233c 100644
--- a/lang/gcc3/distinfo
+++ b/lang/gcc3/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.3 2003/03/22 02:59:32 wiz Exp $
+$NetBSD: distinfo,v 1.4 2003/04/14 04:30:21 salo Exp $
 
 SHA1 (gcc-3.2.2.tar.gz) = 152883d3e1f6190298cb7be43076abeaeac6c2a9
 Size (gcc-3.2.2.tar.gz) = 26664960 bytes
+SHA1 (patch-aa) = 6e9e7eeb7e9ddc043eb2b7c3cb05e7b6112e813b
diff --git a/lang/gcc3/files/gcc3.mk b/lang/gcc3/files/gcc3.mk
index 25851b7fc1b..e50f53a772d 100644
--- a/lang/gcc3/files/gcc3.mk
+++ b/lang/gcc3/files/gcc3.mk
@@ -1,6 +1,6 @@
-# $NetBSD: gcc3.mk,v 1.1.1.1 2003/01/06 07:42:27 uebayasi Exp $
+# $NetBSD: gcc3.mk,v 1.2 2003/04/14 04:30:22 salo Exp $
 #
-# make configuration file for @PKGNAME@
+# make configuration file for @PKGNAME_NOREV@
 
 CC=	@GCC_PREFIX@/bin/cc
 CPP=	@GCC_PREFIX@/bin/cpp
diff --git a/lang/gcc3/patches/patch-aa b/lang/gcc3/patches/patch-aa
new file mode 100644
index 00000000000..e37bce84d6f
--- /dev/null
+++ b/lang/gcc3/patches/patch-aa
@@ -0,0 +1,21 @@
+$NetBSD: patch-aa,v 1.1 2003/04/14 04:30:22 salo Exp $
+
+--- Makefile.in.orig	Tue Jan 28 22:53:32 2003
++++ Makefile.in	Sun Apr 13 12:38:31 2003
+@@ -150,11 +150,11 @@
+ 
+ # For an installed makeinfo, we require it to be from texinfo 4 or
+ # higher, else we use the "missing" dummy.
+-MAKEINFO = `if [ -f $$r/texinfo/makeinfo/makeinfo ] ; \
+-	then echo $$r/texinfo/makeinfo/makeinfo ; \
+-	else if (makeinfo --version \
+-	  | egrep 'texinfo[^0-9]*([1-3][0-9]|[4-9])') >/dev/null 2>&1; \
+-        then echo makeinfo; else echo $$s/missing makeinfo; fi; fi`
++#MAKEINFO = `if [ -f $$r/texinfo/makeinfo/makeinfo ] ; \
++#	then echo $$r/texinfo/makeinfo/makeinfo ; \
++#	else if (makeinfo --version \
++#	  | egrep 'texinfo[^0-9]*([1-3][0-9]|[4-9])') >/dev/null 2>&1; \
++#        then echo makeinfo; else echo $$s/missing makeinfo; fi; fi`
+ 
+ # This just becomes part of the MAKEINFO definition passed down to
+ # sub-makes.  It lets flags be given on the command line while still