Update to 2013030200, fixes build with lua-5.2.

Other changes unknown, but from the PLIST changes:
pwm was removed.
notionflux was added.

6 files changed, 46 insertions, 57 deletions

diff --git a/wm/notion/Makefile b/wm/notion/Makefile
index 0755481521e..4cc01b7fb46 100644
--- a/wm/notion/Makefile
+++ b/wm/notion/Makefile
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2013/07/04 21:27:58 adam Exp $
-#
+# $NetBSD: Makefile,v 1.11 2013/07/05 14:27:56 wiz Exp $
 
-DISTNAME=	notion-3-2012042300-src
+DISTNAME=	notion-3-2013030200-src
 PKGNAME=	${DISTNAME:S/3-/3./:S/-src//}
-PKGREVISION=	1
 CATEGORIES=	wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=notion/}
 EXTRACT_SUFX=	.tar.bz2
@@ -28,11 +26,11 @@ EGFILES+=	cfg_layouts.lua
 EGFILES+=	cfg_menu.lua
 EGFILES+=	cfg_notion.lua
 EGFILES+=	cfg_notioncore.lua
-EGFILES+=	cfg_pwm.lua
 EGFILES+=	cfg_query.lua
 EGFILES+=	cfg_sp.lua
 EGFILES+=	cfg_statusbar.lua
 EGFILES+=	cfg_tiling.lua
+EGFILES+=	cfg_xrandr.lua
 EGFILES+=	look.lua
 EGFILES+=	look_brownsteel.lua
 EGFILES+=	look_clean.lua
diff --git a/wm/notion/PLIST b/wm/notion/PLIST
index 6c407d328bc..e5f5678331f 100644
--- a/wm/notion/PLIST
+++ b/wm/notion/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2012/04/23 21:37:48 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2013/07/05 14:27:56 wiz Exp $
 bin/notion
-bin/pwm3plus
+bin/notionflux
 lib/notion/bin/ion-completefile
 lib/notion/bin/ion-statusd
 lib/notion/lc/de.lc
@@ -16,6 +16,7 @@ lib/notion/lc/ioncore_wd.lc
 lib/notion/lc/ioncore_winprops.lc
 lib/notion/lc/mod_dock.lc
 lib/notion/lc/mod_menu.lc
+lib/notion/lc/mod_notionflux.lc
 lib/notion/lc/mod_query.lc
 lib/notion/lc/mod_query_chdir.lc
 lib/notion/lc/mod_sm.lc
@@ -31,6 +32,7 @@ lib/notion/lc/statusd_mail.lc
 lib/notion/mod/de.so
 lib/notion/mod/mod_dock.so
 lib/notion/mod/mod_menu.so
+lib/notion/mod/mod_notionflux.so
 lib/notion/mod/mod_query.so
 lib/notion/mod/mod_sm.so
 lib/notion/mod/mod_sp.so
@@ -40,11 +42,8 @@ lib/notion/mod/mod_xinerama.so
 lib/notion/mod/mod_xkbevents.so
 lib/notion/mod/mod_xrandr.so
 man/cs/man1/notion.1
-man/cs/man1/pwm3.1
 man/fi/man1/notion.1
-man/fi/man1/pwm3.1
 man/man1/notion.1
-man/man1/pwm3.1
 share/doc/notion/ChangeLog
 share/doc/notion/LICENSE
 share/doc/notion/README
@@ -56,15 +55,14 @@ share/examples/notion/cfg_layouts.lua
 share/examples/notion/cfg_menu.lua
 share/examples/notion/cfg_notion.lua
 share/examples/notion/cfg_notioncore.lua
-share/examples/notion/cfg_pwm.lua
 share/examples/notion/cfg_query.lua
 share/examples/notion/cfg_sp.lua
 share/examples/notion/cfg_statusbar.lua
 share/examples/notion/cfg_tiling.lua
+share/examples/notion/cfg_xrandr.lua
 share/examples/notion/contrib/LICENSE
 share/examples/notion/contrib/README
 share/examples/notion/contrib/create_gitindex.sh
-share/examples/notion/contrib/exact-version
 share/examples/notion/contrib/index.html
 share/examples/notion/contrib/index_git.html
 share/examples/notion/contrib/install-scripts.sh
@@ -83,6 +81,7 @@ share/examples/notion/contrib/scripts/closeorkill.lua
 share/examples/notion/contrib/scripts/collapse.lua
 share/examples/notion/contrib/scripts/ctrl_statusbar.lua
 share/examples/notion/contrib/scripts/cwin_sp.lua
