Update kmymoney2 to 0.8.5

From Gary Duzan in PR pkg/34669 with some tweaks from me.

Changes:
0.8.5:
some bug fixes and user interface improvements. Some build system changes
will help in implementing the application on a wide selection of platforms.
Improvements to the file importers (GnuCash and QIF).

0.8.4:
several bug fixes and some improvements to the entry of scheduled
transactions. There are also some new translations and miscellaneous
changes, all of which should help to make building and using the
application even easier.

0.8.1-3:
Changes unknown.

5 files changed, 42 insertions, 85 deletions

diff --git a/finance/kmymoney2/Makefile b/finance/kmymoney2/Makefile
index c03100d20c4..9861334e680 100644
--- a/finance/kmymoney2/Makefile
+++ b/finance/kmymoney2/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.30 2006/07/07 15:49:32 jlam Exp $
+# $NetBSD: Makefile,v 1.31 2006/10/07 12:14:18 markd Exp $
 
-DISTNAME=	kmymoney2-0.8
-PKGREVISION=	5
+DISTNAME=	kmymoney2-0.8.5
 CATEGORIES=	finance kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=kmymoney2/}
 EXTRACT_SUFX=	.tar.bz2
@@ -10,7 +9,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://kmymoney2.sourceforge.net/
 COMMENT=	Personal finance manager for KDE
 
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake msgfmt perl
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
@@ -20,6 +19,8 @@ SHLIBTOOL_OVERRIDE=	# empty
 
 CONFIGURE_ARGS+=	--enable-mt
 
+REPLACE_PERL+=  admin/fixuifiles
+
 # a fix for qt-3.3.5, please remove if qt-3.3.6 (or newer) solves the problem
 SUBST_CLASSES+=		hints
 SUBST_STAGE.hints=	post-patch
diff --git a/finance/kmymoney2/PLIST b/finance/kmymoney2/PLIST
index 9b8369835dd..7cf7c1ecbb6 100644
--- a/finance/kmymoney2/PLIST
+++ b/finance/kmymoney2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2006/04/17 07:07:19 jlam Exp $
+@comment $NetBSD: PLIST,v 1.7 2006/10/07 12:14:18 markd Exp $
 bin/kmymoney
 bin/kmymoney2
 include/kmymoney/export.h
@@ -110,6 +110,7 @@ share/doc/kde/HTML/en/kmymoney2/ledgers.png
 share/doc/kde/HTML/en/kmymoney2/ledgers_view.png
 share/doc/kde/HTML/en/kmymoney2/ledgerview-numbered.png
 share/doc/kde/HTML/en/kmymoney2/mainwindow_numbered.png
+share/doc/kde/HTML/en/kmymoney2/makemostof.docbook
 share/doc/kde/HTML/en/kmymoney2/new.png
 share/doc/kde/HTML/en/kmymoney2/newfile.png
 share/doc/kde/HTML/en/kmymoney2/newinst.png
@@ -322,6 +323,7 @@ share/kde/icons/hicolor/16x16/apps/kmymoney2.png
 share/kde/icons/hicolor/16x16/mimetypes/kmy.png
 share/kde/icons/hicolor/32x32/apps/kmymoney2.png
 share/kde/icons/hicolor/32x32/mimetypes/kmy.png
+share/kde/icons/hicolor/48x48/apps/kmymoney2.png
 share/kde/icons/hicolor/48x48/mimetypes/kmy.png
 share/kde/icons/hicolor/64x64/apps/kmymoney2.png
 share/kde/icons/hicolor/64x64/mimetypes/kmy.png
@@ -331,12 +333,15 @@ share/kde/mimelnk/application/x-kmymoney2.desktop
 ${HAS_LIBOFX}share/kde/services/kmm_ofximport.desktop
 share/kde/servicetypes/kmymoneyimporterplugin.desktop
 share/kde/servicetypes/kmymoneyplugin.desktop
+share/locale/ca/LC_MESSAGES/kmymoney2.mo
+share/locale/da/LC_MESSAGES/kmymoney2.mo
 share/locale/de/LC_MESSAGES/kmymoney2.mo
 share/locale/en_GB/LC_MESSAGES/kmymoney2.mo
 share/locale/es/LC_MESSAGES/kmymoney2.mo
 share/locale/fr/LC_MESSAGES/kmymoney2.mo
 share/locale/gl/LC_MESSAGES/kmymoney2.mo
 share/locale/it/LC_MESSAGES/kmymoney2.mo
+share/locale/lt/LC_MESSAGES/kmymoney2.mo
 share/locale/pt_BR/LC_MESSAGES/kmymoney2.mo
 share/locale/pt_PT/LC_MESSAGES/kmymoney2.mo
 share/locale/ru/LC_MESSAGES/kmymoney2.mo
diff --git a/finance/kmymoney2/distinfo b/finance/kmymoney2/distinfo
index 040f62b4a6c..05f85466e7d 100644
--- a/finance/kmymoney2/distinfo
+++ b/finance/kmymoney2/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.6 2006/06/28 16:04:06 joerg Exp $
+$NetBSD: distinfo,v 1.7 2006/10/07 12:14:18 markd Exp $
 
