bl3ify the gcc3-* packages. Also provide buildlink[23].mk files for use

by bsd.compiler.mk.  Note that in the buildlink3.mk files, the dependency
is always added regardless of the BUILDLINK_DEPTH.  This is because these
buildlink3.mk files may be included by bsd.prefs.mk, which is often
included other buildlink3.mk files, and we need to ensure that regardless
of the depth, we are using the correct compiler.

4 files changed, 79 insertions, 29 deletions

diff --git a/lang/gcc3-java/DESCR b/lang/gcc3-java/DESCR
index bef410282ba..b55c929570e 100644
--- a/lang/gcc3-java/DESCR
+++ b/lang/gcc3-java/DESCR
@@ -1,14 +1,3 @@
-This directory contains the GNU Compiler Collection (GCC) version 3.3.
-It includes all of the support for compiling C, C++, Objective C, Fortran,
-Java, and Chill.
+The GNU Compiler Collection (GCC) version 3.x.
 
-The GNU Compiler Collection is free software.  See the file COPYING for copying
-permission.
-
-See the file gcc.texi (together with other files that it includes) for
-installation and porting information.  The file INSTALL contains a
-copy of the installation information, as plain ASCII.
-
-See the Bugs chapter of the GCC Manual for how to report bugs
-usefully.  An online readable version of the manual is in the files
-gcc.info*.
+This package includes support for compiling the Java language.
diff --git a/lang/gcc3-java/Makefile b/lang/gcc3-java/Makefile
index a58a5250c74..a8bd5684af0 100644
--- a/lang/gcc3-java/Makefile
+++ b/lang/gcc3-java/Makefile
@@ -1,34 +1,35 @@
-# $NetBSD: Makefile,v 1.8 2003/12/03 11:28:55 drochner Exp $
-#
+# $NetBSD: Makefile,v 1.9 2004/02/01 14:05:47 jlam Exp $
 
-PKGNAME=		gcc3${GCC3_PKGMODIF}-java-${GCC_VERSION}
-COMMENT=		GNU Compiler Collection, version 3, Java compiler
+PKGNAME=	gcc3${GCC3_PKGMODIF}-java-${GCC_VERSION}
+COMMENT=	GNU Compiler Collection, v3 - Java compiler
 
-INFO_FILES=		gcj.info
+INFO_FILES=	gcj.info
 
-.include "../../lang/gcc3-c/buildaddon.mk"
+.include "../gcc3-c/language.mk"
 
-BUILD_DEPENDS+=		gcc3${GCC3_PKGMODIF}-c++-3.3.2:../../lang/gcc3-c++
+BUILD_DEPENDS+=		gcc3${GCC3_PKGMODIF}-c++>=3.3.2:../../lang/gcc3-c++
 CONFIGURE_ARGS+=	--enable-languages="java"
 CONFIGURE_ARGS+=	--with-system-zlib
+
 # done manually in do-build
 #UNLIMIT_RESOURCES=	datasize
 
 do-build:
-	(cd ${WRKSRC}/gcc && ${GMAKE} java)
-	(${ULIMIT_CMD_datasize}; cd ${WRKSRC} && ${GMAKE} all-target-libjava)
+	cd ${WRKSRC}/gcc && ${SETENV} ${MAKE_ENV} ${GMAKE} java
+	${ULIMIT_CMD_datasize}; cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
+		${GMAKE} all-target-libjava
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gcc/jc1 ${GCC_ARCHDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/gcc/gcj ${GCC_ARCHDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/gcc/jvgenmain ${GCC_ARCHDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/gcc/gcjh ${GCC_ARCHDIR}
-	(cd ${WRKSRC}/gcc && ${SETENV} ${MAKE_ENV} ${GMAKE} \
-		java.install-common java.install-info)
-	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} \
-		install-target-libjava)
+	cd ${WRKSRC}/gcc && ${SETENV} ${MAKE_ENV} ${GMAKE} \
+		java.install-common java.install-info
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} \
+		install-target-libjava
 
-.include "../../devel/zlib/buildlink2.mk"
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
 
 # On NetBSD, the gcc-2.95.3 for:
@@ -45,8 +46,8 @@ do-install:
 #
 .if ${OPSYS} == "NetBSD"
 .  if ${MACHINE_ARCH} == "alpha"
