From owner-freebsd-gnome@FreeBSD.ORG Sun Mar 7 13:50:06 2004 Return-Path: Delivered-To: freebsd-gnome@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 425B416A4CE for ; Sun, 7 Mar 2004 13:50:06 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 360C343D1D for ; Sun, 7 Mar 2004 13:50:06 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.10/8.12.10) with ESMTP id i27Lo6bv000390 for ; Sun, 7 Mar 2004 13:50:06 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.10/8.12.10/Submit) id i27Lo6v2000389; Sun, 7 Mar 2004 13:50:06 -0800 (PST) (envelope-from gnats) Date: Sun, 7 Mar 2004 13:50:06 -0800 (PST) Message-Id: <200403072150.i27Lo6v2000389@freefall.freebsd.org> To: gnome@FreeBSD.org From: Sybolt de Boer Subject: Re: ports/63851: [patch] enable devel/libgsf to be built without gnome X-BeenThere: freebsd-gnome@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Sybolt de Boer List-Id: GNOME for FreeBSD -- porting and maintaining List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Mar 2004 21:50:06 -0000 The following reply was made to PR ports/63851; it has been noted by GNATS. From: Sybolt de Boer To: freebsd-gnats-submit@FreeBSD.org Cc: Jeremy Messenger Subject: Re: ports/63851: [patch] enable devel/libgsf to be built without gnome Date: Sun, 7 Mar 2004 22:43:19 +0100 --Boundary-00=_3d5SAB1lWOX6HoO Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline On Sunday 07 March 2004 06:57, you wrote: > In future, when you are going to submit another PR. Can you use the better > word instead use 'EVIL'? Nothing personal about protect GNOME; it's just > not clear enough when someone who are trying to read in the pkg-plist. > Change from EVIL -> GNOME is more clearly enough to show it's GNOME > option, IMO. :-) > > Cheers, > Mezz Thanks for your response! I agree EVIL isn't a good name, I just figured it would be safe namespace wise. I sure don't mean to offend anyone, or obfuscate the port. :) Updated patch (s/EVIL/GNOME/) attached. sybolt --Boundary-00=_3d5SAB1lWOX6HoO Content-Type: text/x-diff; charset="iso-8859-1"; name="libgsf.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="libgsf.patch" diff -ruN libgsf.orig/Makefile libgsf/Makefile --- libgsf.orig/Makefile Sat Mar 6 20:38:46 2004 +++ libgsf/Makefile Sun Mar 7 13:35:07 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= GNOME="" +.else +CONFIGURE_ARGS+=--without-gnome +PLIST_SUB= GNOME="@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 Sun Mar 7 13:35:07 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 +%%GNOME%%include/libgsf-1/gsf-gnome/gsf-input-bonobo.h +%%GNOME%%include/libgsf-1/gsf-gnome/gsf-input-gnomevfs.h +%%GNOME%%include/libgsf-1/gsf-gnome/gsf-output-bonobo.h +%%GNOME%%include/libgsf-1/gsf-gnome/gsf-output-gnomevfs.h +%%GNOME%%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 +%%GNOME%%lib/libgsf-gnome-1.a +%%GNOME%%lib/libgsf-gnome-1.so +%%GNOME%%lib/libgsf-gnome-1.so.9 libdata/pkgconfig/libgsf-1.pc -libdata/pkgconfig/libgsf-gnome-1.pc +%%GNOME%%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 +%%GNOME%%@dirrm include/libgsf-1/gsf-gnome @dirrm include/libgsf-1/gsf @dirrm include/libgsf-1 --Boundary-00=_3d5SAB1lWOX6HoO--