Upgrade to 5.1.4 and unbreak.

Changelog at
<https://sourceforge.net/project/shownotes.php?group_id=146814&release_id=544939>

PR:		ports/118372
Submitted by:	Vaclav Haisman <v.haisman (at) sh.cvut.cz>

21 files changed, 439 insertions, 767 deletions

diff --git a/devel/stlport/Makefile b/devel/stlport/Makefile
index 7ecd2dc1c865..a800fdfee2a0 100644
--- a/devel/stlport/Makefile
+++ b/devel/stlport/Makefile
@@ -7,86 +7,80 @@
 #
 
 PORTNAME=	stlport
-PORTVERSION=	4.6.2
-PORTREVISION?=	0
+PORTVERSION=	5.1.4
 CATEGORIES=	devel
-MASTER_SITES=	http://www.stlport.com/archive/ \
-		SF
+MASTER_SITES=	SF
 PKGNAMESUFFIX=	-${COMPILER}
 DISTNAME=	STLport-${PORTVERSION:S/.b/-b/}
 
-MAINTAINER?=	ports@FreeBSD.org
-COMMENT?=	Adaptation of SGI's Standard Template Library
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Adaptation of SGI\'s Standard Template Library
 
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "alpha" 
-BROKEN=		"Segfault during build on alpha"
-.endif
+USE_BZIP2=	yes
 
 .if !exists(/usr/include/wchar.h)
-BROKEN=		"Requires /usr/include/wchar.h for compilation"
+BROKEN=		Requires /usr/include/wchar.h for compilation
 .endif
 
-.if ${OSVERSION} >= 700042
-BROKEN=		Does not compile with GCC 4.2
-.endif
-
-WRKSRC=		${WRKDIR}/STLport-${PORTVERSION:S/.b/b/}/src
+WRKSRC=		${WRKDIR}/STLport-${PORTVERSION:S/.b/b/}/build/lib
 PATCH_WRKSRC=	${WRKDIR}/STLport-${PORTVERSION:S/.b/b/}
 USE_GMAKE=	yes
 COMPILER?=	gcc
-MAKEFILE=	${COMPILER}-freebsd.mak
+MAKEFILE=	${COMPILER}.mak
+ALL_TARGET=	install
 MAKE_ENV+=	CC=${CC} CXX=${CXX}
-MAKE_ARGS+=	INSTALLDIR=${PREFIX} PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
+MAKE_ARGS+=	INSTALLDIR=${PREFIX} PTHREAD_CFLAGS=${PTHREAD_CFLAGS} 		\
 		PTHREAD_LIBS=${PTHREAD_LIBS}
-PLIST_SUB+=	COMPILER=${COMPILER}
+PLIST_SUB+=	COMPILER=${COMPILER} VER=${PORTVERSION} V2=${PORTVERSION:R}	\
+		V1=${PORTVERSION:R:R}
 
-INSTALL_TARGET=	install_unix
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-lib-motif=${COMPILER}
 USE_LDCONFIG=	yes
+PORTDOCS=	*
+
+OPTIONS=	SHORT_STRING_OPTIM "Enable short string optimization." on 	\
+		PTR_SPECIALIZATIONS "Use pointer types specializations." off 	\
+		TEMPLATE_EXPRESSION "Use template expressions for string." off
 
-.if ${COMPILER} == icc
-CC=		icc
-CXX=		icpc
-CFLAGS=		-O -ip -axiMKW
-CXXFLAGS=	${CFLAGS}
-.else
-# There's segfault on -current if you use non default CFLAGS.
-CFLAGS=		-O -pipe
-CXXFLAGS=	${CFLAGS}
+.include <bsd.port.pre.mk>
+
+.if defined(WITHOUT_SHORT_STRING_OPTIM)
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-no-short-string-optim-user_config.h.diff
+.endif
+
+.if defined(WITH_PTR_SPECIALIZATIONS)
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-ptr_spec-user_config.h.diff
 .endif
 
-.if ${COMPILER} == gcc && ${OSVERSION} >= 502126
-pre-everything::
-	@${ECHO_MSG}
-	@${ECHO_MSG} "If you have encounted a compiler internal error"
-	@${ECHO_MSG} "during building, do NOT 'make clean', simply continue"
-	@${ECHO_MSG} "building by type 'make ${.TARGET}' again."
-	@${ECHO_MSG}
+.if defined(WITH_TEMPLATE_EXPRESSION)
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-templ-expr-user_config.h.diff
 .endif
 
-post-patch:
-	@${CP} ${FILESDIR}/src::icc-freebsd.mak ${WRKSRC}/icc-freebsd.mak
-	@${CP} ${FILESDIR}/stlport::stl_icc.h \
-		${WRKSRC}/../stlport/config/stl_icc.h
-	@${CP} ${FILESDIR}/test::eh::icc-freebsd.mak \
-		${WRKSRC}/../test/eh/icc-freebsd.mak
+pre-configure:
+	${REINPLACE_CMD} -e 's|gcc|${COMPILER}|' ${WRKSRC}/gcc.mak      \
+	${WRKSRC}/../test/unit/gcc.mak
+.for lib in stlport stlportg stlportstlg
+	${REINPLACE_CMD} -e 's|-l${lib}$$|-l${lib}_${COMPILER}|'        \
+	${PATCH_WRKSRC}/build/Makefiles/gmake/app/gcc.mak
+.endfor
 
