AbiWord-0.7.5: Open Source cross-platform word processor

16 files changed, 732 insertions, 0 deletions

diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
new file mode 100644
index 00000000000..2f236a1034e
--- /dev/null
+++ b/editors/abiword/Makefile
@@ -0,0 +1,56 @@
+# $NetBSD: Makefile,v 1.1.1.1 1999/09/11 18:27:48 jlam Exp $
+#
+
+DISTNAME=	abi-${ABIWORD_VERS}
+PKGNAME=	abiword-personal-${ABIWORD_VERS}
+ABIWORD_VERS=	0.7.5
+CATEGORIES=	editors
+MASTER_SITES=	http://www.abisource.com/downloads/Version-${ABIWORD_VERS}/lf/
+DISTFILES=	${ABISRC} ${ABIDISTFILES} ${UNIXFONTS} ${EXPATSRC} ${WVSRC}
+
+MAINTAINER=	jlam@netbsd.org
+HOMEPAGE=	http://www.abisource.com/
+
+BUILD_DEPENDS+=	${LOCALBASE}/bin/unzip:../../archivers/unzip
+DEPENDS+=	gtk+-1.2.4:../../x11/gtk
+DEPENDS+=	png-1.0.3:../../graphics/png
+
+USE_X11=	yes
+USE_GMAKE=	yes
+NO_CONFIGURE=	yes
+ALL_TARGET=	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}
+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}
+
+MAKE_ENV+=	MACHINE_ARCH="${MACHINE_ARCH}" \
+		ABISUITE_HOME="${ABISUITE_HOME}" \
+		ABISUITE_LIBEXEC="${ABISUITE_LIBEXEC}" \
+		ZLIB_DIR="${ZLIB_DIR}" \
+		LIBPNG_DIR="${LIBPNG_DIR}" \
+		OS_CFLAGS="${CPPFLAGS}" \
+		OS_DLLFLAGS="${LDFLAGS}"
+
+post-patch:
+	${MKDIR} ${WRKSRC}/src/pkg/netbsd
+	${CP} ${FILESDIR}/GNUMakefile.install ${WRKSRC}/src/pkg/netbsd/Makefile
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/editors/abiword/files/GNUMakefile.install b/editors/abiword/files/GNUMakefile.install
new file mode 100644
index 00000000000..2a7893286a9
--- /dev/null
+++ b/editors/abiword/files/GNUMakefile.install
@@ -0,0 +1,12 @@
+# $NetBSD: GNUMakefile.install,v 1.1.1.1 1999/09/11 18:27:49 jlam Exp $
+
+ABI_ROOT:=$(shell pwd)/../../..
+include $(ABI_ROOT)/src/config/abi_defs_wp.mk
+include $(ABI_ROOT)/src/config/abi_rules.mk
+
+install:
+	@TARGET=${ABISUITE_HOME} BINDIR=$(prefix)/bin \
+		LIBEXECDIR=${ABISUITE_LIBEXEC} X11BASE=${X11BASE} \
+		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
new file mode 100644
index 00000000000..f3482743352
--- /dev/null
+++ b/editors/abiword/files/md5
@@ -0,0 +1,7 @@
+$NetBSD: md5,v 1.1.1.1 1999/09/11 18:27:49 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
diff --git a/editors/abiword/files/patch-sum b/editors/abiword/files/patch-sum
new file mode 100644
index 00000000000..7cd81878eca
--- /dev/null
+++ b/editors/abiword/files/patch-sum
@@ -0,0 +1,11 @@
+$NetBSD: patch-sum,v 1.1.1.1 1999/09/11 18:27:49 jlam Exp $
+
+MD5 (patch-aa) = 9083af68a39aa7760c1d63776bad501f
+MD5 (patch-ab) = 8d985a606820cd5e8baf6bcc9f77b01f
+MD5 (patch-ac) = 845ead38015793713d0237dc8c178f81
+MD5 (patch-ad) = 10a00574dae636394970511801cc2716
+MD5 (patch-ae) = ff7d5b3bcbf315987ccc1f38c6024afe
+MD5 (patch-af) = b68e0ef50cca301a9e2e59a1902e1be8
+MD5 (patch-ag) = 29b8ee5c764e4800010240bd0f9b8d2a
+MD5 (patch-ah) = 3b1b3d20ea69f5a7c073b841a5dafaba
+MD5 (patch-ai) = 1a738dd05c07909c6a78d28b8202166f
diff --git a/editors/abiword/patches/patch-aa b/editors/abiword/patches/patch-aa
new file mode 100644
index 00000000000..998e4f8f451
--- /dev/null
+++ b/editors/abiword/patches/patch-aa
@@ -0,0 +1,22 @@
+$NetBSD: patch-aa,v 1.1.1.1 1999/09/11 18:27:49 jlam Exp $
+
+--- Makefile.orig	Thu Jun  3 16:20:55 1999
++++ Makefile	Sat Sep 11 13:51:58 1999
+@@ -19,7 +19,7 @@
+ ## 02111-1307, USA.
+ 
+ ABI_ROOT	:=$(shell pwd)
+-prefix		:=/usr/local
++prefix		:=${PREFIX}
+ 
+ ##################################################################
+ ## 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
new file mode 100644
index 00000000000..6ec3ab1e618
--- /dev/null
+++ b/editors/abiword/patches/patch-ab
@@ -0,0 +1,22 @@
+$NetBSD: patch-ab,v 1.1.1.1 1999/09/11 18:27:49 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);			\
+@@ -121,7 +121,7 @@
+ endif
+ 
+ # The generic target
+-install: build canonical
++install:
+ ifeq ($(ABI_NATIVE),unix)
+ 	@echo
+ 	@echo Using prefix value of [$(prefix)]...
diff --git a/editors/abiword/patches/patch-ac b/editors/abiword/patches/patch-ac
new file mode 100644
index 00000000000..8fae4fe0f97
--- /dev/null
+++ b/editors/abiword/patches/patch-ac
@@ -0,0 +1,27 @@
+$NetBSD: patch-ac,v 1.1.1.1 1999/09/11 18:27:49 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 @@
+ ##			a date stamp in a nightly build system).
+ ##
+ 
+-ABI_BUILD_VERSION	= unnumbered
++ABI_BUILD_VERSION	= 0.7.5
+ ABI_BUILD_ID		=
+ 
+ DIST			= $(ABI_ROOT)/dist
+@@ -310,8 +310,11 @@
+ ## We should change this when get non-gtk versions on unix....
+ 
+ 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)
++
++CFLAGS 		+=	$(GTK_CFLAGS)
++EXTRA_LIBS	+=	$(GTK_LIBS)
+ endif
+ 
+ ##################################################################
diff --git a/editors/abiword/patches/patch-ad b/editors/abiword/patches/patch-ad
new file mode 100644
index 00000000000..84b4eefe69b
--- /dev/null
+++ b/editors/abiword/patches/patch-ad
@@ -0,0 +1,79 @@
+$NetBSD: patch-ad,v 1.1.1.1 1999/09/11 18:27:49 jlam Exp $
+
+--- src/config/platforms/netbsd.mk.orig	Fri Jul  9 15:13:57 1999
++++ src/config/platforms/netbsd.mk	Sat Sep 11 11:17:45 1999
+@@ -30,8 +30,37 @@
+ ## 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 MACHINE_ARCH from environment.
++#
++OS_ARCH		= ${MACHINE_ARCH}
++
++# 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)
+ OS_ENDIAN	= LittleEndian32
++endif
++ifeq ($(OS_ARCH),pmax)
++OS_ENDIAN	= LittleEndian32
++endif
++ifeq ($(OS_ARCH),vax)
++OS_ENDIAN	= LittleEndian32
++endif
+ 
+ # Define tools
+ CC		= gcc
+@@ -65,17 +94,20 @@
+ endif
+ 
+ # Includes
+-OS_INCLUDES		=
++OS_INCLUDES		+=
+ G++INCLUDES		= -I/usr/include/g++
+ 
+ # Compiler flags
+ PLATFORM_FLAGS		= -pipe -DNETBSD -DNetBSD
+ PORT_FLAGS		= -DHAVE_STRERROR
+-OS_CFLAGS		= $(DSO_CFLAGS) $(PLATFORM_FLAGS) $(PORT_FLAGS)
++OS_CFLAGS		+= $(DSO_CFLAGS) $(PLATFORM_FLAGS) $(PORT_FLAGS)
+ 
+ PLATFORM_FLAGS		+= 
+ PORT_FLAGS		+= 
+ 
++# Linker flags
++OS_DLLFLAGS		+=
++
+ # Shared library flags
+ MKSHLIB			= $(LD) $(DSO_LDOPTS) -soname $(@:$(OBJDIR)/%.so=%.so)
+ 
+@@ -90,5 +122,12 @@
+ 
+ ABI_NATIVE	= unix
+ ABI_FE		= Unix
++
++##################################################################
++## ABIPKGDIR defines the directory containing the Makefile to use to
++## build a set of distribution archives (.deb, .rpm, .tgz, .exe, etc)
++## This is relative to $(ABI_ROOT)/src/pkg
++
++ABIPKGDIR	= netbsd
+ 
+ # End of NetBSD defs
diff --git a/editors/abiword/patches/patch-ae b/editors/abiword/patches/patch-ae
new file mode 100644
index 00000000000..bfa4294ad61
--- /dev/null
+++ b/editors/abiword/patches/patch-ae
@@ -0,0 +1,162 @@
+$NetBSD: patch-ae,v 1.1.1.1 1999/09/11 18:27:49 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.??
+ 
+ _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
+ 
+ _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 this target fails things aren't fatal, the user
+ # just gets a warning
diff --git a/editors/abiword/patches/patch-af b/editors/abiword/patches/patch-af
new file mode 100644
index 00000000000..3656094f519
--- /dev/null
+++ b/editors/abiword/patches/patch-af
@@ -0,0 +1,67 @@
+$NetBSD: patch-af,v 1.1.1.1 1999/09/11 18:27:49 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
+ 
++# 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 ""
+ 
+@@ -63,9 +74,9 @@
+ # Copy the files from $SRCDIR to $TARGET
+ (cd $SRCDIR/AbiSuite; tar cf - *) | (cd $TARGET; tar xf -)
+ 
+-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 -)
+ 
+ ########################################################################
+ # 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
new file mode 100644
index 00000000000..58256e960f0
--- /dev/null
+++ b/editors/abiword/patches/patch-ag
@@ -0,0 +1,109 @@
+$NetBSD: patch-ag,v 1.1.1.1 1999/09/11 18:27:49 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
+ 
+ # Did they supply any arguments?
+ if [ -z "$PROGRAM_NAME" ]
+@@ -28,11 +33,25 @@
+     echo ""
+     exit 1
+ fi
++if [ -z "$LIBEXECDIR" ]
++then
++    echo ""
++    echo "Error: third argument (MD binaries directory) not specified."
++    echo ""
++    exit 1
++fi
++if [ -z "$X11_BASE" ]
++then
++    echo ""
++    echo "Error: fourth argument (X11 base directory) not specified."
++    echo ""
++    exit 1
++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,28 +61,31 @@
+ 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
+ 
+ # 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
+ 
+ # 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
+ 
+ 
diff --git a/editors/abiword/patches/patch-ah b/editors/abiword/patches/patch-ah
new file mode 100644
index 00000000000..34d62ab29af
--- /dev/null
+++ b/editors/abiword/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1.1.1 1999/09/11 18:27:49 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 @@
+ 
+ CPPSRCS=		UnixMain.cpp
+ 
+-INCLUDES=		`gtk-config --cflags`
++INCLUDES=		$(GTK_CFLAGS)
+ 
+ PROGRAM=		AbiHello
+ 
diff --git a/editors/abiword/patches/patch-ai b/editors/abiword/patches/patch-ai
new file mode 100644
index 00000000000..9a0b8f24dd5
--- /dev/null
+++ b/editors/abiword/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1.1.1 1999/09/11 18:27:49 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
+@@ -24,7 +24,7 @@
+ 
+ CPPSRCS=		UnixMain.cpp
+ 
+-INCLUDES=		`gtk-config --cflags`
++INCLUDES=		$(GTK_CFLAGS)
+ 
+ PROGRAM=		$(BINDIR)/AbiWord_d
+ PROGRAM_S=		$(BINDIR)/AbiWord_s
diff --git a/editors/abiword/pkg/COMMENT b/editors/abiword/pkg/COMMENT
new file mode 100644
index 00000000000..cb0cd6d150f
--- /dev/null
+++ b/editors/abiword/pkg/COMMENT
@@ -0,0 +1 @@
+Open Source cross-platform word processor
diff --git a/editors/abiword/pkg/DESCR b/editors/abiword/pkg/DESCR
new file mode 100644
index 00000000000..d9e617cf04c
--- /dev/null
+++ b/editors/abiword/pkg/DESCR
@@ -0,0 +1,19 @@
+AbiWord(R) is the first application of a suite of Open Source desktop
+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: 
+
+	Basic character formatting (bold, underline, italics, etc.) 
+	Paragraph alignment 
+	Spell-check 
+	Import of Word97 and RTF documents 
+	Interactive rulers and tabs 
+	Styles 
+	Unlimited undo/redo 
+	Multiple column control 
+	Widow/orphan control 
+	Find/Replace 
+	Images 
diff --git a/editors/abiword/pkg/PLIST b/editors/abiword/pkg/PLIST
new file mode 100644
index 00000000000..9065bc8cdb1
--- /dev/null
+++ b/editors/abiword/pkg/PLIST
@@ -0,0 +1,112 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 1999/09/11 18:27:49 jlam Exp $
+bin/AbiWord
+bin/abiword
+libexec/AbiSuite/AbiWord
+libexec/AbiSuite/AbiWord_d
+libexec/AbiSuite/AbiWord_s
+share/AbiSuite/COPYING
+share/AbiSuite/readme.txt
+share/AbiSuite/AbiWord/readme.txt
+share/AbiSuite/AbiWord/help/EnUS/help.html
+share/AbiSuite/AbiWord/sample/EnUS/Latin1.abw
+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/ItIT.strings
+share/AbiSuite/dictionary/american.hash
+share/AbiSuite/fonts/a010013l.afm
+share/AbiSuite/fonts/a010013l.pfa
+share/AbiSuite/fonts/a010015l.afm
+share/AbiSuite/fonts/a010015l.pfa
+share/AbiSuite/fonts/a010033l.afm
+share/AbiSuite/fonts/a010033l.pfa
+share/AbiSuite/fonts/a010035l.afm
+share/AbiSuite/fonts/a010035l.pfa
+share/AbiSuite/fonts/b018012l.afm
+share/AbiSuite/fonts/b018012l.pfa
+share/AbiSuite/fonts/b018015l.afm
+share/AbiSuite/fonts/b018015l.pfa
+share/AbiSuite/fonts/b018032l.afm
+share/AbiSuite/fonts/b018032l.pfa
+share/AbiSuite/fonts/b018035l.afm
+share/AbiSuite/fonts/b018035l.pfa
+share/AbiSuite/fonts/bchb.afm
+share/AbiSuite/fonts/bchb.pfa
+share/AbiSuite/fonts/bchbi.afm
+share/AbiSuite/fonts/bchbi.pfa
+share/AbiSuite/fonts/bchr.afm
+share/AbiSuite/fonts/bchr.pfa
+share/AbiSuite/fonts/bchri.afm
+share/AbiSuite/fonts/bchri.pfa
+share/AbiSuite/fonts/c059013l.afm
+share/AbiSuite/fonts/c059013l.pfa
+share/AbiSuite/fonts/c059016l.afm
+share/AbiSuite/fonts/c059016l.pfa
+share/AbiSuite/fonts/c059033l.afm
+share/AbiSuite/fonts/c059033l.pfa
+share/AbiSuite/fonts/c059036l.afm
+share/AbiSuite/fonts/c059036l.pfa
+share/AbiSuite/fonts/d050000l.afm
+share/AbiSuite/fonts/d050000l.pfa
+share/AbiSuite/fonts/fonts.dir
+share/AbiSuite/fonts/n019003l.afm
+share/AbiSuite/fonts/n019003l.pfa
+share/AbiSuite/fonts/n019004l.afm
+share/AbiSuite/fonts/n019004l.pfa
+share/AbiSuite/fonts/n019023l.afm
+share/AbiSuite/fonts/n019023l.pfa
+share/AbiSuite/fonts/n019024l.afm
+share/AbiSuite/fonts/n019024l.pfa
+share/AbiSuite/fonts/n019043l.afm
+share/AbiSuite/fonts/n019043l.pfa
+share/AbiSuite/fonts/n019044l.afm
+share/AbiSuite/fonts/n019044l.pfa
+share/AbiSuite/fonts/n019063l.afm
+share/AbiSuite/fonts/n019063l.pfa
+share/AbiSuite/fonts/n019064l.afm
+share/AbiSuite/fonts/n019064l.pfa
+share/AbiSuite/fonts/n021003l.afm
+share/AbiSuite/fonts/n021003l.pfa
+share/AbiSuite/fonts/n021004l.afm
+share/AbiSuite/fonts/n021004l.pfa
+share/AbiSuite/fonts/n021023l.afm
+share/AbiSuite/fonts/n021023l.pfa
+share/AbiSuite/fonts/n021024l.afm
+share/AbiSuite/fonts/n021024l.pfa
+share/AbiSuite/fonts/n022003l.afm
+share/AbiSuite/fonts/n022003l.pfa
+share/AbiSuite/fonts/n022004l.afm
+share/AbiSuite/fonts/n022004l.pfa
+share/AbiSuite/fonts/n022023l.afm
+share/AbiSuite/fonts/n022023l.pfa
+share/AbiSuite/fonts/n022024l.afm
+share/AbiSuite/fonts/n022024l.pfa
+share/AbiSuite/fonts/p052003l.afm
+share/AbiSuite/fonts/p052003l.pfa
+share/AbiSuite/fonts/p052004l.afm
+share/AbiSuite/fonts/p052004l.pfa
+share/AbiSuite/fonts/p052023l.afm
+share/AbiSuite/fonts/p052023l.pfa
+share/AbiSuite/fonts/p052024l.afm
+share/AbiSuite/fonts/p052024l.pfa
+share/AbiSuite/fonts/s050000l.afm
+share/AbiSuite/fonts/s050000l.pfa
+share/AbiSuite/fonts/z003034l.afm
+share/AbiSuite/fonts/z003034l.pfa
+share/AbiSuite/icons/abiword_48.png
+share/AbiSuite/icons/abiword_48.tif
+share/AbiSuite/icons/abiword_48.xpm
+@dirrm share/AbiSuite/icons
+@dirrm share/AbiSuite/fonts
+@dirrm share/AbiSuite/dictionary
+@dirrm share/AbiSuite/AbiWord/strings
+@dirrm share/AbiSuite/AbiWord/sample/EnUS
+@dirrm share/AbiSuite/AbiWord/sample
+@dirrm share/AbiSuite/AbiWord/help/EnUS
+@dirrm share/AbiSuite/AbiWord/help
+@dirrm share/AbiSuite/AbiWord
+@dirrm share/AbiSuite
+@dirrm libexec/AbiSuite