-CONFIG_CFLAGS=	${CFLAGS:C/-O[0-9]*//g}
+CONFIG_CFLAGS=		${CFLAGS:C/-O[0-9]*//g}
 CONFIG_CPPFLAGS=	${CPPFLAGS:C/-O[0-9]*//g}
-CONFIGURE_ENV+=	CFLAGS="${CONFIG_CFLAGS}" CPPFLAGS="${CONFIG_CPPFLAGS}"
+CONFIGURE_ENV+=		CFLAGS="${CONFIG_CFLAGS}" CPPFLAGS="${CONFIG_CPPFLAGS}"
 .  endif
 .endif
diff --git a/lang/gcc3-java/buildlink2.mk b/lang/gcc3-java/buildlink2.mk
new file mode 100644
index 00000000000..79abd09002c
--- /dev/null
+++ b/lang/gcc3-java/buildlink2.mk
@@ -0,0 +1,35 @@
+# $NetBSD: buildlink2.mk,v 1.1 2004/02/01 14:05:47 jlam Exp $
+
+.if !defined(GCC3JAVA_BUILDLINK2_MK)
+GCC3JAVA_BUILDLINK2_MK=	# defined
+
+.include "../../mk/bsd.prefs.mk"
+
+.if defined(GCC3_INSTALLTO_SUBPREFIX)
+GCC3_PKGMODIF=			_${GCC3_INSTALLTO_SUBPREFIX}
+.endif
+BUILDLINK_PACKAGES+=		gcc3java
+BUILDLINK_DEPENDS.gcc3java?=	gcc3${GCC3_PKGMODIF}-java>=${_GCC_REQD}
+BUILDLINK_PKGSRCDIR.gcc3java?=	../../lang/gcc3-java
+
+# Packages that link against gcc shared libraries need a full
+# dependency.
+#
+.if defined(USE_GCC_SHLIB)
+BUILDLINK_DEPMETHOD.gcc3java+=	full
+.else
+BUILDLINK_DEPMETHOD.gcc3java?=	build
+.endif
+
+BUILDLINK_PREFIX.gcc3java=	${LOCALBASE}
+BUILDLINK_WRAPPER_ENV+=	\
+	COMPILER_PATH="${BUILDLINK_DIR}/bin"; export COMPILER_PATH
+
+BUILDLINK_FILES.gcc3java=	${_GCC_SUBPREFIX}lib/gcc-lib/*/*/include/java/*
+BUILDLINK_FILES.gcc3java+=	${_GCC_SUBPREFIX}/lib/libjava.*
+
+BUILDLINK_TARGETS+=	gcc3java-buildlink
+
+gcc3java-buildlink: _BUILDLINK_USE
+
+.endif	# GCC3JAVA_BUILDLINK2_MK
diff --git a/lang/gcc3-java/buildlink3.mk b/lang/gcc3-java/buildlink3.mk
new file mode 100644
index 00000000000..16147dec300
--- /dev/null
+++ b/lang/gcc3-java/buildlink3.mk
@@ -0,0 +1,25 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/02/01 14:05:47 jlam Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+GCC3JAVA_BUILDLINK3_MK:=	${GCC3JAVA_BUILDLINK3_MK}+
+
+.include "../../mk/bsd.prefs.mk"
+
+.if !empty(GCC3JAVA_BUILDLINK3_MK:M+)
+.  if defined(GCC3_INSTALLTO_SUBPREFIX)
+GCC3_PKGMODIF=			_${GCC3_INSTALLTO_SUBPREFIX}
+.  endif
+BUILDLINK_PACKAGES+=		gcc3java
+BUILDLINK_DEPENDS+=		gcc3java
+BUILDLINK_DEPENDS.gcc3java+=	gcc3${GCC3_PKGMODIF}-java>=${_GCC_REQD}
+BUILDLINK_PKGSRCDIR.gcc3java?=	../../lang/gcc3-java
+
+# Packages that link against shared libraries need a full dependency.
+.  if defined(USE_GCC_SHLIB)
+BUILDLINK_DEPMETHOD.gcc3java+=	full
+.  else
+BUILDLINK_DEPMETHOD.gcc3java?=	build
+.  endif
+.endif	# GCC3JAVA_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}