- Update to 0.94

PR:		ports/157515
Submitted by:	Jason E. Hale <bsdkaffee@gmail.com> (maintainer)

5 files changed, 41 insertions, 37 deletions

diff --git a/finance/libofx/Makefile b/finance/libofx/Makefile
index 36a6ac98d971..163b03c52611 100644
--- a/finance/libofx/Makefile
+++ b/finance/libofx/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libofx
-PORTVERSION=	0.9.2
+PORTVERSION=	0.9.4
 CATEGORIES=	finance
 MASTER_SITES=	SF
 
@@ -14,14 +14,14 @@ MAINTAINER=	bsdkaffee@gmail.com
 COMMENT=	OpenSource implementation of the OFX (Open Financial eXchange)
 
 LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl \
-		xml\\+\\+-1.0.1:${PORTSDIR}/textproc/libxml++ \
+		xml\\+\\+-2.6.2:${PORTSDIR}/textproc/libxml++26 \
 		osp.5:${PORTSDIR}/textproc/opensp
 
 USE_ICONV=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	aclocal autoheader automake autoconf libtool
 ACLOCAL_ARGS=	-I m4
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--disable-doxygen --disable-dot --disable-gengetopt \
 		--with-opensp-includes=${LOCALBASE}/include/OpenSP \
 		--with-opensp-libs=${LOCALBASE}/lib
@@ -34,6 +34,9 @@ LDFLAGS=	-L${LOCALBASE}/lib
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+MAN1=		ofxconnect.1 \
+		ofxdump.1
+
 PORTDOCS=	*
 
 OPTIONS=	APIDOC "Install full API documentation" off
diff --git a/finance/libofx/distinfo b/finance/libofx/distinfo
index 3b8af8e87f6a..6e80f5087801 100644
--- a/finance/libofx/distinfo
+++ b/finance/libofx/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libofx-0.9.2.tar.gz) = f6d690d3c5305a414b332b814e6c86f2200e809702ae7dffed9331a445e52d6d
-SIZE (libofx-0.9.2.tar.gz) = 1162303
+SHA256 (libofx-0.9.4.tar.gz) = 9b30641fd5672e7a4a7fd3dd789a8a9df80039e5cc5756e28e16e8935560dbaf
+SIZE (libofx-0.9.4.tar.gz) = 1263379
diff --git a/finance/libofx/files/patch-Makefile.am b/finance/libofx/files/patch-Makefile.am
index 589665979f13..8aabbf28f349 100644
--- a/finance/libofx/files/patch-Makefile.am
+++ b/finance/libofx/files/patch-Makefile.am
@@ -1,14 +1,14 @@
---- Makefile.am.orig	2007-10-27 20:28:07.000000000 +0900
-+++ Makefile.am	2009-03-16 04:05:45.000000000 +0900
-@@ -1,27 +1,23 @@
- if BUILD_OFXCONNECT
-        MAYBE_OFXCONNECT = ofxconnect
+--- ./Makefile.am.orig	2011-04-18 12:44:39.000000000 -0400
++++ ./Makefile.am	2011-06-01 11:04:55.000000000 -0400
+@@ -2,20 +2,16 @@
+   MAYBE_OFXCONNECT = ofxconnect
  endif
+ DIST_SUBDIRS = m4 inc dtd lib doc . ofx2qif ofxdump ofxconnect
 -SUBDIRS = m4 inc dtd lib doc . ofx2qif ofxdump $(MAYBE_OFXCONNECT)
+-
+-docdir = $(datadir)/doc/libofx
 +SUBDIRS = m4 inc dtd lib . ofx2qif ofxdump $(MAYBE_OFXCONNECT)
  
--docdir = ${prefix}/share/doc/libofx
--
 -doc_DATA = \
 +EXTRA_DIST = \
    AUTHORS \
@@ -24,7 +24,8 @@
    libofx.spec.in \
    libofx.spec \
    libofx.pc \
-   totest.txt \
+@@ -23,7 +19,7 @@
+   libofx.lsm.in \
    libofx.lsm
  
 -pkgconfigdir=$(libdir)/pkgconfig
diff --git a/finance/libofx/files/patch-lib_ofx_preproc.cpp b/finance/libofx/files/patch-lib_ofx_preproc.cpp
index 8d4c53307dfd..b3d4e05e0b4a 100644
--- a/finance/libofx/files/patch-lib_ofx_preproc.cpp
+++ b/finance/libofx/files/patch-lib_ofx_preproc.cpp
@@ -1,14 +1,11 @@
-
-$FreeBSD$
-
---- ./lib/ofx_preproc.cpp.orig	2011-02-12 11:51:02.000000000 -0500
-+++ ./lib/ofx_preproc.cpp	2011-02-14 13:04:17.000000000 -0500
-@@ -194,7 +194,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;
+--- ./lib/ofx_preproc.cpp.orig	2011-04-16 13:10:20.000000000 -0400
++++ ./lib/ofx_preproc.cpp	2011-04-21 11:03:43.000000000 -0400
+@@ -228,7 +228,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(OS_FREEBSD)
- 	    const char * inchar = (const char *)s_buffer.c_str();
+           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/files/patch-lib_ofx_utilities.cpp b/finance/libofx/files/patch-lib_ofx_utilities.cpp
index 1785ea9d5ae6..da4e08045f7e 100644
--- a/finance/libofx/files/patch-lib_ofx_utilities.cpp
+++ b/finance/libofx/files/patch-lib_ofx_utilities.cpp
@@ -1,15 +1,18 @@
---- ./lib/ofx_utilities.cpp.orig	2011-02-12 11:51:02.000000000 -0500
-+++ ./lib/ofx_utilities.cpp	2011-02-14 22:24:26.000000000 -0500
-@@ -115,9 +115,10 @@
- 
+--- ./lib/ofx_utilities.cpp.orig	2011-04-18 11:51:21.000000000 -0400
++++ ./lib/ofx_utilities.cpp	2011-06-01 21:09:51.000000000 -0400
+@@ -115,9 +115,14 @@
+   char time_zone_specified = false;
+   string ofxdate_whole;
    time_t temptime;
++  int daylight;
++  const struct tm* t;
++  
++  std::time(&temptime);
++  t = localtime(&temptime);
++  daylight = t->tm_isdst;
+ 
+   time.tm_isdst = daylight; // initialize dst setting
+-  std::time(&temptime);
+   local_offset = difftime(mktime(localtime(&temptime)), mktime(gmtime(&temptime))) + (3600 * daylight);
  
--  time.tm_isdst = daylight; // iniitialize dst setting
-+  bzero(&time, sizeof(time));
-+
-   std::time(&temptime);
--  local_offset = difftime(mktime(localtime(&temptime)), mktime(gmtime(&temptime))) + (3600*daylight);
-+  local_offset = difftime(mktime(localtime(&temptime)), mktime(gmtime(&temptime)));
-   
-   if(ofxdate.size()!=0){
-     if (ofxdate.substr(0,8).find_first_not_of("0123456789") != string::npos ){
+   if (ofxdate.size() != 0)