Update to 0.9.6.1.

5 files changed, 43 insertions, 48 deletions

diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index 0ccf9eacaa1e..57b5d57e558f 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -10,7 +10,7 @@
 # AbiWord build system.
 
 PORTNAME=	AbiWord
-PORTVERSION=	0.9.5
+PORTVERSION=	0.9.6.1
 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 346e86caad5b..c374b747c825 100644
--- a/editors/abiword/distinfo
+++ b/editors/abiword/distinfo
@@ -1 +1 @@
-MD5 (AbiWord/abiword-0.9.5.tar.gz) = e7cce492d2b9aa19b4c38dea35292b23
+MD5 (AbiWord/abiword-0.9.6.1.tar.gz) = 6d05bf0300516e530a586d6252b2849e
diff --git a/editors/abiword/files/patch-..::wv::configure b/editors/abiword/files/patch-..::wv::configure
index b997602856e2..b3d0f3b2e717 100644
--- a/editors/abiword/files/patch-..::wv::configure
+++ b/editors/abiword/files/patch-..::wv::configure
@@ -1,39 +1,30 @@
 
 $FreeBSD$
 
---- ../wv/configure.orig	Wed Oct 31 19:07:37 2001
-+++ ../wv/configure	Fri Nov 23 16:22:12 2001
-@@ -2074,7 +2074,7 @@
- 
- 
- # Extract the first word of "glib-config", so it can be a program name with args.
--set dummy glib-config; ac_word=$2
-+set dummy glib12-config; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
- echo "configure:2080: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then
-@@ -2531,16 +2531,16 @@
+--- ../wv/configure.orig	Thu Nov 22 12:24:09 2001
++++ ../wv/configure	Mon Dec 17 13:44:55 2001
+@@ -2676,16 +2676,16 @@
  if eval "test \"`echo '$ac_cv_func_'iconv`\" = yes"; then
    echo "$ac_t""yes" 1>&6
    
 -		ac_safe=`echo "iconv.h" | sed 'y%./+-%__p_%'`
 -echo $ac_n "checking for iconv.h""... $ac_c" 1>&6
--echo "configure:2537: checking for iconv.h" >&5
+-echo "configure:2682: checking for iconv.h" >&5
 +		ac_safe=`echo "giconv.h" | sed 'y%./+-%__p_%'`
 +echo $ac_n "checking for giconv.h""... $ac_c" 1>&6
-+echo "configure:2537: checking for giconv.h" >&5
++echo "configure:2682: checking for giconv.h" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
- #line 2542 "configure"
+ #line 2687 "configure"
  #include "confdefs.h"
 -#include <iconv.h>
 +#include <giconv.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
