Revision: 108691 https://trac.macports.org/changeset/108691 Author: blair@macports.org Date: 2013-07-30 20:27:13 -0700 (Tue, 30 Jul 2013) Log Message: ----------- serf1: update to 1.3.0; switch to using its scons build system; closes #39891. Modified Paths: -------------- trunk/dports/www/serf1/Portfile Added Paths: ----------- trunk/dports/www/serf1/files/ trunk/dports/www/serf1/files/patch-SConstruct.diff Modified: trunk/dports/www/serf1/Portfile =================================================================== --- trunk/dports/www/serf1/Portfile 2013-07-31 03:27:01 UTC (rev 108690) +++ trunk/dports/www/serf1/Portfile 2013-07-31 03:27:13 UTC (rev 108691) @@ -3,8 +3,7 @@ PortSystem 1.0 name serf1 -version 1.2.1 -revision 1 +version 1.3.0 categories www maintainers blair license Apache-2 @@ -22,21 +21,36 @@ dist_subdir serf distname serf-${version} use_bzip2 yes -checksums sha1 f65fbbd72926c8e7cf0dbd4ada03b0d226f461fd \ - sha256 6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700 +checksums sha1 14ed3e1dc195016a548499b3831f3df6b2501d27 \ + sha256 174a46866907c54309c0ccac5efa34304e21979f365b30bdfea6c4ad330ec01c +patchfiles patch-SConstruct.diff platforms darwin +depends_build port:scons depends_lib port:apr port:apr-util port:openssl port:zlib -configure.args --with-apr=${prefix}/bin/apr-1-config \ - --with-apr-util=${prefix}/bin/apu-1-config +use_configure no -configure.ccache no +build.env ARCHFLAGS="[get_canonical_archflags]" \ + CPPFLAGS="${configure.cppflags}" \ + LDFLAGS="${configure.ldflags}" -test.run yes -test.target check +build.cmd ${prefix}/bin/scons +build.target APR=${prefix} \ + APU=${prefix} \ + OPENSSL=${prefix} \ + PREFIX=${prefix} +# TODO: this would be nice to have +build.args +#build.args --cc=${configure.cc} \ +# --cxx=${configure.cxx} +eval destroot.env [option build.env] +destroot.cmd ${build.cmd} +destroot.args --install-sandbox=${destroot} +destroot.destdir + post-destroot { set sharedir ${destroot}${prefix}/share set docdir ${sharedir}/doc/${name} Added: trunk/dports/www/serf1/files/patch-SConstruct.diff =================================================================== --- trunk/dports/www/serf1/files/patch-SConstruct.diff (rev 0) +++ trunk/dports/www/serf1/files/patch-SConstruct.diff 2013-07-31 03:27:13 UTC (rev 108691) @@ -0,0 +1,21 @@ +# This is r2080 from http://serf.googlecode.com/svn/trunk. Remove +# when an upstream release includes it. +Index: SConstruct +=================================================================== +--- SConstruct (revision 2079) ++++ SConstruct (revision 2080) +@@ -377,9 +377,13 @@ + install_shared = env.Install(libdir, lib_shared) + + if sys.platform == 'darwin': ++ # If --install-sandbox=<path> is specified, install_shared_path will point ++ # 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) + env.AddPostAction(install_shared, ('install_name_tool -id %s %s' +- % (install_shared_path, ++ % (target_install_shared_path, + install_shared_path))) + ### construct shared lib symlinks. this also means install the lib + ### as libserf-2.1.0.0.dylib, then add the symlinks.