office/abiword: Updated for version 2.8.5.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>

3 files changed, 31 insertions, 28 deletions

diff --git a/office/abiword/abiword.SlackBuild b/office/abiword/abiword.SlackBuild
index 78bf9a12eb..feaa3cc7e4 100644
--- a/office/abiword/abiword.SlackBuild
+++ b/office/abiword/abiword.SlackBuild
@@ -27,7 +27,7 @@
 # work correctly on Slackware - the patches are all from him
 
 PRGNAM=abiword
-VERSION=2.8.4
+VERSION=2.8.5
 DOCSVER=$VERSION	# version of abiword-docs
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -115,6 +115,7 @@ cd abiword-docs-$DOCSVER
     --mandir=/usr/man \
     --docdir=/usr/doc/$PRGNAM-$VERSION \
     --build=$ARCH-slackware-linux
+
   LD_LIBRARY_PATH="$PKG/usr/lib${LIBDIRSUFFIX}:$LD_LIBRARY_PATH" \
     PATH="$PKG/usr/bin:$PATH" \
     make
diff --git a/office/abiword/abiword.info b/office/abiword/abiword.info
index f19bf820f5..d274f97540 100644
--- a/office/abiword/abiword.info
+++ b/office/abiword/abiword.info
@@ -1,10 +1,10 @@
 PRGNAM="abiword"
-VERSION="2.8.4"
+VERSION="2.8.5"
 HOMEPAGE="http://www.abisource.com"
-DOWNLOAD="http://www.abisource.com/downloads/abiword/2.8.4/source/abiword-2.8.4.tar.gz \
-          http://www.abisource.com/downloads/abiword/2.8.4/source/abiword-docs-2.8.4.tar.gz"
-MD5SUM="f782ecb8e07d07ec179f7a143353cc29 \
-        f0902e3e45d3e5a9916997e3347bc491"
+DOWNLOAD="http://www.abisource.com/downloads/abiword/2.8.5/source/abiword-2.8.5.tar.gz \
+          http://www.abisource.com/downloads/abiword/2.8.5/source/abiword-docs-2.8.5.tar.gz"
+MD5SUM="c0523ade1bc515338473909f5e9eb5dd \
+        e1df310b3af634721628454782a35c90"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Robby Workman"
diff --git a/office/abiword/patches/boost_asio.patch b/office/abiword/patches/boost_asio.patch
index b4535655ca..11b1fea635 100644
--- a/office/abiword/patches/boost_asio.patch
+++ b/office/abiword/patches/boost_asio.patch
@@ -1,5 +1,6 @@
---- abiword-2.8.1/asio.hpp	1969-12-31 16:00:00.000000000 -0800
-+++ abiword-2.8.1/asio.hpp	2009-10-31 19:01:58.977141321 -0700
+diff -Nur abiword-2.8.5.orig//asio.hpp abiword-2.8.5/asio.hpp
+--- abiword-2.8.5.orig//asio.hpp	1969-12-31 18:00:00.000000000 -0600
++++ abiword-2.8.5/asio.hpp	2010-06-04 02:13:57.279465007 -0500
 @@ -0,0 +1,10 @@
 +#include <boost/asio.hpp>
 +#include <boost/thread.hpp>
@@ -11,32 +12,33 @@
 +   using boost::system::system_error;
 +   using boost::thread;
 +}
---- abiword-2.8.1/configure	2009-10-30 23:30:30.761312681 -0700
-+++ abiword-2.8.1/configure	2009-10-31 19:18:16.581095503 -0700
-@@ -22662,7 +22662,7 @@
+diff -Nur abiword-2.8.5.orig//configure abiword-2.8.5/configure
+--- abiword-2.8.5.orig//configure	2010-05-30 14:34:39.000000000 -0500
++++ abiword-2.8.5/configure	2010-06-04 02:13:39.961560728 -0500
+@@ -19815,7 +19815,7 @@
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
  
- 
--for ac_header in asio.hpp
-+for ac_header in boost/asio.hpp
- do
- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-@@ -22834,7 +22834,7 @@
+-		for ac_header in asio.hpp
++		for ac_header in boost/asio.hpp
+ do :
+   ac_fn_cxx_check_header_mongrel "$LINENO" "asio.hpp" "ac_cv_header_asio_hpp" "$ac_includes_default"
+ if test "x$ac_cv_header_asio_hpp" = x""yes; then :
+@@ -19847,7 +19847,7 @@
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
  
+-	for ac_header in asio.hpp
++	for ac_header in boost/asio.hpp
+ do :
+   ac_fn_cxx_check_header_mongrel "$LINENO" "asio.hpp" "ac_cv_header_asio_hpp" "$ac_includes_default"
+ if test "x$ac_cv_header_asio_hpp" = x""yes; then :
+@@ -20353,7 +20353,7 @@
  
--for ac_header in asio.hpp
-+for ac_header in boost/asio.hpp
- do
- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-@@ -23838,7 +23838,7 @@
- 
- if test "$enable_collab_backend_tcp" == "yes" || \
-    test "$enable_collab_backend_service" == "yes"; then
+ if test "$enable_collab_backend_tcp" = "yes" || \
+    test "$enable_collab_backend_service" = "yes"; then
 -	COLLAB_LIBS="$COLLAB_LIBS -lgcrypt -lpthread"
 +	COLLAB_LIBS="$COLLAB_LIBS -lgcrypt -lpthread -lboost_system -lboost_thread"
  fi
  
- test "$enable_collab" == "auto" && PLUGINS="$PLUGINS collab"
+ test "$enable_collab" = "auto" && PLUGINS="$PLUGINS collab"