Fix compilation errors.

PR:		11612
Submitted by:	cpiazza@home.net

20 files changed, 180 insertions, 624 deletions

diff --git a/editors/AbiWord/Makefile b/editors/AbiWord/Makefile
index 1977f4322d64..95c88e1b823e 100644
--- a/editors/AbiWord/Makefile
+++ b/editors/AbiWord/Makefile
@@ -3,7 +3,7 @@
 # Date created:         3 Mar 1999
 # Whom:                 Donald Burr <dburr@FreeBSD.ORG>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1999/05/04 12:26:01 dburr Exp $
 #
 
 DISTNAME=	abi-0.5.5-src
@@ -22,12 +22,9 @@ RUN_DEPENDS=	ispell:${PORTSDIR}/textproc/ispell
 
 DIST_SUBDIR=	AbiWord
 
-WWW_SITE=	http://www.abisource.com/
-
 WRKSRC=		${WRKDIR}/abi-0.5.5/src
 USE_XLIB=	YES
 USE_GMAKE=	YES
-PATCH_STRIP=	-p1
 
 # the build is placed in a directory name of the form
 # FreeBSD_3.1-RELEASE_i386_OBJ.  This variable makes it
@@ -35,16 +32,30 @@ PATCH_STRIP=	-p1
 # do-install target.
 OSDISTDIR=	`uname -s`_`uname -r`_`uname -m`_OBJ
 
+.include <bsd.port.pre.mk>
+
 post-patch:
-	cd ${WRKDIR} && ln -sf abi-0.5.5 abi
+	@ cd ${WRKDIR} && ln -sf abi-0.5.5 abi
+.if ${OSVERSION} > 310000
+	@${CP} 	${WRKSRC}/config/platforms/freebsd.mk \
+		${WRKSRC}/config/platforms/freebsd.mk.version
+	@${SED} -e s,3.1-RELEASE,`uname -r`,g \
+		${WRKSRC}/config/platforms/freebsd.mk.version > \
+		${WRKSRC}/config/platforms/freebsd.mk
+.endif
 
 do-install:
 	${MKDIR} ${PREFIX}/AbiSuite/bin
 	${MKDIR} ${PREFIX}/AbiSuite/lib
 	( cd ${WRKDIR}/abi-0.5.5/dist/${OSDISTDIR}/bin ; for BIN in *; do ${INSTALL_PROGRAM} $${BIN} ${PREFIX}/AbiSuite/bin ; done )
 	( cd ${WRKDIR}/abi-0.5.5/dist/${OSDISTDIR}/lib ; for LIB in *; do ${INSTALL_DATA} $${LIB} ${PREFIX}/AbiSuite/lib ; done )
