Update boost to 1.16.1. Bugfixes, new "functional" library, and better

documentation.

4 files changed, 67 insertions, 51 deletions

diff --git a/devel/boost/Makefile b/devel/boost/Makefile
index 9ae194a9b38..011d2776737 100644
--- a/devel/boost/Makefile
+++ b/devel/boost/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2000/06/20 06:04:40 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2000/07/13 18:25:32 jlam Exp $
 
 DISTNAME=		boost_all
-PKGNAME=		boost-1.15.0
+PKGNAME=		boost-1.16.1
 CATEGORIES=		devel
 MASTER_SITES=		http://www.boost.org/
 EXTRACT_SUFX=		.zip
@@ -9,70 +9,58 @@ EXTRACT_SUFX=		.zip
 MAINTAINER=		jlam@netbsd.org
 HOMEPAGE=		http://www.boost.org/
 
-BUILD_DEPENDS+=		${LOCALBASE}/bin/unzip:../../archivers/unzip
-
 # Need working <limits> and <memory> not present in NetBSD yet.
 DEPENDS+=		sgi-stl>=3.2:../../devel/sgi-stl
 
-USE_PKGLIBTOOL=		# defined
+USE_LIBTOOL=		# defined
 
 DIST_SUBDIR=		${PKGNAME}
-EXTRACT_CMD=		${LOCALBASE}/bin/unzip -aaLu ${DOWNLOADED_DISTFILE}
 NO_WRKSUBDIR=		# defined
 
 BOOST_VERS=		0:0
 MAKE_ENV+=		BOOST_VERS="${BOOST_VERS}"
 
-INCSDIR=		${PREFIX}/include
-LIBDIR=			${PREFIX}/lib
-HTMLDOCDIR=		${PREFIX}/share/doc/html
-
 # 2-step extraction process:
 #
 # 1) Extract everything in text mode with CR/LF -> LF conversions.
 # 2) Extract binary files in binary mode.
 #
+# We remove the dir_it library since our GCC (egcs-1.1.2) doesn't
+# support namespaces and hence can't compile `struct iterator' needed
+# by dir_it.
+#
 post-extract:
-	cd ${WRKSRC}; ${LOCALBASE}/bin/unzip -aCLo \
+	cd ${WRKSRC} && unzip -aaLo \
+		${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}
+	cd ${WRKSRC} && unzip -aCLo \
 		${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX} "*.gif" "*.jpg" "*.zip"
-	cd ${WRKSRC}; ${LOCALBASE}/bin/unzip -aaCLu \
+	cd ${WRKSRC} && unzip -aaCLu \
 		libs/pri_queue/boost-heap-1.0.zip "boost/*"
+	${RM} -rf ${WRKSRC}/libs/dir_it
+
+post-build:
+	${FIND} ${WRKSRC}/libs \
+		\( -name "*.zip" -or -name "*.tgz" \
+		   -or -name "*.orig" -or -name "*.bak" \
+		   -or -name "c++boost.gif" \) \
+		-exec ${RM} {} \;
 
 do-configure:
 	cd ${FILESDIR}; ${CP} Makefile ${WRKSRC}
 
-# We don't install the dir_it library since our GCC (egcs-1.1.2) doesn't
-# support namespaces and hence can't compile `struct iterator' needed by
-# dir_it.
-#
 do-install:
-	${INSTALL_DATA_DIR} ${INCSDIR}/boost
-	${INSTALL_DATA_DIR} ${INCSDIR}/boost/detail
-	cd ${WRKSRC}; \
-	for file in `${GREP} "^include/" ${PLIST_SRC} \
-	    | ${SED} "s,^include/,,g"`; do \
-		${ECHO} ${INSTALL_DATA} $${file} ${INCSDIR}/$${file}; \
-		${INSTALL_DATA} $${file} ${INCSDIR}/$${file}; \
-	done
 	cd ${WRKSRC}; ${LIBTOOL} ${INSTALL_DATA} libboost.la ${LIBDIR}
