2 files changed, 20 insertions, 34 deletions

diff --git a/editors/abiword/files/patch-af b/editors/abiword/files/patch-af
index 88e3d41b36e3..502e8de76cd9 100644
--- a/editors/abiword/files/patch-af
+++ b/editors/abiword/files/patch-af
@@ -1,12 +1,9 @@
-
-$FreeBSD$
-
---- src/af/util/xp/ut_png.cpp.orig	Wed Jun 13 23:39:53 2001
-+++ src/af/util/xp/ut_png.cpp	Wed Aug  8 13:22:37 2001
-@@ -19,7 +19,7 @@
- 
- /* Required to get proper namespace inclusion from PNG code */
- #include <string.h>
+--- src/af/util/xp/ut_png.cpp.orig	Wed Apr 17 12:49:55 2002
++++ src/af/util/xp/ut_png.cpp	Fri Apr 19 20:40:25 2002
+@@ -24,7 +24,7 @@
+ #ifdef _AIX
+ #define jmpbuf __jmpbuf
+ #endif
 -#include "png.h"
 +#include <png.h>
  
diff --git a/editors/abiword/files/patch-ap b/editors/abiword/files/patch-ap
index 6cbc7979ab44..76fbc4554e65 100644
--- a/editors/abiword/files/patch-ap
+++ b/editors/abiword/files/patch-ap
@@ -1,34 +1,23 @@
---- src/wp/Makefile	Fri Jul 21 15:06:38 2000
-+++ src/wp/Makefile.new	Wed Oct 11 21:03:24 2000
-@@ -44,10 +44,28 @@
+--- src/wp/Makefile.orig	Sat Apr 13 07:22:38 2002
++++ src/wp/Makefile	Fri Apr 19 23:30:57 2002
+@@ -44,8 +44,18 @@
  	@$(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)/help/en-US/images,$(VERIFY_DIRECTORY))
-+	@$(subst xxxx,$(CANON_AppDir)/help/es-ES,$(VERIFY_DIRECTORY))
-+	@$(subst xxxx,$(CANON_AppDir)/help/fr-FR,$(VERIFY_DIRECTORY))
-+	@$(subst xxxx,$(CANON_AppDir)/help/fr-FR/images,$(VERIFY_DIRECTORY))
++	@$(subst xxxx,$(CANON_AppDir)/help/en-US/howto,$(VERIFY_DIRECTORY))
++	@$(subst xxxx,$(CANON_AppDir)/help/en-US/howto/howtoweb.xhtml_data,$(VERIFY_DIRECTORY))
++	@$(subst xxxx,$(CANON_AppDir)/help/en-US/howto/howtoword.xhtml_data,$(VERIFY_DIRECTORY))
++	@$(subst xxxx,$(CANON_AppDir)/help/en-US/info,$(VERIFY_DIRECTORY))
++	@$(subst xxxx,$(CANON_AppDir)/help/en-US/interface,$(VERIFY_DIRECTORY))
++	@$(subst xxxx,$(CANON_AppDir)/help/en-US/interface/dialogreplace.xhtml_data,$(VERIFY_DIRECTORY))
++	@$(subst xxxx,$(CANON_AppDir)/help/en-US/interface/menufile.xhtml_data,$(VERIFY_DIRECTORY))
++	@$(subst xxxx,$(CANON_AppDir)/help/en-US/interface/workspace.xhtml_data,$(VERIFY_DIRECTORY))
++	@$(subst xxxx,$(CANON_AppDir)/help/en-US/problems,$(VERIFY_DIRECTORY))
++	@$(subst xxxx,$(CANON_AppDir)/help/en-US/tutorial,$(VERIFY_DIRECTORY))
 +	@$(subst xxxx,$(CANON_AppDir)/help/images,$(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)
  	@$(ABICOPY) $(USERDIR)/wp/system.profile* $(CANON_AppDir)
  	@$(ABICOPY) $(USERDIR)/wp/strings/*.strings $(CANON_AppDir)/strings
 -	(cd $(USERDIR)/wp/help; tar cf - images ./*.* $(CANON_Lang)/*.* $(CANON_Lang)/*/*.*) | (cd $(CANON_AppDir)/help; tar xf -)
--	(cd $(USERDIR)/wp/sample; tar cf - $(CANON_Lang)/*.*) | (cd $(CANON_AppDir)/sample; tar xf -)
--
-+	@$(ABICOPY) $(USERDIR)/wp/help/*.html $(CANON_AppDir)/help
-+	@$(ABICOPY) $(USERDIR)/wp/help/en-US/*.html $(CANON_AppDir)/help/en-US
-+	@$(ABICOPY) $(USERDIR)/wp/help/en-US/images/*.gif $(CANON_AppDir)/help/en-US/images
-+	@$(ABICOPY) $(USERDIR)/wp/help/en-US/images/*.jpg $(CANON_AppDir)/help/en-US/images
-+	@$(ABICOPY) $(USERDIR)/wp/help/en-US/images/*.png $(CANON_AppDir)/help/en-US/images
-+	@$(ABICOPY) $(USERDIR)/wp/help/es-ES/*.html $(CANON_AppDir)/help/es-ES
-+	@$(ABICOPY) $(USERDIR)/wp/help/fr-FR/*.html $(CANON_AppDir)/help/fr-FR
-+	@$(ABICOPY) $(USERDIR)/wp/help/fr-FR/images/*.gif $(CANON_AppDir)/help/fr-FR/images
-+	@$(ABICOPY) $(USERDIR)/wp/help/fr-FR/images/*.jpg $(CANON_AppDir)/help/fr-FR/images
-+	@$(ABICOPY) $(USERDIR)/wp/help/fr-FR/images/*.png $(CANON_AppDir)/help/fr-FR/images
-+	@$(ABICOPY) $(USERDIR)/wp/help/images/*.gif $(CANON_AppDir)/help/images
-+	@$(ABICOPY) $(USERDIR)/wp/help/images/*.jpg $(CANON_AppDir)/help/images
-+	@$(ABICOPY) $(USERDIR)/wp/help/images/*.png $(CANON_AppDir)/help/images
-+	@$(ABICOPY) $(USERDIR)/wp/sample/en-US/*.abw $(CANON_AppDir)/sample/en-US
+-	@$(ABICOPY) $(ABI_ROOT)/CREDITS.TXT $(CANON_AppDir)/help/en-US/credits.txt