+	@${CP}	${WRKDIR}/unixfonts-0.5.4/install.sh \
+		${WRKDIR}/unixfonts-0.5.4/install.sh.orig
+	@${SED} s,/usr/local,${PREFIX}, \
+		${WRKDIR}/unixfonts-0.5.4/install.sh.orig > \
+		${WRKDIR}/unixfonts-0.5.4/install.sh
 	( cd ${WRKDIR}/unixfonts-0.5.4 ; yes "" | bash ./install.sh )
 	for BIN in ${PREFIX}/AbiSuite/bin/* ; do ln -sf $${BIN} ${PREFIX}/bin ; done
-	@${CAT} ${PKGDIR}/MESSAGE
+	@${CAT} ${PKGDIR}/MESSAGE | ${SED} s,/usr/local,${PREFIX},
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/editors/AbiWord/files/patch-aa b/editors/AbiWord/files/patch-aa
index 36d19072ba9a..ce0149fac22c 100644
--- a/editors/AbiWord/files/patch-aa
+++ b/editors/AbiWord/files/patch-aa
@@ -1,6 +1,5 @@
-diff -ruN src.old/af/gr/unix/Makefile src/af/gr/unix/Makefile
---- src.old/af/gr/unix/Makefile	Fri Apr  9 08:47:46 1999
-+++ src/af/gr/unix/Makefile	Tue May  4 03:59:30 1999
+--- af/gr/unix/Makefile.orig	Fri Apr  9 08:47:46 1999
++++ af/gr/unix/Makefile	Sun May  9 10:40:19 1999
 @@ -25,7 +25,7 @@
  CPPSRCS=		gr_UnixGraphics.cpp	\
  			gr_UnixImage.cpp
@@ -10,148 +9,3 @@ diff -ruN src.old/af/gr/unix/Makefile src/af/gr/unix/Makefile
  
  TARGETS=		$(OBJS)
  
-diff -ruN src.old/af/util/xp/Makefile src/af/util/xp/Makefile
---- src.old/af/util/xp/Makefile	Fri Apr  9 08:47:55 1999
-+++ src/af/util/xp/Makefile	Tue May  4 03:59:30 1999
-@@ -44,7 +44,8 @@
- 
- TARGETS=		$(OBJS)
- INCLUDES=		-I$(ABI_DEPTH)/../../libpng	\
--			-I$(ABI_DEPTH)/../../zlib
-+			-I$(ABI_DEPTH)/../../zlib \
-+			-I/usr/local/include
- 
- include $(ABI_DEPTH)/config/abi_rules.mk
- 
-diff -ruN src.old/af/util/xp/ut_png.cpp src/af/util/xp/ut_png.cpp
---- src.old/af/util/xp/ut_png.cpp	Fri Feb 19 09:20:25 1999
-+++ src/af/util/xp/ut_png.cpp	Tue May  4 03:59:30 1999
-@@ -17,7 +17,7 @@
-  * 02111-1307, USA.
-  */
- 
--#include "png.h"
-+#include <png.h>
- 
- #include "ut_assert.h"
- #include "ut_bytebuf.h"
-diff -ruN src.old/af/xap/unix/Makefile src/af/xap/unix/Makefile
---- src.old/af/xap/unix/Makefile	Tue Apr 20 19:50:40 1999
-+++ src/af/xap/unix/Makefile	Tue May  4 03:59:30 1999
-@@ -42,7 +42,7 @@
- 			xap_UnixPSGraphics.cpp
- 
- TARGETS=		$(OBJS)
--INCLUDES=		-I/usr/X11R6/include
-+INCLUDES=		-I/usr/local/include -I/usr/X11R6/include
- 
- include $(ABI_DEPTH)/config/abi_rules.mk
- 
-diff -ruN src.old/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.cpp src/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.cpp
---- src.old/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.cpp	Thu Apr 22 12:11:15 1999
-+++ src/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.cpp	Tue May  4 03:59:30 1999
-@@ -22,6 +22,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <strings.h>
-+#include <sys/types.h>
- #include <sys/stat.h>
- #include <unistd.h>
- #include "ut_string.h"
-diff -ruN src.old/af/xap/unix/xap_UnixFont.cpp src/af/xap/unix/xap_UnixFont.cpp
---- src.old/af/xap/unix/xap_UnixFont.cpp	Tue Apr 20 07:35:11 1999
-+++ src/af/xap/unix/xap_UnixFont.cpp	Tue May  4 03:59:30 1999
-@@ -21,6 +21,7 @@
- #include <stdarg.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <sys/types.h>
- #include <sys/stat.h>
- 
- #include "ut_string.h"
-diff -ruN src.old/config/abi_defs.mk src/config/abi_defs.mk
---- src.old/config/abi_defs.mk	Thu Apr 29 10:46:27 1999
-+++ src/config/abi_defs.mk	Tue May  4 03:59:30 1999
-@@ -230,8 +230,8 @@
- ## We should change this when get non-gtk versions on unix....
- 
- ifeq ($(ABI_NATIVE),unix)
--CFLAGS 		+=	`gtk-config --cflags`
--EXTRA_LIBS	+=	`gtk-config --libs`
-+CFLAGS 		+=	`gtk12-config --cflags`
-+EXTRA_LIBS	+=	`gtk12-config --libs`
- endif
- 
- ##################################################################
-diff -ruN src.old/config/require/unix/Makefile src/config/require/unix/Makefile
---- src.old/config/require/unix/Makefile	Fri Apr  9 09:20:30 1999
-+++ src/config/require/unix/Makefile	Tue May  4 03:59:30 1999
-@@ -48,12 +48,12 @@
- REQ_GTK_BUILD=13
- 
- _GLIB_:
--	@glib-config --version >/dev/null 2>&1 			\
-+	@glib12-config --version >/dev/null 2>&1 			\
- 	|| (echo glib not found; exit 1)
- 	@echo TODO verify 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)
- 	@echo TODO verify version is greater than 1.1.??
- 
-diff -ruN src.old/hello/main/unix/Makefile src/hello/main/unix/Makefile
---- src.old/hello/main/unix/Makefile	Fri Apr  9 09:43:52 1999
-+++ src/hello/main/unix/Makefile	Tue May  4 03:59:30 1999
-@@ -24,7 +24,7 @@
- 
- CPPSRCS=		UnixMain.cpp
- 
--INCLUDES=		`gtk-config --cflags`
-+INCLUDES=		`gtk12-config --cflags`
- 
- PROGRAM=		AbiHello
- 
-diff -ruN src.old/wp/ap/unix/ap_UnixApp.cpp src/wp/ap/unix/ap_UnixApp.cpp
---- src.old/wp/ap/unix/ap_UnixApp.cpp	Mon Apr 26 13:39:41 1999
-+++ src/wp/ap/unix/ap_UnixApp.cpp	Tue May  4 03:59:30 1999
-@@ -28,6 +28,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <sys/types.h>
- #include <sys/stat.h>
- 
- #include "ut_debugmsg.h"
-diff -ruN src.old/wp/ap/xp/ap_Prefs_SchemeIds.h src/wp/ap/xp/ap_Prefs_SchemeIds.h
---- src.old/wp/ap/xp/ap_Prefs_SchemeIds.h	Sun Apr 18 22:29:36 1999
-+++ src/wp/ap/xp/ap_Prefs_SchemeIds.h	Tue May  4 04:03:32 1999
-@@ -50,13 +50,13 @@
- #define AP_PREF_KEY_StringSet						"StringSet"
- #define AP_PREF_DEFAULT_StringSet					"EnUS"						/* name of dialog/msgbox strings */
- #define AP_PREF_KEY_BeOSISpellDirectory				"BeOSISpellDirectory"
--#define AP_PREF_DEFAULT_BeOSISpellDirectory			"/usr/lib/ispell" 			/* where we find hash files */ /* TODO DECIDE WHERE THIS SHOULD BE */
-+#define AP_PREF_DEFAULT_BeOSISpellDirectory			"/usr/local/lib" 			/* where we find hash files */ /* TODO DECIDE WHERE THIS SHOULD BE */
- 
- #define AP_PREF_KEY_BeOSStringSetDirectory			"BeOSStringSetDirectory"
- #define AP_PREF_DEFAULT_BeOSStringSetDirectory		"/boot/home/config/settings/AbiSuite/AbiWord/lib"	/* where we find StringSets */ /* TODO DECIDE WHERE THIS SHOULD BE */
- 
- #define AP_PREF_KEY_UnixISpellDirectory				"UnixISpellDirectory"
--#define AP_PREF_DEFAULT_UnixISpellDirectory			"/usr/lib/ispell" 			/* where we find hash files */ /* TODO DECIDE WHERE THIS SHOULD BE */
-+#define AP_PREF_DEFAULT_UnixISpellDirectory			"/usr/local/lib" 			/* where we find hash files */ /* TODO DECIDE WHERE THIS SHOULD BE */
- 
- #define AP_PREF_KEY_UnixStringSetDirectory			"UnixStringSetDirectory"
- #define AP_PREF_DEFAULT_UnixStringSetDirectory		"/usr/local/AbiSuite/AbiWord/lib"	/* where we find StringSets */ /* TODO DECIDE WHERE THIS SHOULD BE */
-diff -ruN src.old/wp/main/unix/Makefile src/wp/main/unix/Makefile
---- src.old/wp/main/unix/Makefile	Fri Apr  9 09:13:48 1999
-+++ src/wp/main/unix/Makefile	Tue May  4 03:59:30 1999
-@@ -24,7 +24,7 @@
- 
- CPPSRCS=		UnixMain.cpp
- 
--INCLUDES=		`gtk-config --cflags`
-+INCLUDES=		`gtk12-config --cflags`
- 
- PROGRAM=		AbiWord
- 
diff --git a/editors/AbiWord/files/patch-af b/editors/AbiWord/files/patch-af
new file mode 100644
index 000000000000..dc6c520f1370
--- /dev/null
+++ b/editors/AbiWord/files/patch-af
@@ -0,0 +1,10 @@
+--- af/xap/unix/xap_UnixFont.cpp.orig	Tue Apr 20 07:35:11 1999
++++ af/xap/unix/xap_UnixFont.cpp	Sun May  9 10:40:19 1999
+@@ -21,6 +21,7 @@
+ #include <stdarg.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <sys/types.h>
+ #include <sys/stat.h>
+ 
+ #include "ut_string.h"
diff --git a/editors/AbiWord/files/patch-ag b/editors/AbiWord/files/patch-ag
new file mode 100644
index 000000000000..1681bef3593e
--- /dev/null
+++ b/editors/AbiWord/files/patch-ag
@@ -0,0 +1,13 @@
+--- config/abi_defs.mk.orig	Thu Apr 29 10:46:27 1999
++++ config/abi_defs.mk	Sun May  9 10:40:19 1999
+@@ -230,8 +230,8 @@
+ ## We should change this when get non-gtk versions on unix....
+ 
+ ifeq ($(ABI_NATIVE),unix)
+-CFLAGS 		+=	`gtk-config --cflags`
+-EXTRA_LIBS	+=	`gtk-config --libs`
++CFLAGS 		+=	`gtk12-config --cflags`
++EXTRA_LIBS	+=	`gtk12-config --libs`
+ endif
+ 
+ ##################################################################
diff --git a/editors/AbiWord/pkg-descr b/editors/AbiWord/pkg-descr
index fe3e55d2aed0..f80401c4da39 100644
--- a/editors/AbiWord/pkg-descr
+++ b/editors/AbiWord/pkg-descr
@@ -2,4 +2,5 @@ AbiWord is an open-source, cross-platform WYSIWYG word processor, based
 on the GTK tool kit.
 
 For more information, or to see screenshots, visit the AbiSource home page
