Update to latest snapshot from today:

Bug fixes, and better xinerama and fullscreen support.

7 files changed, 17 insertions, 92 deletions

diff --git a/wm/notion/Makefile b/wm/notion/Makefile
index 1112aa8fd48..b58c2a97004 100644
--- a/wm/notion/Makefile
+++ b/wm/notion/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2012/04/19 16:19:52 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2012/04/23 21:37:48 wiz Exp $
 #
 
-DISTNAME=	notion-3-2011102900-src
+DISTNAME=	notion-3-2012042300-src
 PKGNAME=	${DISTNAME:S/3-/3./:S/-src//}
-PKGREVISION=	2
 CATEGORIES=	wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=notion/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/wm/notion/PLIST b/wm/notion/PLIST
index 78068588e0b..6c407d328bc 100644
--- a/wm/notion/PLIST
+++ b/wm/notion/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2012/04/19 16:19:16 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2012/04/23 21:37:48 wiz Exp $
 bin/notion
 bin/pwm3plus
 lib/notion/bin/ion-completefile
@@ -63,8 +63,10 @@ share/examples/notion/cfg_statusbar.lua
 share/examples/notion/cfg_tiling.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
 share/examples/notion/contrib/keybindings/cfg_mouse.lua
 share/examples/notion/contrib/keybindings/dans_bindings.lua
@@ -209,10 +211,10 @@ share/examples/notion/look_newviolet.lua
 share/examples/notion/look_simpleblue.lua
 share/examples/notion/lookcommon_clean.lua
 share/examples/notion/lookcommon_emboss.lua
-share/locale/cs/LC_MESSAGES/ion3.mo
-share/locale/de/LC_MESSAGES/ion3.mo
-share/locale/fi/LC_MESSAGES/ion3.mo
-share/locale/fr/LC_MESSAGES/ion3.mo
+share/locale/cs/LC_MESSAGES/notion.mo
+share/locale/de/LC_MESSAGES/notion.mo
+share/locale/fi/LC_MESSAGES/notion.mo
+share/locale/fr/LC_MESSAGES/notion.mo
 share/notion/ion-completeman
 share/notion/ion-runinxterm
 share/notion/welcome.cs.txt
diff --git a/wm/notion/distinfo b/wm/notion/distinfo
index 965ab5cfced..42298303173 100644
--- a/wm/notion/distinfo
+++ b/wm/notion/distinfo
@@ -1,12 +1,9 @@
-$NetBSD: distinfo,v 1.2 2012/04/18 23:15:18 wiz Exp $
+$NetBSD: distinfo,v 1.3 2012/04/23 21:37:48 wiz Exp $
 
-SHA1 (notion-3-2011102900-src.tar.bz2) = e9f76cee087d8deb7cdef36be160ec830289331a
-RMD160 (notion-3-2011102900-src.tar.bz2) = afe2b0548a2651d8bb7333761d4842464f7bb2c9
-Size (notion-3-2011102900-src.tar.bz2) = 584767 bytes
+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 (patch-build_rules.mk) = f8321cea75a1dfb6187ce5229f85cfea7dc5c9a7
-SHA1 (patch-ioncore_manage.c) = d57e6118716989590b37e472f2d1f921cd16e049
-SHA1 (patch-ioncore_netwm.c) = ff665477c26c56eea4339484a2ad2255e5ddd7c8
-SHA1 (patch-ioncore_netwm.h) = d292d751e7c684d177d574ff2e7a7b346a55f5b9
 SHA1 (patch-libtu_output.c) = e9e9e77f0c1ff196fefa887a51f647f0dee7df89
 SHA1 (patch-pwm_Makefile) = e614eb6aea7af2b526392e7b9c17d5be262bf569
-SHA1 (patch-system.mk) = fa439b406cf79b117118991095520380fb95a109
+SHA1 (patch-system.mk) = 7f7328d687305a0e164c41c007020b2835bf1029
diff --git a/wm/notion/patches/patch-ioncore_manage.c b/wm/notion/patches/patch-ioncore_manage.c
deleted file mode 100644
index 4c9a6763d57..00000000000
--- a/wm/notion/patches/patch-ioncore_manage.c
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ioncore_manage.c,v 1.1 2012/04/18 23:15:19 wiz Exp $
-
-Fixes some fullscreen apps.
-From Philipp Hartwig <ph@phhart.de>
-on notion-general@lists.sourceforge.net
-
---- ioncore/manage.c.orig	2011-10-29 18:19:21.000000000 +0000
-+++ ioncore/manage.c
-@@ -151,8 +151,8 @@ static bool try_fullscreen(WClientWin *c
-         fs_scr=dflt;
-     }
- 
--    if(fs_scr==NULL)
--        fs_scr=netwm_check_initial_fullscreen(cwin);
-+    if(fs_scr==NULL && netwm_check_initial_fullscreen(cwin))
-+        fs_scr=dflt;
- 
-     if(fs_scr==NULL)
-         fs_scr=clientwin_fullscreen_chkrq(cwin, param->geom.w, param->geom.h);
diff --git a/wm/notion/patches/patch-ioncore_netwm.c b/wm/notion/patches/patch-ioncore_netwm.c
deleted file mode 100644
index 53b8fba24c2..00000000000
--- a/wm/notion/patches/patch-ioncore_netwm.c
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-ioncore_netwm.c,v 1.1 2012/04/18 23:15:19 wiz Exp $
-
-Fixes some fullscreen apps.
-From Philipp Hartwig <ph@phhart.de>
-on notion-general@lists.sourceforge.net
-
---- ioncore/netwm.c.orig	2011-10-29 18:19:21.000000000 +0000
-+++ ioncore/netwm.c
-@@ -95,7 +95,7 @@ void netwm_init_rootwin(WRootWin *rw)
- /*{{{ _NET_WM_STATE */
- 
- 
--WScreen *netwm_check_initial_fullscreen(WClientWin *cwin)
-+bool netwm_check_initial_fullscreen(WClientWin *cwin)
- {
- 
-     int i, n;
-@@ -106,16 +106,16 @@ WScreen *netwm_check_initial_fullscreen(
-                    1, TRUE, (uchar**)&data);
-     
-     if(n<0)
--        return NULL;
-+        return FALSE;
-     
-     for(i=0; i<n; i++){
-         if(data[i]==(long)atom_net_wm_state_fullscreen)
--            return region_screen_of((WRegion*)cwin);
-+            return TRUE;
-     }
-     
-     XFree((void*)data);
- 
--    return NULL;
-+    return FALSE;
- }
- 
- 
diff --git a/wm/notion/patches/patch-ioncore_netwm.h b/wm/notion/patches/patch-ioncore_netwm.h
deleted file mode 100644
index 4a122747459..00000000000
--- a/wm/notion/patches/patch-ioncore_netwm.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ioncore_netwm.h,v 1.1 2012/04/18 23:15:19 wiz Exp $
-
-Fixes some fullscreen apps.
-From Philipp Hartwig <ph@phhart.de>
-on notion-general@lists.sourceforge.net
-
---- ioncore/netwm.h.orig	2011-10-29 18:19:21.000000000 +0000
-+++ ioncore/netwm.h
-@@ -20,7 +20,7 @@
- extern void netwm_init();
- extern void netwm_init_rootwin(WRootWin *rw);
- 
--extern WScreen *netwm_check_initial_fullscreen(WClientWin *cwin);
-+extern bool netwm_check_initial_fullscreen(WClientWin *cwin);
- extern void netwm_update_state(WClientWin *cwin);
- extern void netwm_delete_state(WClientWin *cwin);
- extern void netwm_set_active(WRegion *reg);
diff --git a/wm/notion/patches/patch-system.mk b/wm/notion/patches/patch-system.mk
index 26574b5382a..fa97a07188e 100644
--- a/wm/notion/patches/patch-system.mk
+++ b/wm/notion/patches/patch-system.mk
@@ -1,8 +1,8 @@
-$NetBSD: patch-system.mk,v 1.1.1.1 2012/01/08 15:22:14 wiz Exp $
+$NetBSD: patch-system.mk,v 1.2 2012/04/23 21:37:48 wiz Exp $
 
 Adapt for pkgsrc.
 
---- system.mk.orig	2011-10-29 18:27:06.000000000 +0000
+--- system.mk.orig	2012-04-23 16:41:31.000000000 +0000
 +++ system.mk
 @@ -8,7 +8,8 @@
  
@@ -60,7 +60,7 @@ Adapt for pkgsrc.
  #X11_PREFIX=/usr/openwin
  
 -X11_LIBS=-L$(X11_PREFIX)/lib -lX11 -lXext
-+X11_LIBS=${LINKER_RPATH_FLAG}${X11_PREFIX}/lib -L$(X11_PREFIX)/lib -lX11 -lXext
++X11_LIBS=${COMPILER_RPATH_FLAG}${X11_PREFIX}/lib -L$(X11_PREFIX)/lib -lX11 -lXext
  X11_INCLUDES=-I$(X11_PREFIX)/include
  
  # XFree86 libraries up to 4.3.0 have a bug that can cause a segfault.