Import of pkgsrc-2015Q2

2015-08-30 02:56:09 -07:00
parent 4af1cdf7a9
commit f641581404
15409 changed files with 267784 additions and 121624 deletions
--- a/wm/2bwm/DESCR
+++ b/wm/2bwm/DESCR
@@ -0,0 +1,4 @@
+A fast floating WM, with the particularity of having 2 borders,
+written over the XCB library and derived from mcwm written by
+Michael Cardell. In 2bWM everything is accessible from the keyboard
+but a pointing device can be used for move, resize and raise/lower.
--- a/wm/2bwm/Makefile
+++ b/wm/2bwm/Makefile
@@ -0,0 +1,25 @@
+# $NetBSD: Makefile,v 1.1 2015/06/04 19:26:55 youri Exp $
+
+DISTNAME=	2bwm-20150526
+CATEGORIES=	wm
+MASTER_SITES=	${MASTER_SITE_GITHUB:=venam/}
+GITHUB_PROJECT=	2bwm
+GITHUB_TAG=	dfb0cd1b77ce15e52e3fb9dd4eea653b0959e799
+
+MAINTAINER=	youri@NetBSD.org
+HOMEPAGE=	http://github.com/venam/2bwm
+COMMENT=	Fast floating WM written over the XCB library and derived from mcwm
+LICENSE=	isc
+
+SUBST_CLASSES+=		makefile
+SUBST_STAGE.makefile=	pre-build
+SUBST_MESSAGE.makefile=	Fixing makefile
+SUBST_FILES.makefile=	Makefile
+SUBST_SED.makefile=	-e 's,/usr/local,${PREFIX},g'
+SUBST_SED.makefile+=	-e 's,share/man,${PKGMANDIR},g'
+
+.include "../../x11/libxcb/buildlink3.mk"
+.include "../../x11/xcb-util-wm/buildlink3.mk"
+.include "../../x11/xcb-util-keysyms/buildlink3.mk"
+.include "../../x11/xcb-util/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
--- a/wm/2bwm/PLIST
+++ b/wm/2bwm/PLIST
@@ -0,0 +1,5 @@
+@comment $NetBSD: PLIST,v 1.1 2015/06/04 19:26:55 youri Exp $
+bin/2bwm
+bin/hidden
+man/man1/2bwm.1
+man/man1/hidden.1
--- a/wm/2bwm/distinfo
+++ b/wm/2bwm/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2015/06/04 19:26:55 youri Exp $
+
+SHA1 (2bwm-20150526-dfb0cd1b77ce15e52e3fb9dd4eea653b0959e799.tar.gz) = af487d15a422f95a10ec2069ac3429cf253e2837
+RMD160 (2bwm-20150526-dfb0cd1b77ce15e52e3fb9dd4eea653b0959e799.tar.gz) = 5025af12cebb2337f02b0f9eaaa49f3f396315f7
+Size (2bwm-20150526-dfb0cd1b77ce15e52e3fb9dd4eea653b0959e799.tar.gz) = 39128 bytes
--- a/wm/3ddesktop/Makefile
+++ b/wm/3ddesktop/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.34 2013/07/05 13:29:43 ryoon Exp $
+# $NetBSD: Makefile,v 1.35 2015/04/25 14:24:58 tnn Exp $
 #

 DISTNAME=		3ddesktop-0.2.9
-PKGREVISION=		12
+PKGREVISION=		13
 CATEGORIES=		wm
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=desk3d/}

--- a/wm/Makefile
+++ b/wm/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.126 2014/11/24 00:37:13 joerg Exp $
+# $NetBSD: Makefile,v 1.129 2015/06/05 22:50:26 youri Exp $
 #

 COMMENT=	X11 window managers, configuration tools, and themes

+SUBDIR+=	2bwm
 SUBDIR+=	3ddesktop
 SUBDIR+=	9wm
 SUBDIR+=	aewm++
@@ -20,6 +21,7 @@ SUBDIR+=	blackbox
 SUBDIR+=	blackbox70
 SUBDIR+=	bmpanel2
 SUBDIR+=	bsetroot
+SUBDIR+=	bspwm
 SUBDIR+=	ccsm
 SUBDIR+=	compiz
 SUBDIR+=	compiz-fusion-plugins-extra
@@ -72,6 +74,7 @@ SUBDIR+=	sawfish
 SUBDIR+=	selectwm
 SUBDIR+=	skippy
 SUBDIR+=	spectrwm
+SUBDIR+=	trayer
 SUBDIR+=	tvtwm
 SUBDIR+=	twm
 SUBDIR+=	uwm
--- a/wm/afterstep/Makefile
+++ b/wm/afterstep/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.77 2014/10/09 14:07:08 wiz Exp $
+# $NetBSD: Makefile,v 1.79 2015/06/12 10:51:46 wiz Exp $

 DISTNAME=	AfterStep-2.2.11
 PKGNAME=	${DISTNAME:S/AfterStep/afterstep/}
-PKGREVISION=	10
+PKGREVISION=	12
 CATEGORIES=	wm
 MASTER_SITES=	ftp://ftp.afterstep.org/stable/
 EXTRACT_SUFX=	.tar.bz2
--- a/wm/awesome/Makefile
+++ b/wm/awesome/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.53 2014/10/19 22:27:48 alnsn Exp $
+# $NetBSD: Makefile,v 1.54 2015/04/25 14:24:58 tnn Exp $
 #

 DISTNAME=	awesome-3.5.5
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11 wm
 MASTER_SITES=	http://awesome.naquadah.org/download/
 EXTRACT_SUFX=	.tar.xz
--- a/wm/bbkeys/Makefile
+++ b/wm/bbkeys/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2014/05/29 23:37:54 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2015/06/12 10:51:46 wiz Exp $
 #

 DISTNAME=	bbkeys-0.8.6
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	x11 wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=bbkeys/}

--- a/wm/bbkeys09/Makefile
+++ b/wm/bbkeys09/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2014/05/29 23:37:54 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2015/06/12 10:51:47 wiz Exp $
 #

 DISTNAME=	bbkeys-0.9.0
 PKGNAME=	bbkeys09-0.9.0
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11 wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=bbkeys/}

--- a/wm/bmpanel2/Makefile
+++ b/wm/bmpanel2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2014/05/09 07:37:23 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2015/04/25 14:24:59 tnn Exp $

 DISTNAME=	bmpanel2-2.1pre1
-PKGREVISION=	16
+PKGREVISION=	17
 CATEGORIES=	sysutils
 MASTER_SITES=	http://bmpanel2.googlecode.com/files/

