Update to 1.99.5 (aka 2.0 RC 1).

21 files changed, 315 insertions, 54 deletions

diff --git a/editors/AbiWord2/Makefile b/editors/AbiWord2/Makefile
index 98ccef060196..050e66f453d9 100644
--- a/editors/AbiWord2/Makefile
+++ b/editors/AbiWord2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	AbiWord2
-PORTVERSION=	1.99.3
+PORTVERSION=	1.99.5
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.abisource.com/downloads/Version-${PORTVERSION}/lf/
@@ -26,8 +26,9 @@ LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 
 DIST_SUBDIR=	AbiWord
 
-WRKSRC=		${WRKDIR}/abiword-${PORTVERSION}/abi
+WRKSRC=		${WRKDIR}/abi
 
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_AUTOMAKE=	yes
 USE_AUTOMAKE_VER=14
@@ -84,6 +85,7 @@ pre-configure:
 	@cd ${WRKSRC} && ./autogen.sh && ${TRUE}
 	@${FIND} ${WRKSRC} -name GNUmakefile.in | xargs ${REINPLACE_CMD} -e \
 		's|[(]libdir[)]/@PACKAGE@|(datadir)/@PACKAGE@|g ; \
+		 s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g; \
 		 s|@DEFS@|-I${WRKSRC}/../libiconv/include @DEFS@|g' && ${TRUE}
 
 post-install:
diff --git a/editors/AbiWord2/distinfo b/editors/AbiWord2/distinfo
index c51bc0b2b6b4..4c79e47fa9cf 100644
--- a/editors/AbiWord2/distinfo
+++ b/editors/AbiWord2/distinfo
@@ -1 +1 @@
-MD5 (AbiWord/abiword-1.99.3.tar.gz) = 60004be37795b7eae835c7e192868a87
+MD5 (AbiWord/abiword-1.99.5.tar.bz2) = cdf372cfaecb38cbc5e9dee6b4521792
diff --git a/editors/AbiWord2/files/patch-GNUmakefile.am b/editors/AbiWord2/files/patch-GNUmakefile.am
new file mode 100644
index 000000000000..3e4cc389dd55
--- /dev/null
+++ b/editors/AbiWord2/files/patch-GNUmakefile.am
@@ -0,0 +1,22 @@
+--- 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-autogen.sh b/editors/AbiWord2/files/patch-autogen.sh
index 84fe028e64ac..4534322f4ca7 100644
--- a/editors/AbiWord2/files/patch-autogen.sh
+++ b/editors/AbiWord2/files/patch-autogen.sh
@@ -1,11 +1,11 @@
---- autogen.sh.orig	Thu Oct 17 08:19:31 2002
-+++ autogen.sh	Fri Feb 21 23:47:48 2003
-@@ -10,20 +10,20 @@
+--- 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;}}'
++%%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."
@@ -19,14 +19,6 @@
    exit 1
  fi
  
- for script in `cd ac-helpers/fallback; echo *.m4`; do
--  if test -r `aclocal --print-ac-dir 2>> autogen.err`/$script; then
-+  if test -r `%%ACLOCAL%% --print-ac-dir 2>> autogen.err`/$script; then
-     # Perhaps it was installed recently
-     rm -f ac-helpers/$script
-   else
-@@ -34,17 +34,17 @@
- 
  # Produce aclocal.m4, so autoconf gets the automake macros it needs
  # 
 -echo "Creating aclocal.m4: aclocal -I ac-helpers $ACLOCAL_FLAGS"
@@ -48,7 +40,7 @@
      exit 1
    }
    pkgcheckdef=`grep PKG_CHECK_MODULES aclocal.m4 | grep AC_DEFUN`
-@@ -66,9 +66,9 @@
+@@ -56,9 +56,9 @@
  # Produce all the `GNUmakefile.in's and create neat missing things
  # like `install-sh', etc.
  # 
@@ -60,7 +52,7 @@
      echo ""
      echo "* * * warning: possible errors while running automake - check autogen.err"
      echo ""
