summaryrefslogtreecommitdiff
path: root/lang/lua
diff options
context:
space:
mode:
authorsketch <sketch@pkgsrc.org>2009-01-20 16:30:39 +0000
committersketch <sketch@pkgsrc.org>2009-01-20 16:30:39 +0000
commit3948e33bd7bce413cf4217e303dc64452862ca4a (patch)
tree18219934c0c2b1eea4e4e5aabe7974d34deac23b /lang/lua
parent1726335b5ffc8724a0566ef9c21bf7d1a9caa9fb (diff)
downloadpkgsrc-3948e33bd7bce413cf4217e303dc64452862ca4a.tar.gz
Use our INSTALL_DATA.
Diffstat (limited to 'lang/lua')
-rw-r--r--lang/lua/Makefile3
-rw-r--r--lang/lua/distinfo4
-rw-r--r--lang/lua/patches/patch-aa21
3 files changed, 19 insertions, 9 deletions
diff --git a/lang/lua/Makefile b/lang/lua/Makefile
index 1af6819cc73..8ddf6713e4c 100644
--- a/lang/lua/Makefile
+++ b/lang/lua/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2009/01/11 23:15:55 minskim Exp $
+# $NetBSD: Makefile,v 1.40 2009/01/20 16:30:39 sketch Exp $
DISTNAME= lua-${LUA_VERSION}
CATEGORIES= lang
@@ -24,6 +24,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
USE_LIBTOOL= yes
USE_TOOLS+= gmake
MAKE_ENV+= DLLIB=${BUILDLINK_LDADD.dl:Q}
+MAKE_ENV+= INSTALL_DATA=${INSTALL_DATA:Q}
CFLAGS+= -DLUA_ROOT=\"${PREFIX}/\"
DOCDIR= ${PREFIX}/share/doc/lua
diff --git a/lang/lua/distinfo b/lang/lua/distinfo
index 1a659d96a99..6fa023d69dc 100644
--- a/lang/lua/distinfo
+++ b/lang/lua/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.22 2008/09/07 14:03:42 wiz Exp $
+$NetBSD: distinfo,v 1.23 2009/01/20 16:30:39 sketch Exp $
SHA1 (lua-5.1.4.tar.gz) = 2b11c8e60306efb7f0734b747588f57995493db7
RMD160 (lua-5.1.4.tar.gz) = c867c8364295d3e4fb4e4d8ebb27fa2b2312cdef
Size (lua-5.1.4.tar.gz) = 216679 bytes
-SHA1 (patch-aa) = e1ae20d568097f2694abb2d2366082c829195ba8
+SHA1 (patch-aa) = 28b7564fe8fd43d84fb48d74ec14f301dc9615a0
SHA1 (patch-ab) = 3c7a47f9e513b46003d1a05dd3bb99d42070885c
SHA1 (patch-ac) = 9e882a3fd420a45ab4ac0dca55d1b2fac46eb7de
diff --git a/lang/lua/patches/patch-aa b/lang/lua/patches/patch-aa
index 78fc30217ee..3b0cbd4810a 100644
--- a/lang/lua/patches/patch-aa
+++ b/lang/lua/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.17 2008/09/07 14:03:42 wiz Exp $
+$NetBSD: patch-aa,v 1.18 2009/01/20 16:30:39 sketch Exp $
---- Makefile.orig 2008-08-12 02:40:48.000000000 +0200
-+++ Makefile
-@@ -9,11 +9,11 @@ PLAT= none
+--- Makefile.orig Tue Aug 12 01:40:48 2008
++++ Makefile Tue Jan 20 16:27:31 2009
+@@ -9,11 +9,11 @@
# Where to install. The installation starts in the src and doc directories,
# so take care if INSTALL_TOP is not an absolute path.
@@ -16,7 +16,16 @@ $NetBSD: patch-aa,v 1.17 2008/09/07 14:03:42 wiz Exp $
#
# You probably want to make INSTALL_LMOD and INSTALL_CMOD consistent with
# LUA_ROOT, LUA_LDIR, and LUA_CDIR in luaconf.h (and also with etc/lua.pc).
-@@ -43,7 +43,7 @@ PLATS= aix ansi bsd freebsd generic linu
+@@ -24,7 +24,7 @@
+ # may have to run ranlib on the installed liblua.a (do "make ranlib").
+ INSTALL= install -p
+ INSTALL_EXEC= $(INSTALL) -m 0755
+-INSTALL_DATA= $(INSTALL) -m 0644
++#INSTALL_DATA= $(INSTALL) -m 0644
+ #
+ # If you don't have install you can use cp instead.
+ # INSTALL= cp -p
+@@ -43,7 +43,7 @@
# What to install.
TO_BIN= lua luac
TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp
@@ -25,7 +34,7 @@ $NetBSD: patch-aa,v 1.17 2008/09/07 14:03:42 wiz Exp $
TO_MAN= lua.1 luac.1
# Lua version and release.
-@@ -59,11 +59,11 @@ test: dummy
+@@ -59,11 +59,11 @@
src/lua test/hello.lua
install: dummy