diff options
Diffstat (limited to 'meta-pkgs/boost')
| -rw-r--r-- | meta-pkgs/boost/Makefile | 8 | ||||
| -rw-r--r-- | meta-pkgs/boost/Makefile.common | 6 | ||||
| -rw-r--r-- | meta-pkgs/boost/distinfo | 12 | ||||
| -rw-r--r-- | meta-pkgs/boost/patches/patch-ac | 32 | ||||
| -rw-r--r-- | meta-pkgs/boost/patches/patch-ad | 10 |
5 files changed, 25 insertions, 43 deletions
diff --git a/meta-pkgs/boost/Makefile b/meta-pkgs/boost/Makefile index cf84f1fb573..7aef7c7d49b 100644 --- a/meta-pkgs/boost/Makefile +++ b/meta-pkgs/boost/Makefile @@ -1,11 +1,9 @@ -# $NetBSD: Makefile,v 1.3 2005/06/18 14:32:38 jmmv Exp $ +# $NetBSD: Makefile,v 1.4 2005/08/12 20:58:45 jmmv Exp $ # BOOST_PACKAGE= meta-pkg BOOST_COMMENT= (meta package) -PKGREVISION= 1 - .include "Makefile.common" CATEGORIES+= meta-pkgs @@ -19,8 +17,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}nb1:../../devel/boost-libs -DEPENDS+= boost-python>=${BOOST_VERSION}nb1:../../devel/boost-python +DEPENDS+= boost-libs>=${BOOST_VERSION}:../../devel/boost-libs +DEPENDS+= boost-python>=${BOOST_VERSION}:../../devel/boost-python EXTRACT_ONLY= # empty NO_CHECKSUM= yes diff --git a/meta-pkgs/boost/Makefile.common b/meta-pkgs/boost/Makefile.common index 7acb703995b..649ffb1258e 100644 --- a/meta-pkgs/boost/Makefile.common +++ b/meta-pkgs/boost/Makefile.common @@ -1,11 +1,11 @@ -# $NetBSD: Makefile.common,v 1.4 2005/06/18 14:32:38 jmmv Exp $ +# $NetBSD: Makefile.common,v 1.5 2005/08/12 20:58:45 jmmv Exp $ # BOOST_PACKAGE?= undefined BOOST_COMMENT?= undefined -BOOST_VERSION= 1.32.0 -BOOST_SHORT_VERSION= 1_32 +BOOST_VERSION= 1.33.0 +BOOST_SHORT_VERSION= 1_33 DISTNAME= boost_${BOOST_VERSION:S/./_/g} CATEGORIES= devel diff --git a/meta-pkgs/boost/distinfo b/meta-pkgs/boost/distinfo index a4bbca13f4e..9ceb3b55166 100644 --- a/meta-pkgs/boost/distinfo +++ b/meta-pkgs/boost/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.3 2005/06/18 14:32:38 jmmv Exp $ +$NetBSD: distinfo,v 1.4 2005/08/12 20:58:45 jmmv Exp $ -SHA1 (boost_1_32_0.tar.bz2) = bb193b381d8e1c8321ee7d77f01c88837edc3e56 -RMD160 (boost_1_32_0.tar.bz2) = 9a51660e01d5047b08a753a7fa38028d8aa171ec -Size (boost_1_32_0.tar.bz2) = 10181552 bytes +SHA1 (boost_1_33_0.tar.bz2) = be68cb1401ef4dbf8509685df0466429712a9d49 +RMD160 (boost_1_33_0.tar.bz2) = e500524198780f89d041f4a539b8926bc3d6a0a6 +Size (boost_1_33_0.tar.bz2) = 11356417 bytes SHA1 (patch-aa) = 6f0b64da37de35b2b3d2eb5884608bd8f9a906fd SHA1 (patch-ab) = 197c51ac67d74923d02f8a9746b5d2e0f7b84736 -SHA1 (patch-ac) = 3d44a1a368b614d86aff57406363fba57e33a0ba -SHA1 (patch-ad) = eebc1b418bafe22f5adad741820e05e2291b45a2 +SHA1 (patch-ac) = 453d4107df03e96e66cbdbebceebdfcbed2710c1 +SHA1 (patch-ad) = bb6441885c16a4ed11da76cb70acf0cc5ccc03fd diff --git a/meta-pkgs/boost/patches/patch-ac b/meta-pkgs/boost/patches/patch-ac index 36f1e01d04b..6c1a721f512 100644 --- a/meta-pkgs/boost/patches/patch-ac +++ b/meta-pkgs/boost/patches/patch-ac @@ -1,29 +1,13 @@ -$NetBSD: patch-ac,v 1.1 2005/06/14 16:57:49 jmmv Exp $ +$NetBSD: patch-ac,v 1.2 2005/08/12 20:58:45 jmmv Exp $ ---- libs/regex/src/wide_posix_api.cpp.orig 2003-12-16 14:06:00.000000000 +0100 +--- libs/regex/src/wide_posix_api.cpp.orig 2005-03-30 13:38:51.000000000 +0200 +++ libs/regex/src/wide_posix_api.cpp -@@ -28,6 +28,8 @@ +@@ -29,7 +29,7 @@ #include <cstring> #include <cstdio> -+using namespace std; // For swprintf, in case it is there. -+ - namespace boost{ - - namespace { -@@ -142,13 +144,13 @@ BOOST_REGEX_DECL regsize_t BOOST_REGEX_C - { - if(std::wcscmp(e->re_endp, wnames[i]) == 0) - { -- std::swprintf(localbuf, 5, L"%d", i); -+ swprintf(localbuf, 5, L"%d", i); - if(std::wcslen(localbuf) < buf_size) - std::wcscpy(buf, localbuf); - return std::wcslen(localbuf) + 1; - } - } -- std::swprintf(localbuf, 5, L"%d", 0); -+ swprintf(localbuf, 5, L"%d", 0); - if(std::wcslen(localbuf) < buf_size) - std::wcscpy(buf, localbuf); - return std::wcslen(localbuf) + 1; +-#if defined(BOOST_NO_STDC_NAMESPACE) ++#if defined(BOOST_NO_STDC_NAMESPACE) || defined(__NetBSD__) + namespace std{ + # ifndef BOOST_NO_SWPRINTF + using ::swprintf; diff --git a/meta-pkgs/boost/patches/patch-ad b/meta-pkgs/boost/patches/patch-ad index d6edd247bba..45f6236f9db 100644 --- a/meta-pkgs/boost/patches/patch-ad +++ b/meta-pkgs/boost/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.1 2005/06/18 14:32:38 jmmv Exp $ +$NetBSD: patch-ad,v 1.2 2005/08/12 20:58:45 jmmv Exp $ ---- tools/build/v1/gcc-tools.jam.orig 2004-10-19 17:12:58.000000000 +0200 +--- tools/build/v1/gcc-tools.jam.orig 2005-08-12 17:06:38.000000000 +0200 +++ tools/build/v1/gcc-tools.jam -@@ -384,7 +384,7 @@ rule Link-action +@@ -422,7 +422,7 @@ rule Link-action LNOPT on $(<) = "" ; } # do we use sonames or not? @@ -11,8 +11,8 @@ $NetBSD: patch-ad,v 1.1 2005/06/18 14:32:38 jmmv Exp $ { OUTTAG on $(<) = ".$(DLLVERSION)" ; SOTAG on $(<) = ".$(DLLVERSION)" ; -@@ -433,7 +433,7 @@ rule Link-action - +@@ -468,7 +468,7 @@ rule Link-action + gcc-spawn $(<) ; gcc-Link-action $(<) : $(>) ; - if $(DLLVERSION) && $(TARGET_TYPE) in $(SHARED_TYPES) && ( $(OS) = LINUX || $(OS) = OPENBSD ) && ! $(NO_GNU_LN) |