svn commit: r383753 - in head/finance/gnucash: . files

Guido Falsi madpilot at FreeBSD.org
Fri Apr 10 19:30:16 UTC 2015 

Author: madpilot
Date: Fri Apr 10 19:30:14 2015
New Revision: 383753
URL: https://svnweb.freebsd.org/changeset/ports/383753

Log:
  - Update to 2.6.6
  - Fix build when GUILE2 option is enabled
  - Rework compiler:c++11-lib definition to fix build problems
  
  PR:		196704 [2], 197189 [1]
  Submitted by:   Lawrence Chen <beastie at tardisi.com> [2]
  Submitted by:   Don Lewis <truckman at FreeBSD.org> [1]
  Approved by:    kwm (gnome, implicit)

Added:
  head/finance/gnucash/files/patch-src_report_report-gnome_Makefile.in   (contents, props changed)
Modified:
  head/finance/gnucash/Makefile
  head/finance/gnucash/distinfo
  head/finance/gnucash/pkg-plist

Modified: head/finance/gnucash/Makefile
==============================================================================
--- head/finance/gnucash/Makefile	Fri Apr 10 19:26:52 2015	(r383752)
+++ head/finance/gnucash/Makefile	Fri Apr 10 19:30:14 2015	(r383753)
@@ -2,7 +2,7 @@
 #   $MCom: ports/finance/gnucash/Makefile,v 1.26 2008/12/31 03:25:18 mezz Exp $
 
 PORTNAME=	gnucash
-PORTVERSION=	2.6.5
+PORTVERSION=	2.6.6
 CATEGORIES=	finance gnome
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20%28stable%29/${PORTVERSION}
 
@@ -58,7 +58,8 @@ GUILE2_BUILD_DEPENDS=	slib-guile2>0:${PO
 GUILE2_RUN_DEPENDS=	slib-guile2>0:${PORTSDIR}/lang/slib-guile2
 
 USE_XORG=	x11
-USES=		desktop-file-utils gettext gmake libtool perl5 pkgconfig shebangfix tar:bzip2
+USES=		compiler:c++11-lib desktop-file-utils gettext gmake libtool perl5 \
+		pkgconfig shebangfix tar:bzip2
 INSTALLS_ICONS=	yes
 USE_GNOME+=	gtk20 libgnomecanvas libxml2 libxslt:build
 GNU_CONFIGURE=	yes
@@ -96,20 +97,23 @@ GLIB_SCHEMAS+=	org.gnucash.dialogs.impor
 GLIB_SCHEMAS+=	org.gnucash.dialogs.import.ofx.gschema.xml
 .endif
 
-# because webkit-gtk2 needs it
-.if ${OSVERSION} < 1000000
-USES+= compiler:c++11-lib
+.include <bsd.port.pre.mk>
+
+.if ${CHOSEN_COMPILER_TYPE} == gcc
+LDFLAGS+=	-lstdc++
 .endif
 
 post-install:
 .if ${PORT_OPTIONS:MPYTHON}
-	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
-		${STAGEDIR}${PYTHON_SITELIBDIR:S|${LOCALBASE}|${PREFIX}|}/${PORTNAME}
-	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
-		${STAGEDIR}${PYTHON_SITELIBDIR:S|${LOCALBASE}|${PREFIX}|}/${PORTNAME}
+	@(cd ${STAGEDIR}${PREFIX} \
+		&& ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
+		-d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}/${PORTNAME})
+	@(cd ${STAGEDIR}${PREFIX} \
+		&& ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
+		-d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}/${PORTNAME})
 	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/gnucash/_gnucash_core_c.so
 .endif
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*so*
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/gnucash/lib*.so
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Modified: head/finance/gnucash/distinfo
==============================================================================
--- head/finance/gnucash/distinfo	Fri Apr 10 19:26:52 2015	(r383752)
+++ head/finance/gnucash/distinfo	Fri Apr 10 19:30:14 2015	(r383753)
@@ -1,2 +1,2 @@
-SHA256 (gnucash-2.6.5.tar.bz2) = b1b1a943a322e7bf7afb0c2202f491560d4734a2036438bf9820378c34203d65
-SIZE (gnucash-2.6.5.tar.bz2) = 12997511
+SHA256 (gnucash-2.6.6.tar.bz2) = 2337c791511ec35ca1ab207bac5f80dd5764df6029adf46a15154df370c97180
+SIZE (gnucash-2.6.6.tar.bz2) = 13303707

