From 9393d5dda4663217971669a294635eed0f7b2ee1 Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Fri, 6 Sep 2013 17:23:49 +0000
Subject: Update to 1.3.1:

Serf 1.3.1 [2013-08-15, from /tags/1.3.1, r????]
  Fix issue 77: Endless loop if server doesn't accept Negotiate authentication.
  Fix issue 114: ssl/tls renegotiation fails
  Fix issue 120: error with ssl tunnel over proxy with KeepAlive off and
                 Basic authentication.
  Fixed bugs with authentication (r2057,2115,2118)
  SCons-related fixes:
   Fix issue 111: add flag to set custom library path
   Fix issue 112: add soname
   Fix issue 113: add gssapi libs in the serf pc file
   Fix issue 115: Setting RPATH on Solaris broken in SConstruct
   Fix issue 116: scons check should return non-zero exit staths
   Fix issue 121: make CFLAGS, LIBS, LINKFLAGS and CPPFLAGS take a space-
                   separated list of flags.
   Fix issue 122: make scons PREFIX create the folder if it doesn't exist
   Mac OS X: Fix scons --install-sandbox
   Solaris: Fix build with cc, don't use unsupported compiler flags
  Require SCons version 2.3.0 or higher now (for the soname support).

Serf 1.3.0 [2013-07-23, from /tags/1.3.0, r2074]
  Fix issue 83: use PATH rather than URI within an ssltunnel (r1952)
  Fix issue 108: improved error reporting from the underlying socket (r1951)
  NEW: Switch to the SCons build system; retire serfmake, serf.mak, autotools
  Improved Basic and Digest authentication:
    - remember credentials on a per-server basis
    - properly manage authentication realms
    - continue functioning when a server sets KeepAlive: off
  Windows: add support for NTLM authentication
  Improved 2617 compliance: always use strongest authentication (r1968,1971)
  Fixed bugs with proxy authentication and SSL tunneling through a proxy
  Fixed bugs the response parser (r2032,r2036)
  SSL connection performance improvements
  Huge expansion of the test suite
---
 www/serf/Makefile | 18 ++++++++++++------
 www/serf/PLIST    |  7 +++++--
 www/serf/distinfo |  8 ++++----
 3 files changed, 21 insertions(+), 12 deletions(-)

(limited to 'www/serf')

diff --git a/www/serf/Makefile b/www/serf/Makefile
index a11b1a6ae86..6ba9911a824 100644
--- a/www/serf/Makefile
+++ b/www/serf/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2013/07/04 17:17:28 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2013/09/06 17:23:49 wiz Exp $
 
-DISTNAME=	serf-1.2.1
+DISTNAME=	serf-1.3.1
 CATEGORIES=	www
 MASTER_SITES=	http://serf.googlecode.com/files/
 EXTRACT_SUFX=	.tar.bz2
@@ -9,13 +9,19 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://code.google.com/p/serf/
 COMMENT=	High-performance asynchronous HTTP client library
 
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
+BUILD_DEPENDS+=	scons>=2.3.0:../../devel/scons
 
-GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
-USE_TOOLS+=		gmake
-
 TEST_TARGET=		check
+SCONS_ARGS+=		APR=${PREFIX}/bin/apr-1-config
+SCONS_ARGS+=		APU=${PREFIX}/bin/apu-1-config
+SCONS_ARGS+=		OPENSSL=${PREFIX}/lib
+
+do-build:
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/scons PREFIX=${PREFIX} ${SCONS_ARGS}
+
+do-install:
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/scons PREFIX=${DESTDIR}${PREFIX} ${SCONS_ARGS} install
 
 .include "../../devel/apr/buildlink3.mk"
 .include "../../devel/apr-util/buildlink3.mk"
diff --git a/www/serf/PLIST b/www/serf/PLIST
index 6665314a422..85a8af2e03a 100644
--- a/www/serf/PLIST
+++ b/www/serf/PLIST
@@ -1,6 +1,9 @@
-@comment $NetBSD: PLIST,v 1.4 2013/07/04 17:17:28 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2013/09/06 17:23:49 wiz Exp $
 include/serf-1/serf.h
 include/serf-1/serf_bucket_types.h
 include/serf-1/serf_bucket_util.h
-lib/libserf-1.la
+lib/libserf-1.a
+lib/libserf-1.so
+lib/libserf-1.so.3
+lib/libserf-1.so.3.0.0
 lib/pkgconfig/serf-1.pc
diff --git a/www/serf/distinfo b/www/serf/distinfo
index 53897101c18..9006636a8fa 100644
--- a/www/serf/distinfo
+++ b/www/serf/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2013/07/07 01:18:46 obache Exp $
+$NetBSD: distinfo,v 1.7 2013/09/06 17:23:49 wiz Exp $
 
-SHA1 (serf-1.2.1.tar.bz2) = f65fbbd72926c8e7cf0dbd4ada03b0d226f461fd
-RMD160 (serf-1.2.1.tar.bz2) = 49036f303a7737981276fa451a66a3b5bccc201f
-Size (serf-1.2.1.tar.bz2) = 190464 bytes
+SHA1 (serf-1.3.1.tar.bz2) = b8c8e12e7163d7bacf9be0ea4aaa7b8c32e8c72c
+RMD160 (serf-1.3.1.tar.bz2) = 7833e2ab323800aae099c84b9a42ab0331c69c6e
+Size (serf-1.3.1.tar.bz2) = 138181 bytes
 SHA1 (patch-buckets_ssl__buckets.c) = f940e1703d3a8cf879d5a563cf57826f027ed8e1
-- 
cgit v1.2.3