--- a/wm/bspwm/DESCR
+++ b/wm/bspwm/DESCR
@@ -0,0 +1,2 @@
+bspwm is a tiling window manager that represents windows as the leaves of a
+full binary tree. It is controlled and configured via bspc.
--- a/wm/bspwm/Makefile
+++ b/wm/bspwm/Makefile
@@ -0,0 +1,29 @@
+# $NetBSD: Makefile,v 1.3 2015/06/15 09:22:59 joerg Exp $
+
+DISTNAME=		bspwm-0.9
+CATEGORIES=		wm
+MASTER_SITES=		${MASTER_SITE_GITHUB:=baskerville/}
+GITHUB_TAG=		${PKGVERSION_NOREV}
+
+MAINTAINER=		youri@NetBSD.org
+HOMEPAGE=		https://github.com/baskerville/bspwm
+COMMENT=		Binary space partitioning window manager
+LICENSE=		2-clause-bsd
+
+USE_TOOLS+=		gmake bash:run
+REPLACE_BASH+=		contrib/freedesktop/bspwm-session
+
+EXAMPLESDIR=		${PREFIX}/share/examples/bspwm
+INSTALLATION_DIRS=	share/examples/bspwm
+
+SUBST_CLASSES+=		makefile
+SUBST_STAGE.makefile=	pre-build
+SUBST_MESSAGE.makefile=	Fixing makefile
+SUBST_FILES.makefile=	Makefile
+SUBST_SED.makefile=	-e 's,share/man,${PKGMANDIR},1'
+SUBST_SED.makefile+=	-e 's,examples,examples/*,1'
+SUBST_SED.makefile+=	-e 's,$$(DOCPREFIX)"/examples,${EXAMPLESDIR}",1'
+
+.include "../../x11/xcb-util/buildlink3.mk"
+.include "../../x11/xcb-util-wm/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
--- a/wm/bspwm/PLIST
+++ b/wm/bspwm/PLIST
@@ -0,0 +1,29 @@
+@comment $NetBSD: PLIST,v 1.1 2015/06/05 22:48:18 youri Exp $
+bin/bspc
+bin/bspwm
+bin/bspwm-session
+man/man1/bspc.1
+man/man1/bspwm.1
+share/bash-completion/completions/bspc
+share/doc/bspwm/CONTRIBUTING.md
+share/doc/bspwm/INSTALL.md
+share/doc/bspwm/MISC.md
+share/doc/bspwm/TODO.md
+share/examples/bspwm/bspwmrc
+share/examples/bspwm/external_rules/bspwmrc
+share/examples/bspwm/external_rules/external_rules
+share/examples/bspwm/loop/bspwmrc
+share/examples/bspwm/loop/profile
+share/examples/bspwm/loop/sxhkdrc
+share/examples/bspwm/loop/wm
+share/examples/bspwm/loop/xinitrc
+share/examples/bspwm/overlapping_borders/bspwmrc
+share/examples/bspwm/panel/bspwmrc
+share/examples/bspwm/panel/panel
+share/examples/bspwm/panel/panel_bar
+share/examples/bspwm/panel/panel_colors
+share/examples/bspwm/panel/profile
+share/examples/bspwm/panel/sxhkdrc
+share/examples/bspwm/sxhkdrc
+share/xsessions/bspwm.desktop
+share/zsh/site-functions/_bspc
--- a/wm/bspwm/distinfo
+++ b/wm/bspwm/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2015/06/05 22:48:18 youri Exp $
+
+SHA1 (bspwm-0.9.tar.gz) = df3c31d603c8fe19d8a3c897bd16a12cb7bcf21a
+RMD160 (bspwm-0.9.tar.gz) = 21a27e64cf576e4ab1505476609f19cc7c97e853
+Size (bspwm-0.9.tar.gz) = 62798 bytes
--- a/wm/compiz-fusion-plugins-extra/Makefile
+++ b/wm/compiz-fusion-plugins-extra/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.42 2014/10/07 16:47:36 adam Exp $
+# $NetBSD: Makefile,v 1.45 2015/06/12 10:51:47 wiz Exp $
 #

 PKGVER=		0.8.8
 PKGNAME=	compiz-fusion-plugins-extra-${PKGVER}
 DISTNAME=	compiz-plugins-extra-${PKGVER}
-PKGREVISION=	13
+PKGREVISION=	16
 CATEGORIES=	wm x11
 MASTER_SITES=	http://releases.compiz.org/${PKGVER}/

--- a/wm/compiz-fusion-plugins-main/Makefile
+++ b/wm/compiz-fusion-plugins-main/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.42 2014/10/07 16:47:36 adam Exp $
+# $NetBSD: Makefile,v 1.44 2015/04/25 14:24:59 tnn Exp $
 #

 PKGVER=		0.8.8
 PKGNAME=	compiz-fusion-plugins-main-${PKGVER}
 DISTNAME=	compiz-plugins-main-${PKGVER}
-PKGREVISION=	11
+PKGREVISION=	13
 CATEGORIES=	wm x11
 MASTER_SITES=	http://releases.compiz.org/${PKGVER}/

--- a/wm/compiz-fusion-plugins-main/buildlink3.mk
+++ b/wm/compiz-fusion-plugins-main/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.27 2014/05/05 00:48:24 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.28 2015/04/25 14:24:59 tnn Exp $

 BUILDLINK_TREE+=	compiz-fusion-plugins-main

@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	compiz-fusion-plugins-main
 COMPIZ_FUSION_PLUGINS_MAIN_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.compiz-fusion-plugins-main+=	compiz-fusion-plugins-main>=0.6.0nb1
-BUILDLINK_ABI_DEPENDS.compiz-fusion-plugins-main+=	compiz-fusion-plugins-main>=0.8.8nb9
+BUILDLINK_ABI_DEPENDS.compiz-fusion-plugins-main+=	compiz-fusion-plugins-main>=0.8.8nb13
 BUILDLINK_PKGSRCDIR.compiz-fusion-plugins-main?=	../../wm/compiz-fusion-plugins-main

 .include "../../x11/libXrandr/buildlink3.mk"
--- a/wm/compiz/Makefile
+++ b/wm/compiz/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.80 2014/11/07 19:39:42 adam Exp $
+# $NetBSD: Makefile,v 1.83 2015/04/25 14:24:59 tnn Exp $
 #

 PKGVER=		0.8.8
 DISTNAME=	compiz-${PKGVER}
-PKGREVISION=	14
+PKGREVISION=	17
 CATEGORIES=	wm x11
 MASTER_SITES=	http://releases.compiz.org/${PKGVER}/

--- a/wm/compiz/buildlink3.mk
+++ b/wm/compiz/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.35 2014/10/07 16:47:14 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.37 2015/04/25 14:24:59 tnn Exp $

 BUILDLINK_TREE+=	compiz

@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	compiz
 COMPIZ_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.compiz+=	compiz>=0.6.2
-BUILDLINK_ABI_DEPENDS.compiz+=	compiz>=0.8.8nb13
+BUILDLINK_ABI_DEPENDS.compiz+=	compiz>=0.8.8nb17
 BUILDLINK_PKGSRCDIR.compiz?=	../../wm/compiz

 pkgbase := compiz
