Sun Jun 14 21:02:47 2015 UTC ()
Update to 3.20150613:

Highlights include:
* Travis continuous integration
* Better lua autodetection (thanks to Nikolay Orlyuk)
* Various code consistency changes
* Fixing p2 variable scopes in xkbevents handler (thanks to Jon Canning)
* Fixing resizing of dock windows managed by mod_statusbar (thanks
to Edward J. Schwartz)


(wiz)
diff -r1.20 -r1.21 pkgsrc/wm/notion/Makefile
diff -r1.9 -r1.10 pkgsrc/wm/notion/distinfo
diff -r1.1 -r1.2 pkgsrc/wm/notion/patches/patch-build_lua-detect.mk
cvs diff -r1.20 -r1.21 pkgsrc/wm/notion/Makefile (expand / switch to unified diff)

--- pkgsrc/wm/notion/Makefile 2014/10/19 22:27:48 1.20
+++ pkgsrc/wm/notion/Makefile 2015/06/14 21:02:46 1.21
@@ -1,34 +1,35 @@ @@ -1,34 +1,35 @@
1# $NetBSD: Makefile,v 1.20 2014/10/19 22:27:48 alnsn Exp $ 1# $NetBSD: Makefile,v 1.21 2015/06/14 21:02:46 wiz Exp $
2 2
3DISTNAME= notion-3-2014052800-src 3DISTNAME= notion-3-2015061300
4PKGNAME= ${DISTNAME:S/3-/3./:S/-src//} 4PKGNAME= ${DISTNAME:S/3-/3./}
5PKGREVISION= 2 
6CATEGORIES= wm 5CATEGORIES= wm
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=notion/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=raboof/}
8EXTRACT_SUFX= .tar.bz2 7GITHUB_TAG= ${DISTNAME:S/notion-//}
9 8
10MAINTAINER= wiz@NetBSD.org 9MAINTAINER= wiz@NetBSD.org
11HOMEPAGE= http://notion.sourceforge.net/ 10HOMEPAGE= http://notion.sourceforge.net/
12COMMENT= Tiling window manager based on ion3 11COMMENT= Tiling window manager based on ion3
13LICENSE= ion-license AND gnu-lgpl-v2.1 12LICENSE= ion-license AND gnu-lgpl-v2.1
14 13
15# notion is based on ion3 14# notion is based on ion3
16CONFLICTS= ion3-[0-9]* 15CONFLICTS= ion3-[0-9]*
17 16
18WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//} 17WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//}
19USE_LANGUAGES= c99 18USE_LANGUAGES= c99
20USE_TOOLS+= gmake msgfmt pax pkg-config 19USE_TOOLS+= gmake msgfmt pax pkg-config
21 20
 21LUA_VERSIONS_INCOMPATIBLE= 53
 22
22MAKE_FLAGS+= PREFIX=${PREFIX} 23MAKE_FLAGS+= PREFIX=${PREFIX}
23MAKE_FLAGS+= EXAMPLEDIR=${PREFIX}/share/examples/notion 24MAKE_FLAGS+= EXAMPLEDIR=${PREFIX}/share/examples/notion
24MAKE_FLAGS+= MANDIR=${PREFIX}/${PKGMANDIR} 25MAKE_FLAGS+= MANDIR=${PREFIX}/${PKGMANDIR}
25MAKE_FLAGS+= X11_PREFIX=${BUILDLINK_PREFIX.libX11} 26MAKE_FLAGS+= X11_PREFIX=${BUILDLINK_PREFIX.libX11}
26MAKE_FLAGS+= X11_LIBS="${COMPILER_RPATH_FLAG}${X11_PREFIX}/lib -L$(X11_PREFIX)/lib -lX11 -lXext" 27MAKE_FLAGS+= X11_LIBS="${COMPILER_RPATH_FLAG}${X11_PREFIX}/lib -L$(X11_PREFIX)/lib -lX11 -lXext"
27MAKE_FLAGS+= LUA_INTERPRETER=${LUA_INTERPRETER} 28MAKE_FLAGS+= LUA_INTERPRETER=${LUA_INTERPRETER}
28MAKE_FLAGS+= LUA_COMPILER=${LUA_COMPILER} 29MAKE_FLAGS+= LUA_COMPILER=${LUA_COMPILER}
29MAKE_FLAGS+= LUA_VERSION=${_LUA_DOT_VERSION} 30MAKE_FLAGS+= LUA_VERSION=${_LUA_DOT_VERSION}
30 31
31EGDIR= ${PREFIX}/share/examples/notion 32EGDIR= ${PREFIX}/share/examples/notion
32EGFILES= cfg_defaults.lua 33EGFILES= cfg_defaults.lua
33EGFILES+= cfg_dock.lua 34EGFILES+= cfg_dock.lua
34EGFILES+= cfg_kludges.lua 35EGFILES+= cfg_kludges.lua
cvs diff -r1.9 -r1.10 pkgsrc/wm/notion/distinfo (expand / switch to unified diff)

--- pkgsrc/wm/notion/distinfo 2014/07/26 19:58:38 1.9
+++ pkgsrc/wm/notion/distinfo 2015/06/14 21:02:46 1.10
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.9 2014/07/26 19:58:38 wiz Exp $ 1$NetBSD: distinfo,v 1.10 2015/06/14 21:02:46 wiz Exp $
2 2
3SHA1 (notion-3-2014052800-src.tar.bz2) = 83b068fe810fefa4f50caa6a3a6350c1b332e806 3SHA1 (notion-3-2015061300.tar.gz) = 66962dcb6462bf9f2c621530ac845716fafe6a98
4RMD160 (notion-3-2014052800-src.tar.bz2) = 22d3b32f593aab24bfedb5f1e8ec1b5e6317779c 4RMD160 (notion-3-2015061300.tar.gz) = 7a894c523b39cc7c20f85779187c95480e5eac8f
5Size (notion-3-2014052800-src.tar.bz2) = 622504 bytes 5Size (notion-3-2015061300.tar.gz) = 797057 bytes
6SHA1 (patch-build_lua-detect.mk) = b641edda62f54c465a744814b8dd026d617735d5 6SHA1 (patch-build_lua-detect.mk) = e0de2ef82151a5a0cfb3709116667ef6c5362f2e
7SHA1 (patch-build_rules.mk) = f8321cea75a1dfb6187ce5229f85cfea7dc5c9a7 7SHA1 (patch-build_rules.mk) = f8321cea75a1dfb6187ce5229f85cfea7dc5c9a7
8SHA1 (patch-libtu_output.c) = e9e9e77f0c1ff196fefa887a51f647f0dee7df89 8SHA1 (patch-libtu_output.c) = e9e9e77f0c1ff196fefa887a51f647f0dee7df89
9SHA1 (patch-mod__xrandr_Makefile) = 9299bebbd6a1f043a4095abfa19c917e4229456f 9SHA1 (patch-mod__xrandr_Makefile) = 9299bebbd6a1f043a4095abfa19c917e4229456f
10SHA1 (patch-system-autodetect.mk) = 60bd996294b30171cd893e62078ca8eada24c202 10SHA1 (patch-system-autodetect.mk) = 60bd996294b30171cd893e62078ca8eada24c202
cvs diff -r1.1 -r1.2 pkgsrc/wm/notion/patches/Attic/patch-build_lua-detect.mk (expand / switch to unified diff)

--- pkgsrc/wm/notion/patches/Attic/patch-build_lua-detect.mk 2014/07/26 19:58:38 1.1
+++ pkgsrc/wm/notion/patches/Attic/patch-build_lua-detect.mk 2015/06/14 21:02:46 1.2
@@ -1,16 +1,28 @@ @@ -1,16 +1,28 @@
1$NetBSD: patch-build_lua-detect.mk,v 1.1 2014/07/26 19:58:38 wiz Exp $ 1$NetBSD: patch-build_lua-detect.mk,v 1.2 2015/06/14 21:02:46 wiz Exp $
2 2
3Fix lua detection for pkgsrc. 3--- build/lua-detect.mk.orig 2015-06-13 14:37:26.000000000 +0000
4 
5--- build/lua-detect.mk.orig 2014-05-27 22:00:18.000000000 +0000 
6+++ build/lua-detect.mk 4+++ build/lua-detect.mk
7@@ -27,7 +27,7 @@ ifeq ($(LUA_VERSION),5.0) 5@@ -15,20 +15,12 @@
8 LUA_VERSION= 6
9 endif 7 LUA_VERSIONS_CANDIDATES = $(or $(LUA_VERSION),5.2 5.1 5.0)
 8
 9-LUA_PKG := $(firstword $(foreach ver,$(LUA_VERSIONS_CANDIDATES),$(shell \
 10- ($(PKG_CONFIG) --exists lua-$(ver) && echo lua-$(ver)) \
 11- || ($(PKG_CONFIG) --exists lua$(ver:5.0=) && echo lua$(ver:5.0=)))))
 12-
 13-ifeq ($(LUA_PKG),)
 14- $(error Could not find $(or $(LUA_VERSION),any) lua version. (Did you install the -dev package?))
 15-endif
 16-
 17 LUA_VERSION ?= $(or $(shell $(PKG_CONFIG) --variable=V $(LUA_PKG)),5.0)
 18
 19 # prior to 5.1 the lib didn't include version in name.
 20-LUA_SUFFIX := $(if $(findstring $(LUA_VERSION),5.0),,$(LUA_VERSION))
 21+LUA_SUFFIX :=
10  22
11-LUA_LIBS := $(or $(shell pkg-config --libs lua$(LUA_VERSION)), $(error "pkg-config couldn't find linker flags for lua$(LUA_VERSION)!")) 23-LUA_LIBS := $(or $(shell $(PKG_CONFIG) --libs $(LUA_PKG)), $(error "pkg-config couldn't find linker flags for lua$(LUA_SUFFIX)!"))
12-LUA_INCLUDES := $(shell pkg-config --cflags lua$(LUA_VERSION)) 24-LUA_INCLUDES := $(shell $(PKG_CONFIG) --cflags $(LUA_PKG))
13+LUA_LIBS := $(or $(shell pkg-config --libs lua), $(error "pkg-config couldn't find linker flags for lua!")) 25+LUA_LIBS := $(or $(shell $(PKG_CONFIG) --libs lua), $(error "pkg-config couldn't find linker flags for lua!"))
14+LUA_INCLUDES := $(shell pkg-config --cflags lua) 26+LUA_INCLUDES := $(shell $(PKG_CONFIG) --cflags lua)
15 LUA := $(or $(shell which lua$(LUA_VERSION)), $(error No lua$(LUA_VERSION) interpreter found!)) 27 LUA := $(or $(shell which lua$(LUA_SUFFIX)), $(shell which lua), $(error No lua$(LUA_SUFFIX) interpreter found!))
16 LUAC := $(or $(shell which luac$(LUA_VERSION)), $(error No lua$(LUA_VERSION) compiler found!)) 28 LUAC := $(or $(shell which luac$(LUA_SUFFIX)), $(shell which luac), $(error No lua$(LUA_SUFFIX) compiler found!))