Added: head/finance/gnucash/files/patch-src_report_report-gnome_Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/finance/gnucash/files/patch-src_report_report-gnome_Makefile.in	Fri Apr 10 19:30:14 2015	(r383753)
@@ -0,0 +1,10 @@
+--- src/report/report-gnome/Makefile.in.orig	2015-03-30 20:14:44 UTC
++++ src/report/report-gnome/Makefile.in
+@@ -514,6 +514,7 @@ EXTRA_DIST = \
+ @GNC_HAVE_GUILE_2_TRUE at GUILE_COMPILE_ENV = \
+ @GNC_HAVE_GUILE_2_TRUE@  --gnc-module-dir ${top_builddir}/src/app-utils \
+ @GNC_HAVE_GUILE_2_TRUE@  --gnc-module-dir ${top_builddir}/src/engine \
++ at GNC_HAVE_GUILE_2_TRUE@  --gnc-module-dir ${top_builddir}/src/report/report-gnome \
+ @GNC_HAVE_GUILE_2_TRUE@  --guile-load-dir ${top_builddir}/src/app-utils \
+ @GNC_HAVE_GUILE_2_TRUE@  --guile-load-dir ${top_builddir}/src/core-utils \
+ @GNC_HAVE_GUILE_2_TRUE@  --guile-load-dir ${top_builddir}/src/engine \

Modified: head/finance/gnucash/pkg-plist
==============================================================================
--- head/finance/gnucash/pkg-plist	Fri Apr 10 19:26:52 2015	(r383752)
+++ head/finance/gnucash/pkg-plist	Fri Apr 10 19:30:14 2015	(r383753)
@@ -225,6 +225,7 @@ include/gnucash/window-main-summarybar.h
 include/gnucash/window-report.h
 %%PYTHON%%lib/gnucash/libgncmod-app-utils-python.so
 %%PYTHON%%lib/gnucash/libgncmod-app-utils-python.so.0
+%%PYTHON%%lib/gnucash/libgncmod-app-utils-python.so.0.0.0
 lib/gnucash/libgncmod-app-utils.so
 %%AQBANKING%%lib/gnucash/libgncmod-aqbanking.so
 %%DATABASE%%lib/gnucash/libgncmod-backend-dbi.so
