32 files changed, 612 insertions, 292 deletions

diff --git a/editors/AbiWord/Makefile b/editors/AbiWord/Makefile
index 6876ff03ebd9..e6a137584c4d 100644
--- a/editors/AbiWord/Makefile
+++ b/editors/AbiWord/Makefile
@@ -11,60 +11,28 @@ CATEGORIES=	editors
 MASTER_SITES=	http://www.abisource.com/downloads/Version-${VERSION}/lf/
 DISTNAME=	abi-${VERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} expat-${VERSION}.tar.gz \
-		unixfonts-${VERSION}.tar.gz wv-${VERSION}.tar.gz
+		unixfonts-${VERSION}.tar.gz wv-${VERSION}.tar.gz \
+		libiconv-${VERSION}.tar.gz abidistfiles-${VERSION}.tar.gz
 
-MAINTAINER=	dburr@FreeBSD.org
+MAINTAINER=	wolman@cs.washington.edu
 
+# unzip is needed during the installation process
+BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
 		png.3:${PORTSDIR}/graphics/png
 RUN_DEPENDS=	ispell:${PORTSDIR}/textproc/ispell
 
 DIST_SUBDIR=	AbiWord
 
-VERSION=	0.7.6
+VERSION=	0.7.9
 WRKSRC=		${WRKDIR}/abi-${VERSION}/src
 USE_XLIB=	yes
 USE_GMAKE=	yes
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config/gtk12-config
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
-MAKE_ENV=	GTK_CONFIG="${GTK_CONFIG}" GLIB_CONFIG="${GLIB_CONFIG}"
-OSDISTDIR=	${OPSYS}_`uname -r`_${ARCH}_OBJ
+MAKE_ENV=	prefix="${PREFIX}"
 
 .include <bsd.port.pre.mk>
 
-post-patch:
-.if ${OSVERSION} != 310000
-	@${CP} 	${WRKSRC}/config/platforms/freebsd.mk \
-		${WRKSRC}/config/platforms/freebsd.mk.version
-	@${SED} -e s,3.1-RELEASE,`uname -r`,g \
-		-e s,-D_POSIX_SOURCE,,g \
-		${WRKSRC}/config/platforms/freebsd.mk.version > \
-		${WRKSRC}/config/platforms/freebsd.mk
-.endif
-
 pre-build:
 	@(cd ${WRKDIR}/wv && ./configure)
 
-do-install:
-	@${MKDIR} ${PREFIX}/AbiSuite/bin
-	@${MKDIR} ${PREFIX}/AbiSuite/docs
-	@(cd ${WRKDIR}/abi-${VERSION}/docs; for DOCS in *; do \
-		${INSTALL_DATA} $${DOCS} ${PREFIX}/AbiSuite/docs/ \
-		;done)
-	@(cd ${WRKDIR}/abi-${VERSION}/test/wp; for TEST in *; do \
-		${INSTALL_DATA} $${TEST} ${PREFIX}/AbiSuite/docs/ \
-		;done)
-	@${INSTALL_PROGRAM} ${WRKSRC}/${OSDISTDIR}/bin/AbiWord_s \
-		${PREFIX}/AbiSuite/bin/
-	@${LN} -sf ${PREFIX}/AbiSuite/bin/AbiWord ${PREFIX}/bin/AbiWord
-	@${CP}	${WRKDIR}/unixfonts/install.sh \
-		${WRKDIR}/unixfonts/install.sh.orig
-	@${SED} s,/usr/local,${PREFIX}, \
-		${WRKDIR}/unixfonts/install.sh.orig > \
-		${WRKDIR}/unixfonts/install.sh
-	@(cd ${WRKDIR}/unixfonts; yes "" | ./install.sh)
-	@${CAT} ${PKGDIR}/MESSAGE | ${SED} s,/usr/local,${PREFIX},
-	@(${WRKSRC}/pkg/common/unix/scripts/makewrapper.sh \
-		AbiWord ${PREFIX}/AbiSuite)
-
 .include <bsd.port.post.mk>
