[pkgsrc/trunk]: pkgsrc/lang/lua Override /usr/local as LUA_ROOT and ensure th...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e8fa213eb8d6
branches:  trunk
changeset: 530604:e8fa213eb8d6
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Jul 02 13:36:38 2007 +0000

description:
Override /usr/local as LUA_ROOT and ensure that the default search path
matches the pkgsrc environment. Bump revision.

>From Simon Schubert via IRC.

diffstat:

 lang/lua/Makefile         |   6 +++---
 lang/lua/distinfo         |   5 +++--
 lang/lua/patches/patch-ab |  13 +++++++++++--
 lang/lua/patches/patch-ac |  14 ++++++++++++++
 4 files changed, 31 insertions(+), 7 deletions(-)

diffs (77 lines):

diff -r 375eb4f0e55d -r e8fa213eb8d6 lang/lua/Makefile
--- a/lang/lua/Makefile Mon Jul 02 13:34:14 2007 +0000
+++ b/lang/lua/Makefile Mon Jul 02 13:36:38 2007 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2007/06/15 17:45:37 obache Exp $
+# $NetBSD: Makefile,v 1.34 2007/07/02 13:36:38 joerg Exp $
 
 DISTNAME=      lua-5.1.2
+PKGREVISION=   1
 CATEGORIES=    lang
 MASTER_SITES=  ftp://ftp.tecgraf.puc-rio.br/pub/lua/ \
                ftp://ftp.ntua.gr/pub/lang/lua/ \
@@ -24,9 +25,8 @@
 
 USE_LIBTOOL=   yes
 USE_TOOLS+=    gmake
-MAKE_ENV+=     MYCFLAGS=${CFLAGS:M*:Q}
-MAKE_ENV+=     MYLDFLAGS=${LDFLAGS:M*:Q}\ ${LIBS:M*:Q}
 MAKE_ENV+=     DLLIB=${BUILDLINK_LDADD.dl:Q}
+CFLAGS+=       -DLUA_ROOT=\"${PREFIX:Q}/\"
 
 DOCDIR=                ${PREFIX}/share/doc/lua
 EGDIR=         ${PREFIX}/share/examples/lua
diff -r 375eb4f0e55d -r e8fa213eb8d6 lang/lua/distinfo
--- a/lang/lua/distinfo Mon Jul 02 13:34:14 2007 +0000
+++ b/lang/lua/distinfo Mon Jul 02 13:36:38 2007 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.19 2007/06/15 17:45:37 obache Exp $
+$NetBSD: distinfo,v 1.20 2007/07/02 13:36:38 joerg Exp $
 
 SHA1 (lua-5.1.2.tar.gz) = 8a460d2d7e70e93cb72bf3d584405464763cb5f0
 RMD160 (lua-5.1.2.tar.gz) = 01350549b3a05838925dae1a666700bb9f1bc01a
 Size (lua-5.1.2.tar.gz) = 214134 bytes
 SHA1 (patch-aa) = f7be08d025d9ce68d568a922d778e5aca8eb35d5
-SHA1 (patch-ab) = c2439a9bce4e4d7a5be20906d218586160cc943d
+SHA1 (patch-ab) = 3c7a47f9e513b46003d1a05dd3bb99d42070885c
+SHA1 (patch-ac) = 9e882a3fd420a45ab4ac0dca55d1b2fac46eb7de
diff -r 375eb4f0e55d -r e8fa213eb8d6 lang/lua/patches/patch-ab
--- a/lang/lua/patches/patch-ab Mon Jul 02 13:34:14 2007 +0000
+++ b/lang/lua/patches/patch-ab Mon Jul 02 13:36:38 2007 +0000
@@ -1,7 +1,16 @@
-$NetBSD: patch-ab,v 1.9 2007/06/15 17:45:37 obache Exp $
+$NetBSD: patch-ab,v 1.10 2007/07/02 13:36:38 joerg Exp $
 
---- src/Makefile.orig  2007-03-25 14:49:23.000000000 +0000
+--- src/Makefile.orig  2007-03-25 16:49:23.000000000 +0200
 +++ src/Makefile
+@@ -8,7 +8,7 @@
+ PLAT= none
+ 
+ CC= gcc
+-CFLAGS= -O2 -Wall $(MYCFLAGS)
++CFLAGS+= -Wall $(MYCFLAGS)
+ AR= ar rcu
+ RANLIB= ranlib
+ RM= rm -f
 @@ -18,22 +18,32 @@ MYCFLAGS=
  MYLDFLAGS=
  MYLIBS=
diff -r 375eb4f0e55d -r e8fa213eb8d6 lang/lua/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/lua/patches/patch-ac Mon Jul 02 13:36:38 2007 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-ac,v 1.7 2007/07/02 13:36:39 joerg Exp $
+
+--- src/luaconf.h.orig 2007-03-24 04:01:55.000000000 +0100
++++ src/luaconf.h
+@@ -94,7 +94,9 @@
+       ".\\?.dll;"  LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll"
+ 
+ #else
++#ifndef LUA_ROOT
+ #define LUA_ROOT      "/usr/local/"
++#endif
+ #define LUA_LDIR      LUA_ROOT "share/lua/5.1/"
+ #define LUA_CDIR      LUA_ROOT "lib/lua/5.1/"
+ #define LUA_PATH_DEFAULT  \