Update SGI-STL to 3.3. Changes from version 3.2:

* New feature: concept checks.  The library now does better compile-time
  error checking to make sure that the types used to instantiate
  library templates conform to the templates' requirements.
* Removed two non-standard-conforming extensions: the second, defaulted
  template parameter in bitset, and the third, default template
  parameter in deque.
* Many bug fixes, performance enhancements, and compatibility improvements.

6 files changed, 32 insertions, 31 deletions

diff --git a/devel/sgi-stl/Makefile b/devel/sgi-stl/Makefile
index cd4f271fb62..3d921879c1e 100644
--- a/devel/sgi-stl/Makefile
+++ b/devel/sgi-stl/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/05/24 05:46:52 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2000/07/12 20:22:42 jlam Exp $
 
 DISTNAME=		stl
-PKGNAME=		sgi-stl-3.2
+PKGNAME=		sgi-stl-3.3
 CATEGORIES=		devel
 MASTER_SITES=		http://www.sgi.com/Technology/STL/
 
diff --git a/devel/sgi-stl/files/md5 b/devel/sgi-stl/files/md5
index 8fa35d274ce..7974c9ce81b 100644
--- a/devel/sgi-stl/files/md5
+++ b/devel/sgi-stl/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 2000/05/24 05:46:53 jlam Exp $
+$NetBSD: md5,v 1.2 2000/07/12 20:22:43 jlam Exp $
 
-MD5 (sgi-stl-3.2/stl.tar.gz) = 641e50e14e0d5de6cf998d419889c8cd
+MD5 (sgi-stl-3.3/stl.tar.gz) = e0a19469085fb82912cd815a05390797
diff --git a/devel/sgi-stl/files/patch-sum b/devel/sgi-stl/files/patch-sum
index 86c1abbd2d5..3f8f6a077a7 100644
--- a/devel/sgi-stl/files/patch-sum
+++ b/devel/sgi-stl/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.1.1.1 2000/05/24 05:46:53 jlam Exp $
+$NetBSD: patch-sum,v 1.2 2000/07/12 20:22:43 jlam Exp $
 
-MD5 (patch-aa) = 21d0428a70306bb5f22bae2856c7f9c7
-MD5 (patch-ab) = 9ae485b51542be0469461ee9e75a4fec
+MD5 (patch-aa) = 503545ce2a7869a6b5235538b6326703
+MD5 (patch-ab) = cc514851974fcb33c12428e6355bb338
diff --git a/devel/sgi-stl/patches/patch-aa b/devel/sgi-stl/patches/patch-aa
index 34e27c10bd2..dcacc23d996 100644
--- a/devel/sgi-stl/patches/patch-aa
+++ b/devel/sgi-stl/patches/patch-aa
@@ -1,22 +1,19 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/05/24 05:46:54 jlam Exp $
+$NetBSD: patch-aa,v 1.2 2000/07/12 20:22:44 jlam Exp $
 
-Still need to find 1st word of +infinity, quiet NaN, and signaling NaN.
-
---- limits.orig	Thu Apr 22 20:47:10 1999
-+++ limits	Sat May 13 02:24:42 2000
-@@ -372,9 +372,15 @@
+--- limits.orig	Thu Jun  8 18:10:23 2000
++++ limits	Wed Jul 12 03:16:05 2000
+@@ -350,6 +350,14 @@
  #if !defined(LONGLONG_MIN) && !defined(LONGLONG_MAX) \
                             && !defined(ULONGLONG_MAX)
  
-+#ifdef __NetBSD__
++#if defined(__NetBSD__)
++
 +#define ULONGLONG_MAX ULLONG_MAX
 +#define LONGLONG_MAX LLONG_MAX
 +#define LONGLONG_MIN LLONG_MIN
++
 +#else
++
  #define ULONGLONG_MAX 0xffffffffffffffffLLU
  #define LONGLONG_MAX 0x7fffffffffffffffLL
- #define LONGLONG_MIN (-LONGLONG_MAX - 1)
-+#endif
- 
- #endif
- 
+ #define LONGLONG_MIN (-LONGLONG_MAX - 1LL)
diff --git a/devel/sgi-stl/patches/patch-ab b/devel/sgi-stl/patches/patch-ab
index 170142975b0..8fd4a9b01a5 100644
--- a/devel/sgi-stl/patches/patch-ab
+++ b/devel/sgi-stl/patches/patch-ab
@@ -1,14 +1,14 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/05/24 05:46:54 jlam Exp $
+$NetBSD: patch-ab,v 1.2 2000/07/12 20:22:44 jlam Exp $
 
---- stl_config.h.orig	Thu Apr 22 20:47:11 1999
-+++ stl_config.h	Sat May 13 02:19:46 2000
-@@ -260,6 +260,9 @@
- #   ifdef _REENTRANT
- #     define __STL_PTHREADS
- #   endif
-+#   ifdef __NetBSD__
-+#     define __STL_LONG_LONG
-+#   endif
+--- stl_config.h.orig	Thu Jun  8 18:10:28 2000
++++ stl_config.h	Wed Jul 12 03:19:11 2000
+@@ -252,6 +252,9 @@
  # endif
  
- # if defined(__SUNPRO_CC) 
+ 
++# ifdef __NetBSD__
++#     define __STL_LONG_LONG
++# endif
+ 
+ # ifdef __GNUC__
+ #   if __GNUC__ == 2 && __GNUC_MINOR__ <= 7
diff --git a/devel/sgi-stl/pkg/PLIST b/devel/sgi-stl/pkg/PLIST
index ffe63d503d1..f0ac7c6160a 100644
--- a/devel/sgi-stl/pkg/PLIST
+++ b/devel/sgi-stl/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/05/24 05:46:54 jlam Exp $
+@comment $NetBSD: PLIST,v 1.2 2000/07/12 20:22:44 jlam Exp $
 include/sgi-stl/algo.h
 include/sgi-stl/algobase.h
 include/sgi-stl/algorithm
@@ -6,6 +6,8 @@ include/sgi-stl/alloc.h
 include/sgi-stl/bitset
 include/sgi-stl/bvector.h
 include/sgi-stl/char_traits.h
+include/sgi-stl/concept_checks.h
+include/sgi-stl/container_concepts.h
 include/sgi-stl/defalloc.h
 include/sgi-stl/deque
 include/sgi-stl/deque.h
@@ -35,6 +37,7 @@ include/sgi-stl/queue
 include/sgi-stl/rope
 include/sgi-stl/rope.h
 include/sgi-stl/ropeimpl.h
+include/sgi-stl/sequence_concepts.h
 include/sgi-stl/set
 include/sgi-stl/set.h
 include/sgi-stl/slist
@@ -48,6 +51,7 @@ include/sgi-stl/stl_alloc.h
 include/sgi-stl/stl_bvector.h
 include/sgi-stl/stl_config.h
 include/sgi-stl/stl_construct.h
+include/sgi-stl/stl_ctraits_fns.h
 include/sgi-stl/stl_deque.h
 include/sgi-stl/stl_exception.h
 include/sgi-stl/stl_function.h