4 files changed, 40 insertions, 77 deletions

diff --git a/deskutils/bijiben/Makefile b/deskutils/bijiben/Makefile
index 8837256de28a..828a0c43e8fb 100644
--- a/deskutils/bijiben/Makefile
+++ b/deskutils/bijiben/Makefile
@@ -1,9 +1,9 @@
 # Created by: Gustau Perez <gustau.perez@gmail.com>
 
 PORTNAME=	bijiben
-PORTVERSION=	3.38.0
+PORTVERSION=	40.1
 CATEGORIES=	deskutils gnome
-MASTER_SITES=	GNOME
+MASTER_SITES=	GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -19,7 +19,7 @@ LIB_DEPENDS=	libtracker-control-2.0.so:sysutils/tracker \
 		libical.so:devel/libical \
 		libzeitgeist-2.0.so:sysutils/zeitgeist \
 		libuuid.so:misc/e2fsprogs-libuuid \
-		libhandy-0.0.so:x11-toolkits/libhandy0
+		libhandy-1.so:x11-toolkits/libhandy
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/deskutils/bijiben/distinfo b/deskutils/bijiben/distinfo
index 4c10fc0956c9..42df17a5cdea 100644
--- a/deskutils/bijiben/distinfo
+++ b/deskutils/bijiben/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1601294321
-SHA256 (gnome/bijiben-3.38.0.tar.xz) = 1ff6cc0ac6c62907bf2a09a17215edd2f17b74dacab3a5c89a29c3049172be2b
-SIZE (gnome/bijiben-3.38.0.tar.xz) = 602164
+TIMESTAMP = 1628011219
+SHA256 (gnome/bijiben-40.1.tar.xz) = 05a06fb066e9802f5f24ab67b0d2f71451866363ba3e39f9f775fd49a7587bbf
+SIZE (gnome/bijiben-40.1.tar.xz) = 687344
diff --git a/deskutils/bijiben/files/patch-src_libbiji_meson.build b/deskutils/bijiben/files/patch-src_libbiji_meson.build
deleted file mode 100644
index 0365e6ee7ac1..000000000000
--- a/deskutils/bijiben/files/patch-src_libbiji_meson.build
+++ /dev/null
@@ -1,56 +0,0 @@
-From 6dd31c362b264a7d7e5441310ee5baebb3769ac5 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Fri, 9 Apr 2021 21:45:13 -0700
-Subject: [PATCH] Add generated biji-marshalers.h to libbiji dependency sources
-
-The meson manual states that
-
-> Each target that depends on a generated header should add that
-> header to it's sources, as seen above with libfoo and myexe. This
-> is because there is no way for Meson or the backend to know that
-> myexe depends on foo.h just because libfoo does, it could be a
-> private header.
-
-Since biji-marshalers.h is included by the libbiji public header
-libbiji.h, it must be added as a source to all targets that depend
-on libbiji. This can be done by adding it to the sources of
-libbiji_dep.
-
-Fixes #157.
-
-https://gitlab.gnome.org/GNOME/gnome-notes/-/merge_requests/116
-
---- src/libbiji/meson.build.orig	2020-09-20 21:32:11 UTC
-+++ src/libbiji/meson.build
-@@ -27,11 +27,9 @@ sources = files(
-   '../bjb-utils.c',
- )
- 
--marshalers = 'biji-marshalers'
--
--sources += gnome.genmarshal(
--  marshalers,
--  sources: marshalers + '.list',
-+marshalers = gnome.genmarshal(
-+  'biji-marshalers',
-+  sources: 'biji-marshalers.list',
-   prefix: '_biji_marshal'
- )
- 
-@@ -48,7 +46,7 @@ endif
- 
- libbiji = static_library(
-   'biji',
--  sources: sources,
-+  sources: sources + marshalers,
-   include_directories: top_inc,
-   dependencies: deps,
-   c_args: cflags
-@@ -57,5 +55,6 @@ libbiji = static_library(
- libbiji_dep = declare_dependency(
-   link_with: libbiji,
-   include_directories: include_directories('.'),
--  dependencies: deps
-+  dependencies: deps,
-+  sources: marshalers[1],
- )
diff --git a/deskutils/bijiben/pkg-plist b/deskutils/bijiben/pkg-plist
index 92f2e58cd5af..c34044f41a19 100644
--- a/deskutils/bijiben/pkg-plist
+++ b/deskutils/bijiben/pkg-plist
@@ -16,8 +16,8 @@ share/help/C/bijiben/delete-permanent.page
 share/help/C/bijiben/delete-restore.page
 share/help/C/bijiben/delete.page
 share/help/C/bijiben/figures/hicolor_apps_16x16_bijiben.png
-share/help/C/bijiben/figures/hicolor_apps_48x48_bijiben.png
 share/help/C/bijiben/figures/notes-3-36.png
+share/help/C/bijiben/figures/org.gnome.Notes.svg
 share/help/C/bijiben/format-list.page
 share/help/C/bijiben/format-text.page
 share/help/C/bijiben/index.page
@@ -35,8 +35,8 @@ share/help/ca/bijiben/delete-permanent.page
 share/help/ca/bijiben/delete-restore.page
 share/help/ca/bijiben/delete.page
 share/help/ca/bijiben/figures/hicolor_apps_16x16_bijiben.png
-share/help/ca/bijiben/figures/hicolor_apps_48x48_bijiben.png
 share/help/ca/bijiben/figures/notes-3-36.png
+share/help/ca/bijiben/figures/org.gnome.Notes.svg
 share/help/ca/bijiben/format-list.page
 share/help/ca/bijiben/format-text.page
 share/help/ca/bijiben/index.page
@@ -54,8 +54,8 @@ share/help/cs/bijiben/delete-permanent.page
 share/help/cs/bijiben/delete-restore.page
 share/help/cs/bijiben/delete.page
 share/help/cs/bijiben/figures/hicolor_apps_16x16_bijiben.png
-share/help/cs/bijiben/figures/hicolor_apps_48x48_bijiben.png
 share/help/cs/bijiben/figures/notes-3-36.png
+share/help/cs/bijiben/figures/org.gnome.Notes.svg
 share/help/cs/bijiben/format-list.page
 share/help/cs/bijiben/format-text.page
 share/help/cs/bijiben/index.page
@@ -73,8 +73,8 @@ share/help/de/bijiben/delete-permanent.page
 share/help/de/bijiben/delete-restore.page
 share/help/de/bijiben/delete.page
 share/help/de/bijiben/figures/hicolor_apps_16x16_bijiben.png
-share/help/de/bijiben/figures/hicolor_apps_48x48_bijiben.png
 share/help/de/bijiben/figures/notes-3-36.png
+share/help/de/bijiben/figures/org.gnome.Notes.svg
 share/help/de/bijiben/format-list.page
 share/help/de/bijiben/format-text.page
 share/help/de/bijiben/index.page
@@ -92,8 +92,8 @@ share/help/el/bijiben/delete-permanent.page
 share/help/el/bijiben/delete-restore.page
 share/help/el/bijiben/delete.page
 share/help/el/bijiben/figures/hicolor_apps_16x16_bijiben.png
-share/help/el/bijiben/figures/hicolor_apps_48x48_bijiben.png
 share/help/el/bijiben/figures/notes-3-36.png
+share/help/el/bijiben/figures/org.gnome.Notes.svg
 share/help/el/bijiben/format-list.page
 share/help/el/bijiben/format-text.page
 share/help/el/bijiben/index.page
@@ -111,8 +111,8 @@ share/help/es/bijiben/delete-permanent.page
 share/help/es/bijiben/delete-restore.page
 share/help/es/bijiben/delete.page
 share/help/es/bijiben/figures/hicolor_apps_16x16_bijiben.png
-share/help/es/bijiben/figures/hicolor_apps_48x48_bijiben.png
 share/help/es/bijiben/figures/notes-3-36.png
+share/help/es/bijiben/figures/org.gnome.Notes.svg
 share/help/es/bijiben/format-list.page
 share/help/es/bijiben/format-text.page
 share/help/es/bijiben/index.page
@@ -123,6 +123,25 @@ share/help/es/bijiben/notebooks.page
 share/help/es/bijiben/rename.page
 share/help/es/bijiben/search.page
 share/help/es/bijiben/share.page
+share/help/eu/bijiben/colors.page
+share/help/eu/bijiben/create.page
+share/help/eu/bijiben/cut-copy-paste.page
+share/help/eu/bijiben/delete-permanent.page
+share/help/eu/bijiben/delete-restore.page
+share/help/eu/bijiben/delete.page
+share/help/eu/bijiben/figures/hicolor_apps_16x16_bijiben.png
+share/help/eu/bijiben/figures/notes-3-36.png
+share/help/eu/bijiben/figures/org.gnome.Notes.svg
+share/help/eu/bijiben/format-list.page
+share/help/eu/bijiben/format-text.page
+share/help/eu/bijiben/index.page
+share/help/eu/bijiben/introduction.page
+share/help/eu/bijiben/legal.xml
+share/help/eu/bijiben/new-window.page
+share/help/eu/bijiben/notebooks.page
+share/help/eu/bijiben/rename.page
+share/help/eu/bijiben/search.page
+share/help/eu/bijiben/share.page
 share/help/fr/bijiben/colors.page
 share/help/fr/bijiben/create.page
 share/help/fr/bijiben/cut-copy-paste.page
@@ -130,8 +149,8 @@ share/help/fr/bijiben/delete-permanent.page
 share/help/fr/bijiben/delete-restore.page
 share/help/fr/bijiben/delete.page
 share/help/fr/bijiben/figures/hicolor_apps_16x16_bijiben.png
-share/help/fr/bijiben/figures/hicolor_apps_48x48_bijiben.png
 share/help/fr/bijiben/figures/notes-3-36.png
+share/help/fr/bijiben/figures/org.gnome.Notes.svg
 share/help/fr/bijiben/format-list.page
 share/help/fr/bijiben/format-text.page
 share/help/fr/bijiben/index.page
@@ -149,8 +168,8 @@ share/help/fur/bijiben/delete-permanent.page
 share/help/fur/bijiben/delete-restore.page
 share/help/fur/bijiben/delete.page
 share/help/fur/bijiben/figures/hicolor_apps_16x16_bijiben.png
-share/help/fur/bijiben/figures/hicolor_apps_48x48_bijiben.png
 share/help/fur/bijiben/figures/notes-3-36.png
+share/help/fur/bijiben/figures/org.gnome.Notes.svg
 share/help/fur/bijiben/format-list.page
 share/help/fur/bijiben/format-text.page
 share/help/fur/bijiben/index.page
@@ -168,8 +187,8 @@ share/help/hu/bijiben/delete-permanent.page
 share/help/hu/bijiben/delete-restore.page
 share/help/hu/bijiben/delete.page
 share/help/hu/bijiben/figures/hicolor_apps_16x16_bijiben.png
-share/help/hu/bijiben/figures/hicolor_apps_48x48_bijiben.png
 share/help/hu/bijiben/figures/notes-3-36.png
+share/help/hu/bijiben/figures/org.gnome.Notes.svg
 share/help/hu/bijiben/format-list.page
 share/help/hu/bijiben/format-text.page
 share/help/hu/bijiben/index.page
@@ -187,8 +206,8 @@ share/help/id/bijiben/delete-permanent.page
 share/help/id/bijiben/delete-restore.page
 share/help/id/bijiben/delete.page
 share/help/id/bijiben/figures/hicolor_apps_16x16_bijiben.png
-share/help/id/bijiben/figures/hicolor_apps_48x48_bijiben.png
 share/help/id/bijiben/figures/notes-3-36.png
+share/help/id/bijiben/figures/org.gnome.Notes.svg
 share/help/id/bijiben/format-list.page
 share/help/id/bijiben/format-text.page
 share/help/id/bijiben/index.page
@@ -206,8 +225,8 @@ share/help/ko/bijiben/delete-permanent.page
 share/help/ko/bijiben/delete-restore.page
 share/help/ko/bijiben/delete.page
 share/help/ko/bijiben/figures/hicolor_apps_16x16_bijiben.png
-share/help/ko/bijiben/figures/hicolor_apps_48x48_bijiben.png
 share/help/ko/bijiben/figures/notes-3-36.png
+share/help/ko/bijiben/figures/org.gnome.Notes.svg
 share/help/ko/bijiben/format-list.page
 share/help/ko/bijiben/format-text.page
 share/help/ko/bijiben/index.page
@@ -225,8 +244,8 @@ share/help/pl/bijiben/delete-permanent.page
 share/help/pl/bijiben/delete-restore.page
 share/help/pl/bijiben/delete.page
 share/help/pl/bijiben/figures/hicolor_apps_16x16_bijiben.png
-share/help/pl/bijiben/figures/hicolor_apps_48x48_bijiben.png
 share/help/pl/bijiben/figures/notes-3-36.png
+share/help/pl/bijiben/figures/org.gnome.Notes.svg
 share/help/pl/bijiben/format-list.page
 share/help/pl/bijiben/format-text.page
 share/help/pl/bijiben/index.page
@@ -244,8 +263,8 @@ share/help/pt_BR/bijiben/delete-permanent.page
 share/help/pt_BR/bijiben/delete-restore.page
 share/help/pt_BR/bijiben/delete.page
 share/help/pt_BR/bijiben/figures/hicolor_apps_16x16_bijiben.png
-share/help/pt_BR/bijiben/figures/hicolor_apps_48x48_bijiben.png
 share/help/pt_BR/bijiben/figures/notes-3-36.png
+share/help/pt_BR/bijiben/figures/org.gnome.Notes.svg
 share/help/pt_BR/bijiben/format-list.page
 share/help/pt_BR/bijiben/format-text.page
 share/help/pt_BR/bijiben/index.page
@@ -263,8 +282,8 @@ share/help/sv/bijiben/delete-permanent.page
 share/help/sv/bijiben/delete-restore.page
 share/help/sv/bijiben/delete.page
 share/help/sv/bijiben/figures/hicolor_apps_16x16_bijiben.png
-share/help/sv/bijiben/figures/hicolor_apps_48x48_bijiben.png
 share/help/sv/bijiben/figures/notes-3-36.png
+share/help/sv/bijiben/figures/org.gnome.Notes.svg
 share/help/sv/bijiben/format-list.page
 share/help/sv/bijiben/format-text.page
 share/help/sv/bijiben/index.page
@@ -282,8 +301,8 @@ share/help/uk/bijiben/delete-permanent.page
 share/help/uk/bijiben/delete-restore.page
 share/help/uk/bijiben/delete.page
 share/help/uk/bijiben/figures/hicolor_apps_16x16_bijiben.png
-share/help/uk/bijiben/figures/hicolor_apps_48x48_bijiben.png
 share/help/uk/bijiben/figures/notes-3-36.png
+share/help/uk/bijiben/figures/org.gnome.Notes.svg
 share/help/uk/bijiben/format-list.page
 share/help/uk/bijiben/format-text.page
 share/help/uk/bijiben/index.page