Cinnamon 4.2

32 files changed, 99 insertions, 130 deletions

diff --git a/lang/cjs/Makefile b/lang/cjs/Makefile
index 2edabe7f1fb7..ee0db017161a 100644
--- a/lang/cjs/Makefile
+++ b/lang/cjs/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	cjs
-PORTVERSION=	4.0.0
+PORTVERSION=	4.2.0
 CATEGORIES=	lang gnome
 DIST_SUBDIR=	gnome
 
@@ -18,7 +18,7 @@ BUILD_DEPENDS=	gnome-autogen.sh:devel/gnome-common
 LIB_DEPENDS=	libffi.so:devel/libffi \
 		libmozjs-52.so:lang/spidermonkey52
 
-USES=		autoreconf compiler:c11 gettext libtool gmake gnome pathfix pkgconfig
+USES=		autoreconf compiler:c11 gettext libtool gmake gnome pathfix pkgconfig xorg
 USE_GNOME=	cairo gdkpixbuf2 gtk30 introspection
 USE_XORG=	x11 xext
 
diff --git a/lang/cjs/distinfo b/lang/cjs/distinfo
index fb1ca5f27301..08a4dda20fc6 100644
--- a/lang/cjs/distinfo
+++ b/lang/cjs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1546094902
-SHA256 (gnome/linuxmint-cjs-4.0.0_GH0.tar.gz) = acd520a503399753ecb0bfa71aa3d932d22ac6a72162043085ea48519a59d3f5
-SIZE (gnome/linuxmint-cjs-4.0.0_GH0.tar.gz) = 459595
+TIMESTAMP = 1571051109
+SHA256 (gnome/linuxmint-cjs-4.2.0_GH0.tar.gz) = 77d1b9f0290135939ad03b60ac64ac637f05e886ba5b777b97f6742ee75af260
+SIZE (gnome/linuxmint-cjs-4.2.0_GH0.tar.gz) = 462973
diff --git a/misc/cinnamon-translations/Makefile b/misc/cinnamon-translations/Makefile
index ce4aebe85bd2..5f00ea1ba7aa 100644
--- a/misc/cinnamon-translations/Makefile
+++ b/misc/cinnamon-translations/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	cinnamon-translations
-PORTVERSION=	4.0.2
+PORTVERSION=	4.2.2
 CATEGORIES=	misc x11 gnome
 DIST_SUBDIR=	gnome
 
diff --git a/misc/cinnamon-translations/distinfo b/misc/cinnamon-translations/distinfo
index 4379a5acb71d..c18d8b0470cb 100644
--- a/misc/cinnamon-translations/distinfo
+++ b/misc/cinnamon-translations/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1546097629
-SHA256 (gnome/linuxmint-cinnamon-translations-4.0.2_GH0.tar.gz) = 07efa3d387aa91813dcc480e81237ae1daf1c8f817178ef7cbb2377ce8fba37d
-SIZE (gnome/linuxmint-cinnamon-translations-4.0.2_GH0.tar.gz) = 10281373
+TIMESTAMP = 1571051503
+SHA256 (gnome/linuxmint-cinnamon-translations-4.2.2_GH0.tar.gz) = 0bfcca02894dcff4644a77560515ea33d4beed1365210cf17ea66b04bf52ee1d
+SIZE (gnome/linuxmint-cinnamon-translations-4.2.2_GH0.tar.gz) = 11113769
diff --git a/misc/cinnamon-translations/pkg-plist b/misc/cinnamon-translations/pkg-plist
index c00e0bfbc19b..25e1043989de 100644
--- a/misc/cinnamon-translations/pkg-plist
+++ b/misc/cinnamon-translations/pkg-plist
@@ -97,6 +97,7 @@ share/locale/ca@valencia/LC_MESSAGES/cinnamon-screensaver.mo
 share/locale/ca@valencia/LC_MESSAGES/cinnamon-session.mo
 share/locale/ca@valencia/LC_MESSAGES/cinnamon-settings-daemon.mo
 share/locale/ca@valencia/LC_MESSAGES/cinnamon.mo
+share/locale/ca@valencia/LC_MESSAGES/nemo-extensions.mo
 share/locale/ca@valencia/LC_MESSAGES/nemo.mo
 share/locale/crh/LC_MESSAGES/cinnamon-control-center.mo
 share/locale/crh/LC_MESSAGES/cinnamon-screensaver.mo
@@ -333,6 +334,12 @@ share/locale/id/LC_MESSAGES/cinnamon-settings-daemon.mo
 share/locale/id/LC_MESSAGES/cinnamon.mo
 share/locale/id/LC_MESSAGES/nemo-extensions.mo
 share/locale/id/LC_MESSAGES/nemo.mo
