From owner-svn-ports-all@freebsd.org Tue Sep 6 13:19:53 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 82865BC41D0; Tue, 6 Sep 2016 13:19:53 +0000 (UTC) (envelope-from lev@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5DEE765E; Tue, 6 Sep 2016 13:19:53 +0000 (UTC) (envelope-from lev@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u86DJqD9044874; Tue, 6 Sep 2016 13:19:52 GMT (envelope-from lev@FreeBSD.org) Received: (from lev@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u86DJqMt044871; Tue, 6 Sep 2016 13:19:52 GMT (envelope-from lev@FreeBSD.org) Message-Id: <201609061319.u86DJqMt044871@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lev set sender to lev@FreeBSD.org using -f From: "Lev A. Serebryakov" Date: Tue, 6 Sep 2016 13:19:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r421423 - in head/www/serf: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Sep 2016 13:19:53 -0000 Author: lev Date: Tue Sep 6 13:19:52 2016 New Revision: 421423 URL: https://svnweb.freebsd.org/changeset/ports/421423 Log: Update to 1.3.9 Simplify Makefile PR: 212345, 206359 Submitted by: Olli Hauer , John Hein Modified: head/www/serf/Makefile head/www/serf/distinfo head/www/serf/files/patch-SConstruct Modified: head/www/serf/Makefile ============================================================================== --- head/www/serf/Makefile Tue Sep 6 13:12:45 2016 (r421422) +++ head/www/serf/Makefile Tue Sep 6 13:19:52 2016 (r421423) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= serf -PORTVERSION= 1.3.8 -PORTREVISION= 1 +PORTVERSION= 1.3.9 +#PORTREVISION= 1 CATEGORIES= www MASTER_SITES= APACHE/serf @@ -15,8 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS+= libapr-1.so:devel/apr1 -USES= scons tar:bzip2 cpe -USE_OPENSSL= yes +USES= scons ssl tar:bzip2 cpe USE_LDCONFIG= yes OPTIONS_DEFINE= DOCS @@ -46,12 +45,6 @@ SCONS_ARGS+= GSSAPI="/usr" SCONS_ARGS+= GSSAPI="${LOCALBASE}" .endif -do-build: - @(cd ${WRKSRC} && ${SETENV} ${MAKE_CMD} ${SCONS_ARGS}) - -do-install: - @(cd ${WRKSRC} && ${SETENV} ${MAKE_CMD} ${SCONS_ARGS} ${INSTALL_TARGET}) - post-patch: @${REINPLACE_CMD} -E \ -e '/^Requires.private/s/(libssl|libcrypto)//g' \ @@ -66,4 +59,8 @@ post-install-DOCS-on: regression-test check: build @(cd ${WRKSRC} && ${MAKE_CMD} check) -.include +.include + +MAKE_ARGS= ${SCONS_ARGS} + +.include Modified: head/www/serf/distinfo ============================================================================== --- head/www/serf/distinfo Tue Sep 6 13:12:45 2016 (r421422) +++ head/www/serf/distinfo Tue Sep 6 13:19:52 2016 (r421423) @@ -1,2 +1,3 @@ -SHA256 (serf-1.3.8.tar.bz2) = e0500be065dbbce490449837bb2ab624e46d64fc0b090474d9acaa87c82b2590 -SIZE (serf-1.3.8.tar.bz2) = 143337 +TIMESTAMP = 1472645004 +SHA256 (serf-1.3.9.tar.bz2) = 549c2d21c577a8a9c0450facb5cca809f26591f048e466552240947bdf7a87cc +SIZE (serf-1.3.9.tar.bz2) = 145132 Modified: head/www/serf/files/patch-SConstruct ============================================================================== --- head/www/serf/files/patch-SConstruct Tue Sep 6 13:12:45 2016 (r421422) +++ head/www/serf/files/patch-SConstruct Tue Sep 6 13:19:52 2016 (r421423) @@ -1,6 +1,6 @@ ---- SConstruct.orig 2014-02-05 00:11:10.000000000 +0400 -+++ SConstruct 2015-10-19 15:07:53.089322358 +0300 -@@ -69,6 +69,9 @@ +--- SConstruct.orig 2015-09-17 12:46:24 UTC ++++ SConstruct +@@ -74,6 +74,9 @@ else: opts = Variables(files=[SAVED_CONFIG]) opts.AddVariables( @@ -10,7 +10,7 @@ PathVariable('PREFIX', 'Directory to install under', default_prefix, -@@ -203,6 +206,7 @@ +@@ -208,6 +211,7 @@ opts.Save(SAVED_CONFIG, env) thisdir = os.getcwd() libdir = '$LIBDIR' incdir = '$PREFIX/include/serf-$MAJOR' @@ -18,7 +18,7 @@ # 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 @@ +@@ -364,8 +368,8 @@ else: ### 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: @@ -29,7 +29,7 @@ else: apr_libs = '' apu_libs = '' -@@ -387,6 +391,8 @@ +@@ -406,6 +410,8 @@ pkgconfig = env.Textfile('serf-%d.pc' % env.Default(lib_static, lib_shared, pkgconfig) @@ -38,7 +38,7 @@ if CALLOUT_OKAY: conf = Configure(env) -@@ -418,7 +424,7 @@ +@@ -437,7 +443,7 @@ if sys.platform == 'darwin': env.Alias('install-lib', [install_static, install_shared, ]) env.Alias('install-inc', env.Install(incdir, HEADER_FILES))