ports/141033: [PATCH] allow to build libsoup without gnome

[Bapt]

>Number:         141033
>Category:       ports
>Synopsis:       [PATCH] allow to build libsoup without gnome
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Nov 30 18:00:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Bapt
>Release:        FreeBSD 8.0-STABLE amd64
>Organization:
>Environment:
System: FreeBSD wicklow.lan 8.0-STABLE FreeBSD 8.0-STABLE #2: Mon Nov 30 02:31:24 CET 2009 root at wicklow.lan:/usr/obj/usr/src/sys/WICKLOW amd64


	
>Description:
The following patch allows users to build libsoup without gnome it they defined the knobs WITHOUT_GNOME, by default it still works the way it used to.

That is usefull for non-gnome webkit users


>How-To-Repeat:
	
>Fix:

	

--- libsoup-without-gnome.patch begins here ---
diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile
index b53aa9c..c56ea7b 100644
--- a/devel/libsoup/Makefile
+++ b/devel/libsoup/Makefile
@@ -2,7 +2,7 @@
 # Date created:				12 March 2003
 # Whom:					Joe Marcus Clarke <marcus at FreeBSD.org>
 #
-# $FreeBSD$
+# $FreeBSD: ports/devel/libsoup/Makefile,v 1.72 2009/11/28 20:05:36 marcus Exp $
 #   $MCom: ports/devel/libsoup/Makefile,v 1.71 2009/10/20 00:22:57 kwm Exp $
 #
 
@@ -20,12 +20,9 @@ USE_BZIP2=	yes
 
 .if !defined(REFERENCE_PORT)
 
-LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt \
-    		proxy.0:${PORTSDIR}/net/libproxy \
-		gnome-keyring.0:${PORTSDIR}/security/gnome-keyring \
-		sqlite3.8:${PORTSDIR}/databases/sqlite3
+LIB_DEPENDS=	proxy.0:${PORTSDIR}/net/libproxy
 
-USE_GNOME=	gnomehack glib20 libxml2 ltverhack referencehack gconf2
+USE_GNOME=	gnomehack glib20 libxml2 ltverhack referencehack
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
@@ -36,6 +33,17 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 
 PLIST_SUB=	VERSION="2.4"
 
+.if !defined(WITHOUT_GNOME)
+USE_GNMOE+=	gconf2
+LIB_DEPENDS+=	gnome-keyring.0:${PORTSDIR}/security/gnome-keyring \
+		sqlite3.8:${PORTSDIR}/databases/sqlite3
+PLIST_SUB+=	GNOME=""
+.else
+CONFIGURE_AGRS+= --without-gnome
+PLIST_SUB+=	GNOME="@comment "
+.endif
+
+
 .if !defined(WITHOUT_SSL)
 LIB_DEPENDS+=	gnutls.40:${PORTSDIR}/security/gnutls
 .else
diff --git a/devel/libsoup/pkg-plist b/devel/libsoup/pkg-plist
index 08c75d5..3db8349 100644
--- a/devel/libsoup/pkg-plist
+++ b/devel/libsoup/pkg-plist
@@ -34,20 +34,20 @@ include/libsoup-%%VERSION%%/libsoup/soup-uri.h
 include/libsoup-%%VERSION%%/libsoup/soup-value-utils.h
 include/libsoup-%%VERSION%%/libsoup/soup-xmlrpc.h
 include/libsoup-%%VERSION%%/libsoup/soup.h
-include/libsoup-gnome-%%VERSION%%/libsoup/soup-cookie-jar-sqlite.h
-include/libsoup-gnome-%%VERSION%%/libsoup/soup-gnome-features.h
-include/libsoup-gnome-%%VERSION%%/libsoup/soup-gnome.h
+%%GNOME%%include/libsoup-gnome-%%VERSION%%/libsoup/soup-cookie-jar-sqlite.h
+%%GNOME%%include/libsoup-gnome-%%VERSION%%/libsoup/soup-gnome-features.h
+%%GNOME%%include/libsoup-gnome-%%VERSION%%/libsoup/soup-gnome.h
 lib/libsoup-%%VERSION%%.a
 lib/libsoup-%%VERSION%%.la
 lib/libsoup-%%VERSION%%.so
 lib/libsoup-%%VERSION%%.so.1
-lib/libsoup-gnome-%%VERSION%%.a
-lib/libsoup-gnome-%%VERSION%%.la
-lib/libsoup-gnome-%%VERSION%%.so
-lib/libsoup-gnome-%%VERSION%%.so.1
+%%GNOME%%lib/libsoup-gnome-%%VERSION%%.a
+%%GNOME%%lib/libsoup-gnome-%%VERSION%%.la
+%%GNOME%%lib/libsoup-gnome-%%VERSION%%.so
+%%GNOME%%lib/libsoup-gnome-%%VERSION%%.so.1
 libdata/pkgconfig/libsoup-%%VERSION%%.pc
 libdata/pkgconfig/libsoup-gnome-%%VERSION%%.pc
- at dirrm include/libsoup-gnome-%%VERSION%%/libsoup
- at dirrm include/libsoup-gnome-%%VERSION%%
+%%GNOME%%@dirrm include/libsoup-gnome-%%VERSION%%/libsoup
+%%GNOME%%@dirrm include/libsoup-gnome-%%VERSION%%
 @dirrm include/libsoup-%%VERSION%%/libsoup
 @dirrm include/libsoup-%%VERSION%%
--- libsoup-without-gnome.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: