- Update to Boost 1.30.0.

- Honor CC/CXX as best we can (bjam build system is buggy in this area)
- Pull down GCC 3.3 `support' from Boost CVS

Approved by:	Paul Marquis <pmarquis@pobox.com> (maintainer)

devel/boost/Makefile

@@ -7,45 +7,54 @@
 #
 
 PORTNAME=	boost
-PORTVERSION=	1.29.0
+PORTVERSION=	1.30.0
 CATEGORIES=	devel
-MASTER_SITES=	http://${PORTNAME}.sourceforge.net/release/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=${PORTNAME}
 DISTNAME=	${PORTNAME}_${PORTVERSION:S/./_/g}
 
 MAINTAINER=	pmarquis@pobox.com
 COMMENT=	Free peer-reviewed portable C++ source libraries
 
-MAKE_ENV=	BOOST_ROOT=${WRKSRC} TOOLS=gcc BUILD="debug release"
+MAKE_ENV+=	BOOST_ROOT=${WRKSRC} BUILD="debug release"
+MAKE_ENV+=	BOOST_BUILD_PATH="${WRKDIR}/gcc-custom" TOOLS="gcc-custom"
 COMPILED_LIBS=	regex signals thread
 .if defined(WITHOUT_PYTHON)
 PLIST_SUB+=	BOOST_PYTHON="@comment "
 .else
 PLIST_SUB+=	BOOST_PYTHON=""
 USE_PYTHON=	yes
-MAKE_ENV+=	PYTHON=${PYTHON_CMD} PYTHON_VERSION=${_PYTHON_VERSION} \
-		PYTHON_INCLUDES="${PYTHON_INCLUDEDIR}" \
-		PYTHON_STDLIB_PATH="${PYTHON_LIBDIR}"
+MAKE_ENV+=	PYTHON="${PYTHON_CMD}" PYTHON_VERSION="${_PYTHON_VERSION}"
+MAKE_ENV+=	PYTHON_INCLUDES="${PYTHON_INCLUDEDIR}"
+MAKE_ENV+=	PYTHON_STDLIB_PATH="${PYTHON_LIBDIR}"
 COMPILED_LIBS+=	python
 .endif
 INSTALLS_SHLIB=	yes
 DOCFILES=	*.css *.gif *.htm *.html *.jpeg *.jpg *.png
+BJAM=		${WRKSRC}/tools/build/jam_src/bin.freebsd/bjam
+
+do-configure:
+	${MKDIR} ${WRKDIR}/gcc-custom
+	${SED} -E -e 's/%%GXX%%/${CXX}/g' -e 's/%%GCC%%/${CC}/g' < \
+	    ${FILESDIR}/gcc-custom-tools.jam > \
+	    ${WRKDIR}/gcc-custom/gcc-custom-tools.jam
 
 do-build:
-	cd ${WRKSRC}/tools/build/jam_src; ${MAKE} ${MAKE_ARGS}
+	cd ${WRKSRC}/tools/build/jam_src && ./build.sh gcc
 .for lib in ${COMPILED_LIBS}
-	cd ${WRKSRC}/libs/${lib}/build; ${MAKE_ENV} ${WRKSRC}/tools/build/jam_src/bin.freebsd/bjam
+	cd ${WRKSRC}/libs/${lib}/build && ${SETENV} ${MAKE_ENV} ${BJAM} ${BJAM_FLAGS}
 .endfor
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/tools/build/jam_src/bin.freebsd/bjam ${PREFIX}/bin/
-	cd ${WRKSRC}; ${FIND} libs -type f -name \*.a -exec ${INSTALL_DATA} \{\} ${PREFIX}/lib \;
-	cd ${WRKSRC}; ${FIND} libs -type f -name \*.so -exec ${INSTALL_PROGRAM} \{\} ${PREFIX}/lib \;
-	cd ${WRKSRC}; ${FIND} boost -type d -exec ${MKDIR} ${PREFIX}/include/\{\} \;
-	cd ${WRKSRC}; ${FIND} boost -type f -exec ${INSTALL_DATA} \{\} ${PREFIX}/include/\{\} \;
+	${INSTALL_PROGRAM} ${BJAM} ${PREFIX}/bin/
+	cd ${WRKSRC} && ${FIND} libs -type f -name \*.a -exec ${INSTALL_DATA} \{\} ${PREFIX}/lib \;
+	cd ${WRKSRC} && ${FIND} libs -type f -name \*.so -exec ${INSTALL_PROGRAM} \{\} ${PREFIX}/lib \;
+	cd ${WRKSRC} && ${FIND} boost -type d -exec ${MKDIR} ${PREFIX}/include/\{\} \;
+	cd ${WRKSRC} && ${FIND} boost -type f -exec ${INSTALL_DATA} \{\} ${PREFIX}/include/\{\} \;
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR} ${EXAMPLESDIR}
-	cd ${WRKSRC}; ${FIND} * -type f \( -name \*.htm ${DOCFILES:S/^/-o -name \\/} \) | ${TAR} cTf - - | ${TAR} xUCf ${DOCSDIR} -
-	cd ${WRKSRC}; ${FIND} libs -type d -name example\* | ${TAR} cTf - - | ${TAR} xUCf ${EXAMPLESDIR} -
+	cd ${WRKSRC} && ${FIND} * -type f \( -name \*.htm ${DOCFILES:S/^/-o -name \\/} \) | ${TAR} cTf - - | ${TAR} xUCf ${DOCSDIR} -
+	cd ${WRKSRC} && ${FIND} libs -type d -name example\* | ${TAR} cTf - - | ${TAR} xUCf ${EXAMPLESDIR} -
 .endif
 
 .include <bsd.port.mk>

devel/boost/distinfo

@@ -1 +1 @@
-MD5 (boost_1_29_0.tar.gz) = 258243a3b553ab0a3937aa9ea3165351
+MD5 (boost_1_30_0.tar.gz) = fe85dec53e671ea7d830936dd7423458

devel/boost/files/gcc-custom-tools.jam

@@ -0,0 +1,3 @@
+extends-toolset gcc ;
+GXX = %%GXX%% ;
+GCC = %%GCC%% ;

devel/boost/files/patch-aa

@@ -1,14 +0,0 @@
---- tools/build/jam_src/Makefile.orig	Sat Apr  6 17:40:41 2002
-+++ tools/build/jam_src/Makefile	Wed May 22 07:52:16 2002
-@@ -4,9 +4,9 @@
- # located in the "builds" directory
- #
- 
--CC = cc
-+#CC = cc
- TARGET = -o jam0
--CFLAGS =
-+#CFLAGS =
- 
- # Borland C++ on Windows
- #CC = bcc32

devel/boost/files/patch-gcc.hpp

@@ -0,0 +1,59 @@
+*** boost/config/compiler/gcc.hpp	2003/01/30 18:13:55	1.15
+--- boost/config/compiler/gcc.hpp	2003/05/19 12:11:22	1.17
+***************
+*** 28,39 ****
+  #     define BOOST_NO_OPERATORS_IN_NAMESPACE
+  #   endif
+  
+  //
+  // Threading support: Turn this on unconditionally here (except for
+! // MinGW, where we can know for sure). It will get turned off again
+  // later if no threading API is detected.
+  //
+! #if !defined(__MINGW32__) || defined(_MT)
+  # define BOOST_HAS_THREADS
+  #endif 
+  
+--- 28,43 ----
+  #     define BOOST_NO_OPERATORS_IN_NAMESPACE
+  #   endif
+  
++ #ifndef __EXCEPTIONS
++ # define BOOST_NO_EXCEPTIONS
++ #endif
++ 
+  //
+  // Threading support: Turn this on unconditionally here (except for
+! // those platforms where we can know for sure). It will get turned off again
+  // later if no threading API is detected.
+  //
+! #if !defined(__MINGW32__) && !defined(__CYGWIN__) && !defined(linux) && !defined(__linux) && !defined(__linux__)
+  # define BOOST_HAS_THREADS
+  #endif 
+  
+***************
+*** 58,68 ****
+  #  error "Compiler not configured - please reconfigure"
+  #endif
+  //
+! // last known and checked version is 3.2:
+! #if (__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ > 2))
+  #  if defined(BOOST_ASSERT_CONFIG)
+  #     error "Unknown compiler version - please run the configure tests and report the results"
+  #  else
+  #     warning "Unknown compiler version - please run the configure tests and report the results"
+  #  endif
+  #endif
+--- 62,73 ----
+  #  error "Compiler not configured - please reconfigure"
+  #endif
+  //
+! // last known and checked version is 3.3:
+! #if (__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ > 3))
+  #  if defined(BOOST_ASSERT_CONFIG)
+  #     error "Unknown compiler version - please run the configure tests and report the results"
+  #  else
+  #     warning "Unknown compiler version - please run the configure tests and report the results"
+  #  endif
+  #endif
++