Update to 0.99.2.

PR:		35254
Submitted by:	Joe Marcus Clarke <marcus@marcuscom.com>

4 files changed, 31 insertions, 28 deletions

diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index 310854ca6779..d9352ba864cc 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -10,8 +10,7 @@
 # AbiWord build system.
 
 PORTNAME=	AbiWord
-PORTVERSION=	0.99.1
-PORTREVISION=	1
+PORTVERSION=	0.99.2
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.abisource.com/downloads/Version-${PORTVERSION}/lf/
@@ -29,7 +28,7 @@ LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 
 DIST_SUBDIR=	AbiWord
 
-WRKSRC=		${WRKDIR}/abiword/abi
+WRKSRC=		${WRKDIR}/abiword-${PORTVERSION}/abi
 
 USE_X_PREFIX=	yes
 USE_AUTOMAKE=	yes
diff --git a/editors/abiword/distinfo b/editors/abiword/distinfo
index 0eea59baee76..643411738423 100644
--- a/editors/abiword/distinfo
+++ b/editors/abiword/distinfo
@@ -1 +1 @@
-MD5 (AbiWord/abiword-0.99.1.tar.gz) = 09b4a09dad451d4c6f795e7edf8734b2
+MD5 (AbiWord/abiword-0.99.2.tar.gz) = 4d77cc35f049cb17f6bf677e79c54351
diff --git a/editors/abiword/files/patch-au b/editors/abiword/files/patch-au
index 3f4fe57c8a30..3c726a835376 100644
--- a/editors/abiword/files/patch-au
+++ b/editors/abiword/files/patch-au
@@ -1,46 +1,45 @@
-
-$FreeBSD$
-
---- src/pkg/common/unix/scripts/makewrapper.sh.orig	Tue Nov 13 07:59:56 2001
-+++ src/pkg/common/unix/scripts/makewrapper.sh	Fri Nov 23 16:31:06 2001
-@@ -66,23 +66,31 @@
+--- src/pkg/common/unix/scripts/makewrapper.sh.orig	Wed Jan 23 09:16:52 2002
++++ src/pkg/common/unix/scripts/makewrapper.sh	Sat Feb 23 15:30:19 2002
+@@ -80,23 +80,31 @@
  if [ -z "\$locale" ]
  then
      locale=\$LANG
-+elif [ -z \$locale ]
++elif [ -x \$locale ]
 +then
-+    locale=\$LC_CTYPE
++	locale=\$LC_CTYPE
  fi
- #
+ 
  if [ ! -z "\$locale" ]
  then
 -    #now guess encoding
