Upgrade to the latest stable release, 2.0.0.

6 files changed, 33 insertions, 25 deletions

diff --git a/finance/grisbi/Makefile b/finance/grisbi/Makefile
index 5bc12ddaa198..5af961136f65 100644
--- a/finance/grisbi/Makefile
+++ b/finance/grisbi/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	grisbi
-PORTVERSION=	1.2.2
-PORTREVISION=	2
+PORTVERSION=	2.0.0
 CATEGORIES=	finance
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20stable/${PORTVERSION:R}.x/${PORTVERSION}
 
diff --git a/finance/grisbi/distinfo b/finance/grisbi/distinfo
index 4fee67a4ddc1..c093be4977c2 100644
--- a/finance/grisbi/distinfo
+++ b/finance/grisbi/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1555269499
-SHA256 (grisbi-1.2.2.tar.bz2) = 7c6dcb9d123076df33f7225085db44f0b95afbb773378fd94b7c492dbbf731de
-SIZE (grisbi-1.2.2.tar.bz2) = 7325947
+TIMESTAMP = 1610573784
+SHA256 (grisbi-2.0.0.tar.bz2) = 6f723ceed9578488ccfdb16386c25334542f6712062ac21bb1fe33653e6c1d78
+SIZE (grisbi-2.0.0.tar.bz2) = 7502476
diff --git a/finance/grisbi/files/patch-pixmaps__Makefile.in b/finance/grisbi/files/patch-pixmaps__Makefile.in
index bfe372c04d4f..5c1021ad77ba 100644
--- a/finance/grisbi/files/patch-pixmaps__Makefile.in
+++ b/finance/grisbi/files/patch-pixmaps__Makefile.in
@@ -1,11 +1,11 @@
---- pixmaps/Makefile.in.orig	2019-01-26 06:00:37 UTC
+--- pixmaps/Makefile.in.orig	2020-12-21 13:13:38 UTC
 +++ pixmaps/Makefile.in
-@@ -403,7 +403,7 @@ top_build_prefix = @top_build_prefix@
+@@ -406,7 +406,7 @@ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  SUBDIRS = flags
 -grisbi_pixmapsdir = $(datadir)/pixmaps/$(PACKAGE)
 +grisbi_pixmapsdir = $(pkgdatadir)/pixmaps
  grisbi_pixmaps_DATA = \
- 	grisbi-logo.png \
- 	grisbi-32.png \
+ 	grisbi.svg \
+ 	gsb-amount-32.png \
diff --git a/finance/grisbi/files/patch-pixmaps_flags_Makefile.in b/finance/grisbi/files/patch-pixmaps_flags_Makefile.in
index 6fb584186757..f9cbebe8454e 100644
--- a/finance/grisbi/files/patch-pixmaps_flags_Makefile.in
+++ b/finance/grisbi/files/patch-pixmaps_flags_Makefile.in
@@ -1,6 +1,6 @@
---- pixmaps/flags/Makefile.in.orig	2019-01-26 06:00:37 UTC
+--- pixmaps/flags/Makefile.in.orig	2020-12-21 13:13:38 UTC
 +++ pixmaps/flags/Makefile.in
-@@ -341,7 +341,7 @@ target_alias = @target_alias@
+@@ -342,7 +342,7 @@ target_alias = @target_alias@
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
diff --git a/finance/grisbi/files/patch-src__Makefile.in b/finance/grisbi/files/patch-src__Makefile.in
index bc8eab182d66..bd100179f2c4 100644
--- a/finance/grisbi/files/patch-src__Makefile.in
+++ b/finance/grisbi/files/patch-src__Makefile.in
@@ -1,18 +1,16 @@
---- src/Makefile.in.orig	2019-04-12 05:38:20 UTC
+--- src/Makefile.in.orig	2020-12-21 13:13:38 UTC
 +++ src/Makefile.in
-@@ -607,11 +607,11 @@ top_srcdir = @top_srcdir@
- AM_CPPFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(GTK_CFLAGS) \
+@@ -705,10 +705,10 @@ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/pref
+ 	-I$(top_srcdir)/src/widgets $(GLIB_CFLAGS) $(GTK_CFLAGS) \
  	$(LIBGSF_CFLAGS) $(GTK_MAC_CFLAGS) $(GOFFICE_CFLAGS) \
  	-DLOCALEDIR="\"$(localedir)\"" \
 -	-DPIXMAPS_DIR="\"$(datadir)/pixmaps/@PACKAGE@\"" \
--	-DLOGO_PATH="\"$(datadir)/pixmaps/@PACKAGE@/grisbi-logo.png\"" \
 -	-DDATA_PATH="\"$(datadir)/@PACKAGE@\"" \
 +	-DPIXMAPS_DIR="\"$(pkgdatadir)/pixmaps/\"" \
-+	-DLOGO_PATH="\"$(pkgdatadir)/pixmaps/grisbi-logo.png\"" \
 +	-DDATA_PATH="\"$(pkgdatadir)\"" \
  	-DHELP_PATH="\"$(docdir)\"" \
 -	-DUI_DIR="\"$(datadir)/@PACKAGE@/ui\"" $(am__append_5)
 +	-DUI_DIR="\"$(pkgdatadir)/ui\"" $(am__append_5)
  noinst_LTLIBRARIES = libgrisbi.la
  grisbi_LDADD = libgrisbi.la $(GRISBI_LIBS) $(GTK_MAC_LIBS) \
- 	$(ZLIB_LIBS) $(GTK_LIBS) $(GLIB_LIBS) $(am__append_6)
+ 	$(ZLIB_LIBS) $(GTK_LIBS) $(GLIB_LIBS) $(am__append_9)
diff --git a/finance/grisbi/pkg-plist b/finance/grisbi/pkg-plist
index 32cf80e1774e..392ce45f858d 100644
--- a/finance/grisbi/pkg-plist
+++ b/finance/grisbi/pkg-plist
@@ -55,9 +55,7 @@ share/applications/grisbi.desktop
 %%PORTDOCS%%%%DOCSDIR%%/fr/image/icon/display_large.png
 %%PORTDOCS%%%%DOCSDIR%%/fr/image/icon/display_medium.png
 %%PORTDOCS%%%%DOCSDIR%%/fr/image/icon/display_small.png
-%%PORTDOCS%%%%DOCSDIR%%/fr/image/icon/form_close.png
 %%PORTDOCS%%%%DOCSDIR%%/fr/image/icon/form_open.png
-%%PORTDOCS%%%%DOCSDIR%%/fr/image/icon/grisbi.png
 %%PORTDOCS%%%%DOCSDIR%%/fr/image/icon/next_motif.gif
 %%PORTDOCS%%%%DOCSDIR%%/fr/image/icon/previous_motif.gif
 %%PORTDOCS%%%%DOCSDIR%%/fr/image/icon/properties.png
@@ -407,8 +405,6 @@ share/applications/grisbi.desktop
 %%DATADIR%%/pixmaps/flags/ZAR.png
 %%DATADIR%%/pixmaps/flags/ZMK.png
 %%DATADIR%%/pixmaps/flags/ZWD.png
-%%DATADIR%%/pixmaps/grisbi-32.png
-%%DATADIR%%/pixmaps/grisbi-logo.png
 %%DATADIR%%/pixmaps/grisbi.svg
 %%DATADIR%%/pixmaps/gsb-ac-asset-32.png
 %%DATADIR%%/pixmaps/gsb-ac-bank-16.png
@@ -436,7 +432,6 @@ share/applications/grisbi.desktop
 %%DATADIR%%/pixmaps/gsb-convert-24.png
 %%DATADIR%%/pixmaps/gsb-currencies-32.png
 %%DATADIR%%/pixmaps/gsb-display-gui-32.png