-at http://www.abisource.com/.
+at
+WWW:  http://www.abisource.com/
diff --git a/editors/AbiWord2/Makefile b/editors/AbiWord2/Makefile
index 1977f4322d64..95c88e1b823e 100644
--- a/editors/AbiWord2/Makefile
+++ b/editors/AbiWord2/Makefile
@@ -3,7 +3,7 @@
 # Date created:         3 Mar 1999
 # Whom:                 Donald Burr <dburr@FreeBSD.ORG>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1999/05/04 12:26:01 dburr Exp $
 #
 
 DISTNAME=	abi-0.5.5-src
@@ -22,12 +22,9 @@ RUN_DEPENDS=	ispell:${PORTSDIR}/textproc/ispell
 
 DIST_SUBDIR=	AbiWord
 
-WWW_SITE=	http://www.abisource.com/
-
 WRKSRC=		${WRKDIR}/abi-0.5.5/src
 USE_XLIB=	YES
 USE_GMAKE=	YES
-PATCH_STRIP=	-p1
 
 # the build is placed in a directory name of the form
 # FreeBSD_3.1-RELEASE_i386_OBJ.  This variable makes it
@@ -35,16 +32,30 @@ PATCH_STRIP=	-p1
 # do-install target.
 OSDISTDIR=	`uname -s`_`uname -r`_`uname -m`_OBJ
 
+.include <bsd.port.pre.mk>
+
 post-patch:
-	cd ${WRKDIR} && ln -sf abi-0.5.5 abi
+	@ cd ${WRKDIR} && ln -sf abi-0.5.5 abi
+.if ${OSVERSION} > 310000
+	@${CP} 	${WRKSRC}/config/platforms/freebsd.mk \
+		${WRKSRC}/config/platforms/freebsd.mk.version
+	@${SED} -e s,3.1-RELEASE,`uname -r`,g \
+		${WRKSRC}/config/platforms/freebsd.mk.version > \
+		${WRKSRC}/config/platforms/freebsd.mk
+.endif
 
 do-install:
 	${MKDIR} ${PREFIX}/AbiSuite/bin
 	${MKDIR} ${PREFIX}/AbiSuite/lib
 	( cd ${WRKDIR}/abi-0.5.5/dist/${OSDISTDIR}/bin ; for BIN in *; do ${INSTALL_PROGRAM} $${BIN} ${PREFIX}/AbiSuite/bin ; done )
 	( cd ${WRKDIR}/abi-0.5.5/dist/${OSDISTDIR}/lib ; for LIB in *; do ${INSTALL_DATA} $${LIB} ${PREFIX}/AbiSuite/lib ; done )
