Update AbiWord Personal to 0.7.8. Selected highlights since 0.7.5:

True WYSIWYG. Previously, we had subtle reformatting discrepancies when changing resolutions (such as printing and zooming). No more character dirt. Overline support. Minor display glitches. Insert Date and Time. Page-level navigation. Better support for non-English content. LaTeX exporter. Word importer. Justin and Caolan have fixed things so that tabstops, breaks, unicode conversion, page break before, widow/orphan control are all imported successfully now. RTF importer. Now handles negative values for margin-left and text-indent. Minor file format change. Error propagation. Unix stuff. By popular request, libstdc++ is no longer required. (We never really needed it anyhow.) PostScript emissions now use signed characters, as suggested by Bob Monaghan <bob@sbst.com>. With the latest fonts.dir, Symbol fonts should print properly now, too. First support for GNOME. Spelling speedup. The interactive spell check logic is now fast and smart like it should be, instead of woefully poky and dumb like it used to be. Subscript and superscript. View ruler. Stephen Hack <shack@uiuc.edu> implemented this menu item so that you can hide or show the ruler on a per-window basis. Compressed AbiWord files. The AbiWord file format (*.abw) was designed from the get-go to be a highly-readable form of XML. However, for those of you who care more about bloat than legibility, Richard Jefts <babs@cs.jhu.edu> added import/export logic for a gzip-compressed variant (*.zabw). Options dialog started. Zoom and Paragraph dialogs. Justification. Clipboard improvements. More Unicode-friendly. Smarter preferences.
author: jlam <jlam@pkgsrc.org> 2000-02-29 18:31:30 +0000
committer: jlam <jlam@pkgsrc.org> 2000-02-29 18:31:30 +0000
commit: 03efc6a5c58748af101034d74731112ec2bc495e (patch)
tree: dadfb2636ff0ba6d227550efe68c5e091bba26e2 /editors/abiword
parent: e201752bc5d0d1e9730b22ded1829c5c57b22852 (diff)
download: pkgsrc-03efc6a5c58748af101034d74731112ec2bc495e.tar.gz
16 files changed, 293 insertions, 440 deletions
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index d9a352c73fa..e126e93bcc4 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -1,52 +1,47 @@
-# $NetBSD: Makefile,v 1.5 2000/02/09 20:20:52 tron Exp $
+# $NetBSD: Makefile,v 1.6 2000/02/29 18:31:30 jlam Exp $
 #
 
+# According to the AbiSource license, compilations/distributions of AbiWord
+# not provided by AbiSource must be named "AbiWord Personal".
+#
 DISTNAME=	abi-${ABIWORD_VERS}
 PKGNAME=	abiword-personal-${ABIWORD_VERS}
-ABIWORD_VERS=	0.7.5
+ABIWORD_VERS=	0.7.8
 CATEGORIES=	editors
 MASTER_SITES=	http://www.abisource.com/downloads/Version-${ABIWORD_VERS}/lf/
-DISTFILES=	${ABISRC} ${ABIDISTFILES} ${UNIXFONTS} ${EXPATSRC} ${WVSRC}
+DISTFILES=	${ABISRC} ${ABIDISTFILES} ${ICONVSRC} ${EXPATSRC} \
+		${UNIXFONTS} ${WVSRC}
 
 MAINTAINER=	jlam@netbsd.org
 HOMEPAGE=	http://www.abisource.com/
 
-BUILD_DEPENDS+=	${LOCALBASE}/bin/unzip:../../archivers/unzip
+BUILD_DEPENDS+=	${LOCALBASE}/bin/unzip:../../archivers/unzip	
 DEPENDS+=	gtk+-1.2.*:../../x11/gtk
 DEPENDS+=	png>=1.0.3:../../graphics/png
+DEPENDS+=	xpm-3.4k:../../graphics/xpm
 
 USE_X11=	yes
 USE_GMAKE=	yes
 NO_CONFIGURE=	yes
-ALL_TARGET=	canonical
+ALL_TARGET=	compile canonical
 
 DIST_SUBDIR=	abisuite
 ABISRC=		${DISTNAME}${EXTRACT_SUFX}
 ABIDISTFILES=	abidistfiles-${ABIWORD_VERS}${EXTRACT_SUFX}
-UNIXFONTS=	unixfonts-${ABIWORD_VERS}${EXTRACT_SUFX}
 EXPATSRC=	expat-${ABIWORD_VERS}${EXTRACT_SUFX}
+ICONVSRC=	libiconv-${ABIWORD_VERS}${EXTRACT_SUFX}
+UNIXFONTS=	unixfonts-${ABIWORD_VERS}${EXTRACT_SUFX}
 WVSRC=		wv-${ABIWORD_VERS}${EXTRACT_SUFX}
 
 ABISUITE_HOME=		${PREFIX}/share/AbiSuite
 ABISUITE_LIBEXEC=	${PREFIX}/libexec/AbiSuite
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "SunOS"
-ZLIB_DIR=	${LOCALBASE}/lib
-LDFLAGS+=	-L${ZLIB_DIR}
-.endif
-
-LIBPNG_DIR=	${LOCALBASE}/lib
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LIBPNG_DIR}
+LDFLAGS+=	-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib
 
 MAKE_ENV+=	ABI_BUILD_VERSION="${ABIWORD_VERS}" \
-		MACHINE="${MACHINE}" \
 		ABISUITE_HOME="${ABISUITE_HOME}" \
 		ABISUITE_LIBEXEC="${ABISUITE_LIBEXEC}" \
-		ZLIB_DIR="${ZLIB_DIR}" \
-		LIBPNG_DIR="${LIBPNG_DIR}" \
 		OS_CFLAGS="${CPPFLAGS}" \
 		OS_DLLFLAGS="${LDFLAGS}"
 
diff --git a/editors/abiword/files/GNUMakefile.install b/editors/abiword/files/GNUMakefile.install
index 2a7893286a9..3835079cda2 100644
--- a/editors/abiword/files/GNUMakefile.install
+++ b/editors/abiword/files/GNUMakefile.install
@@ -1,12 +1,12 @@
-# $NetBSD: GNUMakefile.install,v 1.1.1.1 1999/09/11 18:27:49 jlam Exp $
+# $NetBSD: GNUMakefile.install,v 1.2 2000/02/29 18:31:30 jlam Exp $
 
 ABI_ROOT:=$(shell pwd)/../../..
 include $(ABI_ROOT)/src/config/abi_defs_wp.mk
 include $(ABI_ROOT)/src/config/abi_rules.mk
 
+# The plain "install" common to all Unix targets
 install:
 	@TARGET=${ABISUITE_HOME} BINDIR=$(prefix)/bin \
