- Update to 0.8.9

- pkg-plist cleanups
- Minor tweaks to install-sh patch

PR:		ports/120758
Submitted by:	gpalmer
Approved by:	beech (mentor, implicit)

6 files changed, 118 insertions, 39 deletions

diff --git a/finance/kmymoney2/Makefile b/finance/kmymoney2/Makefile
index c32f711d08fb..36876da63b8c 100644
--- a/finance/kmymoney2/Makefile
+++ b/finance/kmymoney2/Makefile
@@ -6,49 +6,35 @@
 #
 
 PORTNAME=	kmymoney2
-PORTVERSION=	0.8.7
-PORTREVISION=	2
+PORTVERSION=	0.8.9
 CATEGORIES=	finance
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	alecn2002@yandex.ru
 COMMENT=	KDE-based personal finance assistant
 
 LIB_DEPENDS=	osp.5:${PORTSDIR}/textproc/opensp
-BUILD_DEPENDS=	${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash
+BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
-# Currently no possibility to enable OFX; requires additional work
-.undef WITH_OFX
-WITHOUT_OFX=	yes
+LIB_DEPENDS+=	ofx.4:${PORTSDIR}/finance/libofx
+CONFIGURE_ARGS=	--enable-ofxplugin --enable-ofxbanking --enable-pdf-docs
 
-.if defined(WITH_OFX)
-LIB_DEPENDS+=	ofx.3:${PORTSDIR}/finance/libofx
-CONFIGURE_ARGS=	--enable-ofxplugin
-OFXPLUGIN=
-.else
-CONFIGURE_ARGS=	--enable-ofxplugin=no
-OFXPLUGIN=	"@comment "
-.endif
-
-PLIST_SUB+=	OFXPLUGIN=${OFXPLUGIN}
-
-USE_KDELIBS_VER=	3
-USE_GMAKE=		yes
+USE_KDELIBS_VER=3
+USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	libtool:15
-USE_PERL5=		yes
-USE_BZIP2=		yes
+USE_PERL5=	yes
+USE_BZIP2=	yes
 USE_LDCONFIG=	yes
 USE_GETTEXT=	yes
 
 INSTALLS_ICONS=	yes
 
-MAN1=			kmymoney2.1
+MAN1=		kmymoney2.1
 MANCOMPRESSED=	yes
 
-DATADIR=		${PREFIX}/share/apps/${PORTNAME}
-DOCSDIR=		${PREFIX}/share/doc/HTML/en/${PORTNAME}
+DATADIR=	${PREFIX}/share/apps/${PORTNAME}
+DOCSDIR=	${PREFIX}/share/doc/HTML/en/${PORTNAME}
 
 post-patch:
 	${REINPLACE_CMD} -E -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/configure
diff --git a/finance/kmymoney2/distinfo b/finance/kmymoney2/distinfo
index 1071c66fa41b..826b15746ec3 100644
--- a/finance/kmymoney2/distinfo
+++ b/finance/kmymoney2/distinfo
@@ -1,3 +1,3 @@
-MD5 (kmymoney2-0.8.7.tar.bz2) = 53739ae557d4a9d65a0f93f873f4e729
-SHA256 (kmymoney2-0.8.7.tar.bz2) = e8e3449012036622589ffd31cc9f9d8a3b4ae18dc442236565afa77f50b0822b
-SIZE (kmymoney2-0.8.7.tar.bz2) = 6848630
+MD5 (kmymoney2-0.8.9.tar.bz2) = 1f0c412f88b9344c18562fbca3c10717
+SHA256 (kmymoney2-0.8.9.tar.bz2) = d23717d273e366ba84d7ef3138d71b1b7d758e6c626e83439df7fc1a567c3965
+SIZE (kmymoney2-0.8.9.tar.bz2) = 6161688
diff --git a/finance/kmymoney2/files/patch-admin__install-sh b/finance/kmymoney2/files/patch-admin__install-sh
new file mode 100644
index 000000000000..c8dd2746d86d
--- /dev/null
+++ b/finance/kmymoney2/files/patch-admin__install-sh
@@ -0,0 +1,28 @@
+--- ./admin/install-sh.orig	2004-12-28 15:10:08.000000000 -0500
++++ ./admin/install-sh	2008-10-10 09:39:06.000000000 -0400
+@@ -50,6 +50,7 @@
+ stripcmd=""
+ rmcmd="$rmprog -f"
+ mvcmd="$mvprog"
++mkdircmd="$mkdirprog -p"
+ src=""
+ dst=""
+ dir_arg=""
+@@ -120,7 +121,7 @@
+ 		instcmd=:
+ 		chmodcmd=""
+ 	else
+-		instcmd=$mkdirprog
++		instcmd=$mkdircmd
+ 	fi
+ else
+ 
+@@ -181,7 +182,7 @@
+ 
+ 	if [ ! -d "$pathcomp" ] ;
+         then
+-		$mkdirprog "$pathcomp"
++		$mkdircmd "$pathcomp"
+ 	else
+ 		:
+ 	fi
diff --git a/finance/kmymoney2/files/patch-configure b/finance/kmymoney2/files/patch-configure
index b539a7c431fe..0a0e7ebd5da6 100644
--- a/finance/kmymoney2/files/patch-configure
+++ b/finance/kmymoney2/files/patch-configure
@@ -1,12 +1,25 @@
---- configure.orig	Thu Feb 23 19:02:14 2006
-+++ configure	Thu Feb 23 19:08:19 2006
+--- ./configure.orig	2008-03-24 10:49:54.000000000 -0400
++++ ./configure	2008-10-10 09:39:07.000000000 -0400
 @@ -1,4 +1,4 @@
 -#! /bin/sh
-+#! %%LOCALBASE%%/bin/bash
++#! /usr/local/bin/bash
  # Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.59.
+ # Generated by GNU Autoconf 2.61.
  #
-@@ -36106,11 +36106,11 @@
+@@ -22553,10 +22553,10 @@
+ 
+ 
+ # This can be used to rebuild libtool when needed
+-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++LIBTOOL_DEPS=" /usr/local/share/libtool/ltmain.sh"
+ 
+ # Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent'
++LIBTOOL='$(SHELL) /usr/local/bin/libtool --silent'
+ 
+ # Prevent multiple expansion
+ 
+@@ -36716,11 +36716,11 @@
  
  { (exit 0); exit 0; }
  _ACEOF
diff --git a/finance/kmymoney2/files/patch-kmymoney2__plugins__Makefile.in b/finance/kmymoney2/files/patch-kmymoney2__plugins__Makefile.in
new file mode 100644
index 000000000000..05c55571e3be
--- /dev/null
+++ b/finance/kmymoney2/files/patch-kmymoney2__plugins__Makefile.in
@@ -0,0 +1,11 @@
+--- ./kmymoney2/plugins/Makefile.in.orig	2008-03-24 10:50:04.000000000 -0400
++++ ./kmymoney2/plugins/Makefile.in	2008-10-10 09:39:06.000000000 -0400
+@@ -389,7 +389,7 @@
+ INCLUDES = $(all_includes)  -I$(top_srcdir) -I.
+ 
+ # since some of the subdirs are conditional, we need to define DIST_SUBDIRS
+-SUBDIRS = interfaces @ofx_importerplugin@ @kbanking_plugin@
++SUBDIRS = . interfaces @ofx_importerplugin@ @kbanking_plugin@
+ DIST_SUBDIRS = interfaces kbanking ofximport
+ 
+ # The library containing the plugin base class
diff --git a/finance/kmymoney2/pkg-plist b/finance/kmymoney2/pkg-plist
index e4af0f245e3f..5084276bbc0c 100644
--- a/finance/kmymoney2/pkg-plist
+++ b/finance/kmymoney2/pkg-plist
@@ -29,7 +29,9 @@ include/kmymoney/mymoneytransactionfilter.h
 include/kmymoney/mymoneyutils.h
 include/kmymoney/statementinterface.h
 include/kmymoney/viewinterface.h
-%%OFXPLUGIN%%lib/kde3/kmm_ofximport.so
+lib/kde3/kmm_ofximport.a
+lib/kde3/kmm_ofximport.la
+lib/kde3/kmm_ofximport.so
 lib/libkmm_mymoney.a
 lib/libkmm_mymoney.la
 lib/libkmm_mymoney.so
@@ -191,6 +193,7 @@ share/applications/kde/kmymoney2.desktop
 %%DATADIR%%/templates/es_ES/default_accounts.kmt
 %%DATADIR%%/templates/fr_FR/comptes_par_default.kmt
 %%DATADIR%%/templates/gl_ES/default_accounts.kmt
+%%DATADIR%%/templates/nl_NL/default_accounts.kmt
 %%DATADIR%%/templates/pt_BR/default_accounts.kmt
 %%DATADIR%%/templates/ru_SU/default_accounts.kmt
 %%DATADIR%%/templates/zh_CN/default_accounts.kmt
@@ -349,22 +352,60 @@ share/locale/it/LC_MESSAGES/kmymoney2.mo
 share/locale/lt/LC_MESSAGES/kmymoney2.mo
 share/locale/nl/LC_MESSAGES/kmymoney2.mo
 share/locale/pl/LC_MESSAGES/kmymoney2.mo
+share/locale/pt/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
 share/locale/sk/LC_MESSAGES/kmymoney2.mo
 share/locale/sv/LC_MESSAGES/kmymoney2.mo
 share/locale/zh_CN/LC_MESSAGES/kmymoney2.mo
 share/mimelnk/application/x-kmymoney2.desktop
-%%OFXPLUGIN%%share/services/kmm_ofximport.desktop
+share/services/kmm_ofximport.desktop
 share/servicetypes/kmymoneyimporterplugin.desktop
 share/servicetypes/kmymoneyplugin.desktop
 @dirrm include/kmymoney
-@dirrm share/locale/es_AR/LC_MESSAGES
-@dirrm share/locale/es_AR
+@dirrmtry lib/kde3
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/sv/LC_MESSAGES
+@dirrmtry share/locale/sv
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/ru/LC_MESSAGES
+@dirrmtry share/locale/ru
+@dirrmtry share/locale/pt_BR/LC_MESSAGES
+@dirrmtry share/locale/pt_BR
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nl/LC_MESSAGES
+@dirrmtry share/locale/nl
+@dirrmtry share/locale/lt/LC_MESSAGES
+@dirrmtry share/locale/lt
+@dirrmtry share/locale/it/LC_MESSAGES
+@dirrmtry share/locale/it
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fr/LC_MESSAGES
+@dirrmtry share/locale/fr
+@dirrmtry share/locale/es_AR/LC_MESSAGES
+@dirrmtry share/locale/es_AR
+@dirrmtry share/locale/es/LC_MESSAGES
+@dirrmtry share/locale/es
+@dirrmtry share/locale/en_GB/LC_MESSAGES
+@dirrmtry share/locale/en_GB
+@dirrmtry share/locale/de/LC_MESSAGES
+@dirrmtry share/locale/de
+@dirrmtry share/locale/da/LC_MESSAGES
+@dirrmtry share/locale/da
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
 @dirrm %%DATADIR%%/templates/zh_CN
 @dirrm %%DATADIR%%/templates/ru_SU
 @dirrm %%DATADIR%%/templates/pt_BR
+@dirrm %%DATADIR%%/templates/nl_NL
 @dirrm %%DATADIR%%/templates/gl_ES
 @dirrm %%DATADIR%%/templates/fr_FR
 @dirrm %%DATADIR%%/templates/es_ES