4 files changed, 31 insertions, 14 deletions
diff --git a/meta-pkgs/boost/Makefile b/meta-pkgs/boost/Makefile
index b60e5812ed4..cf84f1fb573 100644
--- a/meta-pkgs/boost/Makefile
+++ b/meta-pkgs/boost/Makefile
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:32 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/06/18 14:32:38 jmmv Exp $
 #
 
 BOOST_PACKAGE=	meta-pkg
 BOOST_COMMENT=	(meta package)
 
+PKGREVISION=	1
+
 .include "Makefile.common"
 
 CATEGORIES+=	meta-pkgs
@@ -17,8 +19,8 @@ COMMENT=	Free, peer-reviewed portable C++ source libraries
 DEPENDS+=	boost-build>=${BOOST_VERSION}:../../devel/boost-build
 DEPENDS+=	boost-docs>=${BOOST_VERSION}:../../devel/boost-docs
 DEPENDS+=	boost-headers>=${BOOST_VERSION}:../../devel/boost-headers
-DEPENDS+=	boost-libs>=${BOOST_VERSION}:../../devel/boost-libs
-DEPENDS+=	boost-python>=${BOOST_VERSION}:../../devel/boost-python
+DEPENDS+=	boost-libs>=${BOOST_VERSION}nb1:../../devel/boost-libs
+DEPENDS+=	boost-python>=${BOOST_VERSION}nb1:../../devel/boost-python
 
 EXTRACT_ONLY=	# empty
 NO_CHECKSUM=	yes
diff --git a/meta-pkgs/boost/Makefile.common b/meta-pkgs/boost/Makefile.common
index b2d5c2b5510..7acb703995b 100644
--- a/meta-pkgs/boost/Makefile.common
+++ b/meta-pkgs/boost/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2005/04/11 21:46:32 tv Exp $
+# $NetBSD: Makefile.common,v 1.4 2005/06/18 14:32:38 jmmv Exp $
 #
 
 BOOST_PACKAGE?=		undefined
@@ -55,14 +55,6 @@ do-configure:
 .endif
 
 boost-install-libs:
-	@cd ${WRKSRC}/stage/lib && \
-	    for f in *; do \
-	        ${ECHO} ${INSTALL_LIB} $$f \
-	            ${PREFIX}/lib/`${ECHO} $$f | \
-	                ${SED} 's|-.*\\.|${BOOST_LIB_SUFFIX}.|'`; \
-	        ${INSTALL_LIB} $$f \
-	            ${PREFIX}/lib/`${ECHO} $$f | \
-	                ${SED} 's|-.*\\.|${BOOST_LIB_SUFFIX}.|'`; \
-	    done
+	cd ${WRKSRC}/stage/lib && ${PAX} -rwpe libboost* ${PREFIX}/lib
 
 .endif # ${BOOST_PACKAGE} == "meta-pkg"
diff --git a/meta-pkgs/boost/distinfo b/meta-pkgs/boost/distinfo
index 153717b528c..a4bbca13f4e 100644
--- a/meta-pkgs/boost/distinfo
+++ b/meta-pkgs/boost/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2005/06/14 16:57:49 jmmv Exp $
+$NetBSD: distinfo,v 1.3 2005/06/18 14:32:38 jmmv Exp $
 
 SHA1 (boost_1_32_0.tar.bz2) = bb193b381d8e1c8321ee7d77f01c88837edc3e56
 RMD160 (boost_1_32_0.tar.bz2) = 9a51660e01d5047b08a753a7fa38028d8aa171ec
@@ -6,3 +6,4 @@ Size (boost_1_32_0.tar.bz2) = 10181552 bytes
 SHA1 (patch-aa) = 6f0b64da37de35b2b3d2eb5884608bd8f9a906fd
 SHA1 (patch-ab) = 197c51ac67d74923d02f8a9746b5d2e0f7b84736
 SHA1 (patch-ac) = 3d44a1a368b614d86aff57406363fba57e33a0ba
+SHA1 (patch-ad) = eebc1b418bafe22f5adad741820e05e2291b45a2
diff --git a/meta-pkgs/boost/patches/patch-ad b/meta-pkgs/boost/patches/patch-ad
new file mode 100644
index 00000000000..d6edd247bba
--- /dev/null
+++ b/meta-pkgs/boost/patches/patch-ad
@@ -0,0 +1,22 @@
+$NetBSD: patch-ad,v 1.1 2005/06/18 14:32:38 jmmv Exp $
+
+--- tools/build/v1/gcc-tools.jam.orig	2004-10-19 17:12:58.000000000 +0200
++++ tools/build/v1/gcc-tools.jam
+@@ -384,7 +384,7 @@ rule Link-action
+         LNOPT on $(<) = "" ;
+     }
+     # do we use sonames or not?
+-    if $(DLLVERSION) && $(TARGET_TYPE) in $(SHARED_TYPES) && ( $(OS) = LINUX || $(OS) = OPENBSD ) && ! $(NO_GNU_LN)
++    if $(DLLVERSION) && $(TARGET_TYPE) in $(SHARED_TYPES) && ( $(OS) = DRAGONFLY || $(OS) = FREEBSD || $(OS) = LINUX || $(OS) = NETBSD || $(OS) = OPENBSD ) && ! $(NO_GNU_LN)
+     {
+         OUTTAG on $(<) = ".$(DLLVERSION)" ;
+         SOTAG on $(<) = ".$(DLLVERSION)" ;
+@@ -433,7 +433,7 @@ rule Link-action
+ 
+     gcc-Link-action $(<) : $(>) ;
+ 
+-    if $(DLLVERSION) && $(TARGET_TYPE) in $(SHARED_TYPES) && ( $(OS) = LINUX || $(OS) = OPENBSD ) && ! $(NO_GNU_LN)
++    if $(DLLVERSION) && $(TARGET_TYPE) in $(SHARED_TYPES) && ( $(OS) = DRAGONFLY || $(OS) = FREEBSD || $(OS) = LINUX || $(OS) = NETBSD || $(OS) = OPENBSD ) && ! $(NO_GNU_LN)
+     {
+         return "$(<[1]).$(DLLVERSION)" ;
+     }