-		LIBEXECDIR=${ABISUITE_LIBEXEC} X11BASE=${X11BASE} \
-		SRCDIR=$(OUTDIR) \
+		LIBEXECDIR=${ABISUITE_LIBEXEC} SRCDIR=$(OUTDIR) \
 		SCRIPTDIR=$(ABI_ROOT)/src/pkg/common/unix/scripts \
 		$(ABI_ROOT)/src/pkg/common/unix/scripts/install.sh
diff --git a/editors/abiword/files/md5 b/editors/abiword/files/md5
index 5d42910ea00..3261da5dee0 100644
--- a/editors/abiword/files/md5
+++ b/editors/abiword/files/md5
@@ -1,7 +1,8 @@
-$NetBSD: md5,v 1.2 1999/09/14 02:19:15 jlam Exp $
+$NetBSD: md5,v 1.3 2000/02/29 18:31:30 jlam Exp $
 
-MD5 (abisuite/abi-0.7.5.tar.gz) = 8ae9d28cbd5905b2f0869114f1259510
-MD5 (abisuite/abidistfiles-0.7.5.tar.gz) = 57bf3b793de91edb6fc0f06c483c66ed
-MD5 (abisuite/unixfonts-0.7.5.tar.gz) = b19603bf0a1f6a2c8f962122f48cb7cf
-MD5 (abisuite/expat-0.7.5.tar.gz) = 415a6b3be9fab57964b1f5114ef6bce0
-MD5 (abisuite/wv-0.7.5.tar.gz) = adf037852c2587c7db35c5fefd09e776
+MD5 (abisuite/abi-0.7.8.tar.gz) = fbbf39257b4d4af94013825a4fad5f59
+MD5 (abisuite/abidistfiles-0.7.8.tar.gz) = 3d704137bbb0741cac7eeb0642f58f41
+MD5 (abisuite/libiconv-0.7.8.tar.gz) = 9ea7b4657beb387a52ae12a4f337a01d
+MD5 (abisuite/expat-0.7.8.tar.gz) = e5ccdcbb82325fec3e82c813461b1d51
+MD5 (abisuite/unixfonts-0.7.8.tar.gz) = b0e01a14ff369966c6d3e8a9b8fb053e
+MD5 (abisuite/wv-0.7.8.tar.gz) = 835450d4a8cdc5962aa475ad159d2432
diff --git a/editors/abiword/files/patch-sum b/editors/abiword/files/patch-sum
index 956eda8ffb7..2036d2e0836 100644
--- a/editors/abiword/files/patch-sum
+++ b/editors/abiword/files/patch-sum
@@ -1,11 +1,12 @@
-$NetBSD: patch-sum,v 1.3 1999/09/17 00:06:20 jlam Exp $
+$NetBSD: patch-sum,v 1.4 2000/02/29 18:31:30 jlam Exp $
 
-MD5 (patch-aa) = 9083af68a39aa7760c1d63776bad501f
-MD5 (patch-ab) = 8d985a606820cd5e8baf6bcc9f77b01f
-MD5 (patch-ac) = c12b687d99d2986e85e45dda6bbe0c8b
-MD5 (patch-ad) = a34a0e862094a575f0c015601177d85b
-MD5 (patch-ae) = ff7d5b3bcbf315987ccc1f38c6024afe
-MD5 (patch-af) = b68e0ef50cca301a9e2e59a1902e1be8
-MD5 (patch-ag) = 29b8ee5c764e4800010240bd0f9b8d2a
-MD5 (patch-ah) = 3b1b3d20ea69f5a7c073b841a5dafaba
-MD5 (patch-ai) = 1a738dd05c07909c6a78d28b8202166f
+MD5 (patch-aa) = c8e3e793314cd29b1e8b5d6339f04413
+MD5 (patch-ab) = 1bf8c8702d9d64b976dc25fbf6d04455
+MD5 (patch-ac) = 8cc6ca174dac92c770e348001368e80f
+MD5 (patch-ad) = 946a0e803a6cfd8e1c363fa366e5aa3d
+MD5 (patch-ae) = f701d11a2944822864837c1fe3eebe2b
+MD5 (patch-af) = 1f8e5c87ade8ddbede8b83110dfb6943
+MD5 (patch-ag) = 918513b15e8512586f2a0d30f8bcd1c4
+MD5 (patch-ah) = 568467cc84c84b28f89b968af0aae6df
+MD5 (patch-ai) = 29c5243319c4c546ee216d698032fc19
+MD5 (patch-aj) = f23e47fc617274f7b64f192577cbfbb1
diff --git a/editors/abiword/patches/patch-aa b/editors/abiword/patches/patch-aa
index 998e4f8f451..35df96fe066 100644
--- a/editors/abiword/patches/patch-aa
+++ b/editors/abiword/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/09/11 18:27:49 jlam Exp $
+$NetBSD: patch-aa,v 1.2 2000/02/29 18:31:30 jlam Exp $
 
---- Makefile.orig	Thu Jun  3 16:20:55 1999
-+++ Makefile	Sat Sep 11 13:51:58 1999
-@@ -19,7 +19,7 @@
+--- Makefile.orig	Sat Dec 11 01:23:53 1999
++++ Makefile	Tue Feb 29 12:05:03 2000
+@@ -20,7 +20,7 @@
  ## 02111-1307, USA.
  
  ABI_ROOT	:=$(shell pwd)
@@ -11,12 +11,3 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/09/11 18:27:49 jlam Exp $
  
  ##################################################################
  ## Useful options:
-@@ -62,7 +62,7 @@
- ## construct the desired layout and installation script.)
- ## This creates $(OUT)/AbiSuite
- 
--canonical:
-+canonical:	compile
- 	@echo Building AbiSuite Canonical Layout
- 	$(MAKE) ABI_ROOT=$(ABI_ROOT) -C src canonical
- 
diff --git a/editors/abiword/patches/patch-ab b/editors/abiword/patches/patch-ab
index 6ec3ab1e618..b1fed849819 100644
--- a/editors/abiword/patches/patch-ab
+++ b/editors/abiword/patches/patch-ab
@@ -1,16 +1,7 @@
-$NetBSD: patch-ab,v 1.1.1.1 1999/09/11 18:27:49 jlam Exp $
+$NetBSD: patch-ab,v 1.2 2000/02/29 18:31:30 jlam Exp $
 
 --- src/Makefile.orig	Fri Jul  9 15:13:56 1999
-+++ src/Makefile	Sat Sep 11 13:53:45 1999
-@@ -47,7 +47,7 @@
- ## that have work to do.
- CANON_SubDirs=		wp
- 
--canonical:
-+canonical:	build
- 	@$(subst xxxx,$(CANONDIR),$(VERIFY_DIRECTORY))
- 	@for k in $(CANON_TOPLEVELFILES); do			\
- 		$(ABICOPY) $$k $(CANONDIR);			\
++++ src/Makefile	Tue Feb 29 12:05:03 2000
 @@ -121,7 +121,7 @@
  endif
  
