Pass in additional libraries and use full path to krb5-config.

Fixes build on SunOS when using builtin mit-krb5.

3 files changed, 29 insertions, 8 deletions

diff --git a/www/serf/Makefile b/www/serf/Makefile
index 05e743084d3..c5bd4c925f0 100644
--- a/www/serf/Makefile
+++ b/www/serf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2014/02/06 11:02:12 markd Exp $
+# $NetBSD: Makefile,v 1.25 2014/02/12 14:35:11 jperkin Exp $
 
 DISTNAME=	serf-1.3.3
 PKGREVISION=	1
@@ -17,8 +17,9 @@ SCONS_ARGS+=		APR=${PREFIX}/bin/apr-1-config
 SCONS_ARGS+=		APU=${PREFIX}/bin/apu-1-config
 SCONS_ARGS+=		CC=${CC:Q}
 SCONS_ARGS+=		CFLAGS=${CFLAGS:Q}
+SCONS_ARGS+=		LDFLAGS=${LDFLAGS:Q}
 SCONS_ARGS+=		OPENSSL=${PREFIX}/lib
-SCONS_ARGS+=		GSSAPI=${KRB5BASE}
+SCONS_ARGS+=		GSSAPI=${KRB5_CONFIG:Q}
 
 CFLAGS.SunOS+=		-D__EXTENSIONS__
 
diff --git a/www/serf/distinfo b/www/serf/distinfo
index 9d3aa5b064c..80741c2152e 100644
--- a/www/serf/distinfo
+++ b/www/serf/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.12 2014/01/02 18:36:40 wiz Exp $
+$NetBSD: distinfo,v 1.13 2014/02/12 14:35:11 jperkin Exp $
 
 SHA1 (serf-1.3.3.tar.bz2) = b25c44a8651805f20f66dcaa76db08442ec4fa0e
 RMD160 (serf-1.3.3.tar.bz2) = bb03de7ed3554f6d47d36e711060979454bda889
 Size (serf-1.3.3.tar.bz2) = 140213 bytes
-SHA1 (patch-SConstruct) = 78eb23e8b3b9cd0ba497a355136d742b6d887bfc
+SHA1 (patch-SConstruct) = c7f3e9e0c778e76808e4a921043723fcfca6a4de
 SHA1 (patch-buckets_ssl__buckets.c) = f940e1703d3a8cf879d5a563cf57826f027ed8e1
diff --git a/www/serf/patches/patch-SConstruct b/www/serf/patches/patch-SConstruct
index feb10d50092..c733e29c195 100644
--- a/www/serf/patches/patch-SConstruct
+++ b/www/serf/patches/patch-SConstruct
@@ -1,11 +1,19 @@
-$NetBSD: patch-SConstruct,v 1.4 2013/10/14 06:30:47 adam Exp $
+$NetBSD: patch-SConstruct,v 1.5 2014/02/12 14:35:11 jperkin Exp $
 
 Hack: Use OPENSSL variable as final shared library path; fixes lib id on Darwin.
 Don't append -O2 compiler flag.
 
 --- SConstruct.orig	2013-10-04 15:11:04.000000000 +0000
 +++ SConstruct
-@@ -146,7 +146,7 @@ if sys.platform == 'win32':
+@@ -106,6 +106,7 @@ opts.AddVariables(
+   RawListVariable('CC', "Command name or path of the C compiler", None),
+   RawListVariable('CFLAGS', "Extra flags for the C compiler (space-separated)",
+                   None),
++  RawListVariable('LDFLAGS', "Extra linker flags from pkgsrc", None),
+   RawListVariable('LIBS', "Extra libraries passed to the linker, "
+                   "e.g. \"-l<library1> -l<library2>\" (space separated)", None),
+   RawListVariable('LINKFLAGS', "Extra flags for the linker (space-separated)",
+@@ -146,7 +147,7 @@ if sys.platform == 'win32':
                   True),
      )
  
@@ -14,7 +22,7 @@ Don't append -O2 compiler flag.
                    tools=('default', 'textfile',),
                    CPPPATH=['.', ],
                    )
-@@ -240,7 +240,6 @@ if sys.platform != 'win32':
+@@ -240,7 +241,6 @@ if sys.platform != 'win32':
      env.Append(CCFLAGS='-g')
      env.Append(CPPDEFINES=['DEBUG', '_DEBUG'])
    else:
@@ -22,7 +30,19 @@ Don't append -O2 compiler flag.
      env.Append(CPPDEFINES='NDEBUG')
  
    ### works for Mac OS. probably needs to change
-@@ -410,7 +409,7 @@ if sys.platform == 'darwin':
+@@ -372,6 +372,11 @@ if sys.platform == 'win32':
+ for d in env['LIBPATH']:
+   env.Append(RPATH=':'+d)
+ 
++for l in env['LDFLAGS']:
++  if l.startswith('-l'):
++    env.Append(LINKFLAGS=" " + l)
++    env.Append(GSSAPI_LIBS=" " + l)
++
+ # Set up the construction of serf-*.pc
+ pkgconfig = env.Textfile('serf-%d.pc' % (MAJOR,),
+                          env.File('build/serf.pc.in'),
+@@ -410,7 +415,7 @@ if sys.platform == 'darwin':
    # make applications depend on the exact major.minor.patch version of serf.
  
    install_shared_path = install_shared[0].abspath