8 files changed, 37 insertions, 82 deletions

diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index e6e62191544a..a7ff92c67605 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	abiword
-PORTVERSION=	2.2.1
-PORTREVISION=	1
+PORTVERSION=	2.2.3
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	abiword
diff --git a/editors/abiword/distinfo b/editors/abiword/distinfo
index 970788033141..39f352bb5cd9 100644
--- a/editors/abiword/distinfo
+++ b/editors/abiword/distinfo
@@ -1,2 +1,2 @@
-MD5 (AbiWord/abiword-2.2.1.tar.bz2) = 1e70a9ee1daee1206fb873bdcd35bcb9
-SIZE (AbiWord/abiword-2.2.1.tar.bz2) = 22868079
+MD5 (AbiWord/abiword-2.2.3.tar.bz2) = 814d9169a46fdeaa40565bc2b567ef42
+SIZE (AbiWord/abiword-2.2.3.tar.bz2) = 23472285
diff --git a/editors/abiword/files/patch-GNUmakefile.in b/editors/abiword/files/patch-GNUmakefile.in
index ad9a02ccfca8..e7b1b3f4059a 100644
--- a/editors/abiword/files/patch-GNUmakefile.in
+++ b/editors/abiword/files/patch-GNUmakefile.in
@@ -1,33 +1,31 @@
---- GNUmakefile.in.orig	Thu Jun 17 14:48:13 2004
-+++ GNUmakefile.in	Thu Jun 17 14:49:43 2004
-@@ -149,17 +149,17 @@
- 
+--- GNUmakefile.in.orig	Wed Jan  5 15:28:11 2005
++++ GNUmakefile.in	Wed Jan  5 15:30:55 2005
+@@ -315,15 +315,15 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
  SUBDIRS = src
- 
 -expat_peerdir = $(top_builddir)/../expat
 -wv_peerdir = $(top_builddir)/../wv
 -libiconv_peerdir = $(top_builddir)/../libiconv
 -libpng_peerdir = @LIBPNG_PEERDIR@
 -libpopt_peerdir = $(top_builddir)/../popt
+-desktop_DATA = abiword.desktop
+-desktopdir = $(datadir)/applications
+-icon_DATA = abiword_48.png
+-icondir = $(datadir)/icons
 +#expat_peerdir = $(top_builddir)/../expat
 +#wv_peerdir = $(top_builddir)/../wv
 +#libiconv_peerdir = $(top_builddir)/../libiconv
 +#libpng_peerdir = @LIBPNG_PEERDIR@
 +#libpopt_peerdir = $(top_builddir)/../popt
- 
--desktop_DATA = abiword.desktop
--desktopdir = $(datadir)/applications
 +#desktop_DATA = abiword.desktop
 +#desktopdir = $(datadir)/applications
- 
--icon_DATA = abiword_48.png
--icondir = $(datadir)/icons
 +#icon_DATA = abiword_48.png
 +#icondir = $(datadir)/icons
- 
- @BIGENDIAN_TRUE@dictionary = $(top_srcdir)/../abidistfiles/dictionary/BigEndian32.american.hash
  @BIGENDIAN_FALSE@dictionary = $(top_srcdir)/../abidistfiles/dictionary/LittleEndian32.american.hash
-@@ -550,7 +550,6 @@
+ @BIGENDIAN_TRUE@dictionary = $(top_srcdir)/../abidistfiles/dictionary/BigEndian32.american.hash
+ @WITH_ISPELL_FALSE@INSTALLDICTIONARY = no
+@@ -816,7 +816,6 @@
  
  # Install the datafiles. This is quick-and-dirty.
  install-data-local:
@@ -35,8 +33,8 @@
  	if test -d $(top_srcdir)/../abidistfiles ; then \
  	  for dir in `cd $(top_srcdir)/../abidistfiles; find . -type d ! -name CVS` ; do \
  	    $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/$$dir ;\
