8 files changed, 345 insertions, 106 deletions

diff --git a/devel/stlport/Makefile b/devel/stlport/Makefile
index 1c577a6d001d..9db1c1a74b56 100644
--- a/devel/stlport/Makefile
+++ b/devel/stlport/Makefile
@@ -7,13 +7,13 @@
 #
 
 PORTNAME=	stlport
-PORTVERSION=	4.0
+PORTVERSION=	4.5
 CATEGORIES=	devel
 MASTER_SITES=	http://www.stlport.com/archive/  \
 		http://www.stlport.com/beta/
 DISTNAME=	STLport-${PORTVERSION:S/.b/-b/}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	pmarquis@pobox.com
 
 .include <bsd.port.pre.mk>
 
@@ -22,38 +22,24 @@ BROKEN=		"requires /usr/include/wchar.h for compilation"
 .endif
 
 WRKSRC=		${WRKDIR}/STLport-${PORTVERSION:S/.b/b/}/src
-MAKEFILE=	gcc.mak
-ALL_TARGET=	clean all
+PATCH_WRKSRC=	${WRKDIR}/STLport-${PORTVERSION:S/.b/b/}
 USE_GMAKE=	yes
-
-FIND?=	/usr/bin/find
+MAKEFILE=	gcc-freebsd.mak
+MAKE_ARGS=	INSTALLDIR=${PREFIX}
+ALL_TARGET=	clean all
+INSTALL_TARGET=	install_unix
+INSTALLS_SHLIB=	ye
 
 .if ${OSVERSION} < 440000
 BROKEN=		"Not supported on systems prior to FreeBSD 4.4"
 .endif
 