+share/locale/ie/LC_MESSAGES/cinnamon-control-center.mo
+share/locale/ie/LC_MESSAGES/cinnamon-session.mo
+share/locale/ie/LC_MESSAGES/cinnamon-settings-daemon.mo
+share/locale/ie/LC_MESSAGES/cinnamon.mo
+share/locale/ie/LC_MESSAGES/nemo-extensions.mo
+share/locale/ie/LC_MESSAGES/nemo.mo
 share/locale/ig/LC_MESSAGES/cinnamon-session.mo
 share/locale/ii/LC_MESSAGES/cinnamon-bluetooth.mo
 share/locale/is/LC_MESSAGES/cinnamon-bluetooth.mo
@@ -357,6 +364,7 @@ share/locale/ja/LC_MESSAGES/cinnamon-screensaver.mo
 share/locale/ja/LC_MESSAGES/cinnamon-session.mo
 share/locale/ja/LC_MESSAGES/cinnamon-settings-daemon.mo
 share/locale/ja/LC_MESSAGES/cinnamon.mo
+share/locale/ja/LC_MESSAGES/nemo-extensions.mo
 share/locale/ja/LC_MESSAGES/nemo.mo
 share/locale/jv/LC_MESSAGES/cinnamon-bluetooth.mo
 share/locale/jv/LC_MESSAGES/cinnamon.mo
@@ -514,6 +522,7 @@ share/locale/ne/LC_MESSAGES/cinnamon-screensaver.mo
 share/locale/ne/LC_MESSAGES/cinnamon-session.mo
 share/locale/ne/LC_MESSAGES/cinnamon-settings-daemon.mo
 share/locale/ne/LC_MESSAGES/cinnamon.mo
+share/locale/ne/LC_MESSAGES/nemo-extensions.mo
 share/locale/ne/LC_MESSAGES/nemo.mo
 share/locale/nl/LC_MESSAGES/cinnamon-bluetooth.mo
 share/locale/nl/LC_MESSAGES/cinnamon-control-center.mo
@@ -681,6 +690,8 @@ share/locale/sv/LC_MESSAGES/cinnamon.mo
 share/locale/sv/LC_MESSAGES/nemo-extensions.mo
 share/locale/sv/LC_MESSAGES/nemo.mo
 share/locale/sw/LC_MESSAGES/cinnamon.mo
+share/locale/szl/LC_MESSAGES/cinnamon.mo
+share/locale/szl/LC_MESSAGES/nemo.mo
 share/locale/ta/LC_MESSAGES/cinnamon-bluetooth.mo
 share/locale/ta/LC_MESSAGES/cinnamon-control-center.mo
 share/locale/ta/LC_MESSAGES/cinnamon-screensaver.mo
diff --git a/sysutils/cinnamon-control-center/Makefile b/sysutils/cinnamon-control-center/Makefile
index 7b14d784db4a..669c2e2f0876 100644
--- a/sysutils/cinnamon-control-center/Makefile
+++ b/sysutils/cinnamon-control-center/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	cinnamon-control-center
-PORTVERSION=	4.0.1
+PORTVERSION=	4.2.2
 CATEGORIES=	sysutils gnome
 DIST_SUBDIR=	gnome
 
@@ -29,7 +29,7 @@ LIB_DEPENDS=	libcinnamon-desktop.so:x11/cinnamon-desktop \
 RUN_DEPENDS=	iso-codes>0:misc/iso-codes \
 		cinnamon-settings-daemon>=1.0.0:sysutils/cinnamon-settings-daemon
 
-USES=		autoreconf gettext gmake gnome libtool pathfix pkgconfig
+USES=		autoreconf gettext gmake gnome libtool pathfix pkgconfig xorg
 
 USE_GNOME=	cairo gdkpixbuf2 gtk30 intltool libgnomekbd libxml2
 
diff --git a/sysutils/cinnamon-control-center/distinfo b/sysutils/cinnamon-control-center/distinfo
index 4416d08b1ce8..561ccf0eac60 100644
--- a/sysutils/cinnamon-control-center/distinfo
+++ b/sysutils/cinnamon-control-center/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1546564612
-SHA256 (gnome/linuxmint-cinnamon-control-center-4.0.1_GH0.tar.gz) = 130663817d55a6f37f6f5a51b2aa71b7b2ec7c684ef358f16b5a47e1b133ff76
-SIZE (gnome/linuxmint-cinnamon-control-center-4.0.1_GH0.tar.gz) = 3872552
+TIMESTAMP = 1571088903
+SHA256 (gnome/linuxmint-cinnamon-control-center-4.2.2_GH0.tar.gz) = 0cd334e9fc36165664362d2bef7953879ec1f1d1becdbce21ef0557ea34618d7
+SIZE (gnome/linuxmint-cinnamon-control-center-4.2.2_GH0.tar.gz) = 3870342
diff --git a/sysutils/cinnamon-control-center/pkg-plist b/sysutils/cinnamon-control-center/pkg-plist
index 4fd88b89a8cd..581edc1d17d0 100644
--- a/sysutils/cinnamon-control-center/pkg-plist
+++ b/sysutils/cinnamon-control-center/pkg-plist
@@ -22,7 +22,6 @@ libdata/pkgconfig/libcinnamon-control-center.pc
 %%COLORD%%share/applications/cinnamon-color-panel.desktop
 share/applications/cinnamon-control-center.desktop
 share/applications/cinnamon-display-panel.desktop
