9 files changed, 88 insertions, 46 deletions

diff --git a/editors/AbiWord/Makefile b/editors/AbiWord/Makefile
index 117a71b1707d..0ccf9eacaa1e 100644
--- a/editors/AbiWord/Makefile
+++ b/editors/AbiWord/Makefile
@@ -10,7 +10,7 @@
 # AbiWord build system.
 
 PORTNAME=	AbiWord
-PORTVERSION=	0.9.4.1
+PORTVERSION=	0.9.5
 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 2d5b29e7a36f..346e86caad5b 100644
--- a/editors/AbiWord/distinfo
+++ b/editors/AbiWord/distinfo
@@ -1 +1 @@
-MD5 (AbiWord/abiword-0.9.4.1.tar.gz) = 18fdce08661becb2394076fd50ea3591
+MD5 (AbiWord/abiword-0.9.5.tar.gz) = e7cce492d2b9aa19b4c38dea35292b23
diff --git a/editors/AbiWord/files/patch-..::wv::configure b/editors/AbiWord/files/patch-..::wv::configure
index ade10754262f..b997602856e2 100644
--- a/editors/AbiWord/files/patch-..::wv::configure
+++ b/editors/AbiWord/files/patch-..::wv::configure
@@ -1,39 +1,39 @@
 
 $FreeBSD$
 
