some cleanup:

-USE_NEW_TEXINFO, saves some patches
-symlink libiberty.a into build tree instead of buildlink/lib,
 saves some patches
-put common make rules into Makefile.common (for all) and
 buildaddon.mk (for all but the base "c" pkg)

8 files changed, 24 insertions, 168 deletions

diff --git a/lang/gcc3-f77/MESSAGE b/lang/gcc3-f77/MESSAGE
index 4344bdc2377..5e4b12dbb68 100644
--- a/lang/gcc3-f77/MESSAGE
+++ b/lang/gcc3-f77/MESSAGE
@@ -1,7 +1,7 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1 2003/07/06 12:15:10 drochner Exp $
+$NetBSD: MESSAGE,v 1.2 2003/07/08 15:05:00 drochner Exp $
 
-To use ${PKGNAME} include "${PREFIX}/share/examples/gcc/mk.conf" in your
+To use ${PKGNAME} include "${GCC_PREFIX}/mk/f77.mk" in your
 BSD style makefile.
 
 ===========================================================================
diff --git a/lang/gcc3-f77/Makefile b/lang/gcc3-f77/Makefile
index a322260cb3a..b7acda1eed4 100644
--- a/lang/gcc3-f77/Makefile
+++ b/lang/gcc3-f77/Makefile
@@ -1,71 +1,16 @@
-# $NetBSD: Makefile,v 1.2 2003/07/06 12:31:58 grant Exp $
+# $NetBSD: Makefile,v 1.3 2003/07/08 15:05:00 drochner Exp $
 #
 
-DISTNAME=		gcc-3.3
 PKGNAME=		gcc3-f77-3.3
-CATEGORIES=		lang
-MASTER_SITES=		${MASTER_SITE_GNU:=gcc/gcc-3.3/}
-EXTRACT_SUFX=		.tar.bz2
+COMMENT=		GNU Compiler Collection, f77 Compiler
 
-MAINTAINER=		tech-pkg@netbsd.org
-HOMEPAGE=		http://www.gnu.org/software/gcc/gcc.html
-COMMENT=		GNU Compiler Collection
-
-NOT_FOR_PLATFORM=	Darwin-*-*
-
-USE_BUILDLINK2=		YES
-USE_PKGINSTALL=		YES
-USE_GMAKE=		YES
-
-HAS_CONFIGURE=		YES
-
-CONFIGURE_ARGS+=	--infodir=${PREFIX}/info
-CONFIGURE_ARGS+=	--prefix=${GCC_PREFIX}
-CONFIGURE_ARGS+=	--enable-languages="f77"
-
-# as this is named gcc3, use DISTNAME instead.
-FILES_SUBST+=		PKGNAME_NOREV=${DISTNAME} GCC_PREFIX=${GCC_PREFIX}
-MESSAGE_SUBST+=		PKGNAME_NOREV=${DISTNAME}
-
-TEXINFO_REQD=		4.2
 INFO_FILES=		g77.info
 
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "NetBSD" && exists(/usr/include/pthread.h)
-GCC_PLATFORM=	${MACHINE_GNU_ARCH}--netbsdelf2.0
-PTHREAD_OPTS+=		require native
-.include "../../mk/pthread.buildlink2.mk"
-CPPFLAGS+=	-I${BUILDLINK_DIR}/include
-CFLAGS+=	-I${BUILDLINK_DIR}/include
-.else
-GCC_PLATFORM=	${MACHINE_GNU_PLATFORM}
-.endif
-CONFIGURE_ARGS+=	--host=${GCC_PLATFORM}
-PLIST_SUBST+=	GCC_PLATFORM=${GCC_PLATFORM}
-
-.if ${OPSYS} == "NetBSD" || ${OPSYS} == "Linux"
-CONFIGURE_ARGS+=	--enable-shared
-.else
-.  if ${OPSYS} == "SunOS"
-CONFIGURE_ARGS+=	--enable-shared
-.  else
-CONFIGURE_ARGS+=	--disable-shared
-.  endif
-.  if ${CC:M*gcc*} == ""
-ALL_TARGET=		bootstrap
-.  endif
-.endif
+.include "../gcc3-c/buildaddon.mk"
 
-GCC_PREFIX=	${PREFIX}/gcc3
-GCC_VERSION=	${PKGVERSION:C|nb*||}
-GCC_ARCHDIR=	${GCC_PREFIX}/lib/gcc-lib/${GCC_PLATFORM}/${GCC_VERSION}
-
-pre-configure:
-	${MKDIR} ${BUILD_DIRS}
-	cd ${WRKSRC} && contrib/gcc_update --touch
+CONFIGURE_ARGS+=	--enable-languages="f77"
 
 do-build:
