git: a95a109955b3 - main - x11-wm/metacity: Update to 3.40.0

[Neel Chauhan]

The branch main has been updated by nc:

URL: https://cgit.FreeBSD.org/ports/commit/?id=a95a109955b3d6a58629e3877bb82611f421a858

commit a95a109955b3d6a58629e3877bb82611f421a858
Author:     Neel Chauhan <nc at FreeBSD.org>
AuthorDate: 2021-08-03 17:09:43 +0000
Commit:     Neel Chauhan <nc at FreeBSD.org>
CommitDate: 2021-08-03 18:24:51 +0000

    x11-wm/metacity: Update to 3.40.0
---
 x11-wm/metacity/Makefile  | 24 +++++++++++++-----------
 x11-wm/metacity/distinfo  |  6 +++---
 x11-wm/metacity/pkg-plist |  8 ++------
 3 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile
index 621b1ee30554..24968d47e69c 100644
--- a/x11-wm/metacity/Makefile
+++ b/x11-wm/metacity/Makefile
@@ -1,7 +1,7 @@
 # Created by: Garrett Rooney <rooneg at electricjellyfish.net>
 
 PORTNAME=	metacity
-PORTVERSION=	3.36.1
+PORTVERSION=	3.40.0
 CATEGORIES=	x11-wm
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome
@@ -11,26 +11,28 @@ COMMENT=	Window manager for the adult in you
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	zenity>=3.0.0:x11/zenity \
+BUILD_DEPENDS=	gsettings-desktop-schemas>=3.3.0:devel/gsettings-desktop-schemas \
 		itstool:textproc/itstool \
-		gsettings-desktop-schemas>=3.3.0:devel/gsettings-desktop-schemas
-LIB_DEPENDS=	libstartup-notification-1.so:x11/startup-notification \
+		zenity>=3.0.0:x11/zenity
+LIB_DEPENDS=	libcanberra-gtk3.so:audio/libcanberra-gtk3 \
 		libgtop-2.0.so:devel/libgtop \
-		libcanberra-gtk3.so:audio/libcanberra-gtk3
-RUN_DEPENDS=	zenity>=3.0.0:x11/zenity \
-		gsettings-desktop-schemas>=3.3.0:devel/gsettings-desktop-schemas
+		libstartup-notification-1.so:x11/startup-notification
+RUN_DEPENDS=	gsettings-desktop-schemas>=3.3.0:devel/gsettings-desktop-schemas \
+		zenity>=3.0.0:x11/zenity
 
 PORTSCOUT=	limitw:1,even
 
-USES=		compiler:c11 gettext gmake gnome libtool \
-		localbase pathfix pkgconfig tar:xz xorg
+USES=		compiler:c11 gettext gmake gnome libtool localbase pathfix \
+		pkgconfig tar:xz xorg
 GNU_CONFIGURE=	yes
-USE_XORG=	x11 xcomposite xdamage xrender xcursor xinerama xext xrandr
+USE_XORG=	x11 xcomposite xcursor xdamage xext xinerama xpresent xrandr \
+		xrender xres
 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.enums.xml \
+		org.gnome.metacity.gschema.xml \
 		org.gnome.metacity.keybindings.gschema.xml \
 		org.gnome.metacity.theme.gschema.xml
 
diff --git a/x11-wm/metacity/distinfo b/x11-wm/metacity/distinfo
index d42341cd089e..b954cb08ea94 100644
--- a/x11-wm/metacity/distinfo
+++ b/x11-wm/metacity/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1601394576
-SHA256 (gnome/metacity-3.36.1.tar.xz) = 11f07693e2b266840759063a4bc807346070e8e7fec8f53cd0757f6662c1b323
-SIZE (gnome/metacity-3.36.1.tar.xz) = 2063452
+TIMESTAMP = 1628010195
+SHA256 (gnome/metacity-3.40.0.tar.xz) = 224c1f65487eac21f0c1d9856152343768ee726c48b1a8a2835a46a8ad9015b5
+SIZE (gnome/metacity-3.40.0.tar.xz) = 1970260
diff --git a/x11-wm/metacity/pkg-plist b/x11-wm/metacity/pkg-plist
index e1c899ce47f7..17df897846e3 100644
--- a/x11-wm/metacity/pkg-plist
+++ b/x11-wm/metacity/pkg-plist
@@ -1,20 +1,17 @@
 bin/metacity
 bin/metacity-message
 bin/metacity-theme-viewer
-bin/metacity-window-demo
 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
+lib/libmetacity.so.3
+lib/libmetacity.so.%%GTK3_VERSION%%
 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/applications/metacity.desktop
 share/gnome-control-center/keybindings/50-metacity-navigation.xml
@@ -114,4 +111,3 @@ share/locale/yo/LC_MESSAGES/metacity.mo
 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