Update mate to 1.24

All components but:
caja
atril
marco

Have been upgraded to 1.24
The above 3 other components depends on a newer version of glib
so they will be upgraded later

5 files changed, 15 insertions, 63 deletions

diff --git a/x11/mate-applets/Makefile b/x11/mate-applets/Makefile
index 7c4597160101..081903b1cfa7 100644
--- a/x11/mate-applets/Makefile
+++ b/x11/mate-applets/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	mate-applets
-PORTVERSION=	1.22.2
+PORTVERSION=	1.24.0
 CATEGORIES=	x11 mate
 MASTER_SITES=	MATE
 DIST_SUBDIR=	mate
@@ -25,7 +25,7 @@ LIB_DEPENDS=	libgtop-2.0.so:devel/libgtop \
 PORTSCOUT=	limitw:1,even
 
 USES=		compiler:c11 gettext gmake gnome libtool localbase mate \
-		pkgconfig python:2.7 tar:xz xorg
+		pkgconfig tar:xz xorg
 USE_CSTD=	c11
 
 USE_MATE=	libmateweather panel
diff --git a/x11/mate-applets/distinfo b/x11/mate-applets/distinfo
index 8ee6b32194fd..11e0097ffa9d 100644
--- a/x11/mate-applets/distinfo
+++ b/x11/mate-applets/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1577279005
-SHA256 (mate/mate-applets-1.22.2.tar.xz) = 0c47d69fdecda40231d021cb72594c479e01a4d4b7f49c9550731a9fe7cc62b0
-SIZE (mate/mate-applets-1.22.2.tar.xz) = 7648744
+TIMESTAMP = 1591975053
+SHA256 (mate/mate-applets-1.24.0.tar.xz) = b84feb195b3deb8ef7a973d6e66ba30f0c411cf2e9af1a76afa8903d5655a35a
+SIZE (mate/mate-applets-1.24.0.tar.xz) = 8142812
diff --git a/x11/mate-applets/files/patch-battstat_acpi-freebsd.c b/x11/mate-applets/files/patch-battstat_acpi-freebsd.c
index 48746fa03bbd..478687eff254 100644
--- a/x11/mate-applets/files/patch-battstat_acpi-freebsd.c
+++ b/x11/mate-applets/files/patch-battstat_acpi-freebsd.c
@@ -1,5 +1,5 @@
---- battstat/acpi-freebsd.c.orig	Sun Jul  3 16:41:26 2005
-+++ battstat/acpi-freebsd.c	Sun Jul  3 16:49:55 2005
+--- battstat/acpi-freebsd.c.orig	2020-02-10 11:36:09 UTC
++++ battstat/acpi-freebsd.c
 @@ -31,9 +31,13 @@
  
  #include <stdio.h>
@@ -57,7 +57,7 @@
    }
  
    update_battery_info(acpiinfo);
-@@ -110,6 +134,65 @@ acpi_freebsd_init(struct acpi_info * acp
+@@ -110,6 +134,65 @@ acpi_freebsd_init(struct acpi_info * acpiinfo)
    return TRUE;
  }
  
@@ -123,7 +123,7 @@
  void
  acpi_freebsd_cleanup(struct acpi_info * acpiinfo)
  {
-@@ -119,21 +202,12 @@ acpi_freebsd_cleanup(struct acpi_info * 
+@@ -119,21 +202,12 @@ acpi_freebsd_cleanup(struct acpi_info * acpiinfo)
      close(acpiinfo->acpifd);
      acpiinfo->acpifd = -1;
    }
diff --git a/x11/mate-applets/files/patch-battstat_acpi-freebsd.h b/x11/mate-applets/files/patch-battstat_acpi-freebsd.h
index 518a5269a069..fd711c5482d8 100644
--- a/x11/mate-applets/files/patch-battstat_acpi-freebsd.h
+++ b/x11/mate-applets/files/patch-battstat_acpi-freebsd.h
@@ -1,5 +1,5 @@
---- battstat/acpi-freebsd.h.orig	2013-03-26 20:55:32.000000000 -0500
-+++ battstat/acpi-freebsd.h	2013-03-26 20:57:36.000000000 -0500
+--- battstat/acpi-freebsd.h.orig	2020-02-10 11:36:09 UTC
++++ battstat/acpi-freebsd.h
 @@ -29,61 +29,30 @@
  #define ACPI_LIFE "hw.acpi.battery.life"
  #define ACPI_STATE "hw.acpi.battery.state"
@@ -18,7 +18,8 @@
 +  int      ai_batt_time;
 +  guint    ai_status;
  };