-	${LN} -sf ${GCC_PREFIX}/bin/gcc ${WRKSRC}/gcc/xgcc
 	(cd ${WRKSRC}/gcc && ${SETENV} ${MAKE_ENV} ${GMAKE} f77)
 	(cd ${WRKSRC}/gcc && ${SETENV} ${MAKE_ENV} ${GMAKE} g77)
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} all-target-libf2c)
@@ -82,9 +27,7 @@ do-install:
 
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/gcc3.mk \
-		${PREFIX}/share/examples/gcc/mk-g77.conf
+		${GCC_PREFIX}/mk/f77.mk
 #	${LN} -f ${GCC_PREFIX}/bin/g77 ${GCC_PREFIX}/bin/f77
 
-.include "../../lang/gcc3-c/buildlink2.mk"
-.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/gcc3-f77/PLIST b/lang/gcc3-f77/PLIST
index f20dea31ae0..60c2bd092bf 100644
--- a/lang/gcc3-f77/PLIST
+++ b/lang/gcc3-f77/PLIST
@@ -1,13 +1,12 @@
-@comment $NetBSD: PLIST,v 1.1 2003/07/06 12:15:10 drochner Exp $
-gcc3/bin/g77
-gcc3/lib/gcc-lib/${GCC_PLATFORM}/${PKGVERSION}/f771
-gcc3/lib/gcc-lib/${GCC_PLATFORM}/${PKGVERSION}/include/g2c.h
-gcc3/lib/libfrtbegin.a
-gcc3/lib/libg2c.a
-gcc3/lib/libg2c.la
-gcc3/lib/libg2c.so
-gcc3/lib/libg2c.so.0
-gcc3/lib/libg2c.so.0.0
-gcc3/man/man1/g77.1
-info/g77.info
-share/examples/gcc/mk-g77.conf
+@comment $NetBSD: PLIST,v 1.2 2003/07/08 15:05:00 drochner Exp $
+${GCC_SUBPREFIX}/bin/g77
+${GCC_SUBPREFIX}/lib/gcc-lib/${GCC_PLATFORM}/${PKGVERSION}/f771
+${GCC_SUBPREFIX}/lib/gcc-lib/${GCC_PLATFORM}/${PKGVERSION}/include/g2c.h
+${GCC_SUBPREFIX}/lib/libfrtbegin.a
+${GCC_SUBPREFIX}/lib/libg2c.a
+${GCC_SUBPREFIX}/lib/libg2c.la
+${GCC_SUBPREFIX}/lib/libg2c.so
+${GCC_SUBPREFIX}/lib/libg2c.so.0
+${GCC_SUBPREFIX}/lib/libg2c.so.0.0
+${GCC_SUBPREFIX}/man/man1/g77.1
+${GCC_SUBPREFIX}/mk/f77.mk
diff --git a/lang/gcc3-f77/distinfo b/lang/gcc3-f77/distinfo
index c2795d973e5..64e608f6f26 100644
--- a/lang/gcc3-f77/distinfo
+++ b/lang/gcc3-f77/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.1 2003/07/06 12:15:10 drochner Exp $
+$NetBSD: distinfo,v 1.2 2003/07/08 15:05:00 drochner Exp $
 
 SHA1 (gcc-3.3.tar.bz2) = 18e23822c6dc9cb462e0ff88bc1b8a20c53da60a
 Size (gcc-3.3.tar.bz2) = 23447616 bytes
-SHA1 (patch-aa) = d52683aa45749ac357549d356abe42537288f352
-SHA1 (patch-ab) = d2f4bf95eaf58e1b388771f1bc2d2083c9dcf514
-SHA1 (patch-ac) = 1bd470366c793bfb12895e365ac4e9f3e5fda101
+SHA1 (patch-aa) = 541cd543720cccc24aa60b9ac26cfa6143e7e5d4
diff --git a/lang/gcc3-f77/files/gcc3.mk b/lang/gcc3-f77/files/gcc3.mk
index 9f473369efb..16b4d795d67 100644
--- a/lang/gcc3-f77/files/gcc3.mk
+++ b/lang/gcc3-f77/files/gcc3.mk
@@ -1,6 +1,6 @@
-# $NetBSD: gcc3.mk,v 1.1 2003/07/06 12:15:10 drochner Exp $
+# $NetBSD: gcc3.mk,v 1.2 2003/07/08 15:05:00 drochner Exp $
 #
-# make configuration file for @PKGNAME_NOREV@
+# make configuration file for @PKGNAME@
 
 USE_GCC3=	# defined
 F77=		@GCC_PREFIX@/bin/g77
diff --git a/lang/gcc3-f77/patches/patch-aa b/lang/gcc3-f77/patches/patch-aa
index 3cf1ed3d249..3c9ebafe63f 100644
--- a/lang/gcc3-f77/patches/patch-aa
+++ b/lang/gcc3-f77/patches/patch-aa
@@ -1,24 +1,7 @@
-$NetBSD: patch-aa,v 1.1 2003/07/06 12:15:11 drochner Exp $
+$NetBSD: patch-aa,v 1.2 2003/07/08 15:05:01 drochner Exp $
 
 --- Makefile.in.orig	2003-05-14 02:18:14.000000000 +0200
 +++ Makefile.in	2003-07-03 18:02:24.000000000 +0200