+	@${CP}	${WRKDIR}/unixfonts-0.5.4/install.sh \
+		${WRKDIR}/unixfonts-0.5.4/install.sh.orig
+	@${SED} s,/usr/local,${PREFIX}, \
+		${WRKDIR}/unixfonts-0.5.4/install.sh.orig > \
+		${WRKDIR}/unixfonts-0.5.4/install.sh
 	( cd ${WRKDIR}/unixfonts-0.5.4 ; yes "" | bash ./install.sh )
 	for BIN in ${PREFIX}/AbiSuite/bin/* ; do ln -sf $${BIN} ${PREFIX}/bin ; done
-	@${CAT} ${PKGDIR}/MESSAGE
+	@${CAT} ${PKGDIR}/MESSAGE | ${SED} s,/usr/local,${PREFIX},
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/editors/AbiWord2/files/patch-aa b/editors/AbiWord2/files/patch-aa
index 36d19072ba9a..ce0149fac22c 100644
--- a/editors/AbiWord2/files/patch-aa
+++ b/editors/AbiWord2/files/patch-aa
@@ -1,6 +1,5 @@
-diff -ruN src.old/af/gr/unix/Makefile src/af/gr/unix/Makefile
---- src.old/af/gr/unix/Makefile	Fri Apr  9 08:47:46 1999
-+++ src/af/gr/unix/Makefile	Tue May  4 03:59:30 1999
+--- af/gr/unix/Makefile.orig	Fri Apr  9 08:47:46 1999
++++ af/gr/unix/Makefile	Sun May  9 10:40:19 1999
 @@ -25,7 +25,7 @@
  CPPSRCS=		gr_UnixGraphics.cpp	\
  			gr_UnixImage.cpp
@@ -10,148 +9,3 @@ diff -ruN src.old/af/gr/unix/Makefile src/af/gr/unix/Makefile
  
  TARGETS=		$(OBJS)
  
-diff -ruN src.old/af/util/xp/Makefile src/af/util/xp/Makefile
---- src.old/af/util/xp/Makefile	Fri Apr  9 08:47:55 1999
-+++ src/af/util/xp/Makefile	Tue May  4 03:59:30 1999
-@@ -44,7 +44,8 @@
- 
- TARGETS=		$(OBJS)
- INCLUDES=		-I$(ABI_DEPTH)/../../libpng	\
--			-I$(ABI_DEPTH)/../../zlib
-+			-I$(ABI_DEPTH)/../../zlib \
-+			-I/usr/local/include
- 
- include $(ABI_DEPTH)/config/abi_rules.mk
- 
-diff -ruN src.old/af/util/xp/ut_png.cpp src/af/util/xp/ut_png.cpp
---- src.old/af/util/xp/ut_png.cpp	Fri Feb 19 09:20:25 1999
-+++ src/af/util/xp/ut_png.cpp	Tue May  4 03:59:30 1999
-@@ -17,7 +17,7 @@
-  * 02111-1307, USA.
-  */
- 
--#include "png.h"
-+#include <png.h>
- 
- #include "ut_assert.h"
- #include "ut_bytebuf.h"
-diff -ruN src.old/af/xap/unix/Makefile src/af/xap/unix/Makefile
---- src.old/af/xap/unix/Makefile	Tue Apr 20 19:50:40 1999
-+++ src/af/xap/unix/Makefile	Tue May  4 03:59:30 1999
-@@ -42,7 +42,7 @@
- 			xap_UnixPSGraphics.cpp
- 
- TARGETS=		$(OBJS)
--INCLUDES=		-I/usr/X11R6/include
-+INCLUDES=		-I/usr/local/include -I/usr/X11R6/include
- 
- include $(ABI_DEPTH)/config/abi_rules.mk
- 
-diff -ruN src.old/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.cpp src/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.cpp
---- src.old/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.cpp	Thu Apr 22 12:11:15 1999
-+++ src/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.cpp	Tue May  4 03:59:30 1999
-@@ -22,6 +22,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <strings.h>
-+#include <sys/types.h>
- #include <sys/stat.h>
- #include <unistd.h>
- #include "ut_string.h"
-diff -ruN src.old/af/xap/unix/xap_UnixFont.cpp src/af/xap/unix/xap_UnixFont.cpp
---- src.old/af/xap/unix/xap_UnixFont.cpp	Tue Apr 20 07:35:11 1999
-+++ src/af/xap/unix/xap_UnixFont.cpp	Tue May  4 03:59:30 1999
-@@ -21,6 +21,7 @@
- #include <stdarg.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <sys/types.h>
- #include <sys/stat.h>
- 
- #include "ut_string.h"
-diff -ruN src.old/config/abi_defs.mk src/config/abi_defs.mk
---- src.old/config/abi_defs.mk	Thu Apr 29 10:46:27 1999
-+++ src/config/abi_defs.mk	Tue May  4 03:59:30 1999
-@@ -230,8 +230,8 @@
- ## We should change this when get non-gtk versions on unix....
- 
- ifeq ($(ABI_NATIVE),unix)
--CFLAGS 		+=	`gtk-config --cflags`
--EXTRA_LIBS	+=	`gtk-config --libs`
-+CFLAGS 		+=	`gtk12-config --cflags`
-+EXTRA_LIBS	+=	`gtk12-config --libs`
- endif
- 
- ##################################################################
-diff -ruN src.old/config/require/unix/Makefile src/config/require/unix/Makefile
---- src.old/config/require/unix/Makefile	Fri Apr  9 09:20:30 1999
-+++ src/config/require/unix/Makefile	Tue May  4 03:59:30 1999
-@@ -48,12 +48,12 @@
- REQ_GTK_BUILD=13
- 
- _GLIB_:
--	@glib-config --version >/dev/null 2>&1 			\
-+	@glib12-config --version >/dev/null 2>&1 			\
- 	|| (echo glib not found; exit 1)
- 	@echo TODO verify 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)
- 	@echo TODO verify version is greater than 1.1.??
- 
-diff -ruN src.old/hello/main/unix/Makefile src/hello/main/unix/Makefile
---- src.old/hello/main/unix/Makefile	Fri Apr  9 09:43:52 1999
-+++ src/hello/main/unix/Makefile	Tue May  4 03:59:30 1999
-@@ -24,7 +24,7 @@
- 
- CPPSRCS=		UnixMain.cpp
- 
--INCLUDES=		`gtk-config --cflags`
-+INCLUDES=		`gtk12-config --cflags`
- 
- PROGRAM=		AbiHello
- 
-diff -ruN src.old/wp/ap/unix/ap_UnixApp.cpp src/wp/ap/unix/ap_UnixApp.cpp
---- src.old/wp/ap/unix/ap_UnixApp.cpp	Mon Apr 26 13:39:41 1999
-+++ src/wp/ap/unix/ap_UnixApp.cpp	Tue May  4 03:59:30 1999
-@@ -28,6 +28,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <sys/types.h>
- #include <sys/stat.h>
- 
- #include "ut_debugmsg.h"
-diff -ruN src.old/wp/ap/xp/ap_Prefs_SchemeIds.h src/wp/ap/xp/ap_Prefs_SchemeIds.h
---- src.old/wp/ap/xp/ap_Prefs_SchemeIds.h	Sun Apr 18 22:29:36 1999
-+++ src/wp/ap/xp/ap_Prefs_SchemeIds.h	Tue May  4 04:03:32 1999
-@@ -50,13 +50,13 @@
- #define AP_PREF_KEY_StringSet						"StringSet"
- #define AP_PREF_DEFAULT_StringSet					"EnUS"						/* name of dialog/msgbox strings */
- #define AP_PREF_KEY_BeOSISpellDirectory				"BeOSISpellDirectory"
--#define AP_PREF_DEFAULT_BeOSISpellDirectory			"/usr/lib/ispell" 			/* where we find hash files */ /* TODO DECIDE WHERE THIS SHOULD BE */
-+#define AP_PREF_DEFAULT_BeOSISpellDirectory			"/usr/local/lib" 			/* where we find hash files */ /* TODO DECIDE WHERE THIS SHOULD BE */
- 
- #define AP_PREF_KEY_BeOSStringSetDirectory			"BeOSStringSetDirectory"
- #define AP_PREF_DEFAULT_BeOSStringSetDirectory		"/boot/home/config/settings/AbiSuite/AbiWord/lib"	/* where we find StringSets */ /* TODO DECIDE WHERE THIS SHOULD BE */
- 
- #define AP_PREF_KEY_UnixISpellDirectory				"UnixISpellDirectory"
--#define AP_PREF_DEFAULT_UnixISpellDirectory			"/usr/lib/ispell" 			/* where we find hash files */ /* TODO DECIDE WHERE THIS SHOULD BE */
-+#define AP_PREF_DEFAULT_UnixISpellDirectory			"/usr/local/lib" 			/* where we find hash files */ /* TODO DECIDE WHERE THIS SHOULD BE */
- 
- #define AP_PREF_KEY_UnixStringSetDirectory			"UnixStringSetDirectory"
- #define AP_PREF_DEFAULT_UnixStringSetDirectory		"/usr/local/AbiSuite/AbiWord/lib"	/* where we find StringSets */ /* TODO DECIDE WHERE THIS SHOULD BE */
-diff -ruN src.old/wp/main/unix/Makefile src/wp/main/unix/Makefile
---- src.old/wp/main/unix/Makefile	Fri Apr  9 09:13:48 1999
-+++ src/wp/main/unix/Makefile	Tue May  4 03:59:30 1999
-@@ -24,7 +24,7 @@
- 
- CPPSRCS=		UnixMain.cpp
- 
--INCLUDES=		`gtk-config --cflags`
-+INCLUDES=		`gtk12-config --cflags`
- 
- PROGRAM=		AbiWord
- 
diff --git a/editors/AbiWord2/files/patch-af b/editors/AbiWord2/files/patch-af
new file mode 100644
index 000000000000..dc6c520f1370
--- /dev/null
+++ b/editors/AbiWord2/files/patch-af
@@ -0,0 +1,10 @@
+--- af/xap/unix/xap_UnixFont.cpp.orig	Tue Apr 20 07:35:11 1999
++++ af/xap/unix/xap_UnixFont.cpp	Sun May  9 10:40:19 1999
+@@ -21,6 +21,7 @@
+ #include <stdarg.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <sys/types.h>
+ #include <sys/stat.h>
+ 
+ #include "ut_string.h"
diff --git a/editors/AbiWord2/files/patch-ag b/editors/AbiWord2/files/patch-ag
new file mode 100644
index 000000000000..1681bef3593e
--- /dev/null
+++ b/editors/AbiWord2/files/patch-ag
@@ -0,0 +1,13 @@
+--- config/abi_defs.mk.orig	Thu Apr 29 10:46:27 1999
++++ config/abi_defs.mk	Sun May  9 10:40:19 1999
+@@ -230,8 +230,8 @@
+ ## We should change this when get non-gtk versions on unix....
+ 
+ ifeq ($(ABI_NATIVE),unix)
+-CFLAGS 		+=	`gtk-config --cflags`
+-EXTRA_LIBS	+=	`gtk-config --libs`
++CFLAGS 		+=	`gtk12-config --cflags`
++EXTRA_LIBS	+=	`gtk12-config --libs`
+ endif
+ 
+ ##################################################################
diff --git a/editors/AbiWord2/pkg-descr b/editors/AbiWord2/pkg-descr
index fe3e55d2aed0..f80401c4da39 100644
--- a/editors/AbiWord2/pkg-descr
+++ b/editors/AbiWord2/pkg-descr
@@ -2,4 +2,5 @@ AbiWord is an open-source, cross-platform WYSIWYG word processor, based
 on the GTK tool kit.
 
 For more information, or to see screenshots, visit the AbiSource home page