-%%ONLINEACCOUNTS%%share/applications/cinnamon-online-accounts-panel.desktop
 share/applications/cinnamon-region-panel.desktop
 %%WACOM%%share/applications/cinnamon-wacom-panel.desktop
 %%DATADIR%%/datetime/backward
diff --git a/sysutils/cinnamon-settings-daemon/Makefile b/sysutils/cinnamon-settings-daemon/Makefile
index b51a2854e9e0..3352fc4ca96c 100644
--- a/sysutils/cinnamon-settings-daemon/Makefile
+++ b/sysutils/cinnamon-settings-daemon/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	cinnamon-settings-daemon
-PORTVERSION=	4.0.3
-PORTREVISION=	1
+PORTVERSION=	4.2.2
 CATEGORIES=	sysutils gnome
 DIST_SUBDIR=	gnome
 
@@ -37,13 +36,12 @@ LIB_DEPENDS=	libcanberra.so:audio/libcanberra \
 		librsvg-2.so:graphics/librsvg2
 RUN_DEPENDS=	cinnamon-session:x11/cinnamon-session
 
-USES=		autoreconf gettext-tools gmake gnome localbase libtool pkgconfig
+USES=		autoreconf gettext-tools gmake gnome localbase libtool pkgconfig xorg
 USE_GNOME=	cairo gdkpixbuf2 gtk30 intltool libgnomekbd
 USE_XORG=	x11 xext xfixes xi xtst
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	linuxmint
-GH_TAGNAME=	cb07d46
 
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
diff --git a/sysutils/cinnamon-settings-daemon/distinfo b/sysutils/cinnamon-settings-daemon/distinfo
index 37dd07f9dfab..8a7a27978958 100644
--- a/sysutils/cinnamon-settings-daemon/distinfo
+++ b/sysutils/cinnamon-settings-daemon/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1551803321
-SHA256 (gnome/linuxmint-cinnamon-settings-daemon-4.0.3-cb07d46_GH0.tar.gz) = 9b9e8bc28d2154ebe58279b979c8e0053efbc83debaeb8f7c40fc17b17b758b1
-SIZE (gnome/linuxmint-cinnamon-settings-daemon-4.0.3-cb07d46_GH0.tar.gz) = 663255
+TIMESTAMP = 1571054564
+SHA256 (gnome/linuxmint-cinnamon-settings-daemon-4.2.2_GH0.tar.gz) = d5b1ff8b5777174a45ebf2906eb1690e79a241c1adeb56cd70f9f273674901f9
+SIZE (gnome/linuxmint-cinnamon-settings-daemon-4.2.2_GH0.tar.gz) = 663894
diff --git a/x11-fm/nemo/Makefile b/x11-fm/nemo/Makefile
index 5310153f4252..309507e9439a 100644
--- a/x11-fm/nemo/Makefile
+++ b/x11-fm/nemo/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	nemo
-PORTVERSION=	4.0.6
+PORTVERSION=	4.2.3
 CATEGORIES=	x11-fm gnome
 DIST_SUBDIR=	gnome
 
@@ -24,7 +24,7 @@ RUN_DEPENDS=	gnome-icon-theme>=0:misc/gnome-icon-theme \
 		gvfs>0:devel/gvfs
 
 USES=		desktop-file-utils gettext gmake gnome meson pkgconfig python:3.5+ \
-		shared-mime-info shebangfix
+		shared-mime-info shebangfix xorg
 
 SHEBANG_FILES=	generate_additional_file makepot
 SHEBANG_GLOB=	*.py
diff --git a/x11-fm/nemo/distinfo b/x11-fm/nemo/distinfo
index 03b2a9b8504e..f2893aab1dc0 100644
--- a/x11-fm/nemo/distinfo
+++ b/x11-fm/nemo/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1546616745
-SHA256 (gnome/linuxmint-nemo-4.0.6_GH0.tar.gz) = 9e7305955d1e420f85c944c921e2d622cd799785ea271ed488888e910a097e47
-SIZE (gnome/linuxmint-nemo-4.0.6_GH0.tar.gz) = 1449313
+TIMESTAMP = 1571092342
+SHA256 (gnome/linuxmint-nemo-4.2.3_GH0.tar.gz) = f7876862340d9823f30e3b6b87bf97578089e448d57eeb7c6e41b0a2b69995f9
+SIZE (gnome/linuxmint-nemo-4.2.3_GH0.tar.gz) = 1459785
diff --git a/x11-fm/nemo/pkg-plist b/x11-fm/nemo/pkg-plist
index b7ec4021215b..7485736b57ab 100644
--- a/x11-fm/nemo/pkg-plist
+++ b/x11-fm/nemo/pkg-plist
@@ -5,6 +5,7 @@ bin/nemo-desktop
 bin/nemo-open-with
 include/nemo/libnemo-extension/nemo-column-provider.h
 include/nemo/libnemo-extension/nemo-column.h
