diff options
Diffstat (limited to 'www')
| -rw-r--r-- | www/serf/Makefile | 4 | ||||
| -rw-r--r-- | www/serf/PLIST | 6 | ||||
| -rw-r--r-- | www/serf/buildlink3.mk | 4 | ||||
| -rw-r--r-- | www/serf/distinfo | 10 | ||||
| -rw-r--r-- | www/serf/patches/patch-SConstruct | 16 |
5 files changed, 15 insertions, 25 deletions
diff --git a/www/serf/Makefile b/www/serf/Makefile index e60eb1d1019..26388db481f 100644 --- a/www/serf/Makefile +++ b/www/serf/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.20 2013/09/20 06:30:02 jperkin Exp $ +# $NetBSD: Makefile,v 1.21 2013/10/06 16:45:04 wiz Exp $ -DISTNAME= serf-1.3.1 +DISTNAME= serf-1.3.2 CATEGORIES= www MASTER_SITES= http://serf.googlecode.com/files/ EXTRACT_SUFX= .tar.bz2 diff --git a/www/serf/PLIST b/www/serf/PLIST index 85a8af2e03a..89fa53f3e3f 100644 --- a/www/serf/PLIST +++ b/www/serf/PLIST @@ -1,9 +1,9 @@ -@comment $NetBSD: PLIST,v 1.5 2013/09/06 17:23:49 wiz Exp $ +@comment $NetBSD: PLIST,v 1.6 2013/10/06 16:45:04 wiz Exp $ include/serf-1/serf.h include/serf-1/serf_bucket_types.h include/serf-1/serf_bucket_util.h lib/libserf-1.a lib/libserf-1.so -lib/libserf-1.so.3 -lib/libserf-1.so.3.0.0 +lib/libserf-1.so.1 +lib/libserf-1.so.1.3.0 lib/pkgconfig/serf-1.pc diff --git a/www/serf/buildlink3.mk b/www/serf/buildlink3.mk index 2ec26f08f16..4f7806d6c79 100644 --- a/www/serf/buildlink3.mk +++ b/www/serf/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.17 2013/09/07 19:38:41 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.18 2013/10/06 16:45:04 wiz Exp $ BUILDLINK_TREE+= serf @@ -6,7 +6,7 @@ BUILDLINK_TREE+= serf SERF_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.serf+= serf>=1.1.1 -BUILDLINK_ABI_DEPENDS.serf+= serf>=1.3.1 +BUILDLINK_ABI_DEPENDS.serf+= serf>=1.3.2 BUILDLINK_PKGSRCDIR.serf?= ../../www/serf .include "../../devel/apr/buildlink3.mk" diff --git a/www/serf/distinfo b/www/serf/distinfo index ddfc1f0fb18..e4b8bf7c00a 100644 --- a/www/serf/distinfo +++ b/www/serf/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.9 2013/09/17 14:01:01 adam Exp $ +$NetBSD: distinfo,v 1.10 2013/10/06 16:45:04 wiz Exp $ -SHA1 (serf-1.3.1.tar.bz2) = b8c8e12e7163d7bacf9be0ea4aaa7b8c32e8c72c -RMD160 (serf-1.3.1.tar.bz2) = 7833e2ab323800aae099c84b9a42ab0331c69c6e -Size (serf-1.3.1.tar.bz2) = 138181 bytes -SHA1 (patch-SConstruct) = 6268dde309e957d6ca5aee2957aef86f5cb14cb2 +SHA1 (serf-1.3.2.tar.bz2) = 90478cd60d4349c07326cb9c5b720438cf9a1b5d +RMD160 (serf-1.3.2.tar.bz2) = 8e3caf78f5bf906c0e20f33eab3f018b03363683 +Size (serf-1.3.2.tar.bz2) = 139861 bytes +SHA1 (patch-SConstruct) = 6bb757f55a9baf60de3cea43afe5fdbd6d24de18 SHA1 (patch-buckets_ssl__buckets.c) = f940e1703d3a8cf879d5a563cf57826f027ed8e1 diff --git a/www/serf/patches/patch-SConstruct b/www/serf/patches/patch-SConstruct index 035f0099ccc..9b6a688e9d8 100644 --- a/www/serf/patches/patch-SConstruct +++ b/www/serf/patches/patch-SConstruct @@ -1,9 +1,8 @@ -$NetBSD: patch-SConstruct,v 1.2 2013/09/17 14:01:01 adam Exp $ +$NetBSD: patch-SConstruct,v 1.3 2013/10/06 16:45:04 wiz Exp $ -Hack: Use OPENSSL variable as final shared library path; fixes lib id on Darwin. Don't append -O2 compiler flag. ---- SConstruct.orig 2013-09-11 09:42:09.000000000 +0000 +--- SConstruct.orig 2013-10-04 15:11:04.000000000 +0000 +++ SConstruct @@ -146,7 +146,7 @@ if sys.platform == 'win32': True), @@ -14,7 +13,7 @@ Don't append -O2 compiler flag. tools=('default', 'textfile',), CPPPATH=['.', ], ) -@@ -238,7 +238,6 @@ if sys.platform != 'win32': +@@ -240,7 +240,6 @@ if sys.platform != 'win32': env.Append(CCFLAGS='-g') env.Append(CPPDEFINES=['DEBUG', '_DEBUG']) else: @@ -22,12 +21,3 @@ Don't append -O2 compiler flag. env.Append(CPPDEFINES='NDEBUG') ### works for Mac OS. probably needs to change -@@ -401,7 +400,7 @@ if sys.platform == 'darwin': - # to a path in the sandbox. The shared library install name (id) should be the - # final targat path. - install_shared_path = install_shared[0].abspath -- target_install_shared_path = os.path.join(libdir, lib_shared[0].name) -+ target_install_shared_path = os.path.join('$OPENSSL', lib_shared[0].name) - env.AddPostAction(install_shared, ('install_name_tool -id %s %s' - % (target_install_shared_path, - install_shared_path))) |