-@@ -153,11 +153,11 @@
- 
- # For an installed makeinfo, we require it to be from texinfo 4.2 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\.[2-9]|[5-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\.[2-9]|[5-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
 @@ -1642,9 +1642,9 @@
  
  install-dosrel-fake:
diff --git a/lang/gcc3-f77/patches/patch-ab b/lang/gcc3-f77/patches/patch-ab
deleted file mode 100644
index 4b206dfb665..00000000000
--- a/lang/gcc3-f77/patches/patch-ab
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2003/07/06 12:15:11 drochner Exp $
-
---- gcc/Makefile.in.orig	2003-04-22 17:50:48.000000000 +0200
-+++ gcc/Makefile.in	2003-07-03 17:21:34.000000000 +0200
-@@ -617,8 +617,8 @@
- 
- # Build and host support libraries.  FORBUILD is either
- # .. or ../$(build_alias) depending on whether host != build.
--LIBIBERTY = ../libiberty/libiberty.a
--BUILD_LIBIBERTY = @FORBUILD@/libiberty/libiberty.a
-+LIBIBERTY = ${prefix}/lib/libiberty.a
-+BUILD_LIBIBERTY = ${prefix}/lib/libiberty.a
- 
- # Dependencies on the intl and portability libraries.
- LIBDEPS= $(INTLDEPS) $(LIBIBERTY)
-@@ -1273,6 +1273,7 @@
- # Language-independent files.
- 
- DRIVER_DEFINES = \
-+  -DLINK_LIBGCC_SPEC="\"%D $(RPATH_FLAG)$(GCC_PREFIX)/lib\"" \
-   -DSTANDARD_STARTFILE_PREFIX=\"$(unlibsubdir)/\" \
-   -DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc-lib/\" \
-   -DDEFAULT_TARGET_VERSION=\"$(version)\" \
-@@ -2874,11 +2875,11 @@
- 	    $(INSTALL_DATA) $$f $(DESTDIR)$(infodir)/$$realfile; \
- 	  done; \
- 	else true; fi
--	-if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
-+	-if $(SHELL) -c '${INSTALL_INFO} --version' >/dev/null 2>&1; then \
- 	  if [ -f $(DESTDIR)$(infodir)/dir ] ; then \
- 	    for f in cpp.info gcc.info gccint.info cppinternals.info; do \
- 		if [ -f $(DESTDIR)$(infodir)/$$f ]; then \
--		  install-info --dir-file=$(DESTDIR)$(infodir)/dir $(DESTDIR)$(infodir)/$$f; \
-+		  ${INSTALL_INFO} --dir-file=$(DESTDIR)$(infodir)/dir $(DESTDIR)$(infodir)/$$f; \
- 		else true; fi; \
- 	    done; \
- 	  else true; fi; \
diff --git a/lang/gcc3-f77/patches/patch-ac b/lang/gcc3-f77/patches/patch-ac
deleted file mode 100644
index 5e603afdf17..00000000000
--- a/lang/gcc3-f77/patches/patch-ac
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2003/07/06 12:15:11 drochner Exp $
-
---- gcc/f/Make-lang.in.orig	Sat May 24 12:59:15 2003
-+++ gcc/f/Make-lang.in	Sat May 24 13:00:08 2003
-@@ -277,9 +277,9 @@
- 	  chmod a-x $(DESTDIR)$(infodir)/g77.info*; \
- 	else true; fi
- 	@if [ -f $(srcdir)/f/g77.info ] ; then \
--	  if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
--	    echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/g77.info"; \
--	    install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/g77.info || : ; \
-+	  if $(SHELL) -c '${INSTALL_INFO} --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
-+	    echo " ${INSTALL_INFO} --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/g77.info"; \
-+	    ${INSTALL_INFO} --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/g77.info || : ; \
- 	  else : ; fi; \
- 	else : ; fi
- 
-@@ -297,9 +297,9 @@
- 	else true; fi
- 
- f77.uninstall: installdirs
--	if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
--	  echo " install-info --delete --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/g77.info"; \
--	  install-info --delete --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/g77.info || : ; \
-+	if $(SHELL) -c '${INSTALL_INFO} --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
-+	  echo " ${INSTALL_INFO} --delete --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/g77.info"; \
-+	  ${INSTALL_INFO} --delete --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/g77.info || : ; \
- 	else : ; fi
- 	rm -rf $(DESTDIR)$(bindir)/$(G77_INSTALL_NAME)$(exeext); \
- 	rm -rf $(DESTDIR)$(bindir)/$(G77_CROSS_NAME)$(exeext); \