Remove AbiWord2 after merge into FreeBSD CVS.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@1254 df743ca5-7f9a-e211-a948-0013205c9059

18 files changed, 0 insertions, 471 deletions

diff --git a/editors/AbiWord2/files/patch-..::wv::magick::Makefile.in b/editors/AbiWord2/files/patch-..::wv::magick::Makefile.in
deleted file mode 100644
index 3880ad648..000000000
--- a/editors/AbiWord2/files/patch-..::wv::magick::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD: ports/editors/AbiWord2/files/patch-..::wv::magick::Makefile.in,v 1.2 2003/02/23 18:39:35 marcus Exp $
-
---- ../wv/magick/Makefile.in	2001/08/08 11:44:02	1.1
-+++ ../wv/magick/Makefile.in	2001/08/08 11:44:13
-@@ -40,7 +40,7 @@
- all: $(MAGICKOBJECTS)
- 
- %.$(OBJEXT): $(srcdir)/%.c 
--	$(CC) $(CFLAGS) -c $(srcdir)/$*.c 
-+	$(CC) @CPPFLAGS@ $(CFLAGS) -c $(srcdir)/$*.c 
- 
- clean:
- 	rm -rf *.$(OBJEXT) core a.$(OBJEXT)ut *.a
diff --git a/editors/AbiWord2/files/patch-GNUmakefile.am b/editors/AbiWord2/files/patch-GNUmakefile.am
deleted file mode 100644
index 3e4cc389d..000000000
--- a/editors/AbiWord2/files/patch-GNUmakefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
---- GNUmakefile.am.orig	Mon Aug 18 09:45:27 2003
-+++ GNUmakefile.am	Mon Aug 25 04:25:53 2003
-@@ -76,7 +76,6 @@
- 
- # Install the datafiles. This is quick-and-dirty.
- install-data-local:
--	@$(mkinstalldirs) $(DESTDIR)$(bonobodir)
- 	if test -d $(top_srcdir)/../abidistfiles ; then \
- 	  for dir in `cd $(top_srcdir)/../abidistfiles; find . -type d ! -name CVS` ; do \
- 	    $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/$$dir ;\
-@@ -89,11 +88,7 @@
- 	      for file in $(top_srcdir)/../abidistfiles/$$dir/* ; do \
- 	        if test -f $$file ; then \
- 		  sfile=`echo "$$file" | sed 's/\.[^.]*$$//'`; \
--		  if test "$$sfile.server" = $$file; then \
--		    $(INSTALL_DATA) $$file $(DESTDIR)$(bonobodir); \
--		  else \
- 		    $(INSTALL_DATA) $$file $(DESTDIR)$(pkgdatadir)/$$dir; \
--		  fi; \
- 	        fi; \
- 	      done; \
- 	    fi; \
diff --git a/editors/AbiWord2/files/patch-af b/editors/AbiWord2/files/patch-af
deleted file mode 100644
index 502e8de76..000000000
--- a/editors/AbiWord2/files/patch-af
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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>
- 
- #include "ut_assert.h"
- #include "ut_bytebuf.h"
diff --git a/editors/AbiWord2/files/patch-an b/editors/AbiWord2/files/patch-an
deleted file mode 100644
index a116fb076..000000000
--- a/editors/AbiWord2/files/patch-an
+++ /dev/null
@@ -1,46 +0,0 @@
-
-$FreeBSD: ports/editors/AbiWord2/files/patch-an,v 1.5 2003/02/23 18:39:35 marcus Exp $
-
---- src/Makefile.orig	Thu May 30 17:51:53 2002
-+++ src/Makefile	Wed Jun  5 15:47:41 2002
-@@ -48,6 +48,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.
-@@ -58,6 +59,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
-@@ -72,6 +76,7 @@
- 			cp $$k american.hash;		\
- 			rm $$k ;			\
- 		done)
-+	@(cd $(CANONDIR)/dictionary; $(ABICHMOD) ugo=r *)
- # We currently only ship american.hash, so the above and below aren't logical.
- # For same reason, this will only copy american.hash-encoding once in place.  The rest is in abispell.
- 	@$(ABICOPY) $(ABI_ROOT)/../abidistfiles/dictionary/*.hash-encoding $(CANONDIR)/dictionary	
-@@ -112,10 +117,12 @@
- 	fi
- # icons for X window manager use
- 	@$(subst xxxx,$(CANONDIR)/icons,$(VERIFY_DIRECTORY))
--	(cd $(ABI_ROOT)/../abidistfiles/icons; cp abi* $(CANONDIR)/icons)
-+	(cd $(ABI_ROOT)/../abidistfiles/icons; $(ABICOPY) abi* $(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
deleted file mode 100644
index 76fbc4554..000000000
--- a/editors/AbiWord2/files/patch-ap
+++ /dev/null
@@ -1,23 +0,0 @@
---- 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/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))
- 	@$(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 -)
--	@$(ABICOPY) $(ABI_ROOT)/CREDITS.TXT $(CANON_AppDir)/help/en-US/credits.txt
diff --git a/editors/AbiWord2/files/patch-aq b/editors/AbiWord2/files/patch-aq
deleted file mode 100644
index ed0324f28..000000000
--- a/editors/AbiWord2/files/patch-aq
+++ /dev/null
@@ -1,27 +0,0 @@
---- src/config/abi_defs.mk	Fri Jun  9 15:48:49 2000
-+++ src/config/abi_defs.mk.new	Thu Jun 22 16:32:03 2000
-@@ -124,11 +124,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
- 
- ifeq ($(OS_NAME), WIN32)
-@@ -160,7 +160,9 @@
- ##################################################################
- ##################################################################
- 
--ABICOPY=cp
-+ABICOPY = cp
-+ABICHMOD = chmod
-+ABIMKDIR = mkdir -m u=rwx,go=rx
- 
- ifdef ABISOURCE_LICENSED_TRADEMARKS
- ABI_TMDEFS=	-DABISOURCE_LICENSED_TRADEMARKS
diff --git a/editors/AbiWord2/files/patch-ar b/editors/AbiWord2/files/patch-ar
deleted file mode 100644
index 9f93ba444..000000000
--- a/editors/AbiWord2/files/patch-ar
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD: ports/editors/AbiWord2/files/patch-ar,v 1.3 2003/02/23 18:39:35 marcus Exp $
-
---- src/pkg/common/unix/scripts/install.sh.orig	Sat Apr  7 10:59:52 2001
-+++ src/pkg/common/unix/scripts/install.sh	Wed Aug  8 13:31:57 2001
-@@ -80,7 +80,7 @@
- 
- echo "Installing program binaries to [$LIBEXECDIR]..."
- # Setup bins 
--(cd $SRCDIR/bin; tar cf - *) | (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/files/patch-autogen.sh b/editors/AbiWord2/files/patch-autogen.sh
deleted file mode 100644
index 4534322f4..000000000
--- a/editors/AbiWord2/files/patch-autogen.sh
+++ /dev/null
@@ -1,63 +0,0 @@
---- autogen.sh.orig	Fri Aug  1 04:40:52 2003
-+++ autogen.sh	Mon Aug 25 03:31:45 2003
-@@ -10,31 +10,31 @@
- 
- rm -f autogen.err
- 
--automake --version | perl -ne 'if (/\(GNU automake\) ([0-9].[0-9])/) {print;  if ($1 < 1.4) {exit 1;}}'
-+%%AUTOMAKE%% --version | perl -ne 'if (/\(GNU automake\) ([0-9].[0-9])/) {print;  if ($1 < 1.4) {exit 1;}}'
- 
- if [ $? -ne 0 ]; then
-     echo "Error: you need automake 1.4 or later.  Please upgrade."
-     exit 1
- fi
- 
--if test ! -d `aclocal --print-ac-dir 2>> autogen.err`; then
--  echo "Bad aclocal (automake) installation"
-+if test ! -d `%%ACLOCAL%% --print-ac-dir 2>> autogen.err`; then
-+  echo "Bad %%ACLOCAL%% (automake) installation"
-   exit 1
- fi
- 
- # Produce aclocal.m4, so autoconf gets the automake macros it needs
- # 
--echo "Creating aclocal.m4: aclocal -I ac-helpers $ACLOCAL_FLAGS"
-+echo "Creating aclocal.m4: %%ACLOCAL%% -I ac-helpers $ACLOCAL_FLAGS"
- 
--aclocal -I ac-helpers $ACLOCAL_FLAGS 2>> autogen.err
-+%%ACLOCAL%% -I ac-helpers $ACLOCAL_FLAGS 2>> autogen.err
- 
- echo "Checking for PKG_CHECK_MODULES..."
- 
- pkgcheckdef=`grep PKG_CHECK_MODULES aclocal.m4 | grep AC_DEFUN`
- if test "x$pkgcheckdef" = "x"; then
--  echo "Running aclocal -I ac-helpers -I ac-helpers/pkg-config $ACLOCAL_FLAGS"
--  (aclocal -I ac-helpers -I ac-helpers/pkg-config $ACLOCAL_FLAGS 2>> autogen.err) || {
--    echo "aclocal failed! Unable to continue."
-+  echo "Running %%ACLOCAL%% -I ac-helpers -I ac-helpers/pkg-config $ACLOCAL_FLAGS"
-+  (%%ACLOCAL%% -I ac-helpers -I ac-helpers/pkg-config $ACLOCAL_FLAGS 2>> autogen.err) || {
-+    echo "%%ACLOCAL%% failed! Unable to continue."
-     exit 1
-   }
-   pkgcheckdef=`grep PKG_CHECK_MODULES aclocal.m4 | grep AC_DEFUN`
-@@ -56,9 +56,9 @@
- # Produce all the `GNUmakefile.in's and create neat missing things
- # like `install-sh', etc.
- # 
--echo "automake --add-missing --copy --foreign"
-+echo "%%AUTOMAKE%% --add-missing --copy --foreign"
- 
--automake --add-missing --copy --foreign 2>> autogen.err || {
-+%%AUTOMAKE%% --add-missing --copy --foreign 2>> autogen.err || {
-     echo ""
-     echo "* * * warning: possible errors while running automake - check autogen.err"
-     echo ""
-@@ -74,7 +74,7 @@
- # 
- echo "Creating configure..."
- 
--autoconf 2>> autogen.err || {
-+%%AUTOCONF%% 2>> autogen.err || {
-     echo ""
-     echo "* * * warning: possible errors while running automake - check autogen.err"
-     echo ""
diff --git a/editors/AbiWord2/files/patch-ax b/editors/AbiWord2/files/patch-ax
deleted file mode 100644
index 91ab01775..000000000
--- a/editors/AbiWord2/files/patch-ax
+++ /dev/null
@@ -1,10 +0,0 @@
---- ../wv/libole2/ms-ole.h	Sun Oct  6 20:18:41 2002
-+++ ../wv/libole2/ms-ole.h.new	Sun Oct  6 20:18:48 2002
-@@ -20,6 +20,7 @@
- #if defined(__QNXNTO__)
- # include <sys/types.h>	
- #endif
-+# include <sys/types.h>	
- # include <fcntl.h>       /* for mode_t */
- #else
- # include <stdlib.h>
diff --git a/editors/AbiWord2/files/patch-src::wp::ap::unix::ap_UnixApp.cpp b/editors/AbiWord2/files/patch-src::wp::ap::unix::ap_UnixApp.cpp
deleted file mode 100644
index 720a1a614..000000000
--- a/editors/AbiWord2/files/patch-src::wp::ap::unix::ap_UnixApp.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD: ports/editors/AbiWord2/files/patch-src::wp::ap::unix::ap_UnixApp.cpp,v 1.3 2003/02/23 18:39:36 marcus Exp $
-
---- src/wp/ap/unix/ap_UnixApp.cpp.orig	Thu Dec  6 09:00:14 2001
-+++ src/wp/ap/unix/ap_UnixApp.cpp	Mon Dec 17 13:49:48 2001
-@@ -612,7 +612,7 @@
-   {
-       pluginDir = pluginList[i];
- 
--      n = scandir(pluginDir.c_str(), &namelist, so_only, alphasort);
-+      n = scandir(pluginDir.c_str(), &namelist, (int (*)(dirent *))so_only, alphasort);
-       UT_DEBUGMSG(("DOM: found %d plugins in %s\n", n, pluginDir.c_str()));
- 
-       if (n > 0)
diff --git a/editors/AbiWord2/files/patch-src_af_util_xp_ut_iconv.cpp b/editors/AbiWord2/files/patch-src_af_util_xp_ut_iconv.cpp
deleted file mode 100644
index 72ff257a6..000000000
--- a/editors/AbiWord2/files/patch-src_af_util_xp_ut_iconv.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/af/util/xp/ut_iconv.cpp.orig	Thu Jul 17 15:12:55 2003
-+++ src/af/util/xp/ut_iconv.cpp	Thu Jul 17 15:16:40 2003
-@@ -295,8 +295,8 @@
-     return (size_t)-1;
- 
- 
--  ICONV_CONST char ** buf = const_cast<ICONV_CONST char**>(inbuf);
--  return iconv( cd, buf, inbytesleft, outbuf, outbytesleft );
-+  //ICONV_CONST char ** buf = const_cast<ICONV_CONST char**>(inbuf);
-+  return iconv( cd, inbuf, inbytesleft, outbuf, outbytesleft );
- }
- 
- int  UT_iconv_close( UT_iconv_t cd )
diff --git a/editors/AbiWord2/files/patch-src_af_util_xp_ut_string_class.cpp b/editors/AbiWord2/files/patch-src_af_util_xp_ut_string_class.cpp
deleted file mode 100644
index a82b611a7..000000000
--- a/editors/AbiWord2/files/patch-src_af_util_xp_ut_string_class.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
---- src/af/util/xp/ut_string_class.cpp.orig	Mon Aug 25 03:34:03 2003
-+++ src/af/util/xp/ut_string_class.cpp	Mon Aug 25 03:42:00 2003
-@@ -28,6 +28,7 @@
- #include <locale.h>
- #include <ctype.h>
- #include <stdarg.h>
-+#include <glib.h>
- 
- #include "ut_string.h"
- #include "ut_string_class.h"
-@@ -340,13 +341,13 @@
-   return len;
- }
- 
-+#define VA_COPY G_VA_COPY
-+
- #if !defined (VA_COPY)
- #  if defined (__GNUC__) && defined (__PPC__) && (defined (_CALL_SYSV) || defined (_WIN32) || defined(WIN32)) || defined(__s390__) || defined(__x86_64__)
- #  define VA_COPY(ap1, ap2)	  (*(ap1) = *(ap2))
- #  elif defined (VA_COPY_AS_ARRAY)
- #  define VA_COPY(ap1, ap2)	  memmove ((ap1), (ap2), sizeof (va_list))
--#  elif defined (__GNUC__)
--#  define VA_COPY(ap1,ap2)     __va_copy((ap1),(ap2))
- #  else /* va_list is a pointer */
- #  define VA_COPY(ap1, ap2)	  ((ap1) = (ap2))
- #  endif /* va_list is a pointer */
diff --git a/editors/AbiWord2/files/patch-src_af_xap_unix_xap_UnixFont.cpp b/editors/AbiWord2/files/patch-src_af_xap_unix_xap_UnixFont.cpp
deleted file mode 100644
index 29b75760b..000000000
--- a/editors/AbiWord2/files/patch-src_af_xap_unix_xap_UnixFont.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/af/xap/unix/xap_UnixFont.cpp.orig	Mon Aug  4 20:24:53 2003
-+++ src/af/xap/unix/xap_UnixFont.cpp	Mon Aug  4 20:25:50 2003
-@@ -400,10 +400,10 @@
- 	size_t idx = 0;
- 	for (size_t i = 0; i < coverage.size(); i += 2)
- 	  {
--		  UT_UCSChar c1 = static_cast<UT_UCSChar>(reinterpret_cast<UT_uint32>(coverage[i]));
-+		  UT_UCSChar c1 = static_cast<UT_UCSChar>(reinterpret_cast<unsigned long>(coverage[i]));
- 		  UT_UCSChar c2 =
- 			  static_cast<UT_UCSChar>(static_cast<UT_uint32>(c1)) +
--			  static_cast<UT_UCSChar>(reinterpret_cast<UT_uint32>(coverage[i + 1]));
-+			  static_cast<UT_UCSChar>(reinterpret_cast<unsigned long>(coverage[i + 1]));
- 		  for (UT_UCSChar c = c1; c < c2; ++c)
- 		    {
- 			    FT_UInt glyph_idx = FT_Get_Char_Index(face, c);
diff --git a/editors/AbiWord2/files/patch-src_af_xap_xp_xap_Draw_Symbol.cpp b/editors/AbiWord2/files/patch-src_af_xap_xp_xap_Draw_Symbol.cpp
deleted file mode 100644
index baf6ff9a7..000000000
--- a/editors/AbiWord2/files/patch-src_af_xap_xp_xap_Draw_Symbol.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
---- src/af/xap/xp/xap_Draw_Symbol.cpp.orig	Wed Jul 30 01:04:34 2003
-+++ src/af/xap/xp/xap_Draw_Symbol.cpp	Wed Jul 30 01:07:18 2003
-@@ -153,7 +153,7 @@
- 	
- 	for (i = 0; i < m_vCharSet.size(); i += 2)
- 	{
--		UT_UCSChar base = static_cast<UT_UCSChar>(reinterpret_cast<UT_uint32>(m_vCharSet[i]));
-+		UT_UCSChar base = static_cast<UT_UCSChar>(reinterpret_cast<unsigned long>(m_vCharSet[i]));
- 		size_t nb_chars = reinterpret_cast<size_t>(m_vCharSet[i + 1]);
- 
- 		for (UT_UCSChar j = base; j < base + nb_chars; ++j)
-@@ -194,11 +194,11 @@
- 	UT_DEBUGMSG(("calcSymbolFromCoords(x = [%u], y = [%u]) =", ix, iy));
- 	for (size_t i = 0; i < m_vCharSet.size(); i += 2)
- 	{
--		count += reinterpret_cast<UT_uint32>(m_vCharSet[i + 1]);
-+		count += static_cast<UT_uint32>(reinterpret_cast<unsigned long>(m_vCharSet[i + 1]));
- 		if (count > index)
- 		{
- 			UT_DEBUGMSG((" %u\n", static_cast<UT_uint32>(reinterpret_cast<UT_uint32>(m_vCharSet[i]) + index - count + reinterpret_cast<UT_uint32>(m_vCharSet[i + 1]))));
--			return static_cast<UT_UCSChar>(reinterpret_cast<UT_uint32>(m_vCharSet[i]) + index - count + reinterpret_cast<UT_uint32>(m_vCharSet[i + 1]));
-+			return static_cast<UT_UCSChar>(static_cast<UT_uint32>(reinterpret_cast<unsigned long>(m_vCharSet[i])) + index - count + static_cast<UT_uint32>(reinterpret_cast<unsigned long>(m_vCharSet[i + 1])));
- 		}
- 	}
- 
-@@ -227,8 +227,8 @@
- 
- 	for (size_t i = 0; i < m_vCharSet.size(); i += 2)
- 	{
--		UT_uint32 base = reinterpret_cast<UT_uint32>(m_vCharSet[i]);
--		UT_uint32 size = reinterpret_cast<UT_uint32>(m_vCharSet[i + 1]);
-+		UT_uint32 base = static_cast<UT_uint32>(reinterpret_cast<unsigned long>(m_vCharSet[i]));
-+		UT_uint32 size = static_cast<UT_uint32>(reinterpret_cast<unsigned long>(m_vCharSet[i + 1]));
- 		
- 		if (base + size > c)
- 		{
diff --git a/editors/AbiWord2/files/patch-src_pkg_linux_rpm_data_abiword.desktop b/editors/AbiWord2/files/patch-src_pkg_linux_rpm_data_abiword.desktop
deleted file mode 100644
index 656c586a6..000000000
--- a/editors/AbiWord2/files/patch-src_pkg_linux_rpm_data_abiword.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/pkg/linux/rpm/data/abiword.desktop.orig	Sun Apr  6 14:45:19 2003
-+++ src/pkg/linux/rpm/data/abiword.desktop	Sun Apr 20 00:33:09 2003
-@@ -12,7 +12,7 @@
- Icon=abiword_48.png
- Terminal=0
- Type=Application
--Categories=Application;Office;WordProcessor;X-Red-Hat-Base;
-+Categories=Application;Office;WordProcessor;
- StartupNotify=true
- Encoding=UTF-8
- X-Desktop-File-Install-Version=0.3
diff --git a/editors/AbiWord2/files/patch-src_wp_impexp_xp_ie_Table.cpp b/editors/AbiWord2/files/patch-src_wp_impexp_xp_ie_Table.cpp
deleted file mode 100644
index a3f8a7e79..000000000
--- a/editors/AbiWord2/files/patch-src_wp_impexp_xp_ie_Table.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/wp/impexp/xp/ie_Table.cpp.orig	Tue Sep 23 21:23:58 2003
-+++ src/wp/impexp/xp/ie_Table.cpp	Tue Sep 23 21:31:58 2003
-@@ -1028,7 +1028,7 @@
- 			UT_sint32 j = 0;
- 			for(j=0; !bMatch && (j < static_cast<UT_sint32>(m_vecCellX.getItemCount())); j++)
- 			{
--				UT_sint32 prevX = reinterpret_cast<UT_sint32>(m_vecCellX.getNthItem(j));
-+				UT_sint32 prevX = reinterpret_cast<long>(m_vecCellX.getNthItem(j));
- 				UT_DEBUGMSG(("Prev cell %d cellx %d \n",j,prevX));
- 				bool bLast = ((j-1) == szCurRow);
- 				bMatch =  doCellXMatch(prevX,curX,bLast);
-@@ -1179,7 +1179,7 @@
- 		sColWidth.clear();
- 		for(i=0; i< static_cast<UT_sint32>(m_vecCellX.getItemCount()); i++)
- 		{
--			UT_sint32 iCellx = reinterpret_cast<UT_sint32>(m_vecCellX.getNthItem(i));
-+			UT_sint32 iCellx = reinterpret_cast<long>(m_vecCellX.getNthItem(i));
- 			xxx_UT_DEBUGMSG(("final cellx import cellx %d iPrev %x \n",iCellx,iPrev));
- 			UT_sint32 iDiffCellx = iCellx - iPrev;
- 			double dCellx = static_cast<double>(iDiffCellx)/1440.0 -dColSpace;
-@@ -1377,7 +1377,7 @@
- 	UT_sint32 iSub = 0;
- 	for(i=0; !bFound && (i< static_cast<UT_sint32>(m_vecCellX.getItemCount())); i++)
- 	{
--		UT_sint32 icellx = reinterpret_cast<UT_sint32>(m_vecCellX.getNthItem(i));
-+		UT_sint32 icellx = reinterpret_cast<long>(m_vecCellX.getNthItem(i));
- 		if(icellx == -1)
- 		{
- 			iSub++;
diff --git a/editors/AbiWord2/files/patch-src_wp_impexp_xp_ie_exp_HTML.cpp b/editors/AbiWord2/files/patch-src_wp_impexp_xp_ie_exp_HTML.cpp
deleted file mode 100644
index 00232c3a3..000000000
--- a/editors/AbiWord2/files/patch-src_wp_impexp_xp_ie_exp_HTML.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
---- src/wp/impexp/xp/ie_exp_HTML.cpp.orig	Mon Sep 22 14:46:23 2003
-+++ src/wp/impexp/xp/ie_exp_HTML.cpp	Mon Sep 22 14:47:36 2003
-@@ -776,7 +776,7 @@
- 	void * vptr = 0;
- 	m_tagStack.pop (&vptr);
- 
--	if (reinterpret_cast<UT_uint32>(vptr) == tagID) return;
-+	if (reinterpret_cast<unsigned long>(vptr) == tagID) return;
- 
- 	UT_DEBUGMSG(("WARNING: possible tag mis-match in XHTML output!\n"));
- }
-@@ -820,7 +820,7 @@
- UT_uint32 s_HTML_Listener::tagTop ()
- {
- 	void * vptr = 0;
--	if (m_tagStack.viewTop (&vptr)) return reinterpret_cast<UT_uint32>(vptr);
-+	if (m_tagStack.viewTop (&vptr)) return reinterpret_cast<unsigned long>(vptr);
- 	return 0;
- }
- 
-@@ -1890,7 +1890,7 @@
- {
- 	void * vptr = 0;
- 	m_utsListType.viewTop (&vptr);
--	return static_cast<UT_uint16>(reinterpret_cast<UT_uint32>(vptr));
-+	return static_cast<UT_uint16>(reinterpret_cast<unsigned long>(vptr));
- }
- 
- void s_HTML_Listener::listPush (UT_uint16 type, const char * ClassName)
-@@ -1929,7 +1929,7 @@
- 
- 	void * vptr = 0;
- 	m_utsListType.pop (&vptr);
--	UT_uint16 type = static_cast<UT_uint16>(reinterpret_cast<UT_uint32>(vptr));
-+	UT_uint16 type = static_cast<UT_uint16>(reinterpret_cast<unsigned long>(vptr));
- 
- 	UT_uint32 tagID;
- 
diff --git a/editors/AbiWord2/files/patch-src_wp_impexp_xp_ie_imp_RTF.cpp b/editors/AbiWord2/files/patch-src_wp_impexp_xp_ie_imp_RTF.cpp
deleted file mode 100644
index 90ad29c85..000000000
--- a/editors/AbiWord2/files/patch-src_wp_impexp_xp_ie_imp_RTF.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/wp/impexp/xp/ie_imp_RTF.cpp.orig	Tue Sep 23 21:19:45 2003
-+++ src/wp/impexp/xp/ie_imp_RTF.cpp	Tue Sep 23 21:22:22 2003
-@@ -1208,9 +1208,9 @@
- 		m_iOverrideLevel = other.m_iOverrideLevel;
- 		if(m_tabTypes.getItemCount() > 0)
- 		{
--			UT_uint32 dum = reinterpret_cast<UT_uint32>(m_tabTypes.getNthItem(0));
-+			UT_uint32 dum = reinterpret_cast<unsigned long>(m_tabTypes.getNthItem(0));
- 			m_curTabType = static_cast<eTabType>(dum);
--			dum = reinterpret_cast<UT_uint32>(m_tabLeader.getNthItem(0));
-+			dum = reinterpret_cast<unsigned long>(m_tabLeader.getNthItem(0));
- 			m_curTabLeader = static_cast<eTabLeader>(dum);
- 		}
- 		else
-@@ -2442,7 +2442,7 @@
- {
- 	if (colNum < m_colourTable.getItemCount())
- 	{
--		return reinterpret_cast<UT_uint32>(m_colourTable.getNthItem(colNum));
-+		return reinterpret_cast<unsigned long>(m_colourTable.getNthItem(colNum));
- 	}
- 	else
- 	{
-@@ -2454,7 +2454,7 @@
- {
- 	if (colNum < m_colourTable.getItemCount())
- 	{
--		return reinterpret_cast<UT_sint32>(m_colourTable.getNthItem(colNum));
-+		return reinterpret_cast<long>(m_colourTable.getNthItem(colNum));
- 	}
- 	else
- 	{
-@@ -6185,11 +6185,11 @@
- 			if (i > 0)
- 				propBuffer += ",";
- 
--			UT_sint32 tabTwips = reinterpret_cast<UT_sint32>(m_currentRTFState.m_paraProps.m_tabStops.getNthItem(i));
-+			UT_sint32 tabTwips = reinterpret_cast<long>(m_currentRTFState.m_paraProps.m_tabStops.getNthItem(i));
- 			double tabIn = tabTwips/(20.0*72.);
--			UT_uint32 idum = reinterpret_cast<UT_uint32>(m_currentRTFState.m_paraProps.m_tabTypes.getNthItem(i));
-+			UT_uint32 idum = reinterpret_cast<unsigned long>(m_currentRTFState.m_paraProps.m_tabTypes.getNthItem(i));
- 			eTabType tabType = static_cast<eTabType>(idum);
--			idum = reinterpret_cast<UT_uint32>((m_currentRTFState.m_paraProps.m_tabLeader.getNthItem(i)));
-+			idum = reinterpret_cast<unsigned long>((m_currentRTFState.m_paraProps.m_tabLeader.getNthItem(i)));
- 			eTabLeader tabLeader = static_cast<eTabLeader>(idum);
- 			char  cType = ' ';
- 			switch(tabType)
-@@ -9654,9 +9654,9 @@
- 		if (i > 0)
- 			strcat(propBuffer, ",");
- 
--		UT_sint32 tabTwips = reinterpret_cast<UT_sint32>(pParas->m_tabStops.getNthItem(i));
-+		UT_sint32 tabTwips = reinterpret_cast<long>(pParas->m_tabStops.getNthItem(i));
- 		double tabIn = tabTwips/(20.0*72.);
--		UT_uint32 idum = reinterpret_cast<UT_uint32>(pParas->m_tabTypes.getNthItem(i));
-+		UT_uint32 idum = reinterpret_cast<unsigned long>(pParas->m_tabTypes.getNthItem(i));
- 		eTabType tabType = static_cast<eTabType>(idum);
- 		idum = (UT_uint32) (pParas->m_tabLeader.getNthItem(i));
- 		eTabLeader tabLeader = static_cast<eTabLeader>(idum);