-at http://www.abisource.com/.
+at
+WWW:  http://www.abisource.com/
diff --git a/editors/abiword-devel/Makefile b/editors/abiword-devel/Makefile
index 1977f4322d64..95c88e1b823e 100644
--- a/editors/abiword-devel/Makefile
+++ b/editors/abiword-devel/Makefile
@@ -3,7 +3,7 @@
 # Date created:         3 Mar 1999
 # Whom:                 Donald Burr <dburr@FreeBSD.ORG>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1999/05/04 12:26:01 dburr Exp $
 #
 
 DISTNAME=	abi-0.5.5-src
@@ -22,12 +22,9 @@ RUN_DEPENDS=	ispell:${PORTSDIR}/textproc/ispell
 
 DIST_SUBDIR=	AbiWord
 
-WWW_SITE=	http://www.abisource.com/
-
 WRKSRC=		${WRKDIR}/abi-0.5.5/src
 USE_XLIB=	YES
 USE_GMAKE=	YES
-PATCH_STRIP=	-p1
 
 # the build is placed in a directory name of the form
 # FreeBSD_3.1-RELEASE_i386_OBJ.  This variable makes it
@@ -35,16 +32,30 @@ PATCH_STRIP=	-p1
 # do-install target.
 OSDISTDIR=	`uname -s`_`uname -r`_`uname -m`_OBJ
 
+.include <bsd.port.pre.mk>
+
 post-patch:
-	cd ${WRKDIR} && ln -sf abi-0.5.5 abi
+	@ cd ${WRKDIR} && ln -sf abi-0.5.5 abi
+.if ${OSVERSION} > 310000
+	@${CP} 	${WRKSRC}/config/platforms/freebsd.mk \
+		${WRKSRC}/config/platforms/freebsd.mk.version
+	@${SED} -e s,3.1-RELEASE,`uname -r`,g \
+		${WRKSRC}/config/platforms/freebsd.mk.version > \
+		${WRKSRC}/config/platforms/freebsd.mk
+.endif
 
 do-install:
 	${MKDIR} ${PREFIX}/AbiSuite/bin
 	${MKDIR} ${PREFIX}/AbiSuite/lib
 	( cd ${WRKDIR}/abi-0.5.5/dist/${OSDISTDIR}/bin ; for BIN in *; do ${INSTALL_PROGRAM} $${BIN} ${PREFIX}/AbiSuite/bin ; done )
 	( cd ${WRKDIR}/abi-0.5.5/dist/${OSDISTDIR}/lib ; for LIB in *; do ${INSTALL_DATA} $${LIB} ${PREFIX}/AbiSuite/lib ; done )
