finance/grisbi: upgrade to 3.0.0

This an intermediate version before the switch towards GTK4.

Remark: a version 3_1_0 is available at GitHUB, but 3.0.0 is the latest
released.

6 files changed, 20 insertions, 51 deletions

diff --git a/finance/grisbi/Makefile b/finance/grisbi/Makefile
index 53ae46656433..ae112b15f602 100644
--- a/finance/grisbi/Makefile
+++ b/finance/grisbi/Makefile
@@ -1,8 +1,7 @@
 PORTNAME=	grisbi
-PORTVERSION=	2.0.5
-PORTREVISION=	3
+PORTVERSION=	3.0.0
 CATEGORIES=	finance
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20stable/${PORTVERSION:R}.x/${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20stable/${PORTVERSION:R}.x/
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Personal accounting application
@@ -10,21 +9,20 @@ WWW=		https://www.grisbi.org/
 
 LICENSE=	GPLv2
 
+BUILD_DEPENDS=	p5-XML-Parser>0:textproc/p5-XML-Parser
 LIB_DEPENDS=	libofx.so:finance/libofx		\
 		libharfbuzz.so:print/harfbuzz		\
 		libfreetype.so:print/freetype2		\
 		libgoffice-0.10.so:devel/goffice	\
 		libfontconfig.so:x11-fonts/fontconfig
 
-USES=		tar:bzip2 desktop-file-utils gmake gnome iconv localbase	\
-		pkgconfig shared-mime-info ssl
+USES=		desktop-file-utils gmake gnome iconv localbase	\
+		pkgconfig shared-mime-info ssl tar:bzip2
 
 USE_GNOME=	cairo gdkpixbuf2 glib20 gtk30 intltool libgsf libxml2
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	OPENSSL_CFLAGS="-I${OPENSSLINC}" OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto"
 
-GLIB_SCHEMAS=	org.gtk.grisbi.gschema.xml
-
 OPTIONS_DEFINE=	DOCS NLS
 
 .include <bsd.port.options.mk>
diff --git a/finance/grisbi/distinfo b/finance/grisbi/distinfo
index c0e8aaf9e04c..aec076ae728b 100644
--- a/finance/grisbi/distinfo
+++ b/finance/grisbi/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1634241314
-SHA256 (grisbi-2.0.5.tar.bz2) = bd3adbabfc4b4dfc05eff62d2b36458a24b0f00d07cf35a29f6af2f203c77a3f
-SIZE (grisbi-2.0.5.tar.bz2) = 7465632
+TIMESTAMP = 1700405462
+SHA256 (grisbi-3.0.0.tar.bz2) = a1307fd3ef1425339c8cedbc9ac110c1b8b633487a8a0b710f44056ea8057e09
+SIZE (grisbi-3.0.0.tar.bz2) = 12447582
diff --git a/finance/grisbi/files/patch-pixmaps__Makefile.in b/finance/grisbi/files/patch-pixmaps__Makefile.in
index 5c1021ad77ba..501855c4e8e0 100644
--- a/finance/grisbi/files/patch-pixmaps__Makefile.in
+++ b/finance/grisbi/files/patch-pixmaps__Makefile.in
@@ -1,6 +1,6 @@
---- pixmaps/Makefile.in.orig	2020-12-21 13:13:38 UTC
+--- pixmaps/Makefile.in.orig	2023-11-13 08:12:38 UTC
 +++ pixmaps/Makefile.in
-@@ -406,7 +406,7 @@ top_build_prefix = @top_build_prefix@
+@@ -405,7 +405,7 @@ SUBDIRS = flags
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  SUBDIRS = flags
diff --git a/finance/grisbi/files/patch-pixmaps_flags_Makefile.in b/finance/grisbi/files/patch-pixmaps_flags_Makefile.in
index f9cbebe8454e..86dc3fb1830e 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	2020-12-21 13:13:38 UTC
+--- pixmaps/flags/Makefile.in.orig	2023-11-13 08:12:38 UTC
 +++ pixmaps/flags/Makefile.in
-@@ -342,7 +342,7 @@ target_alias = @target_alias@
+@@ -343,7 +343,7 @@ top_srcdir = @top_srcdir@
  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 bd100179f2c4..10db4b7863a5 100644
--- a/finance/grisbi/files/patch-src__Makefile.in
+++ b/finance/grisbi/files/patch-src__Makefile.in
@@ -1,9 +1,9 @@
---- src/Makefile.in.orig	2020-12-21 13:13:38 UTC
+--- src/Makefile.in.orig	2023-11-13 08:12:38 UTC
 +++ src/Makefile.in
-@@ -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)\"" \
+@@ -714,10 +714,10 @@ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/etat
+ 	-I$(top_srcdir)/src/prefs -I$(top_srcdir)/src/widgets \
+ 	$(GLIB_CFLAGS) $(GTK_CFLAGS) $(LIBGSF_CFLAGS) \
+ 	$(GTK_MAC_CFLAGS) -DLOCALEDIR="\"$(localedir)\"" \
 -	-DPIXMAPS_DIR="\"$(datadir)/pixmaps/@PACKAGE@\"" \
 -	-DDATA_PATH="\"$(datadir)/@PACKAGE@\"" \
 +	-DPIXMAPS_DIR="\"$(pkgdatadir)/pixmaps/\"" \