-	${INSTALL_DATA_DIR} ${HTMLDOCDIR}/boost
-	${INSTALL_DATA_DIR} ${HTMLDOCDIR}/boost/libs
-	${INSTALL_DATA_DIR} ${HTMLDOCDIR}/boost/libs/array
-	${INSTALL_DATA_DIR} ${HTMLDOCDIR}/boost/libs/compose
-	${INSTALL_DATA_DIR} ${HTMLDOCDIR}/boost/libs/integer
-	${INSTALL_DATA_DIR} ${HTMLDOCDIR}/boost/libs/min_rand
-	${INSTALL_DATA_DIR} ${HTMLDOCDIR}/boost/libs/pri_queue
-	${INSTALL_DATA_DIR} ${HTMLDOCDIR}/boost/libs/random
-	${INSTALL_DATA_DIR} ${HTMLDOCDIR}/boost/libs/rational
-	${INSTALL_DATA_DIR} ${HTMLDOCDIR}/boost/libs/smart_ptr
-	${INSTALL_DATA_DIR} ${HTMLDOCDIR}/boost/libs/timer
-	${INSTALL_DATA_DIR} ${HTMLDOCDIR}/boost/libs/utility
-	${INSTALL_DATA_DIR} ${HTMLDOCDIR}/boost/more
-	cd ${WRKSRC}; \
-	for file in `${GREP} "^share/doc/html/boost/" ${PLIST_SRC} \
-	    | ${SED} "s,^share/doc/html/boost/,,g"`; do \
-		${ECHO} ${INSTALL_DATA} $${file} ${HTMLDOCDIR}/boost/$${file}; \
-		${INSTALL_DATA} $${file} ${HTMLDOCDIR}/boost/$${file}; \
-	done
+	${CP} -R ${WRKSRC}/boost ${PREFIX}/include
+	${MKDIR} ${PREFIX}/share/doc/html/boost
+	${INSTALL_DATA} \
+		${WRKSRC}/c++boost.gif \
+		${WRKSRC}/index.htm \
+		${WRKSRC}/libraries.htm \
+		${PREFIX}/share/doc/html/boost
+	${CP} -R ${WRKSRC}/libs ${WRKSRC}/more ${PREFIX}/share/doc/html/boost
+	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} \
+		${PREFIX}/include/boost ${PREFIX}/share/doc/html/boost
+	${CHMOD} -R a+r-w \
+		${PREFIX}/include/boost ${PREFIX}/share/doc/html/boost
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/boost/files/Makefile b/devel/boost/files/Makefile
index a0bb198ca1f..eb2e0f86d17 100644
--- a/devel/boost/files/Makefile
+++ b/devel/boost/files/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/05/29 22:46:44 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2000/07/13 18:25:33 jlam Exp $
 
 CXX=		c++
 
@@ -16,7 +16,7 @@ CPPFLAGS+=	-I${.CURDIR} -I${LOCALBASE}/include/sgi-stl
 all:	${LIB}
 
 ${LIB}:	${LOBJS}
-	${LIBTOOL} --cplusplus ${CXX} ${CXXFLAGS} -o ${.TARGET} ${LOBJS} \
+	${LIBTOOL} ${CXX} ${CXXFLAGS} -o ${.TARGET} ${LOBJS} \
 		-rpath ${PREFIX}/lib -version-info ${BOOST_VERS}
 
 prg_display.lo:	libs/timer/prg_display.cpp
diff --git a/devel/boost/files/md5 b/devel/boost/files/md5
index 88b69781387..cbb38dd4f7d 100644
--- a/devel/boost/files/md5
+++ b/devel/boost/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.3 2000/06/20 06:04:41 jlam Exp $
+$NetBSD: md5,v 1.4 2000/07/13 18:25:33 jlam Exp $
 
-MD5 (boost-1.15.0/boost_all.zip) = c1e98c3d40858e3a7e98da9a9d65e284
+MD5 (boost-1.16.1/boost_all.zip) = 2d4940bc4a173f4ea7f5e1473d7d9474
diff --git a/devel/boost/pkg/PLIST b/devel/boost/pkg/PLIST
index 79504201322..2be69522895 100644
--- a/devel/boost/pkg/PLIST
+++ b/devel/boost/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2000/06/20 06:04:42 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2000/07/13 18:25:34 jlam Exp $
 include/boost/array.hpp
 include/boost/call_traits.hpp
 include/boost/cast.hpp
@@ -16,9 +16,11 @@ include/boost/detail/ob_type_traits.hpp
 include/boost/detail/type_traits.hpp
 include/boost/f_heap.cc
 include/boost/f_heap.hpp
+include/boost/functional.hpp
 include/boost/heap.hpp
 include/boost/integer.hpp
 include/boost/integer_traits.hpp
+include/boost/iterator.hpp
 include/boost/l_heap.cc
 include/boost/l_heap.hpp
 include/boost/min_rand.hpp
@@ -42,14 +44,14 @@ include/boost/stdint.h
 include/boost/timer.hpp
 include/boost/type_traits.hpp
 include/boost/utility.hpp
-lib/libboost.a
-lib/libboost.so.0.0
 share/doc/html/boost/c++boost.gif
 share/doc/html/boost/index.htm
 share/doc/html/boost/libraries.htm
 share/doc/html/boost/libs/array/array-article.html
 share/doc/html/boost/libs/array/array_traits.html
 share/doc/html/boost/libs/array/index.html
+share/doc/html/boost/libs/compiler_status.htm
+share/doc/html/boost/libs/compose/compose.hpp
 share/doc/html/boost/libs/compose/compose.hpp.html
 share/doc/html/boost/libs/compose/compose.html
 share/doc/html/boost/libs/compose/compose1.cpp