-pre-build:
-	@${LN} -sf /usr/include/g++ ${WRKSRC}/../include
-
-post-build:
-.for lib in libstlport_gcc.so libstlport_gcc_debug.so libstlport_gcc_stldebug.so
-	@${MV} ${WRKSRC}/../lib/${lib} ${WRKSRC}/../lib/${lib}.4_0_${PORTREVISION}
-.endfor
-	-# get list from `export' files in version 4.1, rather than do this
-	@cd ${WRKSRC}/../stlport ; ${RM} -rf BC50 SC5 config/new_compiler old_hp
-	@${FIND} ${WRKSRC}/../stlport -name "*.orig" -delete
-
-do-install:
-	@cd ${WRKSRC}/.. ; pax -rw stlport ${PREFIX}/include
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/include/stlport
-	@${CHMOD} -R ${SHAREMODE} ${PREFIX}/include/stlport
-	@${FIND} ${PREFIX}/include/stlport -type d -exec ${CHMOD} 0755 {} \;
-	@${INSTALL_DATA} ${WRKSRC}/../lib/* ${PREFIX}/lib
-.for lib in libstlport_gcc.so libstlport_gcc_debug.so libstlport_gcc_stldebug.so
-	@cd ${PREFIX}/lib ; ${LN} -sf ${lib}.4_0_${PORTREVISION} ${lib}
-.endfor
-	@${MKDIR} ${PREFIX}/share/doc/html/stlport/images
-	@cd ${WRKSRC}/../doc ; ${INSTALL_MAN} *.css *.html ${PREFIX}/share/doc/html/stlport
-	@cd ${WRKSRC}/../doc ; ${INSTALL_MAN} images/* ${PREFIX}/share/doc/html/stlport/images
+.if !defined(NOPORTDOCS)
+post-install:
+	@${MKDIR} ${DOCSDIR}/images
+	${INSTALL_DATA} ${WRKSRC}/../doc/*.css ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/../doc/*.html ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/../doc/images/* ${DOCSDIR}/images
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/stlport/distinfo b/devel/stlport/distinfo
index 9cb33eafc7d7..cf080a0cdb59 100644
--- a/devel/stlport/distinfo
+++ b/devel/stlport/distinfo
@@ -1 +1 @@
-MD5 (STLport-4.0.tar.gz) = 9f46fa470328f55c550b829abbf8611b
+MD5 (STLport-4.5.tar.gz) = 18f577b374d60b3c760a3a3350407632
diff --git a/devel/stlport/files/patch-common_macros.mak b/devel/stlport/files/patch-common_macros.mak
new file mode 100644
index 000000000000..5ff5c7376e02
--- /dev/null
+++ b/devel/stlport/files/patch-common_macros.mak
@@ -0,0 +1,11 @@
+--- src/common_macros.mak.orig	Sat Jul 28 23:44:30 2001
++++ src/common_macros.mak	Fri Oct  5 09:05:56 2001
+@@ -14,7 +14,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)
+ 
+ DYNAMIC_SUFFIX= $(VERSION_SUFFIX)$(PATCH_SUFFIX)
+ 
diff --git a/devel/stlport/files/patch-common_rules.mak b/devel/stlport/files/patch-common_rules.mak
new file mode 100644
index 000000000000..874a34681834
--- /dev/null
+++ b/devel/stlport/files/patch-common_rules.mak
@@ -0,0 +1,45 @@
+--- src/common_rules.mak.orig	Thu May 31 20:43:14 2001
++++ src/common_rules.mak	Fri Oct  5 00:29:33 2001
+@@ -86,8 +86,8 @@
+ 	ln -s $(STLDEBUG_DYNLIB) $(OUTDIR)/$(STLDEBUG_NAME).$(DYNEXT)
+ 
+ install_unix :
+-	-$(RM) $(INSTALLDIR_INC)
+-	for dir in $(HEADER_DIRS1); \
++	@-$(RM) $(INSTALLDIR_INC)
++	@for dir in $(HEADER_DIRS1); \
+ 	do \
+ 	  ./mkinstalldirs $(INSTALLDIR_INC)/$$dir; \
+ 	  for file in `cat ../stlport/$$dir/export`; \
+@@ -95,7 +95,7 @@
+ 		$(INSTALL_H) ../stlport/$$dir/$$file $(INSTALLDIR_INC)/$$dir ; \
+           done \
+ 	done
+-	for dir in $(HEADER_DIRS2); \
++	@for dir in $(HEADER_DIRS2); \
+ 	do \
+ 	  ./mkinstalldirs $(INSTALLDIR_INC)/$$dir; \
+ 	  for file in `ls ../stlport/$$dir/*.*`; \
+@@ -103,16 +103,16 @@
+ 		$(INSTALL_H) $$file $(INSTALLDIR_INC)/$$dir ; \
+           done \
+ 	done
+-	./mkinstalldirs $(INSTALLDIR_LIB)
+-	for file in `ls $(OUTDIR)/$(LIB_BASENAME)*`; \
++	@./mkinstalldirs $(INSTALLDIR_LIB)
++	@for file in `ls $(OUTDIR)/$(LIB_BASENAME)*`; \
+ 	do \
+          $(RM)  $(INSTALLDIR_LIB)/$$file; \
+ 	 $(INSTALL_LIB)  $$file $(INSTALLDIR_LIB); \
+ 	done
+-	$(RM) $(INSTALLDIR_LIB)/$(RELEASE_NAME).$(DYNEXT)
+-	$(RM) $(INSTALLDIR_LIB)/$(STLDEBUG_NAME).$(DYNEXT)
+-	ln -s $(INSTALLDIR_LIB)/$(RELEASE_DYNLIB) $(INSTALLDIR_LIB)/$(RELEASE_NAME).$(DYNEXT)
+-	ln -s $(INSTALLDIR_LIB)/$(STLDEBUG_DYNLIB) $(INSTALLDIR_LIB)/$(STLDEBUG_NAME).$(DYNEXT)
++	@$(RM) $(INSTALLDIR_LIB)/$(RELEASE_NAME).$(DYNEXT)
++	@$(RM) $(INSTALLDIR_LIB)/$(STLDEBUG_NAME).$(DYNEXT)
++	@ln -s $(INSTALLDIR_LIB)/$(RELEASE_DYNLIB) $(INSTALLDIR_LIB)/$(RELEASE_NAME).$(DYNEXT)
++	@ln -s $(INSTALLDIR_LIB)/$(STLDEBUG_DYNLIB) $(INSTALLDIR_LIB)/$(STLDEBUG_NAME).$(DYNEXT)
+ 
+ $(OUTDIR)$(PATH_SEP)$(RELEASE_DYNLIB) : $(OUTDIR) $(RELEASE_OBJDIR_dynamic) $(DEF_FILE) $(RELEASE_OBJECTS_dynamic)
+ 	$(DYN_LINK) $(DYNLINK_OUT)$(OUTDIR)$(PATH_SEP)$(RELEASE_DYNLIB) $(LDFLAGS_RELEASE_dynamic) $(RELEASE_OBJECTS_dynamic) $(LDLIBS_RELEASE_dynamic) 
diff --git a/devel/stlport/files/patch-export b/devel/stlport/files/patch-export
new file mode 100644
index 000000000000..2305985fba60
--- /dev/null
+++ b/devel/stlport/files/patch-export
@@ -0,0 +1,163 @@
+--- stlport/export.orig	Mon May  7 22:49:32 2001
++++ stlport/export	Sun Sep 30 22:07:42 2001
+@@ -1,160 +1,85 @@
+ ./algorithm
+-./algorithm.SUNWCCh
+ ./bitset
+-./bitset.SUNWCCh
+ ./cassert
+-./cassert.SUNWCCh
+ ./cctype
+-./cctype.SUNWCCh
+ ./cerrno
+-./cerrno.SUNWCCh
+ ./cfloat
+-./cfloat.SUNWCCh
+ ./climits
+-./climits.SUNWCCh
+ ./clocale
+-./clocale.SUNWCCh
+ ./cmath
+-./cmath.SUNWCCh
+ ./complex
+-./complex.SUNWCCh
+ ./csetjmp
+-./csetjmp.SUNWCCh
+ ./csignal
+-./csignal.SUNWCCh
+ ./cstdarg
+-./cstdarg.SUNWCCh
+ ./cstddef
+-./cstddef.SUNWCCh
+ ./cstdio
+-./cstdio.SUNWCCh
+ ./cstdlib
+-./cstdlib.SUNWCCh
+ ./cstring
+-./cstring.SUNWCCh
+ ./ctime
+-./ctime.SUNWCCh
+ ./ctype.h
+-./ctype.h.SUNWCCh
+ ./cwchar
+-./cwchar.SUNWCCh
+ ./cwctype
+-./cwctype.SUNWCCh
+ ./deque
+-./deque.SUNWCCh
+ ./exception
+-./exception.SUNWCCh
+ ./exception.h
+ ./export
+ ./fstream
+-./fstream.SUNWCCh
+ ./fstream.h
+-./fstream.h.SUNWCCh
+ ./functional
+-./functional.SUNWCCh
+ ./hash_map
+-./hash_map.SUNWCCh
+ ./hash_set
+-./hash_set.SUNWCCh
+ ./iomanip
+-./iomanip.SUNWCCh
+ ./iomanip.h
+-./iomanip.h.SUNWCCh
+ ./ios
+-./ios.SUNWCCh
+ ./ios.h
+-./ios.h.SUNWCCh
+ ./iosfwd
+-./iosfwd.SUNWCCh
+ ./iostream
+-./iostream.SUNWCCh
+ ./iostream.h
+-./iostream.h.SUNWCCh
+ ./istream
+-./istream.SUNWCCh
+ ./istream.h
+-./istream.h.SUNWCCh
+ ./iterator
+-./iterator.SUNWCCh
+ ./limits
+-./limits.SUNWCCh
+ ./list
+-./list.SUNWCCh
+ ./locale
+-./locale.SUNWCCh
+ ./locale.h
+-./locale.h.SUNWCCh
+ ./map
+-./map.SUNWCCh
+ ./math.h
+-./math.h.SUNWCCh
+ ./mem.h
+ ./memory
+-./memory.SUNWCCh
+ ./mmemory.h
+ ./new
+-./new.SUNWCCh
+ ./new.h
+ ./numeric
+-./numeric.SUNWCCh
+ ./ostream
+-./ostream.SUNWCCh
+ ./ostream.h
+-./ostream.h.SUNWCCh
+ ./pthread.h
+ ./pthread_alloc
+-./pthread_alloc.SUNWCCh
+ ./queue
+-./queue.SUNWCCh
+ ./rope
+ ./set
+-./set.SUNWCCh
+ ./setjmp.h
+-./setjmp.h.SUNWCCh
+ ./signal.h
+-./signal.h.SUNWCCh
+ ./slist
+-./slist.SUNWCCh
+ ./sstream
+-./sstream.SUNWCCh
+ ./stack
+-./stack.SUNWCCh
+ ./stdarg.h
+-./stdarg.h.SUNWCCh
+ ./stddef.h
+-./stddef.h.SUNWCCh
+ ./stdexcept
+-./stdexcept.SUNWCCh
+ ./stdio.h
+-./stdio.h.SUNWCCh
+ ./stdio_streambuf
+ ./stdlib.h
+-./stdlib.h.SUNWCCh
+ ./stl_user_config.h
+ ./streambuf
+-./streambuf.SUNWCCh
+ ./streambuf.h
+-./streambuf.h.SUNWCCh
+ ./string
+-./string.SUNWCCh
+ ./string.h
+-./string.h.SUNWCCh
+ ./strstream
+-./strstream.SUNWCCh
+ ./strstream.h
+-./strstream.h.SUNWCCh
+ ./time.h
+-./time.h.SUNWCCh
+ ./typeinfo
+-./typeinfo.SUNWCCh
+ ./typeinfo.h
+ ./utility
+-./utility.SUNWCCh
+ ./valarray
+-./valarray.SUNWCCh
+ ./vector
+-./vector.SUNWCCh
+ ./wchar.h
+-./wchar.h.SUNWCCh
+ ./wctype.h
+-./wctype.h.SUNWCCh
diff --git a/devel/stlport/files/patch-mkinstalldirs b/devel/stlport/files/patch-mkinstalldirs
new file mode 100644
index 000000000000..61a7fb9bcd2f
--- /dev/null
+++ b/devel/stlport/files/patch-mkinstalldirs
@@ -0,0 +1,11 @@
+--- src/mkinstalldirs.orig	Thu Dec  7 19:54:47 2000
++++ src/mkinstalldirs	Fri Oct  5 01:03:31 2001
+@@ -19,7 +19,7 @@
+      esac
+ 
+      if test ! -d "$pathcomp"; then
+-        echo "mkdir $pathcomp" 1>&2
++#        echo "mkdir $pathcomp" 1>&2
+         mkdir "$pathcomp" || errstatus=$?
+      fi
+ 
diff --git a/devel/stlport/files/patch-stl_gcc.h b/devel/stlport/files/patch-stl_gcc.h
deleted file mode 100644
index 9c39b612ae2c..000000000000
--- a/devel/stlport/files/patch-stl_gcc.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../stlport/config/stl_gcc.h.orig	Thu Jul 13 18:53:26 2000
-+++ ../stlport/config/stl_gcc.h	Thu May 17 00:35:52 2001
-@@ -14,7 +14,9 @@
- #   define __STL_HAS_NO_NEW_C_HEADERS     1
- 
-+#if 0
- # if defined(__FreeBSD__)
- #  define __STL_NO_WCHAR_T
- # endif
-+#endif
- 
- # if defined(__MINGW32__)
diff --git a/devel/stlport/pkg-plist b/devel/stlport/pkg-plist
index 1fb32a758762..b49eaa383727 100644
--- a/devel/stlport/pkg-plist
+++ b/devel/stlport/pkg-plist
@@ -1,4 +1,3 @@
-@comment $FreeBSD$
 include/stlport/algorithm
 include/stlport/bitset
 include/stlport/cassert
@@ -13,7 +12,6 @@ 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
@@ -21,6 +19,7 @@ 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_fujitsu.h
 include/stlport/config/stl_gcc.h
 include/stlport/config/stl_hpacc.h
 include/stlport/config/stl_ibm.h
@@ -33,6 +32,7 @@ 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
@@ -46,7 +46,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 +53,7 @@ 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
@@ -77,13 +77,40 @@ 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/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
@@ -97,25 +124,32 @@ 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/_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 +157,7 @@ include/stlport/stl/_exception.h
 include/stlport/stl/_fstream.c
 include/stlport/stl/_fstream.h
 include/stlport/stl/_function.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,27 +171,34 @@ 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/_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
@@ -173,6 +215,7 @@ 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 +223,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,7 +248,6 @@ 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
@@ -216,7 +259,6 @@ 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
@@ -243,6 +285,7 @@ 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/iomanip
 include/stlport/using/ios
@@ -260,6 +303,7 @@ include/stlport/vector
 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
@@ -277,63 +321,53 @@ include/stlport/wrap_std/streambuf
 include/stlport/wrap_std/strstream
 lib/libstlport_gcc.a
 lib/libstlport_gcc.so
-lib/libstlport_gcc.so.4_0_0
-lib/libstlport_gcc_debug.a
-lib/libstlport_gcc_debug.so
-lib/libstlport_gcc_debug.so.4_0_0
+lib/libstlport_gcc.so_4_5
 lib/libstlport_gcc_stldebug.a
 lib/libstlport_gcc_stldebug.so
-lib/libstlport_gcc_stldebug.so.4_0_0
-share/doc/html/stlport/FAQ.html
-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.VC++.html
-share/doc/html/stlport/README.aCC.html
-share/doc/html/stlport/README.gcc.html
-share/doc/html/stlport/README.os390.html
-share/doc/html/stlport/README.pow.html
-share/doc/html/stlport/README.sgi40.html
-share/doc/html/stlport/README.sunpro.html
-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/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
-share/doc/html/stlport/vendor_interface.html
-share/doc/html/stlport/wrappers.html
-@dirrm share/doc/html/stlport/images
-@dirrm share/doc/html/stlport
-@unexec rmdir %D/share/doc/html 2>/dev/null || true
+lib/libstlport_gcc_stldebug.so_4_5
+%%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
@@ -341,5 +375,6 @@ share/doc/html/stlport/wrappers.html
 @dirrm include/stlport/stl/wrappers
 @dirrm include/stlport/stl/debug
 @dirrm include/stlport/stl
+@dirrm include/stlport/old_hp
 @dirrm include/stlport/config
 @dirrm include/stlport