aboutsummaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorKoop Mast <kwm@FreeBSD.org>2015-07-27 20:19:33 +0000
committerKoop Mast <kwm@FreeBSD.org>2015-07-27 20:19:33 +0000
commitb18513c396f0da554f784695a222d8383acd7127 (patch)
tree0d276f72ec80621ae31f35239a1c27ae16c21bba /x11
parentd6c984cb28fe817c6db7ba577f9eb98928bacd1e (diff)
downloadports-b18513c396f0da554f784695a222d8383acd7127.tar.gz
ports-b18513c396f0da554f784695a222d8383acd7127.zip
Update MATE DE to 1.10.0.
This MATE is still build agains GTK+2. Sort USES here and there. Replace mate-dialogs with zenity and mate-calc with galculator. This update fixes the following PR's: PR: 193942, 191885 Submitted by: Gustau Perez <gustau.perez@gmail.com> via Gnome devel repo Obtained from: gnome devel repo.
Notes
Notes: svn path=/head/; revision=393031
Diffstat (limited to 'x11')
-rw-r--r--x11/Makefile1
-rw-r--r--x11/libmatekbd/Makefile6
-rw-r--r--x11/libmatekbd/distinfo4
-rw-r--r--x11/libmatekbd/pkg-plist1
-rw-r--r--x11/mate-applets/Makefile4
-rw-r--r--x11/mate-applets/distinfo4
-rw-r--r--x11/mate-applets/files/accessx-status_Makefile.am19
-rw-r--r--x11/mate-applets/files/battstat_Makefile.am24
-rw-r--r--x11/mate-applets/files/command_Makefile.am17
-rw-r--r--x11/mate-applets/files/patch-accessx-status_Makefile.in16
-rw-r--r--x11/mate-applets/files/patch-battstat_Makefile.in99
-rw-r--r--x11/mate-applets/files/patch-battstat_power-management.c26
-rw-r--r--x11/mate-applets/files/patch-charpick_Makefile.in64
-rw-r--r--x11/mate-applets/files/patch-command_Makefile.in29
-rw-r--r--x11/mate-applets/files/patch-drivemount_Makefile.in68
-rw-r--r--x11/mate-applets/files/patch-geyes_Makefile.in64
-rw-r--r--x11/mate-applets/files/patch-multiload_Makefile.in70
-rw-r--r--x11/mate-applets/files/patch-stickynotes_Makefile.in61
-rw-r--r--x11/mate-applets/files/patch-timerapplet_Makefile.in (renamed from x11/mate-applets/files/patch-timer-applet_Makefile.in)22
-rw-r--r--x11/mate-applets/files/patch-trashapplet_src_Makefile.in62
-rw-r--r--x11/mate-applets/files/stickynotes_Makefile.am23
-rw-r--r--x11/mate-applets/files/timerapplet_Makefile.am17
-rw-r--r--x11/mate-applets/files/trashapplet_src_Makefile.am22
-rw-r--r--x11/mate-applets/pkg-plist319
-rw-r--r--x11/mate-base/Makefile4
-rw-r--r--x11/mate-desktop/Makefile20
-rw-r--r--x11/mate-desktop/distinfo4
-rw-r--r--x11/mate-desktop/pkg-plist13
-rw-r--r--x11/mate-dialogs/Makefile37
-rw-r--r--x11/mate-dialogs/distinfo2
-rw-r--r--x11/mate-dialogs/pkg-descr5
-rw-r--r--x11/mate-dialogs/pkg-plist327
-rw-r--r--x11/mate-menus/Makefile3
-rw-r--r--x11/mate-menus/distinfo4
-rw-r--r--x11/mate-menus/pkg-plist3
-rw-r--r--x11/mate-panel/Makefile4
-rw-r--r--x11/mate-panel/distinfo4
-rw-r--r--x11/mate-panel/files/patch-applets_wncklet_workspace-switcher.c11
-rw-r--r--x11/mate-panel/pkg-plist81
-rw-r--r--x11/mate-screensaver/Makefile3
-rw-r--r--x11/mate-screensaver/distinfo4
-rw-r--r--x11/mate-session-manager/Makefile6
-rw-r--r--x11/mate-session-manager/distinfo4
-rw-r--r--x11/mate-session-manager/pkg-plist2
-rw-r--r--x11/mate-terminal/Makefile6
-rw-r--r--x11/mate-terminal/distinfo4
-rw-r--r--x11/mate-terminal/pkg-plist2
-rw-r--r--x11/mate/Makefile5
48 files changed, 615 insertions, 985 deletions
diff --git a/x11/Makefile b/x11/Makefile
index 40b3b8772953..b9e94b9fd50e 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -195,7 +195,6 @@
SUBDIR += mate-applets
SUBDIR += mate-base
SUBDIR += mate-desktop
- SUBDIR += mate-dialogs
SUBDIR += mate-menus
SUBDIR += mate-panel
SUBDIR += mate-screensaver
diff --git a/x11/libmatekbd/Makefile b/x11/libmatekbd/Makefile
index 57ced67b616f..b3fc77ac7e6f 100644
--- a/x11/libmatekbd/Makefile
+++ b/x11/libmatekbd/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= libmatekbd
-PORTVERSION= 1.8.0
-PORTREVISION= 1
+PORTVERSION= 1.10.0
CATEGORIES= x11 mate
MASTER_SITES= MATE
DIST_SUBDIR= mate
@@ -27,4 +26,7 @@ INSTALL_TARGET= install-strip
GLIB_SCHEMAS= org.mate.peripherals-keyboard-xkb.gschema.xml
+post-install:
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libmatekbd*so*
+
.include <bsd.port.mk>
diff --git a/x11/libmatekbd/distinfo b/x11/libmatekbd/distinfo
index 9070b2ca7376..87910a72d1ef 100644
--- a/x11/libmatekbd/distinfo
+++ b/x11/libmatekbd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mate/libmatekbd-1.8.0.tar.xz) = b0e4b0e5388057a26e0ccd960b6f95281519805a4b46ac9a97ccc2ab62706f8d
-SIZE (mate/libmatekbd-1.8.0.tar.xz) = 364024
+SHA256 (mate/libmatekbd-1.10.0.tar.xz) = 09d9bb75d784083036e24a29120f5933f0dfdfe59050858dd353fd7572d7d2d1
+SIZE (mate/libmatekbd-1.10.0.tar.xz) = 365796
diff --git a/x11/libmatekbd/pkg-plist b/x11/libmatekbd/pkg-plist
index b6a2f27c8af3..89611e9c0a48 100644
--- a/x11/libmatekbd/pkg-plist
+++ b/x11/libmatekbd/pkg-plist
@@ -21,6 +21,7 @@ share/locale/am/LC_MESSAGES/libmatekbd.mo
share/locale/ar/LC_MESSAGES/libmatekbd.mo
share/locale/as/LC_MESSAGES/libmatekbd.mo
share/locale/ast/LC_MESSAGES/libmatekbd.mo
+share/locale/be/LC_MESSAGES/libmatekbd.mo
share/locale/be@latin/LC_MESSAGES/libmatekbd.mo
share/locale/bg/LC_MESSAGES/libmatekbd.mo
share/locale/bn/LC_MESSAGES/libmatekbd.mo
diff --git a/x11/mate-applets/Makefile b/x11/mate-applets/Makefile
index cf557313ea4e..88df64dfd375 100644
--- a/x11/mate-applets/Makefile
+++ b/x11/mate-applets/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mate-applets
-PORTVERSION= 1.8.1
+PORTVERSION= 1.10.3
CATEGORIES= x11 mate
MASTER_SITES= MATE
DIST_SUBDIR= mate
@@ -23,7 +23,7 @@ RUN_DEPENDS= gucharmap:${PORTSDIR}/deskutils/gucharmap
PORTSCOUT= limitw:1,even
-USES= gettext gmake libtool pathfix pkgconfig python tar:xz
+USES= autoreconf:build gettext gmake libtool pathfix pkgconfig python tar:xz
USE_MATE= desktop icontheme libmateweather panel polkit settingsdaemon
USE_XORG= x11
USE_GNOME= gdkpixbuf2 gtksourceview2 introspection:build \
diff --git a/x11/mate-applets/distinfo b/x11/mate-applets/distinfo
index e5939a736069..2e1344a9a3ab 100644
--- a/x11/mate-applets/distinfo
+++ b/x11/mate-applets/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mate/mate-applets-1.8.1.tar.xz) = 6f1a88453e526a7ee67e14fa4d6b3dc74fb954a1465c7cb3a76f205389a2df83
-SIZE (mate/mate-applets-1.8.1.tar.xz) = 6877876
+SHA256 (mate/mate-applets-1.10.3.tar.xz) = 4670b0e877639f9c585b84b27c3654880ed96aefea596a8b8c20c955a3c0266d
+SIZE (mate/mate-applets-1.10.3.tar.xz) = 6895936
diff --git a/x11/mate-applets/files/accessx-status_Makefile.am b/x11/mate-applets/files/accessx-status_Makefile.am
new file mode 100644
index 000000000000..b0119487cbfa
--- /dev/null
+++ b/x11/mate-applets/files/accessx-status_Makefile.am
@@ -0,0 +1,19 @@
+--- accessx-status/Makefile.am.orig 2014-12-05 11:01:40.849389089 +0100
++++ accessx-status/Makefile.am 2014-12-05 11:03:05.635384917 +0100
+@@ -6,13 +6,13 @@
+ -DACCESSX_PIXMAPS_DIR=\""$(datadir)/pixmaps/mate-accessx-status-applet"\" \
+ -DACCESSX_MENU_UI_DIR=\""$(uidir)"\"
+
+-libexec_PROGRAMS = accessx-status-applet
++libexec_PROGRAMS = mate-accessx-status-applet
+
+-accessx_status_applet_SOURCES = \
++mate_accessx_status_applet_SOURCES = \
+ applet.c \
+ applet.h
+
+-accessx_status_applet_LDADD = \
++mate_accessx_status_applet_LDADD = \
+ $(MATE_APPLETS4_LIBS) \
+ $(MATEDESKTOP_LIBS) \
+ $(X_LIBS)
diff --git a/x11/mate-applets/files/battstat_Makefile.am b/x11/mate-applets/files/battstat_Makefile.am
new file mode 100644
index 000000000000..2a007c192a0b
--- /dev/null
+++ b/x11/mate-applets/files/battstat_Makefile.am
@@ -0,0 +1,24 @@
+--- battstat/Makefile.am.orig 2014-12-05 12:27:04.701035642 +0100
++++ battstat/Makefile.am 2014-12-05 12:28:02.762606006 +0100
+@@ -35,10 +35,10 @@
+ -DBATTSTAT_MENU_UI_DIR=\""$(uidir)"\"
+
+
+-libexec_PROGRAMS = battstat-applet
++libexec_PROGRAMS = mate-battstat-applet
+
+
+-battstat_applet_SOURCES = \
++mate_battstat_applet_SOURCES = \
+ battstat.h \
+ pixmaps.h \
+ properties.c \
+@@ -54,7 +54,7 @@
+ battstat-upower.h
+
+
+-battstat_applet_LDADD = \
++mate_battstat_applet_LDADD = \
+ $(MATE_APPLETS4_LIBS) \
+ $(MATEDESKTOP_LIBS) \
+ $(LIBNOTIFY_LIBS) \
diff --git a/x11/mate-applets/files/command_Makefile.am b/x11/mate-applets/files/command_Makefile.am
new file mode 100644
index 000000000000..6b67c3a90189
--- /dev/null
+++ b/x11/mate-applets/files/command_Makefile.am
@@ -0,0 +1,17 @@
+--- command/Makefile.am.orig 2014-12-05 12:30:39.726021147 +0100
++++ command/Makefile.am 2014-12-05 12:30:57.153403339 +0100
+@@ -7,10 +7,10 @@
+
+ APPLET_LOCATION = $(libexecdir)/command-applet
+
+-libexec_PROGRAMS = command-applet
+-command_applet_SOURCES = command.c
+-command_applet_LDADD = $(MATE_APPLETS4_LIBS) $(MATEDESKTOP_LIBS)
+-command_applet_CFLAGS = $(WARN_CFLAGS)
++libexec_PROGRAMS = mate-command-applet
++mate_command_applet_SOURCES = command.c
++mate_command_applet_LDADD = $(MATE_APPLETS4_LIBS) $(MATEDESKTOP_LIBS)
++mate_command_applet_CFLAGS = $(WARN_CFLAGS)
+
+ appletsdir = $(datadir)/mate-panel/applets
+ applets_in_files = org.mate.applets.CommandApplet.mate-panel-applet.in
diff --git a/x11/mate-applets/files/patch-accessx-status_Makefile.in b/x11/mate-applets/files/patch-accessx-status_Makefile.in
index 7db226548bb8..c337d980ac00 100644
--- a/x11/mate-applets/files/patch-accessx-status_Makefile.in
+++ b/x11/mate-applets/files/patch-accessx-status_Makefile.in
@@ -1,5 +1,5 @@
---- accessx-status/Makefile.in.orig 2014-04-12 15:37:29.000000000 +0200
-+++ accessx-status/Makefile.in 2014-04-12 15:39:27.000000000 +0200
+--- accessx-status/Makefile.in.orig 2015-01-22 17:21:18.066885138 +0100
++++ accessx-status/Makefile.in 2015-01-22 17:21:33.201884384 +0100
@@ -78,7 +78,7 @@
POST_UNINSTALL = :
build_triplet = @build@
@@ -21,10 +21,10 @@
am__DEPENDENCIES_1 =
-accessx_status_applet_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+mate_accessx_status_applet_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
AM_V_lt = $(am__v_lt_@AM_V@)
- am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-@@ -141,8 +142,8 @@
+@@ -142,8 +143,8 @@
am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
am__v_CCLD_0 = @echo " CCLD " $@;
am__v_CCLD_1 =
@@ -35,7 +35,7 @@
RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
ctags-recursive dvi-recursive html-recursive info-recursive \
install-data-recursive install-dvi-recursive \
-@@ -487,11 +488,11 @@
+@@ -470,11 +471,11 @@
-DACCESSX_PIXMAPS_DIR=\""$(datadir)/pixmaps/mate-accessx-status-applet"\" \
-DACCESSX_MENU_UI_DIR=\""$(uidir)"\"
@@ -48,8 +48,8 @@
+mate_accessx_status_applet_LDADD = \
$(MATE_APPLETS4_LIBS) \
$(MATEDESKTOP_LIBS) \
- $(X_LIBS)
-@@ -594,9 +595,9 @@
+ $(GIO_LIBS) \
+@@ -578,9 +579,9 @@
echo " rm -f" $$list; \
rm -f $$list
diff --git a/x11/mate-applets/files/patch-battstat_Makefile.in b/x11/mate-applets/files/patch-battstat_Makefile.in
index dd6d8ed9498e..be870252e6c9 100644
--- a/x11/mate-applets/files/patch-battstat_Makefile.in
+++ b/x11/mate-applets/files/patch-battstat_Makefile.in
@@ -1,11 +1,17 @@
---- battstat/Makefile.in.orig 2014-04-12 15:37:50.000000000 +0200
-+++ battstat/Makefile.in 2014-04-12 15:39:28.000000000 +0200
+--- battstat/Makefile.in.orig 2015-01-22 17:23:12.427878023 +0100
++++ battstat/Makefile.in 2015-01-22 17:24:25.590872727 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.14.1 from Makefile.am.
++# Makefile.in generated by automake 1.14 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -78,7 +78,7 @@
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
--libexec_PROGRAMS = battstat-applet-2$(EXEEXT)
-+libexec_PROGRAMS = mate-battstat-applet-2$(EXEEXT)
+-libexec_PROGRAMS = battstat-applet$(EXEEXT)
++libexec_PROGRAMS = mate-battstat-applet$(EXEEXT)
subdir = battstat
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/depcomp
@@ -13,18 +19,18 @@
"$(DESTDIR)$(builderdir)" "$(DESTDIR)$(servicedir)" \
"$(DESTDIR)$(uidir)"
PROGRAMS = $(libexec_PROGRAMS)
--am_battstat_applet_2_OBJECTS = properties.$(OBJEXT) \
-+am_mate_battstat_applet_2_OBJECTS = properties.$(OBJEXT) \
+-am_battstat_applet_OBJECTS = properties.$(OBJEXT) \
++am_mate_battstat_applet_OBJECTS = properties.$(OBJEXT) \
battstat_applet.$(OBJEXT) power-management.$(OBJEXT) \
acpi-linux.$(OBJEXT) acpi-freebsd.$(OBJEXT) \
- battstat-hal.$(OBJEXT) battstat-upower.$(OBJEXT)
--battstat_applet_2_OBJECTS = $(am_battstat_applet_2_OBJECTS)
-+mate_battstat_applet_2_OBJECTS = $(am_mate_battstat_applet_2_OBJECTS)
+ battstat-upower.$(OBJEXT)
+-battstat_applet_OBJECTS = $(am_battstat_applet_OBJECTS)
++mate_battstat_applet_OBJECTS = $(am_mate_battstat_applet_OBJECTS)
am__DEPENDENCIES_1 =
@HAVE_LIBAPM_FALSE@@NEED_LIBAPM_TRUE@am__DEPENDENCIES_2 = \
@HAVE_LIBAPM_FALSE@@NEED_LIBAPM_TRUE@ apmlib/libapm.a
--battstat_applet_2_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-+mate_battstat_applet_2_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+-battstat_applet_DEPENDENCIES = $(am__DEPENDENCIES_1) \
++mate_battstat_applet_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
AM_V_lt = $(am__v_lt_@AM_V@)
@@ -32,41 +38,76 @@
am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
am__v_CCLD_0 = @echo " CCLD " $@;
am__v_CCLD_1 =
--SOURCES = $(battstat_applet_2_SOURCES)
--DIST_SOURCES = $(battstat_applet_2_SOURCES)
-+SOURCES = $(mate_battstat_applet_2_SOURCES)
-+DIST_SOURCES = $(mate_battstat_applet_2_SOURCES)
+-SOURCES = $(battstat_applet_SOURCES)
+-DIST_SOURCES = $(battstat_applet_SOURCES)
++SOURCES = $(mate_battstat_applet_SOURCES)
++DIST_SOURCES = $(mate_battstat_applet_SOURCES)
RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
ctags-recursive dvi-recursive html-recursive info-recursive \
install-data-recursive install-dvi-recursive \
-@@ -508,7 +508,7 @@
+@@ -303,7 +303,6 @@
+ GUCHARMAP_LIBS = @GUCHARMAP_LIBS@
+ HAVE_LIBAPM = @HAVE_LIBAPM@
+ HAVE_XKB = @HAVE_XKB@
+-HELP_DIR = @HELP_DIR@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -319,7 +318,6 @@
+ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+-ITSTOOL = @ITSTOOL@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBCPUFREQ_LIBS = @LIBCPUFREQ_LIBS@
+@@ -398,18 +396,14 @@
+ UPOWER_LIBS = @UPOWER_LIBS@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+-WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ XMKMF = @XMKMF@
+ XML2_CFLAGS = @XML2_CFLAGS@
+ XML2_LIBS = @XML2_LIBS@
+-XMLLINT = @XMLLINT@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+-YELP_LC_DIST = @YELP_LC_DIST@
+-YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@
+ abs_builddir = @abs_builddir@
+ abs_srcdir = @abs_srcdir@
+ abs_top_builddir = @abs_top_builddir@
+@@ -495,7 +489,7 @@
-DG_LOG_DOMAIN=\"battstat_applet\" \
-DBATTSTAT_MENU_UI_DIR=\""$(uidir)"\"
--battstat_applet_2_SOURCES = \
-+mate_battstat_applet_2_SOURCES = \
+-battstat_applet_SOURCES = \
++mate_battstat_applet_SOURCES = \
battstat.h \
pixmaps.h \
properties.c \
-@@ -523,7 +523,7 @@
+@@ -508,7 +502,7 @@
battstat-upower.c \
battstat-upower.h
--battstat_applet_2_LDADD = \
-+mate_battstat_applet_2_LDADD = \
+-battstat_applet_LDADD = \
++mate_battstat_applet_LDADD = \
$(MATE_APPLETS4_LIBS) \
+ $(MATEDESKTOP_LIBS) \
$(LIBNOTIFY_LIBS) \
- $(HAL_LIBS) \
-@@ -632,9 +632,9 @@
+@@ -617,9 +611,9 @@
echo " rm -f" $$list; \
rm -f $$list
--battstat-applet-2$(EXEEXT): $(battstat_applet_2_OBJECTS) $(battstat_applet_2_DEPENDENCIES) $(EXTRA_battstat_applet_2_DEPENDENCIES)
-- @rm -f battstat-applet-2$(EXEEXT)
-- $(AM_V_CCLD)$(LINK) $(battstat_applet_2_OBJECTS) $(battstat_applet_2_LDADD) $(LIBS)
-+mate-battstat-applet-2$(EXEEXT): $(mate_battstat_applet_2_OBJECTS) $(mate_battstat_applet_2_DEPENDENCIES) $(EXTRA_mate_battstat_applet_2_DEPENDENCIES)
-+ @rm -f mate-battstat-applet-2$(EXEEXT)
-+ $(AM_V_CCLD)$(LINK) $(mate_battstat_applet_2_OBJECTS) $(mate_battstat_applet_2_LDADD) $(LIBS)
+-battstat-applet$(EXEEXT): $(battstat_applet_OBJECTS) $(battstat_applet_DEPENDENCIES) $(EXTRA_battstat_applet_DEPENDENCIES)
+- @rm -f battstat-applet$(EXEEXT)
+- $(AM_V_CCLD)$(LINK) $(battstat_applet_OBJECTS) $(battstat_applet_LDADD) $(LIBS)
++mate-battstat-applet$(EXEEXT): $(mate_battstat_applet_OBJECTS) $(mate_battstat_applet_DEPENDENCIES) $(EXTRA_mate_battstat_applet_DEPENDENCIES)
++ @rm -f mate-battstat-applet$(EXEEXT)
++ $(AM_V_CCLD)$(LINK) $(mate_battstat_applet_OBJECTS) $(mate_battstat_applet_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
diff --git a/x11/mate-applets/files/patch-battstat_power-management.c b/x11/mate-applets/files/patch-battstat_power-management.c
index 47213b3a92cb..256365e2add2 100644
--- a/x11/mate-applets/files/patch-battstat_power-management.c
+++ b/x11/mate-applets/files/patch-battstat_power-management.c
@@ -1,19 +1,19 @@
---- battstat/power-management.c.orig Thu Aug 25 23:45:47 2005
-+++ battstat/power-management.c Tue Aug 30 01:28:40 2005
-@@ -64,9 +64,7 @@
+--- battstat/power-management.c.orig 2015-01-22 10:16:53.000000000 +0100
++++ battstat/power-management.c 2015-01-22 17:29:57.507849366 +0100
+@@ -67,6 +67,10 @@
static const char *apm_readinfo (BatteryStatus *status);
static int pm_initialised;
--#ifdef HAVE_HAL
--static int using_hal;
--#endif
++#ifdef HAVE_HAL
++static int using_hal;
++#endif
+static int using_hal = FALSE;
#ifdef HAVE_UPOWER
static int using_upower;
#endif
-@@ -173,16 +171,40 @@ apm_readinfo (BatteryStatus *status)
+@@ -178,16 +182,40 @@
- #elif __FreeBSD__
+ #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#if defined(__i386__)
#include <machine/apm_bios.h>
@@ -52,7 +52,7 @@
static const char *
apm_readinfo (BatteryStatus *status)
{
-@@ -190,21 +212,27 @@ apm_readinfo (BatteryStatus *status)
+@@ -195,21 +223,27 @@
if (DEBUG) g_print("apm_readinfo() (FreeBSD)\n");
@@ -88,7 +88,7 @@
fd = open(APMDEVICE, O_RDONLY);
if (fd == -1) {
return ERR_OPEN_APMDEV;
-@@ -217,6 +245,9 @@ apm_readinfo (BatteryStatus *status)
+@@ -222,6 +256,9 @@
if(apminfo.ai_status == 0)
return ERR_APM_E;
@@ -98,7 +98,7 @@
}
status->present = TRUE;
-@@ -480,6 +511,12 @@ power_management_initialise( int no_hal
+@@ -483,6 +520,12 @@
}
else
using_acpi = FALSE;
@@ -111,9 +111,9 @@
#endif
pm_initialised = 1;
-@@ -513,6 +550,9 @@ power_management_cleanup( void )
+@@ -516,6 +559,9 @@
}
- #elif defined(__FreeBSD__)
+ #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
if (using_acpi) {
+ if (acpiwatch != 0)
+ g_source_remove(acpiwatch);
diff --git a/x11/mate-applets/files/patch-charpick_Makefile.in b/x11/mate-applets/files/patch-charpick_Makefile.in
deleted file mode 100644
index 1c6b77bb8b78..000000000000
--- a/x11/mate-applets/files/patch-charpick_Makefile.in
+++ /dev/null
@@ -1,64 +0,0 @@
---- charpick/Makefile.in.orig 2014-04-12 15:38:00.000000000 +0200
-+++ charpick/Makefile.in 2014-04-12 15:39:28.000000000 +0200
-@@ -78,7 +78,7 @@
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
--libexec_PROGRAMS = charpick_applet2$(EXEEXT)
-+libexec_PROGRAMS = mate-charpick_applet2$(EXEEXT)
- subdir = charpick
- DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/depcomp
-@@ -98,10 +98,11 @@
- am__installdirs = "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(appletdir)" \
- "$(DESTDIR)$(servicedir)" "$(DESTDIR)$(uidir)"
- PROGRAMS = $(libexec_PROGRAMS)
--am_charpick_applet2_OBJECTS = charpick.$(OBJEXT) properties.$(OBJEXT)
--charpick_applet2_OBJECTS = $(am_charpick_applet2_OBJECTS)
-+am_mate_charpick_applet2_OBJECTS = charpick.$(OBJEXT) \
-+ properties.$(OBJEXT)
-+mate_charpick_applet2_OBJECTS = $(am_mate_charpick_applet2_OBJECTS)
- am__DEPENDENCIES_1 =
--charpick_applet2_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-+mate_charpick_applet2_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1)
- AM_V_lt = $(am__v_lt_@AM_V@)
- am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-@@ -141,8 +142,8 @@
- am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
- am__v_CCLD_0 = @echo " CCLD " $@;
- am__v_CCLD_1 =
--SOURCES = $(charpick_applet2_SOURCES)
--DIST_SOURCES = $(charpick_applet2_SOURCES)
-+SOURCES = $(mate_charpick_applet2_SOURCES)
-+DIST_SOURCES = $(mate_charpick_applet2_SOURCES)
- RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
- ctags-recursive dvi-recursive html-recursive info-recursive \
- install-data-recursive install-dvi-recursive \
-@@ -488,11 +489,11 @@
- $(MATE_APPLETS4_CFLAGS) \
- $(GUCHARMAP_CFLAGS)
-
--charpick_applet2_SOURCES = charpick.c \
-+mate_charpick_applet2_SOURCES = charpick.c \
- charpick.h \
- properties.c
-
--charpick_applet2_LDADD = \
-+mate_charpick_applet2_LDADD = \
- $(MATE_APPLETS4_LIBS) \
- $(GUCHARMAP_LIBS)
-
-@@ -596,9 +597,9 @@
- echo " rm -f" $$list; \
- rm -f $$list
-
--charpick_applet2$(EXEEXT): $(charpick_applet2_OBJECTS) $(charpick_applet2_DEPENDENCIES) $(EXTRA_charpick_applet2_DEPENDENCIES)
-- @rm -f charpick_applet2$(EXEEXT)
-- $(AM_V_CCLD)$(LINK) $(charpick_applet2_OBJECTS) $(charpick_applet2_LDADD) $(LIBS)
-+mate-charpick_applet2$(EXEEXT): $(mate_charpick_applet2_OBJECTS) $(mate_charpick_applet2_DEPENDENCIES) $(EXTRA_mate_charpick_applet2_DEPENDENCIES)
-+ @rm -f mate-charpick_applet2$(EXEEXT)
-+ $(AM_V_CCLD)$(LINK) $(mate_charpick_applet2_OBJECTS) $(mate_charpick_applet2_LDADD) $(LIBS)
-
- mostlyclean-compile:
- -rm -f *.$(OBJEXT)
diff --git a/x11/mate-applets/files/patch-command_Makefile.in b/x11/mate-applets/files/patch-command_Makefile.in
index 5c1b6fa47c26..d3b2f156f439 100644
--- a/x11/mate-applets/files/patch-command_Makefile.in
+++ b/x11/mate-applets/files/patch-command_Makefile.in
@@ -1,5 +1,5 @@
---- command/Makefile.in.orig 2014-04-14 17:31:14.000000000 +0200
-+++ command/Makefile.in 2014-04-14 17:32:42.000000000 +0200
+--- command/Makefile.in.orig 2014-12-05 12:31:21.926018134 +0100
++++ command/Makefile.in 2014-12-05 12:31:38.632017015 +0100
@@ -78,7 +78,7 @@
POST_UNINSTALL = :
build_triplet = @build@
@@ -9,7 +9,7 @@
subdir = command
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/depcomp
-@@ -98,18 +98,19 @@
+@@ -98,19 +98,20 @@
am__installdirs = "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(appletsdir)" \
"$(DESTDIR)$(servicedir)"
PROGRAMS = $(libexec_PROGRAMS)
@@ -19,8 +19,9 @@
+ mate_command_applet-command.$(OBJEXT)
+mate_command_applet_OBJECTS = $(am_mate_command_applet_OBJECTS)
am__DEPENDENCIES_1 =
--command_applet_DEPENDENCIES = $(am__DEPENDENCIES_1)
-+mate_command_applet_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-command_applet_DEPENDENCIES = $(am__DEPENDENCIES_1) \
++mate_command_applet_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
@@ -35,7 +36,7 @@
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
am__v_P_0 = false
-@@ -144,8 +145,8 @@
+@@ -145,8 +146,8 @@
am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
am__v_CCLD_0 = @echo " CCLD " $@;
am__v_CCLD_1 =
@@ -46,22 +47,20 @@
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
-@@ -447,10 +448,10 @@
- -DMATELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+@@ -444,9 +445,9 @@
$(DISABLE_DEPRECATED_CFLAGS)
--APPLET_LOCATION = $(libexecdir)/command-applet
+ APPLET_LOCATION = $(libexecdir)/command-applet
-command_applet_SOURCES = command.c
--command_applet_LDADD = $(MATE_APPLETS4_LIBS)
+-command_applet_LDADD = $(MATE_APPLETS4_LIBS) $(MATEDESKTOP_LIBS)
-command_applet_CFLAGS = $(WARN_CFLAGS)
-+APPLET_LOCATION = $(libexecdir)/mate-command-applet
+mate_command_applet_SOURCES = command.c
-+mate_command_applet_LDADD = $(MATE_APPLETS4_LIBS)
++mate_command_applet_LDADD = $(MATE_APPLETS4_LIBS) $(MATEDESKTOP_LIBS)
+mate_command_applet_CFLAGS = $(WARN_CFLAGS)
appletsdir = $(datadir)/mate-panel/applets
applets_in_files = org.mate.applets.CommandApplet.mate-panel-applet.in
applets_DATA = $(applets_in_files:.mate-panel-applet.in=.mate-panel-applet)
-@@ -548,9 +549,9 @@
+@@ -544,9 +545,9 @@
echo " rm -f" $$list; \
rm -f $$list
@@ -74,7 +73,7 @@
mostlyclean-compile:
-rm -f *.$(OBJEXT)
-@@ -558,7 +559,7 @@
+@@ -554,7 +555,7 @@
distclean-compile:
-rm -f *.tab.c
@@ -83,7 +82,7 @@
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@@ -581,19 +582,19 @@
+@@ -577,19 +578,19 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
diff --git a/x11/mate-applets/files/patch-drivemount_Makefile.in b/x11/mate-applets/files/patch-drivemount_Makefile.in
deleted file mode 100644
index aadc895d35cc..000000000000
--- a/x11/mate-applets/files/patch-drivemount_Makefile.in
+++ /dev/null
@@ -1,68 +0,0 @@
---- drivemount/Makefile.in.orig 2014-04-12 15:38:12.000000000 +0200
-+++ drivemount/Makefile.in 2014-04-12 15:39:28.000000000 +0200
-@@ -78,7 +78,7 @@
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
--libexec_PROGRAMS = drivemount_applet2$(EXEEXT)
-+libexec_PROGRAMS = mate-drivemount_applet2$(EXEEXT)
- subdir = drivemount
- DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/depcomp AUTHORS
-@@ -98,11 +98,12 @@
- am__installdirs = "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(appletdir)" \
- "$(DESTDIR)$(servicedir)" "$(DESTDIR)$(uidir)"
- PROGRAMS = $(libexec_PROGRAMS)
--am_drivemount_applet2_OBJECTS = drivemount.$(OBJEXT) \
-+am_mate_drivemount_applet2_OBJECTS = drivemount.$(OBJEXT) \
- drive-list.$(OBJEXT) drive-button.$(OBJEXT)
--drivemount_applet2_OBJECTS = $(am_drivemount_applet2_OBJECTS)
-+mate_drivemount_applet2_OBJECTS = \
-+ $(am_mate_drivemount_applet2_OBJECTS)
- am__DEPENDENCIES_1 =
--drivemount_applet2_DEPENDENCIES = $(am__DEPENDENCIES_1)
-+mate_drivemount_applet2_DEPENDENCIES = $(am__DEPENDENCIES_1)
- AM_V_lt = $(am__v_lt_@AM_V@)
- am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
- am__v_lt_0 = --silent
-@@ -141,8 +142,8 @@
- am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
- am__v_CCLD_0 = @echo " CCLD " $@;
- am__v_CCLD_1 =
--SOURCES = $(drivemount_applet2_SOURCES)
--DIST_SOURCES = $(drivemount_applet2_SOURCES)
-+SOURCES = $(mate_drivemount_applet2_SOURCES)
-+DIST_SOURCES = $(mate_drivemount_applet2_SOURCES)
- RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
- ctags-recursive dvi-recursive html-recursive info-recursive \
- install-data-recursive install-dvi-recursive \
-@@ -487,14 +488,14 @@
- -DDRIVEMOUNT_MENU_UI_DIR=\""$(uidir)"\" \
- $(MATE_APPLETS4_CFLAGS)
-
--drivemount_applet2_SOURCES = \
-+mate_drivemount_applet2_SOURCES = \
- drivemount.c \
- drive-list.c \
- drive-list.h \
- drive-button.c \
- drive-button.h
-
--drivemount_applet2_LDADD = \
-+mate_drivemount_applet2_LDADD = \
- $(MATE_APPLETS4_LIBS)
-
- appletdir = $(datadir)/mate-panel/applets
-@@ -595,9 +596,9 @@
- echo " rm -f" $$list; \
- rm -f $$list
-
--drivemount_applet2$(EXEEXT): $(drivemount_applet2_OBJECTS) $(drivemount_applet2_DEPENDENCIES) $(EXTRA_drivemount_applet2_DEPENDENCIES)
-- @rm -f drivemount_applet2$(EXEEXT)
-- $(AM_V_CCLD)$(LINK) $(drivemount_applet2_OBJECTS) $(drivemount_applet2_LDADD) $(LIBS)
-+mate-drivemount_applet2$(EXEEXT): $(mate_drivemount_applet2_OBJECTS) $(mate_drivemount_applet2_DEPENDENCIES) $(EXTRA_mate_drivemount_applet2_DEPENDENCIES)
-+ @rm -f mate-drivemount_applet2$(EXEEXT)
-+ $(AM_V_CCLD)$(LINK) $(mate_drivemount_applet2_OBJECTS) $(mate_drivemount_applet2_LDADD) $(LIBS)
-
- mostlyclean-compile:
- -rm -f *.$(OBJEXT)
diff --git a/x11/mate-applets/files/patch-geyes_Makefile.in b/x11/mate-applets/files/patch-geyes_Makefile.in
deleted file mode 100644
index a96082322b12..000000000000
--- a/x11/mate-applets/files/patch-geyes_Makefile.in
+++ /dev/null
@@ -1,64 +0,0 @@
---- geyes/Makefile.in.orig 2014-04-12 15:38:22.000000000 +0200
-+++ geyes/Makefile.in 2014-04-12 15:39:29.000000000 +0200
-@@ -78,7 +78,7 @@
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
--libexec_PROGRAMS = geyes_applet2$(EXEEXT)
-+libexec_PROGRAMS = mate-geyes_applet2$(EXEEXT)
- subdir = geyes
- DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/depcomp AUTHORS NEWS README
-@@ -98,10 +98,10 @@
- am__installdirs = "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(appletdir)" \
- "$(DESTDIR)$(servicedir)" "$(DESTDIR)$(uidir)"
- PROGRAMS = $(libexec_PROGRAMS)
--am_geyes_applet2_OBJECTS = geyes.$(OBJEXT) themes.$(OBJEXT)
--geyes_applet2_OBJECTS = $(am_geyes_applet2_OBJECTS)
-+am_mate_geyes_applet2_OBJECTS = geyes.$(OBJEXT) themes.$(OBJEXT)
-+mate_geyes_applet2_OBJECTS = $(am_mate_geyes_applet2_OBJECTS)
- am__DEPENDENCIES_1 =
--geyes_applet2_DEPENDENCIES = $(am__DEPENDENCIES_1)
-+mate_geyes_applet2_DEPENDENCIES = $(am__DEPENDENCIES_1)
- AM_V_lt = $(am__v_lt_@AM_V@)
- am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
- am__v_lt_0 = --silent
-@@ -140,8 +140,8 @@
- am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
- am__v_CCLD_0 = @echo " CCLD " $@;
- am__v_CCLD_1 =
--SOURCES = $(geyes_applet2_SOURCES)
--DIST_SOURCES = $(geyes_applet2_SOURCES)
-+SOURCES = $(mate_geyes_applet2_SOURCES)
-+DIST_SOURCES = $(mate_geyes_applet2_SOURCES)
- RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
- ctags-recursive dvi-recursive html-recursive info-recursive \
- install-data-recursive install-dvi-recursive \
-@@ -488,12 +488,12 @@
- -DGEYES_THEMES_DIR=\""$(pkgdatadir)/geyes/"\" \
- -DGEYES_MENU_UI_DIR=\""$(uidir)"\"
-
--geyes_applet2_SOURCES = \
-+mate_geyes_applet2_SOURCES = \
- geyes.c \
- themes.c \
- geyes.h
-
--geyes_applet2_LDADD = \
-+mate_geyes_applet2_LDADD = \
- $(MATE_APPLETS4_LIBS) \
- -lm
-
-@@ -608,9 +608,9 @@
- echo " rm -f" $$list; \
- rm -f $$list
-
--geyes_applet2$(EXEEXT): $(geyes_applet2_OBJECTS) $(geyes_applet2_DEPENDENCIES) $(EXTRA_geyes_applet2_DEPENDENCIES)
-- @rm -f geyes_applet2$(EXEEXT)
-- $(AM_V_CCLD)$(LINK) $(geyes_applet2_OBJECTS) $(geyes_applet2_LDADD) $(LIBS)
-+mate-geyes_applet2$(EXEEXT): $(mate_geyes_applet2_OBJECTS) $(mate_geyes_applet2_DEPENDENCIES) $(EXTRA_mate_geyes_applet2_DEPENDENCIES)
-+ @rm -f mate-geyes_applet2$(EXEEXT)
-+ $(AM_V_CCLD)$(LINK) $(mate_geyes_applet2_OBJECTS) $(mate_geyes_applet2_LDADD) $(LIBS)
-
- mostlyclean-compile:
- -rm -f *.$(OBJEXT)
diff --git a/x11/mate-applets/files/patch-multiload_Makefile.in b/x11/mate-applets/files/patch-multiload_Makefile.in
deleted file mode 100644
index e6428d6c9787..000000000000
--- a/x11/mate-applets/files/patch-multiload_Makefile.in
+++ /dev/null
@@ -1,70 +0,0 @@
---- multiload/Makefile.in.orig 2014-04-12 15:38:40.000000000 +0200
-+++ multiload/Makefile.in 2014-04-12 15:39:29.000000000 +0200
-@@ -78,7 +78,7 @@
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
--libexec_PROGRAMS = multiload-applet-2$(EXEEXT)
-+libexec_PROGRAMS = mate-multiload-applet-2$(EXEEXT)
- subdir = multiload
- DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/depcomp AUTHORS
-@@ -98,12 +98,13 @@
- am__installdirs = "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(appletdir)" \
- "$(DESTDIR)$(servicedir)" "$(DESTDIR)$(uidir)"
- PROGRAMS = $(libexec_PROGRAMS)
--am_multiload_applet_2_OBJECTS = linux-proc.$(OBJEXT) \
-+am_mate_multiload_applet_2_OBJECTS = linux-proc.$(OBJEXT) \
- load-graph.$(OBJEXT) main.$(OBJEXT) properties.$(OBJEXT) \
- netspeed.$(OBJEXT) autoscaler.$(OBJEXT)
--multiload_applet_2_OBJECTS = $(am_multiload_applet_2_OBJECTS)
-+mate_multiload_applet_2_OBJECTS = \
-+ $(am_mate_multiload_applet_2_OBJECTS)
- am__DEPENDENCIES_1 =
--multiload_applet_2_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-+mate_multiload_applet_2_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1)
- AM_V_lt = $(am__v_lt_@AM_V@)
-@@ -144,8 +145,8 @@
- am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
- am__v_CCLD_0 = @echo " CCLD " $@;
- am__v_CCLD_1 =
--SOURCES = $(multiload_applet_2_SOURCES)
--DIST_SOURCES = $(multiload_applet_2_SOURCES)
-+SOURCES = $(mate_multiload_applet_2_SOURCES)
-+DIST_SOURCES = $(mate_multiload_applet_2_SOURCES)
- RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
- ctags-recursive dvi-recursive html-recursive info-recursive \
- install-data-recursive install-dvi-recursive \
-@@ -492,7 +493,7 @@
- $(MATEDESKTOP_CFLAGS) \
- $(GIO_CFLAGS)
-
--multiload_applet_2_SOURCES = \
-+mate_multiload_applet_2_SOURCES = \
- global.h \
- linux-proc.h \
- load-graph.h \
-@@ -504,7 +505,7 @@
- autoscaler.c \
- autoscaler.h
-
--multiload_applet_2_LDADD = \
-+mate_multiload_applet_2_LDADD = \
- $(MATE_APPLETS4_LIBS) \
- $(GTOP_APPLETS_LIBS) \
- $(MATEDESKTOP_LIBS) \
-@@ -611,9 +612,9 @@
- echo " rm -f" $$list; \
- rm -f $$list
-
--multiload-applet-2$(EXEEXT): $(multiload_applet_2_OBJECTS) $(multiload_applet_2_DEPENDENCIES) $(EXTRA_multiload_applet_2_DEPENDENCIES)
-- @rm -f multiload-applet-2$(EXEEXT)
-- $(AM_V_CCLD)$(LINK) $(multiload_applet_2_OBJECTS) $(multiload_applet_2_LDADD) $(LIBS)
-+mate-multiload-applet-2$(EXEEXT): $(mate_multiload_applet_2_OBJECTS) $(mate_multiload_applet_2_DEPENDENCIES) $(EXTRA_mate_multiload_applet_2_DEPENDENCIES)
-+ @rm -f mate-multiload-applet-2$(EXEEXT)
-+ $(AM_V_CCLD)$(LINK) $(mate_multiload_applet_2_OBJECTS) $(mate_multiload_applet_2_LDADD) $(LIBS)
-
- mostlyclean-compile:
- -rm -f *.$(OBJEXT)
diff --git a/x11/mate-applets/files/patch-stickynotes_Makefile.in b/x11/mate-applets/files/patch-stickynotes_Makefile.in
index e2195356ab7a..991c3a669738 100644
--- a/x11/mate-applets/files/patch-stickynotes_Makefile.in
+++ b/x11/mate-applets/files/patch-stickynotes_Makefile.in
@@ -1,12 +1,18 @@
---- stickynotes/Makefile.in.orig 2014-04-14 17:43:53.000000000 +0200
-+++ stickynotes/Makefile.in 2014-04-14 17:44:52.000000000 +0200
+--- stickynotes/Makefile.in.orig 2015-01-22 17:42:18.261799026 +0100
++++ stickynotes/Makefile.in 2015-01-22 17:42:56.807795784 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.14.1 from Makefile.am.
++# Makefile.in generated by automake 1.14 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -78,8 +78,7 @@
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-@BUILD_STICKYNOTES_APPLET_TRUE@libexec_PROGRAMS = \
-@BUILD_STICKYNOTES_APPLET_TRUE@ stickynotes_applet$(EXEEXT)
-+@BUILD_STICKYNOTES_APPLET_TRUE@libexec_PROGRAMS = mate-stickynotes_applet$(EXEEXT)
++@BUILD_STICKYNOTES_APPLET_TRUE@libexec_PROGRAMS = mate-stickynotes-applet$(EXEEXT)
subdir = stickynotes
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/depcomp README TODO
@@ -36,7 +42,7 @@
@BUILD_STICKYNOTES_APPLET_TRUE@ $(am__DEPENDENCIES_1) \
@BUILD_STICKYNOTES_APPLET_TRUE@ $(am__DEPENDENCIES_1) \
@BUILD_STICKYNOTES_APPLET_TRUE@ $(am__DEPENDENCIES_1) \
-@@ -156,8 +156,8 @@
+@@ -157,8 +157,8 @@
am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
am__v_CCLD_0 = @echo " CCLD " $@;
am__v_CCLD_1 =
@@ -47,7 +53,42 @@
RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
ctags-recursive dvi-recursive html-recursive info-recursive \
install-data-recursive install-dvi-recursive \
-@@ -512,7 +512,7 @@
+@@ -314,7 +314,6 @@
+ GUCHARMAP_LIBS = @GUCHARMAP_LIBS@
+ HAVE_LIBAPM = @HAVE_LIBAPM@
+ HAVE_XKB = @HAVE_XKB@
+-HELP_DIR = @HELP_DIR@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -330,7 +329,6 @@
+ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+-ITSTOOL = @ITSTOOL@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBCPUFREQ_LIBS = @LIBCPUFREQ_LIBS@
+@@ -409,18 +407,14 @@
+ UPOWER_LIBS = @UPOWER_LIBS@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+-WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ XMKMF = @XMKMF@
+ XML2_CFLAGS = @XML2_CFLAGS@
+ XML2_LIBS = @XML2_LIBS@
+-XMLLINT = @XMLLINT@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+-YELP_LC_DIST = @YELP_LC_DIST@
+-YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@
+ abs_builddir = @abs_builddir@
+ abs_srcdir = @abs_srcdir@
+ abs_top_builddir = @abs_top_builddir@
+@@ -501,7 +495,7 @@
@BUILD_STICKYNOTES_APPLET_TRUE@ -DSTICKYNOTES_MENU_UI_DIR=\""$(uidir)"\"\
@BUILD_STICKYNOTES_APPLET_TRUE@ -DSTICKYNOTES_ICONDIR=\"$(datadir)/pixmaps/mate-stickynotes/\"
@@ -56,7 +97,7 @@
@BUILD_STICKYNOTES_APPLET_TRUE@ util.h \
@BUILD_STICKYNOTES_APPLET_TRUE@ util.c \
@BUILD_STICKYNOTES_APPLET_TRUE@ stickynotes.h \
-@@ -524,7 +524,7 @@
+@@ -513,7 +507,7 @@
@BUILD_STICKYNOTES_APPLET_TRUE@ stickynotes_applet.c \
@BUILD_STICKYNOTES_APPLET_TRUE@ stickynotes_applet_callbacks.c
@@ -64,16 +105,16 @@
+@BUILD_STICKYNOTES_APPLET_TRUE@mate_stickynotes_applet_LDADD = \
@BUILD_STICKYNOTES_APPLET_TRUE@ $(STICKYNOTES_LIBS) \
@BUILD_STICKYNOTES_APPLET_TRUE@ $(MATE_APPLETS4_LIBS) \
- @BUILD_STICKYNOTES_APPLET_TRUE@ $(LIBWNCK_LIBS) \
-@@ -634,9 +634,9 @@
+ @BUILD_STICKYNOTES_APPLET_TRUE@ $(MATEDESKTOP_LIBS) \
+@@ -624,9 +618,9 @@
echo " rm -f" $$list; \
rm -f $$list
-stickynotes_applet$(EXEEXT): $(stickynotes_applet_OBJECTS) $(stickynotes_applet_DEPENDENCIES) $(EXTRA_stickynotes_applet_DEPENDENCIES)
- @rm -f stickynotes_applet$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(stickynotes_applet_OBJECTS) $(stickynotes_applet_LDADD) $(LIBS)
-+mate-stickynotes_applet$(EXEEXT): $(mate_stickynotes_applet_OBJECTS) $(mate_stickynotes_applet_DEPENDENCIES) $(EXTRA_mate_stickynotes_applet_DEPENDENCIES)
-+ @rm -f mate-stickynotes_applet$(EXEEXT)
++mate-stickynotes-applet$(EXEEXT): $(mate_stickynotes_applet_OBJECTS) $(mate_stickynotes_applet_DEPENDENCIES) $(EXTRA_mate_stickynotes_applet_DEPENDENCIES)
++ @rm -f mate-stickynotes-applet$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(mate_stickynotes_applet_OBJECTS) $(mate_stickynotes_applet_LDADD) $(LIBS)
mostlyclean-compile:
diff --git a/x11/mate-applets/files/patch-timer-applet_Makefile.in b/x11/mate-applets/files/patch-timerapplet_Makefile.in
index 1298c942c556..27f87afe7eda 100644
--- a/x11/mate-applets/files/patch-timer-applet_Makefile.in
+++ b/x11/mate-applets/files/patch-timerapplet_Makefile.in
@@ -1,5 +1,5 @@
---- timerapplet/Makefile.in.orig 2014-04-14 17:37:14.000000000 +0200
-+++ timerapplet/Makefile.in 2014-04-14 17:38:03.000000000 +0200
+--- timerapplet/Makefile.in.orig 2014-12-05 12:42:20.777973220 +0100
++++ timerapplet/Makefile.in 2014-12-05 12:42:53.159970630 +0100
@@ -78,7 +78,7 @@
POST_UNINSTALL = :
build_triplet = @build@
@@ -21,7 +21,7 @@
am__DEPENDENCIES_1 =
-timer_applet_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+mate_timer_applet_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
@@ -47,22 +47,20 @@
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
-@@ -448,10 +450,10 @@
- -DMATELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+@@ -444,9 +446,9 @@
$(DISABLE_DEPRECATED_CFLAGS)
--APPLET_LOCATION = $(libexecdir)/timer-applet
+ APPLET_LOCATION = $(libexecdir)/timer-applet
-timer_applet_SOURCES = timerapplet.c
--timer_applet_LDADD = $(MATE_APPLETS4_LIBS) $(LIBNOTIFY_LIBS)
+-timer_applet_LDADD = $(MATE_APPLETS4_LIBS) $(MATEDESKTOP_LIBS) $(LIBNOTIFY_LIBS)
-timer_applet_CFLAGS = $(WARN_CFLAGS)
-+APPLET_LOCATION = $(libexecdir)/mate-timer-applet
+mate_timer_applet_SOURCES = timerapplet.c
-+mate_timer_applet_LDADD = $(MATE_APPLETS4_LIBS) $(LIBNOTIFY_LIBS)
++mate_timer_applet_LDADD = $(MATE_APPLETS4_LIBS) $(MATEDESKTOP_LIBS) $(LIBNOTIFY_LIBS)
+mate_timer_applet_CFLAGS = $(WARN_CFLAGS)
appletsdir = $(datadir)/mate-panel/applets
applets_in_files = org.mate.applets.TimerApplet.mate-panel-applet.in
applets_DATA = $(applets_in_files:.mate-panel-applet.in=.mate-panel-applet)
-@@ -549,9 +551,9 @@
+@@ -544,9 +546,9 @@
echo " rm -f" $$list; \
rm -f $$list
@@ -75,7 +73,7 @@
mostlyclean-compile:
-rm -f *.$(OBJEXT)
-@@ -559,7 +561,7 @@
+@@ -554,7 +556,7 @@
distclean-compile:
-rm -f *.tab.c
@@ -84,7 +82,7 @@
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@@ -582,19 +584,19 @@
+@@ -577,19 +579,19 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
diff --git a/x11/mate-applets/files/patch-trashapplet_src_Makefile.in b/x11/mate-applets/files/patch-trashapplet_src_Makefile.in
index 11073ce3c880..95618f79c635 100644
--- a/x11/mate-applets/files/patch-trashapplet_src_Makefile.in
+++ b/x11/mate-applets/files/patch-trashapplet_src_Makefile.in
@@ -1,5 +1,11 @@
---- trashapplet/src/Makefile.in.orig 2014-04-12 15:39:01.000000000 +0200
-+++ trashapplet/src/Makefile.in 2014-04-12 15:39:30.000000000 +0200
+--- trashapplet/src/Makefile.in.orig 2015-01-22 17:36:57.524822808 +0100
++++ trashapplet/src/Makefile.in 2015-01-22 17:37:30.146818374 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.14.1 from Makefile.am.
++# Makefile.in generated by automake 1.14 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -77,7 +77,7 @@
POST_UNINSTALL = :
build_triplet = @build@
@@ -9,7 +15,7 @@
subdir = trashapplet/src
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/depcomp
-@@ -96,11 +96,12 @@
+@@ -96,12 +96,12 @@
CONFIG_CLEAN_VPATH_FILES =
am__installdirs = "$(DESTDIR)$(libexecdir)"
PROGRAMS = $(libexec_PROGRAMS)
@@ -20,13 +26,14 @@
+ trash-empty.$(OBJEXT) xstuff.$(OBJEXT)
+mate_trashapplet_OBJECTS = $(am_mate_trashapplet_OBJECTS)
am__DEPENDENCIES_1 =
--trashapplet_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+-trashapplet_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_1)
+mate_trashapplet_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-+ $(am__DEPENDENCIES_1)
++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
-@@ -139,8 +140,8 @@
+@@ -140,8 +140,8 @@
am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
am__v_CCLD_0 = @echo " CCLD " $@;
am__v_CCLD_1 =
@@ -37,9 +44,44 @@
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
-@@ -413,14 +414,14 @@
+@@ -226,7 +226,6 @@
+ GUCHARMAP_LIBS = @GUCHARMAP_LIBS@
+ HAVE_LIBAPM = @HAVE_LIBAPM@
+ HAVE_XKB = @HAVE_XKB@
+-HELP_DIR = @HELP_DIR@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -242,7 +241,6 @@
+ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+-ITSTOOL = @ITSTOOL@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBCPUFREQ_LIBS = @LIBCPUFREQ_LIBS@
+@@ -321,18 +319,14 @@
+ UPOWER_LIBS = @UPOWER_LIBS@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+-WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ XMKMF = @XMKMF@
+ XML2_CFLAGS = @XML2_CFLAGS@
+ XML2_LIBS = @XML2_LIBS@
+-XMLLINT = @XMLLINT@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+-YELP_LC_DIST = @YELP_LC_DIST@
+-YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@
+ abs_builddir = @abs_builddir@
+ abs_srcdir = @abs_srcdir@
+ abs_top_builddir = @abs_top_builddir@
+@@ -402,14 +396,14 @@
$(GIO_CFLAGS) \
- -DTRASH_MENU_UI_DIR=\""$(datadir)/mate-2.0/ui"\"
+ -DTRASH_MENU_UI_DIR=\""$(datadir)/mate/ui"\"
-trashapplet_SOURCES = \
+mate_trashapplet_SOURCES = \
@@ -52,9 +94,9 @@
-trashapplet_LDADD = \
+mate_trashapplet_LDADD = \
$(MATE_APPLETS4_LIBS) \
+ $(MATEDESKTOP_LIBS) \
$(GIO_LIBS) \
- -lX11
-@@ -509,9 +510,9 @@
+@@ -499,9 +493,9 @@
echo " rm -f" $$list; \
rm -f $$list
diff --git a/x11/mate-applets/files/stickynotes_Makefile.am b/x11/mate-applets/files/stickynotes_Makefile.am
new file mode 100644
index 000000000000..d86393547178
--- /dev/null
+++ b/x11/mate-applets/files/stickynotes_Makefile.am
@@ -0,0 +1,23 @@
+--- stickynotes/Makefile.am.orig 2014-12-05 12:40:40.520108172 +0100
++++ stickynotes/Makefile.am 2014-12-05 12:41:13.202979210 +0100
+@@ -20,9 +20,9 @@
+ -DSTICKYNOTES_MENU_UI_DIR=\""$(uidir)"\"\
+ -DSTICKYNOTES_ICONDIR=\"$(datadir)/pixmaps/mate-stickynotes/\"
+
+-libexec_PROGRAMS = stickynotes_applet
++libexec_PROGRAMS = mate-stickynotes-applet
+
+-stickynotes_applet_SOURCES = \
++mate_stickynotes_applet_SOURCES = \
+ util.h \
+ util.c \
+ stickynotes.h \
+@@ -34,7 +34,7 @@
+ stickynotes_applet.c \
+ stickynotes_applet_callbacks.c
+
+-stickynotes_applet_LDADD = \
++mate_stickynotes_applet_LDADD = \
+ $(STICKYNOTES_LIBS) \
+ $(MATE_APPLETS4_LIBS) \
+ $(MATEDESKTOP_LIBS) \
diff --git a/x11/mate-applets/files/timerapplet_Makefile.am b/x11/mate-applets/files/timerapplet_Makefile.am
new file mode 100644
index 000000000000..a246bd826282
--- /dev/null
+++ b/x11/mate-applets/files/timerapplet_Makefile.am
@@ -0,0 +1,17 @@
+--- timerapplet/Makefile.am.orig 2014-12-05 12:42:16.277972721 +0100
++++ timerapplet/Makefile.am 2014-12-05 12:42:39.149096790 +0100
+@@ -8,10 +8,10 @@
+
+ APPLET_LOCATION = $(libexecdir)/timer-applet
+
+-libexec_PROGRAMS = timer-applet
+-timer_applet_SOURCES = timerapplet.c
+-timer_applet_LDADD = $(MATE_APPLETS4_LIBS) $(MATEDESKTOP_LIBS) $(LIBNOTIFY_LIBS)
+-timer_applet_CFLAGS = $(WARN_CFLAGS)
++libexec_PROGRAMS = mate-timer-applet
++mate_timer_applet_SOURCES = timerapplet.c
++mate_timer_applet_LDADD = $(MATE_APPLETS4_LIBS) $(MATEDESKTOP_LIBS) $(LIBNOTIFY_LIBS)
++mate_timer_applet_CFLAGS = $(WARN_CFLAGS)
+
+ appletsdir = $(datadir)/mate-panel/applets
+ applets_in_files = org.mate.applets.TimerApplet.mate-panel-applet.in
diff --git a/x11/mate-applets/files/trashapplet_src_Makefile.am b/x11/mate-applets/files/trashapplet_src_Makefile.am
new file mode 100644
index 000000000000..7b139ddd448d
--- /dev/null
+++ b/x11/mate-applets/files/trashapplet_src_Makefile.am
@@ -0,0 +1,22 @@
+--- trashapplet/src/Makefile.am.orig 2014-12-05 12:54:23.744922552 +0100
++++ trashapplet/src/Makefile.am 2014-12-05 12:54:39.836133588 +0100
+@@ -4,16 +4,16 @@
+ $(GIO_CFLAGS) \
+ -DTRASH_MENU_UI_DIR=\""$(datadir)/mate/ui"\"
+
+-libexec_PROGRAMS = trashapplet
++libexec_PROGRAMS = mate-trashapplet
+
+-trashapplet_SOURCES = \
++mate_trashapplet_SOURCES = \
+ trashapplet.c \
+ trash-empty.h \
+ trash-empty.c \
+ xstuff.c \
+ xstuff.h
+
+-trashapplet_LDADD = \
++mate_trashapplet_LDADD = \
+ $(MATE_APPLETS4_LIBS) \
+ $(MATEDESKTOP_LIBS) \
+ $(GIO_LIBS) \
diff --git a/x11/mate-applets/pkg-plist b/x11/mate-applets/pkg-plist
index 2425982d5ee3..a282230be130 100644
--- a/x11/mate-applets/pkg-plist
+++ b/x11/mate-applets/pkg-plist
@@ -37,17 +37,24 @@ bin/mate-invest-chart
%%PYTHON_SITELIBDIR%%/mate_invest/widgets.pyo
libexec/mate-accessx-status-applet
%%BATTERY%%libexec/mate-battstat-applet-2
-libexec/mate-charpick_applet2
+libexec/mate-charpick-applet
libexec/mate-command-applet
-libexec/mate-drivemount_applet2
-libexec/mate-geyes_applet2
+libexec/mate-drivemount-applet
+libexec/mate-geyes-applet
libexec/mate-invest-applet
%%CPUFREQ%%libexec/mate-cpufreq-applet
-libexec/mateweather-applet-2
-libexec/mate-multiload-applet-2
-libexec/mate-stickynotes_applet
+libexec/mate-multiload-applet
+libexec/mate-stickynotes-applet
libexec/mate-timer-applet
libexec/mate-trashapplet
+libexec/mateweather-applet
+man/man1/mate-charpick-applet.1.gz
+man/man1/mate-cpufreq-selector.1.gz
+man/man1/mate-drivemount-applet.1.gz
+man/man1/mate-geyes-applet.1.gz
+man/man1/mate-invest-chart.1.gz
+man/man1/mate-multiload-applet.1.gz
+man/man1/mateweather.1.gz
share/MateConf/gsettings/stickynotes-applet.convert
share/dbus-1/services/org.mate.panel.applet.AccessxStatusAppletFactory.service
%%BATTERY%%share/dbus-1/services/org.mate.panel.applet.BattstatAppletFactory.service
@@ -100,13 +107,13 @@ share/help/C/mate-multiload/figures/system-monitor-applet_window.png
share/help/C/mate-multiload/figures/system_monitor.png
share/help/C/mate-multiload/index.docbook
share/help/C/mate-multiload/legal.xml
-share/help/C/mate-stickynotes_applet/figures/stickynote-right-menu-lock.png
-share/help/C/mate-stickynotes_applet/figures/stickynote-right-menu-new.png
-share/help/C/mate-stickynotes_applet/figures/stickynotes-note-prefs.png
-share/help/C/mate-stickynotes_applet/figures/stickynotes-prefs.png
-share/help/C/mate-stickynotes_applet/figures/stickynotes_applet.png
-share/help/C/mate-stickynotes_applet/index.docbook
-share/help/C/mate-stickynotes_applet/legal.xml
+share/help/C/mate-stickynotes-applet/figures/stickynote-right-menu-lock.png
+share/help/C/mate-stickynotes-applet/figures/stickynote-right-menu-new.png
+share/help/C/mate-stickynotes-applet/figures/stickynotes-note-prefs.png
+share/help/C/mate-stickynotes-applet/figures/stickynotes-prefs.png
+share/help/C/mate-stickynotes-applet/figures/stickynotes_applet.png
+share/help/C/mate-stickynotes-applet/index.docbook
+share/help/C/mate-stickynotes-applet/legal.xml
share/help/C/mate-trashapplet/figures/trash-applet.png
share/help/C/mate-trashapplet/index.docbook
share/help/C/mate-trashapplet/legal.xml
@@ -204,13 +211,13 @@ share/help/ca/mate-multiload/figures/system-monitor-applet_window.png
share/help/ca/mate-multiload/figures/system_monitor.png
share/help/ca/mate-multiload/index.docbook
share/help/ca/mate-multiload/legal.xml
-share/help/ca/mate-stickynotes_applet/figures/stickynote-right-menu-lock.png
-share/help/ca/mate-stickynotes_applet/figures/stickynote-right-menu-new.png
-share/help/ca/mate-stickynotes_applet/figures/stickynotes-note-prefs.png
-share/help/ca/mate-stickynotes_applet/figures/stickynotes-prefs.png
-share/help/ca/mate-stickynotes_applet/figures/stickynotes_applet.png
-share/help/ca/mate-stickynotes_applet/index.docbook
-share/help/ca/mate-stickynotes_applet/legal.xml
+share/help/ca/mate-stickynotes-applet/figures/stickynote-right-menu-lock.png
+share/help/ca/mate-stickynotes-applet/figures/stickynote-right-menu-new.png
+share/help/ca/mate-stickynotes-applet/figures/stickynotes-note-prefs.png
+share/help/ca/mate-stickynotes-applet/figures/stickynotes-prefs.png
+share/help/ca/mate-stickynotes-applet/figures/stickynotes_applet.png
+share/help/ca/mate-stickynotes-applet/index.docbook
+share/help/ca/mate-stickynotes-applet/legal.xml
share/help/ca/mate-trashapplet/figures/trash-applet.png
share/help/ca/mate-trashapplet/index.docbook
share/help/ca/mate-trashapplet/legal.xml
@@ -264,13 +271,13 @@ share/help/cs/mate-multiload/figures/system-monitor-applet_window.png
share/help/cs/mate-multiload/figures/system_monitor.png
share/help/cs/mate-multiload/index.docbook
share/help/cs/mate-multiload/legal.xml
-share/help/cs/mate-stickynotes_applet/figures/stickynote-right-menu-lock.png
-share/help/cs/mate-stickynotes_applet/figures/stickynote-right-menu-new.png
-share/help/cs/mate-stickynotes_applet/figures/stickynotes-note-prefs.png
-share/help/cs/mate-stickynotes_applet/figures/stickynotes-prefs.png
-share/help/cs/mate-stickynotes_applet/figures/stickynotes_applet.png
-share/help/cs/mate-stickynotes_applet/index.docbook
-share/help/cs/mate-stickynotes_applet/legal.xml
+share/help/cs/mate-stickynotes-applet/figures/stickynote-right-menu-lock.png
+share/help/cs/mate-stickynotes-applet/figures/stickynote-right-menu-new.png
+share/help/cs/mate-stickynotes-applet/figures/stickynotes-note-prefs.png
+share/help/cs/mate-stickynotes-applet/figures/stickynotes-prefs.png
+share/help/cs/mate-stickynotes-applet/figures/stickynotes_applet.png
+share/help/cs/mate-stickynotes-applet/index.docbook
+share/help/cs/mate-stickynotes-applet/legal.xml
share/help/cs/mate-trashapplet/figures/trash-applet.png
share/help/cs/mate-trashapplet/index.docbook
share/help/cs/mate-trashapplet/legal.xml
@@ -340,13 +347,13 @@ share/help/de/mate-multiload/figures/system-monitor-applet_window.png
share/help/de/mate-multiload/figures/system_monitor.png
share/help/de/mate-multiload/index.docbook
share/help/de/mate-multiload/legal.xml
-share/help/de/mate-stickynotes_applet/figures/stickynote-right-menu-lock.png
-share/help/de/mate-stickynotes_applet/figures/stickynote-right-menu-new.png
-share/help/de/mate-stickynotes_applet/figures/stickynotes-note-prefs.png
-share/help/de/mate-stickynotes_applet/figures/stickynotes-prefs.png
-share/help/de/mate-stickynotes_applet/figures/stickynotes_applet.png
-share/help/de/mate-stickynotes_applet/index.docbook
-share/help/de/mate-stickynotes_applet/legal.xml
+share/help/de/mate-stickynotes-applet/figures/stickynote-right-menu-lock.png
+share/help/de/mate-stickynotes-applet/figures/stickynote-right-menu-new.png
+share/help/de/mate-stickynotes-applet/figures/stickynotes-note-prefs.png
+share/help/de/mate-stickynotes-applet/figures/stickynotes-prefs.png
+share/help/de/mate-stickynotes-applet/figures/stickynotes_applet.png
+share/help/de/mate-stickynotes-applet/index.docbook
+share/help/de/mate-stickynotes-applet/legal.xml
share/help/de/mate-trashapplet/figures/trash-applet.png
share/help/de/mate-trashapplet/index.docbook
share/help/de/mate-trashapplet/legal.xml
@@ -403,13 +410,13 @@ share/help/el/mate-multiload/figures/system-monitor-applet_window.png
share/help/el/mate-multiload/figures/system_monitor.png
share/help/el/mate-multiload/index.docbook
share/help/el/mate-multiload/legal.xml
-share/help/el/mate-stickynotes_applet/figures/stickynote-right-menu-lock.png
-share/help/el/mate-stickynotes_applet/figures/stickynote-right-menu-new.png
-share/help/el/mate-stickynotes_applet/figures/stickynotes-note-prefs.png
-share/help/el/mate-stickynotes_applet/figures/stickynotes-prefs.png
-share/help/el/mate-stickynotes_applet/figures/stickynotes_applet.png
-share/help/el/mate-stickynotes_applet/index.docbook
-share/help/el/mate-stickynotes_applet/legal.xml
+share/help/el/mate-stickynotes-applet/figures/stickynote-right-menu-lock.png
+share/help/el/mate-stickynotes-applet/figures/stickynote-right-menu-new.png
+share/help/el/mate-stickynotes-applet/figures/stickynotes-note-prefs.png
+share/help/el/mate-stickynotes-applet/figures/stickynotes-prefs.png
+share/help/el/mate-stickynotes-applet/figures/stickynotes_applet.png
+share/help/el/mate-stickynotes-applet/index.docbook
+share/help/el/mate-stickynotes-applet/legal.xml
share/help/el/mate-trashapplet/figures/trash-applet.png
share/help/el/mate-trashapplet/index.docbook
share/help/el/mate-trashapplet/legal.xml
@@ -466,13 +473,13 @@ share/help/en_GB/mate-multiload/figures/system-monitor-applet_window.png
share/help/en_GB/mate-multiload/figures/system_monitor.png
share/help/en_GB/mate-multiload/index.docbook
share/help/en_GB/mate-multiload/legal.xml
-share/help/en_GB/mate-stickynotes_applet/figures/stickynote-right-menu-lock.png
-share/help/en_GB/mate-stickynotes_applet/figures/stickynote-right-menu-new.png
-share/help/en_GB/mate-stickynotes_applet/figures/stickynotes-note-prefs.png
-share/help/en_GB/mate-stickynotes_applet/figures/stickynotes-prefs.png
-share/help/en_GB/mate-stickynotes_applet/figures/stickynotes_applet.png
-share/help/en_GB/mate-stickynotes_applet/index.docbook
-share/help/en_GB/mate-stickynotes_applet/legal.xml
+share/help/en_GB/mate-stickynotes-applet/figures/stickynote-right-menu-lock.png
+share/help/en_GB/mate-stickynotes-applet/figures/stickynote-right-menu-new.png
+share/help/en_GB/mate-stickynotes-applet/figures/stickynotes-note-prefs.png
+share/help/en_GB/mate-stickynotes-applet/figures/stickynotes-prefs.png
+share/help/en_GB/mate-stickynotes-applet/figures/stickynotes_applet.png
+share/help/en_GB/mate-stickynotes-applet/index.docbook
+share/help/en_GB/mate-stickynotes-applet/legal.xml
share/help/en_GB/mate-trashapplet/figures/trash-applet.png
share/help/en_GB/mate-trashapplet/index.docbook
share/help/en_GB/mate-trashapplet/legal.xml
@@ -529,13 +536,13 @@ share/help/es/mate-multiload/figures/system-monitor-applet_window.png
share/help/es/mate-multiload/figures/system_monitor.png
share/help/es/mate-multiload/index.docbook
share/help/es/mate-multiload/legal.xml
-share/help/es/mate-stickynotes_applet/figures/stickynote-right-menu-lock.png
-share/help/es/mate-stickynotes_applet/figures/stickynote-right-menu-new.png
-share/help/es/mate-stickynotes_applet/figures/stickynotes-note-prefs.png
-share/help/es/mate-stickynotes_applet/figures/stickynotes-prefs.png
-share/help/es/mate-stickynotes_applet/figures/stickynotes_applet.png
-share/help/es/mate-stickynotes_applet/index.docbook
-share/help/es/mate-stickynotes_applet/legal.xml
+share/help/es/mate-stickynotes-applet/figures/stickynote-right-menu-lock.png
+share/help/es/mate-stickynotes-applet/figures/stickynote-right-menu-new.png
+share/help/es/mate-stickynotes-applet/figures/stickynotes-note-prefs.png
+share/help/es/mate-stickynotes-applet/figures/stickynotes-prefs.png
+share/help/es/mate-stickynotes-applet/figures/stickynotes_applet.png
+share/help/es/mate-stickynotes-applet/index.docbook
+share/help/es/mate-stickynotes-applet/legal.xml
share/help/es/mate-trashapplet/figures/trash-applet.png
share/help/es/mate-trashapplet/index.docbook
share/help/es/mate-trashapplet/legal.xml
@@ -589,13 +596,13 @@ share/help/eu/mate-multiload/figures/system-monitor-applet_window.png
share/help/eu/mate-multiload/figures/system_monitor.png
share/help/eu/mate-multiload/index.docbook
share/help/eu/mate-multiload/legal.xml
-share/help/eu/mate-stickynotes_applet/figures/stickynote-right-menu-lock.png
-share/help/eu/mate-stickynotes_applet/figures/stickynote-right-menu-new.png
-share/help/eu/mate-stickynotes_applet/figures/stickynotes-note-prefs.png
-share/help/eu/mate-stickynotes_applet/figures/stickynotes-prefs.png
-share/help/eu/mate-stickynotes_applet/figures/stickynotes_applet.png
-share/help/eu/mate-stickynotes_applet/index.docbook
-share/help/eu/mate-stickynotes_applet/legal.xml
+share/help/eu/mate-stickynotes-applet/figures/stickynote-right-menu-lock.png
+share/help/eu/mate-stickynotes-applet/figures/stickynote-right-menu-new.png
+share/help/eu/mate-stickynotes-applet/figures/stickynotes-note-prefs.png
+share/help/eu/mate-stickynotes-applet/figures/stickynotes-prefs.png
+share/help/eu/mate-stickynotes-applet/figures/stickynotes_applet.png
+share/help/eu/mate-stickynotes-applet/index.docbook
+share/help/eu/mate-stickynotes-applet/legal.xml
share/help/eu/mate-trashapplet/figures/trash-applet.png
share/help/eu/mate-trashapplet/index.docbook
share/help/eu/mate-trashapplet/legal.xml
@@ -652,13 +659,13 @@ share/help/fi/mate-multiload/figures/system-monitor-applet_window.png
share/help/fi/mate-multiload/figures/system_monitor.png
share/help/fi/mate-multiload/index.docbook
share/help/fi/mate-multiload/legal.xml
-share/help/fi/mate-stickynotes_applet/figures/stickynote-right-menu-lock.png
-share/help/fi/mate-stickynotes_applet/figures/stickynote-right-menu-new.png
-share/help/fi/mate-stickynotes_applet/figures/stickynotes-note-prefs.png
-share/help/fi/mate-stickynotes_applet/figures/stickynotes-prefs.png
-share/help/fi/mate-stickynotes_applet/figures/stickynotes_applet.png
-share/help/fi/mate-stickynotes_applet/index.docbook
-share/help/fi/mate-stickynotes_applet/legal.xml
+share/help/fi/mate-stickynotes-applet/figures/stickynote-right-menu-lock.png
+share/help/fi/mate-stickynotes-applet/figures/stickynote-right-menu-new.png
+share/help/fi/mate-stickynotes-applet/figures/stickynotes-note-prefs.png
+share/help/fi/mate-stickynotes-applet/figures/stickynotes-prefs.png
+share/help/fi/mate-stickynotes-applet/figures/stickynotes_applet.png
+share/help/fi/mate-stickynotes-applet/index.docbook
+share/help/fi/mate-stickynotes-applet/legal.xml
share/help/fi/mate-trashapplet/figures/trash-applet.png
share/help/fi/mate-trashapplet/index.docbook
share/help/fi/mate-trashapplet/legal.xml
@@ -712,13 +719,13 @@ share/help/fr/mate-multiload/figures/system-monitor-applet_window.png
share/help/fr/mate-multiload/figures/system_monitor.png
share/help/fr/mate-multiload/index.docbook
share/help/fr/mate-multiload/legal.xml
-share/help/fr/mate-stickynotes_applet/figures/stickynote-right-menu-lock.png
-share/help/fr/mate-stickynotes_applet/figures/stickynote-right-menu-new.png
-share/help/fr/mate-stickynotes_applet/figures/stickynotes-note-prefs.png
-share/help/fr/mate-stickynotes_applet/figures/stickynotes-prefs.png
-share/help/fr/mate-stickynotes_applet/figures/stickynotes_applet.png
-share/help/fr/mate-stickynotes_applet/index.docbook
-share/help/fr/mate-stickynotes_applet/legal.xml
+share/help/fr/mate-stickynotes-applet/figures/stickynote-right-menu-lock.png
+share/help/fr/mate-stickynotes-applet/figures/stickynote-right-menu-new.png
+share/help/fr/mate-stickynotes-applet/figures/stickynotes-note-prefs.png
+share/help/fr/mate-stickynotes-applet/figures/stickynotes-prefs.png
+share/help/fr/mate-stickynotes-applet/figures/stickynotes_applet.png
+share/help/fr/mate-stickynotes-applet/index.docbook
+share/help/fr/mate-stickynotes-applet/legal.xml
share/help/fr/mate-trashapplet/figures/trash-applet.png
share/help/fr/mate-trashapplet/index.docbook
share/help/fr/mate-trashapplet/legal.xml
@@ -820,13 +827,13 @@ share/help/ko/mate-multiload/figures/system-monitor-applet_window.png
share/help/ko/mate-multiload/figures/system_monitor.png
share/help/ko/mate-multiload/index.docbook
share/help/ko/mate-multiload/legal.xml
-share/help/ko/mate-stickynotes_applet/figures/stickynote-right-menu-lock.png
-share/help/ko/mate-stickynotes_applet/figures/stickynote-right-menu-new.png
-share/help/ko/mate-stickynotes_applet/figures/stickynotes-note-prefs.png
-share/help/ko/mate-stickynotes_applet/figures/stickynotes-prefs.png
-share/help/ko/mate-stickynotes_applet/figures/stickynotes_applet.png
-share/help/ko/mate-stickynotes_applet/index.docbook
-share/help/ko/mate-stickynotes_applet/legal.xml
+share/help/ko/mate-stickynotes-applet/figures/stickynote-right-menu-lock.png
+share/help/ko/mate-stickynotes-applet/figures/stickynote-right-menu-new.png
+share/help/ko/mate-stickynotes-applet/figures/stickynotes-note-prefs.png
+share/help/ko/mate-stickynotes-applet/figures/stickynotes-prefs.png
+share/help/ko/mate-stickynotes-applet/figures/stickynotes_applet.png
+share/help/ko/mate-stickynotes-applet/index.docbook
+share/help/ko/mate-stickynotes-applet/legal.xml
share/help/ko/mateweather/figures/mateweather-details.png
share/help/ko/mateweather/figures/mateweather-menu-prefs.png
share/help/ko/mateweather/figures/mateweather-prefs-general.png
@@ -915,13 +922,13 @@ share/help/oc/mate-multiload/figures/system-monitor-applet_window.png
share/help/oc/mate-multiload/figures/system_monitor.png
share/help/oc/mate-multiload/index.docbook
share/help/oc/mate-multiload/legal.xml
-share/help/oc/mate-stickynotes_applet/figures/stickynote-right-menu-lock.png
-share/help/oc/mate-stickynotes_applet/figures/stickynote-right-menu-new.png
-share/help/oc/mate-stickynotes_applet/figures/stickynotes-note-prefs.png
-share/help/oc/mate-stickynotes_applet/figures/stickynotes-prefs.png
-share/help/oc/mate-stickynotes_applet/figures/stickynotes_applet.png
-share/help/oc/mate-stickynotes_applet/index.docbook
-share/help/oc/mate-stickynotes_applet/legal.xml
+share/help/oc/mate-stickynotes-applet/figures/stickynote-right-menu-lock.png
+share/help/oc/mate-stickynotes-applet/figures/stickynote-right-menu-new.png
+share/help/oc/mate-stickynotes-applet/figures/stickynotes-note-prefs.png
+share/help/oc/mate-stickynotes-applet/figures/stickynotes-prefs.png
+share/help/oc/mate-stickynotes-applet/figures/stickynotes_applet.png
+share/help/oc/mate-stickynotes-applet/index.docbook
+share/help/oc/mate-stickynotes-applet/legal.xml
share/help/oc/mate-trashapplet/figures/trash-applet.png
share/help/oc/mate-trashapplet/index.docbook
share/help/oc/mate-trashapplet/legal.xml
@@ -953,13 +960,13 @@ share/help/pa/mate-multiload/figures/system-monitor-applet_window.png
share/help/pa/mate-multiload/figures/system_monitor.png
share/help/pa/mate-multiload/index.docbook
share/help/pa/mate-multiload/legal.xml
-share/help/pa/mate-stickynotes_applet/figures/stickynote-right-menu-lock.png
-share/help/pa/mate-stickynotes_applet/figures/stickynote-right-menu-new.png
-share/help/pa/mate-stickynotes_applet/figures/stickynotes-note-prefs.png
-share/help/pa/mate-stickynotes_applet/figures/stickynotes-prefs.png
-share/help/pa/mate-stickynotes_applet/figures/stickynotes_applet.png
-share/help/pa/mate-stickynotes_applet/index.docbook
-share/help/pa/mate-stickynotes_applet/legal.xml
+share/help/pa/mate-stickynotes-applet/figures/stickynote-right-menu-lock.png
+share/help/pa/mate-stickynotes-applet/figures/stickynote-right-menu-new.png
+share/help/pa/mate-stickynotes-applet/figures/stickynotes-note-prefs.png
+share/help/pa/mate-stickynotes-applet/figures/stickynotes-prefs.png
+share/help/pa/mate-stickynotes-applet/figures/stickynotes_applet.png
+share/help/pa/mate-stickynotes-applet/index.docbook
+share/help/pa/mate-stickynotes-applet/legal.xml
share/help/pa/mate-trashapplet/figures/trash-applet.png
share/help/pa/mate-trashapplet/index.docbook
share/help/pa/mate-trashapplet/legal.xml
@@ -990,13 +997,13 @@ share/help/pt_BR/mate-multiload/figures/system-monitor-applet_window.png
share/help/pt_BR/mate-multiload/figures/system_monitor.png
share/help/pt_BR/mate-multiload/index.docbook
share/help/pt_BR/mate-multiload/legal.xml
-share/help/pt_BR/mate-stickynotes_applet/figures/stickynote-right-menu-lock.png
-share/help/pt_BR/mate-stickynotes_applet/figures/stickynote-right-menu-new.png
-share/help/pt_BR/mate-stickynotes_applet/figures/stickynotes-note-prefs.png
-share/help/pt_BR/mate-stickynotes_applet/figures/stickynotes-prefs.png
-share/help/pt_BR/mate-stickynotes_applet/figures/stickynotes_applet.png
-share/help/pt_BR/mate-stickynotes_applet/index.docbook
-share/help/pt_BR/mate-stickynotes_applet/legal.xml
+share/help/pt_BR/mate-stickynotes-applet/figures/stickynote-right-menu-lock.png
+share/help/pt_BR/mate-stickynotes-applet/figures/stickynote-right-menu-new.png
+share/help/pt_BR/mate-stickynotes-applet/figures/stickynotes-note-prefs.png
+share/help/pt_BR/mate-stickynotes-applet/figures/stickynotes-prefs.png
+share/help/pt_BR/mate-stickynotes-applet/figures/stickynotes_applet.png
+share/help/pt_BR/mate-stickynotes-applet/index.docbook
+share/help/pt_BR/mate-stickynotes-applet/legal.xml
share/help/pt_BR/mate-trashapplet/figures/trash-applet.png
share/help/pt_BR/mate-trashapplet/index.docbook
share/help/pt_BR/mate-trashapplet/legal.xml
@@ -1040,13 +1047,13 @@ share/help/ru/mate-multiload/figures/system-monitor-applet_window.png
share/help/ru/mate-multiload/figures/system_monitor.png
share/help/ru/mate-multiload/index.docbook
share/help/ru/mate-multiload/legal.xml
-share/help/ru/mate-stickynotes_applet/figures/stickynote-right-menu-lock.png
-share/help/ru/mate-stickynotes_applet/figures/stickynote-right-menu-new.png
-share/help/ru/mate-stickynotes_applet/figures/stickynotes-note-prefs.png
-share/help/ru/mate-stickynotes_applet/figures/stickynotes-prefs.png
-share/help/ru/mate-stickynotes_applet/figures/stickynotes_applet.png
-share/help/ru/mate-stickynotes_applet/index.docbook
-share/help/ru/mate-stickynotes_applet/legal.xml
+share/help/ru/mate-stickynotes-applet/figures/stickynote-right-menu-lock.png
+share/help/ru/mate-stickynotes-applet/figures/stickynote-right-menu-new.png
+share/help/ru/mate-stickynotes-applet/figures/stickynotes-note-prefs.png
+share/help/ru/mate-stickynotes-applet/figures/stickynotes-prefs.png
+share/help/ru/mate-stickynotes-applet/figures/stickynotes_applet.png
+share/help/ru/mate-stickynotes-applet/index.docbook
+share/help/ru/mate-stickynotes-applet/legal.xml
share/help/ru/mate-trashapplet/figures/trash-applet.png
share/help/ru/mate-trashapplet/index.docbook
share/help/ru/mate-trashapplet/legal.xml
@@ -1103,13 +1110,13 @@ share/help/sv/mate-multiload/figures/system-monitor-applet_window.png
share/help/sv/mate-multiload/figures/system_monitor.png
share/help/sv/mate-multiload/index.docbook
share/help/sv/mate-multiload/legal.xml
-share/help/sv/mate-stickynotes_applet/figures/stickynote-right-menu-lock.png
-share/help/sv/mate-stickynotes_applet/figures/stickynote-right-menu-new.png
-share/help/sv/mate-stickynotes_applet/figures/stickynotes-note-prefs.png
-share/help/sv/mate-stickynotes_applet/figures/stickynotes-prefs.png
-share/help/sv/mate-stickynotes_applet/figures/stickynotes_applet.png
-share/help/sv/mate-stickynotes_applet/index.docbook
-share/help/sv/mate-stickynotes_applet/legal.xml
+share/help/sv/mate-stickynotes-applet/figures/stickynote-right-menu-lock.png
+share/help/sv/mate-stickynotes-applet/figures/stickynote-right-menu-new.png
+share/help/sv/mate-stickynotes-applet/figures/stickynotes-note-prefs.png
+share/help/sv/mate-stickynotes-applet/figures/stickynotes-prefs.png
+share/help/sv/mate-stickynotes-applet/figures/stickynotes_applet.png
+share/help/sv/mate-stickynotes-applet/index.docbook
+share/help/sv/mate-stickynotes-applet/legal.xml
share/help/sv/mate-trashapplet/figures/trash-applet.png
share/help/sv/mate-trashapplet/index.docbook
share/help/sv/mate-trashapplet/legal.xml
@@ -1163,13 +1170,13 @@ share/help/uk/mate-multiload/figures/system-monitor-applet_window.png
share/help/uk/mate-multiload/figures/system_monitor.png
share/help/uk/mate-multiload/index.docbook
share/help/uk/mate-multiload/legal.xml
-share/help/uk/mate-stickynotes_applet/figures/stickynote-right-menu-lock.png
-share/help/uk/mate-stickynotes_applet/figures/stickynote-right-menu-new.png
-share/help/uk/mate-stickynotes_applet/figures/stickynotes-note-prefs.png
-share/help/uk/mate-stickynotes_applet/figures/stickynotes-prefs.png
-share/help/uk/mate-stickynotes_applet/figures/stickynotes_applet.png
-share/help/uk/mate-stickynotes_applet/index.docbook
-share/help/uk/mate-stickynotes_applet/legal.xml
+share/help/uk/mate-stickynotes-applet/figures/stickynote-right-menu-lock.png
+share/help/uk/mate-stickynotes-applet/figures/stickynote-right-menu-new.png
+share/help/uk/mate-stickynotes-applet/figures/stickynotes-note-prefs.png
+share/help/uk/mate-stickynotes-applet/figures/stickynotes-prefs.png
+share/help/uk/mate-stickynotes-applet/figures/stickynotes_applet.png
+share/help/uk/mate-stickynotes-applet/index.docbook
+share/help/uk/mate-stickynotes-applet/legal.xml
share/help/uk/mate-trashapplet/figures/trash-applet.png
share/help/uk/mate-trashapplet/index.docbook
share/help/uk/mate-trashapplet/legal.xml
@@ -1226,13 +1233,13 @@ share/help/zh_CN/mate-multiload/figures/system-monitor-applet_window.png
share/help/zh_CN/mate-multiload/figures/system_monitor.png
share/help/zh_CN/mate-multiload/index.docbook
share/help/zh_CN/mate-multiload/legal.xml
-share/help/zh_CN/mate-stickynotes_applet/figures/stickynote-right-menu-lock.png
-share/help/zh_CN/mate-stickynotes_applet/figures/stickynote-right-menu-new.png
-share/help/zh_CN/mate-stickynotes_applet/figures/stickynotes-note-prefs.png
-share/help/zh_CN/mate-stickynotes_applet/figures/stickynotes-prefs.png
-share/help/zh_CN/mate-stickynotes_applet/figures/stickynotes_applet.png
-share/help/zh_CN/mate-stickynotes_applet/index.docbook
-share/help/zh_CN/mate-stickynotes_applet/legal.xml
+share/help/zh_CN/mate-stickynotes-applet/figures/stickynote-right-menu-lock.png
+share/help/zh_CN/mate-stickynotes-applet/figures/stickynote-right-menu-new.png
+share/help/zh_CN/mate-stickynotes-applet/figures/stickynotes-note-prefs.png
+share/help/zh_CN/mate-stickynotes-applet/figures/stickynotes-prefs.png
+share/help/zh_CN/mate-stickynotes-applet/figures/stickynotes_applet.png
+share/help/zh_CN/mate-stickynotes-applet/index.docbook
+share/help/zh_CN/mate-stickynotes-applet/legal.xml
share/help/zh_CN/mate-trashapplet/figures/trash-applet.png
share/help/zh_CN/mate-trashapplet/index.docbook
share/help/zh_CN/mate-trashapplet/legal.xml
@@ -1255,26 +1262,26 @@ share/help/zh_CN/mateweather/legal.xml
share/help/zh_HK/mate-geyes/figures/geyes_applet.png
share/help/zh_HK/mate-geyes/index.docbook
share/help/zh_HK/mate-geyes/legal.xml
-share/help/zh_HK/mate-stickynotes_applet/figures/stickynote-right-menu-lock.png
-share/help/zh_HK/mate-stickynotes_applet/figures/stickynote-right-menu-new.png
-share/help/zh_HK/mate-stickynotes_applet/figures/stickynotes-note-prefs.png
-share/help/zh_HK/mate-stickynotes_applet/figures/stickynotes-prefs.png
-share/help/zh_HK/mate-stickynotes_applet/figures/stickynotes_applet.png
-share/help/zh_HK/mate-stickynotes_applet/index.docbook
-share/help/zh_HK/mate-stickynotes_applet/legal.xml
+share/help/zh_HK/mate-stickynotes-applet/figures/stickynote-right-menu-lock.png
+share/help/zh_HK/mate-stickynotes-applet/figures/stickynote-right-menu-new.png
+share/help/zh_HK/mate-stickynotes-applet/figures/stickynotes-note-prefs.png
+share/help/zh_HK/mate-stickynotes-applet/figures/stickynotes-prefs.png
+share/help/zh_HK/mate-stickynotes-applet/figures/stickynotes_applet.png
+share/help/zh_HK/mate-stickynotes-applet/index.docbook
+share/help/zh_HK/mate-stickynotes-applet/legal.xml
share/help/zh_HK/mate-trashapplet/figures/trash-applet.png
share/help/zh_HK/mate-trashapplet/index.docbook
share/help/zh_HK/mate-trashapplet/legal.xml
share/help/zh_TW/mate-geyes/figures/geyes_applet.png
share/help/zh_TW/mate-geyes/index.docbook
share/help/zh_TW/mate-geyes/legal.xml
-share/help/zh_TW/mate-stickynotes_applet/figures/stickynote-right-menu-lock.png
-share/help/zh_TW/mate-stickynotes_applet/figures/stickynote-right-menu-new.png
-share/help/zh_TW/mate-stickynotes_applet/figures/stickynotes-note-prefs.png
-share/help/zh_TW/mate-stickynotes_applet/figures/stickynotes-prefs.png
-share/help/zh_TW/mate-stickynotes_applet/figures/stickynotes_applet.png
-share/help/zh_TW/mate-stickynotes_applet/index.docbook
-share/help/zh_TW/mate-stickynotes_applet/legal.xml
+share/help/zh_TW/mate-stickynotes-applet/figures/stickynote-right-menu-lock.png
+share/help/zh_TW/mate-stickynotes-applet/figures/stickynote-right-menu-new.png
+share/help/zh_TW/mate-stickynotes-applet/figures/stickynotes-note-prefs.png
+share/help/zh_TW/mate-stickynotes-applet/figures/stickynotes-prefs.png
+share/help/zh_TW/mate-stickynotes-applet/figures/stickynotes_applet.png
+share/help/zh_TW/mate-stickynotes-applet/index.docbook
+share/help/zh_TW/mate-stickynotes-applet/legal.xml
share/help/zh_TW/mate-trashapplet/figures/trash-applet.png
share/help/zh_TW/mate-trashapplet/index.docbook
share/help/zh_TW/mate-trashapplet/legal.xml
@@ -1410,16 +1417,16 @@ share/locale/xh/LC_MESSAGES/mate-applets.mo
share/locale/zh_CN/LC_MESSAGES/mate-applets.mo
share/locale/zh_HK/LC_MESSAGES/mate-applets.mo
share/locale/zh_TW/LC_MESSAGES/mate-applets.mo
-share/mate-2.0/ui/accessx-status-applet-menu.xml
-%%BATTERY%%share/mate-2.0/ui/battstat-applet-menu.xml
-share/mate-2.0/ui/charpick-applet-menu.xml
-%%CPUFREQ%%share/mate-2.0/ui/cpufreq-applet-menu.xml
-share/mate-2.0/ui/drivemount-applet-menu.xml
-share/mate-2.0/ui/geyes-applet-menu.xml
-share/mate-2.0/ui/mateweather-applet-menu.xml
-share/mate-2.0/ui/multiload-applet-menu.xml
-share/mate-2.0/ui/stickynotes-applet-menu.xml
-share/mate-2.0/ui/trashapplet-menu.xml
+share/mate/ui/accessx-status-applet-menu.xml
+%%BATTERY%%share/mate/ui/battstat-applet-menu.xml
+share/mate/ui/charpick-applet-menu.xml
+%%CPUFREQ%%share/mate/ui/cpufreq-applet-menu.xml
+share/mate/ui/drivemount-applet-menu.xml
+share/mate/ui/geyes-applet-menu.xml
+share/mate/ui/mateweather-applet-menu.xml
+share/mate/ui/multiload-applet-menu.xml
+share/mate/ui/stickynotes-applet-menu.xml
+share/mate/ui/trashapplet-menu.xml
%%DATADIR%%/Invest_Applet.xml
%%BATTERY%%%%DATADIR%%/builder/battstat_applet.ui
%%CPUFREQ%%%%DATADIR%%/builder/cpufreq-preferences.ui
diff --git a/x11/mate-base/Makefile b/x11/mate-base/Makefile
index 4ef0b114c956..3544be947b9f 100644
--- a/x11/mate-base/Makefile
+++ b/x11/mate-base/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mate-base
-PORTVERSION= 1.8.1
+PORTVERSION= 1.10.0
CATEGORIES= x11 mate
MAINTAINER= gnome@FreeBSD.org
@@ -17,7 +17,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/fonts/dejavu/DejaVuSerif.ttf:${PORTSDIR}/x11-fon
mate-themes>=1.8.0:${PORTSDIR}/x11-themes/mate-themes \
mate-icon-theme-faenza>=1.8.0:${PORTSDIR}/x11-themes/mate-icon-theme-faenza
-USE_MATE= caja:run controlcenter:run dialogs:run icontheme:run \
+USE_MATE= caja:run controlcenter:run icontheme:run \
marco:run notificationdaemon:run panel:run \
polkit:run
diff --git a/x11/mate-desktop/Makefile b/x11/mate-desktop/Makefile
index f76ae883fcc7..2de8021c020b 100644
--- a/x11/mate-desktop/Makefile
+++ b/x11/mate-desktop/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= mate-desktop
-PORTVERSION= 1.8.1
-PORTREVISION= 1
+PORTVERSION= 1.10.1
CATEGORIES= x11 mate
MASTER_SITES= MATE
DIST_SUBDIR= mate
@@ -17,16 +16,16 @@ LIB_DEPENDS= libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification
PORTSCOUT= limitw:1,even
USES= bison gettext gmake libtool pathfix pkgconfig \
- python tar:xz
+ python shebangfix tar:xz
USE_XORG= x11 xrandr
-USE_GNOME= dconf gdkpixbuf2 gtk20 intlhack
+USE_GNOME= dconf gdkpixbuf2 gtk20 intlhack introspection:build
+SHEBANG_FILES= tools/mpaste
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-gtk=2.0 \
--disable-gtk-doc \
- --with-html-dir=${PREFIX}/share/doc \
--disable-user-guide \
- --disable-desktop-docs
+ --with-html-dir=${PREFIX}/share/doc
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
INSTALL_TARGET= install-strip
@@ -47,6 +46,13 @@ GLIB_SCHEMAS= org.mate.accessibility-keyboard.gschema.xml \
org.mate.sound.gschema.xml \
org.mate.thumbnail-cache.gschema.xml \
org.mate.thumbnailers.gschema.xml \
- org.mate.typing-break.gschema.xml
+ org.mate.typing-break.gschema.xml \
+ org.mate.debug.gschema.xml
+
+OPTIONS_SUB= yes
+OPTIONS_DEFINE= PASTE
+OPTIONS_DEFAULT= PASTE
+PASTE_CONFIGURE_ENABLE= mpaste
+PASTE_DESC= Build the mate paste tool
.include <bsd.port.mk>
diff --git a/x11/mate-desktop/distinfo b/x11/mate-desktop/distinfo
index 56e10f8a5fee..1969f35cfb0f 100644
--- a/x11/mate-desktop/distinfo
+++ b/x11/mate-desktop/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mate/mate-desktop-1.8.1.tar.xz) = a4e1316f9468150e30495b54024fbc9f98e12cc7f9750d972f5457f13ca908f3
-SIZE (mate/mate-desktop-1.8.1.tar.xz) = 8027312
+SHA256 (mate/mate-desktop-1.10.1.tar.xz) = 42d8c088a0313884235bbd8901a40b45614cf60c275841397bcc47a5d7fa48c7
+SIZE (mate/mate-desktop-1.10.1.tar.xz) = 9095172
diff --git a/x11/mate-desktop/pkg-plist b/x11/mate-desktop/pkg-plist
index 2b83c334905a..81822f96055d 100644
--- a/x11/mate-desktop/pkg-plist
+++ b/x11/mate-desktop/pkg-plist
@@ -1,7 +1,12 @@
bin/mate-about
-bin/mate-gsettings-toggle
+bin/mate-color-select
+%%PASTE%%bin/mpaste
+include/mate-desktop-2.0/libmate-desktop/mate-aboutdialog.h
include/mate-desktop-2.0/libmate-desktop/mate-bg-crossfade.h
include/mate-desktop-2.0/libmate-desktop/mate-bg.h
+include/mate-desktop-2.0/libmate-desktop/mate-colorbutton.h
+include/mate-desktop-2.0/libmate-desktop/mate-colorsel.h
+include/mate-desktop-2.0/libmate-desktop/mate-colorseldialog.h
include/mate-desktop-2.0/libmate-desktop/mate-dconf.h
include/mate-desktop-2.0/libmate-desktop/mate-desktop-item.h
include/mate-desktop-2.0/libmate-desktop/mate-desktop-thumbnail.h
@@ -11,15 +16,18 @@ include/mate-desktop-2.0/libmate-desktop/mate-gsettings.h
include/mate-desktop-2.0/libmate-desktop/mate-rr-config.h
include/mate-desktop-2.0/libmate-desktop/mate-rr-labeler.h
include/mate-desktop-2.0/libmate-desktop/mate-rr.h
+lib/girepository-1.0/MateDesktop-2.0.typelib
lib/libmate-desktop-2.a
lib/libmate-desktop-2.so
lib/libmate-desktop-2.so.17
lib/libmate-desktop-2.so.17.1.4
libdata/pkgconfig/mate-desktop-2.0.pc
man/man1/mate-about.1.gz
-man/man1/mate-gsettings-toggle.1.gz
+man/man1/mate-color-select.1.gz
+man/man1/mpaste.1.gz
share/MateConf/gsettings/mate-desktop.convert
share/applications/mate-about.desktop
+share/applications/mate-color-select.desktop
%%DOCSDIR%%/MateBG.html
%%DOCSDIR%%/MateDesktopItem.html
%%DOCSDIR%%/MateDesktopThumbnailFactory.html
@@ -47,6 +55,7 @@ share/applications/mate-about.desktop
%%DOCSDIR%%/thumbnail.html
%%DOCSDIR%%/up-insensitive.png
%%DOCSDIR%%/up.png
+share/gir-1.0/MateDesktop-2.0.gir
share/libmate-desktop/pnp.ids
share/locale/af/LC_MESSAGES/mate-desktop.mo
share/locale/am/LC_MESSAGES/mate-desktop.mo
diff --git a/x11/mate-dialogs/Makefile b/x11/mate-dialogs/Makefile
deleted file mode 100644
index 17badd6c6cab..000000000000
--- a/x11/mate-dialogs/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# Created by: Franz Klammer <klammer@webonaut.com>
-# $FreeBSD$
-
-PORTNAME= mate-dialogs
-PORTVERSION= 1.8.0
-PORTREVISION= 1
-CATEGORIES= x11 mate
-MASTER_SITES= MATE
-DIST_SUBDIR= mate
-
-MAINTAINER= gnome@FreeBSD.org
-COMMENT= Display MATE dialogs from the command line
-
-BUILD_DEPENDS= itstool:${PORTSDIR}/textproc/itstool
-
-PORTSCOUT= limitw:1,even
-
-USES= gettext gmake pkgconfig tar:xz
-USE_GNOME= gtk20
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-gtk=2.0
-CPPFLAGS+= -I${LOCALBASE}/include
-LIBS+= -L${LOCALBASE}/lib
-
-OPTIONS_DEFINE= NOTIFY
-OPTIONS_DEFAULT=NOTIFY
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNOTIFY}
-LIB_DEPENDS+= libnotify.so:${PORTSDIR}/devel/libnotify
-CONFIGURE_ARGS+=--enable-libnotify
-.else
-CONFIGURE_ARGS+=--disable-libnotify
-.endif
-
-.include <bsd.port.mk>
diff --git a/x11/mate-dialogs/distinfo b/x11/mate-dialogs/distinfo
deleted file mode 100644
index 4ea7142384e3..000000000000
--- a/x11/mate-dialogs/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (mate/mate-dialogs-1.8.0.tar.xz) = 1db39f743846377c1b5e065c1199285cd70509a26ae2fbdec0884b06f00bcbda
-SIZE (mate/mate-dialogs-1.8.0.tar.xz) = 2786956
diff --git a/x11/mate-dialogs/pkg-descr b/x11/mate-dialogs/pkg-descr
deleted file mode 100644
index c2e513f86e38..000000000000
--- a/x11/mate-dialogs/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Mate-dialogs allows dialog boxes to be created and displayed from the
-commandline. This provides a simple way to create a GUI for
-a shell script.
-
-WWW: http://mate-desktop.org/
diff --git a/x11/mate-dialogs/pkg-plist b/x11/mate-dialogs/pkg-plist
deleted file mode 100644
index 01b506581bc3..000000000000
--- a/x11/mate-dialogs/pkg-plist
+++ /dev/null
@@ -1,327 +0,0 @@
-bin/matedialog
-man/man1/matedialog.1.gz
-share/help/C/matedialog/figures/matedialog-calendar-screenshot.png
-share/help/C/matedialog/figures/matedialog-entry-screenshot.png
-share/help/C/matedialog/figures/matedialog-error-screenshot.png
-share/help/C/matedialog/figures/matedialog-fileselection-screenshot.png
-share/help/C/matedialog/figures/matedialog-information-screenshot.png
-share/help/C/matedialog/figures/matedialog-list-screenshot.png
-share/help/C/matedialog/figures/matedialog-notification-screenshot.png
-share/help/C/matedialog/figures/matedialog-progress-screenshot.png
-share/help/C/matedialog/figures/matedialog-question-screenshot.png
-share/help/C/matedialog/figures/matedialog-text-screenshot.png
-share/help/C/matedialog/figures/matedialog-warning-screenshot.png
-share/help/C/matedialog/index.docbook
-share/help/C/matedialog/legal.xml
-share/help/bg/matedialog/figures/matedialog-calendar-screenshot.png
-share/help/bg/matedialog/figures/matedialog-entry-screenshot.png
-share/help/bg/matedialog/figures/matedialog-error-screenshot.png
-share/help/bg/matedialog/figures/matedialog-fileselection-screenshot.png
-share/help/bg/matedialog/figures/matedialog-information-screenshot.png
-share/help/bg/matedialog/figures/matedialog-list-screenshot.png
-share/help/bg/matedialog/figures/matedialog-notification-screenshot.png
-share/help/bg/matedialog/figures/matedialog-progress-screenshot.png
-share/help/bg/matedialog/figures/matedialog-question-screenshot.png
-share/help/bg/matedialog/figures/matedialog-text-screenshot.png
-share/help/bg/matedialog/figures/matedialog-warning-screenshot.png
-share/help/bg/matedialog/index.docbook
-share/help/bg/matedialog/legal.xml
-share/help/cs/matedialog/figures/matedialog-calendar-screenshot.png
-share/help/cs/matedialog/figures/matedialog-entry-screenshot.png
-share/help/cs/matedialog/figures/matedialog-error-screenshot.png
-share/help/cs/matedialog/figures/matedialog-fileselection-screenshot.png
-share/help/cs/matedialog/figures/matedialog-information-screenshot.png
-share/help/cs/matedialog/figures/matedialog-list-screenshot.png
-share/help/cs/matedialog/figures/matedialog-notification-screenshot.png
-share/help/cs/matedialog/figures/matedialog-progress-screenshot.png
-share/help/cs/matedialog/figures/matedialog-question-screenshot.png
-share/help/cs/matedialog/figures/matedialog-text-screenshot.png
-share/help/cs/matedialog/figures/matedialog-warning-screenshot.png
-share/help/cs/matedialog/index.docbook
-share/help/cs/matedialog/legal.xml
-share/help/da/matedialog/figures/matedialog-calendar-screenshot.png
-share/help/da/matedialog/figures/matedialog-entry-screenshot.png
-share/help/da/matedialog/figures/matedialog-error-screenshot.png
-share/help/da/matedialog/figures/matedialog-fileselection-screenshot.png
-share/help/da/matedialog/figures/matedialog-information-screenshot.png
-share/help/da/matedialog/figures/matedialog-list-screenshot.png
-share/help/da/matedialog/figures/matedialog-notification-screenshot.png
-share/help/da/matedialog/figures/matedialog-progress-screenshot.png
-share/help/da/matedialog/figures/matedialog-question-screenshot.png
-share/help/da/matedialog/figures/matedialog-text-screenshot.png
-share/help/da/matedialog/figures/matedialog-warning-screenshot.png
-share/help/da/matedialog/index.docbook
-share/help/da/matedialog/legal.xml
-share/help/de/matedialog/figures/matedialog-calendar-screenshot.png
-share/help/de/matedialog/figures/matedialog-entry-screenshot.png
-share/help/de/matedialog/figures/matedialog-error-screenshot.png
-share/help/de/matedialog/figures/matedialog-fileselection-screenshot.png
-share/help/de/matedialog/figures/matedialog-information-screenshot.png
-share/help/de/matedialog/figures/matedialog-list-screenshot.png
-share/help/de/matedialog/figures/matedialog-notification-screenshot.png
-share/help/de/matedialog/figures/matedialog-progress-screenshot.png
-share/help/de/matedialog/figures/matedialog-question-screenshot.png
-share/help/de/matedialog/figures/matedialog-text-screenshot.png
-share/help/de/matedialog/figures/matedialog-warning-screenshot.png
-share/help/de/matedialog/index.docbook
-share/help/de/matedialog/legal.xml
-share/help/el/matedialog/figures/matedialog-calendar-screenshot.png
-share/help/el/matedialog/figures/matedialog-entry-screenshot.png
-share/help/el/matedialog/figures/matedialog-error-screenshot.png
-share/help/el/matedialog/figures/matedialog-fileselection-screenshot.png
-share/help/el/matedialog/figures/matedialog-information-screenshot.png
-share/help/el/matedialog/figures/matedialog-list-screenshot.png
-share/help/el/matedialog/figures/matedialog-notification-screenshot.png
-share/help/el/matedialog/figures/matedialog-progress-screenshot.png
-share/help/el/matedialog/figures/matedialog-question-screenshot.png
-share/help/el/matedialog/figures/matedialog-text-screenshot.png
-share/help/el/matedialog/figures/matedialog-warning-screenshot.png
-share/help/el/matedialog/index.docbook
-share/help/el/matedialog/legal.xml
-share/help/en_GB/matedialog/figures/matedialog-calendar-screenshot.png
-share/help/en_GB/matedialog/figures/matedialog-entry-screenshot.png
-share/help/en_GB/matedialog/figures/matedialog-error-screenshot.png
-share/help/en_GB/matedialog/figures/matedialog-fileselection-screenshot.png
-share/help/en_GB/matedialog/figures/matedialog-information-screenshot.png
-share/help/en_GB/matedialog/figures/matedialog-list-screenshot.png
-share/help/en_GB/matedialog/figures/matedialog-notification-screenshot.png
-share/help/en_GB/matedialog/figures/matedialog-progress-screenshot.png
-share/help/en_GB/matedialog/figures/matedialog-question-screenshot.png
-share/help/en_GB/matedialog/figures/matedialog-text-screenshot.png
-share/help/en_GB/matedialog/figures/matedialog-warning-screenshot.png
-share/help/en_GB/matedialog/index.docbook
-share/help/en_GB/matedialog/legal.xml
-share/help/es/matedialog/figures/matedialog-calendar-screenshot.png
-share/help/es/matedialog/figures/matedialog-entry-screenshot.png
-share/help/es/matedialog/figures/matedialog-error-screenshot.png
-share/help/es/matedialog/figures/matedialog-fileselection-screenshot.png
-share/help/es/matedialog/figures/matedialog-information-screenshot.png
-share/help/es/matedialog/figures/matedialog-list-screenshot.png
-share/help/es/matedialog/figures/matedialog-notification-screenshot.png
-share/help/es/matedialog/figures/matedialog-progress-screenshot.png
-share/help/es/matedialog/figures/matedialog-question-screenshot.png
-share/help/es/matedialog/figures/matedialog-text-screenshot.png
-share/help/es/matedialog/figures/matedialog-warning-screenshot.png
-share/help/es/matedialog/index.docbook
-share/help/es/matedialog/legal.xml
-share/help/eu/matedialog/figures/matedialog-calendar-screenshot.png
-share/help/eu/matedialog/figures/matedialog-entry-screenshot.png
-share/help/eu/matedialog/figures/matedialog-error-screenshot.png
-share/help/eu/matedialog/figures/matedialog-fileselection-screenshot.png
-share/help/eu/matedialog/figures/matedialog-information-screenshot.png
-share/help/eu/matedialog/figures/matedialog-list-screenshot.png
-share/help/eu/matedialog/figures/matedialog-notification-screenshot.png
-share/help/eu/matedialog/figures/matedialog-progress-screenshot.png
-share/help/eu/matedialog/figures/matedialog-question-screenshot.png
-share/help/eu/matedialog/figures/matedialog-text-screenshot.png
-share/help/eu/matedialog/figures/matedialog-warning-screenshot.png
-share/help/eu/matedialog/index.docbook
-share/help/eu/matedialog/legal.xml
-share/help/fi/matedialog/figures/matedialog-calendar-screenshot.png
-share/help/fi/matedialog/figures/matedialog-entry-screenshot.png
-share/help/fi/matedialog/figures/matedialog-error-screenshot.png
-share/help/fi/matedialog/figures/matedialog-fileselection-screenshot.png
-share/help/fi/matedialog/figures/matedialog-information-screenshot.png
-share/help/fi/matedialog/figures/matedialog-list-screenshot.png
-share/help/fi/matedialog/figures/matedialog-notification-screenshot.png
-share/help/fi/matedialog/figures/matedialog-progress-screenshot.png
-share/help/fi/matedialog/figures/matedialog-question-screenshot.png
-share/help/fi/matedialog/figures/matedialog-text-screenshot.png
-share/help/fi/matedialog/figures/matedialog-warning-screenshot.png
-share/help/fi/matedialog/index.docbook
-share/help/fi/matedialog/legal.xml
-share/help/fr/matedialog/figures/matedialog-calendar-screenshot.png
-share/help/fr/matedialog/figures/matedialog-entry-screenshot.png
-share/help/fr/matedialog/figures/matedialog-error-screenshot.png
-share/help/fr/matedialog/figures/matedialog-fileselection-screenshot.png
-share/help/fr/matedialog/figures/matedialog-information-screenshot.png
-share/help/fr/matedialog/figures/matedialog-list-screenshot.png
-share/help/fr/matedialog/figures/matedialog-notification-screenshot.png
-share/help/fr/matedialog/figures/matedialog-progress-screenshot.png
-share/help/fr/matedialog/figures/matedialog-question-screenshot.png
-share/help/fr/matedialog/figures/matedialog-text-screenshot.png
-share/help/fr/matedialog/figures/matedialog-warning-screenshot.png
-share/help/fr/matedialog/index.docbook
-share/help/fr/matedialog/legal.xml
-share/help/oc/matedialog/figures/matedialog-calendar-screenshot.png
-share/help/oc/matedialog/figures/matedialog-entry-screenshot.png
-share/help/oc/matedialog/figures/matedialog-error-screenshot.png
-share/help/oc/matedialog/figures/matedialog-fileselection-screenshot.png
-share/help/oc/matedialog/figures/matedialog-information-screenshot.png
-share/help/oc/matedialog/figures/matedialog-list-screenshot.png
-share/help/oc/matedialog/figures/matedialog-notification-screenshot.png
-share/help/oc/matedialog/figures/matedialog-progress-screenshot.png
-share/help/oc/matedialog/figures/matedialog-question-screenshot.png
-share/help/oc/matedialog/figures/matedialog-text-screenshot.png
-share/help/oc/matedialog/figures/matedialog-warning-screenshot.png
-share/help/oc/matedialog/index.docbook
-share/help/oc/matedialog/legal.xml
-share/help/pt_BR/matedialog/figures/matedialog-calendar-screenshot.png
-share/help/pt_BR/matedialog/figures/matedialog-entry-screenshot.png
-share/help/pt_BR/matedialog/figures/matedialog-error-screenshot.png
-share/help/pt_BR/matedialog/figures/matedialog-fileselection-screenshot.png
-share/help/pt_BR/matedialog/figures/matedialog-information-screenshot.png
-share/help/pt_BR/matedialog/figures/matedialog-list-screenshot.png
-share/help/pt_BR/matedialog/figures/matedialog-notification-screenshot.png
-share/help/pt_BR/matedialog/figures/matedialog-progress-screenshot.png
-share/help/pt_BR/matedialog/figures/matedialog-question-screenshot.png
-share/help/pt_BR/matedialog/figures/matedialog-text-screenshot.png
-share/help/pt_BR/matedialog/figures/matedialog-warning-screenshot.png
-share/help/pt_BR/matedialog/index.docbook
-share/help/pt_BR/matedialog/legal.xml
-share/help/ru/matedialog/figures/matedialog-calendar-screenshot.png
-share/help/ru/matedialog/figures/matedialog-entry-screenshot.png
-share/help/ru/matedialog/figures/matedialog-error-screenshot.png
-share/help/ru/matedialog/figures/matedialog-fileselection-screenshot.png
-share/help/ru/matedialog/figures/matedialog-information-screenshot.png
-share/help/ru/matedialog/figures/matedialog-list-screenshot.png
-share/help/ru/matedialog/figures/matedialog-notification-screenshot.png
-share/help/ru/matedialog/figures/matedialog-progress-screenshot.png
-share/help/ru/matedialog/figures/matedialog-question-screenshot.png
-share/help/ru/matedialog/figures/matedialog-text-screenshot.png
-share/help/ru/matedialog/figures/matedialog-warning-screenshot.png
-share/help/ru/matedialog/index.docbook
-share/help/ru/matedialog/legal.xml
-share/help/sv/matedialog/figures/matedialog-calendar-screenshot.png
-share/help/sv/matedialog/figures/matedialog-entry-screenshot.png
-share/help/sv/matedialog/figures/matedialog-error-screenshot.png
-share/help/sv/matedialog/figures/matedialog-fileselection-screenshot.png
-share/help/sv/matedialog/figures/matedialog-information-screenshot.png
-share/help/sv/matedialog/figures/matedialog-list-screenshot.png
-share/help/sv/matedialog/figures/matedialog-notification-screenshot.png
-share/help/sv/matedialog/figures/matedialog-progress-screenshot.png
-share/help/sv/matedialog/figures/matedialog-question-screenshot.png
-share/help/sv/matedialog/figures/matedialog-text-screenshot.png
-share/help/sv/matedialog/figures/matedialog-warning-screenshot.png
-share/help/sv/matedialog/index.docbook
-share/help/sv/matedialog/legal.xml
-share/help/uk/matedialog/figures/matedialog-calendar-screenshot.png
-share/help/uk/matedialog/figures/matedialog-entry-screenshot.png
-share/help/uk/matedialog/figures/matedialog-error-screenshot.png
-share/help/uk/matedialog/figures/matedialog-fileselection-screenshot.png
-share/help/uk/matedialog/figures/matedialog-information-screenshot.png
-share/help/uk/matedialog/figures/matedialog-list-screenshot.png
-share/help/uk/matedialog/figures/matedialog-notification-screenshot.png
-share/help/uk/matedialog/figures/matedialog-progress-screenshot.png
-share/help/uk/matedialog/figures/matedialog-question-screenshot.png
-share/help/uk/matedialog/figures/matedialog-text-screenshot.png
-share/help/uk/matedialog/figures/matedialog-warning-screenshot.png
-share/help/uk/matedialog/index.docbook
-share/help/uk/matedialog/legal.xml
-share/help/zh_CN/matedialog/figures/matedialog-calendar-screenshot.png
-share/help/zh_CN/matedialog/figures/matedialog-entry-screenshot.png
-share/help/zh_CN/matedialog/figures/matedialog-error-screenshot.png
-share/help/zh_CN/matedialog/figures/matedialog-fileselection-screenshot.png
-share/help/zh_CN/matedialog/figures/matedialog-information-screenshot.png
-share/help/zh_CN/matedialog/figures/matedialog-list-screenshot.png
-share/help/zh_CN/matedialog/figures/matedialog-notification-screenshot.png
-share/help/zh_CN/matedialog/figures/matedialog-progress-screenshot.png
-share/help/zh_CN/matedialog/figures/matedialog-question-screenshot.png
-share/help/zh_CN/matedialog/figures/matedialog-text-screenshot.png
-share/help/zh_CN/matedialog/figures/matedialog-warning-screenshot.png
-share/help/zh_CN/matedialog/index.docbook
-share/help/zh_CN/matedialog/legal.xml
-share/matedialog/clothes/hawaii-shirt.png
-share/matedialog/clothes/mate-tshirt.png
-share/matedialog/clothes/monk.png
-share/matedialog/clothes/sunglasses.png
-share/matedialog/clothes/surfboard.png
-share/matedialog/matedialog-calendar.png
-share/matedialog/matedialog-entry.png
-share/matedialog/matedialog-file.png
-share/matedialog/matedialog-list.png
-share/matedialog/matedialog-notification.png
-share/matedialog/matedialog-progress.png
-share/matedialog/matedialog-scale.png
-share/matedialog/matedialog-text.png
-share/matedialog/matedialog.png
-share/matedialog/matedialog.ui
-share/locale/am/LC_MESSAGES/mate-dialogs.mo
-share/locale/ar/LC_MESSAGES/mate-dialogs.mo
-share/locale/as/LC_MESSAGES/mate-dialogs.mo
-share/locale/ast/LC_MESSAGES/mate-dialogs.mo
-share/locale/az/LC_MESSAGES/mate-dialogs.mo
-share/locale/be/LC_MESSAGES/mate-dialogs.mo
-share/locale/be@latin/LC_MESSAGES/mate-dialogs.mo
-share/locale/bg/LC_MESSAGES/mate-dialogs.mo
-share/locale/bn/LC_MESSAGES/mate-dialogs.mo
-share/locale/bn_IN/LC_MESSAGES/mate-dialogs.mo
-share/locale/bs/LC_MESSAGES/mate-dialogs.mo
-share/locale/ca/LC_MESSAGES/mate-dialogs.mo
-share/locale/ca@valencia/LC_MESSAGES/mate-dialogs.mo
-share/locale/cmn/LC_MESSAGES/mate-dialogs.mo
-share/locale/cs/LC_MESSAGES/mate-dialogs.mo
-share/locale/cy/LC_MESSAGES/mate-dialogs.mo
-share/locale/da/LC_MESSAGES/mate-dialogs.mo
-share/locale/de/LC_MESSAGES/mate-dialogs.mo
-share/locale/dz/LC_MESSAGES/mate-dialogs.mo
-share/locale/el/LC_MESSAGES/mate-dialogs.mo
-share/locale/en@shaw/LC_MESSAGES/mate-dialogs.mo
-share/locale/en_AU/LC_MESSAGES/mate-dialogs.mo
-share/locale/en_CA/LC_MESSAGES/mate-dialogs.mo
-share/locale/en_GB/LC_MESSAGES/mate-dialogs.mo
-share/locale/es/LC_MESSAGES/mate-dialogs.mo
-share/locale/et/LC_MESSAGES/mate-dialogs.mo
-share/locale/eu/LC_MESSAGES/mate-dialogs.mo
-share/locale/fa/LC_MESSAGES/mate-dialogs.mo
-share/locale/fi/LC_MESSAGES/mate-dialogs.mo
-share/locale/fr/LC_MESSAGES/mate-dialogs.mo
-share/locale/ga/LC_MESSAGES/mate-dialogs.mo
-share/locale/gl/LC_MESSAGES/mate-dialogs.mo
-share/locale/gu/LC_MESSAGES/mate-dialogs.mo
-share/locale/he/LC_MESSAGES/mate-dialogs.mo
-share/locale/hi/LC_MESSAGES/mate-dialogs.mo
-share/locale/hr/LC_MESSAGES/mate-dialogs.mo
-share/locale/hu/LC_MESSAGES/mate-dialogs.mo
-share/locale/id/LC_MESSAGES/mate-dialogs.mo
-share/locale/is/LC_MESSAGES/mate-dialogs.mo
-share/locale/it/LC_MESSAGES/mate-dialogs.mo
-share/locale/ja/LC_MESSAGES/mate-dialogs.mo
-share/locale/ka/LC_MESSAGES/mate-dialogs.mo
-share/locale/kk/LC_MESSAGES/mate-dialogs.mo
-share/locale/kn/LC_MESSAGES/mate-dialogs.mo
-share/locale/ko/LC_MESSAGES/mate-dialogs.mo
-share/locale/ku/LC_MESSAGES/mate-dialogs.mo
-share/locale/ky/LC_MESSAGES/mate-dialogs.mo
-share/locale/lt/LC_MESSAGES/mate-dialogs.mo
-share/locale/lv/LC_MESSAGES/mate-dialogs.mo
-share/locale/mai/LC_MESSAGES/mate-dialogs.mo
-share/locale/mg/LC_MESSAGES/mate-dialogs.mo
-share/locale/mi/LC_MESSAGES/mate-dialogs.mo
-share/locale/mk/LC_MESSAGES/mate-dialogs.mo
-share/locale/ml/LC_MESSAGES/mate-dialogs.mo
-share/locale/mn/LC_MESSAGES/mate-dialogs.mo
-share/locale/mr/LC_MESSAGES/mate-dialogs.mo
-share/locale/ms/LC_MESSAGES/mate-dialogs.mo
-share/locale/nb/LC_MESSAGES/mate-dialogs.mo
-share/locale/ne/LC_MESSAGES/mate-dialogs.mo
-share/locale/nl/LC_MESSAGES/mate-dialogs.mo
-share/locale/nn/LC_MESSAGES/mate-dialogs.mo
-share/locale/oc/LC_MESSAGES/mate-dialogs.mo
-share/locale/or/LC_MESSAGES/mate-dialogs.mo
-share/locale/pa/LC_MESSAGES/mate-dialogs.mo
-share/locale/pl/LC_MESSAGES/mate-dialogs.mo
-share/locale/ps/LC_MESSAGES/mate-dialogs.mo
-share/locale/pt/LC_MESSAGES/mate-dialogs.mo
-share/locale/pt_BR/LC_MESSAGES/mate-dialogs.mo
-share/locale/ro/LC_MESSAGES/mate-dialogs.mo
-share/locale/ru/LC_MESSAGES/mate-dialogs.mo
-share/locale/rw/LC_MESSAGES/mate-dialogs.mo
-share/locale/si/LC_MESSAGES/mate-dialogs.mo
-share/locale/sk/LC_MESSAGES/mate-dialogs.mo
-share/locale/sl/LC_MESSAGES/mate-dialogs.mo
-share/locale/sq/LC_MESSAGES/mate-dialogs.mo
-share/locale/sr/LC_MESSAGES/mate-dialogs.mo
-share/locale/sr@latin/LC_MESSAGES/mate-dialogs.mo
-share/locale/sv/LC_MESSAGES/mate-dialogs.mo
-share/locale/ta/LC_MESSAGES/mate-dialogs.mo
-share/locale/te/LC_MESSAGES/mate-dialogs.mo
-share/locale/th/LC_MESSAGES/mate-dialogs.mo
-share/locale/tr/LC_MESSAGES/mate-dialogs.mo
-share/locale/ug/LC_MESSAGES/mate-dialogs.mo
-share/locale/uk/LC_MESSAGES/mate-dialogs.mo
-share/locale/vi/LC_MESSAGES/mate-dialogs.mo
-share/locale/xh/LC_MESSAGES/mate-dialogs.mo
-share/locale/zh_CN/LC_MESSAGES/mate-dialogs.mo
-share/locale/zh_HK/LC_MESSAGES/mate-dialogs.mo
-share/locale/zh_TW/LC_MESSAGES/mate-dialogs.mo
diff --git a/x11/mate-menus/Makefile b/x11/mate-menus/Makefile
index 43d7579cc6aa..a35c5f614bcb 100644
--- a/x11/mate-menus/Makefile
+++ b/x11/mate-menus/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= mate-menus
-PORTVERSION= 1.8.0
-PORTREVISION= 1
+PORTVERSION= 1.10.0
CATEGORIES= x11 mate
MASTER_SITES= MATE
DIST_SUBDIR= mate
diff --git a/x11/mate-menus/distinfo b/x11/mate-menus/distinfo
index 126e673a0dc1..2f446dcb02d1 100644
--- a/x11/mate-menus/distinfo
+++ b/x11/mate-menus/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mate/mate-menus-1.8.0.tar.xz) = 0610c1c5c2348e8bcd1dae7bed808c451917a69b31d4b80de2b2f6288005b43c
-SIZE (mate/mate-menus-1.8.0.tar.xz) = 342768
+SHA256 (mate/mate-menus-1.10.0.tar.xz) = dc0832bdcc60354ccfc6e898cf167b7f45778825ef2011d7fe849c10ed0ae759
+SIZE (mate/mate-menus-1.10.0.tar.xz) = 342796
diff --git a/x11/mate-menus/pkg-plist b/x11/mate-menus/pkg-plist
index ef1e67191d5d..bcd55cd77c18 100644
--- a/x11/mate-menus/pkg-plist
+++ b/x11/mate-menus/pkg-plist
@@ -1,11 +1,11 @@
etc/xdg/menus/mate-applications.menu
etc/xdg/menus/mate-settings.menu
include/mate-menus/matemenu-tree.h
+lib/girepository-1.0/MateMenu-2.0.typelib
lib/libmate-menu.a
lib/libmate-menu.so
lib/libmate-menu.so.2
lib/libmate-menu.so.2.4.9
-lib/girepository-1.0/MateMenu-2.0.typelib
%%PYTHON_SITELIBDIR%%/matemenu.a
%%PYTHON_SITELIBDIR%%/matemenu.so
libdata/pkgconfig/libmate-menu.pc
@@ -69,6 +69,7 @@ share/locale/kk/LC_MESSAGES/mate-menus.mo
share/locale/kn/LC_MESSAGES/mate-menus.mo
share/locale/ko/LC_MESSAGES/mate-menus.mo
share/locale/ku/LC_MESSAGES/mate-menus.mo
+share/locale/ku_IQ/LC_MESSAGES/mate-menus.mo
share/locale/ky/LC_MESSAGES/mate-menus.mo
share/locale/lt/LC_MESSAGES/mate-menus.mo
share/locale/lv/LC_MESSAGES/mate-menus.mo
diff --git a/x11/mate-panel/Makefile b/x11/mate-panel/Makefile
index f9f3879aab63..e43e9e72d752 100644
--- a/x11/mate-panel/Makefile
+++ b/x11/mate-panel/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= mate-panel
-PORTVERSION= 1.8.1
-PORTREVISION= 1
+PORTVERSION= 1.10.1
CATEGORIES= x11 mate
MASTER_SITES= MATE
DIST_SUBDIR= mate
@@ -26,6 +25,7 @@ USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-network-manager \
--disable-gtk-doc \
+ --with-gtk=2.0 \
--with-html-dir=${PREFIX}/share/doc \
--libexecdir=${PREFIX}/lib/mate-panel
INSTALLS_ICONS= yes
diff --git a/x11/mate-panel/distinfo b/x11/mate-panel/distinfo
index 63a0f8132551..ca22bf4806c3 100644
--- a/x11/mate-panel/distinfo
+++ b/x11/mate-panel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mate/mate-panel-1.8.1.tar.xz) = d53d1546577db3e45ce6b46b4a40b2edc066781cc1e864eef47ad07b0fdb3f19
-SIZE (mate/mate-panel-1.8.1.tar.xz) = 1953156
+SHA256 (mate/mate-panel-1.10.1.tar.xz) = 261702b4eaf5339a55629c5f31466fb7878d5a640f80f88edde54ed1b9eba444
+SIZE (mate/mate-panel-1.10.1.tar.xz) = 1934576
diff --git a/x11/mate-panel/files/patch-applets_wncklet_workspace-switcher.c b/x11/mate-panel/files/patch-applets_wncklet_workspace-switcher.c
deleted file mode 100644
index 8f1bdfc76e0e..000000000000
--- a/x11/mate-panel/files/patch-applets_wncklet_workspace-switcher.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- applets/wncklet/workspace-switcher.c.orig
-+++ applets/wncklet/workspace-switcher.c
-@@ -143,7 +143,7 @@
-
- if (!wm_name)
- pager->wm = PAGER_WM_UNKNOWN;
-- else if (strcmp(wm_name, "Marco") == 0)
-+ else if (strcmp(wm_name, "Metacity (Marco)") == 0)
- pager->wm = PAGER_WM_MARCO;
- else if (strcmp(wm_name, "Compiz") == 0)
- pager->wm = PAGER_WM_COMPIZ;
diff --git a/x11/mate-panel/pkg-plist b/x11/mate-panel/pkg-plist
index eb7c7cd15c59..ec03f05a4fdb 100644
--- a/x11/mate-panel/pkg-plist
+++ b/x11/mate-panel/pkg-plist
@@ -353,44 +353,47 @@ share/locale/zh_CN/LC_MESSAGES/mate-panel.mo
share/locale/zh_HK/LC_MESSAGES/mate-panel.mo
share/locale/zh_TW/LC_MESSAGES/mate-panel.mo
share/locale/zu/LC_MESSAGES/mate-panel.mo
-%%DATADIR%%/applets/org.mate.panel.ClockApplet.mate-panel-applet
-%%DATADIR%%/applets/org.mate.panel.FishApplet.mate-panel-applet
-%%DATADIR%%/applets/org.mate.panel.NotificationAreaApplet.mate-panel-applet
-%%DATADIR%%/applets/org.mate.panel.Wncklet.mate-panel-applet
-%%DATADIR%%/layouts/default.layout
-%%DATADIR%%/layouts/linuxmint.layout
-%%DATADIR%%/layouts/opensuse.layout
-%%DATADIR%%/pixmaps/clock-calendar-icon.png
-%%DATADIR%%/pixmaps/clock-face-large.svg
-%%DATADIR%%/pixmaps/clock-face-small-day.svg
-%%DATADIR%%/pixmaps/clock-face-small-evening.svg
-%%DATADIR%%/pixmaps/clock-face-small-morning.svg
-%%DATADIR%%/pixmaps/clock-face-small-night.svg
-%%DATADIR%%/pixmaps/clock-face-small.svg
-%%DATADIR%%/pixmaps/clock-map-location-current.png
-%%DATADIR%%/pixmaps/clock-map-location-hilight.png
-%%DATADIR%%/pixmaps/clock-map-location-marker.png
-%%DATADIR%%/pixmaps/clock-map.png
-%%DATADIR%%/pixmaps/fishanim.png
-%%DATADIR%%/pixmaps/footguy.png
-%%DATADIR%%/pixmaps/mate-gegl2-2.png
-%%DATADIR%%/pixmaps/mate-gegl2.png
-%%DATADIR%%/pixmaps/monkey.png
-%%DATADIR%%/pixmaps/oldwanda.png
-%%DATADIR%%/pixmaps/wanda.png
-%%DATADIR%%/ui/clock-menu.xml
-%%DATADIR%%/ui/clock.ui
-%%DATADIR%%/ui/fish-menu.xml
-%%DATADIR%%/ui/fish.ui
-%%DATADIR%%/ui/notification-area-menu.xml
-%%DATADIR%%/ui/panel-properties-dialog.ui
-%%DATADIR%%/ui/panel-run-dialog.ui
-%%DATADIR%%/ui/panel-test-applets.ui
-%%DATADIR%%/ui/showdesktop-menu.xml
-%%DATADIR%%/ui/window-list-menu.xml
-%%DATADIR%%/ui/window-list.ui
-%%DATADIR%%/ui/window-menu-menu.xml
-%%DATADIR%%/ui/workspace-switcher-menu.xml
-%%DATADIR%%/ui/workspace-switcher.ui
+share/mate-panel/applets/org.mate.panel.ClockApplet.mate-panel-applet
+share/mate-panel/applets/org.mate.panel.FishApplet.mate-panel-applet
+share/mate-panel/applets/org.mate.panel.NotificationAreaApplet.mate-panel-applet
+share/mate-panel/applets/org.mate.panel.Wncklet.mate-panel-applet
+share/mate-panel/layouts/default.layout
+share/mate-panel/layouts/fedora.layout
+share/mate-panel/layouts/linuxmint.layout
+share/mate-panel/layouts/mageia.layout
+share/mate-panel/layouts/opensuse.layout
+share/mate-panel/layouts/ubuntu.layout
+share/mate-panel/pixmaps/clock-calendar-icon.png
+share/mate-panel/pixmaps/clock-face-large.svg
+share/mate-panel/pixmaps/clock-face-small-day.svg
+share/mate-panel/pixmaps/clock-face-small-evening.svg
+share/mate-panel/pixmaps/clock-face-small-morning.svg
+share/mate-panel/pixmaps/clock-face-small-night.svg
+share/mate-panel/pixmaps/clock-face-small.svg
+share/mate-panel/pixmaps/clock-map-location-current.png
+share/mate-panel/pixmaps/clock-map-location-hilight.png
+share/mate-panel/pixmaps/clock-map-location-marker.png
+share/mate-panel/pixmaps/clock-map.png
+share/mate-panel/pixmaps/fishanim.png
+share/mate-panel/pixmaps/footguy.png
+share/mate-panel/pixmaps/mate-gegl2-2.png
+share/mate-panel/pixmaps/mate-gegl2.png
+share/mate-panel/pixmaps/monkey.png
+share/mate-panel/pixmaps/oldwanda.png
+share/mate-panel/pixmaps/wanda.png
+share/mate-panel/ui/clock-menu.xml
+share/mate-panel/ui/clock.ui
+share/mate-panel/ui/fish-menu.xml
+share/mate-panel/ui/fish.ui
+share/mate-panel/ui/notification-area-menu.xml
+share/mate-panel/ui/panel-properties-dialog.ui
+share/mate-panel/ui/panel-run-dialog.ui
+share/mate-panel/ui/panel-test-applets.ui
+share/mate-panel/ui/showdesktop-menu.xml
+share/mate-panel/ui/window-list-menu.xml
+share/mate-panel/ui/window-list.ui
+share/mate-panel/ui/window-menu-menu.xml
+share/mate-panel/ui/workspace-switcher-menu.xml
+share/mate-panel/ui/workspace-switcher.ui
@dir lib/mate-panel/modules
@exec %D/bin/gio-querymodules %D/lib/mate-panel/modules
diff --git a/x11/mate-screensaver/Makefile b/x11/mate-screensaver/Makefile
index d16578e06f68..c545cf035032 100644
--- a/x11/mate-screensaver/Makefile
+++ b/x11/mate-screensaver/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mate-screensaver
-PORTVERSION= 1.8.1
+PORTVERSION= 1.10.2
CATEGORIES= x11 mate
MASTER_SITES= MATE
DIST_SUBDIR= mate
@@ -24,6 +24,7 @@ USE_GNOME= glib20 gtk20 intlhack
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-xscreensaverdir=${XSCREENSAVER_DIR} \
--with-xscreensaverhackdir=${LOCALBASE}/bin/xscreensaver-hacks \
+ --with-gtk=2.0 \
--with-console-kit=yes \
--with-systemd=no
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/x11/mate-screensaver/distinfo b/x11/mate-screensaver/distinfo
index dd02d039171b..7a5f6739d206 100644
--- a/x11/mate-screensaver/distinfo
+++ b/x11/mate-screensaver/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mate/mate-screensaver-1.8.1.tar.xz) = a3dd1fe9e8d05b7815544fa186c43a35271dd8b512d6b0377038df02c28c9d62
-SIZE (mate/mate-screensaver-1.8.1.tar.xz) = 4874424
+SHA256 (mate/mate-screensaver-1.10.2.tar.xz) = 19b79dc4b4b5a6dcd407daf5b8f310b6da8210445a6271d265458e79a58d539d
+SIZE (mate/mate-screensaver-1.10.2.tar.xz) = 4888108
diff --git a/x11/mate-session-manager/Makefile b/x11/mate-session-manager/Makefile
index 06a3c2672577..1880afab1dfd 100644
--- a/x11/mate-session-manager/Makefile
+++ b/x11/mate-session-manager/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= mate-session-manager
-PORTVERSION= 1.8.1
-PORTREVISION= 1
+PORTVERSION= 1.10.2
CATEGORIES= x11 mate
MASTER_SITES= MATE
DIST_SUBDIR= mate
@@ -20,12 +19,13 @@ RUN_DEPENDS= ${LOCALBASE}/sbin/console-kit-daemon:${PORTSDIR}/sysutils/consoleki
PORTSCOUT= limitw:1,even
USES= gettext gmake libtool pathfix pkgconfig tar:xz
-USE_MATE= settingsdaemon
+USE_MATE= desktop
USE_XORG= ice sm xau xext xrandr xrender xtrans xtst
USE_GNOME= gtk20 intlhack librsvg2 libxslt pango
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-docbook-docs \
--with-gtk=2.0 \
+ --enable-upower \
--with-systemd=no
INSTALLS_ICONS= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/x11/mate-session-manager/distinfo b/x11/mate-session-manager/distinfo
index d924f991ace7..7380797657c5 100644
--- a/x11/mate-session-manager/distinfo
+++ b/x11/mate-session-manager/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mate/mate-session-manager-1.8.1.tar.xz) = 2f85a714704bc475d08809be6ecf24a5d94d2e2d0ea5ac704d67557c349d7b8c
-SIZE (mate/mate-session-manager-1.8.1.tar.xz) = 524204
+SHA256 (mate/mate-session-manager-1.10.2.tar.xz) = ed9d622d0747521c5ef11bbaea85f40445ef68c06ef6d1626b53055b0185cf7a
+SIZE (mate/mate-session-manager-1.10.2.tar.xz) = 549568
diff --git a/x11/mate-session-manager/pkg-plist b/x11/mate-session-manager/pkg-plist
index aa6c4ce1c21d..591d7bec49b2 100644
--- a/x11/mate-session-manager/pkg-plist
+++ b/x11/mate-session-manager/pkg-plist
@@ -1,7 +1,9 @@
bin/mate-session
+bin/mate-session-inhibit
bin/mate-session-properties
bin/mate-session-save
bin/mate-wm
+man/man1/mate-session-inhibit.1.gz
man/man1/mate-session-properties.1.gz
man/man1/mate-session-save.1.gz
man/man1/mate-session.1.gz
diff --git a/x11/mate-terminal/Makefile b/x11/mate-terminal/Makefile
index 1920bbcae280..6162e207a036 100644
--- a/x11/mate-terminal/Makefile
+++ b/x11/mate-terminal/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mate-terminal
-PORTVERSION= 1.8.1
+PORTVERSION= 1.10.0
CATEGORIES= x11 mate
MASTER_SITES= MATE
DIST_SUBDIR= mate
@@ -14,9 +14,11 @@ BUILD_DEPENDS= itstool:${PORTSDIR}/textproc/itstool
PORTSCOUT= limitw:1,even
-USES= gettext gmake pathfix pkgconfig tar:xz
+USES= gettext gmake pathfix pkgconfig shebangfix tar:xz
+USE_MATE= desktop
USE_XORG= sm x11
USE_GNOME= dconf gtk20 intlhack vte
+SHEBANG_FILES= mate-terminal.wrapper
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-gtk=2.0
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/x11/mate-terminal/distinfo b/x11/mate-terminal/distinfo
index 56333698a934..0a2f2906e94f 100644
--- a/x11/mate-terminal/distinfo
+++ b/x11/mate-terminal/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mate/mate-terminal-1.8.1.tar.xz) = d4ba3fd495feb4f8836ea9ca4c201c78fe9564c8190a2d3c84ca4e514a7aa39d
-SIZE (mate/mate-terminal-1.8.1.tar.xz) = 1160064
+SHA256 (mate/mate-terminal-1.10.0.tar.xz) = 2a0d648c9da39a20bd1a36b53447d1e873dbd40a904026f999266b8346a0c9d3
+SIZE (mate/mate-terminal-1.10.0.tar.xz) = 1161704
diff --git a/x11/mate-terminal/pkg-plist b/x11/mate-terminal/pkg-plist
index e841021cec98..780c1ac6cc47 100644
--- a/x11/mate-terminal/pkg-plist
+++ b/x11/mate-terminal/pkg-plist
@@ -1,6 +1,7 @@
bin/mate-terminal
bin/mate-terminal.wrapper
man/man1/mate-terminal.1.gz
+share/appdata/mate-terminal.appdata.xml
share/applications/mate-terminal.desktop
share/help/C/mate-terminal/figures/mate-terminal-default.png
share/help/C/mate-terminal/figures/mate-terminal-tabbed.png
@@ -95,6 +96,7 @@ share/locale/en@shaw/LC_MESSAGES/mate-terminal.mo
share/locale/en_AU/LC_MESSAGES/mate-terminal.mo
share/locale/en_CA/LC_MESSAGES/mate-terminal.mo
share/locale/en_GB/LC_MESSAGES/mate-terminal.mo
+share/locale/en_US/LC_MESSAGES/mate-terminal.mo
share/locale/eo/LC_MESSAGES/mate-terminal.mo
share/locale/es/LC_MESSAGES/mate-terminal.mo
share/locale/et/LC_MESSAGES/mate-terminal.mo
diff --git a/x11/mate/Makefile b/x11/mate/Makefile
index 0781e5b1ec3f..6442167bcd11 100644
--- a/x11/mate/Makefile
+++ b/x11/mate/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mate
-PORTVERSION= 1.8.1
+PORTVERSION= 1.10.0
CATEGORIES= x11 mate
MAINTAINER= gnome@FreeBSD.org
@@ -15,7 +15,7 @@ RUN_DEPENDS= mate-base>=1.8.0:${PORTSDIR}/x11/mate-base \
mate-icon-theme-faenza>=1.8.0:${PORTSDIR}/x11-themes/mate-icon-theme-faenza \
mate-terminal:${PORTSDIR}/x11/mate-terminal \
mate-screensaver:${PORTSDIR}/x11/mate-screensaver \
- mate-calc:${PORTSDIR}/math/mate-calc \
+ galculator:${PORTSDIR}/math/galculator \
mate-screenshot:${PORTSDIR}/deskutils/mate-utils \
mate-system-monitor:${PORTSDIR}/sysutils/mate-system-monitor \
eom:${PORTSDIR}/graphics/eom \
@@ -23,6 +23,7 @@ RUN_DEPENDS= mate-base>=1.8.0:${PORTSDIR}/x11/mate-base \
atril:${PORTSDIR}/graphics/atril \
mate-volume-control:${PORTSDIR}/audio/mate-media \
mate-power-manager:${PORTSDIR}/sysutils/mate-power-manager \
+ caja-sendto:${PORTSDIR}/deskutils/caja-extensions \
mozo:${PORTSDIR}/deskutils/mozo \
mate-applets>=1.8.0:${PORTSDIR}/x11/mate-applets