diff options
| author | sbd <sbd@pkgsrc.org> | 2011-10-02 21:23:50 +0000 |
|---|---|---|
| committer | sbd <sbd@pkgsrc.org> | 2011-10-02 21:23:50 +0000 |
| commit | 9fc52410ef1c1be1b12925b4c476cfc7bb606e65 (patch) | |
| tree | aaecaeb99af9c36025ece386113d017f8ecfec06 /meta-pkgs | |
| parent | 774c6bb8d69b93d897fa279cec8cf8a6046f1c55 (diff) | |
| download | pkgsrc-9fc52410ef1c1be1b12925b4c476cfc7bb606e65.tar.gz | |
Join patch-ab and patch-af and regen.
Diffstat (limited to 'meta-pkgs')
| -rw-r--r-- | meta-pkgs/boost/distinfo | 4 | ||||
| -rw-r--r-- | meta-pkgs/boost/patches/patch-ab | 15 | ||||
| -rw-r--r-- | meta-pkgs/boost/patches/patch-af | 13 |
3 files changed, 14 insertions, 18 deletions
diff --git a/meta-pkgs/boost/distinfo b/meta-pkgs/boost/distinfo index 28bfe7940a9..919660e196d 100644 --- a/meta-pkgs/boost/distinfo +++ b/meta-pkgs/boost/distinfo @@ -1,13 +1,13 @@ -$NetBSD: distinfo,v 1.33 2011/10/02 10:20:28 sbd Exp $ +$NetBSD: distinfo,v 1.34 2011/10/02 21:23:50 sbd Exp $ SHA1 (boost_1_46_1.tar.bz2) = 3ca6e173ec805e5126868d8a03618e587aa26aef RMD160 (boost_1_46_1.tar.bz2) = bb43b39f7c4b683b80bafa3042b95e65a242d9c3 Size (boost_1_46_1.tar.bz2) = 42001335 bytes SHA1 (patch-aa) = b42e255c8ad2138f226ec14633aedeb9b9a9fd32 +SHA1 (patch-ab) = f1c95ae229465a4d2da76ce6ff88d76ace52fdd8 SHA1 (patch-ac) = 54d40e6a62cdf40c4155c64d9f02df475fbe111d SHA1 (patch-ad) = d36799e40e1f7e6f62768e1144859f22ce76a265 SHA1 (patch-ae) = 0acb8eaa1b5096d86ef0cd1320363f9ae75b7090 -SHA1 (patch-af) = 810ed54c1a84fb0b36e14d6917b90db87890234f SHA1 (patch-ag) = badf96038d7ac5bc566c6ce685116e756d976b13 SHA1 (patch-ah) = c32b43bdbbe3cecc15ad56172083ee6ed926b45b SHA1 (patch-aq) = e5c7b72ffa2942ce401f3d9bf05498fd761df17a diff --git a/meta-pkgs/boost/patches/patch-ab b/meta-pkgs/boost/patches/patch-ab index 01160ef258f..ef6dd16749c 100644 --- a/meta-pkgs/boost/patches/patch-ab +++ b/meta-pkgs/boost/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.4 2011/02/24 11:05:36 adam Exp $ +$NetBSD: patch-ab,v 1.5 2011/10/02 21:23:50 sbd Exp $ ---- boost/config/platform/bsd.hpp.orig 2009-08-20 17:55:59.000000000 +0200 +--- boost/config/platform/bsd.hpp.orig 2011-03-07 13:07:30.000000000 +0000 +++ boost/config/platform/bsd.hpp -@@ -50,7 +50,7 @@ +@@ -37,7 +37,7 @@ // and not in <unistd.h> // #if (defined(__FreeBSD__) && (__FreeBSD__ <= 3))\ @@ -11,3 +11,12 @@ $NetBSD: patch-ab,v 1.4 2011/02/24 11:05:36 adam Exp $ # define BOOST_HAS_PTHREADS #endif +@@ -62,7 +62,7 @@ + // + // The BSD <ctype.h> has macros only, no functions: + // +-#if !defined(__OpenBSD__) || defined(__DragonFly__) ++#if !defined(__OpenBSD__) && !defined(__DragonFly__) + # define BOOST_NO_CTYPE_FUNCTIONS + #endif + diff --git a/meta-pkgs/boost/patches/patch-af b/meta-pkgs/boost/patches/patch-af deleted file mode 100644 index b343fb53d8d..00000000000 --- a/meta-pkgs/boost/patches/patch-af +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-af,v 1.6 2011/02/24 11:05:36 adam Exp $ - ---- boost/config/platform/bsd.hpp.orig 2009-03-12 09:41:50 +0200 -+++ boost/config/platform/bsd.hpp 2009-03-12 15:37:16 +0200 -@@ -75,7 +75,7 @@ - // - // The BSD <ctype.h> has macros only, no functions: - // --#if !defined(__OpenBSD__) || defined(__DragonFly__) -+#if !defined(__OpenBSD__) && !defined(__DragonFly__) - # define BOOST_NO_CTYPE_FUNCTIONS - #endif - |