7 files changed, 29 insertions, 62 deletions

diff --git a/finance/libofx/Makefile b/finance/libofx/Makefile
index d76d8d63e282..1832e5f54ac5 100644
--- a/finance/libofx/Makefile
+++ b/finance/libofx/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	libofx
 PORTVERSION=	0.9.9
+PORTREVISION=	1
 CATEGORIES=	finance
 MASTER_SITES=	SF
 
@@ -15,34 +16,28 @@ LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
 		libxml++-2.6.so:${PORTSDIR}/textproc/libxml++26 \
 		libosp.so:${PORTSDIR}/textproc/opensp
 
-USES=		gmake iconv pkgconfig
-USE_AUTOTOOLS=	aclocal autoheader automake autoconf libtool
-ACLOCAL_ARGS=	-I m4
-AUTOMAKE_ARGS=	--add-missing
+USES=		gmake iconv pkgconfig pathfix libtool
 CONFIGURE_ARGS=	--disable-doxygen --disable-dot --disable-gengetopt \
 		--with-opensp-includes=${LOCALBASE}/include/OpenSP \
 		--with-opensp-libs=${LOCALBASE}/lib
+GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
+INSTALL_TARGET=	install-strip
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-PORTDOCS=	*
-
-OPTIONS_DEFINE=	APIDOC
-APIDOC_DESC=	Install full API documentation
+OPTIONS_DEFINE=	DOCS DOXYGEN
 
 .include <bsd.port.options.mk>
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for file in AUTHORS ChangeLog INSTALL NEWS README totest.txt
-	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
-.endfor
-.if ${PORT_OPTIONS:MAPIDOC}
-	@(cd ${WRKSRC}/doc; ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR})
-.endif
+	${RM} -f ${STAGEDIR}${DOCSDIR}/COPYING
+.if ${PORT_OPTIONS:MDOXYGEN}
+	@${FIND} -P ${STAGEDIR}${DOCSDIR}/html -type f 2>/dev/null | \
+		${SED} -ne 's|^${STAGEDIR}${PREFIX}/||p' >> ${TMPPLIST}
+	@${FIND} -P -d ${STAGEDIR}${DOCSDIR}/ -type d 2>/dev/null | \
+		${SED} -ne 's|^${STAGEDIR}${PREFIX}/|@dirrmtry |p' >> ${TMPPLIST}
 .endif
 
 .include <bsd.port.mk>
diff --git a/finance/libofx/files/patch-Makefile.am b/finance/libofx/files/patch-Makefile.am
deleted file mode 100644
index 8aabbf28f349..000000000000
--- a/finance/libofx/files/patch-Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
---- ./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)
- 
--doc_DATA = \
-+EXTRA_DIST = \
-   AUTHORS \
-   COPYING \
-   INSTALL \
-   NEWS \
-   README \
-   ChangeLog \
--  totest.txt
--
--EXTRA_DIST = \
-+  totest.txt \
-   libofx.spec.in \
-   libofx.spec \
-   libofx.pc \
-@@ -23,7 +19,7 @@
-   libofx.lsm.in \
-   libofx.lsm
- 
--pkgconfigdir=$(libdir)/pkgconfig
-+pkgconfigdir=$(prefix)/libdata/pkgconfig
- pkgconfig_DATA=libofx.pc
- 
- .PHONY: doc
diff --git a/finance/libofx/files/patch-lib__Makefile.am b/finance/libofx/files/patch-lib__Makefile.in
index fd221f52456d..29acc49b1c39 100644
--- a/finance/libofx/files/patch-lib__Makefile.am
+++ b/finance/libofx/files/patch-lib__Makefile.in
@@ -1,11 +1,11 @@
---- ./lib/Makefile.am.orig	2013-10-07 04:12:01.000000000 -0400
-+++ ./lib/Makefile.am	2013-10-07 04:12:16.000000000 -0400
-@@ -45,7 +45,7 @@
- 	-DMAKEFILE_DTD_PATH=\"${LIBOFX_DTD_DIR}\"
+--- ./lib/Makefile.in.orig	2014-06-22 19:45:04.000000000 -0400
++++ ./lib/Makefile.in	2014-06-22 19:46:20.000000000 -0400
+@@ -299,7 +299,7 @@
+ 
  
  #libofx_la_LIBADD = @LIBOBJS@ ${OPENSPLIBS} -lstdc++
 -libofx_la_LIBADD = $(OPENSPLIBS) $(ICONV_LIBS) -lstdc++
 +libofx_la_LIBADD = $(OPENSPLIBS) $(ICONV_LIBS)
  libofx_la_LDFLAGS = -no-undefined -version-info @LIBOFX_SO_CURRENT@:@LIBOFX_SO_REVISION@:@LIBOFX_SO_AGE@
