Update to 3.36.1

3 files changed, 20 insertions, 127 deletions

diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile
index b17f13205b1c..db73a3906f8c 100644
--- a/x11-wm/metacity/Makefile
+++ b/x11-wm/metacity/Makefile
@@ -2,15 +2,16 @@
 # $FreeBSD$
 
 PORTNAME=	metacity
-PORTVERSION=	3.18.3
-PORTREVISION=	2
+PORTVERSION=	3.36.1
 CATEGORIES=	x11-wm
 MASTER_SITES=	GNOME
-DIST_SUBDIR=	gnome3
+DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Window manager for the adult in you
 
+LICENSE=	GPLv2
+
 BUILD_DEPENDS=	zenity>=3.0.0:x11/zenity \
 		itstool:textproc/itstool \
 		gsettings-desktop-schemas>=3.3.0:devel/gsettings-desktop-schemas
@@ -30,6 +31,8 @@ USE_GNOME=	gnomeprefix gtk30 intlhack libxml2:build
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 
-GLIB_SCHEMAS=	org.gnome.metacity.gschema.xml
+GLIB_SCHEMAS=	org.gnome.metacity.gschema.xml \
+		org.gnome.metacity.keybindings.gschema.xml \
+		org.gnome.metacity.theme.gschema.xml
 
 .include <bsd.port.mk>
diff --git a/x11-wm/metacity/distinfo b/x11-wm/metacity/distinfo
index 32e7e78ee440..d42341cd089e 100644
--- a/x11-wm/metacity/distinfo
+++ b/x11-wm/metacity/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1538308625
-SHA256 (gnome3/metacity-3.18.3.tar.xz) = 57698150dc70e6381caafc1fb0dff5d215196f17f791554766a35812dfe19bf5
-SIZE (gnome3/metacity-3.18.3.tar.xz) = 1698184
+TIMESTAMP = 1601394576
+SHA256 (gnome/metacity-3.36.1.tar.xz) = 11f07693e2b266840759063a4bc807346070e8e7fec8f53cd0757f6662c1b323
+SIZE (gnome/metacity-3.36.1.tar.xz) = 2063452
diff --git a/x11-wm/metacity/pkg-plist b/x11-wm/metacity/pkg-plist
index cd7cd520ec17..e1c899ce47f7 100644
--- a/x11-wm/metacity/pkg-plist
+++ b/x11-wm/metacity/pkg-plist
@@ -2,30 +2,24 @@ bin/metacity
 bin/metacity-message
 bin/metacity-theme-viewer
 bin/metacity-window-demo
-include/metacity/metacity-private/boxes.h
-include/metacity/metacity-private/common.h
-include/metacity/metacity-private/gradient.h
-include/metacity/metacity-private/preview-widget.h
-include/metacity/metacity-private/theme-parser.h
-include/metacity/metacity-private/theme.h
-include/metacity/metacity-private/util.h
-lib/libmetacity-private.a
-lib/libmetacity-private.so
-lib/libmetacity-private.so.3
-lib/libmetacity-private.so.3.0.0
-libdata/pkgconfig/libmetacity-private.pc
+include/metacity/libmetacity/meta-button.h
+include/metacity/libmetacity/meta-color.h
+include/metacity/libmetacity/meta-frame-borders.h
+include/metacity/libmetacity/meta-frame-enums.h
+include/metacity/libmetacity/meta-theme.h
+lib/libmetacity.a
+lib/libmetacity.so
+lib/libmetacity.so.1
+lib/libmetacity.so.1.1.0
+libdata/pkgconfig/libmetacity.pc
 man/man1/metacity-message.1.gz
 man/man1/metacity-theme-viewer.1.gz
 man/man1/metacity-window-demo.1.gz
 man/man1/metacity.1.gz
-share/GConf/gsettings/metacity-schemas.convert
 share/applications/metacity.desktop
 share/gnome-control-center/keybindings/50-metacity-navigation.xml
 share/gnome-control-center/keybindings/50-metacity-system.xml
 share/gnome-control-center/keybindings/50-metacity-windows.xml
