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

[Sybolt de Boer]

>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 at 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 <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.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 <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	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
- at 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: