8 files changed, 21 insertions, 24 deletions

diff --git a/x11-wm/Makefile b/x11-wm/Makefile
index af429828977c..15fb04ee6975 100644
--- a/x11-wm/Makefile
+++ b/x11-wm/Makefile
@@ -107,8 +107,8 @@
     SUBDIR += lwm
     SUBDIR += lxmed
     SUBDIR += lxsession
-    SUBDIR += mate-window-manager
     SUBDIR += matwm2
+    SUBDIR += marco
     SUBDIR += mcwm
     SUBDIR += metacity
     SUBDIR += musca
diff --git a/x11-wm/mate-window-manager/Makefile b/x11-wm/marco/Makefile
index 7fbb770875e9..4a8b531c754d 100644
--- a/x11-wm/mate-window-manager/Makefile
+++ b/x11-wm/marco/Makefile
@@ -1,9 +1,8 @@
 # Created by: Garrett Rooney <rooneg@electricjellyfish.net>
 # $FreeBSD$
 
-PORTNAME=	mate-window-manager
-PORTVERSION=	1.6.2
-PORTREVISION=	1
+PORTNAME=	marco
+PORTVERSION=	1.8.0
 CATEGORIES=	x11-wm mate
 MASTER_SITES=	MATE
 DIST_SUBDIR=	mate
@@ -11,13 +10,14 @@ DIST_SUBDIR=	mate
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Window manager for the adult in you
 
+BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
 LIB_DEPENDS=	libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification \
 		libcanberra-gtk.so:${PORTSDIR}/audio/libcanberra
 
 PORTSCOUT=	limitw:1,even
 
 USES=		gettext gmake libtool pathfix pkgconfig tar:xz
-USE_MATE=	dialogs docutils
+USE_MATE=	dialogs
 USE_XORG=	x11 xcomposite xcursor xdamage xrandr
 USE_GNOME=	gdkpixbuf2 glib20 gnomehier gtk20 intlhack pango
 USE_LDCONFIG=	yes
@@ -25,7 +25,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-gtk=2.0
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-INSTALL_TARGET= install-strip
+INSTALL_TARGET=	install-strip
 
 GLIB_SCHEMAS=	org.mate.marco.gschema.xml
 
diff --git a/x11-wm/marco/distinfo b/x11-wm/marco/distinfo
new file mode 100644
index 000000000000..adc58038b8db
--- /dev/null
+++ b/x11-wm/marco/distinfo
@@ -0,0 +1,2 @@
+SHA256 (mate/marco-1.8.0.tar.xz) = b66f58c87552a20a4533c1ea482d374a35c8921091736e198c2bf1774163a9e6
+SIZE (mate/marco-1.8.0.tar.xz) = 1111780
diff --git a/x11-wm/mate-window-manager/files/patch-src_core_main.c b/x11-wm/marco/files/patch-src_core_main.c
index 2d5171e5deda..2d5171e5deda 100644
--- a/x11-wm/mate-window-manager/files/patch-src_core_main.c
+++ b/x11-wm/marco/files/patch-src_core_main.c
diff --git a/x11-wm/mate-window-manager/pkg-descr b/x11-wm/marco/pkg-descr
index 7dc83a91914b..7dc83a91914b 100644
--- a/x11-wm/mate-window-manager/pkg-descr
+++ b/x11-wm/marco/pkg-descr
diff --git a/x11-wm/mate-window-manager/pkg-plist b/x11-wm/marco/pkg-plist
index 0e47ed1910a4..04da9fb7f410 100644
--- a/x11-wm/mate-window-manager/pkg-plist
+++ b/x11-wm/marco/pkg-plist
@@ -20,6 +20,7 @@ man/man1/marco-window-demo.1.gz
 man/man1/marco.1.gz
 share/MateConf/gsettings/marco.convert
 share/applications/marco.desktop
+share/help/C/creating-marco-themes/index.docbook
 share/locale/am/LC_MESSAGES/marco.mo
 share/locale/ar/LC_MESSAGES/marco.mo
 share/locale/as/LC_MESSAGES/marco.mo
@@ -34,6 +35,7 @@ share/locale/br/LC_MESSAGES/marco.mo
 share/locale/bs/LC_MESSAGES/marco.mo
 share/locale/ca/LC_MESSAGES/marco.mo
 share/locale/ca@valencia/LC_MESSAGES/marco.mo
