diff options
| author | wiz <wiz@pkgsrc.org> | 2014-07-26 19:58:38 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2014-07-26 19:58:38 +0000 |
| commit | c7af555b46faab51f584e2aaef02c4c0c247413a (patch) | |
| tree | b4c5d520c42685e9bf047d1d682b290ec9556f70 /wm | |
| parent | 1451faba1155e93048df38277e7951c594c357cc (diff) | |
| download | pkgsrc-c7af555b46faab51f584e2aaef02c4c0c247413a.tar.gz | |
Fix lua detection and usage. Allow 52 again. Bump PKGREVISION.
Diffstat (limited to 'wm')
| -rw-r--r-- | wm/notion/Makefile | 5 | ||||
| -rw-r--r-- | wm/notion/distinfo | 3 | ||||
| -rw-r--r-- | wm/notion/patches/patch-build_lua-detect.mk | 16 |
3 files changed, 21 insertions, 3 deletions
diff --git a/wm/notion/Makefile b/wm/notion/Makefile index 14eb209e28a..1eeb7b3780d 100644 --- a/wm/notion/Makefile +++ b/wm/notion/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.18 2014/05/28 06:25:49 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2014/07/26 19:58:38 wiz Exp $ DISTNAME= notion-3-2014052800-src PKGNAME= ${DISTNAME:S/3-/3./:S/-src//} +PKGREVISION= 1 CATEGORIES= wm MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=notion/} EXTRACT_SUFX= .tar.bz2 @@ -17,7 +18,6 @@ CONFLICTS= ion3-[0-9]* WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//} USE_LANGUAGES= c99 USE_TOOLS+= gmake msgfmt pax pkg-config -LUA_VERSIONS_ACCEPTED= 51 MAKE_FLAGS+= PREFIX=${PREFIX} MAKE_FLAGS+= EXAMPLEDIR=${PREFIX}/share/examples/notion @@ -26,6 +26,7 @@ MAKE_FLAGS+= X11_PREFIX=${BUILDLINK_PREFIX.libX11} MAKE_FLAGS+= X11_LIBS="${COMPILER_RPATH_FLAG}${X11_PREFIX}/lib -L$(X11_PREFIX)/lib -lX11 -lXext" MAKE_FLAGS+= LUA_INTERPRETER=${LUA_INTERPRETER} MAKE_FLAGS+= LUA_COMPILER=${LUA_COMPILER} +MAKE_FLAGS+= LUA_VERSION=${_LUA_DOT_VERSION} EGDIR= ${PREFIX}/share/examples/notion EGFILES= cfg_defaults.lua diff --git a/wm/notion/distinfo b/wm/notion/distinfo index 0c474e374dc..82a7f91043a 100644 --- a/wm/notion/distinfo +++ b/wm/notion/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.8 2014/05/28 06:25:49 wiz Exp $ +$NetBSD: distinfo,v 1.9 2014/07/26 19:58:38 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 (patch-build_rules.mk) = f8321cea75a1dfb6187ce5229f85cfea7dc5c9a7 SHA1 (patch-libtu_output.c) = e9e9e77f0c1ff196fefa887a51f647f0dee7df89 SHA1 (patch-mod__xrandr_Makefile) = 9299bebbd6a1f043a4095abfa19c917e4229456f diff --git a/wm/notion/patches/patch-build_lua-detect.mk b/wm/notion/patches/patch-build_lua-detect.mk new file mode 100644 index 00000000000..46046e3f63d --- /dev/null +++ b/wm/notion/patches/patch-build_lua-detect.mk @@ -0,0 +1,16 @@ +$NetBSD: patch-build_lua-detect.mk,v 1.1 2014/07/26 19:58:38 wiz Exp $ + +Fix lua detection for pkgsrc. + +--- build/lua-detect.mk.orig 2014-05-27 22:00:18.000000000 +0000 ++++ build/lua-detect.mk +@@ -27,7 +27,7 @@ ifeq ($(LUA_VERSION),5.0) + LUA_VERSION= + endif + +-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!)) |