Use buildlink2 and use gcc/buildlink2.mk instead of homegrown GCC detection

code.  We lose the ability to build with PGCC, but that will be added back
into gcc/buildlink2.mk soon.

3 files changed, 19 insertions, 31 deletions

diff --git a/devel/stlport/Makefile b/devel/stlport/Makefile
index b6d365d3d8e..9e835545cb9 100644
--- a/devel/stlport/Makefile
+++ b/devel/stlport/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2002/03/01 10:56:51 martti Exp $
+# $NetBSD: Makefile,v 1.11 2002/09/30 23:33:54 jlam Exp $
 
 DISTNAME=	STLport-4.0
 PKGNAME=	stlport-4.0
@@ -10,21 +10,14 @@ MAINTAINER=	p99dreyf@criens.u-psud.fr
 HOMEPAGE=	http://www.stlport.org/
 COMMENT=	Complete C++ standard library
 
-GCC_VERSION!=	${CC} --version
-.if ${GCC_VERSION}!="2.95.3"
-DEPENDS+=	{gcc,pgcc}>=${GCC_VERS}:../../lang/gcc
-GCC_VERS=	2.95.3
-.else 
-GCC_BINDIR=	/usr/bin
-.endif
-
+USE_BUILDLINK2=	# defined
 USE_GMAKE=	# defined
 USE_LIBTOOL=	# defined
+USE_CXX=	# defined
 
 NO_CONFIGURE=	# defined
+BUILD_DIRS=	${WRKSRC}/src
 
-MAKE_ENV+=	CC="--tag CC ${GCC_BINDIR}/cc"
-MAKE_ENV+=	CXX="--tag CXX ${GCC_BINDIR}/c++"
 MAKE_ENV+=	CXXFLAGS="${CXXFLAGS}"
 MAKEFILE=	gcc-libtool.mak
 
@@ -35,12 +28,9 @@ INCDIR=		${PREFIX}/include/stlport
 LIBDIR=		${PREFIX}/lib
 HTMLDIR=	${PREFIX}/share/doc/html/stlport
 
-do-build:
-	cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} ${ALL_TARGET}
-
 pre-install:
 	cd ${WRKSRC}/stlport && ${RM} -rf BC50 SC5 config/new_compiler old_hp
-	${FIND} ${WRKSRC}/stlport -name "*.orig" -exec ${RM} -f {} \;
+	${FIND} ${WRKSRC}/stlport -name "*.orig" | ${XARGS} ${RM} -f
 
 do-install:
 	cd ${WRKSRC} && ${PAX} -rw stlport ${PREFIX}/include
@@ -59,15 +49,5 @@ do-install:
 	cd ${WRKSRC}/doc; ${INSTALL_DATA} *.css *.html ${HTMLDIR}
 	cd ${WRKSRC}/doc; ${INSTALL_DATA} images/* ${HTMLDIR}/images
 
+.include "../../lang/gcc/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
-
-.if !defined(GCC_BINDIR)
-PGCC_DEPEND!=	${PKG_INFO} -e "pgcc>=${GCC_VERS}" || ${ECHO}
-GCC_DEPEND!=	${PKG_INFO} -e "gcc>=${GCC_VERS}" || ${ECHO}
-.if ${PGCC_DEPEND} != ""
-GCC_BINDIR=	${PREFIX}/${PGCC_DEPEND}/bin
-.elif ${GCC_DEPEND} != ""
-GCC_BINDIR=	${PREFIX}/${GCC_DEPEND}/bin
-.endif
-MAKEFLAGS+=	GCC_BINDIR="${GCC_BINDIR}"
-.endif
diff --git a/devel/stlport/distinfo b/devel/stlport/distinfo
index c771e0eb929..4fb4f7e472d 100644
--- a/devel/stlport/distinfo
+++ b/devel/stlport/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2002/01/08 21:18:04 mrauch Exp $
+$NetBSD: distinfo,v 1.5 2002/09/30 23:33:54 jlam Exp $
 
 SHA1 (STLport-4.0.tar.gz) = 2b13928768d2e9320f5f6f9dd4718e2ac842b637
 Size (STLport-4.0.tar.gz) = 695790 bytes
-SHA1 (patch-aa) = 7d81540306084a02bf34ed095a6906781d0c44b7
+SHA1 (patch-aa) = 8a4f6ef6da001250d92618dea6f5eee0c11c9204
 SHA1 (patch-ab) = 03e790d6c4a666e2929b1fe127be11df9eb97092
 SHA1 (patch-ac) = 889b64fe621d4c1f9e1ab9e0744a9b2daa6cad27
 SHA1 (patch-ad) = fc016c373fcb839c7fe3a7812e7a8d17d290c40a
diff --git a/devel/stlport/patches/patch-aa b/devel/stlport/patches/patch-aa
index cf80152171a..f271c9547bb 100644
--- a/devel/stlport/patches/patch-aa
+++ b/devel/stlport/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2001/04/30 20:41:12 jlam Exp $
+$NetBSD: patch-aa,v 1.3 2002/09/30 23:33:54 jlam Exp $
 
---- src/gcc-libtool.mak.orig	Mon Apr 30 15:26:47 2001
+--- src/gcc-libtool.mak.orig	Mon Sep 30 15:55:13 2002
 +++ src/gcc-libtool.mak
-@@ -0,0 +1,80 @@
+@@ -0,0 +1,88 @@
 +#
 +# Note : this makefile is for gcc-2.95 and later !
 +#
@@ -50,6 +50,14 @@ $NetBSD: patch-aa,v 1.2 2001/04/30 20:41:12 jlam Exp $
 +
 +CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D__STL_DEBUG
 +
++LDFLAGS_COMMON = ${LDFLAGS}
++
++LDFLAGS_RELEASE_static = ${LDFLAGS_COMMON}
++
++LDFLAGS_DEBUG_static = ${LDFLAGS_COMMON}
++
++LDFLAGS_STLDEBUG_static = ${LDFLAGS_COMMON}
++
 +include common_rules.mak
 +
 +.SUFFIXES: .cpp .c .o .lo .so .a