[Midnightbsd-cvs] mports [16088] trunk/www/serf: update patch

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat Mar 22 19:05:53 EDT 2014


Revision: 16088
          http://svnweb.midnightbsd.org/mports/?rev=16088
Author:   laffer1
Date:     2014-03-22 19:05:52 -0400 (Sat, 22 Mar 2014)
Log Message:
-----------
update patch

Modified Paths:
--------------
    trunk/www/serf/Makefile
    trunk/www/serf/files/patch-SConstruct

Modified: trunk/www/serf/Makefile
===================================================================
--- trunk/www/serf/Makefile	2014-03-22 22:26:37 UTC (rev 16087)
+++ trunk/www/serf/Makefile	2014-03-22 23:05:52 UTC (rev 16088)
@@ -19,7 +19,7 @@
 
 SUB_FILES=	libserf-1.la
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	DOCS GSSAPI
 
 SCONS_ENV=	# empty
 SCONS_BUILDENV=	# empty
@@ -31,6 +31,12 @@
 SCONS_ARGS+=	CFLAGS="${CFLAGS}"
 SCONS_INSTALL_TARGET=	install --install-sandbox=${STAGEDIR}
 
+.include <bsd.mport.options.mk>
+
+.if ${PORT_OPTIONS:MGSSAPI}
+SCONS_ARGS+=	GSSAPI="/usr"
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e '/^Requires.private/d' ${WRKSRC}/build/serf.pc.in
 

Modified: trunk/www/serf/files/patch-SConstruct
===================================================================
--- trunk/www/serf/files/patch-SConstruct	2014-03-22 22:26:37 UTC (rev 16087)
+++ trunk/www/serf/files/patch-SConstruct	2014-03-22 23:05:52 UTC (rev 16088)
@@ -1,5 +1,5 @@
---- ./SConstruct.orig	2013-10-04 17:11:04.000000000 +0200
-+++ ./SConstruct	2013-10-05 16:16:20.000000000 +0200
+--- ./SConstruct.orig	2014-02-04 21:11:10.000000000 +0100
++++ ./SConstruct	2014-02-26 21:55:54.000000000 +0100
 @@ -69,6 +69,9 @@
  
  opts = Variables(files=[SAVED_CONFIG])
@@ -18,17 +18,15 @@
  
  # 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')),
-                            })
+@@ -387,6 +391,8 @@
  
--env.Default(lib_static, lib_shared, pkgconfig)
-+env.Default(lib_static, lib_shared, pkgconfig )
+ env.Default(lib_static, lib_shared, pkgconfig)
+ 
++#print env.Dump()
 +
-+#print env.Dump()
- 
  if CALLOUT_OKAY:
    conf = Configure(env)
+ 
 @@ -418,7 +424,7 @@
  env.Alias('install-lib', [install_static, install_shared,
                            ])



More information about the Midnightbsd-cvs mailing list