--- a/wm/e16menuedit2/Makefile
+++ b/wm/e16menuedit2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.44 2014/05/05 00:48:24 ryoon Exp $
+# $NetBSD: Makefile,v 1.45 2015/04/25 14:24:59 tnn Exp $
 #

 DISTNAME=		e16menuedit2-0.0.3
-PKGREVISION=		23
+PKGREVISION=		24
 CATEGORIES=		wm x11
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=enlightenment/}

--- a/wm/enlightenment/Makefile
+++ b/wm/enlightenment/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.63 2014/05/29 23:37:55 wiz Exp $
+# $NetBSD: Makefile,v 1.64 2015/06/12 10:51:47 wiz Exp $

 DISTNAME=	e16-0.16.8.8
 PKGNAME=	${DISTNAME:S/e16/enlightenment/}
-PKGREVISION=	19
+PKGREVISION=	20
 CATEGORIES=	x11 gnome wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=enlightenment/}

--- a/wm/fluxconf/Makefile
+++ b/wm/fluxconf/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2014/12/01 12:39:18 joerg Exp $
+# $NetBSD: Makefile,v 1.29 2015/04/25 14:24:59 tnn Exp $
 #

 DISTNAME=	fluxconf-0.9.9
-PKGREVISION=	21
+PKGREVISION=	22
 CATEGORIES=	wm
 MASTER_SITES=	http://devaux.fabien.free.fr/flux/

--- a/wm/flwm/Makefile
+++ b/wm/flwm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2013/02/16 11:24:46 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2015/04/25 14:24:59 tnn Exp $
 #

 DISTNAME=	flwm-1.02
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	x11 wm
 MASTER_SITES=	http://flwm.sourceforge.net/
 EXTRACT_SUFX=	.tgz
--- a/wm/fvwm-devel/Makefile
+++ b/wm/fvwm-devel/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.49 2014/10/09 14:07:08 wiz Exp $
+# $NetBSD: Makefile,v 1.50 2015/06/12 10:51:47 wiz Exp $

 DISTNAME=	fvwm-${FVWM_VER}
-PKGREVISION=	9
+PKGREVISION=	10
 CATEGORIES=	x11 wm
 MASTER_SITES=	ftp://ftp.fvwm.org/pub/fvwm/version-2/
 EXTRACT_SUFX=	.tar.bz2
--- a/wm/fvwm-themes/Makefile
+++ b/wm/fvwm-themes/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2015/01/21 15:22:14 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2015/06/12 10:51:47 wiz Exp $
 #

 DISTNAME=	fvwm-themes-${THEM_VER}
-PKGREVISION=	11
+PKGREVISION=	12
 CATEGORIES=	wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fvwm-themes/}
 EXTRACT_SUFX=	.tar.bz2
--- a/wm/fvwm/Makefile
+++ b/wm/fvwm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2015/03/15 01:02:42 tnn Exp $
+# $NetBSD: Makefile,v 1.31 2015/06/12 10:51:47 wiz Exp $

 DISTNAME=	fvwm-${FVWM_VER}
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	x11 wm
 MASTER_SITES=	ftp://ftp.fvwm.org/pub/fvwm/version-2/ \
 		http://www.fvwm.org/generated/icon_download/
--- a/wm/i3/Makefile
+++ b/wm/i3/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2014/08/09 19:14:01 degroote Exp $
+# $NetBSD: Makefile,v 1.11 2015/06/12 10:51:47 wiz Exp $
 #

-DISTNAME=	i3-4.8
+DISTNAME=	i3-4.10.2
+PKGREVISION=	1
 CATEGORIES=	wm
 MASTER_SITES=	http://i3wm.org/downloads/
 EXTRACT_SUFX=	.tar.bz2
@@ -16,8 +17,7 @@ USE_LANGUAGES=	c99
 MAKE_JOBS_SAFE=	no

 PKG_SYSCONFSUBDIR=	i3
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 share/examples/i3
-INSTALLATION_DIRS+=	share/xsessions include/i3
+INSTALLATION_DIRS=	${PKGMANDIR}/man1 share/doc/${PKGBASE}

 EGDIR=		${PREFIX}/share/examples/i3
 CONF_FILES=	${EGDIR}/config ${PKG_SYSCONFDIR}/config
