Remove dependency on sgi-stl.

4 files changed, 12 insertions, 29 deletions

diff --git a/devel/gtl/Makefile b/devel/gtl/Makefile
index a7dd5d5cd13..bccf1862aa6 100644
--- a/devel/gtl/Makefile
+++ b/devel/gtl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2000/07/19 18:06:03 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2000/07/31 04:53:55 jlam Exp $
 
 DISTNAME=		GTL-0.3.3
 PKGNAME=		gtl-0.3.3
@@ -8,25 +8,15 @@ MASTER_SITES=		http://infosun.fmi.uni-passau.de/GTL/archive/
 MAINTAINER=		jlam@netbsd.org
 HOMEPAGE=		http://www.fmi.uni-passau.de/Graphlet/GTL/
 
-DEPENDS+=		sgi-stl>=3.2:../../devel/sgi-stl
-
 GNU_CONFIGURE=		# defined
 USE_LIBTOOL=		# defined
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
-CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
-CPPFLAGS+=		-I${LOCALBASE}/include/sgi-stl
-
 GTL_VERS=		0:3
 MAKE_ENV+=		GTL_VERS="${GTL_VERS}"
 
-MESSAGE_FILE=		${WRKDIR}/MESSAGE
 HTMLDOCDIR=		${PREFIX}/share/doc/html/GTL
 
-post-build:
-	${SED}	-e "s,@LOCALBASE@,${LOCALBASE},g" \
-		< ${PKGDIR}/MESSAGE > ${MESSAGE_FILE}
-
 post-install:
 	${INSTALL_DATA_DIR} ${HTMLDOCDIR}
 	${INSTALL_DATA_DIR} ${HTMLDOCDIR}/icons
diff --git a/devel/gtl/files/patch-sum b/devel/gtl/files/patch-sum
index d1c5ca9f75f..d3c82935a6a 100644
--- a/devel/gtl/files/patch-sum
+++ b/devel/gtl/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.3 2000/07/14 06:51:17 jlam Exp $
+$NetBSD: patch-sum,v 1.4 2000/07/31 04:53:56 jlam Exp $
 
 MD5 (patch-aa) = b6148b3262c241c822309b01f4487652
-MD5 (patch-ab) = 5c99810271dec62ff29901de21823046
+MD5 (patch-ab) = 3c7748fa3826ed9abafbffce1f223c92
diff --git a/devel/gtl/patches/patch-ab b/devel/gtl/patches/patch-ab
index be73e10fa2a..ec6640b4afb 100644
--- a/devel/gtl/patches/patch-ab
+++ b/devel/gtl/patches/patch-ab
@@ -1,15 +1,15 @@
-$NetBSD: patch-ab,v 1.1 2000/07/14 06:51:17 jlam Exp $
+$NetBSD: patch-ab,v 1.2 2000/07/31 04:53:56 jlam Exp $
 
 --- include/GTL/GTL.h.orig	Thu Feb  3 07:50:16 2000
-+++ include/GTL/GTL.h	Thu Jul 13 11:56:17 2000
-@@ -128,6 +128,7 @@
- //   Bugfix for EGCS & GCC < 2.95
- //--------------------------------------------------------------------------
- 
-+#if 0
- #if defined(__GNUC__) && __GNUC__ == 2 && __GNUC_MINOR__ < 95
- 
++++ include/GTL/GTL.h	Mon Jul 31 00:30:39 2000
+@@ -133,6 +133,7 @@
  #include <map>
+ #include <memory>
+ 
++#ifndef __STL_USE_STD_ALLOCATORS
+ /**
+  * @internal
+  */
 @@ -141,6 +142,7 @@
  {
  };
diff --git a/devel/gtl/pkg/MESSAGE b/devel/gtl/pkg/MESSAGE
deleted file mode 100644
index 4ddcdd73fb5..00000000000
--- a/devel/gtl/pkg/MESSAGE
+++ /dev/null
@@ -1,7 +0,0 @@
-==========================================================================
-$NetBSD: MESSAGE,v 1.1 2000/07/14 06:51:18 jlam Exp $
-
-If your project uses GTL, then you will need to pass
-"-I@LOCALBASE@/include/sgi-stl" to the compiler so that it may
-find the SGI STL headers.
-==========================================================================