Update marco to 1.18.1

4 files changed, 11 insertions, 27 deletions

diff --git a/wm/marco/Makefile b/wm/marco/Makefile
index 319add6570a..165ccb12d40 100644
--- a/wm/marco/Makefile
+++ b/wm/marco/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2017/02/12 06:24:51 ryoon Exp $
+# $NetBSD: Makefile,v 1.6 2017/06/23 17:13:31 youri Exp $
 
-PKGREVISION= 3
 .include "../../meta-pkgs/mate/Makefile.common"
 
-DISTNAME=	marco-1.14.2
+DISTNAME=	marco-${VERSION:R}.1
 CATEGORIES=	wm
 
 COMMENT=	MATE Marco is a fork of GNOME Metacity
@@ -19,20 +18,6 @@ PKGCONFIG_OVERRIDE+=	src/libmarco-private.pc.in
 
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../audio/libcanberra/buildlink3.mk"
-.include "../../devel/pango/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
 .include "../../sysutils/libgtop/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
-.include "../../x11/libXcomposite/buildlink3.mk"
-.include "../../x11/libXrandr/buildlink3.mk"
-.include "../../x11/libXrender/buildlink3.mk"
-.include "../../x11/libXcursor/buildlink3.mk"
-.include "../../x11/libSM/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libxkbfile/buildlink3.mk"
-.include "../../x11/libXinerama/buildlink3.mk"
-.include "../../x11/libXfixes/buildlink3.mk"
-.include "../../x11/libXdamage/buildlink3.mk"
-.include "../../x11/libICE/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/marco/PLIST b/wm/marco/PLIST
index 073d3a7b325..163b3032aeb 100644
--- a/wm/marco/PLIST
+++ b/wm/marco/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2016/06/13 23:10:36 youri Exp $
+@comment $NetBSD: PLIST,v 1.3 2017/06/23 17:13:31 youri Exp $
 bin/marco
 bin/marco-message
 bin/marco-theme-viewer
@@ -25,7 +25,6 @@ share/locale/as/LC_MESSAGES/marco.mo
 share/locale/ast/LC_MESSAGES/marco.mo
 share/locale/az/LC_MESSAGES/marco.mo
 share/locale/be/LC_MESSAGES/marco.mo
-share/locale/be@latin/LC_MESSAGES/marco.mo
 share/locale/bg/LC_MESSAGES/marco.mo
 share/locale/bn/LC_MESSAGES/marco.mo
 share/locale/bn_IN/LC_MESSAGES/marco.mo
@@ -41,7 +40,6 @@ share/locale/da/LC_MESSAGES/marco.mo
 share/locale/de/LC_MESSAGES/marco.mo
 share/locale/dz/LC_MESSAGES/marco.mo
 share/locale/el/LC_MESSAGES/marco.mo
-share/locale/en@shaw/LC_MESSAGES/marco.mo
 share/locale/en_AU/LC_MESSAGES/marco.mo
 share/locale/en_CA/LC_MESSAGES/marco.mo
 share/locale/en_GB/LC_MESSAGES/marco.mo
@@ -74,6 +72,7 @@ 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
+share/locale/ku_IQ/LC_MESSAGES/marco.mo
 share/locale/ky/LC_MESSAGES/marco.mo
 share/locale/la/LC_MESSAGES/marco.mo
 share/locale/lt/LC_MESSAGES/marco.mo
diff --git a/wm/marco/buildlink3.mk b/wm/marco/buildlink3.mk
index 180807858b0..82ed30c108e 100644
--- a/wm/marco/buildlink3.mk
+++ b/wm/marco/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2017/02/12 06:24:51 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2017/06/23 17:13:31 youri Exp $
 #
 
 BUILDLINK_TREE+=	marco
@@ -7,7 +7,7 @@ BUILDLINK_TREE+=	marco
 MARCO_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.marco+=	marco>=1.8.2
-BUILDLINK_ABI_DEPENDS.marco?=	marco>=1.14.2nb3
+BUILDLINK_ABI_DEPENDS.marco+=	marco>=1.14.2nb3
 BUILDLINK_PKGSRCDIR.marco?=	../../wm/marco
 
 .include "../../audio/libcanberra/buildlink3.mk"
diff --git a/wm/marco/distinfo b/wm/marco/distinfo
index 45669a70004..5617114d051 100644
--- a/wm/marco/distinfo
+++ b/wm/marco/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2016/06/13 23:10:36 youri Exp $
+$NetBSD: distinfo,v 1.3 2017/06/23 17:13:31 youri Exp $
 
-SHA1 (marco-1.14.2.tar.xz) = dc4770dea2d09b046f027064329b94e6fd53367b
-RMD160 (marco-1.14.2.tar.xz) = a8d22e45113e1fc14b5ad243475aa1d02c509cb4
-SHA512 (marco-1.14.2.tar.xz) = 6ca782f5dbbc01f5df4be901a1a6bf5b23398716e5802118482a0bf98e35f4dc544a6070358a931ca11f2d8b71cbbfb7e8768e0535c6605433a202be348ddf84
-Size (marco-1.14.2.tar.xz) = 1244076 bytes
+SHA1 (marco-1.18.1.tar.xz) = 6c09e95749bd01c46937b99894298f67918f720a
+RMD160 (marco-1.18.1.tar.xz) = 2b2d80a7148963ea8910606e9fa25cb4838e4742
+SHA512 (marco-1.18.1.tar.xz) = d6851c8c1c5bc25993dc72de7e5090736d236942ad37124ef52d0c23cc66faa1e4288273160bb9c1d1c303c99e3e096dcf031b2ea70bde93858627f31034708c
+Size (marco-1.18.1.tar.xz) = 1251108 bytes
 SHA1 (patch-src_compositor_compositor-xrender.c) = 5cb7e98d8e2b1dda2842f422ad2268bb258c35ee