+include/nemo/libnemo-extension/nemo-desktop-preferences.h
 include/nemo/libnemo-extension/nemo-extension-types.h
 include/nemo/libnemo-extension/nemo-file-info.h
 include/nemo/libnemo-extension/nemo-info-provider.h
@@ -85,12 +86,7 @@ share/icons/hicolor/48x48/status/progress-60.png
 share/icons/hicolor/48x48/status/progress-70.png
 share/icons/hicolor/48x48/status/progress-80.png
 share/icons/hicolor/48x48/status/progress-90.png
-share/icons/hicolor/scalable/actions/collapse-menu-hover-symbolic.svg
-share/icons/hicolor/scalable/actions/collapse-menu-symbolic.svg
-share/icons/hicolor/scalable/actions/expand-menu-hover-symbolic.svg
-share/icons/hicolor/scalable/actions/expand-menu-symbolic.svg
 share/icons/hicolor/scalable/actions/location-symbolic.svg
-include/nemo/libnemo-extension/nemo-desktop-preferences.h
 share/icons/hicolor/scalable/actions/mount-archive-symbolic.svg
 share/icons/hicolor/scalable/actions/nemo-auto-arrange-symbolic.svg
 share/icons/hicolor/scalable/actions/nemo-desktop-scale-symbolic.svg
diff --git a/x11-wm/muffin/Makefile b/x11-wm/muffin/Makefile
index a87fb96decde..74efab74d52e 100644
--- a/x11-wm/muffin/Makefile
+++ b/x11-wm/muffin/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	muffin
-PORTVERSION=	4.0.7
+PORTVERSION=	4.2.2
 CATEGORIES=	x11-wm gnome
 DIST_SUBDIR=	gnome
 
@@ -30,7 +30,8 @@ LIB_DEPENDS=	libcanberra.so:audio/libcanberra \
 RUN_DEPENDS=	zenity>=3.0.0:x11/zenity \
 		xkeyboard-config>0:x11/xkeyboard-config
 
-USES=		autoreconf:build gettext-tools gl gmake gnome libtool pathfix pkgconfig
+USES=		autoreconf:build gettext-tools gl gmake gnome libtool pathfix pkgconfig \
+		xorg
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	linuxmint
diff --git a/x11-wm/muffin/distinfo b/x11-wm/muffin/distinfo
index 098863b4e173..03de83ecce42 100644
--- a/x11-wm/muffin/distinfo
+++ b/x11-wm/muffin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1554590206
-SHA256 (gnome/linuxmint-muffin-4.0.7_GH0.tar.gz) = e515c5d396c258b6b6c43c3b819cb170f057c90874ece943e31cb8c8f4ba3d10
-SIZE (gnome/linuxmint-muffin-4.0.7_GH0.tar.gz) = 5194670
+TIMESTAMP = 1571091548
+SHA256 (gnome/linuxmint-muffin-4.2.2_GH0.tar.gz) = 08c64a7a951fc526d96b4e3b6b53997328904ae2430aad4c2611a4f130a5bd16
+SIZE (gnome/linuxmint-muffin-4.2.2_GH0.tar.gz) = 5193509
diff --git a/x11/cinnamon-desktop/Makefile b/x11/cinnamon-desktop/Makefile
index 473c5ee97e74..d64dbbfe5030 100644
--- a/x11/cinnamon-desktop/Makefile
+++ b/x11/cinnamon-desktop/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	cinnamon-desktop
-PORTVERSION=	4.0.1
+PORTVERSION=	4.2.0
 CATEGORIES=	x11 gnome
 DIST_SUBDIR=	gnome
 
@@ -20,7 +20,7 @@ LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 RUN_DEPENDS=	xkeyboard-config>=0:x11/xkeyboard-config \
 		libxkbfile>=0:x11/libxkbfile
 
-USES=		gettext gnome localbase meson pkgconfig python:3.5+,build shebangfix
+USES=		gettext gnome localbase meson pkgconfig python:3.5+,build shebangfix xorg
 USE_GNOME=	cairo gdkpixbuf2 gtk30 intltool introspection
 USE_XORG=	x11 xext xrandr
 USE_LDCONFIG=	yes
@@ -28,8 +28,7 @@ USE_LDCONFIG=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	linuxmint
 
-SHEBANG_FILES=	files/usr/bin/cinnamon-desktop-migrate-mediakeys \
-		install-scripts/meson_install_schemas.py
+SHEBANG_FILES=	install-scripts/meson_install_schemas.py
 
 GLIB_SCHEMAS=	org.cinnamon.desktop.a11y.applications.gschema.xml \
 		org.cinnamon.desktop.a11y.keyboard.gschema.xml \
