ports/63851: [patch] enable devel/libgsf to be built without gnome

[Sybolt de Boer]

The following reply was made to PR ports/63851; it has been noted by GNATS.

From: Sybolt de Boer <sybolt at xs4all.nl>
To: freebsd-gnats-submit at FreeBSD.org
Cc: Jeremy Messenger <mezz7 at cox.net>
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 <bsd.port.mk>
 +.include <bsd.port.pre.mk>
 +
 +.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 <bsd.port.post.mk>
 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
 - at 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--