-@@ -84,7 +84,7 @@
+@@ -74,7 +74,7 @@
  # 
  echo "Creating configure..."
  
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
new file mode 100644
index 000000000000..a82b611a78c9
--- /dev/null
+++ b/editors/AbiWord2/files/patch-src_af_util_xp_ut_string_class.cpp
@@ -0,0 +1,26 @@
+--- 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_wp_impexp_xp_ie_imp_MsWord_97.cpp b/editors/AbiWord2/files/patch-src_wp_impexp_xp_ie_imp_MsWord_97.cpp
new file mode 100644
index 000000000000..80c0b5b77580
--- /dev/null
+++ b/editors/AbiWord2/files/patch-src_wp_impexp_xp_ie_imp_MsWord_97.cpp
@@ -0,0 +1,11 @@
+--- src/wp/impexp/xp/ie_imp_MsWord_97.cpp.orig	Mon Aug 25 04:03:16 2003
++++ src/wp/impexp/xp/ie_imp_MsWord_97.cpp	Mon Aug 25 04:03:27 2003
+@@ -3402,7 +3402,7 @@
+     comprLen = size;
+     uncomprLen = b->blip.metafile.m_cb;
+     unsigned char *uncompr = new unsigned char[uncomprLen];
+-    int err = uncompress (uncompr, &uncomprLen, data, comprLen);
++    int err = uncompress (uncompr, &uncomprLen, (unsigned char *)data, comprLen);
+     if (err != Z_OK)
+       {
+ 	UT_DEBUGMSG(("Could not uncompress image\n"));
diff --git a/editors/AbiWord2/pkg-plist b/editors/AbiWord2/pkg-plist
index 5d9a7fab1eb5..6b0cf676066c 100644
--- a/editors/AbiWord2/pkg-plist
+++ b/editors/AbiWord2/pkg-plist
@@ -178,7 +178,7 @@ share/AbiSuite-2.0/icons/abiword_16.xpm
 share/AbiSuite-2.0/icons/abiword_48.png
 share/AbiSuite-2.0/icons/abiword_48.tif
 share/AbiSuite-2.0/icons/abiword_48.xpm
-%%GNOME:%%share/AbiSuite-2.0/icons/abiword_logo.xpm
+share/AbiSuite-2.0/icons/abiword_logo.xpm
 share/AbiSuite-2.0/templates/A4.awt
 share/AbiSuite-2.0/templates/Business-Report.awt
 share/AbiSuite-2.0/templates/Employee-Directory.awt
@@ -254,6 +254,40 @@ share/gnome/pixmaps/abiword_48.png
 @dirrm share/AbiSuite-2.0/clipart
 @dirrm share/AbiSuite-2.0/AbiWord/strings
 @dirrm share/AbiSuite-2.0/AbiWord/scripts
+@dirrm share/AbiSuite-2.0/AbiWord/sample/en-US
+@dirrm share/AbiSuite-2.0/AbiWord/sample
+@dirrm share/AbiSuite-2.0/AbiWord/help/images
+@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/tutorial
+@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/problems
+@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/plugins
+@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/interface/workspace.xhtml_data
+@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/interface/rulers.xhtml_data
+@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/interface/dialogreplace.xhtml_data
+@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/interface
+@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/info
+@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/images
+@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/howto/howtoword.xhtml_data
+@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/howto/howtoweb.xhtml_data
+@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/howto
+@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR
+@dirrm share/AbiSuite-2.0/AbiWord/help/es-ES
+@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/tutorial
+@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/problems
+@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/interface/workspace.xhtml_data
+@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/interface/rulers.xhtml_data
+@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/interface/menufile.xhtml_data
+@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogreplace.xhtml_data
+@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/interface
+@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/info
+@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/images
+@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/howto/howtoword.xhtml_data
+@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/howto/howtoweb.xhtml_data
+@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/howto
+@dirrm share/AbiSuite-2.0/AbiWord/help/en-US
+@dirrm share/AbiSuite-2.0/AbiWord/help/de-DE/images
+@dirrm share/AbiSuite-2.0/AbiWord/help/de-DE/de_DE
+@dirrm share/AbiSuite-2.0/AbiWord/help/de-DE
+@dirrm share/AbiSuite-2.0/AbiWord/help
 @dirrm share/AbiSuite-2.0/AbiWord/glade
 @dirrm share/AbiSuite-2.0/AbiWord
 @dirrm share/AbiSuite-2.0
diff --git a/editors/abiword-devel/Makefile b/editors/abiword-devel/Makefile
index 98ccef060196..050e66f453d9 100644
--- a/editors/abiword-devel/Makefile
+++ b/editors/abiword-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	AbiWord2
-PORTVERSION=	1.99.3
+PORTVERSION=	1.99.5
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.abisource.com/downloads/Version-${PORTVERSION}/lf/
@@ -26,8 +26,9 @@ LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 
 DIST_SUBDIR=	AbiWord
 
-WRKSRC=		${WRKDIR}/abiword-${PORTVERSION}/abi
+WRKSRC=		${WRKDIR}/abi
 
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_AUTOMAKE=	yes
 USE_AUTOMAKE_VER=14
@@ -84,6 +85,7 @@ pre-configure:
 	@cd ${WRKSRC} && ./autogen.sh && ${TRUE}
 	@${FIND} ${WRKSRC} -name GNUmakefile.in | xargs ${REINPLACE_CMD} -e \
 		's|[(]libdir[)]/@PACKAGE@|(datadir)/@PACKAGE@|g ; \
+		 s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g; \
 		 s|@DEFS@|-I${WRKSRC}/../libiconv/include @DEFS@|g' && ${TRUE}
 
 post-install:
diff --git a/editors/abiword-devel/distinfo b/editors/abiword-devel/distinfo
index c51bc0b2b6b4..4c79e47fa9cf 100644
--- a/editors/abiword-devel/distinfo
+++ b/editors/abiword-devel/distinfo
@@ -1 +1 @@
-MD5 (AbiWord/abiword-1.99.3.tar.gz) = 60004be37795b7eae835c7e192868a87
+MD5 (AbiWord/abiword-1.99.5.tar.bz2) = cdf372cfaecb38cbc5e9dee6b4521792
diff --git a/editors/abiword-devel/files/patch-GNUmakefile.am b/editors/abiword-devel/files/patch-GNUmakefile.am
new file mode 100644
index 000000000000..3e4cc389dd55
--- /dev/null
+++ b/editors/abiword-devel/files/patch-GNUmakefile.am
@@ -0,0 +1,22 @@
+--- 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/abiword-devel/files/patch-autogen.sh b/editors/abiword-devel/files/patch-autogen.sh
index 84fe028e64ac..4534322f4ca7 100644
--- a/editors/abiword-devel/files/patch-autogen.sh
+++ b/editors/abiword-devel/files/patch-autogen.sh
@@ -1,11 +1,11 @@
---- autogen.sh.orig	Thu Oct 17 08:19:31 2002
-+++ autogen.sh	Fri Feb 21 23:47:48 2003
-@@ -10,20 +10,20 @@
+--- 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;}}'
++%%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."
@@ -19,14 +19,6 @@
    exit 1
  fi
  