diff --git a/editors/abiword/patches/patch-ac b/editors/abiword/patches/patch-ac
index b01075ed10e..33fefc50090 100644
--- a/editors/abiword/patches/patch-ac
+++ b/editors/abiword/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.2 1999/09/14 02:19:15 jlam Exp $
+$NetBSD: patch-ac,v 1.3 2000/02/29 18:31:30 jlam Exp $
 
---- src/config/abi_defs.mk.orig	Tue Jul 27 11:18:52 1999
-+++ src/config/abi_defs.mk	Sat Sep 11 13:47:32 1999
-@@ -260,7 +260,7 @@
+--- src/config/abi_defs.mk.orig	Tue Jan 11 06:46:50 2000
++++ src/config/abi_defs.mk	Tue Feb 29 12:05:03 2000
+@@ -296,7 +296,7 @@
  ##			a date stamp in a nightly build system).
  ##
  
@@ -10,18 +10,27 @@ $NetBSD: patch-ac,v 1.2 1999/09/14 02:19:15 jlam Exp $
 +ABI_BUILD_VERSION	?= unnumbered
  ABI_BUILD_ID		=
  
- DIST			= $(ABI_ROOT)/dist
-@@ -310,8 +310,11 @@
- ## We should change this when get non-gtk versions on unix....
+ ##################################################################
+@@ -353,14 +353,18 @@
  
  ifeq ($(ABI_NATIVE),unix)
--CFLAGS 		+=	`gtk-config --cflags`
--EXTRA_LIBS	+=	`gtk-config --libs`
-+GTK_CFLAGS	:=	$(shell gtk-config --cflags)
-+GTK_LIBS	:=	$(shell gtk-config --libs)
-+
+ ifdef ABI_OPT_GNOME
+-CFLAGS 		+=	`$(GNOME_CONFIG) --cflags gnorba gnomeui` -DHAVE_GNOME
+-EXTRA_LIBS	+=	`$(GNOME_CONFIG) --libs gnorba gnomeui`
++GNOME_CFLAGS	:=	$(shell $(GNOME_CONFIG) --cflags gnorba gnomeui)
++GNOME_LIBS	:=	$(shell $(GNOME_CONFIG) --libs gnorba gnomeui)
++CFLAGS 		+=	$(GNOME_CFLAGS) -DHAVE_GNOME
++EXTRA_LIBS	+=	$(GNOME_LIBS)
+ ABI_GNOME_DIR		= gnome
+ ABI_GNOME_PREFIX	= Gnome
+ ABI_OPTIONS+=Gnome:On
+ else
+-CFLAGS 		+=	`$(GTK_CONFIG) --cflags`
+-EXTRA_LIBS	+=	`$(GTK_CONFIG) --libs`
++GTK_CFLAGS	:=	$(shell $(GTK_CONFIG) --cflags)
++GTK_LIBS	:=	$(shell $(GTK_CONFIG) --libs)
 +CFLAGS 		+=	$(GTK_CFLAGS)
 +EXTRA_LIBS	+=	$(GTK_LIBS)
+ ABI_OPTIONS+=Gnome:Off
+ endif
  endif
- 
- ##################################################################
diff --git a/editors/abiword/patches/patch-ad b/editors/abiword/patches/patch-ad
index abe5558a4bb..570ce4525c6 100644
--- a/editors/abiword/patches/patch-ad
+++ b/editors/abiword/patches/patch-ad
@@ -1,47 +1,23 @@
-$NetBSD: patch-ad,v 1.3 1999/09/17 00:06:21 jlam Exp $
+$NetBSD: patch-ad,v 1.4 2000/02/29 18:31:30 jlam Exp $
 
---- src/config/platforms/netbsd.mk.orig	Fri Jul  9 15:13:57 1999
-+++ src/config/platforms/netbsd.mk	Thu Sep 16 11:50:53 1999
-@@ -30,8 +30,37 @@
+--- src/config/platforms/netbsd.mk.orig	Sun Dec 12 10:07:09 1999
++++ src/config/platforms/netbsd.mk	Tue Feb 29 12:05:03 2000
+@@ -30,8 +30,13 @@
  ## compiler/loader options are used.  It will probably also be used
  ## in constructing the name object file destination directory.
  
 -OS_ARCH		:= $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/ | sed "s/\//-/")
-+# Get value of OS_ARCH from environment variable MACHINE.
-+#
-+OS_ARCH		= ${MACHINE}
++OS_ARCH		:= $(shell uname -m)
 +
-+# Set OS_ENDIAN to appropriate value.  For NetBSD, most architectures are
-+# big-endian, so test for the architectures which are little-endian and
-+# reset OS_ENDIAN.  Why doesn't GNU make have an OR statement!?
-+#
-+OS_ENDIAN	= BigEndian32
-+
-+ifeq ($(OS_ARCH),alpha)
-+OS_ENDIAN	= LittleEndian32
-+endif
-+ifeq ($(OS_ARCH),arm32)
-+OS_ENDIAN	= LittleEndian32
-+endif
-+ifeq ($(OS_ARCH),i386)
-+OS_ENDIAN	= LittleEndian32
-+endif
-+ifeq ($(OS_ARCH),pc532)
-+OS_ENDIAN	= LittleEndian32
-+endif
-+ifeq ($(OS_ARCH),pica)
++ifneq (,$(shell $(CC) -E - -dM </usr/include/machine/endian.h | grep BYTE_ORDER.*LITTLE_ENDIAN))
  OS_ENDIAN	= LittleEndian32
-+endif
-+ifeq ($(OS_ARCH),pmax)
-+OS_ENDIAN	= LittleEndian32
-+endif
-+ifeq ($(OS_ARCH),vax)
-+OS_ENDIAN	= LittleEndian32
++else
++OS_ENDIAN	= BigEndian32
 +endif
  
  # Define tools
  CC		= gcc
-@@ -65,24 +94,27 @@
+@@ -65,17 +70,20 @@
  endif
  
  # Includes
@@ -61,18 +37,19 @@ $NetBSD: patch-ad,v 1.3 1999/09/17 00:06:21 jlam Exp $
 +# Linker flags
 +OS_DLLFLAGS		+=
 +
- # Shared library flags
- MKSHLIB			= $(LD) $(DSO_LDOPTS) -soname $(@:$(OBJDIR)/%.so=%.so)
- 
+ GLIB_CONFIG		= glib-config
+ GTK_CONFIG		= gtk-config
+ GNOME_CONFIG    	= gnome-config
+@@ -86,7 +94,7 @@
  # Which links can this platform create.  Define one or
  # both of these options.
  UNIX_CAN_BUILD_DYNAMIC=1
 -UNIX_CAN_BUILD_STATIC=1