-post-install:
+do-install:
+	${MKDIR} "${PREFIX}/include/stlport/"
+	(cd ${PATCH_WRKSRC}/stlport/ && ${COPYTREE_SHARE} \* ${PREFIX}/include/stlport/)
+	(cd ${PATCH_WRKSRC}/lib; ${TAR} cf - *) | (cd ${PREFIX}/lib; ${TAR} xf -)
+	${CHOWN} -h ${BINOWN}:${BINGRP} ${PREFIX}/lib/libstlport*
 	${FIND} ${PREFIX}/include/stlport -name \*.orig -delete
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}/images
-	${INSTALL_DATA} ${WRKSRC}/../doc/*.css ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/../doc/*.html ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/../doc/images/* ${DOCSDIR}/images
-.endif
-
-.if ${COMPILER} == icc
-post-build:	test
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PATCH_WRKSRC}/doc/* ${DOCSDIR}
 .endif
 
-test:	do-build
-	@cd ${WRKSRC}/../test/eh && ${SETENV} ${MAKE_ENV} \
-		${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check_d
+regression-test:
+	(cd ${WRKSRC}/../test/unit &&	\
+	${SETENV} STLPORT_LIB_DIR="${PATCH_WRKSRC}/lib"	\
+	${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET} && \
+	(../../../bin/stl_unit_test || ${TRUE}) &&	\
+	(../../../bin-g/stl_unit_test  || ${TRUE}) )
 
 .include <bsd.port.post.mk>
diff --git a/devel/stlport/distinfo b/devel/stlport/distinfo
index 59951bdd5e2f..b6819b7b75f5 100644
--- a/devel/stlport/distinfo
+++ b/devel/stlport/distinfo
@@ -1,3 +1,3 @@
-MD5 (STLport-4.6.2.tar.gz) = 4c01c84f1212369ceb369567ed06d1a2
-SHA256 (STLport-4.6.2.tar.gz) = b506f0e79adc60663a0dbef7192efa0936566c0d5bcf67637807df70541b9fe3
-SIZE (STLport-4.6.2.tar.gz) = 755958
+MD5 (STLport-5.1.4.tar.bz2) = b8d1cba9fd823e1edbfd83b4bbcb237d
+SHA256 (STLport-5.1.4.tar.bz2) = a7533eb341f1cfdc48fa8b4da88a5407c59f3b0fd7846d3870a8c5312aa935ec
+SIZE (STLport-5.1.4.tar.bz2) = 682521
diff --git a/devel/stlport/files/extra-patch-no-short-string-optim-user_config.h.diff b/devel/stlport/files/extra-patch-no-short-string-optim-user_config.h.diff
new file mode 100644
index 000000000000..6d846c99c148
--- /dev/null
+++ b/devel/stlport/files/extra-patch-no-short-string-optim-user_config.h.diff
@@ -0,0 +1,14 @@
+--- stlport/stl/config/user_config.h	Sun Dec  2 19:53:27 2007
++++ stlport/stl/config/user_config.h	Sun Dec  2 19:55:33 2007
+@@ -273,9 +273,9 @@
+  * prefer systematical dynamic allocation turn on this macro.
+  * STLport rebuild: Yes
+  */
+-/*
++
+ #define _STLP_DONT_USE_SHORT_STRING_OPTIM 1
+-*/
++
+ 
+ /*
+  * To reduce the famous code bloat trouble due to the use of templates STLport grant
diff --git a/devel/stlport/files/extra-patch-ptr_spec-user_config.h.diff b/devel/stlport/files/extra-patch-ptr_spec-user_config.h.diff
new file mode 100644
index 000000000000..e38754e27404
--- /dev/null
+++ b/devel/stlport/files/extra-patch-ptr_spec-user_config.h.diff
@@ -0,0 +1,14 @@
+--- stlport/stl/config/user_config.h	Sun Dec  2 19:53:27 2007
++++ stlport/stl/config/user_config.h	Sun Dec  2 19:53:41 2007
+@@ -285,9 +285,9 @@
+  * but after link phase and optimization you will only experiment benefit if you use
+  * many container with pointer types.
+  */
+-/*
++
+ #define _STLP_USE_PTR_SPECIALIZATIONS 1
+-*/
++
+ 
+ /*
+  * To achieve many different optimizations within the template implementations STLport
diff --git a/devel/stlport/files/extra-patch-templ-expr-user_config.h.diff b/devel/stlport/files/extra-patch-templ-expr-user_config.h.diff
new file mode 100644
index 000000000000..b7b8134e1fc2
--- /dev/null
+++ b/devel/stlport/files/extra-patch-templ-expr-user_config.h.diff
@@ -0,0 +1,14 @@
+--- stlport/stl/config/user_config.h	Sun Dec  2 19:53:27 2007
++++ stlport/stl/config/user_config.h	Sun Dec  2 19:56:17 2007
+@@ -261,9 +261,9 @@
+  * The drawback can be longer compilation time and bigger executable size.
+  * STLport rebuild: Yes
+  */
+-/*
++
+ #define _STLP_USE_TEMPLATE_EXPRESSION 1
+-*/
++
+ 
+ /*
+  * By default the STLport basic_string implementation use a little static buffer
diff --git a/devel/stlport/files/patch-src::common_macros.mak b/devel/stlport/files/patch-src::common_macros.mak
deleted file mode 100644
index 134c3f755142..000000000000
--- a/devel/stlport/files/patch-src::common_macros.mak
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/common_macros.mak.orig	Sun Nov  2 16:58:51 2003
-+++ src/common_macros.mak	Sun Oct 31 17:02:57 2004
-@@ -10,7 +10,7 @@
- # We do not assume any binary compatibility for betas.
- BETA_SUFFIX=
- 
--VERSION_SUFFIX= .$(VERSION_MAJOR).$(VERSION_MINOR)$(BETA_SUFFIX)
-+VERSION_SUFFIX= _$(VERSION_MAJOR)_$(VERSION_MINOR)$(BETA_SUFFIX)
- WIN_VERSION_SUFFIX= $(VERSION_MAJOR)$(VERSION_MINOR)$(BETA_SUFFIX)
- 
- # DYNAMIC_SUFFIX= $(VERSION_SUFFIX)$(PATCH_SUFFIX)
diff --git a/devel/stlport/files/patch-src::gcc-freebsd.mak b/devel/stlport/files/patch-src::gcc-freebsd.mak
deleted file mode 100644
index 41d05462f9a1..000000000000
--- a/devel/stlport/files/patch-src::gcc-freebsd.mak
+++ /dev/null
@@ -1,33 +0,0 @@
---- src/gcc-freebsd.mak.orig	Fri Jan 16 08:25:37 2004
-+++ src/gcc-freebsd.mak	Sat Nov  6 15:40:14 2004
-@@ -5,8 +5,8 @@
- #
- # compiler
- #
--CC = gcc -pthread
--CXX = c++ -pthread -fexceptions
-+CC += $(PTHREAD_CFLAGS) -D_REENTRANT
-+CXX += $(PTHREAD_CFLAGS) -D_REENTRANT -fexceptions
- 
- #
- # Basename for libraries
-@@ -19,7 +19,7 @@
- #
- LINK=ar cr
- # 2.95 flag
--DYN_LINK=c++ -pthread -fexceptions -shared -o
-+DYN_LINK=$(CXX) $(PTHREAD_LIBS) -fexceptions -shared -o
- 
- OBJEXT=o
- DYNEXT=so
-@@ -41,8 +41,8 @@
- 
- CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
- 
--CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2
--CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
-+CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) $(CXXFLAGS)
-+CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) $(CXXFLAGS) -fPIC
- 
- CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -O -g
- CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -O -g -fPIC
diff --git a/devel/stlport/files/patch-stlport::c_locale.h b/devel/stlport/files/patch-stlport::c_locale.h
deleted file mode 100644
index 55cad18d5560..000000000000
--- a/devel/stlport/files/patch-stlport::c_locale.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- stlport/stl/c_locale.h.orig	Sun Nov  2 16:59:03 2003
-+++ stlport/stl/c_locale.h	Sat Nov  6 15:44:22 2004
-@@ -178,7 +178,7 @@
-                            _Locale_SPACE ) /* Printable */
- # endif /* __Lynx__ */
- 
--#if defined(__GNUC__) || defined (__BORLANDC__) || defined (__COMO__)
-+#if defined(__GNUC__) || defined (__BORLANDC__) || defined (__COMO__) || defined (__ICC)
- 
- # if defined (__CYGWIN__)
- 
diff --git a/devel/stlport/files/patch-stlport::config::stl_gcc.h b/devel/stlport/files/patch-stlport::config::stl_gcc.h
deleted file mode 100644
index cf4203be4dab..000000000000
--- a/devel/stlport/files/patch-stlport::config::stl_gcc.h
+++ /dev/null
@@ -1,43 +0,0 @@
---- stlport/config/stl_gcc.h.orig	Sun Nov  2 16:59:11 2003
-+++ stlport/config/stl_gcc.h	Mon Nov 29 18:42:05 2004
-@@ -7,11 +7,20 @@
- # define _STLP_USE_GLIBC
- #endif
- 
-+#if !defined(__FreeBSD__) || (defined(__FreeBSD__) && (__FreeBSD_cc_version < 530001))
- #   define _STLP_NO_MEMBER_TEMPLATE_KEYWORD
-+#endif
-+
- 
--# if defined(__FreeBSD__) || defined (__hpux) || defined(__amigaos__) || ( defined(__OS2__) && defined(__EMX__) )
-+#if defined (__hpux) || defined(__amigaos__) || ( defined(__OS2__) && defined(__EMX__) )
-+# define _STLP_NO_WCHAR_T
-+#elif defined(__FreeBSD__)
-+# if (__FreeBSD_cc_version < 500005)
- #  define _STLP_NO_WCHAR_T
--# endif
-+# else
-+#  define _STLP_FREEBSD_HAS_WFUNCS
-+# endif /* __FreeBSD_cc_version < 500005 */
-+#endif
- 
- #ifdef __USLC__
- # include <config/stl_sco.h>
-@@ -81,7 +90,7 @@
- 
- # endif
- 
--#if defined (__CYGWIN__) || defined (__MINGW32__) || !(defined (_STLP_USE_GLIBC) || defined (__sun)) 
-+#if defined (__CYGWIN__) || defined (__MINGW32__) || !(defined (_STLP_USE_GLIBC) || defined (_STLP_FREEBSD_HAS_WFUNCS) || defined (__sun)) 
- #ifndef __MINGW32__
- #   define _STLP_NO_NATIVE_MBSTATE_T      1
- #endif
-@@ -267,7 +276,7 @@
- #   define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
- #   define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward
- #  else
--#   if defined(__GNUC_PATCHLEVEL__) && (__GNUC_PATCHLEVEL__ > 0)
-+#   if defined(__GNUC_PATCHLEVEL__) && (__GNUC_PATCHLEVEL__ > 0) && !defined(__FreeBSD__)
- #     define _STLP_NATIVE_INCLUDE_PATH ../__GNUC__.__GNUC_MINOR__.__GNUC_PATCHLEVEL__
- #     define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../__GNUC__.__GNUC_MINOR__.__GNUC_PATCHLEVEL__/backward
- #   else
diff --git a/devel/stlport/files/patch-stlport::stdexcept b/devel/stlport/files/patch-stlport::stdexcept
deleted file mode 100644
index 41d193eca8b6..000000000000
--- a/devel/stlport/files/patch-stlport::stdexcept
+++ /dev/null
@@ -1,14 +0,0 @@
---- stlport/stdexcept.orig	Sun Nov  2 16:59:01 2003
-+++ stlport/stdexcept	Sun Oct 31 17:05:34 2004
-@@ -60,6 +60,11 @@
- # endif
- #  define _STLP_EXCEPTION_BASE exception
- 
-+/* maybe limit to gcc 3.x */
-+#if defined( __GNUC__)
-+#define _STLP_NOTHROW_INHERENTLY throw()
-+#endif
-+
- class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE {
- public:
-   __Named_exception(const string& __str) 
diff --git a/devel/stlport/files/patch-stlport::stl::_bvector.h b/devel/stlport/files/patch-stlport::stl::_bvector.h
deleted file mode 100644
index d58eacd555a0..000000000000
--- a/devel/stlport/files/patch-stlport::stl::_bvector.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- stlport/stl/_bvector.h.orig	Sun Nov  2 16:59:07 2003
-+++ stlport/stl/_bvector.h	Sun Oct 31 16:48:31 2004
-@@ -34,7 +34,9 @@
- # include <stl/_vector.h>
- # endif
- 
-+#ifndef __WORD_BIT
- #define __WORD_BIT (int(CHAR_BIT*sizeof(unsigned int)))
-+#endif
- 
- _STLP_BEGIN_NAMESPACE 
- 
diff --git a/devel/stlport/files/patch-stlport::stl::_cwchar.h b/devel/stlport/files/patch-stlport::stl::_cwchar.h
deleted file mode 100644
index ac88a5961d0f..000000000000
--- a/devel/stlport/files/patch-stlport::stl::_cwchar.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- stlport/stl/_cwchar.h.orig	Sun Nov  2 16:59:08 2003
-+++ stlport/stl/_cwchar.h	Sat Nov  6 17:01:49 2004
-@@ -24,7 +24,7 @@
- #endif
- #endif
- 
--# if defined (__MRC__) || defined (__SC__) || defined (__BORLANDC__) || defined(__FreeBSD__) || (defined (__GNUC__) && defined (__APPLE__) || defined( __Lynx__ )) || defined (_STLP_NO_WCHAR_T)
-+# if defined (__MRC__) || defined (__SC__) || defined (__BORLANDC__) || (defined(__FreeBSD__) && !defined(_STLP_FREEBSD_HAS_WFUNCS)) || (defined (__GNUC__) && defined (__APPLE__) || defined( __Lynx__ )) || defined (_STLP_NO_WCHAR_T)
- 
- #  include _STLP_NATIVE_C_HEADER(stddef.h)
- #  if defined (__FreeBSD__) || defined (__Lynx__)
diff --git a/devel/stlport/files/patch-stlport::stlcomp.h b/devel/stlport/files/patch-stlport::stlcomp.h
deleted file mode 100644
index 1c2e582338bd..000000000000
--- a/devel/stlport/files/patch-stlport::stlcomp.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- stlport/config/stlcomp.h.orig	Sun Nov  2 16:59:12 2003
-+++ stlport/config/stlcomp.h	Sat Nov  6 16:13:47 2004
-@@ -109,6 +109,9 @@
- # elif defined (__FCC_VERSION)
- /* Fujutsu Compiler, v4.0 assumed */
- #  include <config/stl_fujitsu.h>
-+# elif defined (__ICC)
-+/* Intel(R) C++ Compiler */
-+#  include <config/stl_icc.h>
- # elif defined(_CRAY)
- /* Cray C++ 3.4 or 3.5 */
- #  include <config/stl_cray.h>
diff --git a/devel/stlport/files/patch-stlport_stl_config_features.h b/devel/stlport/files/patch-stlport_stl_config_features.h
new file mode 100644
index 000000000000..625088771706
--- /dev/null
+++ b/devel/stlport/files/patch-stlport_stl_config_features.h
@@ -0,0 +1,19 @@
+--- ./stlport/stl/config/features.h.orig	2007-08-18 22:45:42.000000000 +0200
++++ ./stlport/stl/config/features.h	2007-12-23 11:18:22.000000000 +0100
+@@ -218,7 +218,7 @@
+ #endif
+ 
+ /* Operating system recognition (basic) */
+-#if defined (__unix) || defined (__linux__) || defined (__QNX__) || defined (_AIX)  || defined (__NetBSD__) || defined(__OpenBSD__) || defined (__Lynx__)
++#if defined (__unix) || defined (__linux__) || defined (__QNX__) || defined (_AIX)  || defined (__NetBSD__) || defined(__OpenBSD__) || defined (__Lynx__) || defined(__FreeBSD__)
+ #  define _STLP_UNIX 1
+ #elif defined(macintosh) || defined (_MAC)
+ #  define _STLP_MAC  1
+@@ -305,6 +305,7 @@
+ #endif
+ 
+ #if (defined (_REENTRANT) || defined (_THREAD_SAFE) || \
++    (defined (_POSIX_THREADS) && defined (__FreeBSD__)) && \
+     (defined (_POSIX_THREADS) && defined (__OpenBSD__))) && \
+     !defined (_STLP_THREADS)
+ #  define _STLP_THREADS
diff --git a/devel/stlport/files/patch-stlport_stl_config_host.h b/devel/stlport/files/patch-stlport_stl_config_host.h
new file mode 100644
index 000000000000..a640441fd390
--- /dev/null
+++ b/devel/stlport/files/patch-stlport_stl_config_host.h
@@ -0,0 +1,14 @@
+--- ./stlport/stl/config/host.h.orig	2007-08-26 16:27:21.000000000 +0200
++++ ./stlport/stl/config/host.h	2007-11-19 00:02:25.000000000 +0100
+@@ -72,10 +72,8 @@
+  * _STLP_NATIVE_INCLUDE_PATH.
+  * Hint: never install STLport in the directory that ends with "include"
+  */
+-/*
+ #undef _STLP_NATIVE_INCLUDE_PATH
+-#define _STLP_NATIVE_INCLUDE_PATH ../include
+-*/
++#define _STLP_NATIVE_INCLUDE_PATH c++/__GNUC__.__GNUC_MINOR__
+ /* same for C library headers like <cstring> */
+ /*
+ #undef _STLP_NATIVE_CPP_C_INCLUDE_PATH
diff --git a/devel/stlport/files/patch-test::eh::gcc-freebsd.mak b/devel/stlport/files/patch-test::eh::gcc-freebsd.mak
deleted file mode 100644
index d456c25abcd2..000000000000
--- a/devel/stlport/files/patch-test::eh::gcc-freebsd.mak
+++ /dev/null
@@ -1,27 +0,0 @@
---- test/eh/gcc-freebsd.mak.orig	Sun Nov  2 16:58:53 2003
-+++ test/eh/gcc-freebsd.mak	Sat Nov  6 16:19:16 2004
-@@ -34,20 +34,17 @@
- D_TEST = ./eh_test_d.out
- NOSGI_TEST = ./eh_test_nosgi.out
- 
--CC = c++ -pthread
--CXX = $(CC)
--
- # dwa 12/22/99 -- had to turn off -ansi flag so we could use SGI IOSTREAMS
- # also, test_slist won't compile with -O3/-O2 when targeting PPC. It fails 
- # in the assembler with 'invalid relocation type'
--CXXFLAGS = -Wall -g -O ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} -DEH_VECTOR_OPERATOR_NEW
-+CXXFLAGS = $(PTHREAD_CFLAGS) -D_REENTRANT -fexceptions -Wall ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} -DEH_VECTOR_OPERATOR_NEW -DEH_DELETE_HAS_THROW_SPEC
- 
--D_CXXFLAGS = -Wall -g -O ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} -DEH_VECTOR_OPERATOR_NEW -D_STLP_DEBUG -D_STLP_USE_STATIC_LIB
--NOSGI_CXXFLAGS = -Wall -g -O2 ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} -D_STLP_NO_OWN_IOSTREAMS -D_STLP_DEBUG_UNINITIALIZED -DEH_VECTOR_OPERATOR_NEW
-+D_CXXFLAGS = $(CXXFLAGS) -g -D_STLP_DEBUG
-+NOSGI_CXXFLAGS = $(CXXFLAGS) -D_STLP_NO_OWN_IOSTREAMS -D_STLP_DEBUG_UNINITIALIZED
- 
- check: $(TEST)
- 
--LIBS = -lm 
-+LIBS = -lm $(PTHREAD_LIBS)
- D_LIBSTLPORT = -L../../lib -lstlport_gcc_stldebug
- LIBSTLPORT = -L../../lib -lstlport_gcc
- 
diff --git a/devel/stlport/files/src::icc-freebsd.mak b/devel/stlport/files/src::icc-freebsd.mak
deleted file mode 100644
index 6300ce325340..000000000000
--- a/devel/stlport/files/src::icc-freebsd.mak
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# Note : This makefile is for Intel(R) C++ Compiler
-#
-
-#
-# compiler
-#
-#CC= icc
-#CXX= icpc
-#CFLAGS= -O -ip -axiMKW
-#CXXFLAGS= -O -ip -axiMKW
-
-#
-# Basename for libraries
-#
-LIB_BASENAME = libstlport_icc
-
-#
-# guts for common stuff
-#
-#
-LINK=ar cr
-# Using icc here is a hack while icpc on FreeBSD is set up to automatically
-# link against libstlport_icc.
-DYN_LINK=$(CC) -mt -shared -o
-
-OBJEXT=o
-DYNEXT=so
-STEXT=a
-RM=rm -rf
-PATH_SEP=/
-MKDIR=mkdir -p
-COMP=ICC-FREEBSD
-INSTALL_STEP = install_unix 
-
-all: gmake_message  all_dynamic all_static symbolic_links 
-
-gmake_message:
-	echo "Note : this makefile requires gmake on FreeBSD"
-
-include common_macros.mak
-
-WARNING_FLAGS= -w1
-
-CXXFLAGS_COMMON = -I$(STLPORT_DIR) $(WARNING_FLAGS) $(PTHREAD_CFLAGS) -D_REENTRANT
-
-CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) $(CXXFLAGS)
-CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) $(CXXFLAGS) -KPIC
-
-CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -O -g
-CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -O -KPIC
-
-CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
-CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
-
-include common_percent_rules.mak
-include common_rules.mak
diff --git a/devel/stlport/files/stlport::stl_icc.h b/devel/stlport/files/stlport::stl_icc.h
deleted file mode 100644
index 574af8a500f5..000000000000
--- a/devel/stlport/files/stlport::stl_icc.h
+++ /dev/null
@@ -1,38 +0,0 @@
-// STLport configuration file
-// It is internal STLport header - DO NOT include it directly
-// A list of Intel compiler for Linux portion of STLport settings.
-
-# define _STLP_LONG_LONG long long
-
-// Edit relative path below (or put full path) to get native
-// compiler headers included. Default is "../include".
-// C headers may reside in different directory, so separate macro is provided.
-# if (__INTEL_COMPILER >= 800)
-
-# define _STLP_NATIVE_INCLUDE_PATH ../include/c++
-# define _STLP_NATIVE_C_INCLUDE_PATH ../include
-//# define _STLP_NATIVE_CPP_C_INCLUDE_PATH ../include
-
-# ifndef __GNUC__ 
-//  If GCC compatability is disabled (-no-gcc is specified) STD needs to be redefined.
-# define _STLP_REDEFINE_STD 1
-# endif /* __GNUC__ */
-
-//#define _STLP_HAS_NO_NEW_C_HEADERS 1
-
-# endif /* __INTEL_COMPILER >= 800 */
-
-#ifndef __FreeBSD__ // FreeBSD system headers use unsupported GCC extensions.
-# ifndef __GNUC__ 
-# define __GNUC__ 3
-# endif
-#endif
-
-# define _STLP_NO_NATIVE_WIDE_FUNCTIONS 1
-
-#ifdef __FreeBSD__
-# include <osreldate.h>
-# define _STLP_HAS_NATIVE_FLOAT_ABS
-# define _STLP_NO_CSTD_FUNCTION_IMPORTS
-# define _STLP_NO_LONG_DOUBLE
-#endif
diff --git a/devel/stlport/files/test::eh::icc-freebsd.mak b/devel/stlport/files/test::eh::icc-freebsd.mak
deleted file mode 100644
index 49469197653d..000000000000
--- a/devel/stlport/files/test::eh::icc-freebsd.mak
+++ /dev/null
@@ -1,76 +0,0 @@
-# This requires GNU make.
-
-srcdir = .
-VPATH = .
-SHELL=/bin/sh
-
-# point this to proper location
-STL_INCL=-I../../stlport
-
-AUX_LIST=TestClass.cpp main.cpp nc_alloc.cpp random_number.cpp
-
-TEST_LIST=test_algo.cpp  \
-test_algobase.cpp     test_list.cpp test_slist.cpp \
-test_bit_vector.cpp   test_vector.cpp \
-test_deque.cpp test_set.cpp test_map.cpp \
-test_hash_map.cpp  test_hash_set.cpp test_rope.cpp \
-test_string.cpp test_bitset.cpp test_valarray.cpp
-
-LIST=$(AUX_LIST) $(TEST_LIST)
-
-OBJECTS = $(LIST:%.cpp=obj/%.o) $(STAT_MODULE)
-D_OBJECTS = $(LIST:%.cpp=d_obj/%.o) $(STAT_MODULE)
-
-EXECS = $(LIST:%.cpp=%)
-TESTS = $(LIST:%.cpp=%.out)
-TEST_EXE  = ./eh_test
-D_TEST_EXE = ./eh_test_d
-
-TEST  = ./eh_test.out
-D_TEST = ./eh_test_d.out
-
-CXXFLAGS += $(PTHREAD_CFLAGS) -D_REENTRANT -w1 $(STL_INCL) -I. $(CXX_EXTRA_FLAGS) -DEH_VECTOR_OPERATOR_NEW -DEH_DELETE_HAS_THROW_SPEC
-D_CXXFLAGS = $(CXXFLAGS) -g -D_STLP_DEBUG
-
-check: $(TEST)
-
-LIBS = -lm -mt
-D_LIBSTLPORT = -L../../lib -lstlport_icc_stldebug
-LIBSTLPORT = -L../../lib -lstlport_icc
-
-all: $(TEST_EXE) $(D_TEST_EXE)
-
-check_d: $(D_TEST)
-
-OBJDIR=obj
-D_OBJDIR=d_obj
-
-$(OBJDIR):
-	mkdir obj
-$(D_OBJDIR):
-	mkdir d_obj
-
-
-$(TEST_EXE) : $(OBJDIR) $(OBJECTS)
-	$(CC) $(CXXFLAGS) $(OBJECTS) $(LIBSTLPORT) $(LIBS) -o $(TEST_EXE)
-
-$(D_TEST_EXE) : $(D_OBJDIR) $(D_OBJECTS)
-	$(CC) $(D_CXXFLAGS) $(D_OBJECTS) $(D_LIBSTLPORT) $(LIBS) -o $(D_TEST_EXE)
-
-
-$(TEST) : $(TEST_EXE)
-	LD_LIBRARY_PATH="../../lib:$(LD_LIBRARY_PATH)" ./$(TEST_EXE) -s 100
-
-$(D_TEST) : $(D_TEST_EXE)
-	LD_LIBRARY_PATH="../../lib:$(LD_LIBRARY_PATH)" ./$(D_TEST_EXE) -s 100
-
-SUFFIXES: .cpp.o
-
-d_obj/%.o : %.cpp
-	$(CXX) $(D_CXXFLAGS) $< -c -o $@
-
-obj/%.o : %.cpp
-	$(CXX) $(CXXFLAGS) $< -c -o $@
-
-clean:
-	-rm -rf $(TEST_EXE) *.o */*.o *.core
diff --git a/devel/stlport/pkg-descr b/devel/stlport/pkg-descr
index 136a32056652..07e4d425e616 100644
--- a/devel/stlport/pkg-descr
+++ b/devel/stlport/pkg-descr
@@ -1,13 +1,6 @@
-STLport is an adaptation of SGI's Standard Template Library.
-The goal of the STLport effort is to make SGI's STL
-implementation usable with most compilers while retaining full
-functionality.
+Multiplatform C++ Standard Library (STL implementation). Many
+compilers and operational environments supported. Standard (ISO/IEC
+14882) compliance. Maximum efficiency. Exception and thread
+safety. Debug mode.
 
-The Standard Template Library is a C++ library of container
-classes, algorithms, and iterators providing many of the basic
-algorithms and data structures of computer science.
-
-WWW: http://www.sgi.com/tech/stl/
-
--- 
-Josh Gilliam                    <josh@quick.net>
+WWW: http://stlport.sourceforge.net/
diff --git a/devel/stlport/pkg-plist b/devel/stlport/pkg-plist
index f58cfa0bf825..04c0d09d3c9d 100644
--- a/devel/stlport/pkg-plist
+++ b/devel/stlport/pkg-plist
@@ -1,388 +1,343 @@
-include/stlport/algorithm
-include/stlport/bitset
-include/stlport/cassert
-include/stlport/cctype
-include/stlport/cerrno
-include/stlport/cfloat
-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.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_icc.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_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/csetjmp
-include/stlport/csignal
-include/stlport/cstdarg
-include/stlport/cstddef
-include/stlport/cstdio
-include/stlport/cstdlib
-include/stlport/cstring
-include/stlport/ctime
-include/stlport/ctype.h
-include/stlport/cwchar
-include/stlport/cwctype
-include/stlport/deque
-include/stlport/exception
-include/stlport/exception.h
-include/stlport/export
-include/stlport/fstream
-include/stlport/fstream.h
-include/stlport/functional
-include/stlport/hash_map
-include/stlport/hash_set
-include/stlport/iomanip
-include/stlport/iomanip.h
-include/stlport/ios
-include/stlport/ios.h
-include/stlport/iosfwd
-include/stlport/iostream
-include/stlport/iostream.h
-include/stlport/istream
-include/stlport/istream.h
-include/stlport/iterator
-include/stlport/limits
-include/stlport/list
-include/stlport/locale
-include/stlport/locale.h
-include/stlport/map
-include/stlport/math.h
-include/stlport/mem.h
-include/stlport/memory
-include/stlport/mmemory.h
-include/stlport/new
-include/stlport/new.h
-include/stlport/numeric
-include/stlport/old_hp/algo.h
-include/stlport/old_hp/algobase.h
-include/stlport/old_hp/alloc.h
-include/stlport/old_hp/bvector.h
-include/stlport/old_hp/defalloc.h
-include/stlport/old_hp/deque.h
-include/stlport/old_hp/function.h
-include/stlport/old_hp/hash_map.h
-include/stlport/old_hp/hash_set.h
-include/stlport/old_hp/hashtable.h
-include/stlport/old_hp/heap.h
-include/stlport/old_hp/iterator.h
-include/stlport/old_hp/list.h
-include/stlport/old_hp/map.h
-include/stlport/old_hp/multimap.h
-include/stlport/old_hp/multiset.h
-include/stlport/old_hp/numeric.h
-include/stlport/old_hp/pair.h
-include/stlport/old_hp/pthread_alloc.h
-include/stlport/old_hp/queue.h
-include/stlport/old_hp/rope.h
-include/stlport/old_hp/set.h
-include/stlport/old_hp/slist.h
-include/stlport/old_hp/stack.h
-include/stlport/old_hp/tempbuf.h
-include/stlport/old_hp/tree.h
-include/stlport/old_hp/vector.h
-include/stlport/ostream
-include/stlport/ostream.h
-include/stlport/pthread.h
-include/stlport/pthread_alloc
-include/stlport/queue
-include/stlport/rope
-include/stlport/set
-include/stlport/setjmp.h
-include/stlport/signal.h
-include/stlport/slist
-include/stlport/sstream
-include/stlport/stack
-include/stlport/stdarg.h
-include/stlport/stddef.h
-include/stlport/stdexcept
-include/stlport/stdio.h
-include/stlport/stdio_streambuf
-include/stlport/stdlib.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/_tempbuf.c
+include/stlport/stl/_pair.h
+include/stlport/stl/debug/_hashtable.h
+include/stlport/stl/debug/_list.h
+include/stlport/stl/debug/_slist.h
+include/stlport/stl/debug/_tree.h
+include/stlport/stl/debug/_string_sum_methods.h
+include/stlport/stl/debug/_debug.c
+include/stlport/stl/debug/_vector.h
+include/stlport/stl/debug/_deque.h
+include/stlport/stl/debug/_debug.h
+include/stlport/stl/debug/_string.h
+include/stlport/stl/debug/_iterator.h
+include/stlport/stl/_locale.h
+include/stlport/stl/_null_stream.h
+include/stlport/stl/_tempbuf.h
+include/stlport/stl/_ioserr.h
+include/stlport/stl/_stack.h
+include/stlport/stl/msl_string.h
+include/stlport/stl/_map.h
+include/stlport/stl/_istreambuf_iterator.h
+include/stlport/stl/_stlport_version.h
+include/stlport/stl/_ostreambuf_iterator.h
+include/stlport/stl/_string_workaround.h
+include/stlport/stl/_iterator_old.h
+include/stlport/stl/type_manips.h
+include/stlport/stl/_hash_fun.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/_hash_set.h
+include/stlport/stl/_stdexcept.h
+include/stlport/stl/_cwctype.h
+include/stlport/stl/_ios.c
+include/stlport/stl/_relops_hash_cont.h
+include/stlport/stl/_unordered_map.h
+include/stlport/stl/_function.h
+include/stlport/stl/_tree.c
+include/stlport/stl/_ios.h
+include/stlport/stl/_vector.c
 include/stlport/stl/_cmath.h
-include/stlport/stl/_codecvt.h
-include/stlport/stl/_collate.h
 include/stlport/stl/_complex.c
+include/stlport/stl/_tree.h
+include/stlport/stl/_ctime.h
+include/stlport/stl/char_traits.h
+include/stlport/stl/_clocale.h
+include/stlport/stl/_vector.h
+include/stlport/stl/_string_fwd.h
+include/stlport/stl/_csetjmp.h
+include/stlport/stl/_string_hash.h
 include/stlport/stl/_complex.h
-include/stlport/stl/_config.h
-include/stlport/stl/_config_compat.h
+include/stlport/stl/_algobase.c
+include/stlport/stl/pointers/_vector.h
+include/stlport/stl/pointers/_list.h
+include/stlport/stl/pointers/_set.h
+include/stlport/stl/pointers/_slist.h
+include/stlport/stl/pointers/_tools.h
+include/stlport/stl/pointers/_deque.h
+include/stlport/stl/_numpunct.h
+include/stlport/stl/_algobase.h
 include/stlport/stl/_config_compat_post.h
+include/stlport/stl/boost_type_traits.h
+include/stlport/stl/_heap.c
+include/stlport/stl/_collate.h
 include/stlport/stl/_construct.h
+include/stlport/stl/_cctype.h
+include/stlport/stl/_slist.c
+include/stlport/stl/_num_get.c
+include/stlport/stl/_string_sum.h
+include/stlport/stl/_limits.c
+include/stlport/stl/_stdexcept_base.h
+include/stlport/stl/_slist.h
+include/stlport/stl/_num_get.h
+include/stlport/stl/_limits.h
+include/stlport/stl/_check_config.h
+include/stlport/stl/type_traits.h
+include/stlport/stl/_heap.h
+include/stlport/stl/_time_facets.c
 include/stlport/stl/_ctraits_fns.h
+include/stlport/stl/_carray.h
+include/stlport/stl/_mbstate_t.h
+include/stlport/stl/_time_facets.h
+include/stlport/stl/_slist_base.c
 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
-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
+include/stlport/stl/_abbrevs.h
+include/stlport/stl/_cstdlib.h
+include/stlport/stl/_queue.h
+include/stlport/stl/_strstream.h
+include/stlport/stl/_alloc.c
 include/stlport/stl/_hashtable.c
+include/stlport/stl/_codecvt.h
+include/stlport/stl/_alloc_old.h
+include/stlport/stl/_range_errors.h
+include/stlport/stl/_slist_base.h
+include/stlport/stl/_monetary.c
+include/stlport/stl/_alloc.h
 include/stlport/stl/_hashtable.h
-include/stlport/stl/_heap.c
-include/stlport/stl/_heap.h
-include/stlport/stl/_ios.c
-include/stlport/stl/_ios.h
-include/stlport/stl/_ios_base.h
-include/stlport/stl/_iosfwd.h
+include/stlport/stl/_fstream.c
+include/stlport/stl/_monetary.h
 include/stlport/stl/_istream.c
+include/stlport/stl/_raw_storage_iter.h
+include/stlport/stl/_fstream.h
+include/stlport/stl/_pthread_alloc.h
+include/stlport/stl/_prolog.h
 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.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/_numpunct.h
+include/stlport/stl/_bvector.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/_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/_ostream.h
+include/stlport/stl/_algo.c
+include/stlport/stl/_iterator_base.h
 include/stlport/stl/_sstream.h
-include/stlport/stl/_stack.h
-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/_epilog.h
+include/stlport/stl/_hash_map.h
+include/stlport/stl/_csignal.h
+include/stlport/stl/_algo.h
+include/stlport/stl/_uninitialized.h
+include/stlport/stl/_bitset.c
+include/stlport/stl/_cstdarg.h
+include/stlport/stl/_iterator.h
+include/stlport/stl/_bitset.h
+include/stlport/stl/_deque.c
+include/stlport/stl/_rope.c
+include/stlport/stl/_messages_facets.h
 include/stlport/stl/_string.c
+include/stlport/stl/_ptrs_specialize.h
+include/stlport/stl/_deque.h
+include/stlport/stl/_rope.h
 include/stlport/stl/_string.h
-include/stlport/stl/_string_fwd.c
-include/stlport/stl/_string_fwd.h
-include/stlport/stl/_string_hash.h
+include/stlport/stl/config/user_config.h
+include/stlport/stl/config/_watcom.h
+include/stlport/stl/config/_linux.h
+include/stlport/stl/config/_mwccnlm.h
+include/stlport/stl/config/_dm.h
+include/stlport/stl/config/_prolog.h
+include/stlport/stl/config/_warnings_off.h
+include/stlport/stl/config/_netware.h
+include/stlport/stl/config/_apcc.h
+include/stlport/stl/config/_ibm.h
+include/stlport/stl/config/_msvc.h
+include/stlport/stl/config/_mlc.h
+include/stlport/stl/config/_intel.h
+include/stlport/stl/config/_evc.h
+include/stlport/stl/config/_epilog.h
+include/stlport/stl/config/features.h
+include/stlport/stl/config/_dec_vms.h
+include/stlport/stl/config/_hpux.h
+include/stlport/stl/config/_auto_link.h
+include/stlport/stl/config/stl_mycomp.h
+include/stlport/stl/config/_as400.h
+include/stlport/stl/config/_windows.h
+include/stlport/stl/config/_detect_dll_or_lib.h
+include/stlport/stl/config/_openbsd.h
+include/stlport/stl/config/_macosx.h
+include/stlport/stl/config/_dec.h
+include/stlport/stl/config/_sunprocc.h
+include/stlport/stl/config/_gcc.h
+include/stlport/stl/config/_como.h
+include/stlport/stl/config/_cray.h
+include/stlport/stl/config/_icc.h
+include/stlport/stl/config/_mac.h
+include/stlport/stl/config/_cygwin.h
+include/stlport/stl/config/_apple.h
+include/stlport/stl/config/_kai.h
+include/stlport/stl/config/_mwerks.h
+include/stlport/stl/config/stl_confix.h
+include/stlport/stl/config/_freebsd.h
+include/stlport/stl/config/_solaris.h
+include/stlport/stl/config/_hpacc.h
+include/stlport/stl/config/host.h
+include/stlport/stl/config/_aix.h
+include/stlport/stl/config/_sgi.h
+include/stlport/stl/config/_native_headers.h
+include/stlport/stl/config/_symantec.h
+include/stlport/stl/config/_bc.h
+include/stlport/stl/config/_system.h
+include/stlport/stl/config/compat.h
+include/stlport/stl/config/_fujitsu.h
+include/stlport/stl/concept_checks.h
+include/stlport/stl/_valarray.c
+include/stlport/stl/_function_base.h
+include/stlport/stl/_string_sum_methods.h
+include/stlport/stl/_string_base.h
+include/stlport/stl/_valarray.h
+include/stlport/stl/_cstdio.h
+include/stlport/stl/_set.h
+include/stlport/stl/_move_construct_fwk.h
 include/stlport/stl/_string_io.c
+include/stlport/stl/_typeinfo.h
 include/stlport/stl/_string_io.h
-include/stlport/stl/_strstream.h
-include/stlport/stl/_tempbuf.c
-include/stlport/stl/_tempbuf.h
+include/stlport/stl/_unordered_set.h
+include/stlport/stl/c_locale.h
+include/stlport/stl/_string_operators.h
+include/stlport/stl/_list.c
+include/stlport/stl/_cwchar.h
+include/stlport/stl/_list.h
+include/stlport/stl/_function_adaptors.h
+include/stlport/stl/_ios_base.h
 include/stlport/stl/_threads.c
 include/stlport/stl/_threads.h
-include/stlport/stl/_time_facets.c
-include/stlport/stl/_time_facets.h
-include/stlport/stl/_tree.c
-include/stlport/stl/_tree.h
-include/stlport/stl/_uninitialized.h
-include/stlport/stl/_valarray.c
-include/stlport/stl/_valarray.h
-include/stlport/stl/_vector.c
-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/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/msl_string.h
-include/stlport/stl/type_traits.h
-include/stlport/stl/wrappers/_deque.h
-include/stlport/stl/wrappers/_hash_map.h
-include/stlport/stl/wrappers/_hash_set.h
-include/stlport/stl/wrappers/_list.h
-include/stlport/stl/wrappers/_map.h
-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/stl/_iosfwd.h
+include/stlport/stl/_numeric.c
+include/stlport/stl/_exception.h
+include/stlport/stl/_new.h
+include/stlport/stl/_numeric.h
+include/stlport/stl/_stream_iterator.h
+include/stlport/stl/_sparc_atomic.h
+include/stlport/stl/_string_npos.h
+include/stlport/stl/_cstring.h
+include/stlport/stl/_iostream_string.h
+include/stlport/stl/_cstddef.h
+include/stlport/stl/_num_put.c
+include/stlport/stl/_streambuf.c
+include/stlport/stl/_relops_cont.h
+include/stlport/stl/_num_put.h
+include/stlport/stl/_streambuf.h
+include/stlport/ios.h
+include/stlport/iostream
+include/stlport/cstdio
+include/stlport/cstdarg
+include/stlport/limits.h
+include/stlport/iomanip
+include/stlport/wctype.h
+include/stlport/numeric
+include/stlport/iomanip.h
+include/stlport/utility
+include/stlport/cwchar
+include/stlport/memory
+include/stlport/cstddef
+include/stlport/map
+include/stlport/math.h
+include/stlport/stdiostream.h
 include/stlport/typeinfo.h
-include/stlport/using/cstring
+include/stlport/cstdlib
+include/stlport/functional
+include/stlport/time.h
+include/stlport/locale.h
+include/stlport/set
+include/stlport/unordered_map
+include/stlport/cctype
+include/stlport/assert.h
+include/stlport/setjmp.h
+include/stlport/bitset
+include/stlport/iterator
+include/stlport/iosfwd
+include/stlport/cmath
+include/stlport/limits
+include/stlport/string
+include/stlport/rope
+include/stlport/pthread_alloc
+include/stlport/unordered_set
+include/stlport/istream
+include/stlport/mem.h
+include/stlport/stack
+include/stlport/csetjmp
+include/stlport/using/strstream
+include/stlport/using/locale
+include/stlport/using/export
 include/stlport/using/fstream
-include/stlport/using/h/fstream.h
+include/stlport/using/iostream
+include/stlport/using/istream
+include/stlport/using/h/ostream.h
 include/stlport/using/h/iomanip.h
+include/stlport/using/h/fstream.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/iomanip
+include/stlport/using/h/streambuf.h
+include/stlport/using/streambuf
+include/stlport/using/cstring
 include/stlport/using/ios
-include/stlport/using/iosfwd
-include/stlport/using/iostream
-include/stlport/using/istream
-include/stlport/using/locale
 include/stlport/using/ostream
+include/stlport/using/iosfwd
+include/stlport/using/iomanip
 include/stlport/using/sstream
-include/stlport/using/streambuf
-include/stlport/using/strstream
-include/stlport/utility
+include/stlport/complex
+include/stlport/cfloat
+include/stlport/ostream
+include/stlport/sstream
+include/stlport/new.h
+include/stlport/csignal
+include/stlport/iso646.h
 include/stlport/valarray
+include/stlport/algorithm
+include/stlport/fstream.h
+include/stlport/istream.h
+include/stlport/float.h
+include/stlport/string.h
+include/stlport/typeinfo
+include/stlport/ciso646
+include/stlport/slist
+include/stlport/exception
+include/stlport/stddef.h
+include/stlport/locale
+include/stlport/ostream.h
 include/stlport/vector
+include/stlport/deque
+include/stlport/stdexcept
+include/stlport/climits
+include/stlport/stdlib.h
+include/stlport/stdio.h
+include/stlport/iostream.h
+include/stlport/cstring
+include/stlport/list
+include/stlport/pthread.h
+include/stlport/cwctype
+include/stlport/hash_map
+include/stlport/rlocks.h
+include/stlport/queue
+include/stlport/exception.h
+include/stlport/strstream
+include/stlport/cerrno
+include/stlport/streambuf
+include/stlport/new
+include/stlport/ios
 include/stlport/wchar.h
-include/stlport/wctype.h
-include/stlport/wrap_std/complex
-include/stlport/wrap_std/export
-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/iomanip
-include/stlport/wrap_std/ios
-include/stlport/wrap_std/iosfwd
-include/stlport/wrap_std/iostream
-include/stlport/wrap_std/istream
-include/stlport/wrap_std/locale
-include/stlport/wrap_std/ostream
-include/stlport/wrap_std/sstream
-include/stlport/wrap_std/streambuf
-include/stlport/wrap_std/strstream
-lib/libstlport_%%COMPILER%%.a
+include/stlport/hash_set
+include/stlport/ctime
+include/stlport/fstream
+include/stlport/clocale
+include/stlport/signal.h
+include/stlport/cassert
+include/stlport/ctype.h
+include/stlport/stdarg.h
+include/stlport/strstream.h
+include/stlport/errno.h
+include/stlport/streambuf.h
 lib/libstlport_%%COMPILER%%.so
-lib/libstlport_%%COMPILER%%.so_4_6
-lib/libstlport_%%COMPILER%%_stldebug.a
-lib/libstlport_%%COMPILER%%_stldebug.so
-lib/libstlport_%%COMPILER%%_stldebug.so_4_6
-%%PORTDOCS%%share/doc/stlport/README.BC.html
-%%PORTDOCS%%share/doc/stlport/README.CW.html
-%%PORTDOCS%%share/doc/stlport/README.DEC.html
-%%PORTDOCS%%share/doc/stlport/README.MPW.html
-%%PORTDOCS%%share/doc/stlport/README.VC++.html
-%%PORTDOCS%%share/doc/stlport/README.aCC.html
-%%PORTDOCS%%share/doc/stlport/README.gcc.html
-%%PORTDOCS%%share/doc/stlport/README.os390.html
-%%PORTDOCS%%share/doc/stlport/README.pow.html
-%%PORTDOCS%%share/doc/stlport/README.sgi40.html
-%%PORTDOCS%%share/doc/stlport/README.sunpro.html
-%%PORTDOCS%%share/doc/stlport/README.xlC.html
-%%PORTDOCS%%share/doc/stlport/auto_configure.html
-%%PORTDOCS%%share/doc/stlport/bug_report.html
-%%PORTDOCS%%share/doc/stlport/buglist.html
-%%PORTDOCS%%share/doc/stlport/compiler_readmes.html
-%%PORTDOCS%%share/doc/stlport/configure.html
-%%PORTDOCS%%share/doc/stlport/copyrights.html
-%%PORTDOCS%%share/doc/stlport/cvs.html
-%%PORTDOCS%%share/doc/stlport/debug_mode.html
-%%PORTDOCS%%share/doc/stlport/doc.css
-%%PORTDOCS%%share/doc/stlport/eh_testsuite.html
-%%PORTDOCS%%share/doc/stlport/exception_safety.html
-%%PORTDOCS%%share/doc/stlport/images/black.gif
-%%PORTDOCS%%share/doc/stlport/images/stl_logo_doc.gif
-%%PORTDOCS%%share/doc/stlport/images/t_doc2.gif
-%%PORTDOCS%%share/doc/stlport/images/trans.gif
-%%PORTDOCS%%share/doc/stlport/index.html
-%%PORTDOCS%%share/doc/stlport/install.html
-%%PORTDOCS%%share/doc/stlport/license.html
-%%PORTDOCS%%share/doc/stlport/platforms.html
-%%PORTDOCS%%share/doc/stlport/projects.html
-%%PORTDOCS%%share/doc/stlport/release_notes.html
-%%PORTDOCS%%share/doc/stlport/select_io.html
-%%PORTDOCS%%share/doc/stlport/sgi_stl.html
-%%PORTDOCS%%share/doc/stlport/story.html
-%%PORTDOCS%%share/doc/stlport/testsuite.html
-%%PORTDOCS%%share/doc/stlport/thanks.html
-%%PORTDOCS%%share/doc/stlport/use_stlport.html
-%%PORTDOCS%%share/doc/stlport/vendor_interface.html
-%%PORTDOCS%%share/doc/stlport/wrappers.html
-%%PORTDOCS%%@dirrm share/doc/stlport/images
-%%PORTDOCS%%@dirrm share/doc/stlport
-@dirrm include/stlport/wrap_std/h
-@dirrm include/stlport/wrap_std
-@dirrm include/stlport/using/h
-@dirrm include/stlport/using
-@dirrm include/stlport/stl/wrappers
+lib/libstlport_%%COMPILER%%.so.%%V1%%
+lib/libstlport_%%COMPILER%%.so.%%V2%%
+lib/libstlport_%%COMPILER%%.so.%%VER%%
+lib/libstlportg_%%COMPILER%%.so
+lib/libstlportg_%%COMPILER%%.so.%%V1%%
+lib/libstlportg_%%COMPILER%%.so.%%V2%%
+lib/libstlportg_%%COMPILER%%.so.%%VER%%
+lib/libstlportstlg_%%COMPILER%%.so
+lib/libstlportstlg_%%COMPILER%%.so.%%V1%%
+lib/libstlportstlg_%%COMPILER%%.so.%%V2%%
+lib/libstlportstlg_%%COMPILER%%.so.%%VER%%
 @dirrm include/stlport/stl/debug
+@dirrm include/stlport/stl/pointers
+@dirrm include/stlport/stl/config
 @dirrm include/stlport/stl
-@dirrm include/stlport/old_hp
-@dirrm include/stlport/config
+@dirrm include/stlport/using/h
+@dirrm include/stlport/using
 @dirrm include/stlport