Bump the PKGREVISION after fixing up the installed *.la files to remove

references to the buildlink work directories.

7 files changed, 39 insertions, 10 deletions

diff --git a/lang/gcc3-c++/Makefile b/lang/gcc3-c++/Makefile
index 34a1102c51a..1dcd984a697 100644
--- a/lang/gcc3-c++/Makefile
+++ b/lang/gcc3-c++/Makefile
@@ -1,8 +1,12 @@
-# $NetBSD: Makefile,v 1.8 2004/02/01 14:05:47 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2004/02/13 15:13:01 jlam Exp $
 
 PKGNAME=	gcc3${GCC3_PKGMODIF}-c++-${GCC_VERSION}
+PKGREVISION=	1
 COMMENT=	GNU Compiler Collection, v3 - C++ compiler
 
+INSTLIBS=	libstdc++-v3/libsupc++/libsupc++.la			\
+		libstdc++-v3/src/libstdc++.la
+
 .include "../gcc3-c/language.mk"
 
 CONFIGURE_ARGS+=	--enable-languages="c++"
diff --git a/lang/gcc3-c/Makefile.common b/lang/gcc3-c/Makefile.common
index b4a2e896648..996d5f39103 100644
--- a/lang/gcc3-c/Makefile.common
+++ b/lang/gcc3-c/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.13 2004/02/12 22:53:47 jlam Exp $
+# $NetBSD: Makefile.common,v 1.14 2004/02/13 15:13:01 jlam Exp $
 
 GCC_VERSION=	3.3.2
 DISTNAME=	gcc-${GCC_VERSION}
@@ -89,6 +89,17 @@ CONFIGURE_ARGS+=	--disable-shared
 GCC_ARCHSUBDIR=	${GCC_SUBPREFIX}/lib/gcc-lib/${GCC_PLATFORM}/${GCC_VERSION}
 GCC_ARCHDIR=	${PREFIX}/${GCC_ARCHSUBDIR}
 
+.if defined(INSTLIBS)
+BUILDLINK_LIBTOOL=	${BUILDLINK_DIR}/bin/libtool
+
+.PHONY: scrub-libtool-archives
+post-build: scrub-libtool-archives
+scrub-libtool-archives:
+.  for lafile in ${INSTLIBS}
+	${BUILDLINK_LIBTOOL} --fix-la ${WRKSRC}/${GCC_PLATFORM}/${lafile}
+.  endfor
+.endif
+
 # Create the directories for the build, patch the ltconfig script to
 # always use "sunos" shared library numbering (for consistent PLISTs
 # across platforms), and touch all the necessary files so that they're
diff --git a/lang/gcc3-c/language.mk b/lang/gcc3-c/language.mk
index 32a00188455..f56e2286b29 100644
--- a/lang/gcc3-c/language.mk
+++ b/lang/gcc3-c/language.mk
@@ -1,9 +1,9 @@
-# $NetBSD: language.mk,v 1.4 2004/02/12 11:40:45 jlam Exp $
+# $NetBSD: language.mk,v 1.5 2004/02/13 15:13:01 jlam Exp $
 
 BUILDLINK_DEPENDS.gcc3c+=	gcc3${GCC3_PKGMODIF}-c>=${GCC_VERSION}
 BUILDLINK_DEPMETHOD.gcc3c+=	full
 
-.include "../../lang/gcc3-c/Makefile.common"
+.include "../gcc3-c/Makefile.common"
 
 pre-build:
 	cd ${WRKSRC}/gcc && ${SETENV} ${MAKE_ENV} ${GMAKE} tconfig.h
diff --git a/lang/gcc3-f77/Makefile b/lang/gcc3-f77/Makefile
index bcfea74e96b..706b50edaf4 100644
--- a/lang/gcc3-f77/Makefile
+++ b/lang/gcc3-f77/Makefile
@@ -1,10 +1,13 @@
-# $NetBSD: Makefile,v 1.7 2004/02/01 14:05:47 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2004/02/13 15:13:01 jlam Exp $
 
 PKGNAME=	gcc3${GCC3_PKGMODIF}-f77-${GCC_VERSION}
+PKGREVISION=	1
 COMMENT=	GNU Compiler Collection, v3 - F77 compiler
 
 INFO_FILES=	g77.info
 
+INSTLIBS=	libf2c/libg2c.la
+
 .include "../gcc3-c/language.mk"
 
 CONFIGURE_ARGS+=	--enable-languages="f77"
diff --git a/lang/gcc3-java/Makefile b/lang/gcc3-java/Makefile
index c972a0ff4b6..058a5b75974 100644
--- a/lang/gcc3-java/Makefile
+++ b/lang/gcc3-java/Makefile
@@ -1,13 +1,19 @@
-# $NetBSD: Makefile,v 1.10 2004/02/10 19:33:11 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2004/02/13 15:13:01 jlam Exp $
 
 PKGNAME=	gcc3${GCC3_PKGMODIF}-java-${GCC_VERSION}
+PKGREVISION=	1
 COMMENT=	GNU Compiler Collection, v3 - Java compiler
 
+BUILDLINK_DEPENDS.gcc3cxx+=	gcc3${GCC3_PKGMODIF}-c++>=${GCC_VERSION}
+BUILDLINK_DEPMETHOD.gcc3cxx+=	full
+
 INFO_FILES=	gcj.info
 
-.include "../gcc3-c/language.mk"
+INSTLIBS=	libjava/lib-org-w3c-dom.la				\
+		libjava/lib-org-xml-sax.la				\
+		libjava/libgcj.la
 
-BUILD_DEPENDS+=	gcc3${GCC3_PKGMODIF}-c++>=${GCC_VERSION}:../../lang/gcc3-c++
+.include "../gcc3-c/language.mk"
 
 CONFIGURE_ARGS+=	--enable-languages="java"
 CONFIGURE_ARGS+=	--with-system-zlib
@@ -31,6 +37,7 @@ do-install:
 		install-target-libjava
 
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../lang/gcc3-c++/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
 
 # On NetBSD, the gcc-2.95.3 for:
diff --git a/lang/gcc3-objc/Makefile b/lang/gcc3-objc/Makefile
index b06eb5206e0..c6801890b8c 100644
--- a/lang/gcc3-objc/Makefile
+++ b/lang/gcc3-objc/Makefile
@@ -1,8 +1,11 @@
-# $NetBSD: Makefile,v 1.7 2004/02/01 14:05:47 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2004/02/13 15:13:01 jlam Exp $
 
 PKGNAME=	gcc3${GCC3_PKGMODIF}-objc-${GCC_VERSION}
+PKGREVISION=	1
 COMMENT=	GNU Compiler Collection, v3 - Objective C compiler
 
+INSTLIBS=	libobjc/libobjc.la
+
 .include "../gcc3-c/language.mk"
 
 CONFIGURE_ARGS+=	--enable-languages="objc"
diff --git a/lang/gcc3/Makefile b/lang/gcc3/Makefile
index 96b58334a58..de2c41bbec0 100644
--- a/lang/gcc3/Makefile
+++ b/lang/gcc3/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.49 2004/02/01 14:12:22 jlam Exp $
+# $NetBSD: Makefile,v 1.50 2004/02/13 15:13:00 jlam Exp $
 
 GCC_VERSION=	3.3.2
 DISTNAME=	gcc3-${GCC_VERSION}
+PKGREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	# empty
 DISTFILES=	# empty