Update to 2.0.4. Note: opening Word document is still broken, but a bug has

been filed:

http://bugzilla.abisource.com/show_bug.cgi?id=6466

For a list of what's new, checkout:

http://www.abisource.com/changelogs/2.0.4.phtml

9 files changed, 42 insertions, 33 deletions

diff --git a/editors/AbiWord2/Makefile b/editors/AbiWord2/Makefile
index 4ce5933e4bf2..e5f3b6d6ee7d 100644
--- a/editors/AbiWord2/Makefile
+++ b/editors/AbiWord2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	AbiWord2
-PORTVERSION=	2.0.3
-PORTREVISION=	2
+PORTVERSION=	2.0.4
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.abisource.com/downloads/Version-${PORTVERSION}/lf/
@@ -88,6 +87,7 @@ post-patch:
 	@${FIND} ${WRKSRC}/src/config/platforms -name "*.mk" | ${XARGS} \
 		${REINPLACE_CMD} 's|-ansi||g ; \
 		s|-pedantic||g'
+	@${RM} -rf ${WRKSRC}/autom4te.cache
 
 pre-configure:
 	@cd ${WRKSRC} && ${TOUCH} NEWS README AUTHORS ChangeLog INSTALL
diff --git a/editors/AbiWord2/distinfo b/editors/AbiWord2/distinfo
index 3594faf84208..f63141f98d00 100644
--- a/editors/AbiWord2/distinfo
+++ b/editors/AbiWord2/distinfo
@@ -1 +1,2 @@
-MD5 (AbiWord/abiword-2.0.3.tar.bz2) = aa97aec08c353356dcb95b7634b56e9d
+MD5 (AbiWord/abiword-2.0.4.tar.bz2) = f14699fa3c64f88ec47e0214b127abfd
+SIZE (AbiWord/abiword-2.0.4.tar.bz2) = 22057414
diff --git a/editors/AbiWord2/files/patch-autogen.sh b/editors/AbiWord2/files/patch-autogen.sh
index 69904877598b..666294e14182 100644
--- a/editors/AbiWord2/files/patch-autogen.sh
+++ b/editors/AbiWord2/files/patch-autogen.sh
@@ -1,5 +1,5 @@
---- autogen.sh.orig	Mon Oct  6 04:00:53 2003
-+++ autogen.sh	Fri Oct 31 16:07:18 2003
+--- autogen.sh.orig	Fri Feb 20 08:29:23 2004
++++ autogen.sh	Sat Mar  6 03:36:00 2004
 @@ -10,7 +10,7 @@
  
  rm -f autogen.err
@@ -9,7 +9,7 @@
  
  if [ $? -ne 0 ]; then
      echo "Error: you need automake 1.4 or later.  Please upgrade."
-@@ -19,17 +19,17 @@
+@@ -19,9 +19,9 @@
  
  # Produce aclocal.m4, so autoconf gets the automake macros it needs
  # 
@@ -19,9 +19,11 @@
 -aclocal -I ac-helpers $ACLOCAL_FLAGS 2>> autogen.err
 +%%ACLOCAL%% -I ac-helpers $ACLOCAL_FLAGS 2>> autogen.err
  
- echo "Checking for PKG_CHECK_MODULES..."
+ if test -f autom4te.cache/requests; then
+     echo "Checking for PKG_CHECK_MODULES in autom4te.cache/requests ..."
+@@ -32,9 +32,9 @@
+ fi
  
- 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) || {
@@ -31,8 +33,8 @@
 +    echo "%%ACLOCAL%% failed! Unable to continue."
      exit 1
    }
-   pkgcheckdef=`grep PKG_CHECK_MODULES aclocal.m4 | grep AC_DEFUN`
-@@ -51,9 +51,9 @@
+   if test -f autom4te.cache/requests; then
+@@ -62,9 +62,9 @@
  # Produce all the `GNUmakefile.in's and create neat missing things
  # like `install-sh', etc.
  # 
