-Update to 2.1.5.

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

6 files changed, 29 insertions, 29 deletions

diff --git a/editors/AbiWord2/Makefile b/editors/AbiWord2/Makefile
index daabfd96f..5a9b994cc 100644
--- a/editors/AbiWord2/Makefile
+++ b/editors/AbiWord2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	AbiWord2
-PORTVERSION=	2.1.3
-PORTREVISION=	1
+PORTVERSION=	2.1.5
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.abisource.com/downloads/Version-${PORTVERSION}/lf/
@@ -58,7 +57,7 @@ PLIST_SUB+=		DICT:=""
 .include <bsd.port.pre.mk>
 
 .if ${HAVE_GNOME:Mnautilus2}!="" && ${HAVE_GNOME:Mlibgnomeprintui}!=""
-USE_GNOME+=		nautilus2 libgnomeprintui
+USE_GNOME+=		nautilus2 libgnomeprintui desktopfileutils
 CONFIGURE_ARGS+=	--enable-gnome
 PKGNAMESUFFIX=		-gnome
 GNOME_ENABLED=		yes
@@ -92,13 +91,14 @@ post-install:
 	@${MKDIR} ${PREFIX}/lib/AbiWord-${ABIVERSION}/plugins
 .if defined(GNOME_ENABLED)
 	@${INSTALL_DATA} ${WRKSRC}/abiword.desktop \
-		${X11BASE}/share/gnome/apps/Applications/abiword.desktop
+		${X11BASE}/share/gnome/applications/abiword.desktop
 	@${LN} -sf ${PREFIX}/share/AbiSuite-${ABIVERSION}/icons/abiword_48.png \
 		${X11BASE}/share/gnome/pixmaps/abiword_48.png
 	@${LN} -sf ${PREFIX}/share/AbiSuite-${ABIVERSION}/GNOME_AbiWord_Control_${ABIVERSION:S/./_/}.server \
 		${X11BASE}/libdata/bonobo/servers/GNOME_AbiWord_Control_${ABIVERSION:S/./_/}.server
 	@${LN} -sf ${PREFIX}/share/AbiSuite-${ABIVERSION}/abi-nautilus-view-file.xml \
 		${X11BASE}/share/gnome/gnome-2.0/ui/abi-nautilus-view-file.xml
+	@${X11BASE}/bin/update-desktop-database
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/editors/AbiWord2/distinfo b/editors/AbiWord2/distinfo
index cd31de615..c53f35181 100644
--- a/editors/AbiWord2/distinfo
+++ b/editors/AbiWord2/distinfo
@@ -1,2 +1,2 @@
-MD5 (AbiWord/abiword-2.1.3.tar.bz2) = 991135782dc152f6df68fb4c2de2b834
-SIZE (AbiWord/abiword-2.1.3.tar.bz2) = 23422478
+MD5 (AbiWord/abiword-2.1.5.tar.bz2) = 3c9708cfda2a7da0a4a0f53bc3672798
+SIZE (AbiWord/abiword-2.1.5.tar.bz2) = 23457123
diff --git a/editors/AbiWord2/files/patch-abiword.desktop b/editors/AbiWord2/files/patch-abiword.desktop
index 1253b21b4..985bbc229 100644
--- a/editors/AbiWord2/files/patch-abiword.desktop
+++ b/editors/AbiWord2/files/patch-abiword.desktop
@@ -1,6 +1,6 @@
---- abiword.desktop.orig	Sun Mar 28 15:35:29 2004
-+++ abiword.desktop	Sun Mar 28 15:35:40 2004
-@@ -13,7 +13,7 @@
+--- abiword.desktop.orig	Sat Jul 31 12:57:52 2004
++++ abiword.desktop	Fri Aug 13 20:29:41 2004
+@@ -3,11 +3,10 @@
  Icon=abiword_48.png
  Terminal=false
  Type=Application
@@ -8,4 +8,9 @@
 +Categories=Application;Office;WordProcessor;
  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;
+ Name=Word Processor
+ Comment=AbiWord Word Processor
+ Name[de]=Textverarbeitung
diff --git a/editors/AbiWord2/pkg-plist b/editors/AbiWord2/pkg-plist
index 02755c38a..d3fddee9b 100644
--- a/editors/AbiWord2/pkg-plist
+++ b/editors/AbiWord2/pkg-plist
@@ -3,7 +3,6 @@ bin/abiword
 bin/ttfadmin.sh
 bin/ttftool
 %%GNOME:%%libdata/bonobo/servers/GNOME_AbiWord_Control_2_2.server
