Date: Sun, 22 Feb 2004 00:27:11 +0100 From: Sybolt de Boer <sybolt@xs4all.nl> To: gnome@FreeBSD.org Cc: lofi@FreeBSD.org Subject: Please review: building textproc/wv2 without sucking in half of gnome Message-ID: <200402220027.11245.sybolt@xs4all.nl>
next in thread | raw e-mail | index | archive | help
--Boundary-00=_Pl+NAPpAhQBENwM
Content-Type: text/plain;
charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Hi!
Attached are two patches which enable wv2 to be built without gnome. Since I'm
not very familiar with the USE_GNOME framework, I'd like to hear if this is
the way it's supposed to be done.
TIA,
Sybolt
--Boundary-00=_Pl+NAPpAhQBENwM
Content-Type: text/x-diff;
charset="us-ascii";
name="libgsf.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="libgsf.patch"
diff -ruN libgsf.orig/Makefile libgsf/Makefile
--- libgsf.orig/Makefile Wed Feb 4 13:18:54 2004
+++ libgsf/Makefile Sun Feb 22 00:01:28 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:Mgnomelibs}!=""
+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 Fri Sep 26 11:58:08 2003
+++ libgsf/pkg-plist Thu Feb 12 16:06:18 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
--Boundary-00=_Pl+NAPpAhQBENwM
Content-Type: text/x-diff;
charset="us-ascii";
name="wv2.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="wv2.patch"
diff -ruN wv2.orig/Makefile wv2/Makefile
--- wv2.orig/Makefile Wed Feb 4 13:27:34 2004
+++ wv2/Makefile Sun Feb 22 00:05:18 2004
@@ -15,11 +15,12 @@
MAINTAINER= lofi@freebsd.org
COMMENT= A library providing routines to access Microsoft Word/Excel files
-LIB_DEPENDS= iconv:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS= iconv:${PORTSDIR}/converters/libiconv \
+ gsf-1.9:${PORTSDIR}/devel/libgsf
CONFIGURE_ARGS= --with-libiconv=${LOCALBASE} --disable-debug
-USE_GNOME= gnometarget libgsf
+USE_GNOME= gnometarget
USE_LIBTOOL= yes
LIBTOOLFLAGS= # none, we want to keep libwv2.la
USE_BZIP2= yes
--Boundary-00=_Pl+NAPpAhQBENwM--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200402220027.11245.sybolt>