diff options
| author | wiz <wiz> | 2015-01-29 10:29:13 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2015-01-29 10:29:13 +0000 |
| commit | 8c33d28397c3edaa0063d335cd3c3adb441a8dae (patch) | |
| tree | b3038e53e1110fe8f8094639f9d96418d3b3d6e5 | |
| parent | 4f557ccf8591aba89447f7e6d7ac432458f22482 (diff) | |
| download | pkgsrc-8c33d28397c3edaa0063d335cd3c3adb441a8dae.tar.gz | |
Make gssapi a default-on option instead of a fixed dependency.
From Edgar Fuß in PR 49611.
| -rw-r--r-- | www/serf/Makefile | 6 | ||||
| -rw-r--r-- | www/serf/options.mk | 12 |
2 files changed, 15 insertions, 3 deletions
diff --git a/www/serf/Makefile b/www/serf/Makefile index a5029eef2b4..164f237c7c1 100644 --- a/www/serf/Makefile +++ b/www/serf/Makefile @@ -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+= CC=${CC:Q} 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 @@ do-install: .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 --git a/www/serf/options.mk b/www/serf/options.mk new file mode 100644 index 00000000000..b929abeb8a2 --- /dev/null +++ b/www/serf/options.mk @@ -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 |