--
++#endif
+ 
 -gboolean acpi_freebsd_read(struct apm_info *apminfo, struct acpi_info * acpiinfo);
 -gboolean acpi_process_event(struct acpi_info * acpiinfo);
 -gboolean acpi_freebsd_init(struct acpi_info * acpiinfo);
@@ -40,7 +41,7 @@
 - *
 - *  You should have received a copy of the GNU General Public License
 - *  along with this program; if not, write to the Free Software
-- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02110-1301, USA.
+- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 - */
 -
 -#ifndef __ACPI_FREEBSD_H__
@@ -55,8 +56,7 @@
 -#define ACPI_TIME "hw.acpi.battery.time"
 -#define ACPI_LIFE "hw.acpi.battery.life"
 -#define ACPI_STATE "hw.acpi.battery.state"
-+#endif
- 
+-
  struct acpi_info {
    gboolean  ac_online;
 +  gboolean  event_inited;
diff --git a/x11/mate-applets/files/patch-configure.ac b/x11/mate-applets/files/patch-configure.ac
deleted file mode 100644
index 620890eea917..000000000000
--- a/x11/mate-applets/files/patch-configure.ac
+++ /dev/null
@@ -1,48 +0,0 @@
---- configure.ac.orig	2016-01-05 02:12:51.000000000 +0100
-+++ configure.ac	2016-02-01 10:03:19.854824000 +0100
-@@ -269,7 +269,7 @@
- GETTEXT_PACKAGE=mate-applets
- AC_SUBST(GETTEXT_PACKAGE)
- AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext Package])
--AC_DEFINE_DIR(MATELOCALEDIR, "${datadir}/locale", [locale directory])
-+AC_DEFINE_DIR(MATELOCALEDIR, [localedir], [locale directory])
- AM_GLIB_GNU_GETTEXT
- 
- # this is the directory where the *.{mo,gmo} files are installed
-@@ -310,7 +310,7 @@
- 	   AC_CHECK_LIB(apm,apm_read,[HAVE_LIBAPM=yes],[HAVE_LIBAPM=no])
- 	   ;;
-        # list of supported OS cores that do not use libapm
--       i386-*-freebsd*|*-*-netbsd*|*-*-openbsd*|*-*kfreebsd*-gnu)
-+       *-*-freebsd*|*-*-netbsd*|*-*-openbsd*|*-*kfreebsd*-gnu)
-           if test -n "${OS_SYS}"; then
- 	       ACPIINC="-I${OS_SYS}"
- 	   else
-@@ -546,17 +549,17 @@
- builderdir="${pkgdatadir}/builder"
- AC_SUBST(builderdir)
- 
--AC_DEFINE_DIR(MATE_ICONDIR, "${iconsdir}", [Mate Icon Directory])
--AC_DEFINE_DIR(MATE_PIXMAPSDIR, "${pixmapsdir}", [Mate Pixmaps Directory])
--AC_DEFINE_DIR(PKGDATADIR, "${pkgdatadir}", [Mate Applets Directory])
--AC_DEFINE_DIR(GTK_BUILDERDIR, "${builderdir}", [GtkBuilder Resources Directory])
--AC_DEFINE_DIR(DATADIR, "${datadir}", [datadir])
--AC_DEFINE_DIR(PKG_DATA_DIR, "${pkgdatadir}", [pkgdatadir])
--AC_DEFINE_DIR(SYSCONFDIR, "${sysconfdir}", [sysconfdir])
--AC_DEFINE_DIR(LIBDIR, "${libdir}", [libdir])
--AC_DEFINE_DIR(PREFIX, "$prefix", [install prefix])
-+AC_DEFINE_DIR(MATE_ICONDIR, [iconsdir], [Mate Icon Directory])
-+AC_DEFINE_DIR(MATE_PIXMAPSDIR, [pixmapsdir], [Mate Pixmaps Directory])
-+AC_DEFINE_DIR(PKGDATADIR, [pkgdatadir], [Mate Applets Directory])
-+AC_DEFINE_DIR(GTK_BUILDERDIR, [builderdir], [GtkBuilder Resources Directory])
-+AC_DEFINE_DIR(DATADIR, [datadir], [datadir])
-+AC_DEFINE_DIR(PKG_DATA_DIR, [pkgdatadir], [pkgdatadir])
-+AC_DEFINE_DIR(SYSCONFDIR, [sysconfdir], [sysconfdir])
-+AC_DEFINE_DIR(LIBDIR, [libdir], [libdir])
-+AC_DEFINE_DIR(PREFIX, [prefix], [install prefix])
- 
--AS_AC_EXPAND(DATADIR, "${datadir}")
-+AS_AC_EXPAND(DATADIR, $datadir)
- AS_AC_EXPAND(BUILDERDIR, $builderdir)
-
- AC_SUBST(VERSION)