-share/AbiSuite-%%ABIVERSION%%/AbiWord.exe.MANIFEST
 share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_Break.glade
 share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_Field.glade
 share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_FormatFootnotes.glade
@@ -76,6 +75,7 @@ share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/nn-NO.strings
 share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/pl-PL.strings
 share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/pt-BR.strings
 share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/pt-PT.strings
+share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/qu-BO.strings
 share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/ro-RO.strings
 share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/ru-RU.strings
 share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/sc-IT.strings
@@ -84,6 +84,7 @@ share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/sl-SI.strings
 share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/sq-AL.strings
 share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/sr.strings
 share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/sv-SE.strings
+share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/ta-IN.strings
 share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/tr-TR.strings
 share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/uk-UA.strings
 share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/vi-VN.strings
@@ -160,9 +161,6 @@ share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-ur-PK
 share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-yi
 share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-zh-CN
 share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-zh-TW
-share/AbiSuite-%%ABIVERSION%%/GNOME_AbiWord_Control_2_2.server
-share/AbiSuite-%%ABIVERSION%%/README
-share/AbiSuite-%%ABIVERSION%%/abi-nautilus-view-file.xml
 share/AbiSuite-%%ABIVERSION%%/clipart/book.png
 share/AbiSuite-%%ABIVERSION%%/clipart/chip.png
 share/AbiSuite-%%ABIVERSION%%/clipart/fun.png
@@ -266,7 +264,8 @@ share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-ur_PK
 share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-yi
 share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-zh_CN
 share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-zh_TW
-%%GNOME:%%share/gnome/apps/Applications/abiword.desktop
+%%GNOME:%%share/gnome/applications/abiword.desktop
+%%GNOME:%%@exec update-desktop-database > /dev/null || /usr/bin/true
 %%GNOME:%%share/gnome/gnome-2.0/ui/abi-nautilus-view-file.xml
 %%GNOME:%%share/gnome/pixmaps/abiword_48.png
 @dirrm share/AbiSuite-%%ABIVERSION%%/templates
@@ -280,3 +279,4 @@ share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-zh_TW
 @dirrm share/AbiSuite-%%ABIVERSION%%
 @dirrm lib/AbiWord-%%ABIVERSION%%/plugins
 @dirrm lib/AbiWord-%%ABIVERSION%%
+%%GNOME:%%@unexec update-desktop-database > /dev/null || /usr/bin/true
diff --git a/editors/abiword-plugins/Makefile b/editors/abiword-plugins/Makefile
index 8952f8987..7e333b2d9 100644
--- a/editors/abiword-plugins/Makefile
+++ b/editors/abiword-plugins/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	abiword
-PORTVERSION=	2.1.3
-PORTREVISION=	2
+PORTVERSION=	2.1.5
 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
index 45f8a7dc3..a395724db 100644
--- a/editors/abiword-plugins/files/patch-tools::aiksaurus::xp::AiksaurusABI.cpp
+++ b/editors/abiword-plugins/files/patch-tools::aiksaurus::xp::AiksaurusABI.cpp
@@ -1,6 +1,6 @@
---- tools/aiksaurus/xp/AiksaurusABI.cpp.orig	Sun Jun 15 07:09:42 2003
-+++ tools/aiksaurus/xp/AiksaurusABI.cpp	Fri Jul 23 12:19:18 2004
-@@ -310,13 +310,13 @@
+--- 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.
@@ -9,12 +9,8 @@
      if (!pView->isSelectionEmpty())
      {
          // We need to get the Ascii version of the current word.
--        search = AiksaurusABI_ucsToAscii(
--					 pView->getSelectionText()
--        );
-+        UT_UCS4Char *ucs4ST;
-+        pView->getSelectionText(*&ucs4ST);
-+        search = AiksaurusABI_ucsToAscii(ucs4ST);
-     }
- 
-     // Now we will run the thesaurus dialog and get a response.
+-        UT_UCS4Char * ucs4ST;
++	 UT_UCS4Char * ucs4ST;
+ 	 pView->getSelectionText(*&ucs4ST);
+ 	 search = AiksaurusABI_ucsToAscii(
+ 					 ucs4ST