@@ -257,6 +258,132 @@ lib/gnucash/libgncmod-standard-reports.s
 lib/gnucash/libgncmod-stylesheets.so
 lib/gnucash/libgncmod-tax-us.so
 lib/gnucash/libgncmod-utility-reports.so
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/build-config.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/business-options.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/business-prefs.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/c-interface.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/commodity-table.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/commodity-utilities.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/config-var.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/date-utilities.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/engine-interface.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/engine-utilities.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/fin.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnc-menu-extensions.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnc-numeric.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/app-utils.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/business-core.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/business-gnome.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/core-utils.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/engine.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/gettext.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/gnc-module.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/gnome-utils.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/import-export/qif-import.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/main.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/price-quotes.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/printf.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/aging.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/balsheet-eg.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/business-reports.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/customer-summary.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/easy-invoice.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/eguile-gnc.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/eguile-html-utilities.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/eguile-utilities.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/fancy-invoice.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/hello-world.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/invoice.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/job-report.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/locale-specific/de_DE.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/locale-specific/us.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/owner-report.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/payables.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/receivables.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/report-gnome.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/report-system.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/report-system/collectors.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/report-system/list-extras.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/report-system/report-collectors.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/account-piecharts.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/account-summary.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/advanced-portfolio.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/average-balance.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/balance-sheet.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/budget-balance-sheet.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/budget-barchart.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/budget-flow.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/budget-income-statement.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/budget.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/cash-flow.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/category-barchart.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/daily-reports.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/equity-statement.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/general-journal.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/general-ledger.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/income-statement.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/net-barchart.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/net-linechart.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/portfolio.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/price-scatter.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/register.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/sx-summary.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/transaction.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/trial-balance.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/stylesheet-easy.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/stylesheet-fancy.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/stylesheet-footer.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/stylesheet-plain.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/stylesheets.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/taxinvoice.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/taxtxf-de_DE.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/taxtxf.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/utility-reports.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/view-column.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/welcome-to-gnucash.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/tax/de_DE.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/tax/us.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/unittest-support.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnumeric/gnumeric-utilities.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnumeric/table-utils.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/hooks.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/html-acct-table.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/html-barchart.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/html-document.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/html-fonts.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/html-jqplot.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/html-linechart.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/html-piechart.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/html-scatter.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/html-style-info.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/html-style-sheet.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/html-table.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/html-text.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/html-utilities.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/migrate-prefs.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/options-utilities.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/options.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/prefs.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/qif-import/qif-dialog-utils.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/qif-import/qif-file.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/qif-import/qif-guess-map.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/qif-import/qif-import.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/qif-import/qif-merge-groups.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/qif-import/qif-objects.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/qif-import/qif-parse.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/qif-import/qif-to-gnc.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/qif-import/qif-utils.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/report-utilities.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/report.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/simple-obj.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/string.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/substring-search.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/txf-de_DE.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/txf-help-de_DE.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/txf-help.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/txf.go
+%%GUILE2%%lib/gnucash/scm/ccache/2.0/xml-generator.go
 lib/libgnc-backend-sql.so
 lib/libgnc-backend-sql.so.0
 lib/libgnc-backend-sql.so.0.0.0
@@ -325,6 +452,7 @@ share/applications/gnucash.desktop
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2011
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2012
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2013
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2014
 %%PORTDOCS%%%%DOCSDIR%%/DOCUMENTERS
 %%PORTDOCS%%%%DOCSDIR%%/HACKING
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
@@ -584,6 +712,7 @@ share/applications/gnucash.desktop
 %%DATADIR%%/accounts/ko/acctchrt_retiremt.gnucash-xea
 %%DATADIR%%/accounts/ko/acctchrt_spouseinc.gnucash-xea
 %%DATADIR%%/accounts/ko/acctchrt_spouseretire.gnucash-xea
+%%DATADIR%%/accounts/lt/acctchrt_business.gnucash-xea
 %%DATADIR%%/accounts/lv/acctchrt_brokerage.gnucash-xea
 %%DATADIR%%/accounts/lv/acctchrt_business.gnucash-xea
 %%DATADIR%%/accounts/lv/acctchrt_carloan.gnucash-xea
@@ -1076,6 +1205,9 @@ share/locale/kok at latin/LC_MESSAGES/gnuca
 share/locale/ks/LC_MESSAGES/gnucash.mo
 share/locale/lt/LC_MESSAGES/gnucash.mo
 share/locale/lv/LC_MESSAGES/gnucash.mo
+share/locale/mai/LC_MESSAGES/gnucash.mo
+share/locale/mni/LC_MESSAGES/gnucash.mo
+share/locale/mni at bengali/LC_MESSAGES/gnucash.mo
 share/locale/mr/LC_MESSAGES/gnucash.mo
 share/locale/nb/LC_MESSAGES/gnucash.mo
 share/locale/ne/LC_MESSAGES/gnucash.mo

More information about the svn-ports-all mailing list