-%%DATADIR%%/pixmaps/gsb-down-16.png
 %%DATADIR%%/pixmaps/gsb-export-16.png
 %%DATADIR%%/pixmaps/gsb-export-24.png
 %%DATADIR%%/pixmaps/gsb-export-32.png
@@ -490,7 +485,6 @@ share/applications/grisbi.desktop
 %%DATADIR%%/pixmaps/gsb-transaction-list-32.png
 %%DATADIR%%/pixmaps/gsb-transdisplay-32.png
 %%DATADIR%%/pixmaps/gsb-transfer-32.png
-%%DATADIR%%/pixmaps/gsb-up-16.png
 %%DATADIR%%/pixmaps/gsb-warnings-32.png
 %%DATADIR%%/pixmaps/gsb-web-browser-16.png
 %%DATADIR%%/pixmaps/gtk-about-16.png
@@ -524,24 +518,41 @@ share/applications/grisbi.desktop
 %%DATADIR%%/ui/bet_graph.ui
 %%DATADIR%%/ui/csv_template_rule.ui
 %%DATADIR%%/ui/etats_prefs.ui
+%%DATADIR%%/ui/grisbi-dark.css
+%%DATADIR%%/ui/grisbi-widgets.css
 %%DATADIR%%/ui/grisbi.css
 %%DATADIR%%/ui/grisbi_menu.ui
 %%DATADIR%%/ui/grisbi_prefs.ui
 %%DATADIR%%/ui/grisbi_win.ui
 %%DATADIR%%/ui/prefs_page_accueil.ui
 %%DATADIR%%/ui/prefs_page_archives.ui
+%%DATADIR%%/ui/prefs_page_bank.ui
 %%DATADIR%%/ui/prefs_page_bet_account.ui
+%%DATADIR%%/ui/prefs_page_bet_general.ui
+%%DATADIR%%/ui/prefs_page_currency.ui
+%%DATADIR%%/ui/prefs_page_currency_link.ui
 %%DATADIR%%/ui/prefs_page_display_adr.ui
 %%DATADIR%%/ui/prefs_page_display_fonts.ui
+%%DATADIR%%/ui/prefs_page_display_form.ui
 %%DATADIR%%/ui/prefs_page_display_gui.ui
+%%DATADIR%%/ui/prefs_page_display_ope.ui
 %%DATADIR%%/ui/prefs_page_divers.ui
 %%DATADIR%%/ui/prefs_page_files.ui
 %%DATADIR%%/ui/prefs_page_form_completion.ui
-%%DATADIR%%/ui/prefs_page_import_asso.ui
-%%DATADIR%%/ui/prefs_page_import_files.ui
+%%DATADIR%%/ui/prefs_page_form_options.ui
+%%DATADIR%%/ui/prefs_page_fyear.ui
+%%DATADIR%%/ui/prefs_page_import.ui
 %%DATADIR%%/ui/prefs_page_metatree.ui
+%%DATADIR%%/ui/prefs_page_msg_delete.ui
+%%DATADIR%%/ui/prefs_page_msg_warning.ui
+%%DATADIR%%/ui/prefs_page_options_ope.ui
+%%DATADIR%%/ui/prefs_page_payment_method.ui
+%%DATADIR%%/ui/prefs_page_reconcile.ui
+%%DATADIR%%/ui/prefs_page_reconcile_sort.ui
 %%DATADIR%%/ui/prefs_widget_loan.ui
+%%DATADIR%%/ui/search_transaction.ui
 share/icons/hicolor/scalable/apps/grisbi.svg
+share/icons/hicolor/scalable/mimetypes/application-x-grisbi.svg
 %%NLS%%share/locale/cs/LC_MESSAGES/grisbi.mo
 %%NLS%%share/locale/da/LC_MESSAGES/grisbi.mo
 %%NLS%%share/locale/de/LC_MESSAGES/grisbi.mo