---- ../wv/configure.orig	Tue Sep 18 20:24:33 2001
-+++ ../wv/configure	Tue Oct  2 09:43:27 2001
-@@ -6008,7 +6008,7 @@
- #               LIBXML2_LIBS="-lxml" ]))
+--- ../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:6014: checking for $ac_word" >&5
+ echo "configure:2080: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then
-@@ -6586,16 +6586,16 @@
+@@ -2531,16 +2531,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:6592: checking for iconv.h" >&5
+-echo "configure:2537: 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:6592: checking for giconv.h" >&5
++echo "configure:2537: 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 6597 "configure"
+ #line 2542 "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:6602: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-@@ -6620,7 +6620,7 @@
+ { (eval echo configure:2547: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+@@ -2565,7 +2565,7 @@
  		
  else
    echo "$ac_t""no" 1>&6
@@ -42,7 +42,7 @@ $FreeBSD$
  		
  fi
  
-@@ -6635,30 +6635,30 @@
+@@ -2580,30 +2580,30 @@
  	if  test "x$LIBICONV_DIR" != "x" ; then
  		if  test "$use_peer_libiconv" != "no" ; then
  			ICONV_CFLAGS="-I$LIBICONV_DIR/include"
@@ -65,50 +65,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:6655: checking for iconv.h" >&5
+-echo "configure:2600: 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:6655: checking for giconv.h" >&5
++echo "configure:2600: 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 6660 "configure"
+ #line 2605 "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:6665: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-@@ -6683,16 +6683,16 @@
+ { (eval echo configure:2610: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+@@ -2628,16 +2628,16 @@
  fi
  
  	else
 -		ac_safe=`echo "iconv.h" | sed 'y%./+-%__p_%'`
 -echo $ac_n "checking for iconv.h""... $ac_c" 1>&6
--echo "configure:6689: checking for iconv.h" >&5
+-echo "configure:2634: 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:6689: checking for giconv.h" >&5
++echo "configure:2634: 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 6694 "configure"
+ #line 2639 "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:6699: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-@@ -6712,14 +6712,14 @@
+ { (eval echo configure:2644: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+@@ -2657,14 +2657,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:6717: checking for iconv_open in -liconv" >&5
+-echo "configure:2662: checking for iconv_open in -liconv" >&5
 +			echo $ac_n "checking for iconv_open in -lgiconv""... $ac_c" 1>&6
-+echo "configure:6717: checking for iconv_open in -lgiconv" >&5
++echo "configure:2662: 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 +117,16 @@ $FreeBSD$
 -LIBS="-liconv  $LIBS"
 +LIBS="-lgiconv  $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 6725 "configure"
+ #line 2670 "configure"
  #include "confdefs.h"
-@@ -6752,14 +6752,14 @@
+@@ -2697,14 +2697,14 @@
  			
  else
    echo "$ac_t""no" 1>&6
 -	echo $ac_n "checking for libiconv_open in -liconv""... $ac_c" 1>&6
--echo "configure:6757: checking for libiconv_open in -liconv" >&5
+-echo "configure:2702: checking for libiconv_open in -liconv" >&5
 +	echo $ac_n "checking for libiconv_open in -lgiconv""... $ac_c" 1>&6
-+echo "configure:6757: checking for libiconv_open in -lgiconv" >&5
++echo "configure:2702: 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 +135,9 @@ $FreeBSD$
 -LIBS="-liconv  $LIBS"
 +LIBS="-lgiconv  $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 6765 "configure"
+ #line 2710 "configure"
  #include "confdefs.h"
-@@ -6792,7 +6792,7 @@
+@@ -2737,7 +2737,7 @@
  				
  else
    echo "$ac_t""no" 1>&6
@@ -146,8 +146,8 @@ $FreeBSD$
  				
  fi
  
-@@ -6825,7 +6825,7 @@
- #line 6826 "configure"
+@@ -2771,7 +2771,7 @@
+ #line 2772 "configure"
  #include "confdefs.h"
  
 -#include <iconv.h>
diff --git a/editors/AbiWord/files/patch-..::wv::libole2::Makefile.in b/editors/AbiWord/files/patch-..::wv::libole2::Makefile.in
new file mode 100644
index 000000000000..c1aa9c4a9a1d
--- /dev/null
+++ b/editors/AbiWord/files/patch-..::wv::libole2::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- ../wv/libole2/Makefile.in	2001/11/23 14:38:19	1.1
++++ ../wv/libole2/Makefile.in	2001/11/23 14:43:32
+@@ -13,7 +13,7 @@
+ HAVE_GLIB = @HAVE_GLIB@
+ HAVE_GNOMEVFS= @HAVE_GNOMEVFS@
+ 
+-CFLAGS = @CPPFLAGS@ @CFLAGS@ @DEFS@ -I$(srcdir)/ -I$(srcdir)/.. -DTTFDIR=\"$(datadir)/wv/ttf\" -I$(srcdir)/../libole2 @WMF_CFLAGS@ @GLIB_CFLAGS@
++CFLAGS = -I$(srcdir)/.. @CPPFLAGS@ @CFLAGS@ @DEFS@ -I$(srcdir)/ -DTTFDIR=\"$(datadir)/wv/ttf\" -I$(srcdir)/../libole2 @WMF_CFLAGS@ @GLIB_CFLAGS@
+ ifneq ($(HAVE_GLIB), 1)
+ CFLAGS += -I$(srcdir)/../glib-wv/
+ endif
diff --git a/editors/AbiWord/files/patch-au b/editors/AbiWord/files/patch-au
index 6290aae585fc..3f4fe57c8a30 100644
--- a/editors/AbiWord/files/patch-au
+++ b/editors/AbiWord/files/patch-au
@@ -1,8 +1,8 @@
 
 $FreeBSD$
 
---- src/pkg/common/unix/scripts/makewrapper.sh.orig	Mon Jun 11 02:14:43 2001
-+++ src/pkg/common/unix/scripts/makewrapper.sh	Wed Aug  8 13:38:34 2001
+--- 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 @@
  if [ -z "\$locale" ]
  then
@@ -11,7 +11,7 @@ $FreeBSD$
 +then
 +    locale=\$LC_CTYPE
  fi
- 
+ #
  if [ ! -z "\$locale" ]
  then
 -    #now guess encoding
@@ -43,4 +43,4 @@ $FreeBSD$
 +	done
      fi
  fi
- 
+ #
diff --git a/editors/AbiWord/files/patch-autogen.sh b/editors/AbiWord/files/patch-autogen.sh
index 465e7f9f4047..b7766edf9745 100644
--- a/editors/AbiWord/files/patch-autogen.sh
+++ b/editors/AbiWord/files/patch-autogen.sh
@@ -1,8 +1,8 @@
 
 $FreeBSD$
 
---- autogen.sh	2001/10/30 10:05:41	1.1
-+++ autogen.sh	2001/10/30 10:05:42
+--- autogen.sh.orig	Fri Sep 28 12:06:00 2001
++++ autogen.sh	Fri Nov 23 16:33:29 2001
 @@ -10,20 +10,20 @@
  
  set -e
@@ -34,8 +34,8 @@ $FreeBSD$
 -aclocal -I ac-helpers
 +aclocal14 -I ac-helpers
  
--autoheader
-+autoheader213
+-# autoheader
++# autoheader14
  
  # Produce all the `Makefile.in's, verbosely, and create neat missing things
  # like `libtool', `install-sh', etc.
diff --git a/editors/AbiWord/files/patch-configure.in b/editors/AbiWord/files/patch-configure.in
index fc5e1f3cc617..23d1e45ba2a2 100644
--- a/editors/AbiWord/files/patch-configure.in
+++ b/editors/AbiWord/files/patch-configure.in
@@ -1,9 +1,18 @@
 
 $FreeBSD$
 
---- configure.in	2001/10/02 06:56:47	1.1
-+++ configure.in	2001/10/02 06:57:13
-@@ -257,10 +257,10 @@
+--- configure.in.orig	Thu Nov 22 01:08:37 2001
++++ configure.in	Fri Nov 23 17:17:37 2001
+@@ -90,7 +90,7 @@
+ else
+ 	ICONV_INCLUDES=-I'$(top_srcdir)/../libiconv/include'
+ fi
+-AC_CHECK_FUNC(iconv,ICONV_LIBS="",ICONV_LIBS="-liconv")
++AC_CHECK_FUNC(iconv,ICONV_LIBS="",ICONV_LIBS="-lgiconv")
+ AC_SUBST(ICONV_INCLUDES)
+ AC_SUBST(ICONV_LIBS)
+ 
+@@ -317,10 +317,10 @@
  
  if test "$PLATFORM" = "unix"; then
  	if test "$gnome" = "true"; then
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
new file mode 100644
index 000000000000..0d1581c9c35c
--- /dev/null
+++ b/editors/AbiWord/files/patch-src::wp::ap::unix::ap_UnixApp.cpp
@@ -0,0 +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 @@
+ 
+       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"));
diff --git a/editors/AbiWord/pkg-plist b/editors/AbiWord/pkg-plist
index 0c36f2118bed..f70d27a332fb 100644
--- a/editors/AbiWord/pkg-plist
+++ b/editors/AbiWord/pkg-plist
@@ -118,6 +118,7 @@ share/AbiSuite/AbiWord/help/en-US/basis1.html
 share/AbiSuite/AbiWord/help/en-US/basis2.html
 share/AbiSuite/AbiWord/help/en-US/beos_intel.html
 share/AbiSuite/AbiWord/help/en-US/beos_ppc.html
+share/AbiSuite/AbiWord/help/en-US/bidi.html
 share/AbiSuite/AbiWord/help/en-US/check.html
 share/AbiSuite/AbiWord/help/en-US/column.html
 share/AbiSuite/AbiWord/help/en-US/comindex.html
@@ -312,6 +313,8 @@ share/AbiSuite/AbiWord/help/images/cursor7.gif
 share/AbiSuite/AbiWord/help/images/cursor8.gif
 share/AbiSuite/AbiWord/help/images/cursor9.gif
 share/AbiSuite/AbiWord/help/images/cut.png
+share/AbiSuite/AbiWord/help/images/dir_ltr.png
+share/AbiSuite/AbiWord/help/images/dir_rtl.png
 share/AbiSuite/AbiWord/help/images/elevator.png
 share/AbiSuite/AbiWord/help/images/exmarg1.jpg
 share/AbiSuite/AbiWord/help/images/expose.png
@@ -330,6 +333,7 @@ share/AbiSuite/AbiWord/help/images/minim.png
 share/AbiSuite/AbiWord/help/images/new.png
 share/AbiSuite/AbiWord/help/images/open.png
 share/AbiSuite/AbiWord/help/images/ovr.png
+share/AbiSuite/AbiWord/help/images/para_dir.png
 share/AbiSuite/AbiWord/help/images/paste.png
 share/AbiSuite/AbiWord/help/images/print.png
 share/AbiSuite/AbiWord/help/images/redo.png
@@ -554,7 +558,8 @@ share/AbiSuite/fonts/z003034l.pfb
 share/AbiSuite/icons/abiword_48.png
 share/AbiSuite/icons/abiword_48.tif
 share/AbiSuite/icons/abiword_48.xpm
-share/AbiSuite/icons/abiword_logo.xpm
+share/AbiSuite/templates/normal.awt
+@dirrm share/AbiSuite/templates
 @dirrm share/AbiSuite/icons
 @dirrm share/AbiSuite/fonts
 @dirrm share/AbiSuite/dictionary