 @@ -1,74 +1,74 @@
-# $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
 MAINTAINER=	markd@NetBSD.org
 HOMEPAGE=	http://www.koffice.org/
 COMMENT=	KDE Office Suite
 PKG_DESTDIR_SUPPORT=	user-destdir
 MAKE_JOBS_SAFE=		no
 PATCH_SITES=	ftp://ftp.kde.org/pub/kde/security_patches/
 PATCHFILES=	koffice-xpdf-CVE-2007-3387.diff koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff
 CONFLICTS+=	koffice3-[0-9]*
 # to unpack krita/plugins/convolutionfilters properly on NetBSD 1.6
 ## EXTRACT_USING=		gtar
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake perl pkg-config
 GNU_CONFIGURE=		yes
 GCC_REQD+=		2.95.3
 PTHREAD_OPTS+=		require
 CONFIGURE_ENV+=		PYTHONDIR=${LOCALBASE:Q}
 CONFIGURE_ENV+=		PYVERSSUFFIX=${PYVERSSUFFIX:Q}
 REPLACE_PERL+=		lib/store/fix_storage.pl
 REPLACE_PERL+=		admin/config.pl
 REPLACE_PERL+=		admin/bcheck.pl
 REPLACE_PERL+=		admin/conf.change.pl
 REPLACE_PERL+=		kword/templates/make_template.pl
 REPLACE_PERL+=		tools/scripts/gdb_output_to_text.pl
 REPLACE_PERL+=		tools/thesaurus/extract.pl
 REPLACE_PERL+=		kpresenter/kprconverter.pl
 # Ensure we export symbols in the linked shared object.
 LDFLAGS+=	${EXPORT_SYMBOLS_LDFLAGS}
 .include "options.mk"
 post-install:
 	@# The global desktop template files need to be user-writeable, or
 	@# else users won't be able to alter them after copying them to
 	@# their local directories.
 	${CHMOD} u+w ${DESTDIR}${PREFIX}/share/kde/templates/.source/*
 .include "../../lang/python/pyversion.mk"
 .include "../../meta-pkgs/kde3/kde3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../graphics/ImageMagick/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/jasper/buildlink3.mk"
 .include "../../graphics/libart/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../print/poppler-qt/buildlink3.mk"
 .include "../../textproc/aspell/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
 .include "../../x11/kdebase3/buildlink3.mk"
 .include "../../x11/kdelibs3/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,22 +1,22 @@
-$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
 Size (koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff) = 15961 bytes
 SHA1 (koffice-1.6.3.tar.bz2) = de84214dec913eac1d47dab04dd93f3d81729fd3
 RMD160 (koffice-1.6.3.tar.bz2) = e474ba48fa983fafb61ad58fb79cddda69ec6908
 Size (koffice-1.6.3.tar.bz2) = 56829391 bytes
 SHA1 (koffice-xpdf-CVE-2007-3387.diff) = bff4f540389a77320bc87e2dedece50b82932e59
 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
 SHA1 (patch-ai) = d12fa21d16a1bb11af9b35d65e5dfa9538a635b7
 SHA1 (patch-aj) = 2cbe0c00dbb0b3b52f15caaf5b925bc68e1f55b8
 SHA1 (patch-ak) = 5738bb6b043f8657c473c4d14e2c74d97d4974f8
 SHA1 (patch-al) = 806334757d3ebca4515738e87454a30d9dd26e53
 SHA1 (patch-am) = 022be8c44e0eaa3cab3404da48a4259f1dc3499c
 SHA1 (patch-ao) = 7d976c4f3094635f984fc70964589a863e914be7

 @@ -1,40 +1,40 @@
-# $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"
 PLIST_VARS+=		libwpd mysql pgsql wv2
 .if !empty(PKG_OPTIONS:Mmysql)
 .include "../../mk/mysql.buildlink3.mk"
 PLIST.mysql=		yes
 .else
 CONFIGURE_ARGS+=	--disable-mysql
 .endif
 .if !empty(PKG_OPTIONS:Mpgsql)
 .include "../../mk/pgsql.buildlink3.mk"
 .include "../../databases/libpqxx/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-pgsql-includes=${PGSQL_PREFIX}/include
 CONFIGURE_ARGS+=	--with-pgsql-libraries=${PGSQL_PREFIX}/lib
 CONFIGURE_ARGS+=	--with-pqxx-includes=${BUILDLINK_PREFIX.libpqxx}/include
 CONFIGURE_ARGS+=	--with-pqxx-libraries=${BUILDLINK_PREFIX.libpqxx}/lib
 PLIST.pgsql=		yes
 .else
 CONFIGURE_ARGS+=	--disable-pgsql
 .endif
 .if !empty(PKG_OPTIONS:Mkoffice-wv2)
 .include "../../converters/wv2/buildlink3.mk"
 PLIST.wv2=		yes
 .else
 CONFIGURE_ARGS+=	--without-libwv2
 .endif
 .if !empty(PKG_OPTIONS:Mkoffice-libwpd)
 .include "../../converters/libwpd/buildlink3.mk"
 PLIST.libwpd=		yes
 .endif

 @@ -1,52 +1,74 @@
-$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; }
     fi
 +GRAPHICS_MAGICK_CONFIG=
  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
 -if test "x$compile_kexi_macros_plugin" == "xyes"; then
 +if test "x$compile_kexi_macros_plugin" = "xyes"; then
    compile_kexi_macros_plugin_TRUE=
    compile_kexi_macros_plugin_FALSE='#'
  else
 @@ -38543,7 +38544,7 @@ else
  fi
 -if test "$compile_kexi_macros_plugin" == "yes"; then
 +if test "$compile_kexi_macros_plugin" = "yes"; then
  cat >>confdefs.h <<\_ACEOF
  #define KEXI_MACROS_SUPPORT 1
 @@ -38928,6 +38929,10 @@ else
    version=""2.5""
  fi
 +if test -n "${PYVERSSUFFIX}"; then
 +  version="${PYVERSSUFFIX}"
 +fi
++
  { echo "$as_me:$LINENO: checking for Python$version" >&5
  echo $ECHO_N "checking for Python$version... $ECHO_C" >&6; }
 @@ -51132,6 +51137,10 @@ else
    version=""2.5""
  fi
 +if test -n "${PYVERSSUFFIX}"; then
 +  version="${PYVERSSUFFIX}"
 +fi
++
  { echo "$as_me:$LINENO: checking for Python$version" >&5
  echo $ECHO_N "checking for Python$version... $ECHO_C" >&6; }