+	@${CP}	${WRKDIR}/unixfonts-0.5.4/install.sh \
+		${WRKDIR}/unixfonts-0.5.4/install.sh.orig
+	@${SED} s,/usr/local,${PREFIX}, \
+		${WRKDIR}/unixfonts-0.5.4/install.sh.orig > \
+		${WRKDIR}/unixfonts-0.5.4/install.sh
 	( cd ${WRKDIR}/unixfonts-0.5.4 ; yes "" | bash ./install.sh )
 	for BIN in ${PREFIX}/AbiSuite/bin/* ; do ln -sf $${BIN} ${PREFIX}/bin ; done
-	@${CAT} ${PKGDIR}/MESSAGE
+	@${CAT} ${PKGDIR}/MESSAGE | ${SED} s,/usr/local,${PREFIX},
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/editors/abiword-devel/files/patch-aa b/editors/abiword-devel/files/patch-aa
index 36d19072ba9a..ce0149fac22c 100644
--- a/editors/abiword-devel/files/patch-aa
+++ b/editors/abiword-devel/files/patch-aa
@@ -1,6 +1,5 @@
-diff -ruN src.old/af/gr/unix/Makefile src/af/gr/unix/Makefile
---- src.old/af/gr/unix/Makefile	Fri Apr  9 08:47:46 1999
-+++ src/af/gr/unix/Makefile	Tue May  4 03:59:30 1999
+--- af/gr/unix/Makefile.orig	Fri Apr  9 08:47:46 1999
++++ af/gr/unix/Makefile	Sun May  9 10:40:19 1999
 @@ -25,7 +25,7 @@
  CPPSRCS=		gr_UnixGraphics.cpp	\
  			gr_UnixImage.cpp
@@ -10,148 +9,3 @@ diff -ruN src.old/af/gr/unix/Makefile src/af/gr/unix/Makefile
  
  TARGETS=		$(OBJS)
  
-diff -ruN src.old/af/util/xp/Makefile src/af/util/xp/Makefile
---- src.old/af/util/xp/Makefile	Fri Apr  9 08:47:55 1999
-+++ src/af/util/xp/Makefile	Tue May  4 03:59:30 1999
-@@ -44,7 +44,8 @@
- 
- TARGETS=		$(OBJS)
- INCLUDES=		-I$(ABI_DEPTH)/../../libpng	\
--			-I$(ABI_DEPTH)/../../zlib
-+			-I$(ABI_DEPTH)/../../zlib \
-+			-I/usr/local/include
- 
- include $(ABI_DEPTH)/config/abi_rules.mk
- 
-diff -ruN src.old/af/util/xp/ut_png.cpp src/af/util/xp/ut_png.cpp
---- src.old/af/util/xp/ut_png.cpp	Fri Feb 19 09:20:25 1999
-+++ src/af/util/xp/ut_png.cpp	Tue May  4 03:59:30 1999
-@@ -17,7 +17,7 @@
-  * 02111-1307, USA.
-  */
- 
--#include "png.h"
-+#include <png.h>
- 
- #include "ut_assert.h"
- #include "ut_bytebuf.h"
-diff -ruN src.old/af/xap/unix/Makefile src/af/xap/unix/Makefile
---- src.old/af/xap/unix/Makefile	Tue Apr 20 19:50:40 1999
-+++ src/af/xap/unix/Makefile	Tue May  4 03:59:30 1999
-@@ -42,7 +42,7 @@
- 			xap_UnixPSGraphics.cpp
- 
- TARGETS=		$(OBJS)
--INCLUDES=		-I/usr/X11R6/include
-+INCLUDES=		-I/usr/local/include -I/usr/X11R6/include
- 
- include $(ABI_DEPTH)/config/abi_rules.mk
- 
-diff -ruN src.old/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.cpp src/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.cpp
---- src.old/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.cpp	Thu Apr 22 12:11:15 1999
-+++ src/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.cpp	Tue May  4 03:59:30 1999
-@@ -22,6 +22,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <strings.h>
-+#include <sys/types.h>
- #include <sys/stat.h>
- #include <unistd.h>
- #include "ut_string.h"
-diff -ruN src.old/af/xap/unix/xap_UnixFont.cpp src/af/xap/unix/xap_UnixFont.cpp
---- src.old/af/xap/unix/xap_UnixFont.cpp	Tue Apr 20 07:35:11 1999
-+++ src/af/xap/unix/xap_UnixFont.cpp	Tue May  4 03:59:30 1999
-@@ -21,6 +21,7 @@
- #include <stdarg.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <sys/types.h>
- #include <sys/stat.h>
- 
- #include "ut_string.h"
-diff -ruN src.old/config/abi_defs.mk src/config/abi_defs.mk
---- src.old/config/abi_defs.mk	Thu Apr 29 10:46:27 1999
-+++ src/config/abi_defs.mk	Tue May  4 03:59:30 1999
-@@ -230,8 +230,8 @@
- ## We should change this when get non-gtk versions on unix....
- 
- ifeq ($(ABI_NATIVE),unix)
--CFLAGS 		+=	`gtk-config --cflags`
--EXTRA_LIBS	+=	`gtk-config --libs`
-+CFLAGS 		+=	`gtk12-config --cflags`
-+EXTRA_LIBS	+=	`gtk12-config --libs`
- endif
- 
- ##################################################################
-diff -ruN src.old/config/require/unix/Makefile src/config/require/unix/Makefile
---- src.old/config/require/unix/Makefile	Fri Apr  9 09:20:30 1999
-+++ src/config/require/unix/Makefile	Tue May  4 03:59:30 1999
-@@ -48,12 +48,12 @@
- REQ_GTK_BUILD=13
- 
- _GLIB_:
--	@glib-config --version >/dev/null 2>&1 			\
-+	@glib12-config --version >/dev/null 2>&1 			\
- 	|| (echo glib not found; exit 1)
- 	@echo TODO verify 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)
- 	@echo TODO verify version is greater than 1.1.??
- 
-diff -ruN src.old/hello/main/unix/Makefile src/hello/main/unix/Makefile
---- src.old/hello/main/unix/Makefile	Fri Apr  9 09:43:52 1999
-+++ src/hello/main/unix/Makefile	Tue May  4 03:59:30 1999
-@@ -24,7 +24,7 @@
- 
- CPPSRCS=		UnixMain.cpp
- 
--INCLUDES=		`gtk-config --cflags`
-+INCLUDES=		`gtk12-config --cflags`
- 
- PROGRAM=		AbiHello
- 
-diff -ruN src.old/wp/ap/unix/ap_UnixApp.cpp src/wp/ap/unix/ap_UnixApp.cpp
---- src.old/wp/ap/unix/ap_UnixApp.cpp	Mon Apr 26 13:39:41 1999
-+++ src/wp/ap/unix/ap_UnixApp.cpp	Tue May  4 03:59:30 1999
-@@ -28,6 +28,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <sys/types.h>
- #include <sys/stat.h>
- 
- #include "ut_debugmsg.h"
-diff -ruN src.old/wp/ap/xp/ap_Prefs_SchemeIds.h src/wp/ap/xp/ap_Prefs_SchemeIds.h
---- src.old/wp/ap/xp/ap_Prefs_SchemeIds.h	Sun Apr 18 22:29:36 1999
-+++ src/wp/ap/xp/ap_Prefs_SchemeIds.h	Tue May  4 04:03:32 1999
-@@ -50,13 +50,13 @@
- #define AP_PREF_KEY_StringSet						"StringSet"
- #define AP_PREF_DEFAULT_StringSet					"EnUS"						/* name of dialog/msgbox strings */
- #define AP_PREF_KEY_BeOSISpellDirectory				"BeOSISpellDirectory"
--#define AP_PREF_DEFAULT_BeOSISpellDirectory			"/usr/lib/ispell" 			/* where we find hash files */ /* TODO DECIDE WHERE THIS SHOULD BE */
-+#define AP_PREF_DEFAULT_BeOSISpellDirectory			"/usr/local/lib" 			/* where we find hash files */ /* TODO DECIDE WHERE THIS SHOULD BE */
- 
- #define AP_PREF_KEY_BeOSStringSetDirectory			"BeOSStringSetDirectory"
- #define AP_PREF_DEFAULT_BeOSStringSetDirectory		"/boot/home/config/settings/AbiSuite/AbiWord/lib"	/* where we find StringSets */ /* TODO DECIDE WHERE THIS SHOULD BE */
- 
- #define AP_PREF_KEY_UnixISpellDirectory				"UnixISpellDirectory"
--#define AP_PREF_DEFAULT_UnixISpellDirectory			"/usr/lib/ispell" 			/* where we find hash files */ /* TODO DECIDE WHERE THIS SHOULD BE */
-+#define AP_PREF_DEFAULT_UnixISpellDirectory			"/usr/local/lib" 			/* where we find hash files */ /* TODO DECIDE WHERE THIS SHOULD BE */
- 
- #define AP_PREF_KEY_UnixStringSetDirectory			"UnixStringSetDirectory"
- #define AP_PREF_DEFAULT_UnixStringSetDirectory		"/usr/local/AbiSuite/AbiWord/lib"	/* where we find StringSets */ /* TODO DECIDE WHERE THIS SHOULD BE */
-diff -ruN src.old/wp/main/unix/Makefile src/wp/main/unix/Makefile
---- src.old/wp/main/unix/Makefile	Fri Apr  9 09:13:48 1999
-+++ src/wp/main/unix/Makefile	Tue May  4 03:59:30 1999
-@@ -24,7 +24,7 @@
- 
- CPPSRCS=		UnixMain.cpp
- 
--INCLUDES=		`gtk-config --cflags`
-+INCLUDES=		`gtk12-config --cflags`
- 
- PROGRAM=		AbiWord
- 
diff --git a/editors/abiword-devel/files/patch-af b/editors/abiword-devel/files/patch-af
new file mode 100644
index 000000000000..dc6c520f1370
--- /dev/null
+++ b/editors/abiword-devel/files/patch-af
@@ -0,0 +1,10 @@
+--- af/xap/unix/xap_UnixFont.cpp.orig	Tue Apr 20 07:35:11 1999
++++ af/xap/unix/xap_UnixFont.cpp	Sun May  9 10:40:19 1999
+@@ -21,6 +21,7 @@
+ #include <stdarg.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <sys/types.h>
+ #include <sys/stat.h>
+ 
+ #include "ut_string.h"
diff --git a/editors/abiword-devel/files/patch-ag b/editors/abiword-devel/files/patch-ag
new file mode 100644
index 000000000000..1681bef3593e
--- /dev/null
+++ b/editors/abiword-devel/files/patch-ag
@@ -0,0 +1,13 @@
+--- config/abi_defs.mk.orig	Thu Apr 29 10:46:27 1999
++++ config/abi_defs.mk	Sun May  9 10:40:19 1999
+@@ -230,8 +230,8 @@
+ ## We should change this when get non-gtk versions on unix....
+ 
+ ifeq ($(ABI_NATIVE),unix)
+-CFLAGS 		+=	`gtk-config --cflags`
+-EXTRA_LIBS	+=	`gtk-config --libs`
++CFLAGS 		+=	`gtk12-config --cflags`
++EXTRA_LIBS	+=	`gtk12-config --libs`
+ endif
+ 
+ ##################################################################
diff --git a/editors/abiword-devel/pkg-descr b/editors/abiword-devel/pkg-descr
index fe3e55d2aed0..f80401c4da39 100644
--- a/editors/abiword-devel/pkg-descr
+++ b/editors/abiword-devel/pkg-descr
@@ -2,4 +2,5 @@ AbiWord is an open-source, cross-platform WYSIWYG word processor, based
 on the GTK tool kit.
 
 For more information, or to see screenshots, visit the AbiSource home page
