Add a gnome option, enabled by default.

Fix PR pkg/42854, applying a similar patch.

Remove the dependency on gtk-doc, it wasn't used.

4 files changed, 37 insertions, 13 deletions

diff --git a/net/libsoup24/Makefile b/net/libsoup24/Makefile
index b548da0cbcd..ea055089dcb 100644
--- a/net/libsoup24/Makefile
+++ b/net/libsoup24/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2009/12/16 19:02:26 drochner Exp $
+# $NetBSD: Makefile,v 1.21 2010/02/28 20:49:21 tonio Exp $
 
 DISTNAME=	libsoup-2.28.2
 PKGNAME=	${DISTNAME:S/libsoup/libsoup24/}
+PKGREVISION=	1
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libsoup/2.28/}
 EXTRACT_SUFX=	.tar.bz2
@@ -18,18 +19,16 @@ USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 
 PKGCONFIG_OVERRIDE+=	libsoup-2.4.pc.in
-PKGCONFIG_OVERRIDE+=	libsoup-gnome-2.4.pc.in
 
 TEST_TARGET=	check
 
+.include "options.mk"
+
 .include "../../databases/sqlite3/buildlink3.mk"
-.include "../../devel/GConf/buildlink3.mk"
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.21.3
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../security/gnome-keyring/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gnutls+=	gnutls>=2.1.7
 .include "../../security/gnutls/buildlink3.mk"
-.include "../../textproc/gtk-doc/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../www/libproxy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/libsoup24/PLIST b/net/libsoup24/PLIST
index ac2e00524b8..6011e822b93 100644
--- a/net/libsoup24/PLIST
+++ b/net/libsoup24/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2009/12/16 19:02:26 drochner Exp $
+@comment $NetBSD: PLIST,v 1.10 2010/02/28 20:49:21 tonio Exp $
 include/libsoup-2.4/libsoup/soup-address.h
 include/libsoup-2.4/libsoup/soup-auth-domain-basic.h
 include/libsoup-2.4/libsoup/soup-auth-domain-digest.h
@@ -36,13 +36,13 @@ include/libsoup-2.4/libsoup/soup-uri.h
 include/libsoup-2.4/libsoup/soup-value-utils.h
 include/libsoup-2.4/libsoup/soup-xmlrpc.h
 include/libsoup-2.4/libsoup/soup.h
-include/libsoup-gnome-2.4/libsoup/soup-cookie-jar-sqlite.h
-include/libsoup-gnome-2.4/libsoup/soup-gnome-features.h
-include/libsoup-gnome-2.4/libsoup/soup-gnome.h
+${PLIST.gnome}include/libsoup-gnome-2.4/libsoup/soup-cookie-jar-sqlite.h
+${PLIST.gnome}include/libsoup-gnome-2.4/libsoup/soup-gnome-features.h
+${PLIST.gnome}include/libsoup-gnome-2.4/libsoup/soup-gnome.h
 lib/libsoup-2.4.la
-lib/libsoup-gnome-2.4.la
+${PLIST.gnome}lib/libsoup-gnome-2.4.la
 lib/pkgconfig/libsoup-2.4.pc
-lib/pkgconfig/libsoup-gnome-2.4.pc
+${PLIST.gnome}lib/pkgconfig/libsoup-gnome-2.4.pc
 share/gtk-doc/html/libsoup-2.4/SoupAddress.html
 share/gtk-doc/html/libsoup-2.4/SoupAuth.html
 share/gtk-doc/html/libsoup-2.4/SoupAuthDomain.html
diff --git a/net/libsoup24/buildlink3.mk b/net/libsoup24/buildlink3.mk
index f015926d4fa..a31920f5694 100644
--- a/net/libsoup24/buildlink3.mk
+++ b/net/libsoup24/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2010/02/25 17:24:34 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2010/02/28 20:49:21 tonio Exp $
 
 BUILDLINK_TREE+=	libsoup24
 
@@ -12,11 +12,18 @@ BUILDLINK_PKGSRCDIR.libsoup24?=		../../net/libsoup24
 
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../security/gnome-keyring/buildlink3.mk"
 .include "../../security/gnutls/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../www/libproxy/buildlink3.mk"
+
+pkgbase := libsoup24
+.include "../../mk/pkg-build-options.mk"
+
+.if !empty(PKG_BUILD_OPTIONS.libsoup24:Mgnome)
+.include "../../security/gnome-keyring/buildlink3.mk"
 .include "../../devel/GConf/buildlink3.mk"
+.endif
+
 .endif # LIBSOUP24_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-libsoup24
diff --git a/net/libsoup24/options.mk b/net/libsoup24/options.mk
new file mode 100644
index 00000000000..575d04fb349
--- /dev/null
+++ b/net/libsoup24/options.mk
@@ -0,0 +1,18 @@
+# $NetBSD: options.mk,v 1.1 2010/02/28 20:49:21 tonio Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.libsoup24
+PKG_SUPPORTED_OPTIONS=	gnome
+PKG_SUGGESTED_OPTIONS=	gnome
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+= gnome
+
+.if !empty(PKG_OPTIONS:Mgnome)
+.include "../../devel/GConf/buildlink3.mk"
+.include "../../security/gnome-keyring/buildlink3.mk"
+PKGCONFIG_OVERRIDE+=	libsoup-gnome-2.4.pc.in
+PLIST.gnome=	yes
+.else
+CONFIGURE_ARGS+= --without-gnome
+.endif