-@@ -563,11 +562,7 @@
- 	      for file in $(top_srcdir)/../abidistfiles/$$dir/* ; do \
+@@ -829,11 +828,7 @@
+ 	      for file in `echo $(top_srcdir)/../abidistfiles/$$dir/* | grep -v MANIFEST`; do \
  	        if test -f $$file ; then \
  		  sfile=`echo "$$file" | sed 's/\.[^.]*$$//'`; \
 -		  if test "$$sfile.server" = $$file; then \
diff --git a/editors/abiword/files/patch-abiword.desktop b/editors/abiword/files/patch-abiword.desktop
index b314f946e3cd..94e4f5884ff2 100644
--- a/editors/abiword/files/patch-abiword.desktop
+++ b/editors/abiword/files/patch-abiword.desktop
@@ -1,6 +1,6 @@
---- abiword.desktop.orig	Sat Dec  4 02:09:21 2004
-+++ abiword.desktop	Sat Dec  4 02:10:07 2004
-@@ -3,10 +3,9 @@
+--- abiword.desktop.orig	Sun Nov 28 12:52:11 2004
++++ abiword.desktop	Fri Jan 14 03:04:18 2005
+@@ -3,11 +3,10 @@
  Icon=abiword_48.png
  Terminal=false
  Type=Application
@@ -9,6 +9,8 @@
  StartupNotify=true
  Encoding=UTF-8
 -X-Desktop-File-Install-Version=0.4
- MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;text/plain;
+-MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;text/plain;
++MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;
  Name=AbiWord Word Processor
  Name[de]=AbiWord Textverarbeitung
+ Name[nb]=AbiWord Tekstbehandling
diff --git a/editors/abiword/files/patch-af b/editors/abiword/files/patch-af
deleted file mode 100644
index 502e8de76cd9..000000000000
--- a/editors/abiword/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/abiword/files/patch-src::af::ev::unix::ev_UnixMenu.cpp b/editors/abiword/files/patch-src::af::ev::unix::ev_UnixMenu.cpp
deleted file mode 100644
index 7151aa6a23a2..000000000000
--- a/editors/abiword/files/patch-src::af::ev::unix::ev_UnixMenu.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
---- src/af/ev/unix/ev_UnixMenu.cpp.orig	Sat Dec 11 16:05:23 2004
-+++ src/af/ev/unix/ev_UnixMenu.cpp	Sat Dec 11 16:09:41 2004
-@@ -431,22 +431,20 @@
- 	return true;
- }
- 
--static char _ev_get_underlined_char(const char * szString)
-+static guint _ev_get_underlined_char(const char * szString)
- {
- 
- 	UT_ASSERT(szString);
- 	
--	// return the char right after the underline
--	const char * p = szString;
--	while (*p && *(p+1))
-+	// return the keycode right after the underline
-+	const UT_UCS4String str(szString);
-+	for (int i = 0; i < str.length() - 1; )
- 	{
--		if (*p == '_')
--			return *++p;
--		else
--			p++;
-+		if (str[i++] == '_')
-+			return gdk_unicode_to_keyval(str[i]);
- 	}
- 
--	return 0;
-+	return GDK_VoidSymbol;
- }
- 
- static void _ev_strip_underline(char * bufResult,
-@@ -749,12 +747,12 @@
- 				// version of the underlined char, since all the menus ignore upper
- 				// case (SHIFT-MOD1-[char]) invokations of accelerators.
- 
--				if (bAltOnMod1)
-+				if (keyCode != GDK_VoidSymbol && bAltOnMod1)
- 				{
- 					EV_EditEventMapper * pEEM = XAP_App::getApp()->getEditEventMapper();
- 					UT_ASSERT(pEEM);
- 					EV_EditMethod * pEM = NULL;
--					pEEM->Keystroke(EV_EKP_PRESS|EV_EMS_ALT|tolower(keyCode),&pEM);
-+					pEEM->Keystroke(EV_EKP_PRESS|EV_EMS_ALT|keyCode,&pEM);
- 
- 					// if the pointer is valid, there is a conflict
- 					bConflict = (pEM != NULL);
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..97fad9259f8f
--- /dev/null
+++ b/editors/abiword/files/patch-src_af_util_xp_ut_string_class.cpp
@@ -0,0 +1,12 @@
+--- src/af/util/xp/ut_string_class.cpp.orig	Mon Jan 17 14:38:20 2005
++++ src/af/util/xp/ut_string_class.cpp	Mon Jan 17 14:38:43 2005
+@@ -352,9 +352,6 @@
+ #  else /* va_list is a pointer */
+ #  define VA_COPY(ap1, ap2)	  ((ap1) = (ap2))
+ #  endif /* va_list is a pointer */
+-#  if defined (__GNUC__)
+-#  define VA_COPY(ap1,ap2)     __va_copy((ap1),(ap2))
+-#  endif
+ #endif /* !VA_COPY */
+ 
+ UT_String& UT_String_vprintf (UT_String & inStr, const char *format,
diff --git a/editors/abiword/pkg-plist b/editors/abiword/pkg-plist
index b8725b349c16..2dc435901f8d 100644
--- a/editors/abiword/pkg-plist
+++ b/editors/abiword/pkg-plist
@@ -39,6 +39,7 @@ share/AbiSuite-%%ABIVERSION%%/AbiWord/readme.txt
 share/AbiSuite-%%ABIVERSION%%/AbiWord/scripts/abw2html.pl
 share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/am-ET.strings
 share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/ar.strings
+share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/ast-ES.strings
 share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/be-BY.strings
 share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/bg-BG.strings
 share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/br-FR.strings
@@ -69,6 +70,7 @@ share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/ja-JP.strings
 share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/jbo.strings
 share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/lt-LT.strings
 share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/lv-LV.strings
+share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/mg-MG.strings
 share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/mh-MH.strings
 share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/mk-MK.strings
 share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/ms-MY.strings