-+UNIX_CAN_BUILD_STATIC=0		# 1.4.x can't seem to build statically
++UNIX_CAN_BUILD_STATIC=0
  
- # Compiler options for static and dynamic linkage
- DL_LIBS			= 
-@@ -90,5 +122,12 @@
+ ##################################################################
+ ## Here you can choice if you want to use the gnome stuff.
+@@ -101,5 +109,12 @@
  
  ABI_NATIVE	= unix
  ABI_FE		= Unix
diff --git a/editors/abiword/patches/patch-ae b/editors/abiword/patches/patch-ae
index bfa4294ad61..fab27468e0c 100644
--- a/editors/abiword/patches/patch-ae
+++ b/editors/abiword/patches/patch-ae
@@ -1,162 +1,33 @@
-$NetBSD: patch-ae,v 1.1.1.1 1999/09/11 18:27:49 jlam Exp $
+$NetBSD: patch-ae,v 1.2 2000/02/29 18:31:30 jlam Exp $
 
-Change the order of directory lookups.  We prefer building in a peer
-directory over preinstalled libraries since the peers are known to work
-with the current version of AbiWord.
-
---- src/config/require/unix/Makefile.orig	Mon Jul 19 15:21:59 1999
-+++ src/config/require/unix/Makefile	Sat Sep 11 00:27:08 1999
-@@ -50,69 +50,110 @@
- # and "gtk12-config", so we check for those also.  Thanks to 
- # Ming-I Hsieh <mihs@wm28.csie.ncu.edu.tw> for the patch.
- 
-+GLIB_CONFIG+=	glib-config glib12-config
-+GTK_CONFIG+=	gtk-config gtk12-config
-+
- _GLIB_:
--	@glib-config --version >/dev/null 2>&1 			\
--	|| glib12-config --version >/dev/null 2>&1 			\
--	|| (echo glib not found; exit 1)
-+	@(found=no;						\
-+	  for config in $(GLIB_CONFIG); do			\
-+		if $$config --version >/dev/null 2>&1; then	\
-+			found=yes;				\
-+			break;					\
-+		fi;						\
-+	  done;							\
-+	  if [ "${found}" = "no" ]; then			\
-+		echo glib not found; exit 1;			\
-+	  fi)
- 	@echo TODO verify glib version is greater than 1.1.??
+--- src/config/require/unix/Makefile.orig	Tue Feb  1 18:55:24 2000
++++ src/config/require/unix/Makefile	Tue Feb 29 12:05:03 2000
+@@ -74,7 +74,9 @@
  
- _GTK_:
--	@gtk-config --version >/dev/null 2>&1			\
--	|| gtk12-config --version >/dev/null 2>&1			\
--	|| (echo gtk not found; exit 1)
-+	@(found=no;						\
-+	  for config in $(GTK_CONFIG); do			\
-+		if $$config --version >/dev/null 2>&1; then	\
-+			found=yes;				\
-+			break;					\
-+		fi;						\
-+	  done;							\
-+	  if [ "${found}" = "no" ]; then			\
-+		echo glib not found; exit 1;			\
-+	  fi)
- 	@echo TODO verify gtk version is greater than 1.1.??
- 
-+ZLIB_DIR+=	/usr/lib /usr/local/lib /usr/X11R6/lib
-+
  _ZLIB_:
--	@if [    -r /usr/lib/libz.a				\
--	      -o -r /usr/local/lib/libz.a			\
--	      -o -r /usr/X11R6/lib/libz.a			\
--	    ]; then						\
--		echo Found zlib in system directories;		\
--	elif [ -d $(ABI_ROOT)/../zlib ]; then			\
-+	@(found=no;						\
-+	  if [ -d $(ABI_ROOT)/../zlib ]; then			\
- 		echo Found zlib in peer directory;		\
- 		$(MAKE) -C $(ABI_ROOT)/../zlib;			\
--	else							\
--		echo zlib not found;				\
--		echo TODO provide a nicer error message;	\
--		echo TODO with instructions for obtaining it;	\
--		exit 1;						\
--	fi
-+	  else							\
-+		for dir in $(ZLIB_DIR); do			\
-+			if [ -r $$dir/libz.a ]; then		\
-+				found=yes;			\
-+				break;				\
-+			fi;					\
-+	  	done;						\
-+		if [ "$$found" = "yes" ]; then			\
-+			echo Found zlib in system directories;	\
-+		else						\
-+			echo zlib not found;			\
-+			echo TODO provide a nicer error message;	\
-+			echo TODO with instructions for obtaining it;	\
-+			exit 1;					\
-+		fi;						\
-+	  fi)
-+
-+LIBPNG_DIR+=	/usr/lib /usr/local/lib /usr/X11R6/lib
+ 	@if [    -r /usr/lib/libz.a				\
++	      -o -r ${LOCALBASE}/lib/libz.a			\
+ 	      -o -r /usr/local/lib/libz.a			\
++	      -o -r ${X11BASE}/lib/libz.a			\
+ 	      -o -r /usr/X11R6/lib/libz.a			\
+ 	    ]; then						\
+ 		echo Found zlib in system directories;		\
+@@ -90,7 +92,9 @@
  
  _LIBPNG_:
--	@if [    -r /usr/lib/libpng.a				\
--	      -o -r /usr/local/lib/libpng.a			\
--	      -o -r /usr/X11R6/lib/libpng.a			\
--	    ]; then						\
--		echo Found libpng in system directories;	\
--	elif [ -d $(ABI_ROOT)/../libpng ]; then			\
-+	@(found=no;						\
-+	  if [ -d $(ABI_ROOT)/../libpng ]; then			\
- 		echo Found libpng in peer directory;		\
- 		$(MAKE) -C $(ABI_ROOT)/../libpng;		\
--	else							\
--		echo libpng not found;				\
--		echo TODO provide a nicer error message;	\
--		echo TODO with instructions for obtaining it;	\
--		exit 1;						\
--	fi
-+	  else							\
-+		for dir in $(LIBPNG_DIR); do			\
-+			if [ -r $$dir/libpng.a ]; then		\
-+				found=yes;			\
-+				break;				\
-+			fi;					\
-+	  	done;						\
-+		if [ "$$found" = "yes" ]; then			\
-+			echo Found libpng in system directories;	\
-+		else						\
-+			echo libpng not found;			\
-+			echo TODO provide a nicer error message;	\
-+			echo TODO with instructions for obtaining it;	\
-+			exit 1;					\
-+		fi;						\
-+	  fi)
-+
-+WV_DIR+=	/lib /usr/lib /usr/local/lib
- 
- _LIBWV_:
--	@if [    -r /lib/libwv.a				\
--	      -o -r /usr/lib/libwv.a				\
--	      -o -r /usr/local/lib/libwv.a			\
--	    ]; then						\
--		echo Found libwv in system directories;		\
--	elif [ -r $(ABI_ROOT)/../wv ]; then			\
--		echo Found libwv in peer directory;		\
-+	@(found=no;						\
-+	  if [ -d $(ABI_ROOT)/../wv ]; then			\
-+		echo Found wv in peer directory;		\
- 		if [ ! -r $(ABI_ROOT)/../wv/config.h ]; then	\
- 			cd $(ABI_ROOT)/../wv; 			\
- 			./configure;				\
- 		fi;						\
- 		$(MAKE) -f Makefile.abi -C $(ABI_ROOT)/../wv;  	\
--	else							\
--		echo wv not found;				\
--		echo TODO provide a nicer error message;	\
--		echo TODO with instructions for obtaining it;	\
--		exit 1;						\
--	fi
-+	  else							\
-+		for dir in $(WV_DIR); do			\
-+			if [ -r $$dir/libwv.a ]; then		\
-+				found=yes;			\
-+				break;				\
-+			fi;					\
-+	  	done;						\
-+		if [ "$$found" = "yes" ]; then			\
-+			echo Found wv in system directories;	\
-+		else						\
-+			echo wv not found;			\
-+			echo TODO provide a nicer error message;	\
-+			echo TODO with instructions for obtaining it;	\
-+			exit 1;					\
-+		fi;						\
-+	  fi)
+ 	@if [    -r /usr/lib/libpng.a				\
++	      -o -r ${LOCALBASE}/lib/libpng.a			\
+ 	      -o -r /usr/local/lib/libpng.a			\
++	      -o -r ${X11BASE}/lib/libpng.a			\
+ 	      -o -r /usr/X11R6/lib/libpng.a			\
+ 	    ]; then						\
+ 		echo Found libpng in system directories;	\
+@@ -155,7 +159,7 @@
+ # was something you installed yourself.  
  
- # if this target fails things aren't fatal, the user
- # just gets a warning
+ _LIBICONV_:
+-	@if [ ! -r /usr/include/iconv.h -a ! -r /usr/local/include/iconv.h ]; then	\
++	@if true; then	\
+ 		if [ -d $(ABI_ROOT)/../libiconv ]; then                        	\
+ 			echo Found libiconv in peer directory;                  \
+ 			if [ ! -r $(ABI_ROOT)/../libiconv/src/config.h ]; then  \
diff --git a/editors/abiword/patches/patch-af b/editors/abiword/patches/patch-af
index 3656094f519..2843f0b5477 100644
--- a/editors/abiword/patches/patch-af
+++ b/editors/abiword/patches/patch-af
@@ -1,67 +1,13 @@
-$NetBSD: patch-af,v 1.1.1.1 1999/09/11 18:27:49 jlam Exp $
+$NetBSD: patch-af,v 1.2 2000/02/29 18:31:30 jlam Exp $
 
---- src/pkg/common/unix/scripts/install.sh.orig	Wed Jun  2 16:19:32 1999
-+++ src/pkg/common/unix/scripts/install.sh	Sat Sep 11 13:16:29 1999
-@@ -52,6 +52,17 @@
-     exit 1
- fi
+--- src/hello/main/unix/Makefile.orig	Mon Dec 13 16:10:25 1999
++++ src/hello/main/unix/Makefile	Tue Feb 29 12:05:03 2000
+@@ -24,7 +24,7 @@
  
-+# Make sure the libexec dir exists
-+mkdir -p $LIBEXECDIR
-+
-+if [ ! -d $LIBEXECDIR ]
-+then
-+    echo ""
-+    echo "Error creating directory [$LIBEXECDIR]."
-+    echo ""
-+    exit 1
-+fi
-+
- # start with breathing room
- echo ""
+ CPPSRCS=		UnixMain.cpp
  
-@@ -63,9 +74,9 @@
- # Copy the files from $SRCDIR to $TARGET
- (cd $SRCDIR/AbiSuite; tar cf - *) | (cd $TARGET; tar xf -)
+-INCLUDES=		`gtk-config --cflags`
++INCLUDES=		$(GTK_CFLAGS)
  
--echo "Installing program binaries to [$TARGET/bin]..."
-+echo "Installing program binaries to [$LIBEXECDIR]..."
- # Setup bins 
--(cd $SRCDIR; tar cf - bin/Abi*) | (cd $TARGET; tar xf -)
-+(cd $SRCDIR/bin; tar cf - Abi*) | (cd $LIBEXECDIR; tar xf -)
+ PROGRAM=		AbiHello
  
- ########################################################################
- # If we're on Solaris, run makepsres on the font path
-@@ -90,11 +101,11 @@
- 
- cd $SCRIPTDIR
- 
--echo "Making wrapper script at [$TARGET/bin/AbiWord]..."
--./makewrapper.sh AbiWord $TARGET
-+echo "Making wrapper script at [$LIBEXECDIR/AbiWord]..."
-+./makewrapper.sh AbiWord $TARGET $LIBEXECDIR $X11BASE
- # TODO : make use of these
--# ./makewrapper.sh AbiCalc $TARGET
--# ./makewrapper.sh AbiFile $TARGET
-+# ./makewrapper.sh AbiCalc $TARGET $LIBEXECDIR $X11BASE
-+# ./makewrapper.sh AbiFile $TARGET $LIBEXECDIR $X11BASE
- 
- 
- ########################################################################
-@@ -107,12 +118,12 @@
- 
- # NOTE : Solaris ln doesn't seem to honor the -f (force flag), so
- # NOTE : we have to remove them first.
--rm -f $BINDIR/AbiWord ; ln -s $TARGET/bin/AbiWord $BINDIR/AbiWord
--rm -f $BINDIR/abiword ; ln -s $TARGET/bin/AbiWord $BINDIR/abiword
-+rm -f $BINDIR/AbiWord ; ln -s $LIBEXECDIR/AbiWord $BINDIR/AbiWord
-+rm -f $BINDIR/abiword ; ln -s $LIBEXECDIR/AbiWord $BINDIR/abiword
- 
- # TODO : make use of these, etc.
--# rm -f $BINDIR/AbiCalc ; ln -s $TARGET/bin/AbiCalc $LINK_DIR/AbiCalc
--# rm -f $BINDIR/abicalc ; ln -s $TARGET/bin/AbiCalc $LINK_DIR/abicalc
-+# rm -f $BINDIR/AbiCalc ; ln -s $LIBEXECDIR/AbiCalc $LINK_DIR/AbiCalc
-+# rm -f $BINDIR/abicalc ; ln -s $LIBEXECDIR/AbiCalc $LINK_DIR/abicalc
- 
- ########################################################################
- # Done
diff --git a/editors/abiword/patches/patch-ag b/editors/abiword/patches/patch-ag
index 58256e960f0..a226f3837d0 100644
--- a/editors/abiword/patches/patch-ag
+++ b/editors/abiword/patches/patch-ag
@@ -1,109 +1,88 @@
-$NetBSD: patch-ag,v 1.1.1.1 1999/09/11 18:27:49 jlam Exp $
+$NetBSD: patch-ag,v 1.2 2000/02/29 18:31:30 jlam Exp $
 
