Update to 1.99.2.

4 files changed, 85 insertions, 4 deletions

diff --git a/editors/abiword-devel/Makefile b/editors/abiword-devel/Makefile
index 4c8acf9..ff51fdd 100644
--- a/editors/abiword-devel/Makefile
+++ b/editors/abiword-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	AbiWord2
-PORTVERSION=	1.99.1
+PORTVERSION=	1.99.2
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.abisource.com/downloads/Version-${PORTVERSION}/lf/
@@ -47,8 +47,8 @@ MAKEFILE=	GNUmakefile
 BROKEN=	"This port cannot be built when textproc/wv is installed because of a header conflict.  Please remove textproc/wv, and resume the build.  If textproc/wv is no longer installed, please remove ${LOCALBASE}/include/wv.h, and resume the AbiWord2 build"
 .endif
 
-.if ${HAVE_GNOME:Mnautilus2}!="" && ${HAVE_GNOME:Mgal2}!=""
-USE_GNOME+=		nautilus2 gal2
+.if ${HAVE_GNOME:Mnautilus2}!=""
+USE_GNOME+=		nautilus2
 CONFIGURE_ARGS+=	--enable-gnome
 PKGNAMESUFFIX=		-gnome
 GNOME_ENABLED=		yes
diff --git a/editors/abiword-devel/distinfo b/editors/abiword-devel/distinfo
index f9c0cb1..eabe067 100644
--- a/editors/abiword-devel/distinfo
+++ b/editors/abiword-devel/distinfo
@@ -1 +1 @@
-MD5 (AbiWord/abiword-1.99.1.tar.gz) = e96b50aea36ebf935d001b436b2bc582
+MD5 (AbiWord/abiword-1.99.2.tar.gz) = 6319519f6f8b3eb70b0370bf694350d4
diff --git a/editors/abiword-devel/files/patch-src_text_ptbl_xp_pp_AttrProp.cpp b/editors/abiword-devel/files/patch-src_text_ptbl_xp_pp_AttrProp.cpp
new file mode 100644
index 0000000..6da5af2
--- /dev/null
+++ b/editors/abiword-devel/files/patch-src_text_ptbl_xp_pp_AttrProp.cpp
@@ -0,0 +1,79 @@
+--- src/text/ptbl/xp/pp_AttrProp.cpp.orig	Sat Jul 12 02:57:05 2003
++++ src/text/ptbl/xp/pp_AttrProp.cpp	Sat Jul 12 03:04:49 2003
+@@ -82,7 +82,7 @@
+ 				void* tmp = const_cast<void*> (entry->first());
+ 				FREEP(tmp);
+ 				if (entry->second())
+-					delete static_cast<const PP_PropertyType *>(entry->second());
++					delete (const PP_PropertyType*)entry->second();
+ 				delete entry;
+ 			}
+ 		}
+@@ -336,7 +336,7 @@
+ 
+ 		FREEP(tmp);
+ 		if (p->second())
+-			delete static_cast<const PP_PropertyType *>(p->second());
++			delete (const PP_PropertyType *)p->second();
+ 		delete p;
+ 
+ 		if(bRemove)
+@@ -406,7 +406,7 @@
+ 	if ( (i == ndx) && c.is_valid())
+  		{
+ 		  szName = static_cast<const XML_Char*>(c.key().c_str());
+-		  szValue = static_cast<const XML_Char*>(static_cast<const UT_Pair*>(val)->first());
++		  szValue = (const XML_Char*)(static_cast<const UT_Pair*>(val)->first());
+ 		  return true;
+  		}
+ 	return false;
+@@ -421,7 +421,7 @@
+ 	if (!pEntry)
+ 		return false;
+ 
+-	szValue = static_cast<const XML_Char *>(static_cast<const UT_Pair*>(pEntry)->first());
++	szValue = (const XML_Char *)(static_cast<const UT_Pair*>(pEntry)->first());
+ 
+ 	return true;
+ }
+@@ -440,12 +440,12 @@
+ 		m_pProperties->set(szName, new UT_Pair
+ 				   (pEntry->first(),
+ 				    PP_PropertyType::createPropertyType(Type,
+-									static_cast<const XML_Char *>(pEntry->first()))));
++									(const XML_Char *)(pEntry->first()))));
+ 		delete pEntry;
+ 		pEntry = static_cast<const UT_Pair *>(m_pProperties->pick(szName));
+ 	}
+ 
+-	return static_cast<const PP_PropertyType *>(pEntry->second());
++	return (const PP_PropertyType *)(pEntry->second());
+ }
+ bool PP_AttrProp::getAttribute(const XML_Char * szName, const XML_Char *& szValue) const
+ {
+@@ -750,14 +750,14 @@
+ 		{
+ 			const UT_Pair* p = static_cast<const UT_Pair*>(pEntry);
+ 
+-			if(*(static_cast<const XML_Char *>(p->first())) == 0)
++			if(*((const XML_Char *)(p->first())) == 0)
+ 			{
+ 
+ 				void* tmp = const_cast<void*> (p->first());
+ 				UT_ASSERT(!m_bIsReadOnly);
+ 				FREEP(tmp);
+ 				if (p->second())
+-					delete static_cast<const PP_PropertyType *>(p->second());
++					delete (const PP_PropertyType *)(p->second());
+ 				delete p;
+ 
+ 				m_pProperties->remove(_hc1.key(),pEntry);
+@@ -985,7 +985,7 @@
+ 	while (val != NULL)
+ 	{
+ 		s1 = static_cast<const XML_Char *>(c2.key().c_str());
+-		s2 = static_cast<const XML_Char *>(static_cast<const UT_Pair*>(val)->first());
++		s2 = (const XML_Char *)(static_cast<const UT_Pair*>(val)->first());
+ 
+ 		m_checkSum += UT_XML_strlen(s1);
+ 		m_checkSum += UT_XML_strlen(s2);
diff --git a/editors/abiword-devel/pkg-plist b/editors/abiword-devel/pkg-plist
index 0de96e7..5d9a7fa 100644
--- a/editors/abiword-devel/pkg-plist
+++ b/editors/abiword-devel/pkg-plist
@@ -105,6 +105,8 @@ share/AbiSuite-2.0/AbiWord/system.profile-en-ZA
 share/AbiSuite-2.0/AbiWord/system.profile-es
 share/AbiSuite-2.0/AbiWord/system.profile-es-ES
 share/AbiSuite-2.0/AbiWord/system.profile-es-MX
+share/AbiSuite-2.0/AbiWord/system.profile-eu
+share/AbiSuite-2.0/AbiWord/system.profile-eu-ES
 share/AbiSuite-2.0/AbiWord/system.profile-fa-IR
 share/AbiSuite-2.0/AbiWord/system.profile-fi-FI
 share/AbiSuite-2.0/AbiWord/system.profile-fr