From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Mar 6 12:20:13 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F09F316A4CE for ; Sat, 6 Mar 2004 12:20:12 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D33DF43D31 for ; Sat, 6 Mar 2004 12:20:12 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i26KKCbv039469 for ; Sat, 6 Mar 2004 12:20:12 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.10/8.12.10/Submit) id i26KKCXG039468; Sat, 6 Mar 2004 12:20:12 -0800 (PST) (envelope-from gnats) Resent-Date: Sat, 6 Mar 2004 12:20:12 -0800 (PST) Resent-Message-Id: <200403062020.i26KKCXG039468@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, sybolt@xs4all.nl Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D4C8016A4CE for ; Sat, 6 Mar 2004 12:10:24 -0800 (PST) Received: from tsunami.chello.nl (node-d-4f16.a2000.nl [62.195.79.22]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5897B43D1F for ; Sat, 6 Mar 2004 12:10:21 -0800 (PST) (envelope-from sybolt@xs4all.nl) Received: from tsunami.chello.nl (localhost [127.0.0.1]) by tsunami.chello.nl (8.12.11/8.12.11) with ESMTP id i26K8jUo043964 for ; Sat, 6 Mar 2004 21:08:46 +0100 (CET) (envelope-from sybolt@xs4all.nl) Received: (from bolt@localhost) by tsunami.chello.nl (8.12.11/8.12.11/Submit) id i26K8g49043963; Sat, 6 Mar 2004 21:08:42 +0100 (CET) (envelope-from sybolt@xs4all.nl) Message-Id: <200403062008.i26K8g49043963@tsunami.chello.nl> Date: Sat, 6 Mar 2004 21:08:42 +0100 (CET) From: Sybolt de Boer To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/63851: [patch] enable devel/libgsf to be built without gnome X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: sybolt@xs4all.nl List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Mar 2004 20:20:13 -0000 >Number: 63851 >Category: ports >Synopsis: [patch] enable devel/libgsf to be built without gnome >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Mar 06 12:20:12 PST 2004 >Closed-Date: >Last-Modified: >Originator: Sybolt de Boer >Release: FreeBSD 5.2-CURRENT i386 >Organization: >Environment: System: FreeBSD tsunami.chello.nl 5.2-CURRENT FreeBSD 5.2-CURRENT #3: Sat Mar 6 10:48:30 CET 2004 root@tsunami.chello.nl:/usr/obj/usr/src/sys/TSUNAMI i386 >Description: >How-To-Repeat: >Fix: --- libgsf.patch begins here --- diff -ruN libgsf.orig/Makefile libgsf/Makefile --- libgsf.orig/Makefile Sat Mar 6 20:38:46 2004 +++ libgsf/Makefile Sat Mar 6 20:40:35 2004 @@ -23,11 +23,23 @@ USE_BZIP2= yes USE_GMAKE= yes INSTALLS_SHLIB= yes -USE_GNOME= gnomehack libbonobo gnomevfs2 +WANT_GNOME= yes +USE_GNOME= gnomehack glib20 libxml2 USE_LIBTOOL= yes CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc/gsf \ - --disable-gtk-doc --with-gnome --with-bz2 + --disable-gtk-doc --with-bz2 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -.include +.include + +.if ${HAVE_GNOME:Mgnomevfs2}!="" +USE_GNOME+= libbonobo gnomevfs2 +CONFIGURE_ARGS+=--with-gnome +PLIST_SUB= EVIL="" +.else +CONFIGURE_ARGS+=--without-gnome +PLIST_SUB= EVIL="@comment " +.endif + +.include diff -ruN libgsf.orig/pkg-plist libgsf/pkg-plist --- libgsf.orig/pkg-plist Sat Mar 6 20:38:46 2004 +++ libgsf/pkg-plist Sat Mar 6 20:40:12 2004 @@ -1,8 +1,8 @@ -include/libgsf-1/gsf-gnome/gsf-input-bonobo.h -include/libgsf-1/gsf-gnome/gsf-input-gnomevfs.h -include/libgsf-1/gsf-gnome/gsf-output-bonobo.h -include/libgsf-1/gsf-gnome/gsf-output-gnomevfs.h -include/libgsf-1/gsf-gnome/gsf-shared-bonobo-stream.h +%%EVIL%%include/libgsf-1/gsf-gnome/gsf-input-bonobo.h +%%EVIL%%include/libgsf-1/gsf-gnome/gsf-input-gnomevfs.h +%%EVIL%%include/libgsf-1/gsf-gnome/gsf-output-bonobo.h +%%EVIL%%include/libgsf-1/gsf-gnome/gsf-output-gnomevfs.h +%%EVIL%%include/libgsf-1/gsf-gnome/gsf-shared-bonobo-stream.h include/libgsf-1/gsf/gsf-doc-meta-data.h include/libgsf-1/gsf/gsf-impl-utils.h include/libgsf-1/gsf/gsf-infile-msole.h @@ -34,11 +34,11 @@ lib/libgsf-1.a lib/libgsf-1.so lib/libgsf-1.so.9 -lib/libgsf-gnome-1.a -lib/libgsf-gnome-1.so -lib/libgsf-gnome-1.so.9 +%%EVIL%%lib/libgsf-gnome-1.a +%%EVIL%%lib/libgsf-gnome-1.so +%%EVIL%%lib/libgsf-gnome-1.so.9 libdata/pkgconfig/libgsf-1.pc -libdata/pkgconfig/libgsf-gnome-1.pc +%%EVIL%%libdata/pkgconfig/libgsf-gnome-1.pc share/doc/gsf/gsf-gsf-impl-utils.html share/doc/gsf/gsf-gsf-infile-msole.html share/doc/gsf/gsf-gsf-infile-zip.html @@ -86,6 +86,6 @@ share/doc/gsf/right.png share/doc/gsf/up.png @dirrm share/doc/gsf -@dirrm include/libgsf-1/gsf-gnome +%%EVIL%%@dirrm include/libgsf-1/gsf-gnome @dirrm include/libgsf-1/gsf @dirrm include/libgsf-1 --- libgsf.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: