Update to version 4.6:

* support for compilation with gcc3 added
* ANSI conformance fixes
* smaller bugfixes and performance optimisations
   see etc/ChangeLog for a full list

E-mail to MAINTAINER bounces, therefore reset to default value

16 files changed, 311 insertions, 325 deletions

diff --git a/devel/stlport/Makefile b/devel/stlport/Makefile
index 2b39a33141c..22accd35de3 100644
--- a/devel/stlport/Makefile
+++ b/devel/stlport/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.12 2003/05/29 23:14:09 grant Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/05 22:14:18 mrauch Exp $
 
-DISTNAME=	STLport-4.0
-PKGNAME=	stlport-4.0
-PKGREVISION=	2
+DISTNAME=	STLport-4.6
+PKGNAME=	stlport-4.6
 CATEGORIES=	devel
 MASTER_SITES=	http://www.stlport.com/archive/
 
-MAINTAINER=	p99dreyf@criens.u-psud.fr
+MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.stlport.org/
 COMMENT=	Complete C++ standard library
 
@@ -21,15 +20,14 @@ BUILD_DIRS=	${WRKSRC}/src
 MAKE_ENV+=	CXXFLAGS="${CXXFLAGS}"
 MAKEFILE=	gcc-libtool.mak
 
-# A threads implementation isn't necessary when building the library.
-CPPFLAGS+=	-D__STL_NO_THREADS
+PTHREAD_OPTS+=	require
 
 INCDIR=		${PREFIX}/include/stlport
 LIBDIR=		${PREFIX}/lib
 HTMLDIR=	${PREFIX}/share/doc/html/stlport
 
 pre-install:
-	cd ${WRKSRC}/stlport && ${RM} -rf BC50 SC5 config/new_compiler old_hp
+	cd ${WRKSRC}/stlport && ${RM} -rf BC50 config/new_compiler old_hp
 	${FIND} ${WRKSRC}/stlport -name "*.orig" | ${XARGS} ${RM} -f
 
 do-install:
@@ -39,7 +37,6 @@ do-install:
 	${CHMOD} -R a+X ${INCDIR}
 	for lib in							\
 		libstlport_gcc.la					\
-		libstlport_gcc_debug.la					\
 		libstlport_gcc_stldebug.la;				\
 	do								\
 		${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/lib/$${lib} ${LIBDIR}; \
@@ -49,4 +46,5 @@ do-install:
 	cd ${WRKSRC}/doc; ${INSTALL_DATA} *.css *.html ${HTMLDIR}
 	cd ${WRKSRC}/doc; ${INSTALL_DATA} images/* ${HTMLDIR}/images
 
+.include "../../mk/pthread.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/stlport/PLIST b/devel/stlport/PLIST
index c787c17f58a..bfeb78d47d5 100644
--- a/devel/stlport/PLIST
+++ b/devel/stlport/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:26:55 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/01/05 22:14:18 mrauch Exp $
 include/stlport/algorithm
 include/stlport/bitset
 include/stlport/cassert
@@ -9,36 +9,6 @@ include/stlport/climits
 include/stlport/clocale
 include/stlport/cmath
 include/stlport/complex
-include/stlport/config/_epilog.h
-include/stlport/config/_msvc_warnings_off.h
-include/stlport/config/_prolog.h
-include/stlport/config/stl_apcc.h
-include/stlport/config/stl_apple.bak.h
-include/stlport/config/stl_apple.h
-include/stlport/config/stl_as400.h
-include/stlport/config/stl_bc.h
-include/stlport/config/stl_como.h
-include/stlport/config/stl_confix.h
-include/stlport/config/stl_dec.h
-include/stlport/config/stl_dec_vms.h
-include/stlport/config/stl_gcc.h
-include/stlport/config/stl_hpacc.h
-include/stlport/config/stl_ibm.h
-include/stlport/config/stl_intel.h
-include/stlport/config/stl_kai.h
-include/stlport/config/stl_mlc.h
-include/stlport/config/stl_msvc.h
-include/stlport/config/stl_mwerks.h
-include/stlport/config/stl_mycomp.h
-include/stlport/config/stl_sco.h
-include/stlport/config/stl_select_lib.h
-include/stlport/config/stl_sgi.h
-include/stlport/config/stl_sunpro.h
-include/stlport/config/stl_symantec.h
-include/stlport/config/stl_watcom.h
-include/stlport/config/stl_wince.h
-include/stlport/config/stlcomp.h
-include/stlport/config/vc_select_lib.h
 include/stlport/csetjmp
 include/stlport/csignal
 include/stlport/cstdarg
@@ -46,7 +16,6 @@ include/stlport/cstddef
 include/stlport/cstdio
 include/stlport/cstdlib
 include/stlport/cstring
-include/stlport/cstring.h
 include/stlport/ctime
 include/stlport/ctype.h
 include/stlport/cwchar
@@ -54,6 +23,8 @@ include/stlport/cwctype
 include/stlport/deque
 include/stlport/exception
 include/stlport/exception.h
+include/stlport/export
+include/stlport/export.sun
 include/stlport/fstream
 include/stlport/fstream.h
 include/stlport/functional
@@ -77,15 +48,16 @@ include/stlport/map
 include/stlport/math.h
 include/stlport/mem.h
 include/stlport/memory
-include/stlport/memory.new
 include/stlport/mmemory.h
 include/stlport/new
 include/stlport/new.h
 include/stlport/numeric
 include/stlport/ostream
 include/stlport/ostream.h
+include/stlport/pthread.h
 include/stlport/pthread_alloc
 include/stlport/queue
+include/stlport/rlocks.h
 include/stlport/rope
 include/stlport/set
 include/stlport/setjmp.h
@@ -97,25 +69,55 @@ include/stlport/stdarg.h
 include/stlport/stddef.h
 include/stlport/stdexcept
 include/stlport/stdio.h
+include/stlport/stdio_streambuf
+include/stlport/stdiostream.h
 include/stlport/stdlib.h
+include/stlport/stl_user_config.h
+include/stlport/streambuf
+include/stlport/streambuf.h
+include/stlport/string
+include/stlport/string.h
+include/stlport/strstream
+include/stlport/strstream.h
+include/stlport/time.h
+include/stlport/typeinfo
+include/stlport/stl/debug/_debug.c
+include/stlport/stl/debug/_debug.h
+include/stlport/stl/debug/_deque.h
+include/stlport/stl/debug/_hashtable.h
+include/stlport/stl/debug/_iterator.h
+include/stlport/stl/debug/_list.h
+include/stlport/stl/debug/_relops_cont.h
+include/stlport/stl/debug/_relops_hash_cont.h
+include/stlport/stl/debug/_slist.h
+include/stlport/stl/debug/_string.h
+include/stlport/stl/debug/_tree.h
+include/stlport/stl/debug/_vector.h
+include/stlport/stl/_abbrevs.h
 include/stlport/stl/_algo.c
 include/stlport/stl/_algo.h
 include/stlport/stl/_algobase.c
 include/stlport/stl/_algobase.h
 include/stlport/stl/_alloc.c
 include/stlport/stl/_alloc.h
+include/stlport/stl/_alloc_old.h
+include/stlport/stl/_auto_ptr.h
 include/stlport/stl/_bitset.c
 include/stlport/stl/_bitset.h
 include/stlport/stl/_bvector.h
 include/stlport/stl/_check_config.h
+include/stlport/stl/_cmath.h
 include/stlport/stl/_codecvt.h
 include/stlport/stl/_collate.h
 include/stlport/stl/_complex.c
 include/stlport/stl/_complex.h
 include/stlport/stl/_config.h
+include/stlport/stl/_config_compat.h
+include/stlport/stl/_config_compat_post.h
 include/stlport/stl/_construct.h
 include/stlport/stl/_ctraits_fns.h
 include/stlport/stl/_ctype.h
+include/stlport/stl/_cwchar.h
 include/stlport/stl/_deque.c
 include/stlport/stl/_deque.h
 include/stlport/stl/_epilog.h
@@ -123,6 +125,8 @@ include/stlport/stl/_exception.h
 include/stlport/stl/_fstream.c
 include/stlport/stl/_fstream.h
 include/stlport/stl/_function.h
+include/stlport/stl/_function_adaptors.h
+include/stlport/stl/_function_base.h
 include/stlport/stl/_hash_fun.h
 include/stlport/stl/_hash_map.h
 include/stlport/stl/_hash_set.h
@@ -136,43 +140,52 @@ include/stlport/stl/_ios_base.h
 include/stlport/stl/_iosfwd.h
 include/stlport/stl/_istream.c
 include/stlport/stl/_istream.h
+include/stlport/stl/_istreambuf_iterator.h
 include/stlport/stl/_iterator.h
 include/stlport/stl/_iterator_base.h
+include/stlport/stl/_iterator_old.h
 include/stlport/stl/_limits.c
 include/stlport/stl/_limits.h
 include/stlport/stl/_list.c
 include/stlport/stl/_list.h
-include/stlport/stl/_locale.c
 include/stlport/stl/_locale.h
 include/stlport/stl/_map.h
 include/stlport/stl/_messages_facets.h
 include/stlport/stl/_monetary.c
 include/stlport/stl/_monetary.h
+include/stlport/stl/_new.h
 include/stlport/stl/_null_stream.h
+include/stlport/stl/_num_get.c
+include/stlport/stl/_num_get.h
+include/stlport/stl/_num_put.c
+include/stlport/stl/_num_put.h
 include/stlport/stl/_numeric.c
 include/stlport/stl/_numeric.h
-include/stlport/stl/_numeric_facets.c
-include/stlport/stl/_numeric_facets.h
+include/stlport/stl/_numpunct.h
 include/stlport/stl/_ostream.c
 include/stlport/stl/_ostream.h
+include/stlport/stl/_ostreambuf_iterator.h
 include/stlport/stl/_pair.h
 include/stlport/stl/_prolog.h
+include/stlport/stl/_pthread_alloc.c
+include/stlport/stl/_pthread_alloc.h
 include/stlport/stl/_ptrs_specialize.h
 include/stlport/stl/_queue.h
 include/stlport/stl/_range_errors.h
 include/stlport/stl/_raw_storage_iter.h
 include/stlport/stl/_relops.h
 include/stlport/stl/_relops_cont.h
+include/stlport/stl/_relops_hash_cont.h
 include/stlport/stl/_relops_template.h
 include/stlport/stl/_rope.c
 include/stlport/stl/_rope.h
 include/stlport/stl/_set.h
-include/stlport/stl/_set_operators.h
 include/stlport/stl/_site_config.h
 include/stlport/stl/_slist.c
 include/stlport/stl/_slist.h
 include/stlport/stl/_slist_base.c
 include/stlport/stl/_slist_base.h
+include/stlport/stl/_sparc_atomic.h
 include/stlport/stl/_sstream.c
 include/stlport/stl/_sstream.h
 include/stlport/stl/_stack.h
@@ -180,6 +193,7 @@ include/stlport/stl/_stdio_file.h
 include/stlport/stl/_stream_iterator.h
 include/stlport/stl/_streambuf.c
 include/stlport/stl/_streambuf.h
+include/stlport/stl/_streambuf_iterator.h
 include/stlport/stl/_string.c
 include/stlport/stl/_string.h
 include/stlport/stl/_string_fwd.c
@@ -204,19 +218,7 @@ include/stlport/stl/_vector.h
 include/stlport/stl/c_locale.h
 include/stlport/stl/char_traits.h
 include/stlport/stl/concept_checks.h
-include/stlport/stl/container_concepts.h
-include/stlport/stl/debug/_debug.c
-include/stlport/stl/debug/_debug.h
-include/stlport/stl/debug/_deque.h
-include/stlport/stl/debug/_hashtable.h
-include/stlport/stl/debug/_iterator.h
-include/stlport/stl/debug/_list.h
-include/stlport/stl/debug/_slist.h
-include/stlport/stl/debug/_string.h
-include/stlport/stl/debug/_tree.h
-include/stlport/stl/debug/_vector.h
 include/stlport/stl/msl_string.h
-include/stlport/stl/stdio_streambuf
 include/stlport/stl/type_traits.h
 include/stlport/stl/wrappers/_deque.h
 include/stlport/stl/wrappers/_hash_map.h
@@ -227,23 +229,55 @@ include/stlport/stl/wrappers/_mmap.h
 include/stlport/stl/wrappers/_set.h
 include/stlport/stl/wrappers/_slist.h
 include/stlport/stl/wrappers/_vector.h
-include/stlport/stl_user_config.h
-include/stlport/streambuf
-include/stlport/streambuf.h
-include/stlport/string
-include/stlport/string.h
-include/stlport/strstream
-include/stlport/strstream.h
-include/stlport/time.h
-include/stlport/typeinfo
 include/stlport/typeinfo.h
-include/stlport/using/cstring
-include/stlport/using/fstream
+include/stlport/utility
+include/stlport/valarray
+include/stlport/vector
+include/stlport/wchar.h
+include/stlport/wctype.h
+include/stlport/config/_epilog.h
+include/stlport/config/_msvc_warnings_off.h
+include/stlport/config/_prolog.h
+include/stlport/config/stl_apcc.h
+include/stlport/config/stl_apple.h
+include/stlport/config/stl_as400.h
+include/stlport/config/stl_bc.h
+include/stlport/config/stl_como.h
+include/stlport/config/stl_confix.h
+include/stlport/config/stl_cray.h
+include/stlport/config/stl_dec.h
+include/stlport/config/stl_dec_vms.h
+include/stlport/config/stl_dm.h
+include/stlport/config/stl_fujitsu.h
+include/stlport/config/stl_gcc.h
+include/stlport/config/stl_hpacc.h
+include/stlport/config/stl_ibm.h
+include/stlport/config/stl_intel.h
+include/stlport/config/stl_kai.h
+include/stlport/config/stl_mlc.h
+include/stlport/config/stl_msvc.h
+include/stlport/config/stl_sco.h
+include/stlport/config/stl_mwerks.h
+include/stlport/config/stl_mycomp.h
+include/stlport/config/stl_select_lib.h
+include/stlport/config/stl_sgi.h
+include/stlport/config/stl_solaris.h
+include/stlport/config/stl_sunpro.h
+include/stlport/config/stl_symantec.h
+include/stlport/config/stl_watcom.h
+include/stlport/config/stl_wince.h
+include/stlport/config/stlcomp.h
+include/stlport/config/vc_select_lib.h
+include/stlport/config/stl_icc.h
 include/stlport/using/h/fstream.h
 include/stlport/using/h/iomanip.h
 include/stlport/using/h/iostream.h
 include/stlport/using/h/ostream.h
+include/stlport/using/h/streambuf.h
 include/stlport/using/h/strstream.h
+include/stlport/using/cstring
+include/stlport/using/export
+include/stlport/using/fstream
 include/stlport/using/iomanip
 include/stlport/using/ios
 include/stlport/using/iosfwd
@@ -254,17 +288,13 @@ include/stlport/using/ostream
 include/stlport/using/sstream
 include/stlport/using/streambuf
 include/stlport/using/strstream
-include/stlport/utility
-include/stlport/valarray
-include/stlport/vector
-include/stlport/wchar.h
-include/stlport/wctype.h
-include/stlport/wrap_std/complex
-include/stlport/wrap_std/fstream
 include/stlport/wrap_std/h/fstream.h
 include/stlport/wrap_std/h/iostream.h
 include/stlport/wrap_std/h/streambuf.h
 include/stlport/wrap_std/h/strstream.h
+include/stlport/wrap_std/complex
+include/stlport/wrap_std/export
+include/stlport/wrap_std/fstream
 include/stlport/wrap_std/iomanip
 include/stlport/wrap_std/ios
 include/stlport/wrap_std/iosfwd
@@ -278,22 +308,22 @@ include/stlport/wrap_std/strstream
 lib/libstlport_gcc.a
 lib/libstlport_gcc.la
 lib/libstlport_gcc.so
-lib/libstlport_gcc.so.0
-lib/libstlport_gcc.so.0.0
-lib/libstlport_gcc_debug.a
-lib/libstlport_gcc_debug.la
-lib/libstlport_gcc_debug.so
-lib/libstlport_gcc_debug.so.0
-lib/libstlport_gcc_debug.so.0.0
+lib/libstlport_gcc.so.4
+lib/libstlport_gcc.so.4.6
 lib/libstlport_gcc_stldebug.a
 lib/libstlport_gcc_stldebug.la
 lib/libstlport_gcc_stldebug.so
-lib/libstlport_gcc_stldebug.so.0
-lib/libstlport_gcc_stldebug.so.0.0
-share/doc/html/stlport/FAQ.html
+lib/libstlport_gcc_stldebug.so.4
+lib/libstlport_gcc_stldebug.so.4.6
+share/doc/html/stlport/images/black.gif
+share/doc/html/stlport/images/stl_logo_doc.gif
+share/doc/html/stlport/images/t_doc2.gif
+share/doc/html/stlport/images/trans.gif
+share/doc/html/stlport/doc.css
 share/doc/html/stlport/README.BC.html
 share/doc/html/stlport/README.CW.html
 share/doc/html/stlport/README.DEC.html
+share/doc/html/stlport/README.MPW.html
 share/doc/html/stlport/README.VC++.html
 share/doc/html/stlport/README.aCC.html
 share/doc/html/stlport/README.gcc.html
@@ -305,33 +335,22 @@ share/doc/html/stlport/README.xlC.html
 share/doc/html/stlport/auto_configure.html
 share/doc/html/stlport/bug_report.html
 share/doc/html/stlport/buglist.html
-share/doc/html/stlport/build.html
-share/doc/html/stlport/build_nosgi.html
 share/doc/html/stlport/compiler_readmes.html
 share/doc/html/stlport/configure.html
-share/doc/html/stlport/contributors.html
+share/doc/html/stlport/cvs.html
 share/doc/html/stlport/copyrights.html
 share/doc/html/stlport/debug_mode.html
 share/doc/html/stlport/eh_testsuite.html
 share/doc/html/stlport/exception_safety.html
-share/doc/html/stlport/extensions.html
-share/doc/html/stlport/getting_started.html
-share/doc/html/stlport/images/blue.gif
-share/doc/html/stlport/images/logo.jpg
-share/doc/html/stlport/images/logo_1.jpg
 share/doc/html/stlport/index.html
 share/doc/html/stlport/install.html
 share/doc/html/stlport/license.html
-share/doc/html/stlport/major_modes.html
 share/doc/html/stlport/platforms.html
-share/doc/html/stlport/prepare.html
 share/doc/html/stlport/projects.html
 share/doc/html/stlport/release_notes.html
 share/doc/html/stlport/select_io.html
 share/doc/html/stlport/sgi_stl.html
 share/doc/html/stlport/story.html
-share/doc/html/stlport/style.css
-share/doc/html/stlport/test.html
 share/doc/html/stlport/testsuite.html
 share/doc/html/stlport/thanks.html
 share/doc/html/stlport/use_stlport.html
diff --git a/devel/stlport/distinfo b/devel/stlport/distinfo
index 4fb4f7e472d..1b1a2707e91 100644
--- a/devel/stlport/distinfo
+++ b/devel/stlport/distinfo
@@ -1,13 +1,9 @@
-$NetBSD: distinfo,v 1.5 2002/09/30 23:33:54 jlam Exp $
+$NetBSD: distinfo,v 1.6 2004/01/05 22:14:18 mrauch Exp $
 
-SHA1 (STLport-4.0.tar.gz) = 2b13928768d2e9320f5f6f9dd4718e2ac842b637
-Size (STLport-4.0.tar.gz) = 695790 bytes
-SHA1 (patch-aa) = 8a4f6ef6da001250d92618dea6f5eee0c11c9204
-SHA1 (patch-ab) = 03e790d6c4a666e2929b1fe127be11df9eb97092
-SHA1 (patch-ac) = 889b64fe621d4c1f9e1ab9e0744a9b2daa6cad27
-SHA1 (patch-ad) = fc016c373fcb839c7fe3a7812e7a8d17d290c40a
-SHA1 (patch-ae) = d5cad7ad64e5d9d3aca082a414d3c1d706cc43ae
-SHA1 (patch-af) = c4b069e0d0ac583518111ac40f80567212476e3c
-SHA1 (patch-ag) = 382b89e936931bd0316ccf4e2f13ecdea574fb7f
-SHA1 (patch-ah) = ae45049002bf0cfbeb2805e3cb372ad52c88626d
-SHA1 (patch-ai) = 77f3f271495d34bb867c3da679d64da167eab0f1
+SHA1 (STLport-4.6.tar.gz) = 55401b648bebc0b7b6b4e3d7b4e420d22c358af9
+Size (STLport-4.6.tar.gz) = 756708 bytes
+SHA1 (patch-aa) = 1fa541c702ac3edf67f9085343101fddd860409b
+SHA1 (patch-aj) = 67dd73dcf5a41dd2da38e58363a05f7f54709124
+SHA1 (patch-ak) = ce55c80bc369bf9a8c20d751293197b71fbf4ed8
+SHA1 (patch-al) = d8331d464c810ea8cdeba5cb3fe1e34dea707761
+SHA1 (patch-am) = 01a50206ec73f482c1e2ed7fee2733d7f422de5a
diff --git a/devel/stlport/patches/patch-aa b/devel/stlport/patches/patch-aa
index f271c9547bb..dc14b342b9c 100644
--- a/devel/stlport/patches/patch-aa
+++ b/devel/stlport/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2002/09/30 23:33:54 jlam Exp $
+$NetBSD: patch-aa,v 1.4 2004/01/05 22:14:18 mrauch Exp $
 
---- src/gcc-libtool.mak.orig	Mon Sep 30 15:55:13 2002
+--- src/gcc-libtool.mak.orig	2004-01-04 10:44:33.000000000 +0100
 +++ src/gcc-libtool.mak
-@@ -0,0 +1,88 @@
+@@ -0,0 +1,61 @@
 +#
 +# Note : this makefile is for gcc-2.95 and later !
 +#
@@ -10,9 +10,9 @@ $NetBSD: patch-aa,v 1.3 2002/09/30 23:33:54 jlam Exp $
 +#
 +# compiler
 +#
-+#LIBTOOL = libtool
-+#CC = gcc
-+#CXX = c++
++LIBTOOL ?= libtool
++CC ?= gcc 
++CXX ?= c++ -fexceptions
 +
 +#
 +# Basename for libraries
@@ -23,71 +23,44 @@ $NetBSD: patch-aa,v 1.3 2002/09/30 23:33:54 jlam Exp $
 +# guts for common stuff
 +#
 +#
-+LINK=$(LIBTOOL) $(CXX) -rpath $(PREFIX)/lib -version-info 0:0 -o
++LINK=$(LIBTOOL) $(CXX) $(LDFLAGS) $(PTHREAD_LDFLAGS) -o
++# 2.95 flag
++DYN_LINK=$(LIBTOOL) $(CXX) $(LDFLAGS) $(PTHREAD_LDFLAGS) -rpath $(PREFIX)/lib -version-info $(VERSION_MAJOR):$(VERSION_MINOR) -shared -o
 +
 +OBJEXT=lo
-+STEXT=la
-+MV=mv -f
++DYNEXT=la
++STEXT=a
 +RM=rm -rf
 +PATH_SEP=/
 +MKDIR=mkdir -p
 +COMP=GCC$(ARCH)
++INSTALL_STEP = install_unix 
 +
-+# libtool will handle also creating the shared library alongside the static one
-+all: all_static
++all:  all_dynamic all_static 
 +
 +include common_macros.mak
 +
-+SRCDIR = ../../..
-+
 +WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized -ftemplate-depth-32
 +
-+CXXFLAGS_COMMON = ${CXXFLAGS} ${CPPFLAGS} -I${SRCDIR} -I${SRCDIR}/${STLPORT_DIR} ${WARNING_FLAGS}
++CXXFLAGS_COMMON = ${CXXFLAGS} ${CPPFLAGS} $(PTHREAD_CFLAGS) -I${STLPORT_DIR} ${WARNING_FLAGS}
 +
 +CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2
++CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2
 +
-+CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
++CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -O -g
++CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -O -g
 +
-+CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D__STL_DEBUG
++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
 +
-+LDFLAGS_COMMON = ${LDFLAGS}
++include common_percent_rules.mak
++include common_rules.mak
 +
-+LDFLAGS_RELEASE_static = ${LDFLAGS_COMMON}
 +
-+LDFLAGS_DEBUG_static = ${LDFLAGS_COMMON}
++#install: all
++#	cp -p $(LIB_TARGET) ${D_LIB_TARGET} ../lib
 +
-+LDFLAGS_STLDEBUG_static = ${LDFLAGS_COMMON}
++#%.s: %.cpp
++#	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
 +
-+include common_rules.mak
 +
-+.SUFFIXES: .cpp .c .o .lo .so .a
-+
-+$(RELEASE_OBJDIR_static)/%.lo: %.cpp
-+	cd $(RELEASE_OBJDIR_static) && \
-+		$(LIBTOOL) $(CXX) $(CXXFLAGS_RELEASE_static) -c $(SRCDIR)/$<
-+$(RELEASE_OBJDIR_static)/%.lo: %.c
-+	cd $(RELEASE_OBJDIR_static) && \
-+		$(LIBTOOL) $(CC) $(CXXFLAGS_RELEASE_static) -c $(SRCDIR)/$<
-+$(RELEASE_OBJDIR_static)/%.i : %.cpp
-+	cd $(RELEASE_OBJDIR_static) && \
-+		$(LIBTOOL) $(CXX) $(CXXFLAGS_RELEASE_static) -E $(SRCDIR)/$<
-+
-+$(DEBUG_OBJDIR_static)/%.lo : %.cpp
-+	cd $(DEBUG_OBJDIR_static) && \
-+		$(LIBTOOL) $(CXX) $(CXXFLAGS_DEBUG_static) -c $(SRCDIR)/$<
-+$(DEBUG_OBJDIR_static)/%.lo : %.c
-+	cd $(DEBUG_OBJDIR_static) && \
-+		$(LIBTOOL) $(CC) $(CXXFLAGS_DEBUG_static) -c $(SRCDIR)/$<
-+$(DEBUG_OBJDIR_static)/%.i : %.cpp
-+	cd $(DEBUG_OBJDIR_static) && \
-+		$(LIBTOOL) $(CXX) $(CXXFLAGS_DEBUG_static) -E $(SRCDIR)/$<
-+
-+$(STLDEBUG_OBJDIR_static)/%.lo : %.cpp
-+	cd $(STLDEBUG_OBJDIR_static) && \
-+		$(LIBTOOL) $(CXX) $(CXXFLAGS_STLDEBUG_static) -c $(SRCDIR)/$<
-+$(STLDEBUG_OBJDIR_static)/%.lo : %.c
-+	cd $(STLDEBUG_OBJDIR_static) && \
-+		$(LIBTOOL) $(CC) $(CXXFLAGS_STLDEBUG_static) -c $(SRCDIR)/$<
-+$(STLDEBUG_OBJDIR_static)/%.i : %.cpp
-+	cd $(STLDEBUG_OBJDIR_static) && \
-+		$(LIBTOOL) $(CXX) $(CXXFLAGS_STLDEBUG_static) -E $(SRCDIR)/$<
diff --git a/devel/stlport/patches/patch-ab b/devel/stlport/patches/patch-ab
deleted file mode 100644
index 1164fb841e6..00000000000
--- a/devel/stlport/patches/patch-ab
+++ /dev/null
@@ -1,57 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/12/27 17:37:51 jlam Exp $
-
---- src/num_put_float.cpp.orig	Thu Jul 13 21:53:26 2000
-+++ src/num_put_float.cpp
-@@ -43,13 +43,15 @@
- 
- # ifdef __STL_UNIX
- 
-+# if !defined(__NetBSD__)  // values.h not supplied with NetBSD
- # include <values.h>
-+# endif
- 
- # if defined (__sun) 
- #  include <floatingpoint.h>
- # endif
- 
--# if !defined(__STL_USE_GLIBC) && !defined(__FreeBSD__)   // dwa 1/10/00 - nan.h not supplied with gcc
-+# if !defined(__STL_USE_GLIBC) && !defined(__FreeBSD__) && !defined(__NetBSD__)   // dwa 1/10/00 - nan.h not supplied with gcc
- // DEC & Solaris need this
- #  include <nan.h>
- # endif
-@@ -95,7 +97,7 @@
- # endif
-   inline bool _Stl_is_inf(double x)        { return isinf(x); }
-   inline bool _Stl_is_neg_inf(double x)    { return isinf(x) < 0; }
--#elif defined(__unix) && !defined(__FreeBSD__) /* (__sgi) || defined (__sun) IRIX , Solaris, others ? */
-+#elif defined(__unix) && !defined(__FreeBSD__) && !defined(__NetBSD__) /* (__sgi) || defined (__sun) IRIX , Solaris, others ? */
-   inline bool _Stl_is_nan_or_inf(double x) { return IsNANorINF(x); }
-   inline bool _Stl_is_inf(double x)        { return IsNANorINF(x) && IsINF(x); }
-   inline bool _Stl_is_neg_inf(double x)    { return (IsINF(x)) && (x < 0.0); }
-@@ -124,7 +126,7 @@
-   bool _Stl_is_inf(double x)        { return !isfinite(x); }
-   bool _Stl_is_neg_inf(double x)    { return !isfinite(x) && signbit(x); }
-   bool _Stl_is_neg_nan(double x)    { return isnan(x) && signbit(x); }
--#elif defined (__FreeBSD__)
-+#elif defined (__FreeBSD__) || defined (__NetBSD__)
-  inline bool _Stl_is_nan_or_inf(double x) { return !finite(x); }
-  inline bool _Stl_is_inf(double x)        {
-    return _Stl_is_nan_or_inf(x) && ! isnan(x);
-@@ -193,7 +195,7 @@
-      { return _ldfcvt(*(long_double*)&x, n, pt, sign); }
- #  endif
- 
--#elif defined (__unix)  && !defined(__FreeBSD__)/* defined(__sgi) IRIX */
-+#elif defined (__unix)  && !defined(__FreeBSD__) && !defined(__NetBSD__) /* defined(__sgi) IRIX */
-   inline char* _Stl_ecvtR(double x, int n, int* pt, int* sign, char* buf)
-     { return ecvt_r(x, n, pt, sign, buf); }
-   inline char* _Stl_fcvtR(double x, int n, int* pt, int* sign, char* buf)
-@@ -203,7 +205,7 @@
-   inline char* _Stl_qfcvtR(long double x, int n, int* pt, int* sign, char* buf)
-     { return qfcvt_r(x, n, pt, sign, buf); }
- 
--#elif defined (__FreeBSD__)
-+#elif defined (__FreeBSD__) || defined (__NetBSD__)
- 
- /*
-  * Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
diff --git a/devel/stlport/patches/patch-ac b/devel/stlport/patches/patch-ac
deleted file mode 100644
index 83c719d7f7a..00000000000
--- a/devel/stlport/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2000/12/27 17:37:51 jlam Exp $
-
---- stlport/exception.orig	Thu Jul 13 21:53:26 2000
-+++ stlport/exception
-@@ -42,7 +42,9 @@
- #  undef __STL_INCOMPLETE_EXCEPTION_HEADER
- # endif
- 
--#  if defined (__GNUC__) && (__GNUC_MINOR__ >= 8 )
-+#  if defined (__NetBSD__)
-+#    include <g++/exception>
-+#  elif defined (__GNUC__) && (__GNUC_MINOR__ >= 8 )
- #    include <../include/exception>
- #  else
- #    include __STL_NATIVE_HEADER(exception)
diff --git a/devel/stlport/patches/patch-ad b/devel/stlport/patches/patch-ad
deleted file mode 100644
index 3e548c6222c..00000000000
--- a/devel/stlport/patches/patch-ad
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2000/12/27 17:37:51 jlam Exp $
-
---- stlport/new.orig	Thu Jul 13 21:53:26 2000
-+++ stlport/new
-@@ -43,7 +43,9 @@
- #endif
- 
- # if !defined (__STL_NO_NEW_NEW_HEADER)
--#  if ( defined (__GNUC__) && (__GNUC_MINOR__ >= 8 )) || ( defined (__MVS__) && ! defined (__GNUC__))
-+#  if defined (__NetBSD__)
-+#   include <g++/new>
-+#  elif ( defined (__GNUC__) && (__GNUC_MINOR__ >= 8 )) || ( defined (__MVS__) && ! defined (__GNUC__))
- #    include __STL_NATIVE_C_HEADER(new)
- #   else
- #    include __STL_NATIVE_HEADER(new)
diff --git a/devel/stlport/patches/patch-ae b/devel/stlport/patches/patch-ae
deleted file mode 100644
index 0ec243bdfe4..00000000000
--- a/devel/stlport/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2000/12/27 17:37:51 jlam Exp $
-
---- stlport/stl/_stdio_file.h.orig	Thu Jul 13 21:53:26 2000
-+++ stlport/stl/_stdio_file.h
-@@ -116,7 +116,7 @@
- 
- # define __STL_FILE_I_O_IDENTICAL 1
- 
--#elif defined (__CYGWIN__) || defined(__FreeBSD__)
-+#elif defined (__CYGWIN__) || defined(__FreeBSD__) || defined(__NetBSD__)
- 
- inline int   _FILE_fd(const FILE& __f) { return __f._file; }
- inline char* _FILE_I_begin(const FILE& __f) { return (char*) __f._bf._base; }
diff --git a/devel/stlport/patches/patch-af b/devel/stlport/patches/patch-af
deleted file mode 100644
index 929f437f426..00000000000
--- a/devel/stlport/patches/patch-af
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2000/12/27 17:37:51 jlam Exp $
-
---- stlport/stl/c_locale.h.orig	Thu Jul 13 21:53:26 2000
-+++ stlport/stl/c_locale.h
-@@ -280,6 +280,17 @@
- # define _Locale_PRINT _CTYPE_R
- # define _Locale_ALPHA _CTYPE_A
- 
-+# elif defined (__NetBSD__)
-+
-+# define _Locale_CNTRL _C
-+# define _Locale_UPPER _U
-+# define _Locale_LOWER _L
-+# define _Locale_DIGIT _N
-+# define _Locale_XDIGIT (_N | _X)
-+# define _Locale_PUNCT _P
-+# define _Locale_SPACE _S
-+# define _Locale_PRINT (_P |_U |_L |_N | _B)
-+# define _Locale_ALPHA (_U | _L)
- 
- # elif defined(__STL_USE_GLIBC) /* linux, using the gnu compiler */
- 
diff --git a/devel/stlport/patches/patch-ag b/devel/stlport/patches/patch-ag
deleted file mode 100644
index 63da87ea3d1..00000000000
--- a/devel/stlport/patches/patch-ag
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2002/08/25 19:22:41 jlam Exp $
---- stlport/typeinfo.orig	Sat Nov 10 19:38:11 2001
-+++ stlport/typeinfo	Sat Nov 10 19:39:12 2001
-@@ -23,7 +23,9 @@
- 
- # ifndef __STL_NO_TYPEINFO
- 
--# if defined (__GNUC__) && (__GNUC_MINOR__ > 7)
-+# if defined (__NetBSD__)
-+#  include <g++/typeinfo>
-+# elif defined (__GNUC__) && (__GNUC_MINOR__ > 7)
- #  include <../include/typeinfo>
- # elif defined (__STL_NO_NEW_NEW_HEADER)
- #  include __STL_NATIVE_HEADER(typeinfo.h)
diff --git a/devel/stlport/patches/patch-ah b/devel/stlport/patches/patch-ah
deleted file mode 100644
index 57814c5546c..00000000000
--- a/devel/stlport/patches/patch-ah
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2002/08/25 19:22:41 jlam Exp $
---- stlport/stl/_config.h.orig	Sat Nov 10 19:51:04 2001
-+++ stlport/stl/_config.h	Sat Nov 10 19:51:28 2001
-@@ -174,7 +174,7 @@
- # endif
- 
- /* Operating system recognition (basic) */
--# if defined (__unix) || defined (__linux__) || defined (__QNX__) || defined (_AIX)
-+# if defined (__unix) || defined (__linux__) || defined (__QNX__) || defined (_AIX) || defined(__NetBSD__)
- #  define __STL_UNIX 1
- #  if defined (__linux__) && ! defined (__STL_USE_GLIBC)
- #   define __STL_USE_GLIBC 1
diff --git a/devel/stlport/patches/patch-ai b/devel/stlport/patches/patch-ai
deleted file mode 100644
index 91ee8b3b2c5..00000000000
--- a/devel/stlport/patches/patch-ai
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2002/01/08 21:14:26 mrauch Exp $
-
---- stlport/new.h.orig	Tue Dec 25 11:31:27 2001
-+++ stlport/new.h
-@@ -22,7 +22,9 @@
- # endif
- 
- # ifndef __STL_WINCE
--# if ( defined (__GNUC__) && (__GNUC_MINOR__ >= 8 )) || ( defined (__MVS__) && ! defined (__GNUC__))
-+# if defined(__NetBSD__)
-+#  include <g++/new.h>
-+# elif ( defined (__GNUC__) && (__GNUC_MINOR__ >= 8 )) || ( defined (__MVS__) && ! defined (__GNUC__))
- #   include __STL_NATIVE_C_HEADER(new.h)
- # elif defined (__BORLANDC__)
- #  include <new.>
diff --git a/devel/stlport/patches/patch-aj b/devel/stlport/patches/patch-aj
new file mode 100644
index 00000000000..684cf2c2c65
--- /dev/null
+++ b/devel/stlport/patches/patch-aj
@@ -0,0 +1,22 @@
+$NetBSD: patch-aj,v 1.1 2004/01/05 22:14:19 mrauch Exp $
+
+--- stlport/config/stl_gcc.h.orig	Mon Feb 24 01:51:01 2003
++++ stlport/config/stl_gcc.h
+@@ -268,7 +268,7 @@ typedef unsigned int wint_t;
+ #   define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward
+ #  else
+ #   if defined(__GNUC_PATCHLEVEL__) && (__GNUC_PATCHLEVEL__ > 0)
+-#     define _STLP_NATIVE_INCLUDE_PATH ../__GNUC__.__GNUC_MINOR__.__GNUC_PATCHLEVEL__
++#     define _STLP_NATIVE_INCLUDE_PATH ../g++
+ #     define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../__GNUC__.__GNUC_MINOR__.__GNUC_PATCHLEVEL__/backward
+ #   else
+ #     define _STLP_NATIVE_INCLUDE_PATH ../__GNUC__.__GNUC_MINOR__
+@@ -330,7 +330,7 @@ typedef unsigned int wint_t;
+ #   endif
+ # else
+ // azov
+-#   ifdef __Lynx__ 
++#   if defined __Lynx__ || defined __NetBSD__
+ #     define _STLP_NATIVE_CPP_RUNTIME_INCLUDE_PATH _STLP_NATIVE_INCLUDE_PATH
+ #   else
+ #    if (__GNUC__ > 2) || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)
diff --git a/devel/stlport/patches/patch-ak b/devel/stlport/patches/patch-ak
new file mode 100644
index 00000000000..0ca6b3c8d2d
--- /dev/null
+++ b/devel/stlport/patches/patch-ak
@@ -0,0 +1,38 @@
+$NetBSD: patch-ak,v 1.1 2004/01/05 22:14:19 mrauch Exp $
+
+--- src/common_macros.mak.orig	2003-11-01 00:52:05.000000000 +0100
++++ src/common_macros.mak
+@@ -34,16 +34,16 @@ STLDEBUG_OBJDIR_static=$(OBJDIR)$(PATH_S
+ RELEASE_OBJDIR_staticx=$(OBJDIR)$(PATH_SEP)Releasex
+ DEBUG_OBJDIR_staticx=$(OBJDIR)$(PATH_SEP)Debugx
+ STLDEBUG_OBJDIR_staticx=$(OBJDIR)$(PATH_SEP)DebugSTLx
+-RELEASE_OBJDIR_dynamic=$(OBJDIR)$(PATH_SEP)ReleaseD
+-DEBUG_OBJDIR_dynamic=$(OBJDIR)$(PATH_SEP)DebugD
+-STLDEBUG_OBJDIR_dynamic=$(OBJDIR)$(PATH_SEP)DebugSTLD
++RELEASE_OBJDIR_dynamic=$(OBJDIR)$(PATH_SEP)Release
++DEBUG_OBJDIR_dynamic=$(OBJDIR)$(PATH_SEP)Debug
++STLDEBUG_OBJDIR_dynamic=$(OBJDIR)$(PATH_SEP)DebugSTL
+ 
+ #
+ # By default on UNIX, STLport headers go into /usr/local/include/stlport,
+ # and libraries go into /usr/local/lib. Please override any of them if desired. 
+ #
+ 
+-INSTALLDIR=/usr/local
++INSTALLDIR=$(PREFIX)
+ # INSTALLDIR=/tmp
+ INSTALLDIR_INC=$(INSTALLDIR)/include/stlport
+ INSTALLDIR_LIB=$(INSTALLDIR)/lib
+@@ -62,9 +62,9 @@ RELEASE_NAME=$(LIB_BASENAME)
+ DEBUG_NAME=$(LIB_BASENAME)_debug
+ STLDEBUG_NAME=$(LIB_BASENAME)_stldebug
+ 
+-RELEASE_DYNLIB=$(RELEASE_NAME).$(DYNEXT)$(DYNAMIC_SUFFIX)
+-DEBUG_DYNLIB=$(DEBUG_NAME).$(DYNEXT)$(DYNAMIC_SUFFIX)
+-STLDEBUG_DYNLIB=$(STLDEBUG_NAME).$(DYNEXT)$(DYNAMIC_SUFFIX)
++RELEASE_DYNLIB=$(RELEASE_NAME).$(DYNEXT)
++DEBUG_DYNLIB=$(DEBUG_NAME).$(DYNEXT)
++STLDEBUG_DYNLIB=$(STLDEBUG_NAME).$(DYNEXT)
+ 
+ RELEASE_DYNLIB_SONAME=$(RELEASE_NAME).$(DYNEXT)$(VERSION_SUFFIX)
+ DEBUG_DYNLIB_SONAME=$(DEBUG_NAME).$(DYNEXT)$(VERSION_SUFFIX)
diff --git a/devel/stlport/patches/patch-al b/devel/stlport/patches/patch-al
new file mode 100644
index 00000000000..9498e8f6151
--- /dev/null
+++ b/devel/stlport/patches/patch-al
@@ -0,0 +1,81 @@
+$NetBSD: patch-al,v 1.1 2004/01/05 22:14:19 mrauch Exp $
+
+--- src/common_percent_rules.mak.orig	2001-09-30 22:11:31.000000000 +0200
++++ src/common_percent_rules.mak
+@@ -1,46 +1,46 @@
+ 
+ .SUFFIXES: .cpp .c .o .so .a
+ 
+-$(RELEASE_OBJDIR_static)/%.o: %.cpp
+-	$(CXX) $(CXXFLAGS_RELEASE_static) $< -c -o $@
+-$(RELEASE_OBJDIR_static)/%.o: %.c
+-	$(CC) $(CXXFLAGS_RELEASE_static) $< -c -o $@
++$(RELEASE_OBJDIR_static)/%.lo: %.cpp
++	$(LIBTOOL) $(CXX) $(CXXFLAGS_RELEASE_static) $< -c -o $@
++$(RELEASE_OBJDIR_static)/%.lo: %.c
++	$(LIBTOOL) $(CC) $(CXXFLAGS_RELEASE_static) $< -c -o $@
+ $(RELEASE_OBJDIR_static)/%.i : %.cpp
+-	$(CXX) $(CXXFLAGS_RELEASE_static) $< -E  $@
++	$(LIBTOOL) $(CXX) $(CXXFLAGS_RELEASE_static) $< -E  $@
+ 
+-$(RELEASE_OBJDIR_dynamic)/%.o : %.cpp
+-	$(CXX) $(CXXFLAGS_RELEASE_dynamic) $< -c -o $@
+-$(RELEASE_OBJDIR_dynamic)/%.o : %.c
+-	$(CC) $(CXXFLAGS_RELEASE_dynamic) $< -c -o $@
++$(RELEASE_OBJDIR_dynamic)/%.lo : %.cpp
++	$(LIBTOOL) $(CXX) $(CXXFLAGS_RELEASE_dynamic) $< -c -o $@
++$(RELEASE_OBJDIR_dynamic)/%.lo : %.c
++	$(LIBTOOL) $(CC) $(CXXFLAGS_RELEASE_dynamic) $< -c -o $@
+ $(RELEASE_OBJDIR_dynamic)/%.i : %.cpp
+-	$(CXX) $(CXXFLAGS_RELEASE_dynamic) $< -E  $@
++	$(LIBTOOL) $(CXX) $(CXXFLAGS_RELEASE_dynamic) $< -E  $@
+ 
+-$(DEBUG_OBJDIR_static)/%.o : %.cpp
+-	$(CXX) $(CXXFLAGS_DEBUG_static) $< -c -o $@
+-$(DEBUG_OBJDIR_static)/%.o : %.c
+-	$(CC) $(CXXFLAGS_DEBUG_static) $< -c -o $@
++$(DEBUG_OBJDIR_static)/%.lo : %.cpp
++	$(LIBTOOL) $(CXX) $(CXXFLAGS_DEBUG_static) $< -c -o $@
++$(DEBUG_OBJDIR_static)/%.lo : %.c
++	$(LIBTOOL) $(CC) $(CXXFLAGS_DEBUG_static) $< -c -o $@
+ $(DEBUG_OBJDIR_static)/%.i : %.cpp
+-	$(CXX) $(CXXFLAGS_DEBUG_static) $< -E  $@
++	$(LIBTOOL) $(CXX) $(CXXFLAGS_DEBUG_static) $< -E  $@
+ 
+-$(DEBUG_OBJDIR_dynamic)/%.o : %.cpp
+-	$(CXX) $(CXXFLAGS_DEBUG_dynamic) $< -c -o $@
+-$(DEBUG_OBJDIR_dynamic)/%.o : %.c
+-	$(CC) $(CXXFLAGS_DEBUG_dynamic) $< -c -o $@
++$(DEBUG_OBJDIR_dynamic)/%.lo : %.cpp
++	$(LIBTOOL) $(CXX) $(CXXFLAGS_DEBUG_dynamic) $< -c -o $@
++$(DEBUG_OBJDIR_dynamic)/%.lo : %.c
++	$(LIBTOOL) $(CC) $(CXXFLAGS_DEBUG_dynamic) $< -c -o $@
+ $(DEBUG_OBJDIR_dynamic)/%.i : %.cpp
+-	$(CXX) $(CXXFLAGS_DEBUG_dynamic) $< -E  $@
++	$(LIBTOOL) $(CXX) $(CXXFLAGS_DEBUG_dynamic) $< -E  $@
+ 
+-$(STLDEBUG_OBJDIR_static)/%.o : %.cpp
+-	$(CXX) $(CXXFLAGS_STLDEBUG_static) $< -c -o $@
+-$(STLDEBUG_OBJDIR_static)/%.o : %.c
+-	$(CC) $(CXXFLAGS_STLDEBUG_static) $< -c -o $@
++$(STLDEBUG_OBJDIR_static)/%.lo : %.cpp
++	$(LIBTOOL) $(CXX) $(CXXFLAGS_STLDEBUG_static) $< -c -o $@
++$(STLDEBUG_OBJDIR_static)/%.lo : %.c
++	$(LIBTOOL) $(CC) $(CXXFLAGS_STLDEBUG_static) $< -c -o $@
+ $(STLDEBUG_OBJDIR_static)/%.i : %.cpp
+-	$(CXX) $(CXXFLAGS_STLDEBUG_static) $< -E  $@
++	$(LIBTOOL) $(CXX) $(CXXFLAGS_STLDEBUG_static) $< -E  $@
+ 
+-$(STLDEBUG_OBJDIR_dynamic)/%.o : %.cpp
+-	$(CXX) $(CXXFLAGS_STLDEBUG_dynamic) $< -c -o $@
+-$(STLDEBUG_OBJDIR_dynamic)/%.o : %.c
+-	$(CC) $(CXXFLAGS_STLDEBUG_dynamic) $< -c -o $@
++$(STLDEBUG_OBJDIR_dynamic)/%.lo : %.cpp
++	$(LIBTOOL) $(CXX) $(CXXFLAGS_STLDEBUG_dynamic) $< -c -o $@
++$(STLDEBUG_OBJDIR_dynamic)/%.lo : %.c
++	$(LIBTOOL) $(CC) $(CXXFLAGS_STLDEBUG_dynamic) $< -c -o $@
+ $(STLDEBUG_OBJDIR_dynamic)/%.i : %.cpp
+-	$(CXX) $(CXXFLAGS_STLDEBUG_dynamic) $< -E  $@
++	$(LIBTOOL) $(CXX) $(CXXFLAGS_STLDEBUG_dynamic) $< -E  $@
+ 
+ 
diff --git a/devel/stlport/patches/patch-am b/devel/stlport/patches/patch-am
new file mode 100644
index 00000000000..df5657bae10
--- /dev/null
+++ b/devel/stlport/patches/patch-am
@@ -0,0 +1,22 @@
+$NetBSD: patch-am,v 1.1 2004/01/05 22:14:19 mrauch Exp $
+
+--- stlport/stl/_threads.h.orig	2003-10-22 19:58:59.000000000 +0200
++++ stlport/stl/_threads.h
+@@ -393,7 +393,7 @@ class _STLP_CLASS_DECLSPEC _STLP_mutex_R
+ #  if defined(_STLP_UITHREADS)
+         ,_id( __STATIC_CAST(thread_t,-1) )
+ #  elif defined(_STLP_PTHREADS)
+-#   if !defined(__FreeBSD__) && !defined(__DECCXX)
++#   if !defined(__FreeBSD__) && !defined(__DECCXX) && !defined(__NetBSD__)
+         ,_id( __STATIC_CAST(pthread_t,-1) )
+ #   else
+         ,_id( __STATIC_CAST(pthread_t,0) )
+@@ -434,7 +434,7 @@ class _STLP_CLASS_DECLSPEC _STLP_mutex_R
+ #  if defined(_STLP_UITHREADS)
+         _id = __STATIC_CAST(thread_t,-1);
+ #  elif defined(_STLP_PTHREADS)
+-#   if !defined(__FreeBSD__) && !defined(__DECCXX)
++#   if !defined(__FreeBSD__) && !defined(__DECCXX) && !defined(__NetBSD__)
+         _id =  __STATIC_CAST(pthread_t,-1);
+ #   else
+         _id =  __STATIC_CAST(pthread_t,0);