diff --git a/x11/cinnamon-desktop/distinfo b/x11/cinnamon-desktop/distinfo
index d01ce484b388..2a6a1766dd2f 100644
--- a/x11/cinnamon-desktop/distinfo
+++ b/x11/cinnamon-desktop/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1546103709
-SHA256 (gnome/linuxmint-cinnamon-desktop-4.0.1_GH0.tar.gz) = 72d4a8c78e42cf9d000f553551f3f3645df77c3c23973c989d7d269acd659100
-SIZE (gnome/linuxmint-cinnamon-desktop-4.0.1_GH0.tar.gz) = 489598
+TIMESTAMP = 1571052194
+SHA256 (gnome/linuxmint-cinnamon-desktop-4.2.0_GH0.tar.gz) = e7e6e9aa6e5c5c04a8320cb97ef545700826d04fc34e0f50d140d2efa41941a1
+SIZE (gnome/linuxmint-cinnamon-desktop-4.2.0_GH0.tar.gz) = 487625
diff --git a/x11/cinnamon-desktop/pkg-plist b/x11/cinnamon-desktop/pkg-plist
index 0e8171943e56..ba5c8a2fb00f 100644
--- a/x11/cinnamon-desktop/pkg-plist
+++ b/x11/cinnamon-desktop/pkg-plist
@@ -1,4 +1,3 @@
-bin/cinnamon-desktop-migrate-mediakeys
 include/cinnamon-desktop/libcinnamon-desktop/cdesktop-enums.h
 include/cinnamon-desktop/libcinnamon-desktop/gnome-bg-crossfade.h
 include/cinnamon-desktop/libcinnamon-desktop/gnome-bg.h
diff --git a/x11/cinnamon-menus/Makefile b/x11/cinnamon-menus/Makefile
index c0c120f55752..32b8c75776b8 100644
--- a/x11/cinnamon-menus/Makefile
+++ b/x11/cinnamon-menus/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	cinnamon-menus
-PORTVERSION=	4.0.0
+PORTVERSION=	4.2.0
 CATEGORIES=	x11 gnome
 DIST_SUBDIR=	gnome
 
@@ -14,23 +14,13 @@ LICENSE_COMB=	multi
 LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING
 LICENSE_FILE_LGPL21=	${WRKSRC}/COPYING.LIB
 
-BUILD_DEPENDS=	gnome-autogen.sh:devel/gnome-common \
-		xkeyboard-config>=0:x11/xkeyboard-config
-RUN_DEPENDS=	xkeyboard-config>=0:x11/xkeyboard-config
+USES=		gnome meson pkgconfig
 
-USES=		autoreconf gettext-runtime gmake gnome libtool pathfix pkgconfig
-
-USE_GNOME=	gtk30 intltool introspection:build
-
-USE_XORG=	xkbfile
+USE_GNOME=	glib20 introspection:build
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	linuxmint
 
 USE_LDCONFIG=	yes
 
-GNU_CONFIGURE=	yes
-
-INSTALL_TARGET=	install-strip
-
 .include <bsd.port.mk>
diff --git a/x11/cinnamon-menus/distinfo b/x11/cinnamon-menus/distinfo
index fbf9c2ab5aa0..667e80d76666 100644
--- a/x11/cinnamon-menus/distinfo
+++ b/x11/cinnamon-menus/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1546561607
-SHA256 (gnome/linuxmint-cinnamon-menus-4.0.0_GH0.tar.gz) = e42c642a6fcb3b8e53d6b8f389cca617c8988baaa6e85ac236b61edc38efc3a5
-SIZE (gnome/linuxmint-cinnamon-menus-4.0.0_GH0.tar.gz) = 181311
+TIMESTAMP = 1571076132
+SHA256 (gnome/linuxmint-cinnamon-menus-4.2.0_GH0.tar.gz) = 331bd599d7a863fa92329483637de159c25c57467305691f9768e675cd63f7c2
+SIZE (gnome/linuxmint-cinnamon-menus-4.2.0_GH0.tar.gz) = 96164
diff --git a/x11/cinnamon-menus/pkg-plist b/x11/cinnamon-menus/pkg-plist
index fead2ebd7056..5f02f5badd35 100644
--- a/x11/cinnamon-menus/pkg-plist
+++ b/x11/cinnamon-menus/pkg-plist
@@ -1,5 +1,4 @@
 include/cinnamon-menus-3.0/gmenu-tree.h
-lib/libcinnamon-menu-3.a
 lib/libcinnamon-menu-3.so
 lib/libcinnamon-menu-3.so.0
 lib/libcinnamon-menu-3.so.0.0.1
diff --git a/x11/cinnamon-screensaver/Makefile b/x11/cinnamon-screensaver/Makefile
index 9b1ec6789f63..b1d6db6c1476 100644
--- a/x11/cinnamon-screensaver/Makefile
+++ b/x11/cinnamon-screensaver/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	cinnamon-screensaver
-PORTVERSION=	4.0.3
+PORTVERSION=	4.2.0
 CATEGORIES=	x11 gnome
 DIST_SUBDIR=	gnome
 
@@ -26,7 +26,7 @@ RUN_DEPENDS=	pam_helper:security/pam_helper \
 		${PYTHON_PKGNAMEPREFIX}xapp>0:x11/py-xapp@${PY_FLAVOR}
 
 USES=		autoreconf gettext-tools gmake gnome libtool pathfix pkgconfig \