- { (eval echo configure:2547: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-@@ -2565,7 +2565,7 @@
+ { (eval echo configure:2692: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+@@ -2710,7 +2710,7 @@
  		
  else
    echo "$ac_t""no" 1>&6
@@ -42,7 +33,7 @@ $FreeBSD$
  		
  fi
  
-@@ -2580,30 +2580,30 @@
+@@ -2725,30 +2725,30 @@
  	if  test "x$LIBICONV_DIR" != "x" ; then
  		if  test "$use_peer_libiconv" != "no" ; then
  			ICONV_CFLAGS="-I$LIBICONV_DIR/include"
@@ -65,50 +56,50 @@ $FreeBSD$
  	if  test "$use_peer_libiconv" = "abi" ; then
 -								ac_safe=`echo "iconv.h" | sed 'y%./+-%__p_%'`
 -echo $ac_n "checking for iconv.h""... $ac_c" 1>&6
--echo "configure:2600: checking for iconv.h" >&5
+-echo "configure:2745: checking for iconv.h" >&5
 +								ac_safe=`echo "giconv.h" | sed 'y%./+-%__p_%'`
 +echo $ac_n "checking for giconv.h""... $ac_c" 1>&6
-+echo "configure:2600: checking for giconv.h" >&5
++echo "configure:2745: checking for giconv.h" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
- #line 2605 "configure"
+ #line 2750 "configure"
  #include "confdefs.h"
 -#include <iconv.h>
 +#include <giconv.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
- { (eval echo configure:2610: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-@@ -2628,16 +2628,16 @@
+ { (eval echo configure:2755: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+@@ -2773,16 +2773,16 @@
  fi
  
  	else
 -		ac_safe=`echo "iconv.h" | sed 'y%./+-%__p_%'`
 -echo $ac_n "checking for iconv.h""... $ac_c" 1>&6
--echo "configure:2634: checking for iconv.h" >&5
+-echo "configure:2779: checking for iconv.h" >&5
 +		ac_safe=`echo "giconv.h" | sed 'y%./+-%__p_%'`
 +echo $ac_n "checking for giconv.h""... $ac_c" 1>&6
-+echo "configure:2634: checking for giconv.h" >&5
++echo "configure:2779: checking for giconv.h" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
- #line 2639 "configure"
+ #line 2784 "configure"
  #include "confdefs.h"
 -#include <iconv.h>
 +#include <giconv.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
- { (eval echo configure:2644: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-@@ -2657,14 +2657,14 @@
+ { (eval echo configure:2789: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+@@ -2802,14 +2802,14 @@
  if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
    echo "$ac_t""yes" 1>&6
    
 -			echo $ac_n "checking for iconv_open in -liconv""... $ac_c" 1>&6
--echo "configure:2662: checking for iconv_open in -liconv" >&5
+-echo "configure:2807: checking for iconv_open in -liconv" >&5
 +			echo $ac_n "checking for iconv_open in -lgiconv""... $ac_c" 1>&6
-+echo "configure:2662: checking for iconv_open in -lgiconv" >&5
++echo "configure:2807: checking for iconv_open in -lgiconv" >&5
  ac_lib_var=`echo iconv'_'iconv_open | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
@@ -117,16 +108,16 @@ $FreeBSD$
 -LIBS="-liconv  $LIBS"
 +LIBS="-lgiconv  $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 2670 "configure"
+ #line 2815 "configure"
  #include "confdefs.h"
-@@ -2697,14 +2697,14 @@
+@@ -2842,14 +2842,14 @@
  			
  else
    echo "$ac_t""no" 1>&6
 -	echo $ac_n "checking for libiconv_open in -liconv""... $ac_c" 1>&6
--echo "configure:2702: checking for libiconv_open in -liconv" >&5
+-echo "configure:2847: checking for libiconv_open in -liconv" >&5
 +	echo $ac_n "checking for libiconv_open in -lgiconv""... $ac_c" 1>&6
-+echo "configure:2702: checking for libiconv_open in -lgiconv" >&5
++echo "configure:2847: checking for libiconv_open in -lgiconv" >&5
  ac_lib_var=`echo iconv'_'libiconv_open | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
@@ -135,9 +126,9 @@ $FreeBSD$
 -LIBS="-liconv  $LIBS"
 +LIBS="-lgiconv  $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 2710 "configure"
+ #line 2855 "configure"
  #include "confdefs.h"
-@@ -2737,7 +2737,7 @@
+@@ -2882,7 +2882,7 @@
  				
  else
    echo "$ac_t""no" 1>&6
@@ -146,8 +137,8 @@ $FreeBSD$
  				
  fi
  
-@@ -2771,7 +2771,7 @@
- #line 2772 "configure"
+@@ -2916,7 +2916,7 @@
+ #line 2917 "configure"
  #include "confdefs.h"
  
 -#include <iconv.h>
diff --git a/editors/abiword/files/patch-src::wp::ap::unix::ap_UnixApp.cpp b/editors/abiword/files/patch-src::wp::ap::unix::ap_UnixApp.cpp
index 0d1581c9c35c..9af484ab202f 100644
--- a/editors/abiword/files/patch-src::wp::ap::unix::ap_UnixApp.cpp
+++ b/editors/abiword/files/patch-src::wp::ap::unix::ap_UnixApp.cpp
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- src/wp/ap/unix/ap_UnixApp.cpp	2001/11/23 15:08:40	1.1
-+++ src/wp/ap/unix/ap_UnixApp.cpp	2001/11/23 15:11:10
-@@ -606,7 +606,7 @@
+--- src/wp/ap/unix/ap_UnixApp.cpp.orig	Thu Dec  6 09:00:14 2001
++++ src/wp/ap/unix/ap_UnixApp.cpp	Mon Dec 17 13:49:48 2001
+@@ -612,7 +612,7 @@
+   {
+       pluginDir = pluginList[i];
  
-       UT_DEBUGMSG(("DOM: leading plugins from %s\n", pluginDir.c_str()));
-       
 -      n = scandir(pluginDir.c_str(), &namelist, so_only, alphasort);
 +      n = scandir(pluginDir.c_str(), &namelist, (int (*)(dirent *))so_only, alphasort);
-       if (n < 0)
- 	{
- 	  UT_DEBUGMSG(("DOM: no plugins found\n"));
+       UT_DEBUGMSG(("DOM: found %d plugins in %s\n", n, pluginDir.c_str()));
+ 
+       if (n > 0)
diff --git a/editors/abiword/pkg-plist b/editors/abiword/pkg-plist
index f70d27a332fb..86d29834a24e 100644
--- a/editors/abiword/pkg-plist
+++ b/editors/abiword/pkg-plist
@@ -2,6 +2,7 @@ bin/AbiWord
 bin/AbiWord_d
 bin/AbiWord_s
 bin/abiword
+bin/ttftool
 share/AbiSuite/AbiWord/help/de-DE/about.html
 share/AbiSuite/AbiWord/help/de-DE/aboutabi.html
 share/AbiSuite/AbiWord/help/de-DE/aboutos.html
@@ -370,6 +371,7 @@ share/AbiSuite/AbiWord/help/images/zoom.png
 share/AbiSuite/AbiWord/help/index.html
 share/AbiSuite/AbiWord/readme.txt
 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
@@ -404,6 +406,7 @@ share/AbiSuite/AbiWord/system.profile
 share/AbiSuite/AbiWord/system.profile-KOI8-R
 share/AbiSuite/AbiWord/system.profile-KOI8-U
 share/AbiSuite/AbiWord/system.profile-KOI8-UB
+share/AbiSuite/AbiWord/system.profile-bg-BG
 share/AbiSuite/AbiWord/system.profile-ca-ES
 share/AbiSuite/AbiWord/system.profile-cs-CZ
 share/AbiSuite/AbiWord/system.profile-da-DK
@@ -555,6 +558,7 @@ share/AbiSuite/fonts/s050000l.u2g
 share/AbiSuite/fonts/symbol.e2u
 share/AbiSuite/fonts/z003034l.afm
 share/AbiSuite/fonts/z003034l.pfb
+share/AbiSuite/icons/abiword_16.xpm
 share/AbiSuite/icons/abiword_48.png
 share/AbiSuite/icons/abiword_48.tif
 share/AbiSuite/icons/abiword_48.xpm