* Fix the build on 4.X

* Use libtool15

3 files changed, 92 insertions, 2 deletions

diff --git a/finance/libofx/Makefile b/finance/libofx/Makefile
index cfe4aacb8077..ad810768187e 100644
--- a/finance/libofx/Makefile
+++ b/finance/libofx/Makefile
@@ -17,8 +17,9 @@ COMMENT=	OpenSource implementation of the OFX (Open Financial eXchange)
 LIB_DEPENDS=	osp.3:${PORTSDIR}/textproc/opensp
 
 USE_GMAKE=	yes
-USE_GNOME=	gnometarget lthack
-USE_INC_LIBTOOL_VER=	13
+USE_GNOME=	gnometarge
+USE_LIBTOOL_VER=	15
+USE_GETOPT_LONG=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--disable-doxygen --disable-dot \
diff --git a/finance/libofx/files/patch-inc_libofx.h b/finance/libofx/files/patch-inc_libofx.h
new file mode 100644
index 000000000000..6d682b4df0ee
--- /dev/null
+++ b/finance/libofx/files/patch-inc_libofx.h
@@ -0,0 +1,70 @@
+--- inc/libofx.h.orig	Sat Feb 12 16:40:57 2005
++++ inc/libofx.h	Sat Feb 12 16:39:46 2005
+@@ -38,8 +38,12 @@
+ 
+ #ifdef __cplusplus
+ #define CFCT extern "C"
++#define CFCT_start extern "C" {
++#define CFCT_end }
+ #else
+ #define CFCT
++#define CFCT_start
++#define CFCT_end
+ #define true 1
+ #define false 0
+ #endif
+@@ -207,7 +211,9 @@
+  other events).  An OfxStatusData structure is passed to this event, as well as
+  a pointer to an arbitrary data structure.
+ */
+-CFCT typedef int (*LibofxProcStatusCallback)(const struct OfxStatusData data, void * status_data);
++CFCT_start
++typedef int (*LibofxProcStatusCallback)(const struct OfxStatusData data, void * status_data);
++CFCT_end
+ 
+ /**
+  * \brief An abstraction of an account
+@@ -264,7 +270,9 @@
+  part of OfxStatementData structure passed to ofx_proc_statement event, 
+  as well as a pointer to an arbitrary data structure.
+ */
+-CFCT typedef int (*LibofxProcAccountCallback)(const struct OfxAccountData data, void * account_data);
++CFCT_start
++typedef int (*LibofxProcAccountCallback)(const struct OfxAccountData data, void * account_data);
++CFCT_end
+ 
+ /**
+  * \brief An abstraction of a security, such as a stock, mutual fund, etc.
+@@ -320,7 +328,9 @@
+  An OfxSecurityData structure is passed to this event, as well as
+  a pointer to an arbitrary data structure.
+ */
+-CFCT typedef int (*LibofxProcSecurityCallback)(const struct OfxSecurityData data, void * security_data);
++CFCT_start
++typedef int (*LibofxProcSecurityCallback)(const struct OfxSecurityData data, void * security_data);
++CFCT_end
+ 
+ typedef enum {
+     OFX_CREDIT,     /**< Generic credit */
+@@ -498,7 +508,9 @@
+  generated. An OfxTransactionData structure is passed to this event, as well as
+  a pointer to an arbitrary data structure.
+ */
+-CFCT typedef int (*LibofxProcTransactionCallback)(const struct OfxTransactionData data, void * transaction_data);
++CFCT_start
++typedef int (*LibofxProcTransactionCallback)(const struct OfxTransactionData data, void * transaction_data);
++CFCT_end
+ 
+ /** 
+  * \brief An abstraction of an account statement. 
+@@ -567,7 +579,9 @@
+  events have been sent. An OfxStatementData is passed to this event, as well as
+  a pointer to an arbitrary data structure.
+ */
+-CFCT typedef int (*LibofxProcStatementCallback)(const struct OfxStatementData data, void * statement_data);
++CFCT_start
++typedef int (*LibofxProcStatementCallback)(const struct OfxStatementData data, void * statement_data);
++CFCT_end
+ 
+ /** 
+     \brief NOT YET SUPPORTED
diff --git a/finance/libofx/files/patch-ofx2qif_ofx2qif.c b/finance/libofx/files/patch-ofx2qif_ofx2qif.c
new file mode 100644
index 000000000000..c0532345dad5
--- /dev/null
+++ b/finance/libofx/files/patch-ofx2qif_ofx2qif.c
@@ -0,0 +1,19 @@
+--- ofx2qif/ofx2qif.c.orig	Sat Feb 12 16:38:24 2005
++++ ofx2qif/ofx2qif.c	Sat Feb 12 16:38:45 2005
+@@ -207,6 +207,7 @@
+ extern int ofx_ERROR_msg;
+ extern int ofx_INFO_msg;
+ extern int ofx_STATUS_msg;
++LibofxContextPtr libofx_context;
+  ofx_PARSER_msg = false;
+  ofx_DEBUG_msg = false;
+  ofx_WARNING_msg = false;
+@@ -214,7 +215,7 @@
+  ofx_INFO_msg = false;
+  ofx_STATUS_msg = false;
+ 
+- LibofxContextPtr libofx_context = libofx_get_new_context();
++ libofx_context = libofx_get_new_context();
+  ofx_set_statement_cb(libofx_context, ofx_proc_statement_cb, 0);
+  ofx_set_account_cb(libofx_context, ofx_proc_account_cb, 0);
+  ofx_set_transaction_cb(libofx_context, ofx_proc_transaction_cb, 0);