-		python:3.5+ shebangfix
+		python:3.5+ shebangfix xorg
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	linuxmint
@@ -35,11 +35,14 @@ USE_XORG=	x11 xext xinerama xrandr xscrnsaver
 
 USE_GNOME=	cairo gdkpixbuf2 intltool introspection:build libgnomekbd pygobject3
 
+INSTALLS_ICONS=	yes
+
 SHEBANG_GLOB=	*.py
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-pam-prefix=${PREFIX}/etc/pam.d
 INSTALL_TARGET=	install-strip
+USE_LDCONFIG=	yes
 
 SUB_FILES+=	cinnamon-screensaver.pam
 
diff --git a/x11/cinnamon-screensaver/distinfo b/x11/cinnamon-screensaver/distinfo
index fbcd90dcb22c..59099d47ea9c 100644
--- a/x11/cinnamon-screensaver/distinfo
+++ b/x11/cinnamon-screensaver/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1546600341
-SHA256 (gnome/linuxmint-cinnamon-screensaver-4.0.3_GH0.tar.gz) = 0835111cf01b25447076177944a977cebfe995b5ce3dcfe0fba841141ebbdaca
-SIZE (gnome/linuxmint-cinnamon-screensaver-4.0.3_GH0.tar.gz) = 157719
+TIMESTAMP = 1571090298
+SHA256 (gnome/linuxmint-cinnamon-screensaver-4.2.0_GH0.tar.gz) = 8dee253e12cbd2f30f2c5112a8e5fba62b651733cb56aa327ede939506adf6a0
+SIZE (gnome/linuxmint-cinnamon-screensaver-4.2.0_GH0.tar.gz) = 159710
diff --git a/x11/cinnamon-screensaver/pkg-plist b/x11/cinnamon-screensaver/pkg-plist
index bf1472a58eca..69e4787b7fc6 100644
--- a/x11/cinnamon-screensaver/pkg-plist
+++ b/x11/cinnamon-screensaver/pkg-plist
@@ -32,6 +32,8 @@ libexec/cinnamon-screensaver-pam-helper
 %%DATADIR%%/__pycache__/manager.cpython-%%PYTHON_SUFFIX%%.pyc
 %%DATADIR%%/__pycache__/monitorView.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%DATADIR%%/__pycache__/monitorView.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/__pycache__/osk.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/__pycache__/osk.cpython-%%PYTHON_SUFFIX%%.pyc
 %%DATADIR%%/__pycache__/passwordEntry.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%DATADIR%%/__pycache__/passwordEntry.cpython-%%PYTHON_SUFFIX%%.pyc
 %%DATADIR%%/__pycache__/playerControl.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
@@ -102,6 +104,7 @@ libexec/cinnamon-screensaver-pam-helper
 %%DATADIR%%/infoPanel.py
 %%DATADIR%%/manager.py
 %%DATADIR%%/monitorView.py
+%%DATADIR%%/osk.py
 %%DATADIR%%/pamhelper/__pycache__/authClient.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%DATADIR%%/pamhelper/__pycache__/authClient.cpython-%%PYTHON_SUFFIX%%.pyc
 %%DATADIR%%/pamhelper/authClient.py
diff --git a/x11/cinnamon-session/Makefile b/x11/cinnamon-session/Makefile
index 36c9ec24977c..bdfd34048296 100644
--- a/x11/cinnamon-session/Makefile
+++ b/x11/cinnamon-session/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	cinnamon-session
-PORTVERSION=	4.0.0
-PORTREVISION=	1
+PORTVERSION=	4.2.1
 CATEGORIES=	x11 gnome
 DIST_SUBDIR=	gnome
 
@@ -13,16 +12,17 @@ COMMENT=	Session component for the cinnamon desktop
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libdbus-1.so:devel/dbus \
-		libdbus-glib-1.so:devel/dbus-glib \
 		libxapp.so:x11/xapps \
 		libcanberra.so:audio/libcanberra
 
 RUN_DEPENDS=	console-kit-daemon:sysutils/consolekit2
 
-USES=		gl gnome meson pkgconfig
+USES=		gl gnome meson pkgconfig python:3.5+,build shebangfix xorg
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	linuxmint
-GH_TAGNAME=	3b5759e
+
+SHEBANG_FILES=	data/meson_install_schemas.py
 
 USE_GNOME=	cairo gdkpixbuf2 gtk30
 USE_XORG=	ice sm x11 xau xcomposite xext xrender xtrans xtst
