diff options
Diffstat (limited to 'wm')
| -rw-r--r-- | wm/awesome/Makefile | 4 | ||||
| -rw-r--r-- | wm/notion/Makefile | 7 | ||||
| -rw-r--r-- | wm/notion/distinfo | 4 | ||||
| -rw-r--r-- | wm/notion/patches/patch-system-autodetect.mk | 29 |
4 files changed, 31 insertions, 13 deletions
diff --git a/wm/awesome/Makefile b/wm/awesome/Makefile index 1f939a3c527..e0d79868cdd 100644 --- a/wm/awesome/Makefile +++ b/wm/awesome/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.50 2014/04/29 22:18:04 degroote Exp $ +# $NetBSD: Makefile,v 1.51 2014/05/03 13:01:25 alnsn Exp $ # DISTNAME= awesome-3.5.5 +PKGREVISION= 1 CATEGORIES= x11 wm MASTER_SITES= http://awesome.naquadah.org/download/ EXTRACT_SUFX= .tar.xz @@ -12,6 +13,7 @@ COMMENT= Tiling window manager based on dwm LICENSE= gnu-gpl-v2 CONFLICTS+= awesome<3.0 +LUA_VERSIONS_INCOMPATIBLE=52 USE_TOOLS+= bash gmake pkg-config USE_CMAKE= yes diff --git a/wm/notion/Makefile b/wm/notion/Makefile index 73e51e6b709..7493ddecaea 100644 --- a/wm/notion/Makefile +++ b/wm/notion/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.14 2013/10/30 06:49:55 dholland Exp $ +# $NetBSD: Makefile,v 1.15 2014/05/03 13:01:25 alnsn Exp $ DISTNAME= notion-3-2013030200-src PKGNAME= ${DISTNAME:S/3-/3./:S/-src//} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= wm MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=notion/} EXTRACT_SUFX= .tar.bz2 @@ -18,7 +18,10 @@ CONFLICTS= ion3-[0-9]* WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//} USE_LANGUAGES= c99 USE_TOOLS+= gmake msgfmt pax pkg-config + MAKE_FLAGS+= X11_PREFIX=${BUILDLINK_PREFIX.libX11} +MAKE_FLAGS+= LUA_INTERPRETER=${LUA_INTERPRETER} +MAKE_FLAGS+= LUA_COMPILER=${LUA_COMPILER} EGDIR= ${PREFIX}/share/examples/notion EGFILES= cfg_defaults.lua diff --git a/wm/notion/distinfo b/wm/notion/distinfo index d725fa8b1d6..3f7562aaa19 100644 --- a/wm/notion/distinfo +++ b/wm/notion/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2013/10/20 17:48:54 joerg Exp $ +$NetBSD: distinfo,v 1.6 2014/05/03 13:01:25 alnsn Exp $ SHA1 (notion-3-2013030200-src.tar.bz2) = 1c5d0cf140d1681a99c0fccbd8979846076d5dca RMD160 (notion-3-2013030200-src.tar.bz2) = 5330bcd7743b5756faf552912a1c10d481e50e1a @@ -6,4 +6,4 @@ Size (notion-3-2013030200-src.tar.bz2) = 625211 bytes SHA1 (patch-build_rules.mk) = f8321cea75a1dfb6187ce5229f85cfea7dc5c9a7 SHA1 (patch-libtu_output.c) = e9e9e77f0c1ff196fefa887a51f647f0dee7df89 SHA1 (patch-mod__xrandr_Makefile) = 9299bebbd6a1f043a4095abfa19c917e4229456f -SHA1 (patch-system-autodetect.mk) = d68a698a20db783de30c85482586681a2250b062 +SHA1 (patch-system-autodetect.mk) = 2cdaa0401ceccbf791aa4a52716762a3e43cce5f diff --git a/wm/notion/patches/patch-system-autodetect.mk b/wm/notion/patches/patch-system-autodetect.mk index e672c0023dd..ca4452765a2 100644 --- a/wm/notion/patches/patch-system-autodetect.mk +++ b/wm/notion/patches/patch-system-autodetect.mk @@ -1,4 +1,4 @@ -$NetBSD: patch-system-autodetect.mk,v 1.2 2013/10/20 17:48:54 joerg Exp $ +$NetBSD: patch-system-autodetect.mk,v 1.3 2014/05/03 13:01:25 alnsn Exp $ Adapt for pkgsrc. @@ -37,18 +37,31 @@ Adapt for pkgsrc. ## -@@ -67,8 +69,8 @@ DL_LIBS=-ldl +@@ -63,18 +65,14 @@ DL_LIBS=-ldl + + # To skip auto-detection of lua uncomment this and edit the variables below to + # suit your installation of lua. +-#LUA_MANUAL=1 ++LUA_MANUAL=1 # Default to paths and names that should work for a build installed from the # official Lua 5.1 source tarball. -LUA_DIR=/usr/local -LUA_LIBS=-L$(LUA_DIR)/lib -llua -+LUA_DIR=$(PREFIX) -+LUA_LIBS=${COMPILER_RPATH_FLAG}$(LUA_DIR)/lib -L$(LUA_DIR)/lib -llua - LUA_INCLUDES = -I$(LUA_DIR)/include +-LUA_INCLUDES = -I$(LUA_DIR)/include +- +-ifneq ($(shell which lua),) +-LUA=$(LUA_DIR)/bin/lua +-LUAC=$(LUA_DIR)/bin/luac +-endif ++LUA_LIBS=`pkg-config --libs lua` ++LUA_INCLUDES=`pkg-config --cflags lua` ++LUA=$(LUA_INTERPRETER) ++LUAC=$(LUA_COMPILER) + + # Attempt to autodect lua using pkg-config. - ifneq ($(shell which lua),) -@@ -132,11 +134,12 @@ endif # lua manual +@@ -132,11 +130,12 @@ endif # lua manual ## # Paths @@ -63,7 +76,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. -@@ -164,7 +167,7 @@ DEFINES += -DCF_XFREE86_TEXTPROP_BUG_WOR +@@ -164,7 +163,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. |