Update to 1.99.6 (aka 2.0 RC2).

4 files changed, 2 insertions, 47 deletions

diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index 32048b1019f0..82ab32e73b34 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	AbiWord2
-PORTVERSION=	1.99.5
+PORTVERSION=	1.99.6
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.abisource.com/downloads/Version-${PORTVERSION}/lf/
diff --git a/editors/abiword/distinfo b/editors/abiword/distinfo
index 7b81015f1fb1..0cdec76a2a23 100644
--- a/editors/abiword/distinfo
+++ b/editors/abiword/distinfo
@@ -1 +1 @@
-MD5 (AbiWord/abiword-1.99.5.tar.bz2) = 4b6fac4f358c0e83ffdd190260d9b6c4
+MD5 (AbiWord/abiword-1.99.6.tar.bz2) = cf882f9954d4a742bf2ff3b506f85a4b
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
deleted file mode 100644
index 80c0b5b77580..000000000000
--- a/editors/abiword/files/patch-src_wp_impexp_xp_ie_imp_MsWord_97.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 82bbf9b4f91a..5d9a7fab1eb5 100644
--- a/editors/abiword/pkg-plist
+++ b/editors/abiword/pkg-plist
@@ -254,40 +254,6 @@ 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