- for script in `cd ac-helpers/fallback; echo *.m4`; do
--  if test -r `aclocal --print-ac-dir 2>> autogen.err`/$script; then
-+  if test -r `%%ACLOCAL%% --print-ac-dir 2>> autogen.err`/$script; then
-     # Perhaps it was installed recently
-     rm -f ac-helpers/$script
-   else
-@@ -34,17 +34,17 @@
- 
  # Produce aclocal.m4, so autoconf gets the automake macros it needs
  # 
 -echo "Creating aclocal.m4: aclocal -I ac-helpers $ACLOCAL_FLAGS"
@@ -48,7 +40,7 @@
      exit 1
    }
    pkgcheckdef=`grep PKG_CHECK_MODULES aclocal.m4 | grep AC_DEFUN`
-@@ -66,9 +66,9 @@
+@@ -56,9 +56,9 @@
  # Produce all the `GNUmakefile.in's and create neat missing things
  # like `install-sh', etc.
  # 
@@ -60,7 +52,7 @@
      echo ""
      echo "* * * warning: possible errors while running automake - check autogen.err"
      echo ""
-@@ -84,7 +84,7 @@
+@@ -74,7 +74,7 @@
  # 
  echo "Creating configure..."
  
diff --git a/editors/abiword-devel/files/patch-src_af_util_xp_ut_string_class.cpp b/editors/abiword-devel/files/patch-src_af_util_xp_ut_string_class.cpp
new file mode 100644
index 000000000000..a82b611a78c9
--- /dev/null
+++ b/editors/abiword-devel/files/patch-src_af_util_xp_ut_string_class.cpp
@@ -0,0 +1,26 @@
+--- 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/abiword-devel/files/patch-src_wp_impexp_xp_ie_imp_MsWord_97.cpp b/editors/abiword-devel/files/patch-src_wp_impexp_xp_ie_imp_MsWord_97.cpp
new file mode 100644
index 000000000000..80c0b5b77580
--- /dev/null
+++ b/editors/abiword-devel/files/patch-src_wp_impexp_xp_ie_imp_MsWord_97.cpp
@@ -0,0 +1,11 @@
+--- src/wp/impexp/xp/ie_imp_MsWord_97.cpp.orig	Mon Aug 25 04:03:16 2003
++++ src/wp/impexp/xp/ie_imp_MsWord_97.cpp	Mon Aug 25 04:03:27 2003
+@@ -3402,7 +3402,7 @@
+     comprLen = size;
+     uncomprLen = b->blip.metafile.m_cb;
+     unsigned char *uncompr = new unsigned char[uncomprLen];
+-    int err = uncompress (uncompr, &uncomprLen, data, comprLen);
++    int err = uncompress (uncompr, &uncomprLen, (unsigned char *)data, comprLen);
+     if (err != Z_OK)
+       {
+ 	UT_DEBUGMSG(("Could not uncompress image\n"));
diff --git a/editors/abiword-devel/pkg-plist b/editors/abiword-devel/pkg-plist
index 5d9a7fab1eb5..6b0cf676066c 100644
--- a/editors/abiword-devel/pkg-plist
+++ b/editors/abiword-devel/pkg-plist
@@ -178,7 +178,7 @@ share/AbiSuite-2.0/icons/abiword_16.xpm
 share/AbiSuite-2.0/icons/abiword_48.png
 share/AbiSuite-2.0/icons/abiword_48.tif
 share/AbiSuite-2.0/icons/abiword_48.xpm
-%%GNOME:%%share/AbiSuite-2.0/icons/abiword_logo.xpm
+share/AbiSuite-2.0/icons/abiword_logo.xpm
 share/AbiSuite-2.0/templates/A4.awt
 share/AbiSuite-2.0/templates/Business-Report.awt
 share/AbiSuite-2.0/templates/Employee-Directory.awt
@@ -254,6 +254,40 @@ share/gnome/pixmaps/abiword_48.png
 @dirrm share/AbiSuite-2.0/clipart
 @dirrm share/AbiSuite-2.0/AbiWord/strings
 @dirrm share/AbiSuite-2.0/AbiWord/scripts
+@dirrm share/AbiSuite-2.0/AbiWord/sample/en-US
+@dirrm share/AbiSuite-2.0/AbiWord/sample
+@dirrm share/AbiSuite-2.0/AbiWord/help/images
+@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/tutorial
+@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/problems
+@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/plugins
+@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/interface/workspace.xhtml_data
+@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/interface/rulers.xhtml_data
+@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/interface/dialogreplace.xhtml_data
+@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/interface
+@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/info
+@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/images
+@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/howto/howtoword.xhtml_data
+@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/howto/howtoweb.xhtml_data
+@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/howto
+@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR
+@dirrm share/AbiSuite-2.0/AbiWord/help/es-ES
+@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/tutorial
+@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/problems
+@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/interface/workspace.xhtml_data
+@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/interface/rulers.xhtml_data
+@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/interface/menufile.xhtml_data
+@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogreplace.xhtml_data
+@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/interface
+@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/info
+@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/images
+@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/howto/howtoword.xhtml_data
+@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/howto/howtoweb.xhtml_data
+@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/howto
+@dirrm share/AbiSuite-2.0/AbiWord/help/en-US
+@dirrm share/AbiSuite-2.0/AbiWord/help/de-DE/images
+@dirrm share/AbiSuite-2.0/AbiWord/help/de-DE/de_DE
+@dirrm share/AbiSuite-2.0/AbiWord/help/de-DE
+@dirrm share/AbiSuite-2.0/AbiWord/help
 @dirrm share/AbiSuite-2.0/AbiWord/glade
 @dirrm share/AbiSuite-2.0/AbiWord
 @dirrm share/AbiSuite-2.0
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index 98ccef060196..050e66f453d9 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	AbiWord2
-PORTVERSION=	1.99.3
+PORTVERSION=	1.99.5
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.abisource.com/downloads/Version-${PORTVERSION}/lf/
@@ -26,8 +26,9 @@ LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 
 DIST_SUBDIR=	AbiWord
 
-WRKSRC=		${WRKDIR}/abiword-${PORTVERSION}/abi
+WRKSRC=		${WRKDIR}/abi
 
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_AUTOMAKE=	yes
 USE_AUTOMAKE_VER=14
@@ -84,6 +85,7 @@ pre-configure:
 	@cd ${WRKSRC} && ./autogen.sh && ${TRUE}
 	@${FIND} ${WRKSRC} -name GNUmakefile.in | xargs ${REINPLACE_CMD} -e \
 		's|[(]libdir[)]/@PACKAGE@|(datadir)/@PACKAGE@|g ; \
+		 s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g; \
 		 s|@DEFS@|-I${WRKSRC}/../libiconv/include @DEFS@|g' && ${TRUE}
 
 post-install:
diff --git a/editors/abiword/distinfo b/editors/abiword/distinfo
index c51bc0b2b6b4..4c79e47fa9cf 100644
--- a/editors/abiword/distinfo
+++ b/editors/abiword/distinfo
@@ -1 +1 @@
-MD5 (AbiWord/abiword-1.99.3.tar.gz) = 60004be37795b7eae835c7e192868a87
+MD5 (AbiWord/abiword-1.99.5.tar.bz2) = cdf372cfaecb38cbc5e9dee6b4521792
diff --git a/editors/abiword/files/patch-GNUmakefile.am b/editors/abiword/files/patch-GNUmakefile.am
new file mode 100644
index 000000000000..3e4cc389dd55
--- /dev/null
+++ b/editors/abiword/files/patch-GNUmakefile.am
@@ -0,0 +1,22 @@
+--- 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/abiword/files/patch-autogen.sh b/editors/abiword/files/patch-autogen.sh
index 84fe028e64ac..4534322f4ca7 100644
--- a/editors/abiword/files/patch-autogen.sh
+++ b/editors/abiword/files/patch-autogen.sh
@@ -1,11 +1,11 @@
---- autogen.sh.orig	Thu Oct 17 08:19:31 2002
-+++ autogen.sh	Fri Feb 21 23:47:48 2003
-@@ -10,20 +10,20 @@
+--- 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;}}'
++%%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."
@@ -19,14 +19,6 @@
    exit 1
  fi
  
