Date: Wed, 3 Mar 2004 19:04:39 -0800 From: "\"John Merryweather Cooper,Home Office,,(509) 338-9391 \" <John Merryweather Cooper" <coop9211@uidaho.edu> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Cc: reed@pugetsoundtechnology.com Subject: ports/63729: [UPDATE] textproc/libwpd to 0.7.1 Message-ID: <1078369479.0@borgdemon.losaca.adelphia.net> Resent-Message-ID: <200403040310.i243A0ZV026763@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 63729
>Category: ports
>Synopsis: [UPDATE] textproc/libwpd to 0.7.1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Wed Mar 03 19:10:00 PST 2004
>Closed-Date:
>Last-Modified:
>Originator: John Merryweather Cooper,Home Office,,(509) 338-9391
>Release: FreeBSD 4.9-STABLE i386
>Organization:
>Environment:
System: FreeBSD 4.9-STABLE #14: Wed Mar 3 02:16:41 PST 2004
root@borgdemon.losaca.adelphia.net:/usr/obj/usr/src/sys/K6-2
>Description:
* update to latest version
* now uses libtool
* now installs a shared library instead of static
* use SIZE
>How-To-Repeat:
N/A
>Fix:
--- update-libwpd-0.7.1 begins here ---
# This is a patch for libwpd to update it to libwpd-0.7.1
#
# To apply this patch:
# STEP 1: Chdir to the source directory.
# STEP 2: Run the 'applypatch' program with this patch file as input.
#
# If you do not have 'applypatch', it is part of the 'makepatch' package
# that you can fetch from the Comprehensive Perl Archive Network:
# http://www.perl.com/CPAN/authors/Johan_Vromans/makepatch-x.y.tar.gz
# In the above URL, 'x' should be 2 or higher.
#
# To apply this patch without the use of 'applypatch':
# STEP 1: Chdir to the source directory.
# If you have a decent Bourne-type shell:
# STEP 2: Run the shell with this file as input.
# If you don't have such a shell, you may need to manually create
# the files/directories as shown below.
# STEP 3: Run the 'patch' program with this file as input.
#
# These are the commands needed to create/delete files/directories:
#
mkdir 'files'
chmod 0755 'files'
touch 'files/patch-ltmain.sh'
chmod 0644 'files/patch-ltmain.sh'
#
# This command terminates the shell and need not be executed manually.
exit
#
#### End of Preamble ####
#### Patch data follows ####
diff -u 'libwpd/Makefile' 'libwpd-0.7.1/Makefile'
Index: ./Makefile
--- ./Makefile Thu Feb 5 14:02:03 2004
+++ ./Makefile Wed Mar 3 17:38:30 2004
@@ -2,12 +2,11 @@
# Date created: Mon May 19 09:09:10 PDT 2003
# Whom: reed@pugetsoundtechnology.com
#
-# $FreeBSD: ports/textproc/libwpd/Makefile,v 1.3 2004/02/04 05:09:15 marcus Exp $
+# $FreeBSD$
#
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 @@
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 -u 'libwpd/distinfo' 'libwpd-0.7.1/distinfo'
Index: ./distinfo
--- ./distinfo Mon Jun 2 20:16:23 2003
+++ ./distinfo Wed Mar 3 15:10:22 2004
@@ -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 -u /dev/null 'libwpd-0.7.1/files/patch-ltmain.sh'
Index: ./files/patch-ltmain.sh
--- ./files/patch-ltmain.sh Wed Dec 31 16:00:00 1969
+++ ./files/patch-ltmain.sh Wed Mar 3 18:29:18 2004
@@ -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 -u 'libwpd/pkg-plist' 'libwpd-0.7.1/pkg-plist'
Index: ./pkg-plist
--- ./pkg-plist Mon Jun 2 20:16:23 2003
+++ ./pkg-plist Wed Mar 3 18:42:57 2004
@@ -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
#### End of Patch data ####
#### ApplyPatch data follows ####
# Data version : 1.0
# Date generated : Wed Mar 3 18:49:56 2004
# Generated by : makepatch 2.00
# Recurse directories : Yes
# p 'Makefile' 571 1078364310 0100644
# p 'distinfo' 61 1078355422 0100644
# c 'files/patch-ltmain.sh' 0 1078367358 0100644
# p 'pkg-plist' 865 1078368177 0100644
# C 'files' 0 1078367359 040755
#### End of ApplyPatch data ####
#### End of Patch kit [created: Wed Mar 3 18:49:56 2004] ####
#### Checksum: 175 5390 25127 ####
--- update-libwpd-0.7.1 ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1078369479.0>