4 files changed, 24 insertions, 65 deletions

diff --git a/textproc/libwpd/Makefile b/textproc/libwpd/Makefile
index d29485feff7b..b2f009309a62 100644
--- a/textproc/libwpd/Makefile
+++ b/textproc/libwpd/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libwpd
-PORTVERSION=	0.7.1
-PORTREVISION=	3
+PORTVERSION=	0.8.0
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	libwpd
@@ -16,7 +15,7 @@ MAINTAINER=	reed@pugetsoundtechnology.com
 COMMENT=	Tools for importing and exporting WordPerfect(tm) documents
 
 USE_GMAKE=	yes
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 USE_GNOME=	gnomehack libgsf
 INSTALLS_SHLIB=	yes
 
diff --git a/textproc/libwpd/distinfo b/textproc/libwpd/distinfo
index d0cdf83b1718..a8f1f7664baf 100644
--- a/textproc/libwpd/distinfo
+++ b/textproc/libwpd/distinfo
@@ -1,2 +1,2 @@
-MD5 (libwpd-0.7.1.tar.gz) = 913e5e46c678efeb79604c2566628a68
-SIZE (libwpd-0.7.1.tar.gz) = 399768
+MD5 (libwpd-0.8.0.tar.gz) = 98e59beecc112339bb78654863304c1c
+SIZE (libwpd-0.8.0.tar.gz) = 449371
diff --git a/textproc/libwpd/files/patch-ltmain.sh b/textproc/libwpd/files/patch-ltmain.sh
deleted file mode 100644
index 1d5a5c7b87e1..000000000000
--- a/textproc/libwpd/files/patch-ltmain.sh
+++ /dev/null
@@ -1,51 +0,0 @@
---- ltmain.sh.orig	Fri Sep 12 14:51:51 2003
-+++ ltmain.sh	Sun Sep 21 17:49:07 2003
-@@ -1280,7 +1280,7 @@
- 	  esac
- 	elif test "X$arg" = "X-lc_r"; then
- 	 case $host in
--	 *-*-openbsd* | *-*-freebsd*)
-+	 *-*-openbsd* | *-*-freebsd4*)
- 	   # Do not include libc_r directly, use -pthread flag.
- 	   continue
- 	   ;;
-@@ -1290,8 +1290,16 @@
- 	continue
- 	;;
- 
-+      -pthread)
-+      compile_command="$compile_command -pthread"
-+      finalize_command="$finalize_command -pthread"
-+      compiler_flags="$compiler_flags -pthread"
-+      continue
-+      ;;
-+
-       -module)
- 	module=yes
-+	build_old_libs=no
- 	continue
- 	;;
- 
-@@ -3000,6 +3008,9 @@
- 	    # problems, so we reset it completely
- 	    verstring=
- 	    ;;
-+	  *-*-freebsd*)
-+	    # FreeBSD doesn't need this...
-+	    ;;
- 	  *)
- 	    verstring="0.0"
- 	    ;;
-@@ -5428,10 +5439,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/textproc/libwpd/pkg-plist b/textproc/libwpd/pkg-plist
index e68624e3e06c..b559b8bd349b 100644
--- a/textproc/libwpd/pkg-plist
+++ b/textproc/libwpd/pkg-plist
@@ -1,12 +1,23 @@
 bin/wpd2html
 bin/wpd2raw
 bin/wpd2text
-include/libwpd-1/libwpd/WPDocument.h
-include/libwpd-1/libwpd/WPXHLListenerImpl.h
-include/libwpd-1/libwpd/libwpd.h
-include/libwpd-1/libwpd/libwpd_support.h
-lib/libwpd-1.so
-lib/libwpd-1.so.7
-libdata/pkgconfig/libwpd-1.pc
-@dirrm include/libwpd-1/libwpd
-@dirrm include/libwpd-1
+include/libwpd-0.8/libwpd/GSFStream.h
+include/libwpd-0.8/libwpd/WPDocument.h
+include/libwpd-0.8/libwpd/WPXHLListenerImpl.h
+include/libwpd-0.8/libwpd/WPXProperty.h
+include/libwpd-0.8/libwpd/WPXPropertyList.h
+include/libwpd-0.8/libwpd/WPXPropertyListVector.h
+include/libwpd-0.8/libwpd/WPXStream.h
+include/libwpd-0.8/libwpd/WPXString.h
+include/libwpd-0.8/libwpd/libwpd.h
+include/libwpd-0.8/libwpd/libwpd_types.h
+lib/libwpd-0.8.a
+lib/libwpd-0.8.so
+lib/libwpd-0.8.so.8
+lib/libwpd-stream-0.8.a
+lib/libwpd-stream-0.8.so
+lib/libwpd-stream-0.8.so.8
+libdata/pkgconfig/libwpd-0.8.pc
+libdata/pkgconfig/libwpd-stream-0.8.pc
+@dirrm include/libwpd-0.8/libwpd
+@dirrm include/libwpd-0.8