diff --git a/x11/cinnamon-session/distinfo b/x11/cinnamon-session/distinfo
index 52ca55a2e93a..efdc7eddd815 100644
--- a/x11/cinnamon-session/distinfo
+++ b/x11/cinnamon-session/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1551802954
-SHA256 (gnome/linuxmint-cinnamon-session-4.0.0-3b5759e_GH0.tar.gz) = d020cc0f3ef19da11fc2b50c838c9bc9fc961f5468bb6bd0c4eee9e027c0e61b
-SIZE (gnome/linuxmint-cinnamon-session-4.0.0-3b5759e_GH0.tar.gz) = 198339
+TIMESTAMP = 1571053103
+SHA256 (gnome/linuxmint-cinnamon-session-4.2.1_GH0.tar.gz) = bff38239942dc990ccb57c35bde43c19ebc8708284410de53c100e12c7005663
+SIZE (gnome/linuxmint-cinnamon-session-4.2.1_GH0.tar.gz) = 198571
diff --git a/x11/cinnamon/Makefile b/x11/cinnamon/Makefile
index 3f4b3391b24c..8b4fd71fd225 100644
--- a/x11/cinnamon/Makefile
+++ b/x11/cinnamon/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	cinnamon
-PORTVERSION=	4.0.10
-PORTREVISION=	1
+PORTVERSION=	4.2.4
 CATEGORIES=	x11 gnome
 DIST_SUBDIR=	gnome
 
@@ -42,11 +41,12 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyinotify>0:devel/py-pyinotify@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-pam>0:security/py-python-pam@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}tinycss>0:textproc/py-tinycss@${PY_FLAVOR} \
 		metacity:x11-wm/metacity \
 		tint2:x11/tint
 
 USES=		autoreconf:build compiler:c11 gettext gl gmake gnome libtool pathfix \
-		pkgconfig python:3.5+ shebangfix
+		pkgconfig python:3.5+ shebangfix xorg
 
 USE_GNOME=	cairo gdkpixbuf2 glib20 gtk30 intltool introspection libxml2 pygobject3
 
diff --git a/x11/cinnamon/distinfo b/x11/cinnamon/distinfo
index 5ec66ff6eac3..5db86e2cb29a 100644
--- a/x11/cinnamon/distinfo
+++ b/x11/cinnamon/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1554593968
-SHA256 (gnome/linuxmint-cinnamon-4.0.10_GH0.tar.gz) = 50e07fa014eeecb380e840a3be0f09c8af0ad368c64c6b8ce6c30b1f78a2bf66
-SIZE (gnome/linuxmint-cinnamon-4.0.10_GH0.tar.gz) = 2328500
+TIMESTAMP = 1571093323
+SHA256 (gnome/linuxmint-cinnamon-4.2.4_GH0.tar.gz) = 4329b03e08a82316b6890b761174132c18a349508387f005748c32436f6364fd
+SIZE (gnome/linuxmint-cinnamon-4.2.4_GH0.tar.gz) = 2357054
diff --git a/x11/cinnamon/files/patch-files_usr_share_cinnamon_cinnamon-settings_bin_imtools.py b/x11/cinnamon/files/patch-files_usr_share_cinnamon_cinnamon-settings_bin_imtools.py
deleted file mode 100644
index e06c86b8f3d5..000000000000
--- a/x11/cinnamon/files/patch-files_usr_share_cinnamon_cinnamon-settings_bin_imtools.py
+++ /dev/null
@@ -1,43 +0,0 @@
---- files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py.orig	2019-03-21 16:46:14 UTC
-+++ files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py
-@@ -620,31 +620,6 @@ def has_transparency(image):
-         has_alpha(image)
- 
- 
--if Image.VERSION == '1.1.7':
--
--    def split(image):
--        """Work around for bug in Pil 1.1.7
--
--        :param image: input image
--        :type image: PIL image object
--        :returns: the different color bands of the image (eg R, G, B)
--        :rtype: tuple
--        """
--        image.load()
--        return image.split()
--else:
--
--    def split(image):
--        """Work around for bug in Pil 1.1.7
--
--        :param image: input image
--        :type image: PIL image object
--        :returns: the different color bands of the image (eg R, G, B)
--        :rtype: tuple
--        """
--        return image.split()
--
--
- def get_alpha(image):
-     """Gets the image alpha band. Can handles P mode images with transpareny.
-     Returns a band with all values set to 255 if no alpha band exists.
-@@ -655,7 +630,7 @@ def get_alpha(image):
-     :rtype: single band image object
-     """
-     if has_alpha(image):
--        return split(image)[-1]
-+        return image.split()[-1]
-     if image.mode == 'P' and 'transparency' in image.info:
-         return image.convert('RGBA').split()[-1]
-     # No alpha layer, create one.
diff --git a/x11/cinnamon/pkg-plist b/x11/cinnamon/pkg-plist
index e68c5f225bff..93e8adcb04e0 100644
--- a/x11/cinnamon/pkg-plist
+++ b/x11/cinnamon/pkg-plist
@@ -49,6 +49,7 @@ share/applications/cinnamon-settings-info.desktop
 share/applications/cinnamon-settings-keyboard.desktop
 share/applications/cinnamon-settings-mouse.desktop
 share/applications/cinnamon-settings-notifications.desktop
+share/applications/cinnamon-settings-online-accounts.desktop
 share/applications/cinnamon-settings-panel.desktop
 share/applications/cinnamon-settings-power.desktop
 share/applications/cinnamon-settings-privacy.desktop
