diff options
| author | joerg <joerg> | 2007-07-02 13:36:38 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2007-07-02 13:36:38 +0000 |
| commit | e55d21d2ce63374074a2daef4f9adeb2eec07368 (patch) | |
| tree | 994c95eb054798ce74c4df000ba6fc8cfe4c25ef | |
| parent | 4a1d11d111676a11af217013ceed410b5bbf4fa1 (diff) | |
| download | pkgsrc-e55d21d2ce63374074a2daef4f9adeb2eec07368.tar.gz | |
Override /usr/local as LUA_ROOT and ensure that the default search path
matches the pkgsrc environment. Bump revision.
From Simon Schubert via IRC.
| -rw-r--r-- | lang/lua/Makefile | 6 | ||||
| -rw-r--r-- | lang/lua/distinfo | 5 | ||||
| -rw-r--r-- | lang/lua/patches/patch-ab | 13 | ||||
| -rw-r--r-- | lang/lua/patches/patch-ac | 14 |
4 files changed, 31 insertions, 7 deletions
diff --git a/lang/lua/Makefile b/lang/lua/Makefile index b39b74f1265..d246a7ae69a 100644 --- a/lang/lua/Makefile +++ b/lang/lua/Makefile @@ -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 @@ PKG_DESTDIR_SUPPORT= user-destdir 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 --git a/lang/lua/distinfo b/lang/lua/distinfo index e4e73401fb1..b38bd4c8d44 100644 --- a/lang/lua/distinfo +++ b/lang/lua/distinfo @@ -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 --git a/lang/lua/patches/patch-ab b/lang/lua/patches/patch-ab index 8dcc4651a62..cec29fb1705 100644 --- a/lang/lua/patches/patch-ab +++ b/lang/lua/patches/patch-ab @@ -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 --git a/lang/lua/patches/patch-ac b/lang/lua/patches/patch-ac new file mode 100644 index 00000000000..870e0581f9b --- /dev/null +++ b/lang/lua/patches/patch-ac @@ -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 \ |