Mon Dec 6 11:56:44 2010 UTC ()
Find recent libwpd, but remove koffice-libwpd option from the default
build as currently doesn't build against it.  Bump PKGREVISION.


(markd)
diff -r1.123 -r1.124 pkgsrc/misc/koffice/Makefile
diff -r1.47 -r1.48 pkgsrc/misc/koffice/distinfo
diff -r1.5 -r1.6 pkgsrc/misc/koffice/options.mk
diff -r1.9 -r1.10 pkgsrc/misc/koffice/patches/patch-ab
cvs diff -r1.123 -r1.124 pkgsrc/misc/koffice/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/koffice/Attic/Makefile 2010/11/25 10:28:34 1.123
+++ pkgsrc/misc/koffice/Attic/Makefile 2010/12/06 11:56:44 1.124
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.123 2010/11/25 10:28:34 wiz Exp $ 1# $NetBSD: Makefile,v 1.124 2010/12/06 11:56:44 markd Exp $
2 2
3DISTNAME= koffice-1.6.3 3DISTNAME= koffice-1.6.3
4PKGREVISION= 21 4PKGREVISION= 22
5CATEGORIES= misc kde 5CATEGORIES= misc kde
6MASTER_SITES= ${MASTER_SITE_KDE:=koffice-1.6.3/src/} 6MASTER_SITES= ${MASTER_SITE_KDE:=koffice-1.6.3/src/}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= markd@NetBSD.org 9MAINTAINER= markd@NetBSD.org
10HOMEPAGE= http://www.koffice.org/ 10HOMEPAGE= http://www.koffice.org/
11COMMENT= KDE Office Suite 11COMMENT= KDE Office Suite
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14MAKE_JOBS_SAFE= no 14MAKE_JOBS_SAFE= no
15 15
16PATCH_SITES= ftp://ftp.kde.org/pub/kde/security_patches/ 16PATCH_SITES= ftp://ftp.kde.org/pub/kde/security_patches/
17PATCHFILES= koffice-xpdf-CVE-2007-3387.diff koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff 17PATCHFILES= koffice-xpdf-CVE-2007-3387.diff koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff
cvs diff -r1.47 -r1.48 pkgsrc/misc/koffice/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/misc/koffice/Attic/distinfo 2010/06/20 16:46:24 1.47
+++ pkgsrc/misc/koffice/Attic/distinfo 2010/12/06 11:56:44 1.48
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1$NetBSD: distinfo,v 1.47 2010/06/20 16:46:24 wiz Exp $ 1$NetBSD: distinfo,v 1.48 2010/12/06 11:56:44 markd Exp $
2 2
3SHA1 (koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff) = a3d1d85567ccf729a2237f4aa837f7e025ce00ae 3SHA1 (koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff) = a3d1d85567ccf729a2237f4aa837f7e025ce00ae
4RMD160 (koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff) = ab6ec62b1ee7c369e8a6f44ba285a56b8c5439b4 4RMD160 (koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff) = ab6ec62b1ee7c369e8a6f44ba285a56b8c5439b4
5Size (koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff) = 15961 bytes 5Size (koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff) = 15961 bytes
6SHA1 (koffice-1.6.3.tar.bz2) = de84214dec913eac1d47dab04dd93f3d81729fd3 6SHA1 (koffice-1.6.3.tar.bz2) = de84214dec913eac1d47dab04dd93f3d81729fd3
7RMD160 (koffice-1.6.3.tar.bz2) = e474ba48fa983fafb61ad58fb79cddda69ec6908 7RMD160 (koffice-1.6.3.tar.bz2) = e474ba48fa983fafb61ad58fb79cddda69ec6908
8Size (koffice-1.6.3.tar.bz2) = 56829391 bytes 8Size (koffice-1.6.3.tar.bz2) = 56829391 bytes
9SHA1 (koffice-xpdf-CVE-2007-3387.diff) = bff4f540389a77320bc87e2dedece50b82932e59 9SHA1 (koffice-xpdf-CVE-2007-3387.diff) = bff4f540389a77320bc87e2dedece50b82932e59
10RMD160 (koffice-xpdf-CVE-2007-3387.diff) = 7f620ec00ca05da91596f2d750d32ed8aa8bec95 10RMD160 (koffice-xpdf-CVE-2007-3387.diff) = 7f620ec00ca05da91596f2d750d32ed8aa8bec95
11Size (koffice-xpdf-CVE-2007-3387.diff) = 601 bytes 11Size (koffice-xpdf-CVE-2007-3387.diff) = 601 bytes
12SHA1 (patch-aa) = 78efadde329158d1e41f8a0c899055e265485234 12SHA1 (patch-aa) = 78efadde329158d1e41f8a0c899055e265485234
13SHA1 (patch-ab) = b7cb13d120764011b3b1d32cdc1ec805ddac59d8 13SHA1 (patch-ab) = 1f07247cf1554215d5532114138bfa53c7a3db6d
14SHA1 (patch-af) = a79564e57f2ef8eb43e8c1e23bb6a8e3d2a1d110 14SHA1 (patch-af) = a79564e57f2ef8eb43e8c1e23bb6a8e3d2a1d110
15SHA1 (patch-ag) = f0ad29395bbf52f70dd96f65c291fdb2ff0c6083 15SHA1 (patch-ag) = f0ad29395bbf52f70dd96f65c291fdb2ff0c6083
16SHA1 (patch-ah) = 094eaa1ff9a5f38adc2bf2f74965b0e47ccd2843 16SHA1 (patch-ah) = 094eaa1ff9a5f38adc2bf2f74965b0e47ccd2843
17SHA1 (patch-ai) = d12fa21d16a1bb11af9b35d65e5dfa9538a635b7 17SHA1 (patch-ai) = d12fa21d16a1bb11af9b35d65e5dfa9538a635b7
18SHA1 (patch-aj) = 2cbe0c00dbb0b3b52f15caaf5b925bc68e1f55b8 18SHA1 (patch-aj) = 2cbe0c00dbb0b3b52f15caaf5b925bc68e1f55b8
19SHA1 (patch-ak) = 5738bb6b043f8657c473c4d14e2c74d97d4974f8 19SHA1 (patch-ak) = 5738bb6b043f8657c473c4d14e2c74d97d4974f8
20SHA1 (patch-al) = 806334757d3ebca4515738e87454a30d9dd26e53 20SHA1 (patch-al) = 806334757d3ebca4515738e87454a30d9dd26e53
21SHA1 (patch-am) = 022be8c44e0eaa3cab3404da48a4259f1dc3499c 21SHA1 (patch-am) = 022be8c44e0eaa3cab3404da48a4259f1dc3499c
22SHA1 (patch-ao) = 7d976c4f3094635f984fc70964589a863e914be7 22SHA1 (patch-ao) = 7d976c4f3094635f984fc70964589a863e914be7
cvs diff -r1.5 -r1.6 pkgsrc/misc/koffice/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/misc/koffice/Attic/options.mk 2008/04/12 22:43:04 1.5
+++ pkgsrc/misc/koffice/Attic/options.mk 2010/12/06 11:56:44 1.6
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: options.mk,v 1.5 2008/04/12 22:43:04 jlam Exp $ 1# $NetBSD: options.mk,v 1.6 2010/12/06 11:56:44 markd Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.koffice 3PKG_OPTIONS_VAR= PKG_OPTIONS.koffice
4PKG_SUPPORTED_OPTIONS= mysql pgsql koffice-wv2 koffice-libwpd 4PKG_SUPPORTED_OPTIONS= mysql pgsql koffice-wv2 koffice-libwpd
5PKG_SUGGESTED_OPTIONS= koffice-wv2 koffice-libwpd 5PKG_SUGGESTED_OPTIONS= koffice-wv2
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9PLIST_VARS+= libwpd mysql pgsql wv2 9PLIST_VARS+= libwpd mysql pgsql wv2
10 10
11.if !empty(PKG_OPTIONS:Mmysql) 11.if !empty(PKG_OPTIONS:Mmysql)
12.include "../../mk/mysql.buildlink3.mk" 12.include "../../mk/mysql.buildlink3.mk"
13PLIST.mysql= yes 13PLIST.mysql= yes
14.else 14.else
15CONFIGURE_ARGS+= --disable-mysql 15CONFIGURE_ARGS+= --disable-mysql
16.endif 16.endif
17 17
18.if !empty(PKG_OPTIONS:Mpgsql) 18.if !empty(PKG_OPTIONS:Mpgsql)
cvs diff -r1.9 -r1.10 pkgsrc/misc/koffice/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/misc/koffice/patches/Attic/patch-ab 2009/11/03 19:02:26 1.9
+++ pkgsrc/misc/koffice/patches/Attic/patch-ab 2010/12/06 11:56:44 1.10
@@ -1,25 +1,47 @@ @@ -1,25 +1,47 @@
1$NetBSD: patch-ab,v 1.9 2009/11/03 19:02:26 markd Exp $ 1$NetBSD: patch-ab,v 1.10 2010/12/06 11:56:44 markd Exp $
2 2
3--- configure.orig 2007-05-31 09:56:35.000000000 +1200 3--- configure.orig 2007-05-30 21:56:35.000000000 +0000
4+++ configure 4+++ configure
5@@ -33848,6 +33848,7 @@ echo "${ECHO_T}$kde_cv_path" >&6; } 5@@ -33848,6 +33848,7 @@ echo "${ECHO_T}$kde_cv_path" >&6; }
6  6
7 fi 7 fi
8  8
9+GRAPHICS_MAGICK_CONFIG= 9+GRAPHICS_MAGICK_CONFIG=
10  10
11 if test -n "$GRAPHICS_MAGICK_CONFIG"; then 11 if test -n "$GRAPHICS_MAGICK_CONFIG"; then
12 vers=`$GRAPHICS_MAGICK_CONFIG --version 2>/dev/null | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` 12 vers=`$GRAPHICS_MAGICK_CONFIG --version 2>/dev/null | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
 13@@ -37010,10 +37011,10 @@ echo "${ECHO_T}$kde_cv_path" >&6; }
 14
 15
 16 if test -n "$PKGCONFIG"; then
 17- vers=`$PKGCONFIG libwpd-0.8 --modversion 2>/dev/null`
 18+ vers=`$PKGCONFIG libwpd-0.9 --modversion 2>/dev/null`
 19 if test -n "$vers"
 20 then
 21- LIBWPD_LIBS="`$PKGCONFIG libwpd-0.8 --libs`"
 22+ LIBWPD_LIBS="`$PKGCONFIG libwpd-0.9 --libs`"
 23 LIBWPD_RPATH=
 24 for args in $LIBWPD_LIBS; do
 25 case $args in
 26@@ -37023,7 +37024,7 @@ if test -n "$PKGCONFIG"; then
 27 esac
 28 done
 29 LIBWPD_RPATH=`echo $LIBWPD_RPATH | $SED -e "s/-L/-R/g"`
 30- LIBWPD_CFLAGS="`$PKGCONFIG libwpd-0.8 --cflags`"
 31+ LIBWPD_CFLAGS="`$PKGCONFIG libwpd-0.9 --cflags`"
 32
 33
 34 cat >>confdefs.h <<_ACEOF
13@@ -38534,7 +38535,7 @@ fi 35@@ -38534,7 +38535,7 @@ fi
14  36
15  37
16  38
17-if test "x$compile_kexi_macros_plugin" == "xyes"; then 39-if test "x$compile_kexi_macros_plugin" == "xyes"; then
18+if test "x$compile_kexi_macros_plugin" = "xyes"; then 40+if test "x$compile_kexi_macros_plugin" = "xyes"; then
19 compile_kexi_macros_plugin_TRUE= 41 compile_kexi_macros_plugin_TRUE=
20 compile_kexi_macros_plugin_FALSE='#' 42 compile_kexi_macros_plugin_FALSE='#'
21 else 43 else
22@@ -38543,7 +38544,7 @@ else 44@@ -38543,7 +38544,7 @@ else
23 fi 45 fi
24  46
25  47