diff options
| author | adam <adam> | 2013-09-17 14:01:01 +0000 |
|---|---|---|
| committer | adam <adam> | 2013-09-17 14:01:01 +0000 |
| commit | 673ad2f049dd800f4f86fea29b61713e2dfb265a (patch) | |
| tree | 4bc94ab77ad97ef61aaa14ab270cf83bc401a19e /www/serf | |
| parent | 03f9682ef45f7cf8f59d479fca2fdf99f992cd88 (diff) | |
| download | pkgsrc-673ad2f049dd800f4f86fea29b61713e2dfb265a.tar.gz | |
* Fix library id on Darwin.
* Pass CC and CFLAGS.
* Added LICENSE.
* Removed USE_LIBTOOL and TEST_TARGET: these are not used with Scons build.
Diffstat (limited to 'www/serf')
| -rw-r--r-- | www/serf/Makefile | 9 | ||||
| -rw-r--r-- | www/serf/distinfo | 4 | ||||
| -rw-r--r-- | www/serf/patches/patch-SConstruct | 22 |
3 files changed, 28 insertions, 7 deletions
diff --git a/www/serf/Makefile b/www/serf/Makefile index 6ba9911a824..f5e9a6eb367 100644 --- a/www/serf/Makefile +++ b/www/serf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2013/09/06 17:23:49 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2013/09/17 14:01:01 adam Exp $ DISTNAME= serf-1.3.1 CATEGORIES= www @@ -8,13 +8,14 @@ EXTRACT_SUFX= .tar.bz2 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://code.google.com/p/serf/ COMMENT= High-performance asynchronous HTTP client library +LICENSE= apache-2.0 -BUILD_DEPENDS+= scons>=2.3.0:../../devel/scons +BUILD_DEPENDS+= scons>=2.3.0:../../devel/scons -USE_LIBTOOL= yes -TEST_TARGET= check SCONS_ARGS+= APR=${PREFIX}/bin/apr-1-config SCONS_ARGS+= APU=${PREFIX}/bin/apu-1-config +SCONS_ARGS+= CC=${CC:Q} +SCONS_ARGS+= CFLAGS=${CFLAGS:Q} SCONS_ARGS+= OPENSSL=${PREFIX}/lib do-build: diff --git a/www/serf/distinfo b/www/serf/distinfo index 6692b35692e..ddfc1f0fb18 100644 --- a/www/serf/distinfo +++ b/www/serf/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.8 2013/09/11 09:46:27 joerg Exp $ +$NetBSD: distinfo,v 1.9 2013/09/17 14:01:01 adam 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) = 56b2ad05a41f9c05caec8ea1454f7eb88ba225af +SHA1 (patch-SConstruct) = 6268dde309e957d6ca5aee2957aef86f5cb14cb2 SHA1 (patch-buckets_ssl__buckets.c) = f940e1703d3a8cf879d5a563cf57826f027ed8e1 diff --git a/www/serf/patches/patch-SConstruct b/www/serf/patches/patch-SConstruct index abf1884785a..035f0099ccc 100644 --- a/www/serf/patches/patch-SConstruct +++ b/www/serf/patches/patch-SConstruct @@ -1,4 +1,7 @@ -$NetBSD: patch-SConstruct,v 1.1 2013/09/11 09:46:27 joerg Exp $ +$NetBSD: patch-SConstruct,v 1.2 2013/09/17 14:01:01 adam 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 @@ -11,3 +14,20 @@ $NetBSD: patch-SConstruct,v 1.1 2013/09/11 09:46:27 joerg Exp $ tools=('default', 'textfile',), CPPPATH=['.', ], ) +@@ -238,7 +238,6 @@ if sys.platform != 'win32': + env.Append(CCFLAGS='-g') + env.Append(CPPDEFINES=['DEBUG', '_DEBUG']) + else: +- env.Append(CCFLAGS='-O2') + 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))) |