From ccc581fc0da6f50222457815b5b96e1c39af03d8 Mon Sep 17 00:00:00 2001
From: brad <brad@openbsd.org>
Date: Sun, 9 Dec 2012 08:23:31 +0000
Subject: [PATCH] Mostly cosmetic tweaking and sync distinfo.

ok ajacoutot@
---
 devel/boost/Makefile | 66 ++++++++++++++++++++------------------------
 devel/boost/distinfo |  3 --
 2 files changed, 30 insertions(+), 39 deletions(-)

diff --git a/devel/boost/Makefile b/devel/boost/Makefile
index 59caad32867..1f102160da2 100644
--- a/devel/boost/Makefile
+++ b/devel/boost/Makefile
@@ -1,15 +1,16 @@
-# $OpenBSD: Makefile,v 1.40 2012/10/15 20:31:59 robert Exp $
+# $OpenBSD: Makefile,v 1.41 2012/12/09 08:23:31 brad Exp $
 
 ONLY_FOR_ARCHS=	${GCC4_ARCHS}
 BROKEN-hppa =	ICE on src/tr1/assoc_laguerre.cpp
 
 COMMENT=	free peer-reviewed portable C++ source libraries
 
-PKGNAME=	boost-${VERSION}
-REVISION=	15
-
 VERSION=	1.42.0
 DISTNAME=	boost_${VERSION:S/./_/g}
+PKGNAME=	boost-${VERSION}
+REVISION=	15
+CATEGORIES=	devel
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=boost/}
 
 SO_VERSION=	4.0
 BOOST_LIBS=	boost_date_time boost_date_time-mt \
@@ -33,24 +34,25 @@ BOOST_LIBS=	boost_date_time boost_date_time-mt \
 		boost_unit_test_framework boost_unit_test_framework-mt \
 		boost_wave boost_wave-mt \
 		boost_wserialization boost_wserialization-mt
+
 .for _lib in ${BOOST_LIBS}
 SHARED_LIBS+=	${_lib} ${SO_VERSION}
 .endfor
 
-CATEGORIES=	devel
+HOMEPAGE=	http://www.boost.org/
 
 MAINTAINER=	Brad Smith <brad@comstyle.com>
 
-HOMEPAGE=	http://www.boost.org/
-VMEM_WARNING =	Yes
-
 # MIT-like
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=boost/}
+WANTLIB=	c m pthread stdc++ util z
+
+MODULES=	lang/python
+MODPY_RUNDEP=	No
 
 MAKE_ENV=	GCC="${CC}" GXX="${CXX}"
 
@@ -58,52 +60,44 @@ BJAM_CONFIG=	-sNO_BZIP2=1 \
 		-d+2 -q \
 		-j ${MAKE_JOBS} \
 		cflags='${CFLAGS}' cxxflags='${CXXFLAGS}' \
-		variant=release link=static,shared threading=single,multi 
+		variant=release link=static,shared threading=single,multi
 
-BOOTSTRAP_CONFIG=	--without-icu \
-			--with-python=${MODPY_BIN} \
-			--with-python-root=${LOCALBASE} \
-			--with-python-version=${MODPY_VERSION} \
-#			--without-libraries=test,thread,serialization,system,date_time,filesystem,graph,math,mpi,program_options,signals,wave
+BOOTSTRAP=	--without-icu \
+		--with-python=${MODPY_BIN} \
+		--with-python-root=${LOCALBASE} \
+		--with-python-version=${MODPY_VERSION}
 
+# python.port.mk makes assumptions about an empty CONFIGURE_STYLE
+CONFIGURE_STYLE= none
 CONFIGURE_ENV=	BJAM_CONFIG="${BJAM_CONFIG}"
 
+VMEM_WARNING=	Yes
+
+DPB_PROPERTIES= parallel
+
 NO_REGRESS=	Yes
 
-WANTLIB=	c m pthread stdc++ util z
-
-MODULES=	lang/python
-MODPY_RUNDEP=	No
-
-# python.port.mk makes assumptions about an empty CONFIGURE_STYLE
-CONFIGURE_STYLE=none
-
 SUBST_VARS+=	SO_VERSION
-pre-configure:
-	${SUBST_CMD} ${WRKSRC}/Jamroot
 
 do-configure:
+	@${SUBST_CMD} ${WRKSRC}/Jamroot
 	@cd ${WRKSRC}/libs/config && \
-		${SETENV} ${CONFIGURE_ENV} /bin/sh ./configure && \
-		cp user.hpp ${WRKSRC}/boost/config
-
-post-configure:
+	    ${SETENV} ${CONFIGURE_ENV} /bin/sh ./configure && \
+	    cp user.hpp ${WRKSRC}/boost/config
 	@cd ${WRKSRC} && chmod -R a+x ./ && \
-	/bin/sh ./bootstrap.sh ${BOOTSTRAP_CONFIG}
+	    /bin/sh ./bootstrap.sh ${BOOTSTRAP}
 
 do-build:
 	@cd ${WRKSRC} && \
-		./bjam ${BJAM_CONFIG}
+	    ./bjam ${BJAM_CONFIG}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/tools/jam/src/bin.*/bjam \
-		${PREFIX}/bin
-
+	    ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/stage/lib/lib!(*.so) ${PREFIX}/lib
-
 	@cd ${WRKSRC} && \
-		find boost -type d -exec ${INSTALL_DATA_DIR} ${PREFIX}/include/{} \;
+	    find boost -type d -exec ${INSTALL_DATA_DIR} ${PREFIX}/include/{} \;
 	@cd ${WRKSRC} && \
-		find boost ! -name \*.orig -type f -exec ${INSTALL_DATA} {} ${PREFIX}/include/{} \;
+	    find boost ! -name \*.orig -type f -exec ${INSTALL_DATA} {} ${PREFIX}/include/{} \;
 
 .include <bsd.port.mk>
diff --git a/devel/boost/distinfo b/devel/boost/distinfo
index 9e96de6407a..91cb6817ba3 100644
--- a/devel/boost/distinfo
+++ b/devel/boost/distinfo
@@ -1,5 +1,2 @@
-MD5 (boost_1_42_0.tar.gz) = +CLwHcTrAPWvAAz2M5YaIw==
-RMD160 (boost_1_42_0.tar.gz) = nqTQcz+52sCo37Q7a8KTIvnAJ/g=
-SHA1 (boost_1_42_0.tar.gz) = vC6wt9/0Khpr6BMtouSpCS6vPvw=
 SHA256 (boost_1_42_0.tar.gz) = rFcb6SI9/i73fTU1GrDny7JFzj+p5ut+DBt84FBLFl0=
 SIZE (boost_1_42_0.tar.gz) = 40932853