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

documentation.

1 files changed, 31 insertions, 43 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"