Find recent libwpd, but remove koffice-libwpd option from the default

build as currently doesn't build against it.  Bump PKGREVISION.

4 files changed, 30 insertions, 8 deletions

diff --git a/misc/koffice/Makefile b/misc/koffice/Makefile
index 7d5acc2faa1..81b1099f4a8 100644
--- a/misc/koffice/Makefile
+++ b/misc/koffice/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.123 2010/11/25 10:28:34 wiz Exp $
+# $NetBSD: Makefile,v 1.124 2010/12/06 11:56:44 markd Exp $
 
 DISTNAME=	koffice-1.6.3
-PKGREVISION=	21
+PKGREVISION=	22
 CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE:=koffice-1.6.3/src/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/misc/koffice/distinfo b/misc/koffice/distinfo
index ad7d4ff1fbc..1676233ead1 100644
--- a/misc/koffice/distinfo
+++ b/misc/koffice/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.47 2010/06/20 16:46:24 wiz Exp $
+$NetBSD: distinfo,v 1.48 2010/12/06 11:56:44 markd Exp $
 
 SHA1 (koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff) = a3d1d85567ccf729a2237f4aa837f7e025ce00ae
 RMD160 (koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff) = ab6ec62b1ee7c369e8a6f44ba285a56b8c5439b4
@@ -10,7 +10,7 @@ SHA1 (koffice-xpdf-CVE-2007-3387.diff) = bff4f540389a77320bc87e2dedece50b82932e5
 RMD160 (koffice-xpdf-CVE-2007-3387.diff) = 7f620ec00ca05da91596f2d750d32ed8aa8bec95
 Size (koffice-xpdf-CVE-2007-3387.diff) = 601 bytes
 SHA1 (patch-aa) = 78efadde329158d1e41f8a0c899055e265485234
-SHA1 (patch-ab) = b7cb13d120764011b3b1d32cdc1ec805ddac59d8
+SHA1 (patch-ab) = 1f07247cf1554215d5532114138bfa53c7a3db6d
 SHA1 (patch-af) = a79564e57f2ef8eb43e8c1e23bb6a8e3d2a1d110
 SHA1 (patch-ag) = f0ad29395bbf52f70dd96f65c291fdb2ff0c6083
 SHA1 (patch-ah) = 094eaa1ff9a5f38adc2bf2f74965b0e47ccd2843
diff --git a/misc/koffice/options.mk b/misc/koffice/options.mk
index f0f692a26b3..2e07661a467 100644
--- a/misc/koffice/options.mk
+++ b/misc/koffice/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.5 2008/04/12 22:43:04 jlam Exp $
+# $NetBSD: options.mk,v 1.6 2010/12/06 11:56:44 markd Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.koffice
 PKG_SUPPORTED_OPTIONS=	mysql pgsql koffice-wv2 koffice-libwpd
-PKG_SUGGESTED_OPTIONS=	koffice-wv2 koffice-libwpd
+PKG_SUGGESTED_OPTIONS=	koffice-wv2
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/misc/koffice/patches/patch-ab b/misc/koffice/patches/patch-ab
index 4d52ff60cc3..cc67ccbcc0e 100644
--- a/misc/koffice/patches/patch-ab
+++ b/misc/koffice/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.9 2009/11/03 19:02:26 markd Exp $
+$NetBSD: patch-ab,v 1.10 2010/12/06 11:56:44 markd Exp $
 
---- configure.orig	2007-05-31 09:56:35.000000000 +1200
+--- configure.orig	2007-05-30 21:56:35.000000000 +0000
 +++ configure
 @@ -33848,6 +33848,7 @@ echo "${ECHO_T}$kde_cv_path" >&6; }
  
@@ -10,6 +10,28 @@ $NetBSD: patch-ab,v 1.9 2009/11/03 19:02:26 markd Exp $
  
  if test -n "$GRAPHICS_MAGICK_CONFIG"; then
   vers=`$GRAPHICS_MAGICK_CONFIG --version 2>/dev/null | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
+@@ -37010,10 +37011,10 @@ echo "${ECHO_T}$kde_cv_path" >&6; }
+ 
+ 
+ if test -n "$PKGCONFIG"; then
+-  vers=`$PKGCONFIG libwpd-0.8 --modversion 2>/dev/null`
++  vers=`$PKGCONFIG libwpd-0.9 --modversion 2>/dev/null`
+   if test -n "$vers"
+   then
+-     LIBWPD_LIBS="`$PKGCONFIG libwpd-0.8 --libs`"
++     LIBWPD_LIBS="`$PKGCONFIG libwpd-0.9 --libs`"
+      LIBWPD_RPATH=
+      for args in $LIBWPD_LIBS; do
+           case $args in
+@@ -37023,7 +37024,7 @@ if test -n "$PKGCONFIG"; then
+           esac
+      done
+      LIBWPD_RPATH=`echo $LIBWPD_RPATH | $SED -e "s/-L/-R/g"`
+-     LIBWPD_CFLAGS="`$PKGCONFIG libwpd-0.8 --cflags`"
++     LIBWPD_CFLAGS="`$PKGCONFIG libwpd-0.9 --cflags`"
+ 
+ 
+ cat >>confdefs.h <<_ACEOF
 @@ -38534,7 +38535,7 @@ fi