From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Nov 30 18:00:02 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 808B0106568D for ; Mon, 30 Nov 2009 18:00:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 367878FC1E for ; Mon, 30 Nov 2009 18:00:02 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id nAUI02Dk002060 for ; Mon, 30 Nov 2009 18:00:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id nAUI02IU002059; Mon, 30 Nov 2009 18:00:02 GMT (envelope-from gnats) Resent-Date: Mon, 30 Nov 2009 18:00:02 GMT Resent-Message-Id: <200911301800.nAUI02IU002059@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Bapt Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4126D106566C for ; Mon, 30 Nov 2009 17:58:00 +0000 (UTC) (envelope-from baptiste.daroussin@gmail.com) Received: from mail-ew0-f226.google.com (mail-ew0-f226.google.com [209.85.219.226]) by mx1.freebsd.org (Postfix) with ESMTP id C27098FC1C for ; Mon, 30 Nov 2009 17:57:59 +0000 (UTC) Received: by ewy26 with SMTP id 26so4367319ewy.3 for ; Mon, 30 Nov 2009 09:57:58 -0800 (PST) Received: by 10.213.100.4 with SMTP id w4mr2051273ebn.25.1259603878521; Mon, 30 Nov 2009 09:57:58 -0800 (PST) Received: from wicklow.lan (stc92-3-82-245-249-89.fbx.proxad.net [82.245.249.89]) by mx.google.com with ESMTPS id 15sm2646462ewy.4.2009.11.30.09.57.56 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 30 Nov 2009 09:57:57 -0800 (PST) Received: from root (uid 0) (envelope-from baptiste.daroussin@gmail.com) id 27ad5 by wicklow.lan (DragonFly Mail Agent) Mon, 30 Nov 2009 18:56:34 +0100 Message-Id: <27ad5@wicklow.lan> Date: Mon, 30 Nov 2009 18:56:34 +0100 From: Bapt To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/141033: [PATCH] allow to build libsoup without gnome X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Bapt List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Nov 2009 18:00:02 -0000 >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@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 # -# $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 -@dirrm include/libsoup-gnome-%%VERSION%%/libsoup -@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: