Update to 2.3.6

Changelog:
Changes in 2.3.6 (20160812)

    Auto-maximization of windows when the mouse is brought to the edge of the screen (issue #49). This feature is disabled by default, but can be enabled via the aerosnap group option.
    Added Traditional Chinese translation (from Jim Tsai).
    Added the TaskListStyle and TrayButtonStyle tags to control the look of task lists and tray buttons. These were removed in v2.3.0, but are now back (issue #276).
    Fixed rendering of gradient highlights on menus.
    Changed the default configuration to explicitly set a 24-hour clock format.
    Made the default window title height match the font size used in window titles.
    Added the ability to set a default icon using the DefaultIcon tag (issue #310).
    Added the ability to disable move/resize using mod1+drag via the nodrag group option (issue #311).
    Made JWM raise the selected window when tabbing between windows (issue #313).
    Fixed an issue with some system tray icons not showing up (issue #314).
    Tiled window placement is now confined to the active display (pull request #318).
    Changed to the MIT license (issue #320).
    Added the labeled option to TaskListStyle to allow disabling labels for task lists.


Changes in 2.3.5 (20160326)

    Faster icon loading (issue #258).
    Configurable default window icon via the ButtonMenu tag (issue #246).
    Added the ilist and ipager group options to ignore program-specified task list and pager settings (issue #263).
    Made it so clicking a submenu does not close the menu (issue #264).
    Made the tray respond to clicks at screen edges (issue #270).
    Made tiled window placement (the tiled group option) minimize overlap if no window position can be found with no overlap (issue #269).
    Removed exit confirmation when exit is invoked from the command line (issue #275).
    Now maximized windows restore when being dragged.
    Restored the ClockStyle tag to allow setting a custom font and color for clocks (issue #276).
    Fixed layout and mouse location tracking of tray items for trays with lots of components.
    Added the ability to use the output of a program for Include (issue #291).
    Added the fixed group option (issue #209).

4 files changed, 20 insertions, 16 deletions

diff --git a/wm/jwm/Makefile b/wm/jwm/Makefile
index 7fd1c2893db..5636ebbf2c8 100644
--- a/wm/jwm/Makefile
+++ b/wm/jwm/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2015/12/15 15:44:44 tsutsui Exp $
+# $NetBSD: Makefile,v 1.29 2016/08/21 11:18:37 ryoon Exp $
 #
 
-DISTNAME=		jwm-2.3.4
-PKGREVISION=		1
+DISTNAME=		jwm-2.3.6
 CATEGORIES=		wm x11
 MASTER_SITES=		http://www.joewing.net/programs/jwm/releases/
 EXTRACT_SUFX=		.tar.xz
diff --git a/wm/jwm/PLIST b/wm/jwm/PLIST
index 2d550657b6c..bc1a2a36166 100644
--- a/wm/jwm/PLIST
+++ b/wm/jwm/PLIST
@@ -1,7 +1,11 @@
-@comment $NetBSD: PLIST,v 1.3 2015/12/15 15:44:44 tsutsui Exp $
+@comment $NetBSD: PLIST,v 1.4 2016/08/21 11:18:37 ryoon Exp $
 bin/jwm
 man/man1/jwm.1
 share/examples/jwm/system.jwmrc
+share/jwm/jwm-blue.svg
+share/jwm/jwm-gray.svg
+share/jwm/jwm-orange.svg
+share/jwm/jwm.xbm
 share/locale/de/LC_MESSAGES/jwm.mo
 share/locale/es/LC_MESSAGES/jwm.mo
 share/locale/fr/LC_MESSAGES/jwm.mo
@@ -9,7 +13,8 @@ share/locale/hu/LC_MESSAGES/jwm.mo
 share/locale/it/LC_MESSAGES/jwm.mo
 share/locale/nl/LC_MESSAGES/jwm.mo
 share/locale/pl/LC_MESSAGES/jwm.mo
-share/locale/pt-br/LC_MESSAGES/jwm.mo
 share/locale/pt/LC_MESSAGES/jwm.mo
+share/locale/pt_BR/LC_MESSAGES/jwm.mo
 share/locale/ru/LC_MESSAGES/jwm.mo
 share/locale/zh_CN/LC_MESSAGES/jwm.mo
+share/locale/zh_TW/LC_MESSAGES/jwm.mo
diff --git a/wm/jwm/distinfo b/wm/jwm/distinfo
index 80daa508f19..173929695d7 100644
--- a/wm/jwm/distinfo
+++ b/wm/jwm/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.10 2015/12/13 15:02:36 tsutsui Exp $
+$NetBSD: distinfo,v 1.11 2016/08/21 11:18:37 ryoon Exp $
 
-SHA1 (jwm-2.3.4.tar.xz) = c37458ba5f5b676c2c374c45da5abe3e3c78246c
-RMD160 (jwm-2.3.4.tar.xz) = a1b244c1a2cd4266b000939460a841c73f103cb7
-SHA512 (jwm-2.3.4.tar.xz) = db9f46ced4b1f8128673b551cd865b6c9b6c8d43f839cfe898168251e8326d402a510ce77144273488c1e65a96d66e16124e4b4749a5a96a9057c1eb20c2bee1
-Size (jwm-2.3.4.tar.xz) = 332140 bytes
-SHA1 (patch-Makefile.in) = a458542a4c5330b4d2d3272b625943471830c968
+SHA1 (jwm-2.3.6.tar.xz) = 7a966fafa129dbb42e414b2ac2aa8267f0ff7909
+RMD160 (jwm-2.3.6.tar.xz) = 14d3b1b4adcd26305669ab3a2cd069da6cb92f57
+SHA512 (jwm-2.3.6.tar.xz) = ed3556bf2e28bfcf36b2b145e6c08e75c24e47b723b16ce072100d2773338d819c5465e7af2dc6b842e2e35f375ec3a0b85d9987e0a8acecdbe628dc09eabd11
+Size (jwm-2.3.6.tar.xz) = 343644 bytes
+SHA1 (patch-Makefile.in) = 0ae071bfa59770c3b07f8ab6ce138e6d92318e1f
 SHA1 (patch-src_Makefile.in) = db9b310a04e0542fbbacaba7633bfd0a286d778c
diff --git a/wm/jwm/patches/patch-Makefile.in b/wm/jwm/patches/patch-Makefile.in
index effa9a43185..c05d61ca5c4 100644
--- a/wm/jwm/patches/patch-Makefile.in
+++ b/wm/jwm/patches/patch-Makefile.in
@@ -1,21 +1,21 @@
-$NetBSD: patch-Makefile.in,v 1.1 2015/12/13 15:02:36 tsutsui Exp $
+$NetBSD: patch-Makefile.in,v 1.2 2016/08/21 11:18:37 ryoon Exp $
 
 - put config files into the example dir
 - use pkgsrc INSTALL_MACROS
 
---- Makefile.in.orig	2015-11-22 20:29:54.000000000 +0000
+--- Makefile.in.orig	2016-08-12 01:27:56.000000000 +0000
 +++ Makefile.in
 @@ -1,5 +1,5 @@
  PACKAGE = jwm
 -SYSCONF = $(DESTDIR)@SYSCONF@
 +SYSCONF = $(DESTDIR)@@EGDIR@@
  MANDIR = $(DESTDIR)@MANDIR@
+ ICONDIR = $(DESTDIR)@ICONDIR@
  VERSION ?= @VERSION@
- USE_NLS = @USE_NLS@
-@@ -11,10 +11,10 @@ all:
- install: all
+@@ -13,10 +13,10 @@ install: all
  	$(MAKE) -C src install
  	$(MAKE) -C po install
+ 	$(MAKE) -C contrib install
 -	install -d -m 0755 $(SYSCONF)
 -	install -m 644 example.jwmrc $(SYSCONF)/system.jwmrc
 -	install -d -m 0755 $(MANDIR)/man1