@@ -44,7 +46,7 @@
      echo ""
      echo "* * * warning: possible errors while running automake - check autogen.err"
      echo ""
-@@ -69,7 +69,7 @@
+@@ -80,7 +80,7 @@
  # 
  echo "Creating configure..."
  
diff --git a/editors/abiword-devel/Makefile b/editors/abiword-devel/Makefile
index 4ce5933e4bf2..e5f3b6d6ee7d 100644
--- a/editors/abiword-devel/Makefile
+++ b/editors/abiword-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	AbiWord2
-PORTVERSION=	2.0.3
-PORTREVISION=	2
+PORTVERSION=	2.0.4
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.abisource.com/downloads/Version-${PORTVERSION}/lf/
@@ -88,6 +87,7 @@ post-patch:
 	@${FIND} ${WRKSRC}/src/config/platforms -name "*.mk" | ${XARGS} \
 		${REINPLACE_CMD} 's|-ansi||g ; \
 		s|-pedantic||g'
+	@${RM} -rf ${WRKSRC}/autom4te.cache
 
 pre-configure:
 	@cd ${WRKSRC} && ${TOUCH} NEWS README AUTHORS ChangeLog INSTALL
diff --git a/editors/abiword-devel/distinfo b/editors/abiword-devel/distinfo
index 3594faf84208..f63141f98d00 100644
--- a/editors/abiword-devel/distinfo
+++ b/editors/abiword-devel/distinfo
@@ -1 +1,2 @@
-MD5 (AbiWord/abiword-2.0.3.tar.bz2) = aa97aec08c353356dcb95b7634b56e9d
+MD5 (AbiWord/abiword-2.0.4.tar.bz2) = f14699fa3c64f88ec47e0214b127abfd
+SIZE (AbiWord/abiword-2.0.4.tar.bz2) = 22057414
diff --git a/editors/abiword-devel/files/patch-autogen.sh b/editors/abiword-devel/files/patch-autogen.sh
index 69904877598b..666294e14182 100644
--- a/editors/abiword-devel/files/patch-autogen.sh
+++ b/editors/abiword-devel/files/patch-autogen.sh
@@ -1,5 +1,5 @@
---- autogen.sh.orig	Mon Oct  6 04:00:53 2003
-+++ autogen.sh	Fri Oct 31 16:07:18 2003
+--- autogen.sh.orig	Fri Feb 20 08:29:23 2004
++++ autogen.sh	Sat Mar  6 03:36:00 2004
 @@ -10,7 +10,7 @@
  
  rm -f autogen.err
@@ -9,7 +9,7 @@
  
  if [ $? -ne 0 ]; then
      echo "Error: you need automake 1.4 or later.  Please upgrade."
-@@ -19,17 +19,17 @@
+@@ -19,9 +19,9 @@
  
  # Produce aclocal.m4, so autoconf gets the automake macros it needs
  # 
@@ -19,9 +19,11 @@
 -aclocal -I ac-helpers $ACLOCAL_FLAGS 2>> autogen.err
 +%%ACLOCAL%% -I ac-helpers $ACLOCAL_FLAGS 2>> autogen.err
  
- echo "Checking for PKG_CHECK_MODULES..."
+ if test -f autom4te.cache/requests; then
+     echo "Checking for PKG_CHECK_MODULES in autom4te.cache/requests ..."
+@@ -32,9 +32,9 @@
+ fi
  
- 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) || {
@@ -31,8 +33,8 @@
 +    echo "%%ACLOCAL%% failed! Unable to continue."
      exit 1
    }
-   pkgcheckdef=`grep PKG_CHECK_MODULES aclocal.m4 | grep AC_DEFUN`
-@@ -51,9 +51,9 @@
+   if test -f autom4te.cache/requests; then
+@@ -62,9 +62,9 @@
  # Produce all the `GNUmakefile.in's and create neat missing things
  # like `install-sh', etc.
  # 
