Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 23 Jun 2014 02:31:01 +0000 (UTC)
From:      "Jason E. Hale" <jhale@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r358890 - in head/finance/libofx: . files
Message-ID:  <201406230231.s5N2V1fi026817@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jhale
Date: Mon Jun 23 02:31:01 2014
New Revision: 358890
URL: http://svnweb.freebsd.org/changeset/ports/358890
QAT: https://qat.redports.org/buildarchive/r358890/

Log:
  - USES=libtool, drop .la files
  - Strip binaries
  - Remove autotools hacks that can be fixed with staging
  - Fix packaging of documentation and give regular DOCS their own option
  - Rename APIDOC option to DOXYGEN
  - Bump PORTREVISION

Added:
  head/finance/libofx/files/patch-lib__Makefile.in   (contents, props changed)
  head/finance/libofx/files/patch-lib__ofx_preproc.cpp
     - copied, changed from r358887, head/finance/libofx/files/patch-lib__ofx__preproc.cpp
  head/finance/libofx/files/patch-lib__ofx_utilities.cpp
     - copied, changed from r357036, head/finance/libofx/files/patch-lib__ofx__utilities.cpp
Deleted:
  head/finance/libofx/files/patch-Makefile.am
  head/finance/libofx/files/patch-lib__Makefile.am
  head/finance/libofx/files/patch-lib__ofx__preproc.cpp
  head/finance/libofx/files/patch-lib__ofx__utilities.cpp
Modified:
  head/finance/libofx/Makefile
  head/finance/libofx/files/patch-ofxconnect__ofxpartner.cpp
  head/finance/libofx/pkg-plist

Modified: head/finance/libofx/Makefile
==============================================================================
--- head/finance/libofx/Makefile	Mon Jun 23 02:20:57 2014	(r358889)
+++ head/finance/libofx/Makefile	Mon Jun 23 02:31:01 2014	(r358890)
@@ -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/
 		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>

Added: head/finance/libofx/files/patch-lib__Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/finance/libofx/files/patch-lib__Makefile.in	Mon Jun 23 02:31:01 2014	(r358890)
@@ -0,0 +1,11 @@
+--- ./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
+ 

Copied and modified: head/finance/libofx/files/patch-lib__ofx_preproc.cpp (from r358887, head/finance/libofx/files/patch-lib__ofx__preproc.cpp)
==============================================================================
--- head/finance/libofx/files/patch-lib__ofx__preproc.cpp	Mon Jun 23 02:03:48 2014	(r358887, copy source)
+++ head/finance/libofx/files/patch-lib__ofx_preproc.cpp	Mon Jun 23 02:31:01 2014	(r358890)
@@ -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);

Copied and modified: head/finance/libofx/files/patch-lib__ofx_utilities.cpp (from r357036, head/finance/libofx/files/patch-lib__ofx__utilities.cpp)
==============================================================================
--- head/finance/libofx/files/patch-lib__ofx__utilities.cpp	Sun Jun  8 14:16:57 2014	(r357036, copy source)
+++ head/finance/libofx/files/patch-lib__ofx_utilities.cpp	Mon Jun 23 02:31:01 2014	(r358890)
@@ -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;

Modified: head/finance/libofx/files/patch-ofxconnect__ofxpartner.cpp
==============================================================================
--- head/finance/libofx/files/patch-ofxconnect__ofxpartner.cpp	Mon Jun 23 02:20:57 2014	(r358889)
+++ head/finance/libofx/files/patch-ofxconnect__ofxpartner.cpp	Mon Jun 23 02:31:01 2014	(r358890)
@@ -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>

Modified: head/finance/libofx/pkg-plist
==============================================================================
--- head/finance/libofx/pkg-plist	Mon Jun 23 02:20:57 2014	(r358889)
+++ head/finance/libofx/pkg-plist	Mon Jun 23 02:31:01 2014	(r358890)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406230231.s5N2V1fi026817>