summaryrefslogtreecommitdiff
path: root/lang/lua
diff options
context:
space:
mode:
Diffstat (limited to 'lang/lua')
-rw-r--r--lang/lua/Makefile24
-rw-r--r--lang/lua/buildlink3.mk6
-rw-r--r--lang/lua/distinfo8
-rw-r--r--lang/lua/patches/patch-aa15
-rw-r--r--lang/lua/patches/patch-ac15
-rw-r--r--lang/lua/patches/patch-ad15
6 files changed, 48 insertions, 35 deletions
diff --git a/lang/lua/Makefile b/lang/lua/Makefile
index 7c2e70e6bde..a3650bda6e3 100644
--- a/lang/lua/Makefile
+++ b/lang/lua/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2006/03/04 21:29:54 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2006/06/01 06:52:27 rillig Exp $
DISTNAME= lua-5.0.2
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= lang
MASTER_SITES= ftp://ftp.tecgraf.puc-rio.br/pub/lua/ \
ftp://ftp.ntua.gr/pub/lang/lua/ \
@@ -23,11 +23,9 @@ COMMENT= Powerful light-weight language for extending applications
PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_LIBTOOL= yes
-DL_AUTO_VARS= yes
-LIBS+= ${BUILDLINK_LDADD.dl}
-LUA_CFLAGS= ${CFLAGS}
-LUA_LDFLAGS= ${LDFLAGS} ${LIBS}
-MAKE_ENV+= MYCFLAGS=${LUA_CFLAGS:Q} MYLDFLAGS=${LUA_LDFLAGS:Q}
+MAKE_ENV+= MYCFLAGS=${CFLAGS:M*:Q}
+MAKE_ENV+= MYLDFLAGS=${LDFLAGS:M*:Q}\ ${LIBS:M*:Q}
+MAKE_ENV+= DLLIB=${BUILDLINK_LDADD.dl:Q}
DOCDIR= ${PREFIX}/share/doc/lua
EGDIR= ${PREFIX}/share/examples/lua
@@ -39,19 +37,23 @@ post-build:
post-install:
${INSTALL_DATA_DIR} ${DOCDIR}
+ set -e; \
cd ${WRKSRC}; for f in README COPYRIGHT HISTORY; do \
- ${INSTALL_DATA} $$f ${DOCDIR}; \
+ ${INSTALL_DATA} "$$f" ${DOCDIR}; \
done
+ set -e; \
cd ${WRKSRC}/doc; for f in *.html *.gif; do \
- ${INSTALL_DATA} $$f ${DOCDIR}; \
+ ${INSTALL_DATA} "$$f" ${DOCDIR}; \
done
${INSTALL_DATA_DIR} ${EGDIR}
+ set -e; \
cd ${WRKSRC}/test; for f in README *.lua; do \
- ${INSTALL_DATA} $$f ${EGDIR}; \
+ ${INSTALL_DATA} "$$f" ${EGDIR}; \
done
${INSTALL_DATA_DIR} ${EGDIR}/etc
+ set -e; \
cd ${WRKSRC}/etc; for f in README *.c *.h *.lua lua.magic lua.xpm; do \
- ${INSTALL_DATA} $$f ${EGDIR}/etc; \
+ ${INSTALL_DATA} "$$f" ${EGDIR}/etc; \
done
${INSTALL_PROGRAM} ${WRKSRC}/etc/bin2c ${PREFIX}/bin
diff --git a/lang/lua/buildlink3.mk b/lang/lua/buildlink3.mk
index d2161bcdf2f..e26d164583e 100644
--- a/lang/lua/buildlink3.mk
+++ b/lang/lua/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/04/12 10:27:21 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/06/01 06:52:27 rillig Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LUA_BUILDLINK3_MK:= ${LUA_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlua}
BUILDLINK_PACKAGES+= lua
.if !empty(LUA_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.lua+= lua>=5.0.2
-BUILDLINK_ABI_DEPENDS.lua+= lua>=5.0.2nb4
+BUILDLINK_API_DEPENDS.lua+= lua>=5.0.2
+BUILDLINK_ABI_DEPENDS.lua+= lua>=5.0.2nb5
BUILDLINK_PKGSRCDIR.lua?= ../../lang/lua
.endif # LUA_BUILDLINK3_MK
diff --git a/lang/lua/distinfo b/lang/lua/distinfo
index 827c5548293..472330dfebe 100644
--- a/lang/lua/distinfo
+++ b/lang/lua/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.13 2006/05/26 18:29:27 reed Exp $
+$NetBSD: distinfo,v 1.14 2006/06/01 06:52:27 rillig Exp $
SHA1 (lua-5.0.2.tar.gz) = a200cfd20a9a4c7da1206ae45dddf26186a9e0e7
RMD160 (lua-5.0.2.tar.gz) = 5f1a1cf5802e38b3c4dcfc9f3cd0dc33bfdc0a30
Size (lua-5.0.2.tar.gz) = 190442 bytes
-SHA1 (patch-aa) = bc10e75e3b4113ba9a8c635c46242f358c8f32a3
+SHA1 (patch-aa) = b521ce5dfed8c57a2e7ac4d1b1a263a7c011b666
SHA1 (patch-ab) = 983d0ea51adf08188830b163075e13f331bb4c8a
-SHA1 (patch-ac) = 3f5a63251b1386969d583aeea167131567966e6e
-SHA1 (patch-ad) = b9ab79c9b1098d6b74a025ac986a5e26ef2111ec
+SHA1 (patch-ac) = 10ab28dc4b389b8b2d9b41eb6694ccfbd2320c1e
+SHA1 (patch-ad) = 8c4907c47dae10c70bc7d6365c5980765e0db31a
SHA1 (patch-ae) = 178d4ea2cb59a9548aad73ce3be67d6920d19be9
SHA1 (patch-af) = e15b5a75a162fdce6d0b6898ae5db048c6d62e75
diff --git a/lang/lua/patches/patch-aa b/lang/lua/patches/patch-aa
index 2e1429555c3..9c17a5b6aec 100644
--- a/lang/lua/patches/patch-aa
+++ b/lang/lua/patches/patch-aa
@@ -1,7 +1,16 @@
-$NetBSD: patch-aa,v 1.10 2006/05/26 18:29:27 reed Exp $
+$NetBSD: patch-aa,v 1.11 2006/06/01 06:52:28 rillig Exp $
---- config.orig 2003-04-11 07:00:41.000000000 -0700
-+++ config 2006-05-26 11:22:14.000000000 -0700
+--- config.orig 2003-04-11 15:00:41.000000000 +0100
++++ config 2006-06-01 07:40:42.963818821 +0100
+@@ -4,7 +4,7 @@
+ # These are default values. Skip this section and see the explanations below.
+
+ LOADLIB=
+-DLLIB=
++#DLLIB=
+ NUMBER=
+ POPEN=
+ TMPNAM=
@@ -25,7 +25,7 @@ USERCONF=
# interface (e.g., Linux, Solaris, IRIX, BSD, AIX, HPUX, and probably others),
# uncomment the next two lines.
diff --git a/lang/lua/patches/patch-ac b/lang/lua/patches/patch-ac
index f0817e4dab3..128429c7857 100644
--- a/lang/lua/patches/patch-ac
+++ b/lang/lua/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.4 2005/09/04 04:59:36 jlam Exp $
+$NetBSD: patch-ac,v 1.5 2006/06/01 06:52:28 rillig Exp $
---- src/Makefile.orig Fri Dec 13 12:12:11 2002
-+++ src/Makefile
+--- src/Makefile.orig 2002-12-13 12:12:11.000000000 +0000
++++ src/Makefile 2006-06-01 07:25:02.604386400 +0100
@@ -26,6 +26,8 @@ OBJS= \
lvm.o \
lzio.o
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.4 2005/09/04 04:59:36 jlam Exp $
SRCS= \
lapi.c \
lcode.c \
-@@ -68,12 +70,16 @@ SRCS= \
+@@ -68,13 +70,17 @@ SRCS= \
lzio.h
T= $(LIB)/liblua.a
@@ -23,9 +23,10 @@ $NetBSD: patch-ac,v 1.4 2005/09/04 04:59:36 jlam Exp $
$T: $(OBJS)
$(AR) $@ $(OBJS)
$(RANLIB) $@
-+
-+$(LT): $(LOBJS)
-+ $(LIBTOOL) --mode=link $(CC) -o $@ $(LOBJS) -rpath $(INSTALL_LIB) -version-info $(LV)
++$(LT): $(LOBJS)
++ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(LOBJS) -rpath $(INSTALL_LIB) -version-info $(LV) $(DLLIB)
++
clean:
rm -f $(OBJS) $T
+
diff --git a/lang/lua/patches/patch-ad b/lang/lua/patches/patch-ad
index 3bab482670e..b6104def4f2 100644
--- a/lang/lua/patches/patch-ad
+++ b/lang/lua/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.4 2005/09/04 04:59:36 jlam Exp $
+$NetBSD: patch-ad,v 1.5 2006/06/01 06:52:28 rillig Exp $
---- src/lib/Makefile.orig Fri Mar 28 12:49:56 2003
-+++ src/lib/Makefile
-@@ -7,15 +7,20 @@ include $(LUA)/config
+--- src/lib/Makefile.orig 2003-03-28 12:49:56.000000000 +0000
++++ src/lib/Makefile 2006-06-01 07:25:02.631381504 +0100
+@@ -7,16 +7,21 @@ include $(LUA)/config
EXTRA_DEFS= $(POPEN) $(TMPNAM) $(DEGREES) $(LOADLIB)
OBJS= lauxlib.o lbaselib.o ldblib.o liolib.o lmathlib.o ltablib.o lstrlib.o loadlib.o
@@ -18,9 +18,10 @@ $NetBSD: patch-ad,v 1.4 2005/09/04 04:59:36 jlam Exp $
$T: $(OBJS)
$(AR) $@ $(OBJS)
$(RANLIB) $@
-+
-+$(LT): $(LOBJS)
-+ $(LIBTOOL) --mode=link $(CC) -o $@ $(LOBJS) -rpath $(INSTALL_LIB) -version-info $(LV)
++$(LT): $(LOBJS)
++ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(LOBJS) -rpath $(INSTALL_LIB) -version-info $(LV) $(DLLIB)
++
clean:
rm -f $(OBJS) $T
+
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-10 12:28:08 +0000