[Midnightbsd-cvs] mports [22303] serf 1.3.9
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Feb 19 21:12:38 EST 2017
Revision: 22303
http://svnweb.midnightbsd.org/mports/?rev=22303
Author: laffer1
Date: 2017-02-19 21:12:38 -0500 (Sun, 19 Feb 2017)
Log Message:
-----------
serf 1.3.9
Modified Paths:
--------------
trunk/www/serf/Makefile
trunk/www/serf/distinfo
trunk/www/serf/files/patch-SConstruct
trunk/www/serf/pkg-descr
Added Paths:
-----------
trunk/www/serf/files/patch-buckets_ssl__buckets.c
Property Changed:
----------------
trunk/www/serf/pkg-descr
Modified: trunk/www/serf/Makefile
===================================================================
--- trunk/www/serf/Makefile 2017-02-20 00:39:36 UTC (rev 22302)
+++ trunk/www/serf/Makefile 2017-02-20 02:12:38 UTC (rev 22303)
@@ -1,10 +1,10 @@
# $MidnightBSD$
PORTNAME= serf
-PORTVERSION= 1.3.8
-PORTREVISION= 2
+PORTVERSION= 1.3.9
+PORTREVISION= 0
CATEGORIES= www
-MASTER_SITES= http://serf.googlecode.com/svn/src_releases/
+MASTER_SITES= APACHE/serf
MAINTAINER= ports at MidnightBSD.org
COMMENT= Serf HTTP client library
@@ -12,14 +12,22 @@
LICENSE= apache2
LICENSE_FILE= ${WRKSRC}/LICENSE
-LIB_DEPENDS+= libapr-1.so:${PORTSDIR}/devel/apr1
+LIB_DEPENDS+= libapr-1.so:devel/apr1
USES= scons tar:bzip2 cpe python:2
USE_OPENSSL= yes
USE_LDCONFIG= yes
-OPTIONS_DEFINE= DOCS GSSAPI
+OPTIONS_DEFINE= DOCS
+OPTIONS_RADIO= KERBEROS
+OPTIONS_RADIO_KERBEROS= MIT HEIMDAL HEIMDAL_BASE
+HEIMDAL_DESC= Heimdal Kerberos (security/heimdal)
+HEIMDAL_BASE_DESC= Heimdal Kerberos (base)
+MIT_DESC= MIT Kerberos (security/krb5)
+MIT_LIB_DEPENDS= libkrb5.so.3:security/krb5
+HEIMDAL_LIB_DEPENDS= libkrb5.so.26:security/heimdal
+
SCONS_ARGS= APR=${LOCALBASE}/bin/apr-1-config
SCONS_ARGS+= APU=${LOCALBASE}/bin/apu-1-config
SCONS_ARGS+= OPENSSL=${OPENSSLBASE}
@@ -30,10 +38,14 @@
.include <bsd.mport.options.mk>
-.if ${PORT_OPTIONS:MGSSAPI}
+.if ${PORT_OPTIONS:MHEIMDAL_BASE}
SCONS_ARGS+= GSSAPI="/usr"
.endif
+.if ${PORT_OPTIONS:MMIT} || ${PORT_OPTIONS:MHEIMDAL}
+SCONS_ARGS+= GSSAPI="${LOCALBASE}"
+.endif
+
do-build:
@(cd ${WRKSRC} && ${SETENV} ${MAKE_CMD} ${SCONS_ARGS})
Modified: trunk/www/serf/distinfo
===================================================================
--- trunk/www/serf/distinfo 2017-02-20 00:39:36 UTC (rev 22302)
+++ trunk/www/serf/distinfo 2017-02-20 02:12:38 UTC (rev 22303)
@@ -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: trunk/www/serf/files/patch-SConstruct
===================================================================
--- trunk/www/serf/files/patch-SConstruct 2017-02-20 00:39:36 UTC (rev 22302)
+++ trunk/www/serf/files/patch-SConstruct 2017-02-20 02:12:38 UTC (rev 22303)
@@ -1,6 +1,6 @@
---- ./SConstruct.orig 2014-02-04 21:11:10.000000000 +0100
-+++ ./SConstruct 2014-02-26 21:55:54.000000000 +0100
-@@ -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,18 @@
# 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
-@@ -387,6 +391,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:
+- 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 = ''
+@@ -406,6 +410,8 @@ pkgconfig = env.Textfile('serf-%d.pc' %
env.Default(lib_static, lib_shared, pkgconfig)
@@ -27,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))
Added: trunk/www/serf/files/patch-buckets_ssl__buckets.c
===================================================================
--- trunk/www/serf/files/patch-buckets_ssl__buckets.c (rev 0)
+++ trunk/www/serf/files/patch-buckets_ssl__buckets.c 2017-02-20 02:12:38 UTC (rev 22303)
@@ -0,0 +1,11 @@
+--- buckets/ssl_buckets.c.orig 2016-06-30 15:45:07 UTC
++++ buckets/ssl_buckets.c
+@@ -52,7 +52,7 @@
+ #define APR_ARRAY_PUSH(ary,type) (*((type *)apr_array_push(ary)))
+ #endif
+
+-#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ #define USE_OPENSSL_1_1_API
+ #endif
+
Property changes on: trunk/www/serf/files/patch-buckets_ssl__buckets.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/www/serf/pkg-descr
===================================================================
--- trunk/www/serf/pkg-descr 2017-02-20 00:39:36 UTC (rev 22302)
+++ trunk/www/serf/pkg-descr 2017-02-20 02:12:38 UTC (rev 22303)
@@ -4,4 +4,4 @@
and transformations are kept to a minimum to provide high
performance operation.
-WWW: http://code.google.com/p/serf/
+WWW: http://serf.apache.org/
Property changes on: trunk/www/serf/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
More information about the Midnightbsd-cvs
mailing list