summaryrefslogtreecommitdiff
path: root/wm
diff options
context:
space:
mode:
Diffstat (limited to 'wm')
-rw-r--r--wm/marco/Makefile5
-rw-r--r--wm/marco/PLIST32
-rw-r--r--wm/marco/distinfo11
-rw-r--r--wm/marco/patches/patch-configure15
-rw-r--r--wm/mate-netbook/Makefile5
-rw-r--r--wm/mate-netbook/PLIST4
-rw-r--r--wm/mate-netbook/distinfo10
7 files changed, 48 insertions, 34 deletions
diff --git a/wm/marco/Makefile b/wm/marco/Makefile
index 4e12de2eb8c..d3081aaa5c4 100644
--- a/wm/marco/Makefile
+++ b/wm/marco/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2020/03/10 22:09:03 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2020/04/05 16:05:41 bsiegert Exp $
-PKGREVISION= 2
.include "../../meta-pkgs/mate/Makefile.common"
-DISTNAME= marco-${VERSION:R}.4
+DISTNAME= marco-${VERSION}
CATEGORIES= wm
COMMENT= Fork of GNOME Metacity
diff --git a/wm/marco/PLIST b/wm/marco/PLIST
index 719ab3fd509..d2f61707a0a 100644
--- a/wm/marco/PLIST
+++ b/wm/marco/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2019/07/09 02:41:51 gutteridge Exp $
+@comment $NetBSD: PLIST,v 1.7 2020/04/05 16:05:41 bsiegert Exp $
bin/marco
bin/marco-message
bin/marco-theme-viewer
@@ -136,6 +136,7 @@ share/mate-control-center/keybindings/50-marco-desktop-key.xml
share/mate-control-center/keybindings/50-marco-global-key.xml
share/mate-control-center/keybindings/50-marco-window-key.xml
share/mate/wm-properties/marco-wm.desktop
+share/themes/Atlanta/metacity-1/metacity-theme-1.xml
share/themes/ClearlooksRe/metacity-1/metacity-theme-1.xml
share/themes/Dopple-Left/metacity-1/metacity-theme-1.xml
share/themes/Dopple/metacity-1/metacity-theme-1.xml
@@ -153,6 +154,32 @@ share/themes/DustBlue/metacity-1/button_min_prelight.png
share/themes/DustBlue/metacity-1/button_min_pressed.png
share/themes/DustBlue/metacity-1/menu.png
share/themes/DustBlue/metacity-1/metacity-theme-1.xml
+share/themes/Esco/metacity-1/metacity-theme-1.xml
+share/themes/Gorilla/metacity-1/active-button.png
+share/themes/Gorilla/metacity-1/active-close-button.png
+share/themes/Gorilla/metacity-1/active-close-menu-icon.png
+share/themes/Gorilla/metacity-1/active-maximize-button.png
+share/themes/Gorilla/metacity-1/active-maximize-menu-icon.png
+share/themes/Gorilla/metacity-1/active-menu-button.png
+share/themes/Gorilla/metacity-1/active-minimize-button.png
+share/themes/Gorilla/metacity-1/active-minimize-menu-icon.png
+share/themes/Gorilla/metacity-1/inactive-close-button.png
+share/themes/Gorilla/metacity-1/inactive-maximize-button.png
+share/themes/Gorilla/metacity-1/inactive-menu-button.png
+share/themes/Gorilla/metacity-1/inactive-minimize-button.png
+share/themes/Gorilla/metacity-1/metacity-theme-1.xml
+share/themes/Motif/metacity-1/metacity-theme-1.xml
+share/themes/Raleigh/metacity-1/close_normal.png
+share/themes/Raleigh/metacity-1/close_normal_small.png
+share/themes/Raleigh/metacity-1/close_pressed.png
+share/themes/Raleigh/metacity-1/close_pressed_small.png
+share/themes/Raleigh/metacity-1/maximize_normal.png
+share/themes/Raleigh/metacity-1/maximize_pressed.png
+share/themes/Raleigh/metacity-1/metacity-theme-1.xml
+share/themes/Raleigh/metacity-1/minimize_normal.png
+share/themes/Raleigh/metacity-1/minimize_pressed.png
+share/themes/Raleigh/metacity-1/restore_normal.png
+share/themes/Raleigh/metacity-1/restore_pressed.png
share/themes/Spidey-Left/metacity-1/metacity-theme-1.xml
share/themes/Spidey/metacity-1/metacity-theme-1.xml
share/themes/Splint-Left/metacity-1/metacity-theme-1.xml
@@ -177,6 +204,7 @@ share/themes/eOS/metacity-1/maximize_unfocused_over.png
share/themes/eOS/metacity-1/menu.png
share/themes/eOS/metacity-1/menu_prelight.png
share/themes/eOS/metacity-1/metacity-theme-1.xml
+share/themes/eOS/metacity-1/metacity-theme-3.xml
share/themes/eOS/metacity-1/minimize.png
share/themes/eOS/metacity-1/minimize_unfocused.png
share/themes/eOS/metacity-1/minimize_unfocused_over.png
@@ -186,6 +214,8 @@ share/themes/eOS/metacity-1/trough_middle.png
share/themes/eOS/metacity-1/trough_middle_unfocused.png
share/themes/eOS/metacity-1/trough_right.png
share/themes/eOS/metacity-1/trough_right_unfocused.png
+share/themes/eOS/metacity-1/trough_single.png
+share/themes/eOS/metacity-1/trough_single_unfocused.png
share/themes/eOS/metacity-1/unmaximize.png
share/themes/eOS/metacity-1/unmaximize_unfocused.png
share/themes/eOS/metacity-1/unmaximize_unfocused_over.png
diff --git a/wm/marco/distinfo b/wm/marco/distinfo
index a8edb110a94..6150d5f24af 100644
--- a/wm/marco/distinfo
+++ b/wm/marco/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.11 2019/12/16 04:09:42 gutteridge Exp $
+$NetBSD: distinfo,v 1.12 2020/04/05 16:05:41 bsiegert Exp $
-SHA1 (marco-1.22.4.tar.xz) = b1890120abc38a3369c6c57b4e6d78e442a3af3f
-RMD160 (marco-1.22.4.tar.xz) = 1975b8114e4e9311215300adf0ed363e720501f8
-SHA512 (marco-1.22.4.tar.xz) = 46867396b66453c63624e54c382845b898b10768db0560100f021e57ec80189785093be38eeaf19c50a9e4728de2b6e605267a8f1d5a5596aaa75958c0e3a6b0
-Size (marco-1.22.4.tar.xz) = 1368868 bytes
-SHA1 (patch-configure) = fa46453a5d25f154b60970e921f3802cd91ca786
+SHA1 (marco-1.24.0.tar.xz) = f1516aec99aebba177a5fc223e6816015eea18d9
+RMD160 (marco-1.24.0.tar.xz) = 5583ffc137b5e1d4eab3c39efbf926bf0108b0f5
+SHA512 (marco-1.24.0.tar.xz) = b257994c097f174fe83f3f0f4d6b6991e8c0f402daffd99f8a9521d588b609c56953e73dd4d143be64f5c9a4caa8d890ff30a120e18a9d5b36c6f856a7190428
+Size (marco-1.24.0.tar.xz) = 1827076 bytes
SHA1 (patch-src_compositor_compositor-xrender.c) = 5cb7e98d8e2b1dda2842f422ad2268bb258c35ee
SHA1 (patch-src_core_delete.c) = ace180e80d63bbf0a35abc18bf6501061e09d158
SHA1 (patch-src_core_keybindings.c) = 98235897926d017994e1fa01c754419d14432b08
diff --git a/wm/marco/patches/patch-configure b/wm/marco/patches/patch-configure
deleted file mode 100644
index e0d7a462dc9..00000000000
--- a/wm/marco/patches/patch-configure
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-configure,v 1.1 2018/02/08 16:50:22 jperkin Exp $
-
-Don't specify -ansi.
-
---- configure.orig 2017-05-10 15:17:22.000000000 +0000
-+++ configure
-@@ -16283,7 +16283,7 @@ fi
-
- # Warnings are there for a reason
- if test "x$GCC" = "xyes"; then
-- CFLAGS="$CFLAGS -Wall -ansi"
-+ CFLAGS="$CFLAGS -Wall"
- if test "x$enable_maintainer_mode" = "xyes"; then
- CFLAGS="$CFLAGS"
- fi
diff --git a/wm/mate-netbook/Makefile b/wm/mate-netbook/Makefile
index ce6b095239c..cde916ed115 100644
--- a/wm/mate-netbook/Makefile
+++ b/wm/mate-netbook/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2020/03/10 22:11:07 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2020/04/05 16:05:43 bsiegert Exp $
-PKGREVISION= 2
.include "../../meta-pkgs/mate/Makefile.common"
-DISTNAME= mate-netbook-${VERSION:R}.2
+DISTNAME= mate-netbook-${VERSION:R}.0
CATEGORIES= wm
COMMENT= Simple window management tool for MATE desktop
diff --git a/wm/mate-netbook/PLIST b/wm/mate-netbook/PLIST
index 3b67ca53999..0c21634601f 100644
--- a/wm/mate-netbook/PLIST
+++ b/wm/mate-netbook/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2019/02/17 06:18:55 gutteridge Exp $
+@comment $NetBSD: PLIST,v 1.6 2020/04/05 16:05:43 bsiegert Exp $
bin/mate-maximus
libexec/mate-window-picker-applet
man/man1/mate-maximus.1
@@ -25,6 +25,7 @@ share/locale/cmn/LC_MESSAGES/mate-netbook.mo
share/locale/crh/LC_MESSAGES/mate-netbook.mo
share/locale/cs/LC_MESSAGES/mate-netbook.mo
share/locale/csb/LC_MESSAGES/mate-netbook.mo
+share/locale/cv/LC_MESSAGES/mate-netbook.mo
share/locale/cy/LC_MESSAGES/mate-netbook.mo
share/locale/da/LC_MESSAGES/mate-netbook.mo
share/locale/de/LC_MESSAGES/mate-netbook.mo
@@ -73,6 +74,7 @@ share/locale/hu/LC_MESSAGES/mate-netbook.mo
share/locale/hy/LC_MESSAGES/mate-netbook.mo
share/locale/ia/LC_MESSAGES/mate-netbook.mo
share/locale/id/LC_MESSAGES/mate-netbook.mo
+share/locale/ie/LC_MESSAGES/mate-netbook.mo
share/locale/ig/LC_MESSAGES/mate-netbook.mo
share/locale/is/LC_MESSAGES/mate-netbook.mo
share/locale/it/LC_MESSAGES/mate-netbook.mo
diff --git a/wm/mate-netbook/distinfo b/wm/mate-netbook/distinfo
index 051524bf232..d87d9a37576 100644
--- a/wm/mate-netbook/distinfo
+++ b/wm/mate-netbook/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.9 2019/12/30 22:59:56 gutteridge Exp $
+$NetBSD: distinfo,v 1.10 2020/04/05 16:05:43 bsiegert Exp $
-SHA1 (mate-netbook-1.22.2.tar.xz) = 565fbc519eec6478de57c09e453a07a383dd55cb
-RMD160 (mate-netbook-1.22.2.tar.xz) = 2d696b890c10f1ec32c915629703140b7702ac19
-SHA512 (mate-netbook-1.22.2.tar.xz) = caaa841857b86592dd7417fa77e8211d1527f8234cd248a00a3a74b2b1487bd1c06a4bfde44818e1c3b0a64350b94e47d8bfdbcd545d787365dfd76c3af2ff71
-Size (mate-netbook-1.22.2.tar.xz) = 308168 bytes
+SHA1 (mate-netbook-1.24.0.tar.xz) = de13d9637fa77d53e4a6783ca13296bde1135c0c
+RMD160 (mate-netbook-1.24.0.tar.xz) = 4e014b640ace1b8acc0e3ebbd311d1ccbee91498
+SHA512 (mate-netbook-1.24.0.tar.xz) = fd2efbfaa3fb53f96bf9bff28eba70d3cd46b723a63e6748af0cb8314821cbafdc8d0122d402e89ac2742247685e630544f3d98149514114de5a3e38f7fbe471
+Size (mate-netbook-1.24.0.tar.xz) = 356072 bytes
SHA1 (patch-maximus_xutils.c) = b44ac9b31e25ee1e7b93ffa8b16ac7f6da407e0a