-SHA1 (kmymoney2-0.8.tar.bz2) = 5e46cbf04b34a495433d9a1582a607ef2b4ef086
-RMD160 (kmymoney2-0.8.tar.bz2) = 53337e1f48ea3cad74328640302348257005e148
-Size (kmymoney2-0.8.tar.bz2) = 6078609 bytes
+SHA1 (kmymoney2-0.8.5.tar.bz2) = 1c0780621f381cf096baf975ecad9e94571372d4
+RMD160 (kmymoney2-0.8.5.tar.bz2) = bcf2c149791c7d181a87aee0bf25c03de634bf8a
+Size (kmymoney2-0.8.5.tar.bz2) = 5919649 bytes
 SHA1 (patch-aa) = 742f6b67c3f9de966f0441c5c5dd16fd8fcc28e3
 SHA1 (patch-ab) = b5c39f7e35b70304abfc2f8c9a9d438031e16631
-SHA1 (patch-ac) = 8cbc58fd79822705c7e672a5caced50ae8894c0a
-SHA1 (patch-ad) = 9cf0fe5efe66e3734b5410116977f7998969025a
+SHA1 (patch-ac) = ab739b5719a4e4e9caa4e8399bbe1bd98cd43627
+SHA1 (patch-ad) = 0b87fd40a8c5fa0af71002b06d3e1b5d7f1e2508
 SHA1 (patch-ae) = 3466df88f68535549172e253ad24142ef1149360
 SHA1 (patch-af) = 9228789b4d601a22d77fe7b41e04fa08a068040c
diff --git a/finance/kmymoney2/patches/patch-ac b/finance/kmymoney2/patches/patch-ac
index c33f894a620..fd6cc9ef66a 100644
--- a/finance/kmymoney2/patches/patch-ac
+++ b/finance/kmymoney2/patches/patch-ac
@@ -1,62 +1,17 @@
-$NetBSD: patch-ac,v 1.3 2005/10/09 12:33:58 markd Exp $
+$NetBSD: patch-ac,v 1.4 2006/10/07 12:14:18 markd Exp $
 
---- configure.orig	2005-08-13 05:49:50.000000000 +1200
-+++ configure
-@@ -31762,7 +31762,7 @@ echo "${ECHO_T}$kde_cv_path" >&6
-               if test "$kde_qtsubver" -le 1; then
-                 kde32ornewer=
-               fi
--              if test "$kde_qtsubver" -le 2 -o `kde-config --version | grep KDE | sed 's/KDE: \(...\).*/\1/'` == 3.2; then
-+              if test "$kde_qtsubver" -le 2 -o `kde-config --version | grep KDE | sed 's/KDE: \(...\).*/\1/'` = 3.2; then
-                 kde33ornewer=
-               fi
-             fi
-@@ -32043,7 +32043,7 @@ echo "${ECHO_T}$kde_cv_path" >&6
+--- configure.orig	2006-05-15 10:21:20.000000000 -0400
++++ configure	2006-07-04 23:56:41.000000000 -0400
+@@ -32362,7 +32362,7 @@ echo "${ECHO_T}$kde_cv_path" >&6
  
  
-         if test -n "$MEINPROC" && test ! "$MEINPROC" = "compiled"; then
--	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share `kde-config --prefix`/share"
-+	    kde_sharedirs="$prefix/share/kde /usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share `kde-config --prefix`/share"
+         if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then
+- 	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share `kde-config --prefix`/share"
++ 	    kde_sharedirs="$prefix/share/kde /usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share `kde-config --prefix`/share"
              test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
  
  KDE_XSL_STYLESHEET=NO
-@@ -33391,7 +33391,7 @@ echo "${ECHO_T}$enable_pdfdocs" >&6
- 
- 
- 
--if test x$enable_pdfdocs == xyes; then
-+if test x$enable_pdfdocs = xyes; then
-   GENERATE_PDF_TRUE=
-   GENERATE_PDF_FALSE='#'
- else
-@@ -33400,7 +33400,7 @@ else
- fi
- 
- 
--  if test x$enable_pdfdocs == xyes; then
-+  if test x$enable_pdfdocs = xyes; then
-         # Extract the first word of "html2ps", so it can be a program name with args.
- set dummy html2ps; ac_word=$2
- echo "$as_me:$LINENO: checking for $ac_word" >&5
-@@ -33549,7 +33549,7 @@ fi
- 
- 
- 
--if test x$enable_pdfdocs == xyes -a x$found_ps2pdf = xyes -a x$found_html2ps == xyes; then
-+if test x$enable_pdfdocs = xyes -a x$found_ps2pdf = xyes -a x$found_html2ps = xyes; then
-   HAVE_HTMLCONVERSIONTOOLS_TRUE=
-   HAVE_HTMLCONVERSIONTOOLS_FALSE='#'
- else
-@@ -33559,7 +33559,7 @@ fi
- 
- 
- 
--if test x$enable_pdfdocs == xyes -a x$found_jade = xyes -a x$found_pdfjadetex == xyes; then
-+if test x$enable_pdfdocs = xyes -a x$found_jade = xyes -a x$found_pdfjadetex = xyes; then
-   HAVE_DSSSLCONVERSIONTOOLS_TRUE=
-   HAVE_DSSSLCONVERSIONTOOLS_FALSE='#'
- else
-@@ -33808,7 +33808,7 @@ else
+@@ -34274,7 +34274,7 @@ else
    have_new_ofx="no"
  fi
  