+share/examples/notion/contrib/scripts/display_by_tag.lua
 share/examples/notion/contrib/scripts/document_menus.lua
 share/examples/notion/contrib/scripts/enumerate.lua
 share/examples/notion/contrib/scripts/environment_placement_hook.lua
@@ -217,6 +216,7 @@ share/locale/fi/LC_MESSAGES/notion.mo
 share/locale/fr/LC_MESSAGES/notion.mo
 share/notion/ion-completeman
 share/notion/ion-runinxterm
+share/notion/notion-lock
 share/notion/welcome.cs.txt
 share/notion/welcome.fi.txt
 share/notion/welcome.txt
diff --git a/wm/notion/distinfo b/wm/notion/distinfo
index 42298303173..782f19accdc 100644
--- a/wm/notion/distinfo
+++ b/wm/notion/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.3 2012/04/23 21:37:48 wiz Exp $
+$NetBSD: distinfo,v 1.4 2013/07/05 14:27:56 wiz Exp $
 
-SHA1 (notion-3-2012042300-src.tar.bz2) = df2ebc35904f6da17f3c4a50735d88a98a91daf5
-RMD160 (notion-3-2012042300-src.tar.bz2) = b877152e6c566f682e8b23cc8595546458f029ab
-Size (notion-3-2012042300-src.tar.bz2) = 587151 bytes
+SHA1 (notion-3-2013030200-src.tar.bz2) = 1c5d0cf140d1681a99c0fccbd8979846076d5dca
+RMD160 (notion-3-2013030200-src.tar.bz2) = 5330bcd7743b5756faf552912a1c10d481e50e1a
+Size (notion-3-2013030200-src.tar.bz2) = 625211 bytes
 SHA1 (patch-build_rules.mk) = f8321cea75a1dfb6187ce5229f85cfea7dc5c9a7
 SHA1 (patch-libtu_output.c) = e9e9e77f0c1ff196fefa887a51f647f0dee7df89
-SHA1 (patch-pwm_Makefile) = e614eb6aea7af2b526392e7b9c17d5be262bf569
-SHA1 (patch-system.mk) = 7f7328d687305a0e164c41c007020b2835bf1029
+SHA1 (patch-mod__xrandr_Makefile) = 9299bebbd6a1f043a4095abfa19c917e4229456f
+SHA1 (patch-system-autodetect.mk) = 3c0e6046950441280fa12495d57bc6afc00ead44
diff --git a/wm/notion/patches/patch-mod__xrandr_Makefile b/wm/notion/patches/patch-mod__xrandr_Makefile
new file mode 100644
index 00000000000..6625b2ad30e
--- /dev/null
+++ b/wm/notion/patches/patch-mod__xrandr_Makefile
@@ -0,0 +1,18 @@
+$NetBSD: patch-mod__xrandr_Makefile,v 1.1 2013/07/05 14:27:56 wiz Exp $
+
+Install into examples directory, let pkgsrc framework deal with config files.
+
+--- mod_xrandr/Makefile.orig	2013-03-02 21:05:13.000000000 +0000
++++ mod_xrandr/Makefile
+@@ -27,9 +27,9 @@ include $(TOPDIR)/build/rules.mk
+ ######################################
+ 
+ _install: module_install
+-	$(INSTALLDIR) $(DESTDIR)$(ETCDIR)
++	$(INSTALLDIR) $(DESTDIR)$(EXAMPLEDIR)
+ 	for i in $(ETC); do \
+-		$(INSTALL) -m $(DATA_MODE) $$i $(DESTDIR)$(ETCDIR); \
++		$(INSTALL) -m $(DATA_MODE) $$i $(DESTDIR)$(EXAMPLEDIR); \
+ 	done
+ 
+ ######################################
diff --git a/wm/notion/patches/patch-pwm_Makefile b/wm/notion/patches/patch-pwm_Makefile
deleted file mode 100644
index 63d1dacc600..00000000000
--- a/wm/notion/patches/patch-pwm_Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-pwm_Makefile,v 1.1.1.1 2012/01/08 15:22:14 wiz Exp $
-
-Install config to example directory; will be installed
-with pkgsrc config framework.
-
---- pwm/Makefile.orig	2011-10-29 18:19:21.000000000 +0000
-+++ pwm/Makefile
-@@ -49,7 +49,7 @@ include $(TOPDIR)/build/rules.mk
- ######################################
- 
- _install: executable_install
--	$(INSTALLDIR) $(DESTDIR)$(PWM_ETCDIR)
-+	$(INSTALLDIR) $(DESTDIR)$(EXAMPLEDIR)
- 	for i in $(ETC); do \
--		$(INSTALL) -m $(DATA_MODE) $$i $(DESTDIR)$(PWM_ETCDIR); \
-+		$(INSTALL) -m $(DATA_MODE) $$i $(DESTDIR)$(EXAMPLEDIR); \
- 	done
diff --git a/wm/notion/patches/patch-system.mk b/wm/notion/patches/patch-system-autodetect.mk
index fa97a07188e..27dff018108 100644
--- a/wm/notion/patches/patch-system.mk
+++ b/wm/notion/patches/patch-system-autodetect.mk
@@ -1,20 +1,19 @@
-$NetBSD: patch-system.mk,v 1.2 2012/04/23 21:37:48 wiz Exp $
+$NetBSD: patch-system-autodetect.mk,v 1.1 2013/07/05 14:27:56 wiz Exp $
 
 Adapt for pkgsrc.
 
---- system.mk.orig	2012-04-23 16:41:31.000000000 +0000
-+++ system.mk
-@@ -8,7 +8,8 @@
- 
+--- system-autodetect.mk.orig	2013-03-02 21:02:30.000000000 +0000
++++ system-autodetect.mk
+@@ -9,7 +9,7 @@
  # Installation path prefix. Unless you know what you're doing, the default
  # of /usr/local is likely the correct choice.
+ #DIST: PREFIX=/usr/local
 -PREFIX=/usr/local
-+# set by pkgsrc
 +#PREFIX=/usr/local
  
  # Unless you are creating a package conforming to some OS's standards, you
  # probably do not want to modify the following directories:
-@@ -16,11 +17,12 @@ PREFIX=/usr/local
+@@ -17,11 +17,12 @@ PREFIX=/usr/local
  # Main binaries
  BINDIR=$(PREFIX)/bin
  # Configuration .lua files
@@ -28,7 +27,7 @@ Adapt for pkgsrc.
  # Some documents
  DOCDIR=$(PREFIX)/share/doc/notion
  # Nothing at the moment
-@@ -53,7 +55,8 @@ LOCALEDIR=$(PREFIX)/share/locale
+@@ -54,7 +55,8 @@ LOCALEDIR=$(PREFIX)/share/locale
  
  # Flags to link with libdl. Even if PRELOAD_MODULES=1, you may need this
  # setting (for e.g. Lua, when not instructed by pkg-config).
@@ -38,7 +37,7 @@ Adapt for pkgsrc.
  
  
  ##
-@@ -66,8 +69,8 @@ DL_LIBS=-ldl
+@@ -67,8 +69,8 @@ DL_LIBS=-ldl
  
  # Default to paths and names that should work for a build installed from the
  # official Lua 5.1 source tarball.
@@ -47,9 +46,9 @@ Adapt for pkgsrc.
 +LUA_DIR=$(PREFIX)
 +LUA_LIBS=${LINKER_RPATH_FLAG}$(LUA_DIR)/lib -L$(LUA_DIR)/lib -llua
  LUA_INCLUDES = -I$(LUA_DIR)/include
- LUA=$(LUA_DIR)/bin/lua
- LUAC=$(LUA_DIR)/bin/luac
-@@ -100,11 +103,12 @@ endif # LUA_MANUAL
+ 
+ ifneq ($(shell which lua),)
+@@ -132,11 +134,12 @@ endif # lua manual
  ##
  
  # Paths
@@ -64,7 +63,7 @@ Adapt for pkgsrc.
  X11_INCLUDES=-I$(X11_PREFIX)/include
  
  # XFree86 libraries up to 4.3.0 have a bug that can cause a segfault.
-@@ -132,7 +136,7 @@ DEFINES += -DCF_XFREE86_TEXTPROP_BUG_WOR
+@@ -164,7 +167,7 @@ DEFINES += -DCF_XFREE86_TEXTPROP_BUG_WOR
  #DEFINES += -DCF_NO_LOCALE -DCF_NO_GETTEXT
  
  # On some other systems you may need to explicitly link against libintl.
@@ -73,12 +72,3 @@ Adapt for pkgsrc.
  # You may also need to give the location of its headers. The following
  # should work on Mac OS X (which needs the above option as well) with
  # macports.
-@@ -146,7 +150,7 @@ DEFINES += -DCF_XFREE86_TEXTPROP_BUG_WOR
- # You may uncomment this if you know that your system C libary provides
- # asprintf and  vasprintf. (GNU libc does.) If HAS_SYSTEM_ASPRINTF is not
- # defined, an implementation provided in libtu/sprintf_2.2/ is used. 
--#HAS_SYSTEM_ASPRINTF=1
-+HAS_SYSTEM_ASPRINTF=1
- 
- # The following setting is needed with GNU libc for clock_gettime and the
- # monotonic clock. Other systems may not need it, or may not provide a