- for script in `cd ac-helpers/fallback; echo *.m4`; do
--  if test -r `aclocal --print-ac-dir 2>> autogen.err`/$script; then
-+  if test -r `%%ACLOCAL%% --print-ac-dir 2>> autogen.err`/$script; then
-     # Perhaps it was installed recently
-     rm -f ac-helpers/$script
-   else
-@@ -34,17 +34,17 @@
- 
  # Produce aclocal.m4, so autoconf gets the automake macros it needs
  # 
 -echo "Creating aclocal.m4: aclocal -I ac-helpers $ACLOCAL_FLAGS"
@@ -48,7 +40,7 @@
      exit 1
    }
    pkgcheckdef=`grep PKG_CHECK_MODULES aclocal.m4 | grep AC_DEFUN`
-@@ -66,9 +66,9 @@
+@@ -56,9 +56,9 @@
  # Produce all the `GNUmakefile.in's and create neat missing things
  # like `install-sh', etc.
  # 
@@ -60,7 +52,7 @@
      echo ""
      echo "* * * warning: possible errors while running automake - check autogen.err"
      echo ""
-@@ -84,7 +84,7 @@
+@@ -74,7 +74,7 @@
  # 
  echo "Creating configure..."
  
diff --git a/editors/abiword/files/patch-src_af_util_xp_ut_string_class.cpp b/editors/abiword/files/patch-src_af_util_xp_ut_string_class.cpp
new file mode 100644
index 000000000000..a82b611a78c9
--- /dev/null
+++ b/editors/abiword/files/patch-src_af_util_xp_ut_string_class.cpp
@@ -0,0 +1,26 @@
+--- 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/abiword/files/patch-src_wp_impexp_xp_ie_imp_MsWord_97.cpp b/editors/abiword/files/patch-src_wp_impexp_xp_ie_imp_MsWord_97.cpp
new file mode 100644
index 000000000000..80c0b5b77580
--- /dev/null
+++ b/editors/abiword/files/patch-src_wp_impexp_xp_ie_imp_MsWord_97.cpp
@@ -0,0 +1,11 @@
+--- src/wp/impexp/xp/ie_imp_MsWord_97.cpp.orig	Mon Aug 25 04:03:16 2003
++++ src/wp/impexp/xp/ie_imp_MsWord_97.cpp	Mon Aug 25 04:03:27 2003
+@@ -3402,7 +3402,7 @@
+     comprLen = size;
+     uncomprLen = b->blip.metafile.m_cb;
+     unsigned char *uncompr = new unsigned char[uncomprLen];
+-    int err = uncompress (uncompr, &uncomprLen, data, comprLen);
++    int err = uncompress (uncompr, &uncomprLen, (unsigned char *)data, comprLen);
+     if (err != Z_OK)
+       {
+ 	UT_DEBUGMSG(("Could not uncompress image\n"));
diff --git a/editors/abiword/pkg-plist b/editors/abiword/pkg-plist
index 5d9a7fab1eb5..6b0cf676066c 100644
--- a/editors/abiword/pkg-plist
+++ b/editors/abiword/pkg-plist
@@ -178,7 +178,7 @@ share/AbiSuite-2.0/icons/abiword_16.xpm
 share/AbiSuite-2.0/icons/abiword_48.png
 share/AbiSuite-2.0/icons/abiword_48.tif
 share/AbiSuite-2.0/icons/abiword_48.xpm
-%%GNOME:%%share/AbiSuite-2.0/icons/abiword_logo.xpm
+share/AbiSuite-2.0/icons/abiword_logo.xpm
 share/AbiSuite-2.0/templates/A4.awt
 share/AbiSuite-2.0/templates/Business-Report.awt
 share/AbiSuite-2.0/templates/Employee-Directory.awt
@@ -254,6 +254,40 @@ share/gnome/pixmaps/abiword_48.png
 @dirrm share/AbiSuite-2.0/clipart
 @dirrm share/AbiSuite-2.0/AbiWord/strings
 @dirrm share/AbiSuite-2.0/AbiWord/scripts
+@dirrm share/AbiSuite-2.0/AbiWord/sample/en-US
+@dirrm share/AbiSuite-2.0/AbiWord/sample
+@dirrm share/AbiSuite-2.0/AbiWord/help/images
+@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/tutorial
+@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/problems
+@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/plugins
+@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/interface/workspace.xhtml_data
+@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/interface/rulers.xhtml_data
+@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/interface/dialogreplace.xhtml_data
+@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/interface
+@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/info
+@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/images
+@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/howto/howtoword.xhtml_data
+@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/howto/howtoweb.xhtml_data
+@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/howto
+@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR
+@dirrm share/AbiSuite-2.0/AbiWord/help/es-ES
+@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/tutorial
+@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/problems
+@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/interface/workspace.xhtml_data
+@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/interface/rulers.xhtml_data
+@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/interface/menufile.xhtml_data
+@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogreplace.xhtml_data
+@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/interface
+@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/info
+@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/images
+@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/howto/howtoword.xhtml_data
+@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/howto/howtoweb.xhtml_data
+@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/howto
+@dirrm share/AbiSuite-2.0/AbiWord/help/en-US
+@dirrm share/AbiSuite-2.0/AbiWord/help/de-DE/images
+@dirrm share/AbiSuite-2.0/AbiWord/help/de-DE/de_DE
+@dirrm share/AbiSuite-2.0/AbiWord/help/de-DE
+@dirrm share/AbiSuite-2.0/AbiWord/help
 @dirrm share/AbiSuite-2.0/AbiWord/glade
 @dirrm share/AbiSuite-2.0/AbiWord
 @dirrm share/AbiSuite-2.0