From 1884bd9e187376c322b0b8e162ebf87840322479 Mon Sep 17 00:00:00 2001
From: marcm <marcm@openbsd.org>
Date: Thu, 14 Nov 2002 20:16:27 +0000
Subject: [PATCH] Added gnome flavor and fixed some verbage in MESSAGE file.

ok couderc@
---
 editors/abiword/Makefile                      | 27 +++++++++++++++++--
 .../files/patch-wv_libole2_Makefile_in        | 11 ++++++++
 editors/abiword/pkg/MESSAGE                   |  8 +++---
 editors/abiword/pkg/PFRAG.gnome               |  3 +++
 editors/abiword/pkg/PFRAG.no-gnome            |  2 ++
 editors/abiword/pkg/PLIST                     |  5 ++--
 6 files changed, 48 insertions(+), 8 deletions(-)
 create mode 100644 editors/abiword/files/patch-wv_libole2_Makefile_in
 create mode 100644 editors/abiword/pkg/PFRAG.gnome
 create mode 100644 editors/abiword/pkg/PFRAG.no-gnome

diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index 696170be39e..50898c9b9ac 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2002/10/17 18:37:13 couderc Exp $
+# $OpenBSD: Makefile,v 1.23 2002/11/14 20:16:27 marcm Exp $
 
 COMMENT=	"open-source, cross-platform WYSIWYG word processor"
 
@@ -28,7 +28,7 @@ USE_GMAKE=	Yes
 CONFIGURE_STYLE=	gnu autoconf
 CONFIGURE_ARGS=		--with-libpng=${LOCALBASE}/lib \
 			--with-libxml2 \
-			--disable-debug --disable-gnome
+			--disable-debug
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng" \
 			LDFLAGS="-L${LOCALBASE}/lib"
 
@@ -41,8 +41,31 @@ WRKDIST=	${WRKDIR}/abiword-${VERSION}/abi
 
 PFILE=		${WRKDIR}/abiword-${VERSION}/wv/generic.c
 
+FLAVORS=	gnome
+FLAVOR?=
+
+.if ${FLAVOR:L:Mgnome}
+CONFIGURE_ARGS+=	--enable-gnome
+LIB_DEPENDS+=		bonobo.2,bonobo-print.2,bonobox.2::x11/gnome/bonobo \
+			gal.19::devel/gal \
+			glade.5,glade-gnome.5::devel/libglade,gnome \
+			gnomevfs::x11/gnome/vfs
+.else
+CONFIGURE_ARGS+=	--disable-gnome
+.endif
+
 post-patch:
 	@mv ${PFILE} ${PFILE}.orig
 	@sed -e s/tmpnam/mkstemp/ ${PFILE}.orig > ${PFILE}
+	@cd ${WRKDIR}/abiword-${VERSION}; \
+	patch < ${FILESDIR}/patch-wv_libole2_Makefile_in
+
+.if ${FLAVOR:L:Mgnome}
+post-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/gnome/apps/Applications
+	${INSTALL_DATA} ${WRKDIST}/src/pkg/linux/rpm/data/abiword.desktop ${PREFIX}/share/gnome/apps/Applications
+	${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps
+	${INSTALL_DATA} ${PREFIX}/share/AbiSuite/icons/abiword_48.png ${PREFIX}/share/pixmaps
+.endif
 
 .include <bsd.port.mk>
diff --git a/editors/abiword/files/patch-wv_libole2_Makefile_in b/editors/abiword/files/patch-wv_libole2_Makefile_in
new file mode 100644
index 00000000000..22501f553f2
--- /dev/null
+++ b/editors/abiword/files/patch-wv_libole2_Makefile_in
@@ -0,0 +1,11 @@
+--- wv/libole2/Makefile.in.orig	Sat Sep 14 22:50:04 2002
++++ wv/libole2/Makefile.in	Sat Sep 14 22:50:36 2002
+@@ -13,7 +13,7 @@
+ HAVE_GLIB = @HAVE_GLIB@
+ HAVE_GNOMEVFS= @HAVE_GNOMEVFS@
+ 
+-CFLAGS = @CPPFLAGS@ @CFLAGS@ @DEFS@ -I$(srcdir)/ -I$(srcdir)/.. -DTTFDIR=\"$(datadir)/wv/ttf\" -I$(srcdir)/../libole2 @WMF_CFLAGS@ @GLIB_CFLAGS@
++CFLAGS = @DEFS@ -I$(srcdir)/ -I$(srcdir)/.. -DTTFDIR=\"$(datadir)/wv/ttf\" -I$(srcdir)/../libole2 @WMF_CFLAGS@ @GLIB_CFLAGS@ @CPPFLAGS@ @CFLAGS@
+ ifneq ($(HAVE_GLIB), 1)
+ CFLAGS += -I$(srcdir)/../glib-wv/
+ endif
diff --git a/editors/abiword/pkg/MESSAGE b/editors/abiword/pkg/MESSAGE
index 923504023c6..d8d24a61869 100644
--- a/editors/abiword/pkg/MESSAGE
+++ b/editors/abiword/pkg/MESSAGE
@@ -2,12 +2,12 @@ Abiword needs to have XFree86 type1 module loaded to run correctly, you just
 have to add the following line in the module section :
 Load "type1"
 
-You must also add the ${PREFIX}/AbiSuite/fonts directory to your X server's
-font path.  For XFree86, add the line:
+You must also add the ${PREFIX}/share/AbiSuite/fonts directory to your
+X server's font path.  For XFree86, add the line:
 
-FontPath "${PREFIX}/AbiSuite/fonts"
+FontPath "${PREFIX}/share/AbiSuite/fonts"
 
-in the "Files" section of your /etc/XF86Config file.
+in the "Files" section of your /etc/X11/XF86Config file.
 If you use a different X server, please see its documentation on how to do
 this.
 
diff --git a/editors/abiword/pkg/PFRAG.gnome b/editors/abiword/pkg/PFRAG.gnome
new file mode 100644
index 00000000000..82fdf8dd2c4
--- /dev/null
+++ b/editors/abiword/pkg/PFRAG.gnome
@@ -0,0 +1,3 @@
+@comment $OpenBSD: PFRAG.gnome,v 1.1 2002/11/14 20:16:27 marcm Exp $
+share/gnome/apps/Applications/abiword.desktop
+share/pixmaps/abiword_48.png
diff --git a/editors/abiword/pkg/PFRAG.no-gnome b/editors/abiword/pkg/PFRAG.no-gnome
new file mode 100644
index 00000000000..3cb6e583ceb
--- /dev/null
+++ b/editors/abiword/pkg/PFRAG.no-gnome
@@ -0,0 +1,2 @@
+@comment $OpenBSD: PFRAG.no-gnome,v 1.1 2002/11/14 20:16:27 marcm Exp $
+bin/AbiWord_s
diff --git a/editors/abiword/pkg/PLIST b/editors/abiword/pkg/PLIST
index 81832e45960..351f6ab1b01 100644
--- a/editors/abiword/pkg/PLIST
+++ b/editors/abiword/pkg/PLIST
@@ -1,7 +1,8 @@
-@comment $OpenBSD: PLIST,v 1.6 2002/10/17 18:37:13 couderc Exp $
+@comment $OpenBSD: PLIST,v 1.7 2002/11/14 20:16:27 marcm Exp $
+!%%gnome%%
+%%gnome%%
 bin/AbiWord
 bin/AbiWord_d
-bin/AbiWord_s
 bin/abiword
 bin/ttfadmin.sh
 bin/ttftool