- 
+ all: all-am
  
diff --git a/finance/libofx/files/patch-lib__ofx__preproc.cpp b/finance/libofx/files/patch-lib__ofx_preproc.cpp
index 900c89d392b5..915fe2ed35c0 100644
--- a/finance/libofx/files/patch-lib__ofx__preproc.cpp
+++ b/finance/libofx/files/patch-lib__ofx_preproc.cpp
@@ -1,5 +1,5 @@
 --- ./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
++++ ./lib/ofx_preproc.cpp	2014-06-22 19:44:48.000000000 -0400
 @@ -310,7 +310,7 @@
              size_t outbytesleft = inbytesleft * 2 - 1;
              iconv_buffer = (char*) malloc (inbytesleft * 2);
diff --git a/finance/libofx/files/patch-lib__ofx__utilities.cpp b/finance/libofx/files/patch-lib__ofx_utilities.cpp
index da4e08045f7e..7b8027225aed 100644
--- a/finance/libofx/files/patch-lib__ofx__utilities.cpp
+++ b/finance/libofx/files/patch-lib__ofx_utilities.cpp
@@ -1,5 +1,5 @@
---- ./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
+--- ./lib/ofx_utilities.cpp.orig	2013-04-16 15:50:51.000000000 -0400
++++ ./lib/ofx_utilities.cpp	2014-06-22 19:44:48.000000000 -0400
 @@ -115,9 +115,14 @@
    char time_zone_specified = false;
    string ofxdate_whole;
diff --git a/finance/libofx/files/patch-ofxconnect__ofxpartner.cpp b/finance/libofx/files/patch-ofxconnect__ofxpartner.cpp
index 72aba297bf4c..50bdd15e2d38 100644
--- a/finance/libofx/files/patch-ofxconnect__ofxpartner.cpp
+++ b/finance/libofx/files/patch-ofxconnect__ofxpartner.cpp
@@ -1,5 +1,5 @@
---- ofxconnect/ofxpartner.cpp.orig	2011-03-30 22:30:50.000000000 +0000
-+++ ofxconnect/ofxpartner.cpp
+--- ./ofxconnect/ofxpartner.cpp.orig	2013-04-16 15:50:51.000000000 -0400
++++ ./ofxconnect/ofxpartner.cpp	2014-06-22 19:44:48.000000000 -0400
 @@ -37,6 +37,7 @@
  #include <vector>
  #include <algorithm>
diff --git a/finance/libofx/pkg-plist b/finance/libofx/pkg-plist
index af9791b51585..3c6205bb13aa 100644
--- a/finance/libofx/pkg-plist
+++ b/finance/libofx/pkg-plist
@@ -3,16 +3,23 @@ bin/ofxconnect
 bin/ofxdump
 include/libofx/libofx.h
 lib/libofx.a
-lib/libofx.la
 lib/libofx.so
 lib/libofx.so.6
+lib/libofx.so.6.0.0
 libdata/pkgconfig/libofx.pc
 man/man1/ofxconnect.1.gz
 man/man1/ofxdump.1.gz
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/totest.txt
 %%DATADIR%%/dtd/ofc.dtd
 %%DATADIR%%/dtd/ofx160.dtd
 %%DATADIR%%/dtd/ofx201.dtd
 %%DATADIR%%/dtd/opensp.dcl
 @dirrm %%DATADIR%%/dtd
 @dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
 @dirrm include/libofx