wm: Remove GNOME 2 metacity, successor wm/marco

7 files changed, 1 insertions, 349 deletions

diff --git a/wm/Makefile b/wm/Makefile
index 59ddb2e32fb..d8deb2bf352 100644
--- a/wm/Makefile
+++ b/wm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.144 2020/01/01 15:24:01 nia Exp $
+# $NetBSD: Makefile,v 1.145 2020/01/08 12:52:13 nia Exp $
 #
 
 COMMENT=	X11 window managers, configuration tools, and themes
@@ -58,7 +58,6 @@ SUBDIR+=	lwm
 SUBDIR+=	marco
 SUBDIR+=	matchbox-wm
 SUBDIR+=	mate-netbook
-SUBDIR+=	metacity
 SUBDIR+=	mlvwm
 SUBDIR+=	musca
 SUBDIR+=	notion
diff --git a/wm/metacity/DESCR b/wm/metacity/DESCR
deleted file mode 100644
index a3bd5188785..00000000000
--- a/wm/metacity/DESCR
+++ /dev/null
@@ -1,16 +0,0 @@
-Metacity is not a meta-City as in an urban center, but rather Meta-ness as in
-the state of being meta.  i.e.  metacity :  meta as opacity :  opaque.  Also
-it may have something to do with the Meta key on UNIX keyboards.
-
-- Boring window manager for the adult in you.  Many window managers are like
-  Marshmallow Froot Loops; Metacity is like Cheerios.
-- Uses GTK+ 2.0 for drawing window frames.  This means colors, fonts, etc.
-  come from GTK+ theme.
-- Has a simple theme system and a couple of extra themes come with it.
-  Change themes via gconf-editor or gconftool:
-    gconftool-2 --type=string --set /apps/metacity/general/theme Crux
-- Change number of workspaces via gconf-editor or gconftool:
-    gconftool-2 --type=int --set /apps/metacity/general/num_workspaces 5
-  Can also change workspaces from GNOME 2 pager.
-- Change focus mode:
-    gconftool-2 --type=string --set /apps/metacity/general/focus_mode mouse
diff --git a/wm/metacity/Makefile b/wm/metacity/Makefile
deleted file mode 100644
index 7d22e53aa1d..00000000000
--- a/wm/metacity/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-# $NetBSD: Makefile,v 1.127 2019/07/21 22:24:13 wiz Exp $
-
-DISTNAME=	metacity-2.34.13
-PKGREVISION=	11
-CATEGORIES=	wm x11 gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/metacity/2.34/}
-EXTRACT_SUFX=	.tar.xz
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-#HOMEPAGE=	https://www.gnome.org/softwaremap/projects/Metacity/
-COMMENT=	GNOME-compliant window manager
-LICENSE=	gnu-gpl-v2
-
-USE_PKGLOCALEDIR=	YES
-USE_TOOLS+=		gmake intltool msgfmt pkg-config
-GNU_CONFIGURE=		YES
-USE_LIBTOOL=		YES
-
-PKGCONFIG_OVERRIDE=	src/libmetacity-private.pc.in
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${X11_TYPE} != "native"
-.include "../../x11/libXinerama/buildlink3.mk"
-.elif !exists(${X11BASE}/lib/libXinerama.so)
-CONFIGURE_ARGS+=	--disable-xinerama
-.endif
-
-.if ${X11_TYPE} != "modular" && !exists(${X11BASE}/lib/libXdamage.so)
-CONFIGURE_ARGS+=	--disable-compositor
-.endif
-
-CFLAGS.SunOS+=			-std=c99 -D__EXTENSIONS__
-BUILDLINK_TRANSFORM.SunOS+=	rm:-ansi
-
-BUILD_DEPENDS+=		itstool-[0-9]*:../../textproc/itstool
-
-BUILDLINK_API_DEPENDS.glib2+=			glib2>=2.25.10
-BUILDLINK_API_DEPENDS.gtk2+=			gtk2+>=2.24.0
-BUILDLINK_API_DEPENDS.startup-notification+=	startup-notification>=0.7
-
-BUILDLINK_DEPMETHOD.libXt?=	build
-
-.include "../../audio/libcanberra/buildlink3.mk"
-.include "../../devel/glib2/schemas.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pango/buildlink3.mk"
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../sysutils/gsettings-desktop-schemas/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../x11/libSM/buildlink3.mk"
-.include "../../x11/libXcomposite/buildlink3.mk"
-.include "../../x11/libXcursor/buildlink3.mk"
-.include "../../x11/libXdamage/buildlink3.mk"
-.include "../../x11/libXrender/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/startup-notification/buildlink3.mk"
-DEPENDS+=	zenity-[0-9]*:../../x11/zenity
-.include "../../mk/bsd.pkg.mk"
diff --git a/wm/metacity/PLIST b/wm/metacity/PLIST
deleted file mode 100644
index 41ed4bd8a0c..00000000000
--- a/wm/metacity/PLIST
+++ /dev/null
@@ -1,224 +0,0 @@
-@comment $NetBSD: PLIST,v 1.35 2014/05/27 11:45:22 prlw1 Exp $
-bin/metacity
-bin/metacity-message
-bin/metacity-theme-viewer
-bin/metacity-window-demo
-include/metacity-1/metacity-private/boxes.h
-include/metacity-1/metacity-private/common.h
-include/metacity-1/metacity-private/gradient.h
-include/metacity-1/metacity-private/preview-widget.h
-include/metacity-1/metacity-private/theme-parser.h
-include/metacity-1/metacity-private/theme.h
-include/metacity-1/metacity-private/util.h
-lib/libmetacity-private.la
-lib/pkgconfig/libmetacity-private.pc
-man/man1/metacity-message.1
-man/man1/metacity-theme-viewer.1
-man/man1/metacity-window-demo.1
-man/man1/metacity.1
-share/GConf/gsettings/metacity-schemas.convert
-share/applications/metacity.desktop
-share/glib-2.0/schemas/org.gnome.metacity.gschema.xml
-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
-share/locale/ast/LC_MESSAGES/metacity.mo
-share/locale/az/LC_MESSAGES/metacity.mo
-share/locale/be/LC_MESSAGES/metacity.mo
-share/locale/be@latin/LC_MESSAGES/metacity.mo
-share/locale/bg/LC_MESSAGES/metacity.mo
-share/locale/bn/LC_MESSAGES/metacity.mo
-share/locale/bn_IN/LC_MESSAGES/metacity.mo
-share/locale/br/LC_MESSAGES/metacity.mo
-share/locale/bs/LC_MESSAGES/metacity.mo
-share/locale/ca/LC_MESSAGES/metacity.mo
-share/locale/ca@valencia/LC_MESSAGES/metacity.mo
-share/locale/crh/LC_MESSAGES/metacity.mo
-share/locale/cs/LC_MESSAGES/metacity.mo
-share/locale/cy/LC_MESSAGES/metacity.mo
-share/locale/da/LC_MESSAGES/metacity.mo
-share/locale/de/LC_MESSAGES/metacity.mo
-share/locale/dz/LC_MESSAGES/metacity.mo
-share/locale/el/LC_MESSAGES/metacity.mo
-share/locale/en@shaw/LC_MESSAGES/metacity.mo
-share/locale/en_CA/LC_MESSAGES/metacity.mo
-share/locale/en_GB/LC_MESSAGES/metacity.mo
-share/locale/eo/LC_MESSAGES/metacity.mo
-share/locale/es/LC_MESSAGES/metacity.mo
-share/locale/et/LC_MESSAGES/metacity.mo
-share/locale/eu/LC_MESSAGES/metacity.mo
-share/locale/fa/LC_MESSAGES/metacity.mo
-share/locale/fi/LC_MESSAGES/metacity.mo
-share/locale/fr/LC_MESSAGES/metacity.mo
-share/locale/ga/LC_MESSAGES/metacity.mo
-share/locale/gl/LC_MESSAGES/metacity.mo
-share/locale/gu/LC_MESSAGES/metacity.mo
-share/locale/ha/LC_MESSAGES/metacity.mo
-share/locale/he/LC_MESSAGES/metacity.mo
-share/locale/hi/LC_MESSAGES/metacity.mo
-share/locale/hr/LC_MESSAGES/metacity.mo
-share/locale/hu/LC_MESSAGES/metacity.mo
-share/locale/hy/LC_MESSAGES/metacity.mo
-share/locale/id/LC_MESSAGES/metacity.mo
-share/locale/ig/LC_MESSAGES/metacity.mo
-share/locale/is/LC_MESSAGES/metacity.mo
-share/locale/it/LC_MESSAGES/metacity.mo
-share/locale/ja/LC_MESSAGES/metacity.mo
-share/locale/ka/LC_MESSAGES/metacity.mo
-share/locale/kn/LC_MESSAGES/metacity.mo
-share/locale/ko/LC_MESSAGES/metacity.mo
-share/locale/ku/LC_MESSAGES/metacity.mo
-share/locale/la/LC_MESSAGES/metacity.mo
-share/locale/lt/LC_MESSAGES/metacity.mo
-share/locale/lv/LC_MESSAGES/metacity.mo
-share/locale/mai/LC_MESSAGES/metacity.mo
-share/locale/mg/LC_MESSAGES/metacity.mo
-share/locale/mk/LC_MESSAGES/metacity.mo
-share/locale/ml/LC_MESSAGES/metacity.mo
-share/locale/mn/LC_MESSAGES/metacity.mo
-share/locale/mr/LC_MESSAGES/metacity.mo
-share/locale/ms/LC_MESSAGES/metacity.mo
-share/locale/nb/LC_MESSAGES/metacity.mo
-share/locale/nds/LC_MESSAGES/metacity.mo
-share/locale/ne/LC_MESSAGES/metacity.mo
-share/locale/nl/LC_MESSAGES/metacity.mo
-share/locale/nn/LC_MESSAGES/metacity.mo
-share/locale/oc/LC_MESSAGES/metacity.mo
-share/locale/or/LC_MESSAGES/metacity.mo
-share/locale/pa/LC_MESSAGES/metacity.mo
-share/locale/pl/LC_MESSAGES/metacity.mo
-share/locale/pt/LC_MESSAGES/metacity.mo
-share/locale/pt_BR/LC_MESSAGES/metacity.mo
-share/locale/ro/LC_MESSAGES/metacity.mo
-share/locale/ru/LC_MESSAGES/metacity.mo
-share/locale/rw/LC_MESSAGES/metacity.mo
-share/locale/si/LC_MESSAGES/metacity.mo
-share/locale/sk/LC_MESSAGES/metacity.mo
-share/locale/sl/LC_MESSAGES/metacity.mo
-share/locale/sq/LC_MESSAGES/metacity.mo
-share/locale/sr/LC_MESSAGES/metacity.mo
-share/locale/sr@latin/LC_MESSAGES/metacity.mo
-share/locale/sv/LC_MESSAGES/metacity.mo
-share/locale/ta/LC_MESSAGES/metacity.mo
-share/locale/te/LC_MESSAGES/metacity.mo
-share/locale/th/LC_MESSAGES/metacity.mo
-share/locale/tk/LC_MESSAGES/metacity.mo
-share/locale/tr/LC_MESSAGES/metacity.mo
-share/locale/ug/LC_MESSAGES/metacity.mo
-share/locale/uk/LC_MESSAGES/metacity.mo
-share/locale/vi/LC_MESSAGES/metacity.mo
-share/locale/wa/LC_MESSAGES/metacity.mo
-share/locale/xh/LC_MESSAGES/metacity.mo
-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
-share/metacity/icons/metacity-window-demo.png
-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/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
diff --git a/wm/metacity/buildlink3.mk b/wm/metacity/buildlink3.mk
deleted file mode 100644
index 23d68ddef13..00000000000
--- a/wm/metacity/buildlink3.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.51 2019/07/21 22:24:13 wiz Exp $
-
-BUILDLINK_TREE+=	metacity
-
-.if !defined(METACITY_BUILDLINK3_MK)
-METACITY_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.metacity+=	metacity>=2.8.5
-BUILDLINK_ABI_DEPENDS.metacity+=	metacity>=2.34.13nb11
-BUILDLINK_PKGSRCDIR.metacity?=		../../wm/metacity
-
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pango/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../x11/startup-notification/buildlink3.mk"
-.include "../../x11/libXcomposite/buildlink3.mk"
-.include "../../x11/libXdamage/buildlink3.mk"
-.endif # METACITY_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-metacity
diff --git a/wm/metacity/distinfo b/wm/metacity/distinfo
deleted file mode 100644
index d6ace6bfa47..00000000000
--- a/wm/metacity/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.46 2015/11/02 23:42:53 agc Exp $
-
-SHA1 (metacity-2.34.13.tar.xz) = 7b5b20e84ffb86290955a726af946a78b7a45e26
-RMD160 (metacity-2.34.13.tar.xz) = c04af49aedb46207053c199c61974751461bfd37
-SHA512 (metacity-2.34.13.tar.xz) = 4faa2dced43b1e89213a3ba3b672f660016eb0f45ff449168aab8269cd788d9f82a0067018ef90ca0bf4f274e660d09c721f7fb1d0e5808ee21b9f0778fb0769
-Size (metacity-2.34.13.tar.xz) = 1660136 bytes
-SHA1 (patch-ac) = a672cc7cc5cfa2dfe0be93be1f6dd764b11beeb2
diff --git a/wm/metacity/patches/patch-ac b/wm/metacity/patches/patch-ac
deleted file mode 100644
index b8fa0390ae4..00000000000
--- a/wm/metacity/patches/patch-ac
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2014/05/27 11:45:23 prlw1 Exp $
-
-Look for WIFEXITED and WEXITSTATUS in sys/wait.h
-https://bugzilla.gnome.org/show_bug.cgi?id=681328
-commit 7b3e8f63eaa055fda49d48178e53b0ad2ae513ce
-
---- src/core/delete.c.orig	2011-11-10 14:14:34.000000000 +0000
-+++ src/core/delete.c
-@@ -32,11 +32,11 @@
- #include "workspace.h"
- 
- #include <sys/types.h>
-+#include <sys/wait.h>
- #include <signal.h>
- #include <unistd.h>
- #include <errno.h>
- #include <string.h>
--#include <stdlib.h>
- #include <stdio.h>
- 
- static void meta_window_present_delete_dialog (MetaWindow *window,