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.

2 files changed, 37 insertions, 48 deletions

diff --git a/lang/gcc3-ada/DESCR b/lang/gcc3-ada/DESCR
index bef410282ba..725cd6e821d 100644
--- a/lang/gcc3-ada/DESCR
+++ b/lang/gcc3-ada/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 Ada language.
diff --git a/lang/gcc3-ada/Makefile b/lang/gcc3-ada/Makefile
index 85661eacdfc..cd899da6a6b 100644
--- a/lang/gcc3-ada/Makefile
+++ b/lang/gcc3-ada/Makefile
@@ -1,37 +1,38 @@
-# $NetBSD: Makefile,v 1.8 2003/12/08 18:33:53 drochner Exp $
-#
+# $NetBSD: Makefile,v 1.9 2004/02/01 14:05:46 jlam Exp $
 
-PKGNAME=		gcc3${GCC3_PKGMODIF}-ada-${GCC_VERSION}
-COMMENT=		GNU Compiler Collection, version 3, Ada compiler
+PKGNAME=	gcc3${GCC3_PKGMODIF}-ada-${GCC_VERSION}
+COMMENT=	GNU Compiler Collection, v3 - Ada compiler
 
 INFO_FILES=	gnat_ug_unx.info gnat_ug_vms.info gnat_ug_vxw.info
 INFO_FILES+=	gnat_ug_wnt.info gnat_rm.info gnat-style.info
 
-.include "../../lang/gcc3-c/buildaddon.mk"
+.include "../gcc3-c/language.mk"
 
-PTHREAD_OPTS+=  require native
+PTHREAD_OPTS+=		require native
 CONFIGURE_ARGS+=	--enable-languages="ada"
 CONFIGURE_ARGS+=	--enable-threads=yes
 
 #
-# Bootstrap section. Define something to make the pkg usable.
+# Bootstrap section. Define something to make the package usable.
+#
+# To make things more interesting, we need an existing GCC with Ada
+# support to build Ada support.
 #
-# To make things more interesting, we need a gcc with ada support to build
-# ada support.
 # A gcc tree with compiler driver and gnatbind should be in ADA_BOOT_PATH.
-#ADA_BOOT_PATH=               /path/to/adagcc
-# Use this if a special compiler driver is needed to compile ada programs
-# (as seen in linux installations).
+#
+#ADA_BOOT_PATH=		/path/to/adagcc
+#
+# Use this if a special compiler driver is needed to compile Ada programs
+# (as seen in Linux installations).
+#
 #GNATGCC_ADA_DRIVER=	gnatgcc
 
 .if defined(ADA_BOOT_PATH)
-
-.if defined(GNATGCC_ADA_DRIVER)
+.  if defined(GNATGCC_ADA_DRIVER)
 ADA_BOOT_ADAC=	${ADA_BOOT_PATH}/bin/${GNATGCC_ADA_DRIVER}
-.else
+.  else
 ADA_BOOT_ADAC=	${ADA_BOOT_PATH}/bin/gcc
-.endif
-
+.  endif
 ADA_BOOT_GNATBIND=	${ADA_BOOT_PATH}/bin/gnatbind
 
 EXTRA_ENV+=	ADAC=${ADA_BOOT_ADAC:Q}
@@ -40,8 +41,7 @@ MAKE_ENV+=	${EXTRA_ENV}
 
 .else # !ADA_BOOT_PATH
 
-# XXX No known system has ada in the main tree.
-ONLY_FOR_PLATFORM=	sorry_need_ada_compiler
+PKG_SKIP_REASON=	"Sorry, need an Ada compiler"
 
 .endif # ADA_BOOT_PATH
 
@@ -50,28 +50,28 @@ ONLY_FOR_PLATFORM=	sorry_need_ada_compiler
 #
 
 post-patch:
-	(cd files; \
-		${CP} adasignal.c ${WRKSRC}/gcc/ada; \
-		${CP} ada_lwp_self.c ${WRKSRC}/gcc/ada; \
-		for i in *.adb *.ads ; do \
-		${CP} $$i ${WRKSRC}/gcc/ada; \
-	done )
+	cd ${FILESDIR};							\
+	${CP} adasignal.c ${WRKSRC}/gcc/ada;				\
+	${CP} ada_lwp_self.c ${WRKSRC}/gcc/ada;				\
+	for i in *.adb *.ads ; do					\
+		${CP} $$i ${WRKSRC}/gcc/ada;				\
+	done
 
 post-buildlink:
 	${LN} -sf ${ADA_BOOT_GNATBIND} ${BUILDLINK_DIR}/bin
 
 post-configure:
 	${TEST} -f ${WRKSRC}/gcc/ada/Makefile \
-	  || ${FALSE} # no ada bootstrap found by configure
-	(cd ${WRKSRC}/gcc/ada && ${TOUCH} treeprs.ads [es]info.h nmake.ad[bs])
+		|| ${FALSE} # no ada bootstrap found by configure
+	cd ${WRKSRC}/gcc/ada && ${TOUCH} treeprs.ads [es]info.h nmake.ad[bs]
 
 do-build:
-	(cd ${WRKSRC}/gcc && ${SETENV} ${MAKE_ENV} ${GMAKE} ada)
+	cd ${WRKSRC}/gcc && ${SETENV} ${MAKE_ENV} ${GMAKE} ada
 	# XXX avoid some VPATH related lossage
-	(cd ${WRKSRC}/gcc/ada && ${MV} targtyps.o targtyps.o.sav)
-	(cd ${WRKSRC}/gcc/ada && ${RM} -f *.o *.ali)
-	(cd ${WRKSRC}/gcc/ada && ${MV} targtyps.o.sav targtyps.o)
-	(cd ${WRKSRC}/gcc && ${SETENV} ${MAKE_ENV} ${GMAKE} gnatlib_and_tools)
+	cd ${WRKSRC}/gcc/ada && ${MV} targtyps.o targtyps.o.sav
+	cd ${WRKSRC}/gcc/ada && ${RM} -f *.o *.ali
+	cd ${WRKSRC}/gcc/ada && ${MV} targtyps.o.sav targtyps.o
+	cd ${WRKSRC}/gcc && ${SETENV} ${MAKE_ENV} ${GMAKE} gnatlib_and_tools
 
 post-build:
 	@${SED} ${FILES_SUBST_SED} ${FILESDIR}/gcc3.mk > ${WRKDIR}/gcc3.mk
@@ -79,12 +79,12 @@ post-build:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gcc/gnat1 ${GCC_ARCHDIR}
-	(cd ${WRKSRC}/gcc && ${SETENV} ${MAKE_ENV} ${GMAKE} \
-		ada.install-common ada.install-info install-gnatlib)
+	cd ${WRKSRC}/gcc && ${SETENV} ${MAKE_ENV} ${GMAKE} \
+		ada.install-common ada.install-info install-gnatlib
 	${RM} -f ${GCC_ARCHDIR}/adalib/lib*.so
 
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/gcc3.mk ${GCC_PREFIX}/mk/ada.mk
 
-.include "../../mk/pthread.buildlink2.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"