diff --git a/finance/grisbi/pkg-plist b/finance/grisbi/pkg-plist
index 4120df0616ae..2fe8176c3af2 100644
--- a/finance/grisbi/pkg-plist
+++ b/finance/grisbi/pkg-plist
@@ -10,6 +10,7 @@ share/applications/grisbi.desktop
 %%PORTDOCS%%%%DOCSDIR%%/C/translation.html
 %%PORTDOCS%%%%DOCSDIR%%/de/grisbi-manuel.css
 %%PORTDOCS%%%%DOCSDIR%%/de/grisbi-manuel.html
+%%PORTDOCS%%%%DOCSDIR%%/de/grisbi-manuel.pdf
 %%PORTDOCS%%%%DOCSDIR%%/de/quickstart.html
 %%PORTDOCS%%%%DOCSDIR%%/en/contents_motif.gif
 %%PORTDOCS%%%%DOCSDIR%%/en/grisbi-manuel.html
@@ -21,6 +22,7 @@ share/applications/grisbi.desktop
 %%PORTDOCS%%%%DOCSDIR%%/fr/contents_motif.gif
 %%PORTDOCS%%%%DOCSDIR%%/fr/grisbi-manuel.css
 %%PORTDOCS%%%%DOCSDIR%%/fr/grisbi-manuel.html
+%%PORTDOCS%%%%DOCSDIR%%/fr/grisbi-manuel.pdf
 %%PORTDOCS%%%%DOCSDIR%%/fr/grisbi-manuel001.html
 %%PORTDOCS%%%%DOCSDIR%%/fr/grisbi-manuel002.html
 %%PORTDOCS%%%%DOCSDIR%%/fr/grisbi-manuel003.html
@@ -449,7 +451,6 @@ share/applications/grisbi.desktop
 %%DATADIR%%/pixmaps/gsb-grille-16.png
 %%DATADIR%%/pixmaps/gsb-help-16.png
 %%DATADIR%%/pixmaps/gsb-import-16.png
-%%DATADIR%%/pixmaps/gsb-import-24.png
 %%DATADIR%%/pixmaps/gsb-import-32.png
 %%DATADIR%%/pixmaps/gsb-jump-16.png
 %%DATADIR%%/pixmaps/gsb-new-categ-16.png
@@ -489,8 +490,6 @@ share/applications/grisbi.desktop
 %%DATADIR%%/pixmaps/gsb-warnings-32.png
 %%DATADIR%%/pixmaps/gsb-web-browser-16.png
 %%DATADIR%%/pixmaps/gtk-about-16.png
-%%DATADIR%%/pixmaps/gtk-add-16.png
-%%DATADIR%%/pixmaps/gtk-apply-16.png
 %%DATADIR%%/pixmaps/gtk-close-16.png
 %%DATADIR%%/pixmaps/gtk-copy-16.png
 %%DATADIR%%/pixmaps/gtk-copy-24.png
@@ -513,10 +512,8 @@ share/applications/grisbi.desktop
 %%DATADIR%%/pixmaps/gtk-remove-16.png
 %%DATADIR%%/pixmaps/gtk-save-16.png
 %%DATADIR%%/pixmaps/gtk-save-as-16.png
-%%DATADIR%%/pixmaps/gtk-search-16.png
 %%DATADIR%%/pixmaps/gtk-select-color-24.png
 %%DATADIR%%/pixmaps/gtk-window-new-16.png
-%%DATADIR%%/ui/bet_graph.ui
 %%DATADIR%%/ui/csv_template_rule.ui
 %%DATADIR%%/ui/etats_prefs.ui
 %%DATADIR%%/ui/grisbi-dark.css
@@ -525,33 +522,6 @@ share/applications/grisbi.desktop
 %%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_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
@@ -574,6 +544,7 @@ share/icons/hicolor/scalable/mimetypes/application-x-grisbi.svg
 %%NLS%%share/locale/ru/LC_MESSAGES/grisbi.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/grisbi.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/grisbi.mo
+share/metainfo/grisbi.metainfo.xml
 share/mime-info/grisbi.keys
 share/mime-info/grisbi.mime
 share/mime/packages/grisbi.xml