@@ -27,33 +27,26 @@ MAKE_ENV+=	SYSCONFDIR=${PKG_SYSCONFDIR:C/\/i3//}
 MAKE_ENV+=	DEBUG=0
 MAKE_ENV+=	SHM_SUPPORT=0

-REPLACE_INTERPRETER+=	perl
-REPLACE.perl.old=	/usr/bin/env perl
-REPLACE.perl.new=	${TOOLS_PATH.perl}
-REPLACE_FILES.perl=	i3-dmenu-desktop i3-migrate-config-to-v4
+REPLACE_PERL+=	i3-dmenu-desktop
+REPLACE_PERL+=	i3-migrate-config-to-v4 
+REPLACE_PERL+=	i3-save-tree

-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/i3 ${DESTDIR}${PREFIX}/bin/
-	${INSTALL_MAN} ${WRKSRC}/man/i3.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
-.for i in i3 i3-dmenu-desktop i3-migrate-config-to-v4 i3-sensible-editor	\
-	i3-sensible-pager i3-sensible-terminal
-	${INSTALL_SCRIPT} ${WRKSRC}/${i} ${DESTDIR}${PREFIX}/bin/
-	${INSTALL_MAN} ${WRKSRC}/man/${i}.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
-.endfor
-.for i in i3bar i3-config-wizard i3-input i3-msg i3-nagbar
-	${INSTALL_PROGRAM} ${WRKSRC}/${i}/${i} ${DESTDIR}${PREFIX}/bin/
-	${INSTALL_MAN} ${WRKSRC}/man/${i}.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
-.endfor
-	${INSTALL_DATA} ${WRKSRC}/i3.config ${DESTDIR}${EGDIR}/config
-	${INSTALL_DATA} ${WRKSRC}/i3.config.keycodes ${DESTDIR}${EGDIR}/config.keycodes
-	${INSTALL_DATA} ${WRKSRC}/i3.xsession.desktop ${DESTDIR}${PREFIX}/share/xsessions/
-	${INSTALL_DATA} ${WRKSRC}/include/i3/ipc.h ${DESTDIR}${PREFIX}/include/i3/
+SUBST_CLASSES+=		conf
+SUBST_STAGE.conf=	pre-install
+SUBST_MESSAGE.conf=	Change src/i3.mk to install conf files in share/examples
+SUBST_FILES.conf=	src/i3.mk
+SUBST_SED.conf=		-e s,$$\(SYSCONFDIR\),$$\(PREFIX\)/share/examples,g
+
+post-install:
+	${INSTALL_MAN} ${WRKSRC}/man/*.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
+	${INSTALL_DATA} ${WRKSRC}/LICENSE ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}

 .include "../../devel/libev/buildlink3.mk"
 .include "../../devel/yajl/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
+.include "../../x11/libxkbcommon/buildlink3.mk"
 .include "../../x11/xcb-util/buildlink3.mk"
 .include "../../x11/xcb-util-cursor/buildlink3.mk"
 .include "../../x11/xcb-util-keysyms/buildlink3.mk"
--- a/wm/i3/PLIST
+++ b/wm/i3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2013/10/17 22:41:12 tonnerre Exp $
+@comment $NetBSD: PLIST,v 1.3 2015/04/05 17:02:51 nros Exp $
 bin/i3
 bin/i3-config-wizard
 bin/i3-dmenu-desktop
@@ -6,22 +6,29 @@ bin/i3-input
 bin/i3-migrate-config-to-v4
 bin/i3-msg
 bin/i3-nagbar
+bin/i3-save-tree
 bin/i3-sensible-editor
 bin/i3-sensible-pager
 bin/i3-sensible-terminal
+bin/i3-with-shmlog
 bin/i3bar
 include/i3/ipc.h
 man/man1/i3-config-wizard.1
 man/man1/i3-dmenu-desktop.1
+man/man1/i3-dump-log.1
 man/man1/i3-input.1
 man/man1/i3-migrate-config-to-v4.1
 man/man1/i3-msg.1
 man/man1/i3-nagbar.1
+man/man1/i3-save-tree.1
 man/man1/i3-sensible-editor.1
 man/man1/i3-sensible-pager.1
 man/man1/i3-sensible-terminal.1
 man/man1/i3.1
 man/man1/i3bar.1
+share/applications/i3.desktop
+share/doc/i3/LICENSE
 share/examples/i3/config
 share/examples/i3/config.keycodes
-share/xsessions/i3.xsession.desktop
+share/xsessions/i3-with-shmlog.desktop
+share/xsessions/i3.desktop
--- a/wm/i3/buildlink3.mk
+++ b/wm/i3/buildlink3.mk
@@ -0,0 +1,14 @@
+# $NetBSD: buildlink3.mk,v 1.1 2015/04/05 17:04:59 nros Exp $
+
+BUILDLINK_TREE+=	i3
+
+.if !defined(I3_BUILDLINK3_MK)
+I3_BUILDLINK3_MK:=
+
+BULDLINK_DEPMETHOD.i3?=		build
+BUILDLINK_API_DEPENDS.i3+=	i3>=4.10.1
+BUILDLINK_PKGSRCDIR.i3?=	../../wm/i3
+
+.endif	# I3_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-i3
--- a/wm/i3/distinfo
+++ b/wm/i3/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2014/08/09 19:14:01 degroote Exp $
+$NetBSD: distinfo,v 1.6 2015/04/28 18:15:54 nros Exp $

-SHA1 (i3-4.8.tar.bz2) = 857d8d0014b873de406e2041dea94d81cc515b74
-RMD160 (i3-4.8.tar.bz2) = 2f21b7f59aa6edab50f2d5dbf093c68e1ddf5d03
-Size (i3-4.8.tar.bz2) = 939690 bytes
+SHA1 (i3-4.10.2.tar.bz2) = dc50d112645b9838d05e5864dc09a160c4cec8a1
+RMD160 (i3-4.10.2.tar.bz2) = 952f2a6a9fad4432065ac6435ac6cfb07affbf78
+Size (i3-4.10.2.tar.bz2) = 942759 bytes
 SHA1 (patch-Makefile) = 919f0e87efa951bde531b9172b74589d3e1c474a
 SHA1 (patch-src_log.c) = 75ac4d0681d114e0343ddb015292c6c8ee81c1ae
 SHA1 (patch-src_main.c) = c03fcb12d404fcdfd14c1892b771ee0c7a86b39d
--- a/wm/icewm13/Makefile
+++ b/wm/icewm13/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.2 2014/02/20 14:15:40 jperkin Exp $
+# $NetBSD: Makefile,v 1.3 2015/04/04 13:26:38 jmcneill Exp $

 DISTNAME=	icewm-1.3.8
 CATEGORIES=	wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=icewm/}

 MAINTAINER=	ryoon@NetBSD.org
-HOMEPAGE=	http://example.com/
-COMMENT=	TODO: Short description of the package
+HOMEPAGE=	http://www.icewm.org/
+COMMENT=	Small, fast and light-weight window manager
 #LICENSE=	# TODO: (see mk/license.mk)

 CONFLICTS+=	icewm-imlib-[0-9]*
--- a/wm/metacity/Makefile
+++ b/wm/metacity/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.113 2014/05/27 11:45:22 prlw1 Exp $
+# $NetBSD: Makefile,v 1.114 2015/04/25 14:24:59 tnn Exp $

 DISTNAME=	metacity-2.34.13
+PKGREVISION=	1
 CATEGORIES=	wm x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/metacity/2.34/}
 EXTRACT_SUFX=	.tar.xz
--- a/wm/metacity/buildlink3.mk
+++ b/wm/metacity/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.41 2014/05/05 00:48:25 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.42 2015/04/25 14:24:59 tnn Exp $

 BUILDLINK_TREE+=	metacity

@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	metacity
 METACITY_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.metacity+=	metacity>=2.8.5
-BUILDLINK_ABI_DEPENDS.metacity+=	metacity>=2.34.1nb16
+BUILDLINK_ABI_DEPENDS.metacity+=	metacity>=2.34.13nb1
 BUILDLINK_PKGSRCDIR.metacity?=	../../wm/metacity

 .include "../../devel/gettext-lib/buildlink3.mk"
--- a/wm/notion/Makefile
+++ b/wm/notion/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.20 2014/10/19 22:27:48 alnsn Exp $
+# $NetBSD: Makefile,v 1.21 2015/06/14 21:02:46 wiz Exp $

-DISTNAME=	notion-3-2014052800-src
-PKGNAME=	${DISTNAME:S/3-/3./:S/-src//}
-PKGREVISION=	2
+DISTNAME=	notion-3-2015061300
+PKGNAME=	${DISTNAME:S/3-/3./}
 CATEGORIES=	wm
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=notion/}
-EXTRACT_SUFX=	.tar.bz2
+MASTER_SITES=	${MASTER_SITE_GITHUB:=raboof/}
+GITHUB_TAG=	${DISTNAME:S/notion-//}

 MAINTAINER=	wiz@NetBSD.org
 HOMEPAGE=	http://notion.sourceforge.net/
@@ -19,6 +18,8 @@ WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
 USE_LANGUAGES=	c99
 USE_TOOLS+=	gmake msgfmt pax pkg-config

+LUA_VERSIONS_INCOMPATIBLE=	53
+
 MAKE_FLAGS+=	PREFIX=${PREFIX}
 MAKE_FLAGS+=	EXAMPLEDIR=${PREFIX}/share/examples/notion
 MAKE_FLAGS+=	MANDIR=${PREFIX}/${PKGMANDIR}
--- a/wm/notion/distinfo
+++ b/wm/notion/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.9 2014/07/26 19:58:38 wiz Exp $
+$NetBSD: distinfo,v 1.10 2015/06/14 21:02:46 wiz Exp $

-SHA1 (notion-3-2014052800-src.tar.bz2) = 83b068fe810fefa4f50caa6a3a6350c1b332e806
-RMD160 (notion-3-2014052800-src.tar.bz2) = 22d3b32f593aab24bfedb5f1e8ec1b5e6317779c
-Size (notion-3-2014052800-src.tar.bz2) = 622504 bytes
-SHA1 (patch-build_lua-detect.mk) = b641edda62f54c465a744814b8dd026d617735d5
+SHA1 (notion-3-2015061300.tar.gz) = 66962dcb6462bf9f2c621530ac845716fafe6a98
+RMD160 (notion-3-2015061300.tar.gz) = 7a894c523b39cc7c20f85779187c95480e5eac8f
+Size (notion-3-2015061300.tar.gz) = 797057 bytes
+SHA1 (patch-build_lua-detect.mk) = e0de2ef82151a5a0cfb3709116667ef6c5362f2e
 SHA1 (patch-build_rules.mk) = f8321cea75a1dfb6187ce5229f85cfea7dc5c9a7
 SHA1 (patch-libtu_output.c) = e9e9e77f0c1ff196fefa887a51f647f0dee7df89
 SHA1 (patch-mod__xrandr_Makefile) = 9299bebbd6a1f043a4095abfa19c917e4229456f
--- a/wm/notion/patches/patch-build_lua-detect.mk
+++ b/wm/notion/patches/patch-build_lua-detect.mk
@@ -1,16 +1,28 @@
-$NetBSD: patch-build_lua-detect.mk,v 1.1 2014/07/26 19:58:38 wiz Exp $
+$NetBSD: patch-build_lua-detect.mk,v 1.2 2015/06/14 21:02:46 wiz Exp $

-Fix lua detection for pkgsrc.
-
--- build/lua-detect.mk.orig	2014-05-27 22:00:18.000000000 +0000
+--- build/lua-detect.mk.orig	2015-06-13 14:37:26.000000000 +0000
 +++ build/lua-detect.mk
-@@ -27,7 +27,7 @@ ifeq ($(LUA_VERSION),5.0)
-     LUA_VERSION=
- endif
+@@ -15,20 +15,12 @@
 
-LUA_LIBS     := $(or $(shell pkg-config --libs lua$(LUA_VERSION)),   $(error "pkg-config couldn't find linker flags for lua$(LUA_VERSION)!"))
-LUA_INCLUDES := $(shell pkg-config --cflags lua$(LUA_VERSION))
-+LUA_LIBS     := $(or $(shell pkg-config --libs lua),   $(error "pkg-config couldn't find linker flags for lua!"))
-+LUA_INCLUDES := $(shell pkg-config --cflags lua)
- LUA          := $(or $(shell which lua$(LUA_VERSION)),               $(error No lua$(LUA_VERSION) interpreter found!))
- LUAC         := $(or $(shell which luac$(LUA_VERSION)),              $(error No lua$(LUA_VERSION) compiler found!))
+ LUA_VERSIONS_CANDIDATES = $(or $(LUA_VERSION),5.2 5.1 5.0)
+ 
+-LUA_PKG := $(firstword $(foreach ver,$(LUA_VERSIONS_CANDIDATES),$(shell \
+-       ($(PKG_CONFIG) --exists lua-$(ver)     && echo lua-$(ver)) \
+-    || ($(PKG_CONFIG) --exists lua$(ver:5.0=) && echo lua$(ver:5.0=)))))
+-
+-ifeq ($(LUA_PKG),)
+-    $(error Could not find $(or $(LUA_VERSION),any) lua version. (Did you install the -dev package?))
+-endif
+-
+ LUA_VERSION ?= $(or $(shell $(PKG_CONFIG) --variable=V $(LUA_PKG)),5.0)
+ 
+ # prior to 5.1 the lib didn't include version in name.
+-LUA_SUFFIX := $(if $(findstring $(LUA_VERSION),5.0),,$(LUA_VERSION))
+LUA_SUFFIX := 
+ 
+-LUA_LIBS     := $(or $(shell $(PKG_CONFIG) --libs $(LUA_PKG)), $(error "pkg-config couldn't find linker flags for lua$(LUA_SUFFIX)!"))
+-LUA_INCLUDES := $(shell $(PKG_CONFIG) --cflags $(LUA_PKG))
+LUA_LIBS     := $(or $(shell $(PKG_CONFIG) --libs lua), $(error "pkg-config couldn't find linker flags for lua!"))
+LUA_INCLUDES := $(shell $(PKG_CONFIG) --cflags lua)
+ LUA          := $(or $(shell which lua$(LUA_SUFFIX)),          $(shell which lua),  $(error No lua$(LUA_SUFFIX) interpreter found!))
+ LUAC         := $(or $(shell which luac$(LUA_SUFFIX)),         $(shell which luac), $(error No lua$(LUA_SUFFIX) compiler found!))
--- a/wm/obconf/Makefile
+++ b/wm/obconf/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.44 2014/05/05 00:48:25 ryoon Exp $
+# $NetBSD: Makefile,v 1.45 2015/04/25 14:24:59 tnn Exp $

 DISTNAME=		obconf-2.0.4
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		wm
 MASTER_SITES=		http://openbox.org/dist/obconf/

--- a/wm/openbox/Makefile
+++ b/wm/openbox/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.90 2015/02/09 03:50:20 snj Exp $
+# $NetBSD: Makefile,v 1.92 2015/06/01 17:52:38 snj Exp $

-DISTNAME=	openbox-3.5.2
-PKGREVISION=	2
+DISTNAME=	openbox-3.6
 CATEGORIES=	wm x11
 MASTER_SITES=	http://openbox.org/dist/openbox/

--- a/wm/openbox/PLIST
+++ b/wm/openbox/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.25 2013/12/08 07:56:31 obache Exp $
+@comment $NetBSD: PLIST,v 1.26 2015/06/01 17:52:38 snj Exp $
 bin/gdm-control
 bin/gnome-panel-control
 bin/obxprop
@@ -6,26 +6,26 @@ bin/openbox
 bin/openbox-gnome-session
 bin/openbox-kde-session
 bin/openbox-session
-include/openbox/3.5/obrender/color.h
-include/openbox/3.5/obrender/font.h
-include/openbox/3.5/obrender/geom.h
-include/openbox/3.5/obrender/gradient.h
-include/openbox/3.5/obrender/image.h
-include/openbox/3.5/obrender/instance.h
-include/openbox/3.5/obrender/mask.h
-include/openbox/3.5/obrender/render.h
-include/openbox/3.5/obrender/theme.h
-include/openbox/3.5/obrender/version.h
-include/openbox/3.5/obt/display.h
-include/openbox/3.5/obt/keyboard.h
-include/openbox/3.5/obt/link.h
-include/openbox/3.5/obt/paths.h
-include/openbox/3.5/obt/prop.h
-include/openbox/3.5/obt/signal.h
-include/openbox/3.5/obt/util.h
-include/openbox/3.5/obt/version.h
-include/openbox/3.5/obt/xml.h
-include/openbox/3.5/obt/xqueue.h
+include/openbox/3.6/obrender/color.h
+include/openbox/3.6/obrender/font.h
+include/openbox/3.6/obrender/geom.h
+include/openbox/3.6/obrender/gradient.h
+include/openbox/3.6/obrender/image.h
+include/openbox/3.6/obrender/instance.h
+include/openbox/3.6/obrender/mask.h
+include/openbox/3.6/obrender/render.h
+include/openbox/3.6/obrender/theme.h
+include/openbox/3.6/obrender/version.h
+include/openbox/3.6/obt/display.h
+include/openbox/3.6/obt/keyboard.h
+include/openbox/3.6/obt/link.h
+include/openbox/3.6/obt/paths.h
+include/openbox/3.6/obt/prop.h
+include/openbox/3.6/obt/signal.h
+include/openbox/3.6/obt/util.h
+include/openbox/3.6/obt/version.h
+include/openbox/3.6/obt/xml.h
+include/openbox/3.6/obt/xqueue.h
 lib/libobrender.la
 lib/libobt.la
 lib/pkgconfig/obrender-3.5.pc
@@ -77,6 +77,7 @@ share/locale/et/LC_MESSAGES/openbox.mo
 share/locale/eu/LC_MESSAGES/openbox.mo
 share/locale/fi/LC_MESSAGES/openbox.mo
 share/locale/fr/LC_MESSAGES/openbox.mo
+share/locale/gl_ES/LC_MESSAGES/openbox.mo
 share/locale/he/LC_MESSAGES/openbox.mo
 share/locale/hr/LC_MESSAGES/openbox.mo
 share/locale/hu/LC_MESSAGES/openbox.mo
--- a/wm/openbox/buildlink3.mk
+++ b/wm/openbox/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.23 2014/05/05 00:48:25 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.25 2015/05/27 14:49:33 dholland Exp $

 BUILDLINK_TREE+=	openbox

@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	openbox
 OPENBOX_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.openbox+=	openbox>=3.5
-BUILDLINK_ABI_DEPENDS.openbox?=	openbox>=3.5.2nb1
+BUILDLINK_ABI_DEPENDS.openbox?=	openbox>=3.5.2nb3
 BUILDLINK_PKGSRCDIR.openbox?=	../../wm/openbox

 pkgbase := openbox
@@ -21,6 +21,7 @@ pkgbase := openbox

 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/pango/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .endif # OPENBOX_BUILDLINK3_MK
--- a/wm/openbox/distinfo
+++ b/wm/openbox/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.29 2013/12/08 07:56:31 obache Exp $
+$NetBSD: distinfo,v 1.30 2015/06/01 17:52:38 snj Exp $

-SHA1 (openbox-3.5.2.tar.gz) = 6573516107f8cdb83842aac25a430e3f9f966bad
-RMD160 (openbox-3.5.2.tar.gz) = 0f5abc8445469b112129fe874a6fbbf80c951434
-Size (openbox-3.5.2.tar.gz) = 972751 bytes
+SHA1 (openbox-3.6.tar.gz) = b3a6163e4f7dd65bc0a387e09d32f94c5cdf5be8
+RMD160 (openbox-3.6.tar.gz) = a043273f992b2f65f8d9346935ef35305eb43472
+Size (openbox-3.6.tar.gz) = 963207 bytes
 SHA1 (patch-ab) = e6d837a3f74deacdb9ebbf813b7f86497fa34fa9
--- a/wm/oroborox/Makefile
+++ b/wm/oroborox/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.45 2014/05/17 16:10:49 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2015/04/25 14:24:59 tnn Exp $
 #

 DISTNAME=	OroboROX-0.9.8
 PKGNAME=	oroborox-0.9.8
-PKGREVISION=	26
+PKGREVISION=	27
 CATEGORIES=	wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=rox/}
 EXTRACT_SUFX=	.tar.bz2
--- a/wm/ratpoison/Makefile
+++ b/wm/ratpoison/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.39 2014/05/29 23:37:55 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2015/06/12 10:51:47 wiz Exp $
 #

 DISTNAME=	ratpoison-1.4.5
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	wm
 MASTER_SITES=	http://savannah.nongnu.org/download/ratpoison/

--- a/wm/sawfish/Makefile
+++ b/wm/sawfish/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.81 2014/05/05 00:48:25 ryoon Exp $
+# $NetBSD: Makefile,v 1.82 2015/04/25 14:24:59 tnn Exp $

 DISTNAME=		sawfish-1.10
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		x11 wm
 MASTER_SITES=		http://download.tuxfamily.org/sawfish/
 EXTRACT_SUFX=		.tar.bz2
--- a/wm/selectwm/Makefile
+++ b/wm/selectwm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2014/05/05 00:48:25 ryoon Exp $
+# $NetBSD: Makefile,v 1.32 2015/04/25 14:25:00 tnn Exp $
 #

 DISTNAME=	selectwm-0.4.1
-PKGREVISION=	25
+PKGREVISION=	26
 CATEGORIES=	wm
 MASTER_SITES=	http://ordiluc.net/selectwm/

--- a/wm/trayer/DESCR
+++ b/wm/trayer/DESCR
@@ -0,0 +1 @@
+Standalone tray app for fvwm-crystal.
--- a/wm/trayer/Makefile
+++ b/wm/trayer/Makefile
@@ -0,0 +1,34 @@
+# $NetBSD: Makefile,v 1.3 2015/04/26 10:03:52 tnn Exp $
+
+PKGREVISION=	1
+DISTNAME=	trayer-1.1.6
+CATEGORIES=	wm x11
+MASTER_SITES=	${MASTER_SITE_GITHUB:=sargon/}
+GITHUB_PROJECT=	trayer-srg
+GITHUB_TAG=	${PKGNAME_NOREV}
+
+MAINTAINER=	cheusov@NetBSD.org
+HOMEPAGE=	https://github.com/sargon/trayer-srg
+COMMENT=	Lightweight GTK2-based systray for UNIX desktop
+LICENSE=	mit
+
+USE_TOOLS+=	gmake pkg-config
+
+BUILD_MAKE_FLAGS=	CFLAGS=${CFLAGS:Q}
+INSTALL_MAKE_FLAGS=	PREFIX=${DESTDIR}${PREFIX}
+
+SUBST_CLASSES+=		paths
+SUBST_SED.paths=	-e 's,/usr,${PREFIX},'
+SUBST_FILES.paths=	config.h Makefile.config
+SUBST_STAGE.paths=	pre-build
+SUBST_MESSAGE.paths=	Fixing path to ${PREFIX}.
+
+AUTO_MKDIRS=		yes
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/trayer/
+
+.include "../../x11/gtk2/buildlink3.mk"
+.include "../../graphics/gdk-pixbuf2-xlib/buildlink3.mk"
+.include "../../x11/libXmu/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
--- a/wm/trayer/PLIST
+++ b/wm/trayer/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2015/04/19 23:37:11 cheusov Exp $
+bin/trayer
+share/doc/trayer/README
--- a/wm/trayer/distinfo
+++ b/wm/trayer/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.2 2015/04/26 10:03:52 tnn Exp $
+
+SHA1 (trayer-1.1.6.tar.gz) = f0d45c722b6e2a850ce7f7c90c36dc680353d500
+RMD160 (trayer-1.1.6.tar.gz) = 078497ce53bb1eb386f9ebd2c75ce65753fb3881
+Size (trayer-1.1.6.tar.gz) = 27582 bytes
--- a/wm/twm/Makefile
+++ b/wm/twm/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2013/09/07 05:53:39 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2015/04/17 06:57:41 wiz Exp $

-DISTNAME=	twm-1.0.8
+DISTNAME=	twm-1.0.9
 CATEGORIES=	x11 wm
 MASTER_SITES=	${MASTER_SITE_XORG:=app/}
 EXTRACT_SUFX=	.tar.bz2
--- a/wm/twm/distinfo
+++ b/wm/twm/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2013/09/07 05:53:39 wiz Exp $
+$NetBSD: distinfo,v 1.6 2015/04/17 06:57:41 wiz Exp $

-SHA1 (twm-1.0.8.tar.bz2) = b568e6242c5a2b9a05d0a198b96f3d43cf792931
-RMD160 (twm-1.0.8.tar.bz2) = 4b8e957afb93e807abeaa5b785d55d7bc7cdee5e
-Size (twm-1.0.8.tar.bz2) = 275201 bytes
+SHA1 (twm-1.0.9.tar.bz2) = 09e8a8f0d1072e11eb0d6e354d75a555b9952755
+RMD160 (twm-1.0.9.tar.bz2) = e0f5706a99b2221a0bc9af72378f6a81b428181e
+Size (twm-1.0.9.tar.bz2) = 284160 bytes
--- a/wm/waimea/Makefile
+++ b/wm/waimea/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.50 2014/05/29 23:37:55 wiz Exp $
+# $NetBSD: Makefile,v 1.51 2015/06/12 10:51:47 wiz Exp $
 #

 DISTNAME=	waimea-0.4.0
-PKGREVISION=	28
+PKGREVISION=	29
 CATEGORIES=	wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=waimea/}

--- a/wm/wbar/Makefile
+++ b/wm/wbar/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2014/05/05 00:48:25 ryoon Exp $
+# $NetBSD: Makefile,v 1.23 2015/04/25 14:25:00 tnn Exp $
 #

 DISTNAME=	wbar-2.2.2
-PKGREVISION=	17
+PKGREVISION=	18
 CATEGORIES=	wm
 MASTER_SITES=	http://wbar.googlecode.com/files/

--- a/wm/windowmaker/Makefile
+++ b/wm/windowmaker/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.111 2015/01/17 14:01:31 mef Exp $
+# $NetBSD: Makefile,v 1.112 2015/06/12 10:51:47 wiz Exp $

 DISTNAME=	WindowMaker-0.95.6
 PKGNAME=	${DISTNAME:S/WindowMaker/windowmaker/}
+PKGREVISION=	1
 CATEGORIES=	x11 wm windowmaker
 MASTER_SITES=	http://windowmaker.info/pub/source/release/

--- a/wm/wmakerconf/Makefile
+++ b/wm/wmakerconf/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.74 2014/05/29 23:37:55 wiz Exp $
+# $NetBSD: Makefile,v 1.76 2015/06/12 10:51:47 wiz Exp $

 DISTNAME=	wmakerconf-2.11
-PKGREVISION=	38
+PKGREVISION=	40
 CATEGORIES=	x11 wm windowmaker
 MASTER_SITES=	http://starplot.org/wmakerconf/

--- a/wm/xfce4-wm-themes/Makefile
+++ b/wm/xfce4-wm-themes/Makefile
@@ -1,12 +1,15 @@
-# $NetBSD: Makefile,v 1.39 2013/10/10 14:42:35 ryoon Exp $
+# $NetBSD: Makefile,v 1.41 2015/04/25 14:25:00 tnn Exp $

+PKGREVISION= 1
 .include "../../meta-pkgs/xfce4/Makefile.common"

-XFCE4_VERSION=	4.6.0
-DISTNAME=	xfwm4-themes-${XFCE4_VERSION}
-PKGNAME=	xfce4-wm-themes-${XFCE4_VERSION}
-PKGREVISION=	17
+VERSION=	4.10.0
+DISTNAME=	xfwm4-themes-${VERSION}
+PKGNAME=	xfce4-wm-themes-${VERSION}
 CATEGORIES=	wm
+MASTER_SITES=	http://archive.xfce.org/src/art/xfwm4-themes/4.10/
+
+HOMEPAGE=	https://wiki.xfce.org/howto/xfwm4_theme
 COMMENT=	Xfce window manager themes

 USE_LANGUAGES=	#empty
--- a/wm/xfce4-wm-themes/PLIST
+++ b/wm/xfce4-wm-themes/PLIST
--- a/wm/xfce4-wm-themes/buildlink3.mk
+++ b/wm/xfce4-wm-themes/buildlink3.mk
@@ -1,13 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.24 2009/09/16 01:15:34 reed Exp $
-
-BUILDLINK_TREE+=	xfce4-wm-themes
-
-.if !defined(XFCE4_WM_THEMES_BUILDLINK3_MK)
-XFCE4_WM_THEMES_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.xfce4-wm-themes+=	xfce4-wm-themes>=4.6.0
-BUILDLINK_PKGSRCDIR.xfce4-wm-themes?=	../../wm/xfce4-wm-themes
-
-.endif # XFCE4_WM_THEMES_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-xfce4-wm-themes
--- a/wm/xfce4-wm-themes/distinfo
+++ b/wm/xfce4-wm-themes/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.16 2009/09/16 01:15:34 reed Exp $
+$NetBSD: distinfo,v 1.17 2015/04/21 08:56:43 jperkin Exp $

-SHA1 (xfwm4-themes-4.6.0.tar.bz2) = 7e81d00b2b0a7a2b91071b8c3767171bce738af2
-RMD160 (xfwm4-themes-4.6.0.tar.bz2) = 1f6230cdb7626b48671c170234aa97c28ba2eaf9
-Size (xfwm4-themes-4.6.0.tar.bz2) = 508403 bytes
+SHA1 (xfwm4-themes-4.10.0.tar.bz2) = 6608cd2e615e0e058f25ccf2868f903b35b2115f
+RMD160 (xfwm4-themes-4.10.0.tar.bz2) = a5cf7cf25eab6daec7cbd1212d74298d0ac2989f
+Size (xfwm4-themes-4.10.0.tar.bz2) = 621206 bytes
--- a/wm/xfce4-wm/Makefile
+++ b/wm/xfce4-wm/Makefile
@@ -1,32 +1,18 @@
-# $NetBSD: Makefile,v 1.52 2014/05/05 00:48:25 ryoon Exp $
+# $NetBSD: Makefile,v 1.54 2015/04/25 14:25:00 tnn Exp $

+PKGREVISION= 1
 .include "../../meta-pkgs/xfce4/Makefile.common"

-DISTNAME=	xfwm4-${XFCE4_VERSION}
-PKGNAME=	xfce4-wm-${XFCE4_VERSION}
-PKGREVISION=	21
+DISTNAME=	xfwm4-4.12.2
+PKGNAME=	xfce4-wm-4.12.2
 CATEGORIES=	wm
+MASTER_SITES+=	http://archive.xfce.org/src/xfce/xfwm4/4.12/
+
+HOMEPAGE=	http://docs.xfce.org/xfce/xfwm4/start
 COMMENT=	Xfce window manager

-MAKE_DIRS+=	${PREFIX}/libexec/xfce4 ${PREFIX}/share/themes/Default
-MAKE_DIRS+=	${PREFIX}/share/xfce4 ${PREFIX}/share/xfce4/doc
-MAKE_DIRS+=	${PREFIX}/share/xfce4/doc/C ${PREFIX}/share/xfce4/doc/C/images
-MAKE_DIRS+=	${PREFIX}/share/xfce4/doc/fr ${PREFIX}/share/xfce4/doc/fr/images
-MAKE_DIRS+=	${PREFIX}/share/xfce4/doc/it ${PREFIX}/share/xfce4/doc/it/images
-
-.include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libwnck/buildlink3.mk"
-.include "../../devel/xfconf/buildlink3.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../sysutils/dbus/buildlink3.mk"
-.include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../x11/libXcomposite/buildlink3.mk"
-.include "../../x11/libXdamage/buildlink3.mk"
-.include "../../x11/libXfixes/buildlink3.mk"
-.include "../../x11/libXpm/buildlink3.mk"
-.include "../../x11/libXrender/buildlink3.mk"
-.include "../../x11/libxfce4gui/buildlink3.mk"
-.include "../../x11/libxfce4util/buildlink3.mk"
-.include "../../x11/startup-notification/buildlink3.mk"
+.include "../../x11/libxfce4ui/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
--- a/wm/xfce4-wm/PLIST
+++ b/wm/xfce4-wm/PLIST
--- a/wm/xfce4-wm/buildlink3.mk
+++ b/wm/xfce4-wm/buildlink3.mk
@@ -1,13 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.27 2009/09/16 01:15:34 reed Exp $
-
-BUILDLINK_TREE+=	xfce4-wm
-
-.if !defined(XFCE4_WM_BUILDLINK3_MK)
-XFCE4_WM_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.xfce4-wm+=	xfce4-wm>=4.6.0
-BUILDLINK_PKGSRCDIR.xfce4-wm?=	../../wm/xfce4-wm
-
-.endif # XFCE4_WM_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-xfce4-wm
--- a/wm/xfce4-wm/distinfo
+++ b/wm/xfce4-wm/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.20 2009/09/16 01:15:34 reed Exp $
+$NetBSD: distinfo,v 1.21 2015/04/21 08:56:42 jperkin Exp $

-SHA1 (xfwm4-4.6.1.tar.bz2) = 236622ffddd4618b94eaba8f402c0c48bdcef929
-RMD160 (xfwm4-4.6.1.tar.bz2) = facd0a6b6db036a066468747a757fd5f391a8f6f
-Size (xfwm4-4.6.1.tar.bz2) = 1765862 bytes
+SHA1 (xfwm4-4.12.2.tar.bz2) = fb9e9bd6f8a5e1838933355565b92cd40941b90b
+RMD160 (xfwm4-4.12.2.tar.bz2) = 961090a4fda5e3ce090d4425b7f0aac0d2cb6a16
+Size (xfwm4-4.12.2.tar.bz2) = 1191635 bytes
+SHA1 (patch-defaults_defaults) = 288fd242357739e238cca9195ee2a99a093d57d3
--- a/wm/xfce4-wm/patches/patch-defaults_defaults
+++ b/wm/xfce4-wm/patches/patch-defaults_defaults
@@ -0,0 +1,15 @@
+$NetBSD: patch-defaults_defaults,v 1.1 2015/04/21 08:56:43 jperkin Exp $
+
+Use a more pleasing theme by default. It would be even better
+if we could use one from the extra themes.
+--- defaults/defaults.orig	2015-02-28 19:17:44.000000000 +0000
+++ defaults/defaults
+@@ -52,7 +52,7 @@ snap_to_border=true
+ snap_to_windows=false
+ snap_width=10
+ sync_to_vblank=false
+-theme=Default
+theme=Daloa
+ tile_on_move=true
+ title_alignment=center
+ title_font=Sans Bold 9
--- a/wm/xmonad-contrib/Makefile
+++ b/wm/xmonad-contrib/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2015/03/01 20:02:50 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2015/05/31 12:59:16 szptvlfn Exp $

 DISTNAME=	xmonad-contrib-0.11.3
 PKGNAME=	${DISTNAME}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	wm

 MAINTAINER=	degroote@NetBSD.org
--- a/wm/xmonad/Makefile
+++ b/wm/xmonad/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2015/02/20 18:35:58 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2015/05/31 12:59:15 szptvlfn Exp $

 DISTNAME=	xmonad-0.11
 PKGNAME=	${DISTNAME}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	wm

 MAINTAINER=	esg@sdf.lonestar.org
--- a/wm/xmonad/buildlink3.mk
+++ b/wm/xmonad/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2014/11/23 12:52:33 szptvlfn Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2015/05/31 12:59:15 szptvlfn Exp $

 BUILDLINK_TREE+=	xmonad

@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	xmonad
 XMONAD_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.xmonad+=	xmonad>=0.11
-BUILDLINK_ABI_DEPENDS.xmonad+=	xmonad>=0.11nb3
+BUILDLINK_ABI_DEPENDS.xmonad+=	xmonad>=0.11nb4
 BUILDLINK_PKGSRCDIR.xmonad?=	../../wm/xmonad

 .include "../../x11/libX11/buildlink3.mk"