- update to version 1.3.2

4 files changed, 61 insertions, 20 deletions

diff --git a/www/serf/Makefile b/www/serf/Makefile
index 54f9e14d93c0..d1c57bd6d1c1 100644
--- a/www/serf/Makefile
+++ b/www/serf/Makefile
@@ -2,39 +2,40 @@
 # $FreeBSD$
 
 PORTNAME=	serf
-PORTVERSION=	1.2.1
-PORTREVISION=	1
+PORTVERSION=	1.3.2
 CATEGORIES=	www
 MASTER_SITES=	GOOGLE_CODE
-MASTER_SITE_SUBDIR=	db
 
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Serf HTTP client library
 
 LIB_DEPENDS+=	apr-1:${PORTSDIR}/devel/apr1
 
+USE_SCONS=	yes
 USE_BZIP2=	yes
-USES=		pathfix
-GNU_CONFIGURE=	yes
+USE_OPENSSL=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ARGS+=	--with-apr=${LOCALBASE}/bin/apr-1-config \
-			--with-apr-util=${LOCALBASE}/bin/apu-1-config
 
 OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+SCONS_ENV=	# empty
+SCONS_BUILDENV=	# empty
+SCONS_ARGS=	APR=${LOCALBASE}/bin/apr-1-config
+SCONS_ARGS+=	APU=${LOCALBASE}/bin/apu-1-config
+SCONS_ARGS+=	OPENSSL=${OPENSSLBASE}
+SCONS_ARGS+=	PREFIX=${PREFIX}
+SCONS_ARGS+=	CC=${CC}
+SCONS_ARGS+=	CFLAGS="${CFLAGS}"
+SCONS_INSTALL_TARGET=	install --install-sandbox=${STAGEDIR}
 
 post-patch:
-	@${REINPLACE_CMD} -e '/^Requires.private/d' ${WRKSRC}/serf.pc.in
+	@${REINPLACE_CMD} -e '/^Requires.private/d' ${WRKSRC}/build/serf.pc.in
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/design-guide.txt ${DOCSDIR}
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/design-guide.txt ${STAGEDIR}${DOCSDIR}
 
-regression-test:
-	@(cd ${WRKSRC} && ${MAKE} check)
+regression-test check: build
+	@(cd ${WRKSRC} && ${SCONS_BIN} check)
 
 .include <bsd.port.mk>
diff --git a/www/serf/distinfo b/www/serf/distinfo
index dafe692f6f30..003b4864165c 100644
--- a/www/serf/distinfo
+++ b/www/serf/distinfo
@@ -1,2 +1,2 @@
-SHA256 (serf-1.2.1.tar.bz2) = 6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700
-SIZE (serf-1.2.1.tar.bz2) = 190464
+SHA256 (serf-1.3.2.tar.bz2) = e4e7da37d99f4fdf14a4c13a256330037536d4328a0e1ae3deb6f8531ed8200f
+SIZE (serf-1.3.2.tar.bz2) = 139861
diff --git a/www/serf/files/patch-SConstruct b/www/serf/files/patch-SConstruct
new file mode 100644
index 000000000000..3f1ec54f9491
--- /dev/null
+++ b/www/serf/files/patch-SConstruct
@@ -0,0 +1,40 @@
+--- ./SConstruct.orig	2013-10-04 17:11:04.000000000 +0200
++++ ./SConstruct	2013-10-05 16:16:20.000000000 +0200
+@@ -69,6 +69,9 @@
+ 
+ opts = Variables(files=[SAVED_CONFIG])
+ opts.AddVariables(
++  RawListVariable('DESTDIR',
++               'Required *dummy*, without scons will stop with "Unknown variables: DESTDIR"',
++                None),
+   PathVariable('PREFIX',
+                'Directory to install under',
+                default_prefix,
+@@ -203,6 +206,7 @@
+ thisdir = os.getcwd()
+ libdir = '$LIBDIR'
+ incdir = '$PREFIX/include/serf-$MAJOR'
++pkgconfdir = '$PREFIX/libdata'
+ 
+ # 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
+@@ -385,7 +389,9 @@
+                                                        env.get('GSSAPI_LIBS')),
+                            })
+ 
+-env.Default(lib_static, lib_shared, pkgconfig)
++env.Default(lib_static, lib_shared, pkgconfig )
++
++#print env.Dump()
+ 
+ if CALLOUT_OKAY:
+   conf = Configure(env)
+@@ -418,7 +424,7 @@
+ env.Alias('install-lib', [install_static, install_shared,
+                           ])
+ env.Alias('install-inc', env.Install(incdir, HEADER_FILES))
+-env.Alias('install-pc', env.Install(os.path.join(libdir, 'pkgconfig'),
++env.Alias('install-pc', env.Install(os.path.join(pkgconfdir, 'pkgconfig'),
+                                     pkgconfig))
+ env.Alias('install', ['install-lib', 'install-inc', 'install-pc', ])
+ 
diff --git a/www/serf/pkg-plist b/www/serf/pkg-plist
index 85c86cf8977f..36775eb22698 100644
--- a/www/serf/pkg-plist
+++ b/www/serf/pkg-plist
@@ -2,9 +2,9 @@ include/serf-1/serf.h
 include/serf-1/serf_bucket_types.h
 include/serf-1/serf_bucket_util.h
 lib/libserf-1.a
-lib/libserf-1.la
 lib/libserf-1.so
-lib/libserf-1.so.0
+lib/libserf-1.so.1
+lib/libserf-1.so.1.3.0
 libdata/pkgconfig/serf-1.pc
 %%PORTDOCS%%%%DOCSDIR%%/design-guide.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%