From 796b863dbdc415542cdcd0b602a58eb3d5539409 Mon Sep 17 00:00:00 2001 From: wiz Date: Tue, 21 Jul 2015 10:40:47 +0000 Subject: Remove now unneeded patch (after lua pc file name change). --- wm/notion/distinfo | 3 +-- wm/notion/patches/patch-build_lua-detect.mk | 28 ---------------------------- 2 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 wm/notion/patches/patch-build_lua-detect.mk (limited to 'wm/notion') diff --git a/wm/notion/distinfo b/wm/notion/distinfo index 94834636ace..607c5d6e45c 100644 --- a/wm/notion/distinfo +++ b/wm/notion/distinfo @@ -1,9 +1,8 @@ -$NetBSD: distinfo,v 1.10 2015/06/14 21:02:46 wiz Exp $ +$NetBSD: distinfo,v 1.11 2015/07/21 10:40:47 wiz Exp $ SHA1 (notion-3-2015061300.tar.gz) = 66962dcb6462bf9f2c621530ac845716fafe6a98 RMD160 (notion-3-2015061300.tar.gz) = 7a894c523b39cc7c20f85779187c95480e5eac8f Size (notion-3-2015061300.tar.gz) = 797057 bytes -SHA1 (patch-build_lua-detect.mk) = e0de2ef82151a5a0cfb3709116667ef6c5362f2e 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 deleted file mode 100644 index d1d3cb81169..00000000000 --- a/wm/notion/patches/patch-build_lua-detect.mk +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-build_lua-detect.mk,v 1.2 2015/06/14 21:02:46 wiz Exp $ - ---- build/lua-detect.mk.orig 2015-06-13 14:37:26.000000000 +0000 -+++ build/lua-detect.mk -@@ -15,20 +15,12 @@ - - LUA_VERSIONS_CANDIDATES = $(or $(LUA_VERSION),5.2 5.1 5.0) - --LUA_PKG := $(firstword $(foreach ver,$(LUA_VERSIONS_CANDIDATES),$(shell \ -- ($(PKG_CONFIG) --exists lua-$(ver) && echo lua-$(ver)) \ -- || ($(PKG_CONFIG) --exists lua$(ver:5.0=) && echo lua$(ver:5.0=))))) -- --ifeq ($(LUA_PKG),) -- $(error Could not find $(or $(LUA_VERSION),any) lua version. (Did you install the -dev package?)) --endif -- - LUA_VERSION ?= $(or $(shell $(PKG_CONFIG) --variable=V $(LUA_PKG)),5.0) - - # prior to 5.1 the lib didn't include version in name. --LUA_SUFFIX := $(if $(findstring $(LUA_VERSION),5.0),,$(LUA_VERSION)) -+LUA_SUFFIX := - --LUA_LIBS := $(or $(shell $(PKG_CONFIG) --libs $(LUA_PKG)), $(error "pkg-config couldn't find linker flags for lua$(LUA_SUFFIX)!")) --LUA_INCLUDES := $(shell $(PKG_CONFIG) --cflags $(LUA_PKG)) -+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_SUFFIX)), $(shell which lua), $(error No lua$(LUA_SUFFIX) interpreter found!)) - LUAC := $(or $(shell which luac$(LUA_SUFFIX)), $(shell which luac), $(error No lua$(LUA_SUFFIX) compiler found!)) -- cgit v1.2.3