Date: Mon, 19 Oct 2015 12:35:56 +0000 (UTC) From: "Lev A. Serebryakov" <lev@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r399661 - in head/www/serf: . files Message-ID: <201510191235.t9JCZuM3081617@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: lev Date: Mon Oct 19 12:35:56 2015 New Revision: 399661 URL: https://svnweb.freebsd.org/changeset/ports/399661 Log: Fix "serf.pc" to allow static builds with serf. Modified: head/www/serf/Makefile head/www/serf/files/patch-SConstruct Modified: head/www/serf/Makefile ============================================================================== --- head/www/serf/Makefile Mon Oct 19 11:29:01 2015 (r399660) +++ head/www/serf/Makefile Mon Oct 19 12:35:56 2015 (r399661) @@ -3,6 +3,7 @@ PORTNAME= serf PORTVERSION= 1.3.8 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://serf.googlecode.com/svn/src_releases/ Modified: head/www/serf/files/patch-SConstruct ============================================================================== --- head/www/serf/files/patch-SConstruct Mon Oct 19 11:29:01 2015 (r399660) +++ head/www/serf/files/patch-SConstruct Mon Oct 19 12:35:56 2015 (r399661) @@ -1,5 +1,5 @@ ---- ./SConstruct.orig 2014-02-04 21:11:10.000000000 +0100 -+++ ./SConstruct 2014-02-26 21:55:54.000000000 +0100 +--- SConstruct.orig 2014-02-05 00:11:10.000000000 +0400 ++++ SConstruct 2015-10-19 15:07:53.089322358 +0300 @@ -69,6 +69,9 @@ opts = Variables(files=[SAVED_CONFIG]) @@ -18,6 +18,17 @@ # This version string is used in the dynamic library name, and for Mac OS X also # for the current_version and compatibility_version options in the .dylib +@@ -345,8 +349,8 @@ + ### there is probably a better way to run/capture output. + ### env.ParseConfig() may be handy for getting this stuff into the build + if CALLOUT_OKAY: +- apr_libs = os.popen(env.subst('$APR --link-libtool --libs')).read().strip() +- apu_libs = os.popen(env.subst('$APU --link-libtool --libs')).read().strip() ++ apr_libs = os.popen(env.subst('$APR --libs')).read().strip() ++ apu_libs = os.popen(env.subst('$APU --libs')).read().strip() + else: + apr_libs = '' + apu_libs = '' @@ -387,6 +391,8 @@ env.Default(lib_static, lib_shared, pkgconfig)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510191235.t9JCZuM3081617>