-+    #now guess country/region/encoding
-+    country=\`echo \$locale | sed -e 's/\(.*\)_.*\$/\1/'\`
-+    region=\`echo \$locale | sed -e 's/^.*_\(.*\)\..*/\1/'\`
++	#now guess country/region/encoding
++	country=\`echo \$locale | sed -e 's/\(.*\)_.*\$/\1/'\`
++	region=\`echo \$locale | sed -e 's/^.*_\(.*\)\..*/\1/'\`
      encoding=\`echo \$locale | sed -e 's/^.*\.\(.*\)\$/\1/'\`
 -    if [ ! -z "\$encoding" ]
-+    if [ ! -z \$country -o ! -z \$region -o ! -z \$encoding ]
++	if [ ! -z \$country -o ! -z \$region -o ! -z \$encoding ]
      then
 -	addfontdir=\$ABISUITE_FONT_HOME/\$encoding
 -	if [ ! -z "\$addfontdir" ]
 -	then
 -	    if [ -d "\$addfontdir" ]
+-	    then
+-	    	#add directory with locale-specific fonts to font path
+-	    	ABISUITE_FONT_PATH=\$ABISUITE_FONT_PATH,\$addfontdir
+-	    fi
+-	fi
 +	addfontdirlst="\$ABISUITE_FONT_HOME/\$country \$ABISUITE_FONT_HOME/\${country}-\${region} \$ABISUITE_FONT_HOME/\$encoding \$ABISUITE_FONT_HOME/\${country}-\${region}.\${encoding}"
 +	for addfontdir in \$addfontdirlst
 +	do
-+	    if [ ! -z \$addfontdir ]
- 	    then
--	    	#add directory with locale-specific fonts to font path
--	    	ABISUITE_FONT_PATH=\$ABISUITE_FONT_PATH,\$addfontdir
++		if [ ! -z \$addfontdir ]
++		then
 +		if [ -d \$addfontdir -a ! -f \$addfontdir/.already-in-fp ]
 +		then
-+		    #add directory with locale-specific fonts to font path
-+		    ABISUITE_FONT_PATH=\$ABISUITE_FONT_PATH,\$addfontdir
++			#add directory with locale-specific fonts to font path
++			ABISUITE_FONT_PATH=\$ABISUITE_FONT_PATH,\$addfontdir
++		fi
 +		fi
- 	    fi
--	fi
 +	done
      fi
  fi
- #
+ 
diff --git a/editors/abiword/pkg-plist b/editors/abiword/pkg-plist
index 94f101ab14e6..336165965c41 100644
--- a/editors/abiword/pkg-plist
+++ b/editors/abiword/pkg-plist
@@ -374,10 +374,11 @@ share/AbiSuite/AbiWord/scripts/abw2html.pl
 share/AbiSuite/AbiWord/strings/bg-BG.strings
 share/AbiSuite/AbiWord/strings/ca-ES.strings
 share/AbiSuite/AbiWord/strings/cs-CZ.strings
-share/AbiSuite/AbiWord/strings/cy-CY.strings
+share/AbiSuite/AbiWord/strings/cy-GB.strings
 share/AbiSuite/AbiWord/strings/da-DK.strings
 share/AbiSuite/AbiWord/strings/de-CH.strings
 share/AbiSuite/AbiWord/strings/de-DE.strings
+share/AbiSuite/AbiWord/strings/el-GR.strings
 share/AbiSuite/AbiWord/strings/en-AU.strings
 share/AbiSuite/AbiWord/strings/en-GB.strings
 share/AbiSuite/AbiWord/strings/en-IE.strings
@@ -397,7 +398,7 @@ share/AbiSuite/AbiWord/strings/pl-PL.strings
 share/AbiSuite/AbiWord/strings/pt-BR.strings
 share/AbiSuite/AbiWord/strings/pt-PT.strings
 share/AbiSuite/AbiWord/strings/ru-RU.strings
-share/AbiSuite/AbiWord/strings/sk.strings
+share/AbiSuite/AbiWord/strings/sk-SK.strings
 share/AbiSuite/AbiWord/strings/sl-SI.strings
 share/AbiSuite/AbiWord/strings/sv-SE.strings
 share/AbiSuite/AbiWord/strings/tr-TR.strings
@@ -433,6 +434,8 @@ share/AbiSuite/AbiWord/system.profile-fr-BE
 share/AbiSuite/AbiWord/system.profile-fr-CA
 share/AbiSuite/AbiWord/system.profile-fr-CH
 share/AbiSuite/AbiWord/system.profile-fr-FR
+share/AbiSuite/AbiWord/system.profile-gl-ES
+share/AbiSuite/AbiWord/system.profile-hu-HU
 share/AbiSuite/AbiWord/system.profile-it-IT
 share/AbiSuite/AbiWord/system.profile-lt-LT
 share/AbiSuite/AbiWord/system.profile-nb-NO
@@ -443,6 +446,8 @@ share/AbiSuite/AbiWord/system.profile-pt-BR
 share/AbiSuite/AbiWord/system.profile-pt-PT
 share/AbiSuite/AbiWord/system.profile-ru
 share/AbiSuite/AbiWord/system.profile-ru-RU
+share/AbiSuite/AbiWord/system.profile-sk-SK
+share/AbiSuite/AbiWord/system.profile-sk-SK.CP1250
 share/AbiSuite/AbiWord/system.profile-sl
 share/AbiSuite/AbiWord/system.profile-sv
 share/AbiSuite/AbiWord/system.profile-sv-SE