diff options
author | madpilot <madpilot@FreeBSD.org> | 2018-12-31 20:40:47 +0800 |
---|---|---|
committer | madpilot <madpilot@FreeBSD.org> | 2018-12-31 20:40:47 +0800 |
commit | 6f3e38a6919cb58d622f6410ea44b55b69d5eafe (patch) | |
tree | 7229d2867677ed802014f487f2c2c6f0161bf2d4 /finance | |
parent | 247df42a02884d91ff1670be50bcc4ff3120c33b (diff) | |
download | freebsd-ports-gnome-6f3e38a6919cb58d622f6410ea44b55b69d5eafe.tar.gz freebsd-ports-gnome-6f3e38a6919cb58d622f6410ea44b55b69d5eafe.tar.zst freebsd-ports-gnome-6f3e38a6919cb58d622f6410ea44b55b69d5eafe.zip |
- Update gnucash to 3.4
- Update gnucash-docs to 3.4
- Change variables order to silence portlint warnings
- add USES=gnome
Diffstat (limited to 'finance')
-rw-r--r-- | finance/gnucash-docs/Makefile | 7 | ||||
-rw-r--r-- | finance/gnucash-docs/distinfo | 6 | ||||
-rw-r--r-- | finance/gnucash/Makefile | 64 | ||||
-rw-r--r-- | finance/gnucash/distinfo | 6 | ||||
-rw-r--r-- | finance/gnucash/files/patch-CMakeLists.txt | 8 | ||||
-rw-r--r-- | finance/gnucash/pkg-plist | 15 |
6 files changed, 48 insertions, 58 deletions
diff --git a/finance/gnucash-docs/Makefile b/finance/gnucash-docs/Makefile index 9c421851bb0c..90af60cc63e5 100644 --- a/finance/gnucash-docs/Makefile +++ b/finance/gnucash-docs/Makefile @@ -3,7 +3,7 @@ # $MCom: ports/finance/gnucash-docs/Makefile,v 1.7 2007/08/04 03:51:29 marcus Exp $ PORTNAME= gnucash-docs -PORTVERSION= 3.3 +PORTVERSION= 3.4 CATEGORIES= finance gnome MASTER_SITES= SF/gnucash/gnucash%20%28stable%29/${PORTVERSION} @@ -13,9 +13,10 @@ COMMENT= Documentation for gnucash LIB_DEPENDS= librarian.so:textproc/rarian RUN_DEPENDS= yelp:x11/yelp -INSTALLS_OMF= yes -USES= autoreconf localbase gmake +USES= autoreconf localbase gmake gnome USE_GNOME= libxml2 + +INSTALLS_OMF= yes GNU_CONFIGURE= yes NO_ARCH= yes diff --git a/finance/gnucash-docs/distinfo b/finance/gnucash-docs/distinfo index 42f370cdbb94..3a901f8713e8 100644 --- a/finance/gnucash-docs/distinfo +++ b/finance/gnucash-docs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1538390171 -SHA256 (gnucash-docs-3.3.tar.gz) = cc84ca9b45c8e691347c5a9859156fe849f777c6771cb23dca08214809876483 -SIZE (gnucash-docs-3.3.tar.gz) = 92348594 +TIMESTAMP = 1546209276 +SHA256 (gnucash-docs-3.4.tar.gz) = 6575438811ecf8a208a33cd6055b4a10ed324b89e12a247a76cdecc5a82489ec +SIZE (gnucash-docs-3.4.tar.gz) = 92698625 diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile index bb376bfe660d..d751d8af515c 100644 --- a/finance/gnucash/Makefile +++ b/finance/gnucash/Makefile @@ -2,8 +2,7 @@ # $MCom: ports/finance/gnucash/Makefile,v 1.26 2008/12/31 03:25:18 mezz Exp $ PORTNAME= gnucash -PORTVERSION= 3.3 -PORTREVISION= 3 +PORTVERSION= 3.4 CATEGORIES= finance gnome MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20%28stable%29/${PORTVERSION} @@ -27,6 +26,37 @@ RUN_DEPENDS= p5-libwww>=0:www/p5-libwww \ p5-Date-Manip>=0:devel/p5-Date-Manip \ p5-Finance-Quote>=0:finance/p5-Finance-Quote +USES= cmake:insource compiler:c++11-lib desktop-file-utils gettext-tools gnome libtool \ + localbase perl5 pkgconfig shebangfix tar:bzip2 +USE_XORG= x11 +USE_CXXSTD= c++11 +USE_GNOME= cairo gtk30 intltool libxml2 libxslt +USE_LDCONFIG= yes + +INSTALLS_ICONS= yes +CMAKE_ARGS= -DCOMPILE_GSCHEMAS=OFF \ + -DENABLE_BINRELOC=OFF +SHEBANG_FILES= common/gnc-test-env.pl libgnucash/quotes/gnc-fq-dump +WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} + +GLIB_SCHEMAS= org.gnucash.dialogs.business.gschema.xml \ + org.gnucash.dialogs.checkprinting.gschema.xml \ + org.gnucash.dialogs.commodities.gschema.xml \ + org.gnucash.dialogs.export.csv.gschema.xml \ + org.gnucash.dialogs.gschema.xml \ + org.gnucash.dialogs.import.csv.gschema.xml \ + org.gnucash.dialogs.import.generic.gschema.xml \ + org.gnucash.dialogs.import.qif.gschema.xml \ + org.gnucash.dialogs.reconcile.gschema.xml \ + org.gnucash.dialogs.sxs.gschema.xml \ + org.gnucash.dialogs.totd.gschema.xml \ + org.gnucash.general.finance-quote.gschema.xml \ + org.gnucash.gschema.xml \ + org.gnucash.history.gschema.xml \ + org.gnucash.warnings.gschema.xml \ + org.gnucash.window.pages.account.tree.gschema.xml \ + org.gnucash.window.pages.gschema.xml + OPTIONS_DEFINE= AQBANKING DATABASE DOCS NLS OFX PYTHON TEST OPTIONS_DEFAULT= AQBANKING OFX @@ -55,36 +85,6 @@ PYTHON_USES= python:3.3+ TEST_BUILD_DEPENDS= ${NONEXISTENT}:devel/googlemock:build \ gtest-config:devel/googletest -USES= cmake:insource compiler:c++11-lib desktop-file-utils gettext-tools libtool localbase \ - perl5 pkgconfig shebangfix tar:bzip2 -USE_XORG= x11 -USE_CXXSTD= c++11 -INSTALLS_ICONS= yes -USE_GNOME+= cairo gtk30 intltool libxml2 libxslt -USE_LDCONFIG= yes -CMAKE_ARGS= -DCOMPILE_GSCHEMAS=OFF \ - -DENABLE_BINRELOC=OFF -SHEBANG_FILES= common/gnc-test-env.pl libgnucash/quotes/gnc-fq-dump -WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} - -GLIB_SCHEMAS= org.gnucash.dialogs.business.gschema.xml \ - org.gnucash.dialogs.checkprinting.gschema.xml \ - org.gnucash.dialogs.commodities.gschema.xml \ - org.gnucash.dialogs.export.csv.gschema.xml \ - org.gnucash.dialogs.gschema.xml \ - org.gnucash.dialogs.import.csv.gschema.xml \ - org.gnucash.dialogs.import.generic.gschema.xml \ - org.gnucash.dialogs.import.qif.gschema.xml \ - org.gnucash.dialogs.reconcile.gschema.xml \ - org.gnucash.dialogs.sxs.gschema.xml \ - org.gnucash.dialogs.totd.gschema.xml \ - org.gnucash.general.finance-quote.gschema.xml \ - org.gnucash.gschema.xml \ - org.gnucash.history.gschema.xml \ - org.gnucash.warnings.gschema.xml \ - org.gnucash.window.pages.account.tree.gschema.xml \ - org.gnucash.window.pages.gschema.xml - .include <bsd.port.pre.mk> .if ${PORT_OPTIONS:MTEST} diff --git a/finance/gnucash/distinfo b/finance/gnucash/distinfo index 70059306c0cb..9907e5e067c4 100644 --- a/finance/gnucash/distinfo +++ b/finance/gnucash/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1538344925 -SHA256 (gnucash-3.3.tar.bz2) = 8396ed8d2a88ac358ecf458c253cf38f55a13aaba7958e4fde3dd85c222e393f -SIZE (gnucash-3.3.tar.bz2) = 13440713 +TIMESTAMP = 1546208827 +SHA256 (gnucash-3.4.tar.bz2) = a254883c8f7e34f2e19ebdc6a0185489d9027341d7d62a6f1ef815a8c9e342d7 +SIZE (gnucash-3.4.tar.bz2) = 13564432 diff --git a/finance/gnucash/files/patch-CMakeLists.txt b/finance/gnucash/files/patch-CMakeLists.txt index 856ba520df0a..2386fb524768 100644 --- a/finance/gnucash/files/patch-CMakeLists.txt +++ b/finance/gnucash/files/patch-CMakeLists.txt @@ -1,4 +1,4 @@ ---- CMakeLists.txt.orig 2018-09-29 21:16:50 UTC +--- CMakeLists.txt.orig 2018-12-30 15:38:18 UTC +++ CMakeLists.txt @@ -43,6 +43,7 @@ include (MacroAppendForeach) include (MacroAddSourceFileCompileFlags) @@ -8,15 +8,15 @@ include (GncAddSchemeTargets) include (GncAddGSchemaTargets) include (GncAddTest) -@@ -573,9 +574,9 @@ set(CMAKE_CXX_FLAGS "-std=gnu++11 ${CMAKE_CXX_FLAGS}") +@@ -567,9 +568,9 @@ set(CMAKE_CXX_FLAGS "-std=gnu++11 ${CMAKE_CXX_FLAGS}") if (UNIX) - set( CMAKE_C_FLAGS "-Werror -Wdeclaration-after-statement -Wno-pointer-sign -Wall -Wmissing-prototypes -Wmissing-declarations -Wno-unused ${CMAKE_C_FLAGS}") + set( CMAKE_C_FLAGS "-Wdeclaration-after-statement -Wno-pointer-sign -Wall -Wmissing-prototypes -Wmissing-declarations -Wno-unused ${CMAKE_C_FLAGS}") - set( CMAKE_C_FLAGS "-Wno-deprecated-declarations -std=gnu11 -Wno-error=parentheses ${CMAKE_C_FLAGS}") + set( CMAKE_C_FLAGS "-Wno-error=deprecated-declarations -std=gnu11 -Wno-error=parentheses ${CMAKE_C_FLAGS}") - set( CMAKE_CXX_FLAGS "-Werror -Wall -Wmissing-declarations -Wno-unused -Wno-error=parentheses ${CMAKE_CXX_FLAGS}") + set( CMAKE_CXX_FLAGS "-Wall -Wmissing-declarations -Wno-unused -Wno-error=parentheses ${CMAKE_CXX_FLAGS}") - set( CMAKE_CXX_FLAGS "-Wno-deprecated-declarations -Wno-register ${CMAKE_CXX_FLAGS}") + set( CMAKE_CXX_FLAGS "-Wno-error=deprecated-declarations ${REGISTER_CXXFLAG} ${CMAKE_CXX_FLAGS}") set( CMAKE_C_FLAGS_RELEASE "-O3 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 ${CMAKE_C_FLAGS}") endif (UNIX) diff --git a/finance/gnucash/pkg-plist b/finance/gnucash/pkg-plist index 3421f5181070..ee8cb796fff1 100644 --- a/finance/gnucash/pkg-plist +++ b/finance/gnucash/pkg-plist @@ -304,7 +304,6 @@ lib/gnucash/scm/ccache/2.0/gnucash/report/report-gnome.go lib/gnucash/scm/ccache/2.0/gnucash/report/report-system.go lib/gnucash/scm/ccache/2.0/gnucash/report/report-system/collectors.go lib/gnucash/scm/ccache/2.0/gnucash/report/report-system/report-collectors.go -%%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/report/report-system/test/test-collectors.go %%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/report/report-system/test/test-extras.go %%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/report/report-system/test/test-load-report-system-module.go %%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/report/report-system/test/test-test-extras.go @@ -334,10 +333,6 @@ lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/price-scatter.go lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/register.go lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/sx-summary.go %%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/test/test-cash-flow.go -%%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/test/test-cashflow-barchart.go -%%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/test/test-standard-category-report.go -%%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/test/test-standard-net-barchart.go -%%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/test/test-standard-net-linechart.go lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/transaction.go lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/trial-balance.go lib/gnucash/scm/ccache/2.0/gnucash/report/stylesheet-easy.go @@ -398,7 +393,6 @@ lib/gnucash/scm/ccache/2.0/simple-obj.go %%TEST%%lib/gnucash/scm/ccache/2.0/test-c-interface.go %%TEST%%lib/gnucash/scm/ccache/2.0/test-create-account.go %%TEST%%lib/gnucash/scm/ccache/2.0/test-split.go -%%TEST%%lib/gnucash/scm/ccache/2.0/test-test-extras.go lib/gnucash/scm/ccache/2.0/txf-de_DE.go lib/gnucash/scm/ccache/2.0/txf-help-de_DE.go lib/gnucash/scm/ccache/2.0/txf-help.go @@ -430,8 +424,8 @@ lib/libgnc-module.so man/man1/gnc-fq-dump.1.gz man/man1/gnc-fq-helper.1.gz man/man1/gnucash.1.gz -share/appdata/gnucash.appdata.xml share/applications/gnucash.desktop +share/metainfo/gnucash.appdata.xml %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/ChangeLog.1999 @@ -545,6 +539,7 @@ share/applications/gnucash.desktop %%DATADIR%%/accounts/de_AT/acctchrt_brokerage.gnucash-xea %%DATADIR%%/accounts/de_AT/acctchrt_business.gnucash-xea %%DATADIR%%/accounts/de_AT/acctchrt_common.gnucash-xea +%%DATADIR%%/accounts/de_AT/acctchrt_ekr2017.gnucash-xea %%DATADIR%%/accounts/de_AT/acctchrt_houseown.gnucash-xea %%DATADIR%%/accounts/de_AT/acctchrt_investment.gnucash-xea %%DATADIR%%/accounts/de_AT/acctchrt_kids.gnucash-xea @@ -1076,7 +1071,6 @@ share/applications/gnucash.desktop %%DATADIR%%/scm/gnucash/report/report-system.scm %%DATADIR%%/scm/gnucash/report/report-system/collectors.scm %%DATADIR%%/scm/gnucash/report/report-system/report-collectors.scm -%%TEST%%%%DATADIR%%/scm/gnucash/report/report-system/test/test-collectors.scm %%TEST%%%%DATADIR%%/scm/gnucash/report/report-system/test/test-extras.scm %%TEST%%%%DATADIR%%/scm/gnucash/report/report-system/test/test-load-report-system-module.scm %%TEST%%%%DATADIR%%/scm/gnucash/report/report-system/test/test-test-extras.scm @@ -1106,10 +1100,6 @@ share/applications/gnucash.desktop %%DATADIR%%/scm/gnucash/report/standard-reports/register.scm %%DATADIR%%/scm/gnucash/report/standard-reports/sx-summary.scm %%TEST%%%%DATADIR%%/scm/gnucash/report/standard-reports/test/test-cash-flow.scm -%%TEST%%%%DATADIR%%/scm/gnucash/report/standard-reports/test/test-cashflow-barchart.scm -%%TEST%%%%DATADIR%%/scm/gnucash/report/standard-reports/test/test-standard-category-report.scm -%%TEST%%%%DATADIR%%/scm/gnucash/report/standard-reports/test/test-standard-net-barchart.scm -%%TEST%%%%DATADIR%%/scm/gnucash/report/standard-reports/test/test-standard-net-linechart.scm %%DATADIR%%/scm/gnucash/report/standard-reports/transaction.scm %%DATADIR%%/scm/gnucash/report/standard-reports/trial-balance.scm %%DATADIR%%/scm/gnucash/report/stylesheet-easy.scm @@ -1172,7 +1162,6 @@ share/applications/gnucash.desktop %%TEST%%%%DATADIR%%/scm/test-c-interface.scm %%TEST%%%%DATADIR%%/scm/test-create-account.scm %%TEST%%%%DATADIR%%/scm/test-split.scm -%%TEST%%%%DATADIR%%/scm/test-test-extras.scm %%DATADIR%%/scm/txf-de_DE.scm %%DATADIR%%/scm/txf-help-de_DE.scm %%DATADIR%%/scm/txf-help.scm |