-share/gnome/wm-properties/metacity-wm.desktop
-share/help/C/creating-metacity-themes/index.docbook
-share/help/de/creating-metacity-themes/index.docbook
 share/locale/am/LC_MESSAGES/metacity.mo
 share/locale/ar/LC_MESSAGES/metacity.mo
 share/locale/as/LC_MESSAGES/metacity.mo
@@ -121,107 +115,3 @@ share/locale/zh_CN/LC_MESSAGES/metacity.mo
 share/locale/zh_HK/LC_MESSAGES/metacity.mo
 share/locale/zh_TW/LC_MESSAGES/metacity.mo
 %%DATADIR%%/icons/metacity-window-demo.png
-share/themes/Adwaita/metacity-1/metacity-theme-3.xml
-share/themes/AgingGorilla/metacity-1/active-button.png
-share/themes/AgingGorilla/metacity-1/active-close-button.png
-share/themes/AgingGorilla/metacity-1/active-close-menu-icon.png
-share/themes/AgingGorilla/metacity-1/active-maximize-button.png
-share/themes/AgingGorilla/metacity-1/active-maximize-menu-icon.png
-share/themes/AgingGorilla/metacity-1/active-menu-button.png
-share/themes/AgingGorilla/metacity-1/active-minimize-button.png
-share/themes/AgingGorilla/metacity-1/active-minimize-menu-icon.png
-share/themes/AgingGorilla/metacity-1/inactive-close-button.png
-share/themes/AgingGorilla/metacity-1/inactive-maximize-button.png
-share/themes/AgingGorilla/metacity-1/inactive-menu-button.png
-share/themes/AgingGorilla/metacity-1/inactive-minimize-button.png
-share/themes/AgingGorilla/metacity-1/metacity-theme-1.xml
-share/themes/Atlanta/metacity-1/metacity-theme-1.xml
-share/themes/Bright/metacity-1/metacity-theme-1.xml
-share/themes/Bright/metacity-1/metacity-theme-2.xml
-share/themes/Crux/metacity-1/active-above-button.png
-share/themes/Crux/metacity-1/active-border-top-left-border.png
-share/themes/Crux/metacity-1/active-border-top-right-border.png
-share/themes/Crux/metacity-1/active-bottom-left-border.png
-share/themes/Crux/metacity-1/active-bottom-left-corner.png
-share/themes/Crux/metacity-1/active-bottom-mid-left-border.png
-share/themes/Crux/metacity-1/active-bottom-mid-right-border.png
-share/themes/Crux/metacity-1/active-bottom-right-border.png
-share/themes/Crux/metacity-1/active-bottom-right-corner.png
-share/themes/Crux/metacity-1/active-button-prelight.png
-share/themes/Crux/metacity-1/active-button-pressed.png
-share/themes/Crux/metacity-1/active-button.png
-share/themes/Crux/metacity-1/active-close-button.png
-share/themes/Crux/metacity-1/active-left-border.png
-share/themes/Crux/metacity-1/active-left-top-border-shaded.png
-share/themes/Crux/metacity-1/active-left-top-border.png
-share/themes/Crux/metacity-1/active-maximize-button.png
-share/themes/Crux/metacity-1/active-menu-button-prelight.png
-share/themes/Crux/metacity-1/active-menu-button-pressed.png
-share/themes/Crux/metacity-1/active-menu-button.png
-share/themes/Crux/metacity-1/active-minimize-button.png
-share/themes/Crux/metacity-1/active-restore-button.png
-share/themes/Crux/metacity-1/active-right-border.png
-share/themes/Crux/metacity-1/active-right-top-border-shaded.png
-share/themes/Crux/metacity-1/active-right-top-border.png
-share/themes/Crux/metacity-1/active-shade-button.png
-share/themes/Crux/metacity-1/active-stick-button.png
-share/themes/Crux/metacity-1/active-top-center-left.png
-share/themes/Crux/metacity-1/active-top-center-mid-left.png
-share/themes/Crux/metacity-1/active-top-center-mid-right.png
-share/themes/Crux/metacity-1/active-top-center-right.png
-share/themes/Crux/metacity-1/active-top-left-border.png
-share/themes/Crux/metacity-1/active-top-left-corner.png
-share/themes/Crux/metacity-1/active-top-mid-left-border.png
-share/themes/Crux/metacity-1/active-top-mid-right-border.png
-share/themes/Crux/metacity-1/active-top-right-border.png
-share/themes/Crux/metacity-1/active-top-right-corner.png
-share/themes/Crux/metacity-1/active-unabove-button.png
-share/themes/Crux/metacity-1/active-unshade-button.png
-share/themes/Crux/metacity-1/active-unstick-button.png
-share/themes/Crux/metacity-1/inactive-above-button.png
-share/themes/Crux/metacity-1/inactive-border-top-left-border.png
-share/themes/Crux/metacity-1/inactive-border-top-right-border.png
-share/themes/Crux/metacity-1/inactive-bottom-left-border.png
-share/themes/Crux/metacity-1/inactive-bottom-left-corner.png
-share/themes/Crux/metacity-1/inactive-bottom-mid-border.png
-share/themes/Crux/metacity-1/inactive-bottom-right-border.png
-share/themes/Crux/metacity-1/inactive-bottom-right-corner.png
-share/themes/Crux/metacity-1/inactive-button-prelight.png
-share/themes/Crux/metacity-1/inactive-button-pressed.png
-share/themes/Crux/metacity-1/inactive-button.png
-share/themes/Crux/metacity-1/inactive-close-button.png
-share/themes/Crux/metacity-1/inactive-left-border.png
-share/themes/Crux/metacity-1/inactive-left-top-border-shaded.png
-share/themes/Crux/metacity-1/inactive-left-top-border.png
-share/themes/Crux/metacity-1/inactive-maximize-button.png
-share/themes/Crux/metacity-1/inactive-menu-button-prelight.png
-share/themes/Crux/metacity-1/inactive-menu-button-pressed.png
-share/themes/Crux/metacity-1/inactive-menu-button.png
-share/themes/Crux/metacity-1/inactive-minimize-button.png
-share/themes/Crux/metacity-1/inactive-restore-button.png
-share/themes/Crux/metacity-1/inactive-right-border.png
-share/themes/Crux/metacity-1/inactive-right-top-border-shaded.png
-share/themes/Crux/metacity-1/inactive-right-top-border.png
-share/themes/Crux/metacity-1/inactive-shade-button.png
-share/themes/Crux/metacity-1/inactive-stick-button.png
-share/themes/Crux/metacity-1/inactive-top-center-left.png
-share/themes/Crux/metacity-1/inactive-top-center-mid.png
-share/themes/Crux/metacity-1/inactive-top-center-right.png
-share/themes/Crux/metacity-1/inactive-top-left-border.png
-share/themes/Crux/metacity-1/inactive-top-left-corner.png
-share/themes/Crux/metacity-1/inactive-top-mid-border.png
-share/themes/Crux/metacity-1/inactive-top-right-border.png
-share/themes/Crux/metacity-1/inactive-top-right-corner.png
-share/themes/Crux/metacity-1/inactive-unabove-button.png
-share/themes/Crux/metacity-1/inactive-unshade-button.png
-share/themes/Crux/metacity-1/inactive-unstick-button.png
-share/themes/Crux/metacity-1/metacity-theme-1.xml
-share/themes/Crux/metacity-1/metacity-theme-2.xml
-share/themes/Esco/metacity-1/metacity-theme-1.xml
-share/themes/HighContrast/metacity-1/metacity-theme-3.xml
-share/themes/Metabox/metacity-1/metacity-theme-1.xml
-share/themes/Simple/metacity-1/close.png
-share/themes/Simple/metacity-1/maximize.png
-share/themes/Simple/metacity-1/maximized.png
-share/themes/Simple/metacity-1/metacity-theme-1.xml
-share/themes/Simple/metacity-1/minimize.png