@@ -44,7 +46,7 @@
      echo ""
      echo "* * * warning: possible errors while running automake - check autogen.err"
      echo ""
-@@ -69,7 +69,7 @@
+@@ -80,7 +80,7 @@
  # 
  echo "Creating configure..."
  
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index 4ce5933e4bf2..e5f3b6d6ee7d 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	AbiWord2
-PORTVERSION=	2.0.3
-PORTREVISION=	2
+PORTVERSION=	2.0.4
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.abisource.com/downloads/Version-${PORTVERSION}/lf/
@@ -88,6 +87,7 @@ post-patch:
 	@${FIND} ${WRKSRC}/src/config/platforms -name "*.mk" | ${XARGS} \
 		${REINPLACE_CMD} 's|-ansi||g ; \
 		s|-pedantic||g'
+	@${RM} -rf ${WRKSRC}/autom4te.cache
 
 pre-configure:
 	@cd ${WRKSRC} && ${TOUCH} NEWS README AUTHORS ChangeLog INSTALL
diff --git a/editors/abiword/distinfo b/editors/abiword/distinfo
index 3594faf84208..f63141f98d00 100644
--- a/editors/abiword/distinfo
+++ b/editors/abiword/distinfo
@@ -1 +1,2 @@
-MD5 (AbiWord/abiword-2.0.3.tar.bz2) = aa97aec08c353356dcb95b7634b56e9d
+MD5 (AbiWord/abiword-2.0.4.tar.bz2) = f14699fa3c64f88ec47e0214b127abfd
+SIZE (AbiWord/abiword-2.0.4.tar.bz2) = 22057414
diff --git a/editors/abiword/files/patch-autogen.sh b/editors/abiword/files/patch-autogen.sh
index 69904877598b..666294e14182 100644
--- a/editors/abiword/files/patch-autogen.sh
+++ b/editors/abiword/files/patch-autogen.sh
@@ -1,5 +1,5 @@
---- autogen.sh.orig	Mon Oct  6 04:00:53 2003
-+++ autogen.sh	Fri Oct 31 16:07:18 2003
+--- autogen.sh.orig	Fri Feb 20 08:29:23 2004
++++ autogen.sh	Sat Mar  6 03:36:00 2004
 @@ -10,7 +10,7 @@
  
  rm -f autogen.err
@@ -9,7 +9,7 @@
  
  if [ $? -ne 0 ]; then
      echo "Error: you need automake 1.4 or later.  Please upgrade."
-@@ -19,17 +19,17 @@
+@@ -19,9 +19,9 @@
  
  # Produce aclocal.m4, so autoconf gets the automake macros it needs
  # 
@@ -19,9 +19,11 @@
 -aclocal -I ac-helpers $ACLOCAL_FLAGS 2>> autogen.err
 +%%ACLOCAL%% -I ac-helpers $ACLOCAL_FLAGS 2>> autogen.err
  
- echo "Checking for PKG_CHECK_MODULES..."
+ if test -f autom4te.cache/requests; then
+     echo "Checking for PKG_CHECK_MODULES in autom4te.cache/requests ..."
+@@ -32,9 +32,9 @@
+ fi
  
- 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) || {
@@ -31,8 +33,8 @@
 +    echo "%%ACLOCAL%% failed! Unable to continue."
      exit 1
    }
-   pkgcheckdef=`grep PKG_CHECK_MODULES aclocal.m4 | grep AC_DEFUN`
-@@ -51,9 +51,9 @@
+   if test -f autom4te.cache/requests; then
+@@ -62,9 +62,9 @@
  # Produce all the `GNUmakefile.in's and create neat missing things
  # like `install-sh', etc.
  # 
@@ -44,7 +46,7 @@
      echo ""
      echo "* * * warning: possible errors while running automake - check autogen.err"
      echo ""
-@@ -69,7 +69,7 @@
+@@ -80,7 +80,7 @@
  # 
  echo "Creating configure..."