---- src/pkg/common/unix/scripts/makewrapper.sh.orig	Thu Jun 24 16:54:37 1999
-+++ src/pkg/common/unix/scripts/makewrapper.sh	Sat Sep 11 13:33:11 1999
-@@ -3,15 +3,20 @@
- # This script is invoked to create wrapper scripts for AbiSuite
- # binaries.  One should pass it the _base_ name of the program
- # to wrap (one would pass "AbiWord" to wrap "AbiWord_s" and 
--# "AbiWord_d"), and the install base of the tree, to which "bin"
--# will be appended for binary and script locations.
-+# "AbiWord_d"), the install base of the tree, the location of the
-+# machine-dependent binaries and scripts, and the base of the X11
-+# tree.
- 
- # Examples:
--#     makewrapper.sh AbiWord /usr/local/AbiSuite
--#     makewrapper.sh AbiCalc /usr/local/AbiSuite
-+#     makewrapper.sh AbiWord /usr/pkg/share/AbiSuite \
-+#		     /usr/pkg/libexec/AbiSuite /usr/X11R6
-+#     makewrapper.sh AbiCalc /usr/pkg/share/AbiSuite \
-+#		     /usr/pkg/libexec/AbiSuite /usr/X11R6
- 
- PROGRAM_NAME=$1
- INSTALL_BASE=$2
-+LIBEXECDIR=$3
-+X11_BASE=$4
+--- src/pkg/common/unix/scripts/install.sh.orig	Wed Jun  2 16:19:32 1999
++++ src/pkg/common/unix/scripts/install.sh	Tue Feb 29 12:17:41 2000
+@@ -2,14 +2,14 @@
+ #
+ # This script is invoked by the Makefiles when the "install" target
+ # is specified.  It just puts things where most users will probably
+-# be happy, in $TARGET, with symbolic links (in $BINDIR) to the binaries
+-# in $TARGET/bin
++# be happy, in $TARGET, with the binaries in $LIBEXECDIR, with
++# symbolic links (in $BINDIR) to the binaries in $LIBEXECDIR.
+ # 
+ # $SRCDIR should be the place where the compile process (the "canonical"
+ # target especially) put all the stuff.  $SCRIPTDIR should be set by the 
+ # caller so we can know where we are.  $BINDIR is where the symbolic
+-# links are eventually installed, to point to the "bin/*" files within
+-# $TARGET/bin
++# links are eventually installed, to point to the executable files within
++# $LIBEXECDIR
  
- # Did they supply any arguments?
- if [ -z "$PROGRAM_NAME" ]
-@@ -28,11 +33,25 @@
-     echo ""
+ # if no target, bail
+ if [ -z "$TARGET" ]
+@@ -52,6 +52,21 @@
      exit 1
  fi
+ 
++# Make sure the libexec dir exists
 +if [ -z "$LIBEXECDIR" ]
 +then
-+    echo ""
-+    echo "Error: third argument (MD binaries directory) not specified."
-+    echo ""
-+    exit 1
++    LIBEXECDIR=${TARGET}/bin
 +fi
-+if [ -z "$X11_BASE" ]
++mkdir -p $LIBEXECDIR
++
++if [ ! -d $LIBEXECDIR ]
 +then
 +    echo ""
-+    echo "Error: fourth argument (X11 base directory) not specified."
++    echo "Error creating directory [$LIBEXECDIR]."
 +    echo ""
 +    exit 1
 +fi
++
+ # start with breathing room
+ echo ""
  
- # Make directory path up to program we're creating
--mkdir -p $INSTALL_BASE/bin
-+mkdir -p $LIBEXECDIR
+@@ -63,9 +78,9 @@
+ # Copy the files from $SRCDIR to $TARGET
+ (cd $SRCDIR/AbiSuite; tar cf - *) | (cd $TARGET; tar xf -)
  
--cat >$INSTALL_BASE/bin/$PROGRAM_NAME<<EOF
-+cat >$LIBEXECDIR/$PROGRAM_NAME<<EOF
- #!/bin/sh
- #
- # AbiSuite program wrapper script, dynamically generated
-@@ -42,28 +61,31 @@
- ABISUITE_HOME=$INSTALL_BASE
- export ABISUITE_HOME
+-echo "Installing program binaries to [$TARGET/bin]..."
++echo "Installing program binaries to [$LIBEXECDIR]..."
+ # Setup bins 
+-(cd $SRCDIR; tar cf - bin/Abi*) | (cd $TARGET; tar xf -)
++(cd $SRCDIR/bin; tar cf - Abi*) | (cd $LIBEXECDIR; tar xf -)
  
-+# Change this if you move the AbiSuite binaries.
-+ABISUITE_LIBEXEC=$LIBEXECDIR
-+
- # Change this if you move your fonts.
- ABISUITE_FONT_HOME=\$ABISUITE_HOME/fonts
+ ########################################################################
+ # If we're on Solaris, run makepsres on the font path
+@@ -91,10 +106,10 @@
+ cd $SCRIPTDIR
  
- # Set run-time font path
- if [ -d \$ABISUITE_FONT_HOME ]
- then
--    xset fp+ \$ABISUITE_FONT_HOME 1>/dev/null 2>/dev/null
-+    $X11_BASE/bin/xset fp+ \$ABISUITE_FONT_HOME 1>/dev/null 2>/dev/null
- fi
+ echo "Making wrapper script at [$TARGET/bin/AbiWord]..."
+-./makewrapper.sh AbiWord $TARGET
++./makewrapper.sh AbiWord $TARGET $LIBEXECDIR
+ # TODO : make use of these
+-# ./makewrapper.sh AbiCalc $TARGET
+-# ./makewrapper.sh AbiFile $TARGET
++# ./makewrapper.sh AbiCalc $TARGET $LIBEXECDIR
++# ./makewrapper.sh AbiFile $TARGET $LIBEXECDIR
  
