10 files changed, 46 insertions, 50 deletions

diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index 1b1182e1d27a..92d281ca6438 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gnucash
 PORTVERSION=	2.4.13
+PORTREVISION=	1
 CATEGORIES=	finance gnome
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20%28stable%29/${PORTVERSION}
 
diff --git a/finance/grisbi/Makefile b/finance/grisbi/Makefile
index 20adea01e93f..f7b426c1950e 100644
--- a/finance/grisbi/Makefile
+++ b/finance/grisbi/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	grisbi
 PORTVERSION=	0.8.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	finance
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20stable/${PORTVERSION:R}.x/
 
@@ -12,7 +12,7 @@ COMMENT=	Personal accounting application
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	ofx.5:${PORTSDIR}/finance/libofx
+LIB_DEPENDS=	libofx.so:${PORTSDIR}/finance/libofx
 
 USE_BZIP2=	yes
 USES=		gmake iconv pkgconfig
diff --git a/finance/homebank/Makefile b/finance/homebank/Makefile
index e51562fd49e7..d33d2dee7905 100644
--- a/finance/homebank/Makefile
+++ b/finance/homebank/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	homebank
 PORTVERSION=	4.5.4
+PORTREVISION=	1
 CATEGORIES=	finance
 MASTER_SITES=	http://homebank.free.fr/public/
 
diff --git a/finance/kmymoney-kde4/Makefile b/finance/kmymoney-kde4/Makefile
index 2972453f513a..82fbc4429e2e 100644
--- a/finance/kmymoney-kde4/Makefile
+++ b/finance/kmymoney-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kmymoney
 PORTVERSION=	4.6.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	finance kde
 MASTER_SITES=	SF/${PORTNAME}2/KMyMoney-KDE4/${PORTVERSION}
 
diff --git a/finance/libofx/Makefile b/finance/libofx/Makefile
index 05cd84b6ac84..d76d8d63e282 100644
--- a/finance/libofx/Makefile
+++ b/finance/libofx/Makefile
@@ -2,21 +2,20 @@
 # $FreeBSD$
 
 PORTNAME=	libofx
-PORTVERSION=	0.9.5
-PORTREVISION=	1
+PORTVERSION=	0.9.9
 CATEGORIES=	finance
 MASTER_SITES=	SF
 
 MAINTAINER=	jhale@FreeBSD.org
 COMMENT=	OpenSource implementation of the OFX (Open Financial eXchange)
 
-LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
-		xml\\+\\+-2.6.2:${PORTSDIR}/textproc/libxml++26 \
-		osp.5:${PORTSDIR}/textproc/opensp
+LICENSE=	GPLv2
+
+LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
+		libxml++-2.6.so:${PORTSDIR}/textproc/libxml++26 \
+		libosp.so:${PORTSDIR}/textproc/opensp
 
-USE_GCC=	any
-USES=		iconv pkgconfig
-USE_GMAKE=	yes
+USES=		gmake iconv pkgconfig
 USE_AUTOTOOLS=	aclocal autoheader automake autoconf libtool
 ACLOCAL_ARGS=	-I m4
 AUTOMAKE_ARGS=	--add-missing
@@ -28,27 +27,21 @@ USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-LICENSE=	GPLv2
-
-MAN1=		ofxconnect.1 \
-		ofxdump.1
-
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	APIDOC
 APIDOC_DESC=	Install full API documentation
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for file in AUTHORS ChangeLog INSTALL NEWS README totest.txt
-	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
 .endfor
 .if ${PORT_OPTIONS:MAPIDOC}
-	@(cd ${WRKSRC}/doc; ${COPYTREE_SHARE} html ${DOCSDIR})
+	@(cd ${WRKSRC}/doc; ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR})
 .endif
 .endif
 
diff --git a/finance/libofx/distinfo b/finance/libofx/distinfo
index f3c426261247..58a28c8e684d 100644
--- a/finance/libofx/distinfo
+++ b/finance/libofx/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libofx-0.9.5.tar.gz) = a075c5634b94bad16f8c949eeb77625d31bedea3bb10a8da174b989ffab7e78e
-SIZE (libofx-0.9.5.tar.gz) = 1526857
+SHA256 (libofx-0.9.9.tar.gz) = 94ef88c5cdc3e307e473fa2a55d4a05da802ee2feb65c85c63b9019c83747b23
+SIZE (libofx-0.9.9.tar.gz) = 1072495
diff --git a/finance/libofx/files/patch-lib_ofx_preproc.cpp b/finance/libofx/files/patch-lib_ofx_preproc.cpp
index 43f575905355..900c89d392b5 100644
--- a/finance/libofx/files/patch-lib_ofx_preproc.cpp
+++ b/finance/libofx/files/patch-lib_ofx_preproc.cpp
@@ -1,11 +1,11 @@
---- ./lib/ofx_preproc.cpp.orig	2011-06-08 08:07:52.000000000 -0400
-+++ ./lib/ofx_preproc.cpp	2012-02-22 08:46:57.000000000 -0500
-@@ -231,7 +231,7 @@
-           memset(iconv_buffer, 0, READ_BUFFER_SIZE * 2);
-           size_t inbytesleft = strlen(s_buffer.c_str());
-           size_t outbytesleft = READ_BUFFER_SIZE * 2 - 1;
--#ifdef OS_WIN32
-+#if defined(OS_WIN32) || defined(__FreeBSD__)
-           const char * inchar = (const char *)s_buffer.c_str();
+--- ./lib/ofx_preproc.cpp.orig	2013-04-25 14:06:29.000000000 -0400
++++ ./lib/ofx_preproc.cpp	2013-10-04 06:27:25.000000000 -0400
+@@ -310,7 +310,7 @@
+             size_t outbytesleft = inbytesleft * 2 - 1;
+             iconv_buffer = (char*) malloc (inbytesleft * 2);
+             memset(iconv_buffer, 0, inbytesleft * 2);
+-#if defined(OS_WIN32) || defined(__sun)
++#if defined(OS_WIN32) || defined(__sun) || defined(__FreeBSD__)
+             const char * inchar = (const char *)s_buffer.c_str();
  #else
-           char * inchar = (char *)s_buffer.c_str();
+             char * inchar = (char *)s_buffer.c_str();
diff --git a/finance/libofx/pkg-descr b/finance/libofx/pkg-descr
index 2a83f97a1801..332d842f3513 100644
--- a/finance/libofx/pkg-descr
+++ b/finance/libofx/pkg-descr
@@ -1,24 +1,22 @@
-LibOFX is an API designed to allow applications to very easily support
-OFX command responses, usually provided by financial institutions.
+LibOFX is a parser and an API designed to allow applications to
+very easily support OFX command responses, usually provided by
+financial institutions for statement downloads.
 
 LibOFX was implemented directly from the full OFX 1.6 spec, and
 currently supports:
--Banking transactions and statements
--Credit card and statements
-                                                                                
-For the 1.0 release, it should also support:
--Header parsing
--DTD autodetection
--OFX 2.0
--Currency conversion
 
-Somewhere in the future:
--investment transactions.
+- Banking transactions and statements
+- Credit card and statements
+- Investment transactions
+- OFX 2.0
 
-You should read the file doc/implementation_notes.txt
-                                                                                
-This is an ALPHA release.  It really works and is not vaporware, but the
-API is still subject to change, and several OFX structures are not fully
-implemented, notably currency conversions and the <PAYEE> aggregate.
+Future projects for LibOFX include:
+
+- Header parsing
+- DTD autodetection
+- Currency conversion
+- QIF import
+- QIF export (integrated inside the library)
+- OFX export
 
 WWW: http://libofx.sourceforge.net/
diff --git a/finance/libofx/pkg-plist b/finance/libofx/pkg-plist
index 6ac624b82491..af9791b51585 100644
--- a/finance/libofx/pkg-plist
+++ b/finance/libofx/pkg-plist
@@ -5,8 +5,10 @@ include/libofx/libofx.h
 lib/libofx.a
 lib/libofx.la
 lib/libofx.so
-lib/libofx.so.5
+lib/libofx.so.6
 libdata/pkgconfig/libofx.pc
+man/man1/ofxconnect.1.gz
+man/man1/ofxdump.1.gz
 %%DATADIR%%/dtd/ofc.dtd
 %%DATADIR%%/dtd/ofx160.dtd
 %%DATADIR%%/dtd/ofx201.dtd
diff --git a/finance/skrooge/Makefile b/finance/skrooge/Makefile
index 6dfc5d74e502..725b4d1ea2ee 100644
--- a/finance/skrooge/Makefile
+++ b/finance/skrooge/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	skrooge
 PORTVERSION=	1.7.1
+PORTREVISION=	1
 CATEGORIES=	finance kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTNAME}/${PORTVERSION}/src/