pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/www/serf Make gssapi a default-on option instead of a ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/944bb7c11186
branches:  trunk
changeset: 645503:944bb7c11186
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Jan 29 10:29:13 2015 +0000

description:
Make gssapi a default-on option instead of a fixed dependency.
>From Edgar Fuß in PR 49611.

diffstat:

 www/serf/Makefile   |   6 +++---
 www/serf/options.mk |  12 ++++++++++++
 2 files changed, 15 insertions(+), 3 deletions(-)

diffs (44 lines):

diff -r 19cadfce96a8 -r 944bb7c11186 www/serf/Makefile
--- a/www/serf/Makefile Thu Jan 29 10:17:12 2015 +0000
+++ b/www/serf/Makefile Thu Jan 29 10:29:13 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2014/10/27 08:38:02 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2015/01/29 10:29:13 wiz Exp $
 
 DISTNAME=      serf-1.3.8
 CATEGORIES=    www
@@ -18,9 +18,10 @@
 SCONS_ARGS+=           CFLAGS=${CFLAGS:Q}
 SCONS_ARGS+=           LDFLAGS=${LDFLAGS:Q}
 SCONS_ARGS+=           OPENSSL=${PREFIX}/lib
-SCONS_ARGS+=           GSSAPI=${KRB5_CONFIG:Q}
 SCONS_ARGS+=           --install-sandbox=${DESTDIR}
 
+.include "options.mk"
+
 CFLAGS.SunOS+=         -D__EXTENSIONS__
 
 do-build:
@@ -32,6 +33,5 @@
 .include "../../devel/apr/buildlink3.mk"
 .include "../../devel/apr-util/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/krb5.buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 19cadfce96a8 -r 944bb7c11186 www/serf/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/serf/options.mk       Thu Jan 29 10:29:13 2015 +0000
@@ -0,0 +1,12 @@
+# $NetBSD: options.mk,v 1.1 2015/01/29 10:29:13 wiz Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.serf
+PKG_SUPPORTED_OPTIONS= gssapi
+PKG_SUGGESTED_OPTIONS= gssapi
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mgssapi)
+.include "../../mk/krb5.buildlink3.mk"
+SCONS_ARGS+=           GSSAPI=${KRB5_CONFIG:Q}
+.endif



Home | Main Index | Thread Index | Old Index