- # Figure out which binary to run
--if [ -f \$ABISUITE_HOME/bin/${PROGRAM_NAME}_d ]
-+if [ -f \$ABISUITE_LIBEXEC/${PROGRAM_NAME}_d ]
- then
--    \$ABISUITE_HOME/bin/${PROGRAM_NAME}_d "\$@"
--elif [ -f \$ABISUITE_HOME/bin/${PROGRAM_NAME}_s ]
-+    \$ABISUITE_LIBEXEC/${PROGRAM_NAME}_d "\$@"
-+elif [ -f \$ABISUITE_LIBEXEC/${PROGRAM_NAME}_s ]
- then
--    \$ABISUITE_HOME/bin/${PROGRAM_NAME}_s "\$@"
-+    \$ABISUITE_LIBEXEC/${PROGRAM_NAME}_s "\$@"
- else
-     echo ""
-     echo "Error: can't find ${PROGRAM_NAME} executables:"
--    echo "    \$ABISUITE_HOME/bin/${PROGRAM_NAME}_d"
-+    echo "    \$ABISUITE_LIBEXEC/${PROGRAM_NAME}_d"
-     echo "    -or-"
--    echo "    \$ABISUITE_HOME/bin/${PROGRAM_NAME}_s"
-+    echo "    \$ABISUITE_LIBEXEC/${PROGRAM_NAME}_s"
-     echo ""
-     exit
- fi
-@@ -71,10 +93,10 @@
- # Set post run-time font path
- if [ -d \$ABISUITE_FONT_HOME ]
- then
--    xset fp- \$ABISUITE_FONT_HOME 1>/dev/null 2>/dev/null
-+    $X11_BASE/bin/xset fp- \$ABISUITE_FONT_HOME 1>/dev/null 2>/dev/null
- fi
- EOF
  
--chmod 755 ${INSTALL_BASE}/bin/$PROGRAM_NAME
-+chmod 755 $LIBEXECDIR/$PROGRAM_NAME
+ ########################################################################
+@@ -107,12 +122,12 @@
+ 
+ # NOTE : Solaris ln doesn't seem to honor the -f (force flag), so
+ # NOTE : we have to remove them first.
+-rm -f $BINDIR/AbiWord ; ln -s $TARGET/bin/AbiWord $BINDIR/AbiWord
+-rm -f $BINDIR/abiword ; ln -s $TARGET/bin/AbiWord $BINDIR/abiword
++rm -f $BINDIR/AbiWord ; ln -s $LIBEXECDIR/AbiWord $BINDIR/AbiWord
++rm -f $BINDIR/abiword ; ln -s $LIBEXECDIR/AbiWord $BINDIR/abiword
  
+ # TODO : make use of these, etc.
+-# rm -f $BINDIR/AbiCalc ; ln -s $TARGET/bin/AbiCalc $LINK_DIR/AbiCalc
+-# rm -f $BINDIR/abicalc ; ln -s $TARGET/bin/AbiCalc $LINK_DIR/abicalc
++# rm -f $BINDIR/AbiCalc ; ln -s $LIBEXECDIR/AbiCalc $LINK_DIR/AbiCalc
++# rm -f $BINDIR/abicalc ; ln -s $LIBEXECDIR/AbiCalc $LINK_DIR/abicalc
  
+ ########################################################################
+ # Done
diff --git a/editors/abiword/patches/patch-ah b/editors/abiword/patches/patch-ah
index 34d62ab29af..ae372a31396 100644
--- a/editors/abiword/patches/patch-ah
+++ b/editors/abiword/patches/patch-ah
@@ -1,13 +1,86 @@
-$NetBSD: patch-ah,v 1.1.1.1 1999/09/11 18:27:49 jlam Exp $
+$NetBSD: patch-ah,v 1.2 2000/02/29 18:31:30 jlam Exp $
 
---- src/hello/main/unix/Makefile.orig	Sun May 23 15:13:57 1999
-+++ src/hello/main/unix/Makefile	Sat Sep 11 11:00:30 1999
-@@ -24,7 +24,7 @@
+--- src/pkg/common/unix/scripts/makewrapper.sh.orig	Thu Jun 24 16:54:37 1999
++++ src/pkg/common/unix/scripts/makewrapper.sh	Tue Feb 29 12:19:00 2000
+@@ -3,15 +3,16 @@
+ # This script is invoked to create wrapper scripts for AbiSuite
+ # binaries.  One should pass it the _base_ name of the program
+ # to wrap (one would pass "AbiWord" to wrap "AbiWord_s" and 
+-# "AbiWord_d"), and the install base of the tree, to which "bin"
+-# will be appended for binary and script locations.
++# "AbiWord_d"), and the install base of the tree and the location of the
++# machine-dependent binaries and scripts.
  
- CPPSRCS=		UnixMain.cpp
+ # Examples:
+-#     makewrapper.sh AbiWord /usr/local/AbiSuite
+-#     makewrapper.sh AbiCalc /usr/local/AbiSuite
++#     makewrapper.sh AbiWord /usr/local/AbiSuite /usr/local/libexec/AbiSuite
++#     makewrapper.sh AbiCalc /usr/local/AbiSuite /usr/local/libexec/AbiSuite
  
--INCLUDES=		`gtk-config --cflags`
-+INCLUDES=		$(GTK_CFLAGS)
+ PROGRAM_NAME=$1
+ INSTALL_BASE=$2
++LIBEXECDIR=$3
+ 
+ # Did they supply any arguments?
+ if [ -z "$PROGRAM_NAME" ]
+@@ -28,11 +29,15 @@
+     echo ""
+     exit 1
+ fi
++if [ -z "$LIBEXECDIR" ]
++then
++    LIBEXECDIR=${INSTALL_BASE}/bin
++fi
+ 
+ # Make directory path up to program we're creating
+-mkdir -p $INSTALL_BASE/bin
++mkdir -p $LIBEXECDIR
+ 
+-cat >$INSTALL_BASE/bin/$PROGRAM_NAME<<EOF
++cat >$LIBEXECDIR/$PROGRAM_NAME<<EOF
+ #!/bin/sh
+ #
+ # AbiSuite program wrapper script, dynamically generated
+@@ -42,6 +47,9 @@
+ ABISUITE_HOME=$INSTALL_BASE
+ export ABISUITE_HOME
+ 
++# Change this if you move the AbiSuite binaries.
++ABISUITE_LIBEXEC=$LIBEXECDIR
++
+ # Change this if you move your fonts.
+ ABISUITE_FONT_HOME=\$ABISUITE_HOME/fonts
+ 
+@@ -52,18 +60,18 @@
+ fi
+ 
+ # Figure out which binary to run
+-if [ -f \$ABISUITE_HOME/bin/${PROGRAM_NAME}_d ]
++if [ -f \$ABISUITE_LIBEXEC/${PROGRAM_NAME}_d ]
+ then
+-    \$ABISUITE_HOME/bin/${PROGRAM_NAME}_d "\$@"
+-elif [ -f \$ABISUITE_HOME/bin/${PROGRAM_NAME}_s ]
++    \$ABISUITE_LIBEXEC/${PROGRAM_NAME}_d "\$@"
++elif [ -f \$ABISUITE_LIBEXEC/${PROGRAM_NAME}_s ]
+ then
+-    \$ABISUITE_HOME/bin/${PROGRAM_NAME}_s "\$@"
++    \$ABISUITE_LIBEXEC/${PROGRAM_NAME}_s "\$@"
+ else
+     echo ""
+     echo "Error: can't find ${PROGRAM_NAME} executables:"
+-    echo "    \$ABISUITE_HOME/bin/${PROGRAM_NAME}_d"
++    echo "    \$ABISUITE_LIBEXEC/${PROGRAM_NAME}_d"
+     echo "    -or-"
+-    echo "    \$ABISUITE_HOME/bin/${PROGRAM_NAME}_s"
++    echo "    \$ABISUITE_LIBEXEC/${PROGRAM_NAME}_s"
+     echo ""
+     exit
+ fi
+@@ -75,6 +83,6 @@
+ fi
+ EOF
+ 
+-chmod 755 ${INSTALL_BASE}/bin/$PROGRAM_NAME
++chmod 755 ${LIBEXECDIR}/$PROGRAM_NAME
  