+share/locale/cmn/LC_MESSAGES/marco.mo
 share/locale/crh/LC_MESSAGES/marco.mo
 share/locale/cs/LC_MESSAGES/marco.mo
 share/locale/cy/LC_MESSAGES/marco.mo
@@ -67,6 +69,7 @@ share/locale/is/LC_MESSAGES/marco.mo
 share/locale/it/LC_MESSAGES/marco.mo
 share/locale/ja/LC_MESSAGES/marco.mo
 share/locale/ka/LC_MESSAGES/marco.mo
+share/locale/kk/LC_MESSAGES/marco.mo
 share/locale/kn/LC_MESSAGES/marco.mo
 share/locale/ko/LC_MESSAGES/marco.mo
 share/locale/ku/LC_MESSAGES/marco.mo
@@ -115,11 +118,10 @@ share/locale/yo/LC_MESSAGES/marco.mo
 share/locale/zh_CN/LC_MESSAGES/marco.mo
 share/locale/zh_HK/LC_MESSAGES/marco.mo
 share/locale/zh_TW/LC_MESSAGES/marco.mo
-share/mate-window-manager/icons/marco-window-demo.png
+%%DATADIR%%/icons/marco-window-demo.png
 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/help/creating-marco-themes/C/creating-marco-themes.xml
 share/mate/wm-properties/marco-wm.desktop
 share/themes/ClearlooksRe/metacity-1/metacity-theme-1.xml
 share/themes/Dopple-Left/metacity-1/metacity-theme-1.xml
@@ -196,10 +198,8 @@ share/themes/eOS/metacity-1/unmaximize_unfocused_over.png
 @dirrm share/themes/ClearlooksRe
 @dirrmtry share/themes
 @dirrm share/mate/wm-properties
-@dirrm share/mate/help/creating-marco-themes/C
-@dirrm share/mate/help/creating-marco-themes
-@dirrm share/mate-window-manager/icons
-@dirrm share/mate-window-manager
+@dirrmtry %%DATADIR%%/icons
+@dirrmtry %%DATADIR%%
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/yo/LC_MESSAGES
@@ -230,6 +230,8 @@ share/themes/eOS/metacity-1/unmaximize_unfocused_over.png
 @dirrmtry share/locale/ky
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
+@dirrmtry share/locale/kk/LC_MESSAGES
+@dirrmtry share/locale/kk
 @dirrmtry share/locale/ig/LC_MESSAGES
 @dirrmtry share/locale/ig
 @dirrmtry share/locale/hy/LC_MESSAGES
@@ -242,6 +244,8 @@ share/themes/eOS/metacity-1/unmaximize_unfocused_over.png
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/crh/LC_MESSAGES
 @dirrmtry share/locale/crh
+@dirrmtry share/locale/cmn/LC_MESSAGES
+@dirrmtry share/locale/cmn
 @dirrmtry share/locale/ca@valencia/LC_MESSAGES
 @dirrmtry share/locale/ca@valencia
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
@@ -252,5 +256,8 @@ share/themes/eOS/metacity-1/unmaximize_unfocused_over.png
 @dirrmtry share/locale/ast
 @dirrmtry share/locale/as/LC_MESSAGES
 @dirrmtry share/locale/as
+@dirrmtry share/help/C/creating-marco-themes
+@dirrmtry share/help/C
+@dirrmtry share/help
 @dirrm include/marco-1/marco-private
 @dirrm include/marco-1
diff --git a/x11-wm/mate-window-manager/distinfo b/x11-wm/mate-window-manager/distinfo
deleted file mode 100644
index 60f0ac571340..000000000000
--- a/x11-wm/mate-window-manager/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (mate/mate-window-manager-1.6.2.tar.xz) = d4c887c7de76073409bf653701ae1d16d17ca5205776fd4dcc952cb3128120e1
-SIZE (mate/mate-window-manager-1.6.2.tar.xz) = 1102396
diff --git a/x11-wm/mate-window-manager/files/patch-src_core_delete.c b/x11-wm/mate-window-manager/files/patch-src_core_delete.c
deleted file mode 100644
index c72b0f60ae0e..000000000000
--- a/x11-wm/mate-window-manager/files/patch-src_core_delete.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/core/delete.c.orig	2010-01-30 18:56:27.000000000 -0500
-+++ src/core/delete.c	2010-01-30 18:56:53.000000000 -0500
-@@ -32,6 +32,7 @@
- #include "workspace.h"
- 
- #include <sys/types.h>
-+#include <sys/wait.h>
- #include <signal.h>
- #include <unistd.h>
- #include <errno.h>