aboutsummaryrefslogtreecommitdiff
path: root/textproc
diff options
context:
space:
mode:
Diffstat (limited to 'textproc')
-rw-r--r--textproc/libwpd/Makefile6
-rw-r--r--textproc/libwpd/distinfo3
-rw-r--r--textproc/libwpd/files/patch-ltmain.sh51
-rw-r--r--textproc/libwpd/pkg-plist23
-rw-r--r--textproc/libwpd08/Makefile6
-rw-r--r--textproc/libwpd08/distinfo3
-rw-r--r--textproc/libwpd08/files/patch-ltmain.sh51
-rw-r--r--textproc/libwpd08/pkg-plist23
8 files changed, 122 insertions, 44 deletions
diff --git a/textproc/libwpd/Makefile b/textproc/libwpd/Makefile
index 7252090481cf..a667a9dbf373 100644
--- a/textproc/libwpd/Makefile
+++ b/textproc/libwpd/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= libwpd
-PORTVERSION= 0.4.0
-PORTREVISION= 1
+PORTVERSION= 0.7.1
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= libwpd
@@ -16,7 +15,8 @@ MAINTAINER= reed@pugetsoundtechnology.com
COMMENT= Tools for importing and exporting WordPerfect(tm) documents
USE_GMAKE= yes
-GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
USE_GNOME= libgsf
+INSTALLS_SHLIB= yes
.include <bsd.port.mk>
diff --git a/textproc/libwpd/distinfo b/textproc/libwpd/distinfo
index d03806a134bf..d0cdf83b1718 100644
--- a/textproc/libwpd/distinfo
+++ b/textproc/libwpd/distinfo
@@ -1 +1,2 @@
-MD5 (libwpd-0.4.0.tar.gz) = b646abfa4854b2eee56907815c226527
+MD5 (libwpd-0.7.1.tar.gz) = 913e5e46c678efeb79604c2566628a68
+SIZE (libwpd-0.7.1.tar.gz) = 399768
diff --git a/textproc/libwpd/files/patch-ltmain.sh b/textproc/libwpd/files/patch-ltmain.sh
new file mode 100644
index 000000000000..1d5a5c7b87e1
--- /dev/null
+++ b/textproc/libwpd/files/patch-ltmain.sh
@@ -0,0 +1,51 @@
+--- 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 d99e5a832171..95fd4df9a1f0 100644
--- a/textproc/libwpd/pkg-plist
+++ b/textproc/libwpd/pkg-plist
@@ -1,25 +1,12 @@
bin/wpd2html
bin/wpd2raw
bin/wpd2text
-lib/libwpd-1.a
-lib/pkgconfig/libwpd-1.pc
+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
-include/libwpd-1/libwpd/WPXHLListener.h
-include/libwpd-1/libwpd/WPXHLListenerImpl.h
-include/libwpd-1/libwpd/WPXLLListener.h
-include/libwpd-1/libwpd/WPXParser.h
-include/libwpd-1/libwpd/WP6Parser.h
-include/libwpd-1/libwpd/WP6HLListener.h
-include/libwpd-1/libwpd/WP6Header.h
-include/libwpd-1/libwpd/WP60Header.h
-include/libwpd-1/libwpd/WP61Header.h
-include/libwpd-1/libwpd/WP6LLListener.h
-include/libwpd-1/libwpd/WPXHeader.h
-include/libwpd-1/libwpd/WP6FileStructure.h
-include/libwpd-1/libwpd/WP6PrefixDataPacket.h
-include/libwpd-1/libwpd/WP6FontDescriptorPacket.h
-include/libwpd-1/libwpd/WP6DefaultInitialFontPacket.h
-@exec mkdir -p %D/include/libwpd-1/libwpd
+lib/libwpd-1.so
+lib/libwpd-1.so.7
+lib/pkgconfig/libwpd-1.pc
@dirrm include/libwpd-1/libwpd
@dirrm include/libwpd-1
diff --git a/textproc/libwpd08/Makefile b/textproc/libwpd08/Makefile
index 7252090481cf..a667a9dbf373 100644
--- a/textproc/libwpd08/Makefile
+++ b/textproc/libwpd08/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= libwpd
-PORTVERSION= 0.4.0
-PORTREVISION= 1
+PORTVERSION= 0.7.1
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= libwpd
@@ -16,7 +15,8 @@ MAINTAINER= reed@pugetsoundtechnology.com
COMMENT= Tools for importing and exporting WordPerfect(tm) documents
USE_GMAKE= yes
-GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
USE_GNOME= libgsf
+INSTALLS_SHLIB= yes
.include <bsd.port.mk>
diff --git a/textproc/libwpd08/distinfo b/textproc/libwpd08/distinfo
index d03806a134bf..d0cdf83b1718 100644
--- a/textproc/libwpd08/distinfo
+++ b/textproc/libwpd08/distinfo
@@ -1 +1,2 @@
-MD5 (libwpd-0.4.0.tar.gz) = b646abfa4854b2eee56907815c226527
+MD5 (libwpd-0.7.1.tar.gz) = 913e5e46c678efeb79604c2566628a68
+SIZE (libwpd-0.7.1.tar.gz) = 399768
diff --git a/textproc/libwpd08/files/patch-ltmain.sh b/textproc/libwpd08/files/patch-ltmain.sh
new file mode 100644
index 000000000000..1d5a5c7b87e1
--- /dev/null
+++ b/textproc/libwpd08/files/patch-ltmain.sh
@@ -0,0 +1,51 @@
+--- 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/libwpd08/pkg-plist b/textproc/libwpd08/pkg-plist
index d99e5a832171..95fd4df9a1f0 100644
--- a/textproc/libwpd08/pkg-plist
+++ b/textproc/libwpd08/pkg-plist
@@ -1,25 +1,12 @@
bin/wpd2html
bin/wpd2raw
bin/wpd2text
-lib/libwpd-1.a
-lib/pkgconfig/libwpd-1.pc
+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
-include/libwpd-1/libwpd/WPXHLListener.h
-include/libwpd-1/libwpd/WPXHLListenerImpl.h
-include/libwpd-1/libwpd/WPXLLListener.h
-include/libwpd-1/libwpd/WPXParser.h
-include/libwpd-1/libwpd/WP6Parser.h
-include/libwpd-1/libwpd/WP6HLListener.h
-include/libwpd-1/libwpd/WP6Header.h
-include/libwpd-1/libwpd/WP60Header.h
-include/libwpd-1/libwpd/WP61Header.h
-include/libwpd-1/libwpd/WP6LLListener.h
-include/libwpd-1/libwpd/WPXHeader.h
-include/libwpd-1/libwpd/WP6FileStructure.h
-include/libwpd-1/libwpd/WP6PrefixDataPacket.h
-include/libwpd-1/libwpd/WP6FontDescriptorPacket.h
-include/libwpd-1/libwpd/WP6DefaultInitialFontPacket.h
-@exec mkdir -p %D/include/libwpd-1/libwpd
+lib/libwpd-1.so
+lib/libwpd-1.so.7
+lib/pkgconfig/libwpd-1.pc
@dirrm include/libwpd-1/libwpd
@dirrm include/libwpd-1