- PROGRAM=		AbiHello
  
diff --git a/editors/abiword/patches/patch-ai b/editors/abiword/patches/patch-ai
index 9a0b8f24dd5..6501578551d 100644
--- a/editors/abiword/patches/patch-ai
+++ b/editors/abiword/patches/patch-ai
@@ -1,12 +1,12 @@
-$NetBSD: patch-ai,v 1.1.1.1 1999/09/11 18:27:49 jlam Exp $
+$NetBSD: patch-ai,v 1.2 2000/02/29 18:31:30 jlam Exp $
 
---- src/wp/main/unix/Makefile.orig	Mon Jul 19 15:22:06 1999
-+++ src/wp/main/unix/Makefile	Sat Sep 11 11:01:10 1999
+--- src/wp/main/unix/Makefile.orig	Mon Dec 13 16:10:26 1999
++++ src/wp/main/unix/Makefile	Tue Feb 29 12:05:03 2000
 @@ -24,7 +24,7 @@
  
  CPPSRCS=		UnixMain.cpp
  
--INCLUDES=		`gtk-config --cflags`
+-INCLUDES=		`$(GTK_CONFIG) --cflags`
 +INCLUDES=		$(GTK_CFLAGS)
  
  PROGRAM=		$(BINDIR)/AbiWord_d
diff --git a/editors/abiword/patches/patch-aj b/editors/abiword/patches/patch-aj
new file mode 100644
index 00000000000..836b31102a0
--- /dev/null
+++ b/editors/abiword/patches/patch-aj
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.1 2000/02/29 18:31:30 jlam Exp $
+
+--- src/wp/main/unix/gnome/Makefile.orig	Mon Dec 13 16:10:26 1999
++++ src/wp/main/unix/gnome/Makefile	Tue Feb 29 12:05:03 2000
+@@ -24,7 +24,7 @@
+ 
+ CPPSRCS=		UnixGnomeMain.cpp
+ 
+-INCLUDES=		`$(GNOME_CONFIG) gnomeui --cflags`
++INCLUDES=		$(GNOME_CFLAGS)
+ 
+ PROGRAM=		$(BINDIR)/AbiWord_d
+ PROGRAM_S=		$(BINDIR)/AbiWord_s
diff --git a/editors/abiword/pkg/DESCR b/editors/abiword/pkg/DESCR
index d9e617cf04c..715ee662138 100644
--- a/editors/abiword/pkg/DESCR
+++ b/editors/abiword/pkg/DESCR
@@ -3,13 +3,13 @@ productivity applications.  AbiWord(R) is available for all to use,
 free of charge.
 
 AbiWord(R) is a lean and fast full-featured word processor. It works on
-Windows and most Unix Systems. It is safe and easy to download and
-install. Features include: 
+Windows and most Unix Systems. Features include: 
 
 	Basic character formatting (bold, underline, italics, etc.) 
 	Paragraph alignment 
 	Spell-check 
 	Import of Word97 and RTF documents 
+	Export to RTF, Text, HTML, and LaTeX formats
 	Interactive rulers and tabs 
 	Styles 
 	Unlimited undo/redo 
diff --git a/editors/abiword/pkg/PLIST b/editors/abiword/pkg/PLIST
index 5a2fc8e3132..65656126297 100644
--- a/editors/abiword/pkg/PLIST
+++ b/editors/abiword/pkg/PLIST
@@ -1,20 +1,25 @@
-@comment $NetBSD: PLIST,v 1.2 1999/09/17 00:06:21 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 2000/02/29 18:31:31 jlam Exp $
 bin/AbiWord
 bin/abiword
 libexec/AbiSuite/AbiWord
 libexec/AbiSuite/AbiWord_d
-share/AbiSuite/COPYING
-share/AbiSuite/readme.txt
-share/AbiSuite/AbiWord/readme.txt
 share/AbiSuite/AbiWord/help/EnUS/help.html
+share/AbiSuite/AbiWord/readme.txt
 share/AbiSuite/AbiWord/sample/EnUS/Latin1.abw
+share/AbiSuite/AbiWord/strings/CaES.strings
 share/AbiSuite/AbiWord/strings/DaDK.strings
 share/AbiSuite/AbiWord/strings/DeDE.strings
 share/AbiSuite/AbiWord/strings/DuNL.strings
 share/AbiSuite/AbiWord/strings/EsES.strings
 share/AbiSuite/AbiWord/strings/FiFI.strings
 share/AbiSuite/AbiWord/strings/FrFR.strings
+share/AbiSuite/AbiWord/strings/IdID.strings
 share/AbiSuite/AbiWord/strings/ItIT.strings
+share/AbiSuite/AbiWord/strings/NoNO.strings
+share/AbiSuite/AbiWord/strings/PtPT.strings
+share/AbiSuite/AbiWord/strings/SvSE.strings
+share/AbiSuite/AbiWord/system.profile
+share/AbiSuite/COPYING
 share/AbiSuite/dictionary/american.hash
 share/AbiSuite/fonts/a010013l.afm
 share/AbiSuite/fonts/a010013l.pfa
@@ -98,6 +103,7 @@ share/AbiSuite/fonts/z003034l.pfa
 share/AbiSuite/icons/abiword_48.png
 share/AbiSuite/icons/abiword_48.tif
 share/AbiSuite/icons/abiword_48.xpm
+share/AbiSuite/readme.txt
 @dirrm share/AbiSuite/icons
 @dirrm share/AbiSuite/fonts
 @dirrm share/AbiSuite/dictionary
author	jlam <jlam@pkgsrc.org>	2000-02-29 18:31:30 +0000
committer	jlam <jlam@pkgsrc.org>	2000-02-29 18:31:30 +0000
commit	03efc6a5c58748af101034d74731112ec2bc495e (patch)
tree	dadfb2636ff0ba6d227550efe68c5e091bba26e2 /editors/abiword
parent	e201752bc5d0d1e9730b22ded1829c5c57b22852 (diff)
download	pkgsrc-03efc6a5c58748af101034d74731112ec2bc495e.tar.gz