-at http://www.abisource.com/.
+at
+WWW:  http://www.abisource.com/
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index 1977f4322d64..95c88e1b823e 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -3,7 +3,7 @@
 # Date created:         3 Mar 1999
 # Whom:                 Donald Burr <dburr@FreeBSD.ORG>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1999/05/04 12:26:01 dburr Exp $
 #
 
 DISTNAME=	abi-0.5.5-src
@@ -22,12 +22,9 @@ RUN_DEPENDS=	ispell:${PORTSDIR}/textproc/ispell
 
 DIST_SUBDIR=	AbiWord
 
-WWW_SITE=	http://www.abisource.com/
-
 WRKSRC=		${WRKDIR}/abi-0.5.5/src
 USE_XLIB=	YES
 USE_GMAKE=	YES
-PATCH_STRIP=	-p1
 
 # the build is placed in a directory name of the form
 # FreeBSD_3.1-RELEASE_i386_OBJ.  This variable makes it
@@ -35,16 +32,30 @@ PATCH_STRIP=	-p1
 # do-install target.
 OSDISTDIR=	`uname -s`_`uname -r`_`uname -m`_OBJ
 
+.include <bsd.port.pre.mk>
+
 post-patch:
-	cd ${WRKDIR} && ln -sf abi-0.5.5 abi
+	@ cd ${WRKDIR} && ln -sf abi-0.5.5 abi
+.if ${OSVERSION} > 310000
+	@${CP} 	${WRKSRC}/config/platforms/freebsd.mk \
+		${WRKSRC}/config/platforms/freebsd.mk.version
+	@${SED} -e s,3.1-RELEASE,`uname -r`,g \
+		${WRKSRC}/config/platforms/freebsd.mk.version > \
+		${WRKSRC}/config/platforms/freebsd.mk
+.endif
 
 do-install:
 	${MKDIR} ${PREFIX}/AbiSuite/bin
 	${MKDIR} ${PREFIX}/AbiSuite/lib
 	( cd ${WRKDIR}/abi-0.5.5/dist/${OSDISTDIR}/bin ; for BIN in *; do ${INSTALL_PROGRAM} $${BIN} ${PREFIX}/AbiSuite/bin ; done )
 	( cd ${WRKDIR}/abi-0.5.5/dist/${OSDISTDIR}/lib ; for LIB in *; do ${INSTALL_DATA} $${LIB} ${PREFIX}/AbiSuite/lib ; done )