diff --git a/editors/AbiWord/distinfo b/editors/AbiWord/distinfo
index 7ae219276a27..dc31a8262eb5 100644
--- a/editors/AbiWord/distinfo
+++ b/editors/AbiWord/distinfo
@@ -1,4 +1,6 @@
-MD5 (AbiWord/abi-0.7.6.tar.gz) = eabfa3067ff560f7c08b62d7661bba55
-MD5 (AbiWord/expat-0.7.6.tar.gz) = 3645bf427740914d7fd5f3173f2a742a
-MD5 (AbiWord/unixfonts-0.7.6.tar.gz) = 937be69cc7d43a0aa15215ec04e102dd
-MD5 (AbiWord/wv-0.7.6.tar.gz) = 528c967c1d0fcb2f7b817920c6610a50
+MD5 (AbiWord/abi-0.7.9.tar.gz) = 65bab409639c5d80a94738f06754ece9
+MD5 (AbiWord/expat-0.7.9.tar.gz) = 80396b61675674b2772ec93abae6a18e
+MD5 (AbiWord/unixfonts-0.7.9.tar.gz) = d91711abd8686112b4df1f0d28a3d83f
+MD5 (AbiWord/wv-0.7.9.tar.gz) = a28bf03833ecb0da1fc5355788efdbba
+MD5 (AbiWord/libiconv-0.7.9.tar.gz) = 69ab6ebfaf9043795311621328a1c527
+MD5 (AbiWord/abidistfiles-0.7.9.tar.gz) = 5d12bbe54ac7d0775076ea4f10f4a29c
diff --git a/editors/AbiWord/files/patch-an b/editors/AbiWord/files/patch-an
new file mode 100644
index 000000000000..ee7d51335e95
--- /dev/null
+++ b/editors/AbiWord/files/patch-an
@@ -0,0 +1,43 @@
+--- Makefile	Tue Feb 29 07:34:29 2000
++++ Makefile.new	Sun May 14 21:58:09 2000
+@@ -42,6 +42,7 @@
+ 
+ ## Set the following to a list of pathnames to be copied to $(CANONDIR)
+ CANON_TOPLEVELFILES=	$(ABI_ROOT)/COPYING $(ABI_ROOT)/user/wp/readme.txt
++CANON_TLF_NOTDIR=	$(notdir $(CANON_TOPLEVELFILES))
+ 
+ ## Set the following to a list of directories (probably a subset of DIRS)
+ ## that have work to do.
+@@ -52,6 +53,9 @@
+ 	@for k in $(CANON_TOPLEVELFILES); do			\
+ 		$(ABICOPY) $$k $(CANONDIR);			\
+ 	done
++	@for k in $(CANON_TLF_NOTDIR); do			\
++		$(ABICHMOD) ugo=r $(CANONDIR)/$$k;		\
++	done
+ 	@for k in $(CANON_SubDirs); do				\
+ 		$(MAKE) ABI_ROOT=$(ABI_ROOT) -C $$k canonical;	\
+ 	done
+@@ -63,6 +67,7 @@
+ 			unzip -o $$k;				\
+ 			rm $$k;					\
+ 		done)
++	@(cd $(CANONDIR)/dictionary; $(ABICHMOD) ugo=r *)
+ #	(cd $(ABI_ROOT)/../abidistfiles; tar cf - dictionary/*.hash) | (cd $(CANONDIR); tar xf -)
+ ifeq ($(ABI_NATIVE),unix)
+ # each Unix installer requires both unixfonts and abidistfiles, 
+@@ -92,10 +97,12 @@
+ 	fi
+ # icons for X window manager use
+ 	@$(subst xxxx,$(CANONDIR)/icons,$(VERIFY_DIRECTORY))
+-	(cd $(ABI_ROOT)/../abidistfiles/icons; cp *_48* $(CANONDIR)/icons)
++	(cd $(ABI_ROOT)/../abidistfiles/icons; $(ABICOPY) *_48* $(CANONDIR)/icons)
++	@(cd $(CANONDIR)/icons; $(ABICHMOD) ugo=r *_48*)
+ # font stuff for installation
+ 	@$(subst xxxx,$(CANONDIR)/fonts,$(VERIFY_DIRECTORY))
+-	(cd $(ABI_ROOT)/../unixfonts/fonts ; cp *.* $(CANONDIR)/fonts)
++	(cd $(ABI_ROOT)/../unixfonts/fonts ; $(ABICOPY) *.* $(CANONDIR)/fonts)
++	@(cd $(CANONDIR)/fonts; $(ABICHMOD) ugo=r *.*)
+ endif
+ 
+ ##################################################################
diff --git a/editors/AbiWord/files/patch-ap b/editors/AbiWord/files/patch-ap
new file mode 100644
index 000000000000..a006ac936e31
--- /dev/null
+++ b/editors/AbiWord/files/patch-ap
@@ -0,0 +1,22 @@
+--- wp/Makefile	Tue Feb 29 07:34:31 2000
++++ wp/Makefile.new	Sun May 14 21:15:19 2000
+@@ -44,10 +44,16 @@
+ 	@$(subst xxxx,$(CANON_AppDir),$(VERIFY_DIRECTORY))
+ 	@$(subst xxxx,$(CANON_AppDir)/strings,$(VERIFY_DIRECTORY))
+ 	@$(subst xxxx,$(CANON_AppDir)/help,$(VERIFY_DIRECTORY))
++	@$(subst xxxx,$(CANON_AppDir)/help/en-US,$(VERIFY_DIRECTORY))
+ 	@$(subst xxxx,$(CANON_AppDir)/sample,$(VERIFY_DIRECTORY))
++	@$(subst xxxx,$(CANON_AppDir)/sample/en-US,$(VERIFY_DIRECTORY))
+ 	@$(ABICOPY) $(USERDIR)/wp/readme.txt $(CANON_AppDir)
++	@$(ABICHMOD) ugo=r $(CANON_AppDir)/readme.txt
+ 	@$(ABICOPY) $(USERDIR)/wp/system.profile $(CANON_AppDir)
++	@$(ABICHMOD) ugo=r $(CANON_AppDir)/system.profile
+ 	@$(ABICOPY) $(USERDIR)/wp/strings/*.strings $(CANON_AppDir)/strings
+-	(cd $(USERDIR)/wp/help; tar cf - $(CANON_Lang)/*.*) | (cd $(CANON_AppDir)/help; tar xf -)
+-	(cd $(USERDIR)/wp/sample; tar cf - $(CANON_Lang)/*.*) | (cd $(CANON_AppDir)/sample; tar xf -)
+-
++	@$(ABICHMOD) ugo=r $(CANON_AppDir)/strings/*.strings
++	@$(ABICOPY) $(USERDIR)/wp/help/en-US/*.html $(CANON_AppDir)/help/en-US
++	@$(ABICHMOD) ugo=r $(CANON_AppDir)/help/en-US/*.html
++	@$(ABICOPY) $(USERDIR)/wp/sample/en-US/*.abw $(CANON_AppDir)/sample/en-US
++	@$(ABICHMOD) ugo=r $(CANON_AppDir)/sample/en-US/*.abw
diff --git a/editors/AbiWord/files/patch-aq b/editors/AbiWord/files/patch-aq
new file mode 100644
index 000000000000..c541d8b5d2f3
--- /dev/null
+++ b/editors/AbiWord/files/patch-aq
@@ -0,0 +1,27 @@
+--- config/abi_defs.mk	Mon Mar 13 14:48:16 2000
++++ config/abi_defs.mk.new	Sat May 13 16:07:19 2000
+@@ -121,7 +121,9 @@
+ ##################################################################
+ ##################################################################
+ 
+-ABICOPY=cp
++ABICOPY = cp
++ABICHMOD = chmod
++ABIMKDIR = mkdir -m u=rwx,go=rx
+ 
+ ifdef ABISOURCE_LICENSED_TRADEMARKS
+ ABI_TMDEFS=	-DABISOURCE_LICENSED_TRADEMARKS
+@@ -287,11 +289,11 @@
+ ## INSTALL program...
+ 
+ define MAKE_OBJDIR
+-if test ! -d $(@D); then rm -rf $(@D); mkdir -p $(@D); fi
++if test ! -d $(@D); then rm -rf $(@D); $(ABIMKDIR) -p $(@D); fi
+ endef
+ 
+ define VERIFY_DIRECTORY
+-if test ! -d xxxx; then rm -rf xxxx; mkdir -p  xxxx; fi
++if test ! -d xxxx; then rm -rf xxxx; $(ABIMKDIR) -p  xxxx; fi
+ endef
+ 
+ ##################################################################
diff --git a/editors/AbiWord/files/patch-ar b/editors/AbiWord/files/patch-ar
new file mode 100644
index 000000000000..1b319cafe8d8
--- /dev/null
+++ b/editors/AbiWord/files/patch-ar
@@ -0,0 +1,11 @@
+--- pkg/common/unix/scripts/install.sh	Tue Feb 29 13:37:57 2000
++++ pkg/common/unix/scripts/install.sh.new	Sun May 14 18:11:15 2000
+@@ -80,7 +80,7 @@
+ 
+ echo "Installing program binaries to [$LIBEXECDIR]..."
+ # Setup bins 
+-(cd $SRCDIR/bin; tar cf - Abi*) | (cd $LIBEXECDIR; tar xf -)
++(cd $SRCDIR/bin; cp Abi* $LIBEXECDIR)
+ 
+ ########################################################################
+ # If we're on Solaris, run makepsres on the font path
diff --git a/editors/AbiWord/pkg-message b/editors/AbiWord/pkg-message
index 41799bba5851..cf30e88f24e6 100644
--- a/editors/AbiWord/pkg-message
+++ b/editors/AbiWord/pkg-message
@@ -1,7 +1,7 @@
-You must add the /usr/local/AbiSuite/fonts directory to your X server's
+You must add the ${PREFIX}/AbiSuite/fonts directory to your X server's
 font path.  For XFree86, add the line:
 
-FontPath "/usr/local/AbiSuite/fonts/"
+FontPath "${PREFIX}/AbiSuite/fonts/"
 
 in the "Files" section of your /etc/XF86Config file.
 If you use a different X server, please see its documentation on how to do
diff --git a/editors/AbiWord/pkg-plist b/editors/AbiWord/pkg-plist
index 77eee5b0bc34..0d89e3385d58 100644
--- a/editors/AbiWord/pkg-plist
+++ b/editors/AbiWord/pkg-plist
@@ -1,6 +1,29 @@
 bin/AbiWord
+bin/abiword
+AbiSuite/COPYING
+AbiSuite/readme.txt
+AbiSuite/AbiWord/readme.txt
+AbiSuite/AbiWord/system.profile
+AbiSuite/AbiWord/help/en-US/help.html
+AbiSuite/AbiWord/sample/en-US/Latin1.abw
+AbiSuite/AbiWord/strings/ca-ES.strings
+AbiSuite/AbiWord/strings/da-DK.strings
+AbiSuite/AbiWord/strings/de-DE.strings
+AbiSuite/AbiWord/strings/du-NL.strings
+AbiSuite/AbiWord/strings/es-ES.strings
+AbiSuite/AbiWord/strings/fi-FI.strings
+AbiSuite/AbiWord/strings/fr-FR.strings
+AbiSuite/AbiWord/strings/hu-HU.strings
+AbiSuite/AbiWord/strings/id-ID.strings
+AbiSuite/AbiWord/strings/it-IT.strings
+AbiSuite/AbiWord/strings/no-BOK.strings
+AbiSuite/AbiWord/strings/pt-BR.strings
+AbiSuite/AbiWord/strings/pt-PT.strings
+AbiSuite/AbiWord/strings/sv-SE.strings
 AbiSuite/bin/AbiWord
+AbiSuite/bin/AbiWord_d
 AbiSuite/bin/AbiWord_s
+AbiSuite/dictionary/american.hash
 AbiSuite/fonts/a010013l.afm
 AbiSuite/fonts/a010013l.pfa
 AbiSuite/fonts/a010015l.afm
@@ -80,33 +103,17 @@ AbiSuite/fonts/s050000l.afm
 AbiSuite/fonts/s050000l.pfa
 AbiSuite/fonts/z003034l.afm
 AbiSuite/fonts/z003034l.pfa
-AbiSuite/docs/AbiSource_DialogFramework.abw
-AbiSuite/docs/AbiSource_Localization.abw
-AbiSuite/docs/AbiSource_ProgrammerGuidelines.abw
-AbiSuite/docs/AbiWord_DocumentFormat.abw
-AbiSuite/docs/AbiWord_FileImport.abw
-AbiSuite/docs/AbiWord_LayoutDesign.abw
-AbiSuite/docs/AbiWord_SourceOverview.abw
-AbiSuite/docs/AbiWord_SpellCheck_Notes.abw
-AbiSuite/docs/AbiWord_list_notes.txt
-AbiSuite/docs/BUILD.TXT
-AbiSuite/docs/UnixAdmin.abw
-AbiSuite/docs/roadmap.html
-AbiSuite/docs/Bazaar.abw
-AbiSuite/docs/BillOfRights.abw
-AbiSuite/docs/Gettysburg.abw
-AbiSuite/docs/Interview.abw
-AbiSuite/docs/Latin1.abw
-AbiSuite/docs/Styles.abw
-AbiSuite/docs/Unicode1.abw
-AbiSuite/docs/Word97Test.doc
-AbiSuite/docs/abi_memo-new.abw
-AbiSuite/docs/abi_memo.abw
-AbiSuite/docs/data.abw
-AbiSuite/docs/footer.abw
-AbiSuite/docs/rtftest.rtf
-AbiSuite/docs/tabs.abw
-@dirrm AbiSuite/fonts
+AbiSuite/icons/abiword_48.png
+AbiSuite/icons/abiword_48.tif
+AbiSuite/icons/abiword_48.xpm
+@dirrm AbiSuite/AbiWord/help/en-US
+@dirrm AbiSuite/AbiWord/help
+@dirrm AbiSuite/AbiWord/sample/en-US
+@dirrm AbiSuite/AbiWord/sample
+@dirrm AbiSuite/AbiWord/strings
+@dirrm AbiSuite/AbiWord
 @dirrm AbiSuite/bin
-@dirrm AbiSuite/docs
+@dirrm AbiSuite/dictionary
+@dirrm AbiSuite/fonts
+@dirrm AbiSuite/icons
 @dirrm AbiSuite
diff --git a/editors/AbiWord2/Makefile b/editors/AbiWord2/Makefile
index 6876ff03ebd9..e6a137584c4d 100644
--- a/editors/AbiWord2/Makefile
+++ b/editors/AbiWord2/Makefile
@@ -11,60 +11,28 @@ CATEGORIES=	editors
 MASTER_SITES=	http://www.abisource.com/downloads/Version-${VERSION}/lf/
 DISTNAME=	abi-${VERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} expat-${VERSION}.tar.gz \
-		unixfonts-${VERSION}.tar.gz wv-${VERSION}.tar.gz
+		unixfonts-${VERSION}.tar.gz wv-${VERSION}.tar.gz \
+		libiconv-${VERSION}.tar.gz abidistfiles-${VERSION}.tar.gz
 
-MAINTAINER=	dburr@FreeBSD.org
+MAINTAINER=	wolman@cs.washington.edu
 
+# unzip is needed during the installation process
+BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
 		png.3:${PORTSDIR}/graphics/png
 RUN_DEPENDS=	ispell:${PORTSDIR}/textproc/ispell
 
 DIST_SUBDIR=	AbiWord
 
-VERSION=	0.7.6
+VERSION=	0.7.9
 WRKSRC=		${WRKDIR}/abi-${VERSION}/src
 USE_XLIB=	yes
 USE_GMAKE=	yes
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config/gtk12-config
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
-MAKE_ENV=	GTK_CONFIG="${GTK_CONFIG}" GLIB_CONFIG="${GLIB_CONFIG}"
-OSDISTDIR=	${OPSYS}_`uname -r`_${ARCH}_OBJ
+MAKE_ENV=	prefix="${PREFIX}"
 
 .include <bsd.port.pre.mk>
 
-post-patch:
-.if ${OSVERSION} != 310000
-	@${CP} 	${WRKSRC}/config/platforms/freebsd.mk \
-		${WRKSRC}/config/platforms/freebsd.mk.version
-	@${SED} -e s,3.1-RELEASE,`uname -r`,g \
-		-e s,-D_POSIX_SOURCE,,g \
-		${WRKSRC}/config/platforms/freebsd.mk.version > \
-		${WRKSRC}/config/platforms/freebsd.mk
-.endif
-
 pre-build:
 	@(cd ${WRKDIR}/wv && ./configure)
 
-do-install:
-	@${MKDIR} ${PREFIX}/AbiSuite/bin
-	@${MKDIR} ${PREFIX}/AbiSuite/docs
-	@(cd ${WRKDIR}/abi-${VERSION}/docs; for DOCS in *; do \
-		${INSTALL_DATA} $${DOCS} ${PREFIX}/AbiSuite/docs/ \
-		;done)
-	@(cd ${WRKDIR}/abi-${VERSION}/test/wp; for TEST in *; do \
-		${INSTALL_DATA} $${TEST} ${PREFIX}/AbiSuite/docs/ \
-		;done)
-	@${INSTALL_PROGRAM} ${WRKSRC}/${OSDISTDIR}/bin/AbiWord_s \
-		${PREFIX}/AbiSuite/bin/
-	@${LN} -sf ${PREFIX}/AbiSuite/bin/AbiWord ${PREFIX}/bin/AbiWord
-	@${CP}	${WRKDIR}/unixfonts/install.sh \
-		${WRKDIR}/unixfonts/install.sh.orig
-	@${SED} s,/usr/local,${PREFIX}, \
-		${WRKDIR}/unixfonts/install.sh.orig > \
-		${WRKDIR}/unixfonts/install.sh
-	@(cd ${WRKDIR}/unixfonts; yes "" | ./install.sh)
-	@${CAT} ${PKGDIR}/MESSAGE | ${SED} s,/usr/local,${PREFIX},
-	@(${WRKSRC}/pkg/common/unix/scripts/makewrapper.sh \
-		AbiWord ${PREFIX}/AbiSuite)
-
 .include <bsd.port.post.mk>
diff --git a/editors/AbiWord2/distinfo b/editors/AbiWord2/distinfo
index 7ae219276a27..dc31a8262eb5 100644
--- a/editors/AbiWord2/distinfo
+++ b/editors/AbiWord2/distinfo
@@ -1,4 +1,6 @@
-MD5 (AbiWord/abi-0.7.6.tar.gz) = eabfa3067ff560f7c08b62d7661bba55
-MD5 (AbiWord/expat-0.7.6.tar.gz) = 3645bf427740914d7fd5f3173f2a742a
-MD5 (AbiWord/unixfonts-0.7.6.tar.gz) = 937be69cc7d43a0aa15215ec04e102dd
-MD5 (AbiWord/wv-0.7.6.tar.gz) = 528c967c1d0fcb2f7b817920c6610a50
+MD5 (AbiWord/abi-0.7.9.tar.gz) = 65bab409639c5d80a94738f06754ece9
+MD5 (AbiWord/expat-0.7.9.tar.gz) = 80396b61675674b2772ec93abae6a18e
+MD5 (AbiWord/unixfonts-0.7.9.tar.gz) = d91711abd8686112b4df1f0d28a3d83f
+MD5 (AbiWord/wv-0.7.9.tar.gz) = a28bf03833ecb0da1fc5355788efdbba
+MD5 (AbiWord/libiconv-0.7.9.tar.gz) = 69ab6ebfaf9043795311621328a1c527
+MD5 (AbiWord/abidistfiles-0.7.9.tar.gz) = 5d12bbe54ac7d0775076ea4f10f4a29c
diff --git a/editors/AbiWord2/files/patch-an b/editors/AbiWord2/files/patch-an
new file mode 100644
index 000000000000..ee7d51335e95
--- /dev/null
+++ b/editors/AbiWord2/files/patch-an
@@ -0,0 +1,43 @@
+--- Makefile	Tue Feb 29 07:34:29 2000
++++ Makefile.new	Sun May 14 21:58:09 2000
+@@ -42,6 +42,7 @@
+ 
+ ## Set the following to a list of pathnames to be copied to $(CANONDIR)
+ CANON_TOPLEVELFILES=	$(ABI_ROOT)/COPYING $(ABI_ROOT)/user/wp/readme.txt
++CANON_TLF_NOTDIR=	$(notdir $(CANON_TOPLEVELFILES))
+ 
+ ## Set the following to a list of directories (probably a subset of DIRS)
+ ## that have work to do.
+@@ -52,6 +53,9 @@
+ 	@for k in $(CANON_TOPLEVELFILES); do			\
+ 		$(ABICOPY) $$k $(CANONDIR);			\
+ 	done
++	@for k in $(CANON_TLF_NOTDIR); do			\
++		$(ABICHMOD) ugo=r $(CANONDIR)/$$k;		\
++	done
+ 	@for k in $(CANON_SubDirs); do				\
+ 		$(MAKE) ABI_ROOT=$(ABI_ROOT) -C $$k canonical;	\
+ 	done
+@@ -63,6 +67,7 @@
+ 			unzip -o $$k;				\
+ 			rm $$k;					\
+ 		done)
++	@(cd $(CANONDIR)/dictionary; $(ABICHMOD) ugo=r *)
+ #	(cd $(ABI_ROOT)/../abidistfiles; tar cf - dictionary/*.hash) | (cd $(CANONDIR); tar xf -)
+ ifeq ($(ABI_NATIVE),unix)
+ # each Unix installer requires both unixfonts and abidistfiles, 
+@@ -92,10 +97,12 @@
+ 	fi
+ # icons for X window manager use
+ 	@$(subst xxxx,$(CANONDIR)/icons,$(VERIFY_DIRECTORY))
+-	(cd $(ABI_ROOT)/../abidistfiles/icons; cp *_48* $(CANONDIR)/icons)
++	(cd $(ABI_ROOT)/../abidistfiles/icons; $(ABICOPY) *_48* $(CANONDIR)/icons)
++	@(cd $(CANONDIR)/icons; $(ABICHMOD) ugo=r *_48*)
+ # font stuff for installation
+ 	@$(subst xxxx,$(CANONDIR)/fonts,$(VERIFY_DIRECTORY))
+-	(cd $(ABI_ROOT)/../unixfonts/fonts ; cp *.* $(CANONDIR)/fonts)
++	(cd $(ABI_ROOT)/../unixfonts/fonts ; $(ABICOPY) *.* $(CANONDIR)/fonts)
++	@(cd $(CANONDIR)/fonts; $(ABICHMOD) ugo=r *.*)
+ endif
+ 
+ ##################################################################
diff --git a/editors/AbiWord2/files/patch-ap b/editors/AbiWord2/files/patch-ap
new file mode 100644
index 000000000000..a006ac936e31
--- /dev/null
+++ b/editors/AbiWord2/files/patch-ap
@@ -0,0 +1,22 @@
+--- wp/Makefile	Tue Feb 29 07:34:31 2000
++++ wp/Makefile.new	Sun May 14 21:15:19 2000
+@@ -44,10 +44,16 @@
+ 	@$(subst xxxx,$(CANON_AppDir),$(VERIFY_DIRECTORY))
+ 	@$(subst xxxx,$(CANON_AppDir)/strings,$(VERIFY_DIRECTORY))
+ 	@$(subst xxxx,$(CANON_AppDir)/help,$(VERIFY_DIRECTORY))
++	@$(subst xxxx,$(CANON_AppDir)/help/en-US,$(VERIFY_DIRECTORY))
+ 	@$(subst xxxx,$(CANON_AppDir)/sample,$(VERIFY_DIRECTORY))
++	@$(subst xxxx,$(CANON_AppDir)/sample/en-US,$(VERIFY_DIRECTORY))
+ 	@$(ABICOPY) $(USERDIR)/wp/readme.txt $(CANON_AppDir)
++	@$(ABICHMOD) ugo=r $(CANON_AppDir)/readme.txt
+ 	@$(ABICOPY) $(USERDIR)/wp/system.profile $(CANON_AppDir)
++	@$(ABICHMOD) ugo=r $(CANON_AppDir)/system.profile
+ 	@$(ABICOPY) $(USERDIR)/wp/strings/*.strings $(CANON_AppDir)/strings
+-	(cd $(USERDIR)/wp/help; tar cf - $(CANON_Lang)/*.*) | (cd $(CANON_AppDir)/help; tar xf -)
+-	(cd $(USERDIR)/wp/sample; tar cf - $(CANON_Lang)/*.*) | (cd $(CANON_AppDir)/sample; tar xf -)
+-
++	@$(ABICHMOD) ugo=r $(CANON_AppDir)/strings/*.strings
++	@$(ABICOPY) $(USERDIR)/wp/help/en-US/*.html $(CANON_AppDir)/help/en-US
++	@$(ABICHMOD) ugo=r $(CANON_AppDir)/help/en-US/*.html
++	@$(ABICOPY) $(USERDIR)/wp/sample/en-US/*.abw $(CANON_AppDir)/sample/en-US
++	@$(ABICHMOD) ugo=r $(CANON_AppDir)/sample/en-US/*.abw
diff --git a/editors/AbiWord2/files/patch-aq b/editors/AbiWord2/files/patch-aq
new file mode 100644
index 000000000000..c541d8b5d2f3
--- /dev/null
+++ b/editors/AbiWord2/files/patch-aq
@@ -0,0 +1,27 @@
+--- config/abi_defs.mk	Mon Mar 13 14:48:16 2000
++++ config/abi_defs.mk.new	Sat May 13 16:07:19 2000
+@@ -121,7 +121,9 @@
+ ##################################################################
+ ##################################################################
+ 
+-ABICOPY=cp
++ABICOPY = cp
++ABICHMOD = chmod
++ABIMKDIR = mkdir -m u=rwx,go=rx
+ 
+ ifdef ABISOURCE_LICENSED_TRADEMARKS
+ ABI_TMDEFS=	-DABISOURCE_LICENSED_TRADEMARKS
+@@ -287,11 +289,11 @@
+ ## INSTALL program...
+ 
+ define MAKE_OBJDIR
+-if test ! -d $(@D); then rm -rf $(@D); mkdir -p $(@D); fi
++if test ! -d $(@D); then rm -rf $(@D); $(ABIMKDIR) -p $(@D); fi
+ endef
+ 
+ define VERIFY_DIRECTORY
+-if test ! -d xxxx; then rm -rf xxxx; mkdir -p  xxxx; fi
++if test ! -d xxxx; then rm -rf xxxx; $(ABIMKDIR) -p  xxxx; fi
+ endef
+ 
+ ##################################################################
diff --git a/editors/AbiWord2/files/patch-ar b/editors/AbiWord2/files/patch-ar
new file mode 100644
index 000000000000..1b319cafe8d8
--- /dev/null
+++ b/editors/AbiWord2/files/patch-ar
@@ -0,0 +1,11 @@
+--- pkg/common/unix/scripts/install.sh	Tue Feb 29 13:37:57 2000
++++ pkg/common/unix/scripts/install.sh.new	Sun May 14 18:11:15 2000
+@@ -80,7 +80,7 @@
+ 
+ echo "Installing program binaries to [$LIBEXECDIR]..."
+ # Setup bins 
+-(cd $SRCDIR/bin; tar cf - Abi*) | (cd $LIBEXECDIR; tar xf -)
++(cd $SRCDIR/bin; cp Abi* $LIBEXECDIR)
+ 
+ ########################################################################
+ # If we're on Solaris, run makepsres on the font path
diff --git a/editors/AbiWord2/pkg-message b/editors/AbiWord2/pkg-message
index 41799bba5851..cf30e88f24e6 100644
--- a/editors/AbiWord2/pkg-message
+++ b/editors/AbiWord2/pkg-message
@@ -1,7 +1,7 @@
-You must add the /usr/local/AbiSuite/fonts directory to your X server's
+You must add the ${PREFIX}/AbiSuite/fonts directory to your X server's
 font path.  For XFree86, add the line:
 
-FontPath "/usr/local/AbiSuite/fonts/"
+FontPath "${PREFIX}/AbiSuite/fonts/"
 
 in the "Files" section of your /etc/XF86Config file.
 If you use a different X server, please see its documentation on how to do
diff --git a/editors/AbiWord2/pkg-plist b/editors/AbiWord2/pkg-plist
index 77eee5b0bc34..0d89e3385d58 100644
--- a/editors/AbiWord2/pkg-plist
+++ b/editors/AbiWord2/pkg-plist
@@ -1,6 +1,29 @@
 bin/AbiWord
+bin/abiword
+AbiSuite/COPYING
+AbiSuite/readme.txt
+AbiSuite/AbiWord/readme.txt
+AbiSuite/AbiWord/system.profile
+AbiSuite/AbiWord/help/en-US/help.html
+AbiSuite/AbiWord/sample/en-US/Latin1.abw
+AbiSuite/AbiWord/strings/ca-ES.strings
+AbiSuite/AbiWord/strings/da-DK.strings
+AbiSuite/AbiWord/strings/de-DE.strings
+AbiSuite/AbiWord/strings/du-NL.strings
+AbiSuite/AbiWord/strings/es-ES.strings
+AbiSuite/AbiWord/strings/fi-FI.strings
+AbiSuite/AbiWord/strings/fr-FR.strings
+AbiSuite/AbiWord/strings/hu-HU.strings
+AbiSuite/AbiWord/strings/id-ID.strings
+AbiSuite/AbiWord/strings/it-IT.strings
+AbiSuite/AbiWord/strings/no-BOK.strings
+AbiSuite/AbiWord/strings/pt-BR.strings
+AbiSuite/AbiWord/strings/pt-PT.strings
+AbiSuite/AbiWord/strings/sv-SE.strings
 AbiSuite/bin/AbiWord
+AbiSuite/bin/AbiWord_d
 AbiSuite/bin/AbiWord_s
+AbiSuite/dictionary/american.hash
 AbiSuite/fonts/a010013l.afm
 AbiSuite/fonts/a010013l.pfa
 AbiSuite/fonts/a010015l.afm
@@ -80,33 +103,17 @@ AbiSuite/fonts/s050000l.afm
 AbiSuite/fonts/s050000l.pfa
 AbiSuite/fonts/z003034l.afm
 AbiSuite/fonts/z003034l.pfa
-AbiSuite/docs/AbiSource_DialogFramework.abw
-AbiSuite/docs/AbiSource_Localization.abw
-AbiSuite/docs/AbiSource_ProgrammerGuidelines.abw
-AbiSuite/docs/AbiWord_DocumentFormat.abw
-AbiSuite/docs/AbiWord_FileImport.abw
-AbiSuite/docs/AbiWord_LayoutDesign.abw
-AbiSuite/docs/AbiWord_SourceOverview.abw
-AbiSuite/docs/AbiWord_SpellCheck_Notes.abw
-AbiSuite/docs/AbiWord_list_notes.txt
-AbiSuite/docs/BUILD.TXT
-AbiSuite/docs/UnixAdmin.abw
-AbiSuite/docs/roadmap.html
-AbiSuite/docs/Bazaar.abw
-AbiSuite/docs/BillOfRights.abw
-AbiSuite/docs/Gettysburg.abw
-AbiSuite/docs/Interview.abw
-AbiSuite/docs/Latin1.abw
-AbiSuite/docs/Styles.abw
-AbiSuite/docs/Unicode1.abw
-AbiSuite/docs/Word97Test.doc
-AbiSuite/docs/abi_memo-new.abw
-AbiSuite/docs/abi_memo.abw
-AbiSuite/docs/data.abw
-AbiSuite/docs/footer.abw
-AbiSuite/docs/rtftest.rtf
-AbiSuite/docs/tabs.abw
-@dirrm AbiSuite/fonts
+AbiSuite/icons/abiword_48.png
+AbiSuite/icons/abiword_48.tif
+AbiSuite/icons/abiword_48.xpm
+@dirrm AbiSuite/AbiWord/help/en-US
+@dirrm AbiSuite/AbiWord/help
+@dirrm AbiSuite/AbiWord/sample/en-US
+@dirrm AbiSuite/AbiWord/sample
+@dirrm AbiSuite/AbiWord/strings
+@dirrm AbiSuite/AbiWord
 @dirrm AbiSuite/bin
-@dirrm AbiSuite/docs
+@dirrm AbiSuite/dictionary
+@dirrm AbiSuite/fonts
+@dirrm AbiSuite/icons
 @dirrm AbiSuite
diff --git a/editors/abiword-devel/Makefile b/editors/abiword-devel/Makefile
index 6876ff03ebd9..e6a137584c4d 100644
--- a/editors/abiword-devel/Makefile
+++ b/editors/abiword-devel/Makefile
@@ -11,60 +11,28 @@ CATEGORIES=	editors
 MASTER_SITES=	http://www.abisource.com/downloads/Version-${VERSION}/lf/
 DISTNAME=	abi-${VERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} expat-${VERSION}.tar.gz \
-		unixfonts-${VERSION}.tar.gz wv-${VERSION}.tar.gz
+		unixfonts-${VERSION}.tar.gz wv-${VERSION}.tar.gz \
+		libiconv-${VERSION}.tar.gz abidistfiles-${VERSION}.tar.gz
 
-MAINTAINER=	dburr@FreeBSD.org
+MAINTAINER=	wolman@cs.washington.edu
 
+# unzip is needed during the installation process
+BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
 		png.3:${PORTSDIR}/graphics/png
 RUN_DEPENDS=	ispell:${PORTSDIR}/textproc/ispell
 
 DIST_SUBDIR=	AbiWord
 
-VERSION=	0.7.6
+VERSION=	0.7.9
 WRKSRC=		${WRKDIR}/abi-${VERSION}/src
 USE_XLIB=	yes
 USE_GMAKE=	yes
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config/gtk12-config
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
-MAKE_ENV=	GTK_CONFIG="${GTK_CONFIG}" GLIB_CONFIG="${GLIB_CONFIG}"
-OSDISTDIR=	${OPSYS}_`uname -r`_${ARCH}_OBJ
+MAKE_ENV=	prefix="${PREFIX}"
 
 .include <bsd.port.pre.mk>
 
-post-patch:
-.if ${OSVERSION} != 310000
-	@${CP} 	${WRKSRC}/config/platforms/freebsd.mk \
-		${WRKSRC}/config/platforms/freebsd.mk.version
-	@${SED} -e s,3.1-RELEASE,`uname -r`,g \
-		-e s,-D_POSIX_SOURCE,,g \
-		${WRKSRC}/config/platforms/freebsd.mk.version > \
-		${WRKSRC}/config/platforms/freebsd.mk
-.endif
-
 pre-build:
 	@(cd ${WRKDIR}/wv && ./configure)
 
-do-install:
-	@${MKDIR} ${PREFIX}/AbiSuite/bin
-	@${MKDIR} ${PREFIX}/AbiSuite/docs
-	@(cd ${WRKDIR}/abi-${VERSION}/docs; for DOCS in *; do \
-		${INSTALL_DATA} $${DOCS} ${PREFIX}/AbiSuite/docs/ \
-		;done)
-	@(cd ${WRKDIR}/abi-${VERSION}/test/wp; for TEST in *; do \
-		${INSTALL_DATA} $${TEST} ${PREFIX}/AbiSuite/docs/ \
-		;done)
-	@${INSTALL_PROGRAM} ${WRKSRC}/${OSDISTDIR}/bin/AbiWord_s \
-		${PREFIX}/AbiSuite/bin/
-	@${LN} -sf ${PREFIX}/AbiSuite/bin/AbiWord ${PREFIX}/bin/AbiWord
-	@${CP}	${WRKDIR}/unixfonts/install.sh \
-		${WRKDIR}/unixfonts/install.sh.orig
-	@${SED} s,/usr/local,${PREFIX}, \
-		${WRKDIR}/unixfonts/install.sh.orig > \
-		${WRKDIR}/unixfonts/install.sh
-	@(cd ${WRKDIR}/unixfonts; yes "" | ./install.sh)
-	@${CAT} ${PKGDIR}/MESSAGE | ${SED} s,/usr/local,${PREFIX},
-	@(${WRKSRC}/pkg/common/unix/scripts/makewrapper.sh \
-		AbiWord ${PREFIX}/AbiSuite)
-
 .include <bsd.port.post.mk>
diff --git a/editors/abiword-devel/distinfo b/editors/abiword-devel/distinfo
index 7ae219276a27..dc31a8262eb5 100644
--- a/editors/abiword-devel/distinfo
+++ b/editors/abiword-devel/distinfo
@@ -1,4 +1,6 @@
-MD5 (AbiWord/abi-0.7.6.tar.gz) = eabfa3067ff560f7c08b62d7661bba55
-MD5 (AbiWord/expat-0.7.6.tar.gz) = 3645bf427740914d7fd5f3173f2a742a
-MD5 (AbiWord/unixfonts-0.7.6.tar.gz) = 937be69cc7d43a0aa15215ec04e102dd
-MD5 (AbiWord/wv-0.7.6.tar.gz) = 528c967c1d0fcb2f7b817920c6610a50
+MD5 (AbiWord/abi-0.7.9.tar.gz) = 65bab409639c5d80a94738f06754ece9
+MD5 (AbiWord/expat-0.7.9.tar.gz) = 80396b61675674b2772ec93abae6a18e
+MD5 (AbiWord/unixfonts-0.7.9.tar.gz) = d91711abd8686112b4df1f0d28a3d83f
+MD5 (AbiWord/wv-0.7.9.tar.gz) = a28bf03833ecb0da1fc5355788efdbba
+MD5 (AbiWord/libiconv-0.7.9.tar.gz) = 69ab6ebfaf9043795311621328a1c527
+MD5 (AbiWord/abidistfiles-0.7.9.tar.gz) = 5d12bbe54ac7d0775076ea4f10f4a29c
diff --git a/editors/abiword-devel/files/patch-an b/editors/abiword-devel/files/patch-an
new file mode 100644
index 000000000000..ee7d51335e95
--- /dev/null
+++ b/editors/abiword-devel/files/patch-an
@@ -0,0 +1,43 @@
+--- Makefile	Tue Feb 29 07:34:29 2000
++++ Makefile.new	Sun May 14 21:58:09 2000
+@@ -42,6 +42,7 @@
+ 
+ ## Set the following to a list of pathnames to be copied to $(CANONDIR)
+ CANON_TOPLEVELFILES=	$(ABI_ROOT)/COPYING $(ABI_ROOT)/user/wp/readme.txt
++CANON_TLF_NOTDIR=	$(notdir $(CANON_TOPLEVELFILES))
+ 
+ ## Set the following to a list of directories (probably a subset of DIRS)
+ ## that have work to do.
+@@ -52,6 +53,9 @@
+ 	@for k in $(CANON_TOPLEVELFILES); do			\
+ 		$(ABICOPY) $$k $(CANONDIR);			\
+ 	done
++	@for k in $(CANON_TLF_NOTDIR); do			\
++		$(ABICHMOD) ugo=r $(CANONDIR)/$$k;		\
++	done
+ 	@for k in $(CANON_SubDirs); do				\
+ 		$(MAKE) ABI_ROOT=$(ABI_ROOT) -C $$k canonical;	\
+ 	done
+@@ -63,6 +67,7 @@
+ 			unzip -o $$k;				\
+ 			rm $$k;					\
+ 		done)
++	@(cd $(CANONDIR)/dictionary; $(ABICHMOD) ugo=r *)
+ #	(cd $(ABI_ROOT)/../abidistfiles; tar cf - dictionary/*.hash) | (cd $(CANONDIR); tar xf -)
+ ifeq ($(ABI_NATIVE),unix)
+ # each Unix installer requires both unixfonts and abidistfiles, 
+@@ -92,10 +97,12 @@
+ 	fi
+ # icons for X window manager use
+ 	@$(subst xxxx,$(CANONDIR)/icons,$(VERIFY_DIRECTORY))
+-	(cd $(ABI_ROOT)/../abidistfiles/icons; cp *_48* $(CANONDIR)/icons)
++	(cd $(ABI_ROOT)/../abidistfiles/icons; $(ABICOPY) *_48* $(CANONDIR)/icons)
++	@(cd $(CANONDIR)/icons; $(ABICHMOD) ugo=r *_48*)
+ # font stuff for installation
+ 	@$(subst xxxx,$(CANONDIR)/fonts,$(VERIFY_DIRECTORY))
+-	(cd $(ABI_ROOT)/../unixfonts/fonts ; cp *.* $(CANONDIR)/fonts)
++	(cd $(ABI_ROOT)/../unixfonts/fonts ; $(ABICOPY) *.* $(CANONDIR)/fonts)
++	@(cd $(CANONDIR)/fonts; $(ABICHMOD) ugo=r *.*)
+ endif
+ 
+ ##################################################################
diff --git a/editors/abiword-devel/files/patch-ap b/editors/abiword-devel/files/patch-ap
new file mode 100644
index 000000000000..a006ac936e31
--- /dev/null
+++ b/editors/abiword-devel/files/patch-ap
@@ -0,0 +1,22 @@
+--- wp/Makefile	Tue Feb 29 07:34:31 2000
++++ wp/Makefile.new	Sun May 14 21:15:19 2000
+@@ -44,10 +44,16 @@
+ 	@$(subst xxxx,$(CANON_AppDir),$(VERIFY_DIRECTORY))
+ 	@$(subst xxxx,$(CANON_AppDir)/strings,$(VERIFY_DIRECTORY))
+ 	@$(subst xxxx,$(CANON_AppDir)/help,$(VERIFY_DIRECTORY))
++	@$(subst xxxx,$(CANON_AppDir)/help/en-US,$(VERIFY_DIRECTORY))
+ 	@$(subst xxxx,$(CANON_AppDir)/sample,$(VERIFY_DIRECTORY))
++	@$(subst xxxx,$(CANON_AppDir)/sample/en-US,$(VERIFY_DIRECTORY))
+ 	@$(ABICOPY) $(USERDIR)/wp/readme.txt $(CANON_AppDir)
++	@$(ABICHMOD) ugo=r $(CANON_AppDir)/readme.txt
+ 	@$(ABICOPY) $(USERDIR)/wp/system.profile $(CANON_AppDir)
++	@$(ABICHMOD) ugo=r $(CANON_AppDir)/system.profile
+ 	@$(ABICOPY) $(USERDIR)/wp/strings/*.strings $(CANON_AppDir)/strings
+-	(cd $(USERDIR)/wp/help; tar cf - $(CANON_Lang)/*.*) | (cd $(CANON_AppDir)/help; tar xf -)
+-	(cd $(USERDIR)/wp/sample; tar cf - $(CANON_Lang)/*.*) | (cd $(CANON_AppDir)/sample; tar xf -)
+-
++	@$(ABICHMOD) ugo=r $(CANON_AppDir)/strings/*.strings
++	@$(ABICOPY) $(USERDIR)/wp/help/en-US/*.html $(CANON_AppDir)/help/en-US
++	@$(ABICHMOD) ugo=r $(CANON_AppDir)/help/en-US/*.html
++	@$(ABICOPY) $(USERDIR)/wp/sample/en-US/*.abw $(CANON_AppDir)/sample/en-US
++	@$(ABICHMOD) ugo=r $(CANON_AppDir)/sample/en-US/*.abw
diff --git a/editors/abiword-devel/files/patch-aq b/editors/abiword-devel/files/patch-aq
new file mode 100644
index 000000000000..c541d8b5d2f3
--- /dev/null
+++ b/editors/abiword-devel/files/patch-aq
@@ -0,0 +1,27 @@
+--- config/abi_defs.mk	Mon Mar 13 14:48:16 2000
++++ config/abi_defs.mk.new	Sat May 13 16:07:19 2000
+@@ -121,7 +121,9 @@
+ ##################################################################
+ ##################################################################
+ 
+-ABICOPY=cp
++ABICOPY = cp
++ABICHMOD = chmod
++ABIMKDIR = mkdir -m u=rwx,go=rx
+ 
+ ifdef ABISOURCE_LICENSED_TRADEMARKS
+ ABI_TMDEFS=	-DABISOURCE_LICENSED_TRADEMARKS
+@@ -287,11 +289,11 @@
+ ## INSTALL program...
+ 
+ define MAKE_OBJDIR
+-if test ! -d $(@D); then rm -rf $(@D); mkdir -p $(@D); fi
++if test ! -d $(@D); then rm -rf $(@D); $(ABIMKDIR) -p $(@D); fi
+ endef
+ 
+ define VERIFY_DIRECTORY
+-if test ! -d xxxx; then rm -rf xxxx; mkdir -p  xxxx; fi
++if test ! -d xxxx; then rm -rf xxxx; $(ABIMKDIR) -p  xxxx; fi
+ endef
+ 
+ ##################################################################
diff --git a/editors/abiword-devel/files/patch-ar b/editors/abiword-devel/files/patch-ar
new file mode 100644
index 000000000000..1b319cafe8d8
--- /dev/null
+++ b/editors/abiword-devel/files/patch-ar
@@ -0,0 +1,11 @@
+--- pkg/common/unix/scripts/install.sh	Tue Feb 29 13:37:57 2000
++++ pkg/common/unix/scripts/install.sh.new	Sun May 14 18:11:15 2000
+@@ -80,7 +80,7 @@
+ 
+ echo "Installing program binaries to [$LIBEXECDIR]..."
+ # Setup bins 
+-(cd $SRCDIR/bin; tar cf - Abi*) | (cd $LIBEXECDIR; tar xf -)
++(cd $SRCDIR/bin; cp Abi* $LIBEXECDIR)
+ 
+ ########################################################################
+ # If we're on Solaris, run makepsres on the font path
diff --git a/editors/abiword-devel/pkg-message b/editors/abiword-devel/pkg-message
index 41799bba5851..cf30e88f24e6 100644
--- a/editors/abiword-devel/pkg-message
+++ b/editors/abiword-devel/pkg-message
@@ -1,7 +1,7 @@
-You must add the /usr/local/AbiSuite/fonts directory to your X server's
+You must add the ${PREFIX}/AbiSuite/fonts directory to your X server's
 font path.  For XFree86, add the line:
 
-FontPath "/usr/local/AbiSuite/fonts/"
+FontPath "${PREFIX}/AbiSuite/fonts/"
 
 in the "Files" section of your /etc/XF86Config file.
 If you use a different X server, please see its documentation on how to do
diff --git a/editors/abiword-devel/pkg-plist b/editors/abiword-devel/pkg-plist
index 77eee5b0bc34..0d89e3385d58 100644
--- a/editors/abiword-devel/pkg-plist
+++ b/editors/abiword-devel/pkg-plist
@@ -1,6 +1,29 @@
 bin/AbiWord
+bin/abiword
+AbiSuite/COPYING
+AbiSuite/readme.txt
+AbiSuite/AbiWord/readme.txt
+AbiSuite/AbiWord/system.profile
+AbiSuite/AbiWord/help/en-US/help.html
+AbiSuite/AbiWord/sample/en-US/Latin1.abw
+AbiSuite/AbiWord/strings/ca-ES.strings
+AbiSuite/AbiWord/strings/da-DK.strings
+AbiSuite/AbiWord/strings/de-DE.strings
+AbiSuite/AbiWord/strings/du-NL.strings
+AbiSuite/AbiWord/strings/es-ES.strings
+AbiSuite/AbiWord/strings/fi-FI.strings
+AbiSuite/AbiWord/strings/fr-FR.strings
+AbiSuite/AbiWord/strings/hu-HU.strings
+AbiSuite/AbiWord/strings/id-ID.strings
+AbiSuite/AbiWord/strings/it-IT.strings
+AbiSuite/AbiWord/strings/no-BOK.strings
+AbiSuite/AbiWord/strings/pt-BR.strings
+AbiSuite/AbiWord/strings/pt-PT.strings
+AbiSuite/AbiWord/strings/sv-SE.strings
 AbiSuite/bin/AbiWord
+AbiSuite/bin/AbiWord_d
 AbiSuite/bin/AbiWord_s
+AbiSuite/dictionary/american.hash
 AbiSuite/fonts/a010013l.afm
 AbiSuite/fonts/a010013l.pfa
 AbiSuite/fonts/a010015l.afm
@@ -80,33 +103,17 @@ AbiSuite/fonts/s050000l.afm
 AbiSuite/fonts/s050000l.pfa
 AbiSuite/fonts/z003034l.afm
 AbiSuite/fonts/z003034l.pfa
-AbiSuite/docs/AbiSource_DialogFramework.abw
-AbiSuite/docs/AbiSource_Localization.abw
-AbiSuite/docs/AbiSource_ProgrammerGuidelines.abw
-AbiSuite/docs/AbiWord_DocumentFormat.abw
-AbiSuite/docs/AbiWord_FileImport.abw
-AbiSuite/docs/AbiWord_LayoutDesign.abw
-AbiSuite/docs/AbiWord_SourceOverview.abw
-AbiSuite/docs/AbiWord_SpellCheck_Notes.abw
-AbiSuite/docs/AbiWord_list_notes.txt
-AbiSuite/docs/BUILD.TXT
-AbiSuite/docs/UnixAdmin.abw
-AbiSuite/docs/roadmap.html
-AbiSuite/docs/Bazaar.abw
-AbiSuite/docs/BillOfRights.abw
-AbiSuite/docs/Gettysburg.abw
-AbiSuite/docs/Interview.abw
-AbiSuite/docs/Latin1.abw
-AbiSuite/docs/Styles.abw
-AbiSuite/docs/Unicode1.abw
-AbiSuite/docs/Word97Test.doc
-AbiSuite/docs/abi_memo-new.abw
-AbiSuite/docs/abi_memo.abw
-AbiSuite/docs/data.abw
-AbiSuite/docs/footer.abw
-AbiSuite/docs/rtftest.rtf
-AbiSuite/docs/tabs.abw
-@dirrm AbiSuite/fonts
+AbiSuite/icons/abiword_48.png
+AbiSuite/icons/abiword_48.tif
+AbiSuite/icons/abiword_48.xpm
+@dirrm AbiSuite/AbiWord/help/en-US
+@dirrm AbiSuite/AbiWord/help
+@dirrm AbiSuite/AbiWord/sample/en-US
+@dirrm AbiSuite/AbiWord/sample
+@dirrm AbiSuite/AbiWord/strings
+@dirrm AbiSuite/AbiWord
 @dirrm AbiSuite/bin
-@dirrm AbiSuite/docs
+@dirrm AbiSuite/dictionary
+@dirrm AbiSuite/fonts
+@dirrm AbiSuite/icons
 @dirrm AbiSuite
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index 6876ff03ebd9..e6a137584c4d 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -11,60 +11,28 @@ CATEGORIES=	editors
 MASTER_SITES=	http://www.abisource.com/downloads/Version-${VERSION}/lf/
 DISTNAME=	abi-${VERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} expat-${VERSION}.tar.gz \
-		unixfonts-${VERSION}.tar.gz wv-${VERSION}.tar.gz
+		unixfonts-${VERSION}.tar.gz wv-${VERSION}.tar.gz \
+		libiconv-${VERSION}.tar.gz abidistfiles-${VERSION}.tar.gz
 
-MAINTAINER=	dburr@FreeBSD.org
+MAINTAINER=	wolman@cs.washington.edu
 
+# unzip is needed during the installation process
+BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
 		png.3:${PORTSDIR}/graphics/png
 RUN_DEPENDS=	ispell:${PORTSDIR}/textproc/ispell
 
 DIST_SUBDIR=	AbiWord
 
-VERSION=	0.7.6
+VERSION=	0.7.9
 WRKSRC=		${WRKDIR}/abi-${VERSION}/src
 USE_XLIB=	yes
 USE_GMAKE=	yes
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config/gtk12-config
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
-MAKE_ENV=	GTK_CONFIG="${GTK_CONFIG}" GLIB_CONFIG="${GLIB_CONFIG}"
-OSDISTDIR=	${OPSYS}_`uname -r`_${ARCH}_OBJ
+MAKE_ENV=	prefix="${PREFIX}"
 
 .include <bsd.port.pre.mk>
 
-post-patch:
-.if ${OSVERSION} != 310000
-	@${CP} 	${WRKSRC}/config/platforms/freebsd.mk \
-		${WRKSRC}/config/platforms/freebsd.mk.version
-	@${SED} -e s,3.1-RELEASE,`uname -r`,g \
-		-e s,-D_POSIX_SOURCE,,g \
-		${WRKSRC}/config/platforms/freebsd.mk.version > \
-		${WRKSRC}/config/platforms/freebsd.mk
-.endif
-
 pre-build:
 	@(cd ${WRKDIR}/wv && ./configure)
 
-do-install:
-	@${MKDIR} ${PREFIX}/AbiSuite/bin
-	@${MKDIR} ${PREFIX}/AbiSuite/docs
-	@(cd ${WRKDIR}/abi-${VERSION}/docs; for DOCS in *; do \
-		${INSTALL_DATA} $${DOCS} ${PREFIX}/AbiSuite/docs/ \
-		;done)
-	@(cd ${WRKDIR}/abi-${VERSION}/test/wp; for TEST in *; do \
-		${INSTALL_DATA} $${TEST} ${PREFIX}/AbiSuite/docs/ \
-		;done)
-	@${INSTALL_PROGRAM} ${WRKSRC}/${OSDISTDIR}/bin/AbiWord_s \
-		${PREFIX}/AbiSuite/bin/
-	@${LN} -sf ${PREFIX}/AbiSuite/bin/AbiWord ${PREFIX}/bin/AbiWord
-	@${CP}	${WRKDIR}/unixfonts/install.sh \
-		${WRKDIR}/unixfonts/install.sh.orig
-	@${SED} s,/usr/local,${PREFIX}, \
-		${WRKDIR}/unixfonts/install.sh.orig > \
-		${WRKDIR}/unixfonts/install.sh
-	@(cd ${WRKDIR}/unixfonts; yes "" | ./install.sh)
-	@${CAT} ${PKGDIR}/MESSAGE | ${SED} s,/usr/local,${PREFIX},
-	@(${WRKSRC}/pkg/common/unix/scripts/makewrapper.sh \
-		AbiWord ${PREFIX}/AbiSuite)
-
 .include <bsd.port.post.mk>
diff --git a/editors/abiword/distinfo b/editors/abiword/distinfo
index 7ae219276a27..dc31a8262eb5 100644
--- a/editors/abiword/distinfo
+++ b/editors/abiword/distinfo
@@ -1,4 +1,6 @@
-MD5 (AbiWord/abi-0.7.6.tar.gz) = eabfa3067ff560f7c08b62d7661bba55
-MD5 (AbiWord/expat-0.7.6.tar.gz) = 3645bf427740914d7fd5f3173f2a742a
-MD5 (AbiWord/unixfonts-0.7.6.tar.gz) = 937be69cc7d43a0aa15215ec04e102dd
-MD5 (AbiWord/wv-0.7.6.tar.gz) = 528c967c1d0fcb2f7b817920c6610a50
+MD5 (AbiWord/abi-0.7.9.tar.gz) = 65bab409639c5d80a94738f06754ece9
+MD5 (AbiWord/expat-0.7.9.tar.gz) = 80396b61675674b2772ec93abae6a18e
+MD5 (AbiWord/unixfonts-0.7.9.tar.gz) = d91711abd8686112b4df1f0d28a3d83f
+MD5 (AbiWord/wv-0.7.9.tar.gz) = a28bf03833ecb0da1fc5355788efdbba
+MD5 (AbiWord/libiconv-0.7.9.tar.gz) = 69ab6ebfaf9043795311621328a1c527
+MD5 (AbiWord/abidistfiles-0.7.9.tar.gz) = 5d12bbe54ac7d0775076ea4f10f4a29c
diff --git a/editors/abiword/files/patch-an b/editors/abiword/files/patch-an
new file mode 100644
index 000000000000..ee7d51335e95
--- /dev/null
+++ b/editors/abiword/files/patch-an
@@ -0,0 +1,43 @@
+--- Makefile	Tue Feb 29 07:34:29 2000
++++ Makefile.new	Sun May 14 21:58:09 2000
+@@ -42,6 +42,7 @@
+ 
+ ## Set the following to a list of pathnames to be copied to $(CANONDIR)
+ CANON_TOPLEVELFILES=	$(ABI_ROOT)/COPYING $(ABI_ROOT)/user/wp/readme.txt
++CANON_TLF_NOTDIR=	$(notdir $(CANON_TOPLEVELFILES))
+ 
+ ## Set the following to a list of directories (probably a subset of DIRS)
+ ## that have work to do.
+@@ -52,6 +53,9 @@
+ 	@for k in $(CANON_TOPLEVELFILES); do			\
+ 		$(ABICOPY) $$k $(CANONDIR);			\
+ 	done
++	@for k in $(CANON_TLF_NOTDIR); do			\
++		$(ABICHMOD) ugo=r $(CANONDIR)/$$k;		\
++	done
+ 	@for k in $(CANON_SubDirs); do				\
+ 		$(MAKE) ABI_ROOT=$(ABI_ROOT) -C $$k canonical;	\
+ 	done
+@@ -63,6 +67,7 @@
+ 			unzip -o $$k;				\
+ 			rm $$k;					\
+ 		done)
++	@(cd $(CANONDIR)/dictionary; $(ABICHMOD) ugo=r *)
+ #	(cd $(ABI_ROOT)/../abidistfiles; tar cf - dictionary/*.hash) | (cd $(CANONDIR); tar xf -)
+ ifeq ($(ABI_NATIVE),unix)
+ # each Unix installer requires both unixfonts and abidistfiles, 
+@@ -92,10 +97,12 @@
+ 	fi
+ # icons for X window manager use
+ 	@$(subst xxxx,$(CANONDIR)/icons,$(VERIFY_DIRECTORY))
+-	(cd $(ABI_ROOT)/../abidistfiles/icons; cp *_48* $(CANONDIR)/icons)
++	(cd $(ABI_ROOT)/../abidistfiles/icons; $(ABICOPY) *_48* $(CANONDIR)/icons)
++	@(cd $(CANONDIR)/icons; $(ABICHMOD) ugo=r *_48*)
+ # font stuff for installation
+ 	@$(subst xxxx,$(CANONDIR)/fonts,$(VERIFY_DIRECTORY))
+-	(cd $(ABI_ROOT)/../unixfonts/fonts ; cp *.* $(CANONDIR)/fonts)
++	(cd $(ABI_ROOT)/../unixfonts/fonts ; $(ABICOPY) *.* $(CANONDIR)/fonts)
++	@(cd $(CANONDIR)/fonts; $(ABICHMOD) ugo=r *.*)
+ endif
+ 
+ ##################################################################
diff --git a/editors/abiword/files/patch-ap b/editors/abiword/files/patch-ap
new file mode 100644
index 000000000000..a006ac936e31
--- /dev/null
+++ b/editors/abiword/files/patch-ap
@@ -0,0 +1,22 @@
+--- wp/Makefile	Tue Feb 29 07:34:31 2000
++++ wp/Makefile.new	Sun May 14 21:15:19 2000
+@@ -44,10 +44,16 @@
+ 	@$(subst xxxx,$(CANON_AppDir),$(VERIFY_DIRECTORY))
+ 	@$(subst xxxx,$(CANON_AppDir)/strings,$(VERIFY_DIRECTORY))
+ 	@$(subst xxxx,$(CANON_AppDir)/help,$(VERIFY_DIRECTORY))
++	@$(subst xxxx,$(CANON_AppDir)/help/en-US,$(VERIFY_DIRECTORY))
+ 	@$(subst xxxx,$(CANON_AppDir)/sample,$(VERIFY_DIRECTORY))
++	@$(subst xxxx,$(CANON_AppDir)/sample/en-US,$(VERIFY_DIRECTORY))
+ 	@$(ABICOPY) $(USERDIR)/wp/readme.txt $(CANON_AppDir)
++	@$(ABICHMOD) ugo=r $(CANON_AppDir)/readme.txt
+ 	@$(ABICOPY) $(USERDIR)/wp/system.profile $(CANON_AppDir)
++	@$(ABICHMOD) ugo=r $(CANON_AppDir)/system.profile
+ 	@$(ABICOPY) $(USERDIR)/wp/strings/*.strings $(CANON_AppDir)/strings
+-	(cd $(USERDIR)/wp/help; tar cf - $(CANON_Lang)/*.*) | (cd $(CANON_AppDir)/help; tar xf -)
+-	(cd $(USERDIR)/wp/sample; tar cf - $(CANON_Lang)/*.*) | (cd $(CANON_AppDir)/sample; tar xf -)
+-
++	@$(ABICHMOD) ugo=r $(CANON_AppDir)/strings/*.strings
++	@$(ABICOPY) $(USERDIR)/wp/help/en-US/*.html $(CANON_AppDir)/help/en-US
++	@$(ABICHMOD) ugo=r $(CANON_AppDir)/help/en-US/*.html
++	@$(ABICOPY) $(USERDIR)/wp/sample/en-US/*.abw $(CANON_AppDir)/sample/en-US
++	@$(ABICHMOD) ugo=r $(CANON_AppDir)/sample/en-US/*.abw
diff --git a/editors/abiword/files/patch-aq b/editors/abiword/files/patch-aq
new file mode 100644
index 000000000000..c541d8b5d2f3
--- /dev/null
+++ b/editors/abiword/files/patch-aq
@@ -0,0 +1,27 @@
+--- config/abi_defs.mk	Mon Mar 13 14:48:16 2000
++++ config/abi_defs.mk.new	Sat May 13 16:07:19 2000
+@@ -121,7 +121,9 @@
+ ##################################################################
+ ##################################################################
+ 
+-ABICOPY=cp
++ABICOPY = cp
++ABICHMOD = chmod
++ABIMKDIR = mkdir -m u=rwx,go=rx
+ 
+ ifdef ABISOURCE_LICENSED_TRADEMARKS
+ ABI_TMDEFS=	-DABISOURCE_LICENSED_TRADEMARKS
+@@ -287,11 +289,11 @@
+ ## INSTALL program...
+ 
+ define MAKE_OBJDIR
+-if test ! -d $(@D); then rm -rf $(@D); mkdir -p $(@D); fi
++if test ! -d $(@D); then rm -rf $(@D); $(ABIMKDIR) -p $(@D); fi
+ endef
+ 
+ define VERIFY_DIRECTORY
+-if test ! -d xxxx; then rm -rf xxxx; mkdir -p  xxxx; fi
++if test ! -d xxxx; then rm -rf xxxx; $(ABIMKDIR) -p  xxxx; fi
+ endef
+ 
+ ##################################################################
diff --git a/editors/abiword/files/patch-ar b/editors/abiword/files/patch-ar
new file mode 100644
index 000000000000..1b319cafe8d8
--- /dev/null
+++ b/editors/abiword/files/patch-ar
@@ -0,0 +1,11 @@
+--- pkg/common/unix/scripts/install.sh	Tue Feb 29 13:37:57 2000
++++ pkg/common/unix/scripts/install.sh.new	Sun May 14 18:11:15 2000
+@@ -80,7 +80,7 @@
+ 
+ echo "Installing program binaries to [$LIBEXECDIR]..."
+ # Setup bins 
+-(cd $SRCDIR/bin; tar cf - Abi*) | (cd $LIBEXECDIR; tar xf -)
++(cd $SRCDIR/bin; cp Abi* $LIBEXECDIR)
+ 
+ ########################################################################
+ # If we're on Solaris, run makepsres on the font path
diff --git a/editors/abiword/pkg-message b/editors/abiword/pkg-message
index 41799bba5851..cf30e88f24e6 100644
--- a/editors/abiword/pkg-message
+++ b/editors/abiword/pkg-message
@@ -1,7 +1,7 @@
-You must add the /usr/local/AbiSuite/fonts directory to your X server's
+You must add the ${PREFIX}/AbiSuite/fonts directory to your X server's
 font path.  For XFree86, add the line:
 
-FontPath "/usr/local/AbiSuite/fonts/"
+FontPath "${PREFIX}/AbiSuite/fonts/"
 
 in the "Files" section of your /etc/XF86Config file.
 If you use a different X server, please see its documentation on how to do
diff --git a/editors/abiword/pkg-plist b/editors/abiword/pkg-plist
index 77eee5b0bc34..0d89e3385d58 100644
--- a/editors/abiword/pkg-plist
+++ b/editors/abiword/pkg-plist
@@ -1,6 +1,29 @@
 bin/AbiWord
+bin/abiword
+AbiSuite/COPYING
+AbiSuite/readme.txt
+AbiSuite/AbiWord/readme.txt
+AbiSuite/AbiWord/system.profile
+AbiSuite/AbiWord/help/en-US/help.html
+AbiSuite/AbiWord/sample/en-US/Latin1.abw
+AbiSuite/AbiWord/strings/ca-ES.strings
+AbiSuite/AbiWord/strings/da-DK.strings
+AbiSuite/AbiWord/strings/de-DE.strings
+AbiSuite/AbiWord/strings/du-NL.strings
+AbiSuite/AbiWord/strings/es-ES.strings
+AbiSuite/AbiWord/strings/fi-FI.strings
+AbiSuite/AbiWord/strings/fr-FR.strings
+AbiSuite/AbiWord/strings/hu-HU.strings
+AbiSuite/AbiWord/strings/id-ID.strings
+AbiSuite/AbiWord/strings/it-IT.strings
+AbiSuite/AbiWord/strings/no-BOK.strings
+AbiSuite/AbiWord/strings/pt-BR.strings
+AbiSuite/AbiWord/strings/pt-PT.strings
+AbiSuite/AbiWord/strings/sv-SE.strings
 AbiSuite/bin/AbiWord
+AbiSuite/bin/AbiWord_d
 AbiSuite/bin/AbiWord_s
+AbiSuite/dictionary/american.hash
 AbiSuite/fonts/a010013l.afm
 AbiSuite/fonts/a010013l.pfa
 AbiSuite/fonts/a010015l.afm
@@ -80,33 +103,17 @@ AbiSuite/fonts/s050000l.afm
 AbiSuite/fonts/s050000l.pfa
 AbiSuite/fonts/z003034l.afm
 AbiSuite/fonts/z003034l.pfa
-AbiSuite/docs/AbiSource_DialogFramework.abw
-AbiSuite/docs/AbiSource_Localization.abw
-AbiSuite/docs/AbiSource_ProgrammerGuidelines.abw
-AbiSuite/docs/AbiWord_DocumentFormat.abw
-AbiSuite/docs/AbiWord_FileImport.abw
-AbiSuite/docs/AbiWord_LayoutDesign.abw
-AbiSuite/docs/AbiWord_SourceOverview.abw
-AbiSuite/docs/AbiWord_SpellCheck_Notes.abw
-AbiSuite/docs/AbiWord_list_notes.txt
-AbiSuite/docs/BUILD.TXT
-AbiSuite/docs/UnixAdmin.abw
-AbiSuite/docs/roadmap.html
-AbiSuite/docs/Bazaar.abw
-AbiSuite/docs/BillOfRights.abw
-AbiSuite/docs/Gettysburg.abw
-AbiSuite/docs/Interview.abw
-AbiSuite/docs/Latin1.abw
-AbiSuite/docs/Styles.abw
-AbiSuite/docs/Unicode1.abw
-AbiSuite/docs/Word97Test.doc
-AbiSuite/docs/abi_memo-new.abw
-AbiSuite/docs/abi_memo.abw
-AbiSuite/docs/data.abw
-AbiSuite/docs/footer.abw
-AbiSuite/docs/rtftest.rtf
-AbiSuite/docs/tabs.abw
-@dirrm AbiSuite/fonts
+AbiSuite/icons/abiword_48.png
+AbiSuite/icons/abiword_48.tif
+AbiSuite/icons/abiword_48.xpm
+@dirrm AbiSuite/AbiWord/help/en-US
+@dirrm AbiSuite/AbiWord/help
+@dirrm AbiSuite/AbiWord/sample/en-US
+@dirrm AbiSuite/AbiWord/sample
+@dirrm AbiSuite/AbiWord/strings
+@dirrm AbiSuite/AbiWord
 @dirrm AbiSuite/bin
-@dirrm AbiSuite/docs
+@dirrm AbiSuite/dictionary
+@dirrm AbiSuite/fonts
+@dirrm AbiSuite/icons
 @dirrm AbiSuite