@@ -65,7 +20,7 @@ $NetBSD: patch-ac,v 1.3 2005/10/09 12:33:58 markd Exp $
        ofx_importerplugin="ofximport"
        ofx_libs="-lofx"
      fi
-@@ -34028,7 +34028,7 @@ else
+@@ -34494,7 +34494,7 @@ else
    have_new_ofx="no"
  fi
  
@@ -74,17 +29,12 @@ $NetBSD: patch-ac,v 1.3 2005/10/09 12:33:58 markd Exp $
  
  cat >>confdefs.h <<_ACEOF
  #define USE_OFX_DIRECTCONNECT "1"
-@@ -34058,10 +34058,9 @@ CURDIR=`pwd`
- MFILES=$(find $CURDIR/$srcdir -name Makefile.am);
- for mfile in $MFILES; do
-   DIR=$(dirname $mfile)
--  pushd $DIR > /dev/null
--  CD=`pwd`
--  popd > /dev/null
--  if test "$srcdir" == "." -o ${CD:0:${#CURDIR}} == $CURDIR; then
-+  CD=`(cd $DIR; pwd)`
-+  CD1=`echo $CD | head -c ${#CURDIR}`
-+  if test "$srcdir" = "." -o $CD1 = $CURDIR; then
-     HFILES=$(grep -v noinst_HEADERS $mfile | grep _HEADERS)
-     for HFILE in $HFILES; do
-       case $HFILE in
+@@ -34521,7 +34521,7 @@ mkdir kmymoney
+ 
+ echo Generating symlinks to header files
+ CURDIR=
+-if test "x${srcdir:0:1}" != "x/"; then
++if test "x$(echo $srcdir | cut -b 1)" != "x/"; then
+   CURDIR=`pwd`/
+ fi
+ BASEDIR=$CURDIR$srcdir
diff --git a/finance/kmymoney2/patches/patch-ad b/finance/kmymoney2/patches/patch-ad
index 0a3a6709b3a..87e0547d140 100644
--- a/finance/kmymoney2/patches/patch-ad
+++ b/finance/kmymoney2/patches/patch-ad
@@ -1,15 +1,16 @@
-$NetBSD: patch-ad,v 1.3 2005/10/09 12:33:58 markd Exp $
+$NetBSD: patch-ad,v 1.4 2006/10/07 12:14:18 markd Exp $
 
---- developer-doc/phb/Makefile.in.orig	2005-10-09 10:10:54.000000000 +1300
-+++ developer-doc/phb/Makefile.in
-@@ -507,8 +507,8 @@ all:	$(TARGETS) $(PDF_TARGET)
+--- developer-doc/phb/Makefile.in.orig	2006-05-15 10:21:38.000000000 -0400
++++ developer-doc/phb/Makefile.in	2006-07-04 23:28:49.000000000 -0400
+@@ -511,9 +511,9 @@ all:	$(TARGETS) $(PDF_TARGET)
  
  phb.html:	$(DOCBOOK_FILES)
  	@if test -e $(MEINPROC); then \
 -		echo $(MEINPROC) --stylesheet $(kde_libs_prefix)/share/apps/ksgmltools2/customization/$(STYLESHEET) $(srcdir)/phb.docbook -o phb.html; \
--		$(MEINPROC) --stylesheet $(kde_libs_prefix)/share/apps/ksgmltools2/customization/$(STYLESHEET) $(srcdir)/phb.docbook -o phb.html; \
 +		echo $(MEINPROC) --stylesheet $(kde_libs_prefix)/share/kde/apps/ksgmltools2/customization/$(STYLESHEET) $(srcdir)/phb.docbook -o phb.html; \
-+		$(MEINPROC) --stylesheet $(kde_libs_prefix)/share/kde/apps/ksgmltools2/customization/$(STYLESHEET) $(srcdir)/phb.docbook -o phb.html; \
+ 		echo sed -i "s/ISO-8859-1/UTF-8/g" phb.html; \
+-		$(MEINPROC) --stylesheet $(kde_libs_prefix)/share/apps/ksgmltools2/customization/$(STYLESHEET) $(srcdir)/phb.docbook --stdout | sed "s/ISO-8859-1/UTF-8/g" > phb.html; \
++		$(MEINPROC) --stylesheet $(kde_libs_prefix)/share/kde/apps/ksgmltools2/customization/$(STYLESHEET) $(srcdir)/phb.docbook --stdout | sed "s/ISO-8859-1/UTF-8/g" > phb.html; \
  	fi
  
  # if we're in a VPATH environment, we need to copy all files over