@@ -63,7 +65,17 @@ share/doc/html/boost/libs/compose/compose4.cpp.html
 share/doc/html/boost/libs/compose/index.htm
 share/doc/html/boost/libs/compose/print.hpp
 share/doc/html/boost/libs/compose/print.hpp.html
+share/doc/html/boost/libs/config/config_test.cpp
+share/doc/html/boost/libs/config/index.htm
+share/doc/html/boost/libs/functional/binders.html
+share/doc/html/boost/libs/functional/function_test.cpp
+share/doc/html/boost/libs/functional/function_traits.html
+share/doc/html/boost/libs/functional/index.html
+share/doc/html/boost/libs/functional/mem_fun.html
+share/doc/html/boost/libs/functional/negators.html
+share/doc/html/boost/libs/functional/ptr_fun.html
 share/doc/html/boost/libs/integer/cstdint.htm
+share/doc/html/boost/libs/integer/cstdint_test.cpp
 share/doc/html/boost/libs/integer/index.htm
 share/doc/html/boost/libs/integer/integer.htm
 share/doc/html/boost/libs/integer/integer_test.cpp
@@ -90,7 +102,9 @@ share/doc/html/boost/libs/pri_queue/r_heap.html
 share/doc/html/boost/libs/pri_queue/s_heap.html
 share/doc/html/boost/libs/pri_queue/sidebar.jpg
 share/doc/html/boost/libs/pri_queue/stack.html
+share/doc/html/boost/libs/random/histogram.cpp
 share/doc/html/boost/libs/random/index.html
+share/doc/html/boost/libs/random/integrate.hpp
 share/doc/html/boost/libs/random/nondet_random.html
 share/doc/html/boost/libs/random/nondet_random_speed.cpp
 share/doc/html/boost/libs/random/random-concepts.html
@@ -98,7 +112,11 @@ share/doc/html/boost/libs/random/random-distributions.html
 share/doc/html/boost/libs/random/random-generators.html
 share/doc/html/boost/libs/random/random-misc.html
 share/doc/html/boost/libs/random/random_demo.cpp
+share/doc/html/boost/libs/random/random_device.cpp
 share/doc/html/boost/libs/random/random_speed.cpp
+share/doc/html/boost/libs/random/random_test.cpp
+share/doc/html/boost/libs/random/statistic_tests.cpp
+share/doc/html/boost/libs/random/statistic_tests.hpp
 share/doc/html/boost/libs/rational/index.html
 share/doc/html/boost/libs/rational/rational.html
 share/doc/html/boost/libs/rational/rational_example.cpp
@@ -113,10 +131,14 @@ share/doc/html/boost/libs/smart_ptr/smart_ptr.htm
 share/doc/html/boost/libs/smart_ptr/smart_ptr_test.cpp
 share/doc/html/boost/libs/smart_ptr/smarttests.htm
 share/doc/html/boost/libs/timer/index.htm
+share/doc/html/boost/libs/timer/prg_display.cpp
+share/doc/html/boost/libs/timer/prg_timer.cpp
+share/doc/html/boost/libs/timer/timer.cpp
 share/doc/html/boost/libs/timer/timer.htm
 share/doc/html/boost/libs/timer/timer_test.cpp
 share/doc/html/boost/libs/utility/algo_opt_examples.cpp
 share/doc/html/boost/libs/utility/call_traits.htm
+share/doc/html/boost/libs/utility/call_traits_test.cpp
 share/doc/html/boost/libs/utility/cast.htm
 share/doc/html/boost/libs/utility/cast_test.cpp
 share/doc/html/boost/libs/utility/compressed_pair.htm
@@ -138,14 +160,20 @@ share/doc/html/boost/more/lib_guide.htm
 share/doc/html/boost/more/submission_process.htm
 share/doc/html/boost/more/use_other_libs.htm
 @dirrm share/doc/html/boost/more
+@dirrm share/doc/html/boost/libs/utility/debug
 @dirrm share/doc/html/boost/libs/utility
 @dirrm share/doc/html/boost/libs/timer
+@dirrm share/doc/html/boost/libs/smart_ptr/debug
 @dirrm share/doc/html/boost/libs/smart_ptr
+@dirrm share/doc/html/boost/libs/rational/debug
 @dirrm share/doc/html/boost/libs/rational
-@dirrm share/doc/html/boost/libs/random/
+@dirrm share/doc/html/boost/libs/random
 @dirrm share/doc/html/boost/libs/pri_queue
 @dirrm share/doc/html/boost/libs/min_rand
+@dirrm share/doc/html/boost/libs/integer/debug
 @dirrm share/doc/html/boost/libs/integer
+@dirrm share/doc/html/boost/libs/functional
+@dirrm share/doc/html/boost/libs/config
 @dirrm share/doc/html/boost/libs/compose
 @dirrm share/doc/html/boost/libs/array
 @dirrm share/doc/html/boost/libs