summaryrefslogtreecommitdiff
path: root/editors/AbiWord
diff options
context:
space:
mode:
authorMaxim Sobolev <sobomax@FreeBSD.org>2001-10-02 07:21:21 +0000
committerMaxim Sobolev <sobomax@FreeBSD.org>2001-10-02 07:21:21 +0000
commit8ebcd7cb694ab9bc2c3529a611391ff98d48e9cd (patch)
tree2c14a7d7eb7b210e031d8e7dd3012c5f6ac03464 /editors/AbiWord
parentUpdate to 1.0.11. (diff)
Update to 0.9.4.
Notes
Notes: svn path=/head/; revision=48331
Diffstat (limited to 'editors/AbiWord')
-rw-r--r--editors/AbiWord/Makefile3
-rw-r--r--editors/AbiWord/distinfo2
-rw-r--r--editors/AbiWord/files/patch-..::wv::configure95
-rw-r--r--editors/AbiWord/files/patch-configure.in18
-rw-r--r--editors/AbiWord/files/patch-configure.in-v2.1318
-rw-r--r--editors/AbiWord/files/patch-src::af::util::unix::ut_files.cpp23
-rw-r--r--editors/AbiWord/files/patch-src::af::xap::unix::xap_UnixFrame.cpp26
-rw-r--r--editors/AbiWord/pkg-plist5
8 files changed, 84 insertions, 106 deletions
diff --git a/editors/AbiWord/Makefile b/editors/AbiWord/Makefile
index 9a0f587e2451..ac145cc9c7cc 100644
--- a/editors/AbiWord/Makefile
+++ b/editors/AbiWord/Makefile
@@ -10,7 +10,7 @@
# AbiWord build system.
PORTNAME= AbiWord
-PORTVERSION= 0.9.2
+PORTVERSION= 0.9.4
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
http://www.abisource.com/downloads/Version-${PORTVERSION}/lf/
@@ -44,6 +44,7 @@ FIXME= find ${WRKSRC} -name GNUmakefile.in | xargs ${PERL} -pi -e \
pre-configure:
@cd ${WRKSRC} && ${TOUCH} NEWS README AUTHORS ChangeLog
@cd ${WRKSRC}/ac-helpers && ${RM} -f install-sh mkinstalldirs missing
+ @${RM} -f ${WRKSRC}/configure.ac
post-install:
@${CAT} ${PKGMESSAGE}
diff --git a/editors/AbiWord/distinfo b/editors/AbiWord/distinfo
index aeef3738d224..032de582181e 100644
--- a/editors/AbiWord/distinfo
+++ b/editors/AbiWord/distinfo
@@ -1 +1 @@
-MD5 (AbiWord/abiword-0.9.2.tar.gz) = 05f7ace87fec7635106caf499192d12f
+MD5 (AbiWord/abiword-0.9.4.tar.gz) = dcb1e357e3bfb4cfc566475e567ce164
diff --git a/editors/AbiWord/files/patch-..::wv::configure b/editors/AbiWord/files/patch-..::wv::configure
index 4a3682669219..ade10754262f 100644
--- a/editors/AbiWord/files/patch-..::wv::configure
+++ b/editors/AbiWord/files/patch-..::wv::configure
@@ -1,38 +1,53 @@
$FreeBSD$
---- ../wv/configure.orig Fri Aug 10 16:54:41 2001
-+++ ../wv/configure Thu Aug 16 10:49:37 2001
-@@ -2351,7 +2351,7 @@
+--- ../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" ]))
# 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:2357: checking for $ac_word" >&5
+ echo "configure:6014: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then
-@@ -2930,15 +2930,15 @@
+@@ -6586,16 +6586,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_%'`
+- ac_safe=`echo "iconv.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for iconv.h""... $ac_c" 1>&6
--echo "configure:2935: checking for iconv.h" >&5
+-echo "configure:6592: 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:2935: checking for giconv.h" >&5
++echo "configure:6592: 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 2940 "configure"
+ #line 6597 "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:2945: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-@@ -2981,11 +2981,11 @@
- ICONV_LIBS="-L$LIBICONV_DIR/lib/.libs -liconv"
+ { (eval echo configure:6602: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+@@ -6620,7 +6620,7 @@
+
+ else
+ echo "$ac_t""no" 1>&6
+- { echo "configure: error: * * * I found system iconv but can't find iconv.h header! * * *" 1>&2; exit 1; }
++ { echo "configure: error: * * * I found system iconv but can't find giconv.h header! * * *" 1>&2; exit 1; }
+
+ fi
+
+@@ -6635,30 +6635,30 @@
+ if test "x$LIBICONV_DIR" != "x" ; then
+ if test "$use_peer_libiconv" != "no" ; then
+ ICONV_CFLAGS="-I$LIBICONV_DIR/include"
+- ICONV_LIBS="-L$LIBICONV_DIR/lib/.libs -liconv"
++ ICONV_LIBS="-L$LIBICONV_DIR/lib/.libs -lgiconv"
else
ICONV_CFLAGS="-I$LIBICONV_DIR/include"
- ICONV_LIBS="-L$LIBICONV_DIR/lib -liconv"
@@ -45,52 +60,55 @@ $FreeBSD$
fi
CPPFLAGS="${CPPFLAGS} $ICONV_CFLAGS"
-@@ -2993,15 +2993,15 @@
+ LDFLAGS="${LDFLAGS} $ICONV_LIBS"
if test "$use_peer_libiconv" = "abi" ; then
- ac_safe=`echo "iconv.h" | sed 'y%./+-%__p_%'`
+- ac_safe=`echo "iconv.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for iconv.h""... $ac_c" 1>&6
--echo "configure:2998: checking for iconv.h" >&5
+-echo "configure:6655: 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:2998: checking for giconv.h" >&5
++echo "configure:6655: 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 3003 "configure"
+ #line 6660 "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:3008: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-@@ -3027,15 +3027,15 @@
+ { (eval echo configure:6665: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+@@ -6683,16 +6683,16 @@
+ fi
else
- ac_safe=`echo "iconv.h" | sed 'y%./+-%__p_%'`
+- ac_safe=`echo "iconv.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for iconv.h""... $ac_c" 1>&6
--echo "configure:3032: checking for iconv.h" >&5
+-echo "configure:6689: 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:3032: checking for giconv.h" >&5
++echo "configure:6689: 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 3037 "configure"
+ #line 6694 "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:3042: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-@@ -3055,14 +3055,14 @@
+ { (eval echo configure:6699: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+@@ -6712,14 +6712,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:3060: checking for iconv_open in -liconv" >&5
+-echo "configure:6717: checking for iconv_open in -liconv" >&5
+ echo $ac_n "checking for iconv_open in -lgiconv""... $ac_c" 1>&6
-+echo "configure:3060: checking for iconv_open in -lgiconv" >&5
++echo "configure:6717: 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
@@ -99,16 +117,16 @@ $FreeBSD$
-LIBS="-liconv $LIBS"
+LIBS="-lgiconv $LIBS"
cat > conftest.$ac_ext <<EOF
- #line 3068 "configure"
+ #line 6725 "configure"
#include "confdefs.h"
-@@ -3095,14 +3095,14 @@
+@@ -6752,14 +6752,14 @@
else
echo "$ac_t""no" 1>&6
- echo $ac_n "checking for libiconv_open in -liconv""... $ac_c" 1>&6
--echo "configure:3100: checking for libiconv_open in -liconv" >&5
+-echo "configure:6757: checking for libiconv_open in -liconv" >&5
+ echo $ac_n "checking for libiconv_open in -lgiconv""... $ac_c" 1>&6
-+echo "configure:3100: checking for libiconv_open in -lgiconv" >&5
++echo "configure:6757: 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
@@ -117,10 +135,19 @@ $FreeBSD$
-LIBS="-liconv $LIBS"
+LIBS="-lgiconv $LIBS"
cat > conftest.$ac_ext <<EOF
- #line 3108 "configure"
+ #line 6765 "configure"
#include "confdefs.h"
-@@ -3168,7 +3168,7 @@
- #line 3169 "configure"
+@@ -6792,7 +6792,7 @@
+
+ else
+ echo "$ac_t""no" 1>&6
+- { echo "configure: error: * * * I found iconv.h header but no working library! * * *" 1>&2; exit 1; }
++ { echo "configure: error: * * * I found giconv.h header but no working library! * * *" 1>&2; exit 1; }
+
+ fi
+
+@@ -6825,7 +6825,7 @@
+ #line 6826 "configure"
#include "confdefs.h"
-#include <iconv.h>
diff --git a/editors/AbiWord/files/patch-configure.in b/editors/AbiWord/files/patch-configure.in
new file mode 100644
index 000000000000..fc5e1f3cc617
--- /dev/null
+++ b/editors/AbiWord/files/patch-configure.in
@@ -0,0 +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 @@
+
+ if test "$PLATFORM" = "unix"; then
+ if test "$gnome" = "true"; then
+- PLATFORM_CFLAGS="$GNOME_CFLAGS $GMODULE_CFLAGS $GTK_CFLAGS -DSUPPORTS_UT_IDLE=1"
++ PLATFORM_CFLAGS="$CFLAGS $GNOME_CFLAGS $GMODULE_CFLAGS $GTK_CFLAGS -DSUPPORTS_UT_IDLE=1"
+ PLATFORM_LIBS=
+ else
+- PLATFORM_CFLAGS="$GMODULE_CFLAGS $GTK_CFLAGS -DSUPPORTS_UT_IDLE=1"
++ PLATFORM_CFLAGS="$CFLAGS $GMODULE_CFLAGS $GTK_CFLAGS -DSUPPORTS_UT_IDLE=1"
+ PLATFORM_LIBS=
+ fi
+ fi
diff --git a/editors/AbiWord/files/patch-configure.in-v2.13 b/editors/AbiWord/files/patch-configure.in-v2.13
deleted file mode 100644
index f13c71061dec..000000000000
--- a/editors/AbiWord/files/patch-configure.in-v2.13
+++ /dev/null
@@ -1,18 +0,0 @@
-
-$FreeBSD$
-
---- configure.in-v2.13.orig Wed Jul 18 01:38:22 2001
-+++ configure.in-v2.13 Mon Aug 13 14:47:43 2001
-@@ -252,10 +252,10 @@
-
- if test "$PLATFORM" = "unix"; then
- if test "$gnome" = "true"; then
-- PLATFORM_CFLAGS="$GNOME_CFLAGS $GMODULE_CFLAGS $GTK_CFLAGS"
-+ PLATFORM_CFLAGS="$CFLAGS $GNOME_CFLAGS $GMODULE_CFLAGS $GTK_CFLAGS"
- PLATFORM_LIBS=
- else
-- PLATFORM_CFLAGS="$GMODULE_CFLAGS $GTK_CFLAGS"
-+ PLATFORM_CFLAGS="$CFLAGS $GMODULE_CFLAGS $GTK_CFLAGS"
- PLATFORM_LIBS=
- fi
- fi
diff --git a/editors/AbiWord/files/patch-src::af::util::unix::ut_files.cpp b/editors/AbiWord/files/patch-src::af::util::unix::ut_files.cpp
deleted file mode 100644
index d17128bab3f1..000000000000
--- a/editors/AbiWord/files/patch-src::af::util::unix::ut_files.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- src/af/util/unix/ut_files.cpp.orig Mon Apr 16 02:25:35 2001
-+++ src/af/util/unix/ut_files.cpp Thu Aug 16 14:55:28 2001
-@@ -45,7 +45,7 @@
- if(*progName == '/')
- {
- laststat = stat(progName, &statbuf);
-- if(S_ISREG(statbuf.st_mode) || S_ISLNK(statbuf.st_mode))
-+ if(laststat == 0 && (S_ISREG(statbuf.st_mode) || S_ISLNK(statbuf.st_mode)))
- {
- return true;
- }
-@@ -67,7 +67,7 @@
- path = (UT_String*) utvPath->getNthItem(i);;
- laststat = stat(UT_catPathname(path->c_str(), progName), &statbuf);
-
-- if(S_ISREG(statbuf.st_mode) || S_ISLNK(statbuf.st_mode))
-+ if(laststat == 0 && (S_ISREG(statbuf.st_mode) || S_ISLNK(statbuf.st_mode)))
- {
- return true;
- }
diff --git a/editors/AbiWord/files/patch-src::af::xap::unix::xap_UnixFrame.cpp b/editors/AbiWord/files/patch-src::af::xap::unix::xap_UnixFrame.cpp
deleted file mode 100644
index 9eea861c1a92..000000000000
--- a/editors/AbiWord/files/patch-src::af::xap::unix::xap_UnixFrame.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-
-$FreeBSD$
-
---- src/af/xap/unix/xap_UnixFrame.cpp 2001/08/08 15:59:48 1.1
-+++ src/af/xap/unix/xap_UnixFrame.cpp 2001/08/08 16:06:14
-@@ -767,9 +767,19 @@
- fmtstring = "khelpcenter %s &";
- execstring = g_strdup_printf(fmtstring, szURL);
- }
-- else
-+ else if(progExists("gnome-help-browser"))
-+ {
-+ fmtstring = "gnome-help-browser %s &";
-+ execstring = g_strdup_printf(fmtstring, szURL);
-+ }
-+ else if(progExists("lynx"))
- {
- fmtstring = "xterm -e lynx %s &";
-+ execstring = g_strdup_printf(fmtstring, szURL);
-+ }
-+ else if(progExists("w3m"))
-+ {
-+ fmtstring = "xterm -e w3m %s &";
- execstring = g_strdup_printf(fmtstring, szURL);
- }
-
diff --git a/editors/AbiWord/pkg-plist b/editors/AbiWord/pkg-plist
index 0c41323746eb..0c36f2118bed 100644
--- a/editors/AbiWord/pkg-plist
+++ b/editors/AbiWord/pkg-plist
@@ -1,6 +1,7 @@
bin/AbiWord
bin/AbiWord_d
bin/AbiWord_s
+bin/abiword
share/AbiSuite/AbiWord/help/de-DE/about.html
share/AbiSuite/AbiWord/help/de-DE/aboutabi.html
share/AbiSuite/AbiWord/help/de-DE/aboutos.html
@@ -364,7 +365,6 @@ share/AbiSuite/AbiWord/help/images/wedge_l.gif
share/AbiSuite/AbiWord/help/images/zoom.png
share/AbiSuite/AbiWord/help/index.html
share/AbiSuite/AbiWord/readme.txt
-share/AbiSuite/AbiWord/sample/en-US/Latin1.abw
share/AbiSuite/AbiWord/scripts/abw2html.pl
share/AbiSuite/AbiWord/strings/ca-ES.strings
share/AbiSuite/AbiWord/strings/cs-CZ.strings
@@ -390,6 +390,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/sl-SI.strings
share/AbiSuite/AbiWord/strings/sv-SE.strings
share/AbiSuite/AbiWord/strings/uk-UA.strings
@@ -560,8 +561,6 @@ share/AbiSuite/icons/abiword_logo.xpm
@dirrm share/AbiSuite/clipart
@dirrm share/AbiSuite/AbiWord/strings
@dirrm share/AbiSuite/AbiWord/scripts
-@dirrm share/AbiSuite/AbiWord/sample/en-US
-@dirrm share/AbiSuite/AbiWord/sample
@dirrm share/AbiSuite/AbiWord/help/images
@dirrm share/AbiSuite/AbiWord/help/fr-FR/images
@dirrm share/AbiSuite/AbiWord/help/fr-FR