diff options
author | mezz <mezz@FreeBSD.org> | 2005-01-17 21:23:31 +0000 |
---|---|---|
committer | mezz <mezz@FreeBSD.org> | 2005-01-17 21:23:31 +0000 |
commit | d0981471284a813b1c504603003f7e399101873a (patch) | |
tree | a86239a6e9cd632c3994cbe8f4ed86fbb905a1bc /editors | |
parent | c4c48b206184cc8148015475f8ad7296aed5e203 (diff) | |
download | FreeBSD-ports-d0981471284a813b1c504603003f7e399101873a.zip FreeBSD-ports-d0981471284a813b1c504603003f7e399101873a.tar.gz |
-Update to 2.2.3, see more details:
http://www.abisource.com/release-notes/2.2.3.phtml
http://www.abisource.com/changelogs/2.2.3.phtml
-Remove the 'text/plain' mimetype in the favor of 10 days vote @ freebsd-gnome.
no 12% (3 votes)
yes 87% (21 votes)
-Few of our patches have been merged in the this release.
Diffstat (limited to 'editors')
20 files changed, 76 insertions, 198 deletions
diff --git a/editors/abiword-devel/Makefile b/editors/abiword-devel/Makefile index e6e6219..a7ff92c 100644 --- a/editors/abiword-devel/Makefile +++ b/editors/abiword-devel/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-devel/distinfo b/editors/abiword-devel/distinfo index 9707880..39f352b 100644 --- a/editors/abiword-devel/distinfo +++ b/editors/abiword-devel/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-devel/files/patch-GNUmakefile.in b/editors/abiword-devel/files/patch-GNUmakefile.in index ad9a02c..e7b1b3f 100644 --- a/editors/abiword-devel/files/patch-GNUmakefile.in +++ b/editors/abiword-devel/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-devel/files/patch-abiword.desktop b/editors/abiword-devel/files/patch-abiword.desktop index b314f94..94e4f58 100644 --- a/editors/abiword-devel/files/patch-abiword.desktop +++ b/editors/abiword-devel/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-devel/files/patch-af b/editors/abiword-devel/files/patch-af deleted file mode 100644 index 502e8de..0000000 --- a/editors/abiword-devel/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-devel/files/patch-src::af::ev::unix::ev_UnixMenu.cpp b/editors/abiword-devel/files/patch-src::af::ev::unix::ev_UnixMenu.cpp deleted file mode 100644 index 7151aa6..0000000 --- a/editors/abiword-devel/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-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 0000000..97fad92 --- /dev/null +++ b/editors/abiword-devel/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-devel/pkg-plist b/editors/abiword-devel/pkg-plist index b8725b3..2dc4359 100644 --- a/editors/abiword-devel/pkg-plist +++ b/editors/abiword-devel/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 diff --git a/editors/abiword-plugins-devel/Makefile b/editors/abiword-plugins-devel/Makefile index 20953c3..157327a 100644 --- a/editors/abiword-plugins-devel/Makefile +++ b/editors/abiword-plugins-devel/Makefile @@ -6,7 +6,7 @@ # PORTNAME= abiword -PORTVERSION= 2.2.1 +PORTVERSION= 2.2.3 CATEGORIES= editors MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://www.abisource.com/downloads/Version-${PORTVERSION}/lf/ diff --git a/editors/abiword-plugins-devel/files/patch-tools::aiksaurus::xp::AiksaurusABI.cpp b/editors/abiword-plugins-devel/files/patch-tools::aiksaurus::xp::AiksaurusABI.cpp deleted file mode 100644 index a395724..0000000 --- a/editors/abiword-plugins-devel/files/patch-tools::aiksaurus::xp::AiksaurusABI.cpp +++ /dev/null @@ -1,16 +0,0 @@ ---- tools/aiksaurus/xp/AiksaurusABI.cpp.orig Fri Aug 13 21:09:34 2004 -+++ tools/aiksaurus/xp/AiksaurusABI.cpp Fri Aug 13 21:10:33 2004 -@@ -310,11 +310,11 @@ - pView->extSelTo(FV_DOCPOS_EOW_SELECT); - - // Now we will figure out what word to look up when we open our dialog. -- char* search = ""; -+ char* search = NULL; - if (!pView->isSelectionEmpty()) - { - // We need to get the Ascii version of the current word. -- UT_UCS4Char * ucs4ST; -+ UT_UCS4Char * ucs4ST; - pView->getSelectionText(*&ucs4ST); - search = AiksaurusABI_ucsToAscii( - ucs4ST diff --git a/editors/abiword-plugins/Makefile b/editors/abiword-plugins/Makefile index 20953c3..157327a 100644 --- a/editors/abiword-plugins/Makefile +++ b/editors/abiword-plugins/Makefile @@ -6,7 +6,7 @@ # PORTNAME= abiword -PORTVERSION= 2.2.1 +PORTVERSION= 2.2.3 CATEGORIES= editors MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://www.abisource.com/downloads/Version-${PORTVERSION}/lf/ diff --git a/editors/abiword-plugins/files/patch-tools::aiksaurus::xp::AiksaurusABI.cpp b/editors/abiword-plugins/files/patch-tools::aiksaurus::xp::AiksaurusABI.cpp deleted file mode 100644 index a395724..0000000 --- a/editors/abiword-plugins/files/patch-tools::aiksaurus::xp::AiksaurusABI.cpp +++ /dev/null @@ -1,16 +0,0 @@ ---- tools/aiksaurus/xp/AiksaurusABI.cpp.orig Fri Aug 13 21:09:34 2004 -+++ tools/aiksaurus/xp/AiksaurusABI.cpp Fri Aug 13 21:10:33 2004 -@@ -310,11 +310,11 @@ - pView->extSelTo(FV_DOCPOS_EOW_SELECT); - - // Now we will figure out what word to look up when we open our dialog. -- char* search = ""; -+ char* search = NULL; - if (!pView->isSelectionEmpty()) - { - // We need to get the Ascii version of the current word. -- UT_UCS4Char * ucs4ST; -+ UT_UCS4Char * ucs4ST; - pView->getSelectionText(*&ucs4ST); - search = AiksaurusABI_ucsToAscii( - ucs4ST diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile index e6e6219..a7ff92c 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 9707880..39f352b 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 ad9a02c..e7b1b3f 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 b314f94..94e4f58 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 502e8de..0000000 --- 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 7151aa6..0000000 --- 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 0000000..97fad92 --- /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 b8725b3..2dc4359 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 |