@@ -130,6 +131,11 @@ share/applications/cinnamon2d.desktop
 %%DATADIR%%/applets/power@cinnamon.org/applet.js
 %%DATADIR%%/applets/power@cinnamon.org/metadata.json
 %%DATADIR%%/applets/power@cinnamon.org/settings-schema.json
+%%DATADIR%%/applets/printers@cinnamon.org/applet.js
+%%DATADIR%%/applets/printers@cinnamon.org/cancel-print-dialog.py
+%%DATADIR%%/applets/printers@cinnamon.org/lpstat-a.py
+%%DATADIR%%/applets/printers@cinnamon.org/metadata.json
+%%DATADIR%%/applets/printers@cinnamon.org/settings-schema.json
 %%DATADIR%%/applets/recent@cinnamon.org/applet.js
 %%DATADIR%%/applets/recent@cinnamon.org/metadata.json
 %%DATADIR%%/applets/removable-drives@cinnamon.org/applet.js
@@ -188,6 +194,7 @@ share/applications/cinnamon2d.desktop
 %%DATADIR%%/bumpmaps/frost.png
 %%DATADIR%%/bumpmaps/hex.png
 %%DATADIR%%/bumpmaps/lizard.png
+%%DATADIR%%/cinnamon-dbus-command
 %%DATADIR%%/cinnamon-desktop-editor/cinnamon-desktop-editor.py
 %%DATADIR%%/cinnamon-desktop-editor/directory-editor.ui
 %%DATADIR%%/cinnamon-desktop-editor/launcher-editor.ui
@@ -196,7 +203,6 @@ share/applications/cinnamon2d.desktop
 %%DATADIR%%/cinnamon-looking-glass/page_extensions.py
 %%DATADIR%%/cinnamon-looking-glass/page_inspect.py
 %%DATADIR%%/cinnamon-looking-glass/page_log.py
-%%DATADIR%%/cinnamon-looking-glass/page_memory.py
 %%DATADIR%%/cinnamon-looking-glass/page_results.py
 %%DATADIR%%/cinnamon-looking-glass/page_windows.py
 %%DATADIR%%/cinnamon-looking-glass/pageutils.py
@@ -225,6 +231,8 @@ share/applications/cinnamon2d.desktop
 %%DATADIR%%/cinnamon-settings/bin/eyedropper.py
 %%DATADIR%%/cinnamon-settings/bin/imtools.py
 %%DATADIR%%/cinnamon-settings/bin/proxygsettings.py
+%%DATADIR%%/cinnamon-settings/bin/scrollbar-test-widget.glade
+%%DATADIR%%/cinnamon-settings/bin/scrollbar-test-widget.py
 %%DATADIR%%/cinnamon-settings/bin/tweenEquations.py
 %%DATADIR%%/cinnamon-settings/cinnamon-online-accounts-info.ui
 %%DATADIR%%/cinnamon-settings/cinnamon-settings.py
@@ -471,6 +479,8 @@ share/desktop-directories/cinnamon-system-tools.directory
 share/desktop-directories/cinnamon-system.directory
 share/desktop-directories/cinnamon-utility-accessibility.directory
 share/desktop-directories/cinnamon-utility.directory
+%%DOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-misc-docInfo-section.html
+%%DOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-misc-docInfo.html
 %%DOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-misc-signalManager-SignalManager.html
 %%DOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-misc-signalManager-section.html
 %%DOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-misc-state-section.html
diff --git a/x11/py-xapp/Makefile b/x11/py-xapp/Makefile
index 288e4daea31f..7a0860ca707f 100644
--- a/x11/py-xapp/Makefile
+++ b/x11/py-xapp/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	xapp
-DISTVERSION=	1.4.0
+DISTVERSION=	1.6.0
 CATEGORIES=	x11 gnome
 DIST_SUBDIR=	gnome
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,12 +14,16 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR}
 
-USES=		python
+USES=		gnome python:3.5+ shebangfix
 
+USE_GNOME=	pygobject3
 USE_PYTHON=	autoplist distutils
+SHEBANG_GLOB=	*.py
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	linuxmint
 GH_PROJECT=	python-${PORTNAME}
 
+NO_ARCH=	yes
+
 .include <bsd.port.mk>
diff --git a/x11/py-xapp/distinfo b/x11/py-xapp/distinfo
index 15f346a275c0..b3640c5af6bf 100644
--- a/x11/py-xapp/distinfo
+++ b/x11/py-xapp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1546603028
-SHA256 (gnome/linuxmint-python-xapp-1.4.0_GH0.tar.gz) = 71ab0ee87df2c6902b36c66c1764b47f558ce3dd1a95b6435a0e65cee8d7eb26
-SIZE (gnome/linuxmint-python-xapp-1.4.0_GH0.tar.gz) = 12431
+TIMESTAMP = 1571089916
+SHA256 (gnome/linuxmint-python-xapp-1.6.0_GH0.tar.gz) = 0de55525b12166d80895ef14b0ba4583b1cd8c23d9262357a18d5f47cf7254df
+SIZE (gnome/linuxmint-python-xapp-1.6.0_GH0.tar.gz) = 19436