+	@${CP}	${WRKDIR}/unixfonts-0.5.4/install.sh \
+		${WRKDIR}/unixfonts-0.5.4/install.sh.orig
+	@${SED} s,/usr/local,${PREFIX}, \
+		${WRKDIR}/unixfonts-0.5.4/install.sh.orig > \
+		${WRKDIR}/unixfonts-0.5.4/install.sh
 	( cd ${WRKDIR}/unixfonts-0.5.4 ; yes "" | bash ./install.sh )
 	for BIN in ${PREFIX}/AbiSuite/bin/* ; do ln -sf $${BIN} ${PREFIX}/bin ; done
-	@${CAT} ${PKGDIR}/MESSAGE
+	@${CAT} ${PKGDIR}/MESSAGE | ${SED} s,/usr/local,${PREFIX},
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/editors/abiword/files/patch-aa b/editors/abiword/files/patch-aa
index 36d19072ba9a..ce0149fac22c 100644
--- a/editors/abiword/files/patch-aa
+++ b/editors/abiword/files/patch-aa
@@ -1,6 +1,5 @@
-diff -ruN src.old/af/gr/unix/Makefile src/af/gr/unix/Makefile
---- src.old/af/gr/unix/Makefile	Fri Apr  9 08:47:46 1999
-+++ src/af/gr/unix/Makefile	Tue May  4 03:59:30 1999
+--- af/gr/unix/Makefile.orig	Fri Apr  9 08:47:46 1999
++++ af/gr/unix/Makefile	Sun May  9 10:40:19 1999
 @@ -25,7 +25,7 @@
  CPPSRCS=		gr_UnixGraphics.cpp	\
  			gr_UnixImage.cpp
@@ -10,148 +9,3 @@ diff -ruN src.old/af/gr/unix/Makefile src/af/gr/unix/Makefile
  
  TARGETS=		$(OBJS)
  
-diff -ruN src.old/af/util/xp/Makefile src/af/util/xp/Makefile
---- src.old/af/util/xp/Makefile	Fri Apr  9 08:47:55 1999
-+++ src/af/util/xp/Makefile	Tue May  4 03:59:30 1999
-@@ -44,7 +44,8 @@
- 
- TARGETS=		$(OBJS)
- INCLUDES=		-I$(ABI_DEPTH)/../../libpng	\
--			-I$(ABI_DEPTH)/../../zlib
-+			-I$(ABI_DEPTH)/../../zlib \
-+			-I/usr/local/include
- 
- include $(ABI_DEPTH)/config/abi_rules.mk
- 
-diff -ruN src.old/af/util/xp/ut_png.cpp src/af/util/xp/ut_png.cpp
---- src.old/af/util/xp/ut_png.cpp	Fri Feb 19 09:20:25 1999
-+++ src/af/util/xp/ut_png.cpp	Tue May  4 03:59:30 1999
-@@ -17,7 +17,7 @@
-  * 02111-1307, USA.
-  */
- 
--#include "png.h"
-+#include <png.h>
- 
- #include "ut_assert.h"
- #include "ut_bytebuf.h"
-diff -ruN src.old/af/xap/unix/Makefile src/af/xap/unix/Makefile
---- src.old/af/xap/unix/Makefile	Tue Apr 20 19:50:40 1999
-+++ src/af/xap/unix/Makefile	Tue May  4 03:59:30 1999
-@@ -42,7 +42,7 @@
- 			xap_UnixPSGraphics.cpp
- 
- TARGETS=		$(OBJS)
--INCLUDES=		-I/usr/X11R6/include
-+INCLUDES=		-I/usr/local/include -I/usr/X11R6/include
- 
- include $(ABI_DEPTH)/config/abi_rules.mk
- 
-diff -ruN src.old/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.cpp src/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.cpp
---- src.old/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.cpp	Thu Apr 22 12:11:15 1999
-+++ src/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.cpp	Tue May  4 03:59:30 1999
-@@ -22,6 +22,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <strings.h>
-+#include <sys/types.h>
- #include <sys/stat.h>
- #include <unistd.h>
- #include "ut_string.h"
-diff -ruN src.old/af/xap/unix/xap_UnixFont.cpp src/af/xap/unix/xap_UnixFont.cpp
---- src.old/af/xap/unix/xap_UnixFont.cpp	Tue Apr 20 07:35:11 1999
-+++ src/af/xap/unix/xap_UnixFont.cpp	Tue May  4 03:59:30 1999
-@@ -21,6 +21,7 @@
- #include <stdarg.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <sys/types.h>
- #include <sys/stat.h>
- 
- #include "ut_string.h"
-diff -ruN src.old/config/abi_defs.mk src/config/abi_defs.mk
---- src.old/config/abi_defs.mk	Thu Apr 29 10:46:27 1999
-+++ src/config/abi_defs.mk	Tue May  4 03:59:30 1999
-@@ -230,8 +230,8 @@
- ## We should change this when get non-gtk versions on unix....
- 
- ifeq ($(ABI_NATIVE),unix)
--CFLAGS 		+=	`gtk-config --cflags`
--EXTRA_LIBS	+=	`gtk-config --libs`
-+CFLAGS 		+=	`gtk12-config --cflags`
-+EXTRA_LIBS	+=	`gtk12-config --libs`
- endif
- 
- ##################################################################
-diff -ruN src.old/config/require/unix/Makefile src/config/require/unix/Makefile
---- src.old/config/require/unix/Makefile	Fri Apr  9 09:20:30 1999
-+++ src/config/require/unix/Makefile	Tue May  4 03:59:30 1999
-@@ -48,12 +48,12 @@
- REQ_GTK_BUILD=13
- 
- _GLIB_:
--	@glib-config --version >/dev/null 2>&1 			\
-+	@glib12-config --version >/dev/null 2>&1 			\
- 	|| (echo glib not found; exit 1)
- 	@echo TODO verify 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)
- 	@echo TODO verify version is greater than 1.1.??
- 
-diff -ruN src.old/hello/main/unix/Makefile src/hello/main/unix/Makefile
---- src.old/hello/main/unix/Makefile	Fri Apr  9 09:43:52 1999
-+++ src/hello/main/unix/Makefile	Tue May  4 03:59:30 1999
-@@ -24,7 +24,7 @@
- 
- CPPSRCS=		UnixMain.cpp
- 
--INCLUDES=		`gtk-config --cflags`
-+INCLUDES=		`gtk12-config --cflags`
- 
- PROGRAM=		AbiHello
- 
-diff -ruN src.old/wp/ap/unix/ap_UnixApp.cpp src/wp/ap/unix/ap_UnixApp.cpp
---- src.old/wp/ap/unix/ap_UnixApp.cpp	Mon Apr 26 13:39:41 1999
-+++ src/wp/ap/unix/ap_UnixApp.cpp	Tue May  4 03:59:30 1999
-@@ -28,6 +28,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <sys/types.h>
- #include <sys/stat.h>
- 
- #include "ut_debugmsg.h"
-diff -ruN src.old/wp/ap/xp/ap_Prefs_SchemeIds.h src/wp/ap/xp/ap_Prefs_SchemeIds.h
---- src.old/wp/ap/xp/ap_Prefs_SchemeIds.h	Sun Apr 18 22:29:36 1999
-+++ src/wp/ap/xp/ap_Prefs_SchemeIds.h	Tue May  4 04:03:32 1999
-@@ -50,13 +50,13 @@
- #define AP_PREF_KEY_StringSet						"StringSet"
- #define AP_PREF_DEFAULT_StringSet					"EnUS"						/* name of dialog/msgbox strings */
- #define AP_PREF_KEY_BeOSISpellDirectory				"BeOSISpellDirectory"
--#define AP_PREF_DEFAULT_BeOSISpellDirectory			"/usr/lib/ispell" 			/* where we find hash files */ /* TODO DECIDE WHERE THIS SHOULD BE */
-+#define AP_PREF_DEFAULT_BeOSISpellDirectory			"/usr/local/lib" 			/* where we find hash files */ /* TODO DECIDE WHERE THIS SHOULD BE */
- 
- #define AP_PREF_KEY_BeOSStringSetDirectory			"BeOSStringSetDirectory"
- #define AP_PREF_DEFAULT_BeOSStringSetDirectory		"/boot/home/config/settings/AbiSuite/AbiWord/lib"	/* where we find StringSets */ /* TODO DECIDE WHERE THIS SHOULD BE */
- 
- #define AP_PREF_KEY_UnixISpellDirectory				"UnixISpellDirectory"
--#define AP_PREF_DEFAULT_UnixISpellDirectory			"/usr/lib/ispell" 			/* where we find hash files */ /* TODO DECIDE WHERE THIS SHOULD BE */
-+#define AP_PREF_DEFAULT_UnixISpellDirectory			"/usr/local/lib" 			/* where we find hash files */ /* TODO DECIDE WHERE THIS SHOULD BE */
- 
- #define AP_PREF_KEY_UnixStringSetDirectory			"UnixStringSetDirectory"
- #define AP_PREF_DEFAULT_UnixStringSetDirectory		"/usr/local/AbiSuite/AbiWord/lib"	/* where we find StringSets */ /* TODO DECIDE WHERE THIS SHOULD BE */
-diff -ruN src.old/wp/main/unix/Makefile src/wp/main/unix/Makefile
---- src.old/wp/main/unix/Makefile	Fri Apr  9 09:13:48 1999
-+++ src/wp/main/unix/Makefile	Tue May  4 03:59:30 1999
-@@ -24,7 +24,7 @@
- 
- CPPSRCS=		UnixMain.cpp
- 
--INCLUDES=		`gtk-config --cflags`
-+INCLUDES=		`gtk12-config --cflags`
- 
- PROGRAM=		AbiWord
- 
diff --git a/editors/abiword/files/patch-af b/editors/abiword/files/patch-af
new file mode 100644
index 000000000000..dc6c520f1370
--- /dev/null
+++ b/editors/abiword/files/patch-af
@@ -0,0 +1,10 @@
+--- af/xap/unix/xap_UnixFont.cpp.orig	Tue Apr 20 07:35:11 1999
++++ af/xap/unix/xap_UnixFont.cpp	Sun May  9 10:40:19 1999
+@@ -21,6 +21,7 @@
+ #include <stdarg.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <sys/types.h>
+ #include <sys/stat.h>
+ 
+ #include "ut_string.h"
diff --git a/editors/abiword/files/patch-ag b/editors/abiword/files/patch-ag
new file mode 100644
index 000000000000..1681bef3593e
--- /dev/null
+++ b/editors/abiword/files/patch-ag
@@ -0,0 +1,13 @@
+--- config/abi_defs.mk.orig	Thu Apr 29 10:46:27 1999
++++ config/abi_defs.mk	Sun May  9 10:40:19 1999
+@@ -230,8 +230,8 @@
+ ## We should change this when get non-gtk versions on unix....
+ 
+ ifeq ($(ABI_NATIVE),unix)
+-CFLAGS 		+=	`gtk-config --cflags`
+-EXTRA_LIBS	+=	`gtk-config --libs`
++CFLAGS 		+=	`gtk12-config --cflags`
++EXTRA_LIBS	+=	`gtk12-config --libs`
+ endif
+ 
+ ##################################################################
diff --git a/editors/abiword/pkg-descr b/editors/abiword/pkg-descr
index fe3e55d2aed0..f80401c4da39 100644
--- a/editors/abiword/pkg-descr
+++ b/editors/abiword/pkg-descr
@@ -2,4 +2,5 @@ AbiWord is an open-source, cross-platform WYSIWYG word processor, based
 on the GTK tool kit.
 
 For more information, or to see screenshots, visit the AbiSource home page
-at http://www.abisource.com/.
+at
+WWW:  http://www.abisource.com/