summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lang/lua/Makefile44
-rw-r--r--lang/lua/PLIST23
-rw-r--r--lang/lua/buildlink3.mk3
-rw-r--r--lang/lua/distinfo10
-rw-r--r--lang/lua/patches/patch-aa80
-rw-r--r--lang/lua/patches/patch-ab27
-rw-r--r--lang/lua/patches/patch-ac31
-rw-r--r--lang/lua/patches/patch-ad26
-rw-r--r--lang/lua/patches/patch-ae15
-rw-r--r--lang/lua/patches/patch-af15
10 files changed, 179 insertions, 95 deletions
diff --git a/lang/lua/Makefile b/lang/lua/Makefile
index f42c60dd496..3531550337a 100644
--- a/lang/lua/Makefile
+++ b/lang/lua/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2005/06/07 03:52:10 minskim Exp $
+# $NetBSD: Makefile,v 1.25 2005/09/04 04:59:36 jlam Exp $
DISTNAME= lua-5.0.2
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= lang
MASTER_SITES= ftp://ftp.tecgraf.puc-rio.br/pub/lua/ \
ftp://ftp.ntua.gr/pub/lang/lua/ \
@@ -22,12 +22,14 @@ COMMENT= Powerful light-weight language for extending applications
PKG_INSTALLATION_TYPES= overwrite pkgviews
-BUILD_TARGET= all so
-INSTALL_TARGET= install soinstall
+USE_LIBTOOL= yes
+DL_AUTO_VARS= yes
+LUA_CFLAGS= ${CFLAGS}
+LUA_LDFLAGS= ${LDFLAGS} ${LIBS}
+MAKE_ENV+= MYCFLAGS=${LUA_CFLAGS:Q} MYLDFLAGS=${LUA_LDFLAGS:Q}
-CFLAGS+= -fPIC
-LIBS+= ${BUILDLINK_LDADD.dl}
-MAKE_ENV+= LIBS="${LIBS}"
+DOCDIR= ${PREFIX}/share/doc/lua
+EGDIR= ${PREFIX}/share/examples/lua
.include "../../mk/dlopen.buildlink3.mk"
@@ -35,19 +37,21 @@ post-build:
cd ${WRKSRC}/etc && ${SETENV} ${MAKE_ENV} ${MAKE} bin2c
post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/lua
- cd ${WRKSRC}; ${INSTALL_DATA} README COPYRIGHT \
- HISTORY ${PREFIX}/share/doc/lua
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/lua
- cd ${WRKSRC}/doc; ${INSTALL_DATA} *.html *.gif \
- ${PREFIX}/share/doc/html/lua
- ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/lua
- cd ${WRKSRC}/test && ${INSTALL_DATA} README *.lua \
- ${PREFIX}/share/examples/lua
- ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/lua/etc
- cd ${WRKSRC}/etc && ${INSTALL_DATA} README *.c *.h \
- *.lua lua.magic lua.xpm \
- ${PREFIX}/share/examples/lua/etc
+ ${INSTALL_DATA_DIR} ${DOCDIR}
+ cd ${WRKSRC}; for f in README COPYRIGHT HISTORY; do \
+ ${INSTALL_DATA} $$f ${DOCDIR}; \
+ done
+ cd ${WRKSRC}/doc; for f in *.html *.gif; do \
+ ${INSTALL_DATA} $$f ${DOCDIR}; \
+ done
+ ${INSTALL_DATA_DIR} ${EGDIR}
+ cd ${WRKSRC}/test; for f in README *.lua; do \
+ ${INSTALL_DATA} $$f ${EGDIR}; \
+ done
+ ${INSTALL_DATA_DIR} ${EGDIR}/etc
+ cd ${WRKSRC}/etc; for f in README *.c *.h *.lua lua.magic lua.xpm; do \
+ ${INSTALL_DATA} $$f ${EGDIR}/etc; \
+ done
${INSTALL_PROGRAM} ${WRKSRC}/etc/bin2c ${PREFIX}/bin
.include "../../mk/bsd.pkg.mk"
diff --git a/lang/lua/PLIST b/lang/lua/PLIST
index 1eb3a1c8451..ee9adc98f0e 100644
--- a/lang/lua/PLIST
+++ b/lang/lua/PLIST
@@ -1,27 +1,23 @@
-@comment $NetBSD: PLIST,v 1.6 2004/04/05 14:54:34 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.7 2005/09/04 04:59:36 jlam Exp $
bin/bin2c
bin/lua
bin/luac
include/lauxlib.h
include/lua.h
include/lualib.h
-lib/liblua.a
-lib/liblua.so
-lib/liblua.so.5.0
-lib/liblualib.a
-lib/liblualib.so
-lib/liblualib.so.5.0
+lib/liblua.la
+lib/liblualib.la
man/man1/lua.1
man/man1/luac.1
-share/doc/html/lua/contents.html
-share/doc/html/lua/logo.gif
-share/doc/html/lua/lua.html
-share/doc/html/lua/luac.html
-share/doc/html/lua/manual.html
-share/doc/html/lua/readme.html
share/doc/lua/COPYRIGHT
share/doc/lua/HISTORY
share/doc/lua/README
+share/doc/lua/contents.html
+share/doc/lua/logo.gif
+share/doc/lua/lua.html
+share/doc/lua/luac.html
+share/doc/lua/manual.html
+share/doc/lua/readme.html
share/examples/lua/README
share/examples/lua/bisect.lua
share/examples/lua/cf.lua
@@ -58,4 +54,3 @@ share/examples/lua/xd.lua
@dirrm share/examples/lua/etc
@dirrm share/examples/lua
@dirrm share/doc/lua
-@dirrm share/doc/html/lua
diff --git a/lang/lua/buildlink3.mk b/lang/lua/buildlink3.mk
index 995e649b2df..62eba55f0d5 100644
--- a/lang/lua/buildlink3.mk
+++ b/lang/lua/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/04/05 15:19:49 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2005/09/04 04:59:36 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LUA_BUILDLINK3_MK:= ${LUA_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+= lua
.if !empty(LUA_BUILDLINK3_MK:M+)
BUILDLINK_DEPENDS.lua+= lua>=5.0.2
+BUILDLINK_RECOMMENDED.lua+= lua>=5.0.2nb4
BUILDLINK_PKGSRCDIR.lua?= ../../lang/lua
.endif # LUA_BUILDLINK3_MK
diff --git a/lang/lua/distinfo b/lang/lua/distinfo
index e4cfd1acbb8..84023d58a8d 100644
--- a/lang/lua/distinfo
+++ b/lang/lua/distinfo
@@ -1,7 +1,11 @@
-$NetBSD: distinfo,v 1.11 2005/06/07 03:52:10 minskim Exp $
+$NetBSD: distinfo,v 1.12 2005/09/04 04:59:36 jlam 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) = 0b3f82f2c510ef1fc0b3071fbdb16db91dcd7faf
-SHA1 (patch-ab) = 6f8e8b903b10f95798593ecb3e51cb4db9766b11
+SHA1 (patch-aa) = 510d19518331e8290bbec95d3f18ca746dbb0d2e
+SHA1 (patch-ab) = 983d0ea51adf08188830b163075e13f331bb4c8a
+SHA1 (patch-ac) = 3f5a63251b1386969d583aeea167131567966e6e
+SHA1 (patch-ad) = b9ab79c9b1098d6b74a025ac986a5e26ef2111ec
+SHA1 (patch-ae) = 178d4ea2cb59a9548aad73ce3be67d6920d19be9
+SHA1 (patch-af) = e15b5a75a162fdce6d0b6898ae5db048c6d62e75
diff --git a/lang/lua/patches/patch-aa b/lang/lua/patches/patch-aa
index 6afb86acead..d5a1349b094 100644
--- a/lang/lua/patches/patch-aa
+++ b/lang/lua/patches/patch-aa
@@ -1,16 +1,7 @@
-$NetBSD: patch-aa,v 1.8 2004/10/02 20:54:59 cube Exp $
+$NetBSD: patch-aa,v 1.9 2005/09/04 04:59:36 jlam Exp $
---- config.orig 2003-04-11 16:00:41.000000000 +0200
+--- config.orig Fri Apr 11 14:00:41 2003
+++ config
-@@ -6,7 +6,7 @@
- LOADLIB=
- DLLIB=
- NUMBER=
--POPEN=
-+POPEN= -DUSE_POPEN=1
- TMPNAM=
- DEGREES=
- USERCONF=
@@ -25,7 +25,7 @@ USERCONF=
# interface (e.g., Linux, Solaris, IRIX, BSD, AIX, HPUX, and probably others),
# uncomment the next two lines.
@@ -20,49 +11,35 @@ $NetBSD: patch-aa,v 1.8 2004/10/02 20:54:59 cube Exp $
#DLLIB= -ldl
#
# In Linux with gcc, you should also uncomment the next definition for
-@@ -83,7 +83,7 @@ USERCONF=
- # For partial compatibility with old upvalue behavior in C functions, define
- # LUA_COMPATUPVALUES. Add these definitions to MYCFLAGS.
+@@ -45,7 +45,7 @@ USERCONF=
+ # If your system is not POSIX but has popen and pclose, define USE_POPEN=1.
+ # If you don't want to support pipes, define USE_POPEN=0.
#
--# -DLUA_COMPATUPSYNTAX -DLUA_COMPATUPVALUES
-+# EXTRA_DEFS=-DLUA_COMPATUPSYNTAX -DLUA_COMPATUPVALUES
-
- # ------------------------------------------------------------- Lua interpreter
-
+-#POPEN= -DUSE_POPEN=1
++POPEN= -DUSE_POPEN=1
+ #POPEN= -DUSE_POPEN=0
+ #
+ # The form below will probably work in (some) Windows systems.
@@ -108,8 +108,8 @@ EXTRA_LIBS= -lm
# You need an ANSI C compiler. gcc is a popular one. We do not use -ansi in
# WARN because it disables POSIX features used in the libraries.
#
-CC= gcc
-WARN= -Wall
-+# CC= gcc
-+# WARN= -Wall
++#CC= gcc
++#WARN= -Wall
# ------------------------------------------------------------------ C options
-@@ -119,11 +119,11 @@ WARN= -Wall
+@@ -119,7 +119,7 @@ WARN= -Wall
# debug information. If you only want the shared libraries, you may want to
# add -fPIC to MYCFLAGS.
#
-MYCFLAGS= -O2
-+MYCFLAGS:= $(CFLAGS)
++#MYCFLAGS= -O2
#MYCFLAGS= -O3 -fomit-frame-pointer # -fPIC
# Write here any options you may need for your C linker.
--#MYLDFLAGS=
-+MYLDFLAGS= $(LDFLAGS) $(LIBS) # -Wl,-E
-
- # ------------------------------------------------------------------ librarian
-
-@@ -134,7 +134,7 @@ AR= ar rcu
- # If your system doesn't have (or need) ranlib, use RANLIB=true.
- # On some systems, "ar s" does what ranlib would do.
- #
--RANLIB= ranlib
-+# RANLIB= ranlib
- #RANLIB= ar s
- #RANLIB= true
-
@@ -148,7 +148,7 @@ STRIP= strip
# Locations for "make install". You may need to be root do "make install".
@@ -72,14 +49,23 @@ $NetBSD: patch-aa,v 1.8 2004/10/02 20:54:59 cube Exp $
INSTALL_BIN= $(INSTALL_ROOT)/bin
INSTALL_INC= $(INSTALL_ROOT)/include
INSTALL_LIB= $(INSTALL_ROOT)/lib
-@@ -157,8 +157,8 @@ INSTALL_MAN= $(INSTALL_ROOT)/man/man1
- # You may prefer to use "install" instead of "cp" if you have it.
- # If you use "install", you may also want to change the permissions after -m.
- #
--INSTALL_EXEC= cp
--INSTALL_DATA= cp
-+INSTALL_EXEC= $(BSD_INSTALL_PROGRAM)
-+INSTALL_DATA= $(BSD_INSTALL_DATA)
- #INSTALL_EXEC= install -m 0755
- #INSTALL_DATA= install -m 0644
+@@ -165,6 +165,7 @@ INSTALL_DATA= cp
+ # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE =========
+
+ V=5.0
++LV=5:0
+
+ BIN= $(LUA)/bin
+ INC= $(LUA)/include
+@@ -173,6 +174,11 @@ LIB= $(LUA)/lib
+ INCS= -I$(INC) $(EXTRA_INCS)
+ DEFS= $(NUMBER) $(EXTRA_DEFS)
+
++CCLD= $(LIBTOOL) --mode=link $(CC)
+ CFLAGS= $(MYCFLAGS) $(WARN) $(INCS) $(DEFS)
++
++.SUFFIXES: .lo
++.c.lo:
++ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c $<
+ # (end of config)
diff --git a/lang/lua/patches/patch-ab b/lang/lua/patches/patch-ab
index eb78e3edae5..653beb55dd4 100644
--- a/lang/lua/patches/patch-ab
+++ b/lang/lua/patches/patch-ab
@@ -1,15 +1,22 @@
-$NetBSD: patch-ab,v 1.5 2005/06/07 03:52:10 minskim Exp $
+$NetBSD: patch-ab,v 1.6 2005/09/04 04:59:36 jlam Exp $
---- Makefile.orig 2004-03-11 19:50:55.000000000 -0600
+--- Makefile.orig Fri Mar 12 01:50:55 2004
+++ Makefile
-@@ -38,8 +38,8 @@ install: all strip
+@@ -29,12 +29,12 @@ strip:
+ $(STRIP) bin/*
+
+ # official installation
+-install: all strip
++install: all
+ mkdir -p $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN)
+- $(INSTALL_EXEC) bin/* $(INSTALL_BIN)
+- $(INSTALL_DATA) include/*.h $(INSTALL_INC)
+- $(INSTALL_DATA) lib/*.a $(INSTALL_LIB)
+- $(INSTALL_DATA) doc/*.1 $(INSTALL_MAN)
++ cd bin; for f in *; do $(LIBTOOL) --mode=install $(BSD_INSTALL_PROGRAM) $$f $(INSTALL_BIN); done
++ cd include; for f in *.h; do $(BSD_INSTALL_DATA) $$f $(INSTALL_INC); done
++ cd lib; for f in *.la; do $(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) $$f $(INSTALL_LIB); done
++ cd doc; for f in *.1; do $(BSD_INSTALL_MAN) $$f $(INSTALL_MAN); done
# shared libraries (for Linux)
so:
-- ld -o lib/liblua.so.$V -shared src/*.o
-- ld -o lib/liblualib.so.$V -shared src/lib/*.o
-+ ${CC} ${LDFLAGS} -o lib/liblua.so.$V -shared src/*.o ${LIBS}
-+ ${CC} ${LDFLAGS} -o lib/liblualib.so.$V -shared src/lib/*.o ${LIBS}
- cd lib; ln -fs liblua.so.$V liblua.so; ln -fs liblualib.so.$V liblualib.so
-
- # binaries using shared libraries
diff --git a/lang/lua/patches/patch-ac b/lang/lua/patches/patch-ac
new file mode 100644
index 00000000000..f0817e4dab3
--- /dev/null
+++ b/lang/lua/patches/patch-ac
@@ -0,0 +1,31 @@
+$NetBSD: patch-ac,v 1.4 2005/09/04 04:59:36 jlam Exp $
+
+--- src/Makefile.orig Fri Dec 13 12:12:11 2002
++++ src/Makefile
+@@ -26,6 +26,8 @@ OBJS= \
+ lvm.o \
+ lzio.o
+
++LOBJS= $(OBJS:.o=.lo)
++
+ SRCS= \
+ lapi.c \
+ lcode.c \
+@@ -68,12 +70,16 @@ SRCS= \
+ lzio.h
+
+ T= $(LIB)/liblua.a
++LT= $(T:.a=.la)
+
+-all: $T
++all: $(LT)
+
+ $T: $(OBJS)
+ $(AR) $@ $(OBJS)
+ $(RANLIB) $@
++
++$(LT): $(LOBJS)
++ $(LIBTOOL) --mode=link $(CC) -o $@ $(LOBJS) -rpath $(INSTALL_LIB) -version-info $(LV)
+
+ clean:
+ rm -f $(OBJS) $T
diff --git a/lang/lua/patches/patch-ad b/lang/lua/patches/patch-ad
new file mode 100644
index 00000000000..3bab482670e
--- /dev/null
+++ b/lang/lua/patches/patch-ad
@@ -0,0 +1,26 @@
+$NetBSD: patch-ad,v 1.4 2005/09/04 04:59:36 jlam Exp $
+
+--- src/lib/Makefile.orig Fri Mar 28 12:49:56 2003
++++ src/lib/Makefile
+@@ -7,15 +7,20 @@ 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
++LOBJS= $(OBJS:.o=.lo)
+ SRCS= lauxlib.c lbaselib.c ldblib.c liolib.c lmathlib.c ltablib.c lstrlib.c loadlib.c
+
+ T= $(LIB)/liblualib.a
++LT= $(T:.a=.la)
+
+-all: $T
++all: $(LT)
+
+ $T: $(OBJS)
+ $(AR) $@ $(OBJS)
+ $(RANLIB) $@
++
++$(LT): $(LOBJS)
++ $(LIBTOOL) --mode=link $(CC) -o $@ $(LOBJS) -rpath $(INSTALL_LIB) -version-info $(LV)
+
+ clean:
+ rm -f $(OBJS) $T
diff --git a/lang/lua/patches/patch-ae b/lang/lua/patches/patch-ae
new file mode 100644
index 00000000000..8d36dd5d9a3
--- /dev/null
+++ b/lang/lua/patches/patch-ae
@@ -0,0 +1,15 @@
+$NetBSD: patch-ae,v 1.4 2005/09/04 04:59:36 jlam Exp $
+
+--- src/lua/Makefile.orig Wed Apr 9 02:07:23 2003
++++ src/lua/Makefile
+@@ -12,8 +12,8 @@ T= $(BIN)/lua
+
+ all: $T
+
+-$T: $(OBJS) $(LIB)/liblua.a $(LIB)/liblualib.a
+- $(CC) -o $@ $(MYLDFLAGS) $(OBJS) -L$(LIB) -llua -llualib $(EXTRA_LIBS) $(DLLIB)
++$T: $(OBJS)
++ $(CCLD) -o $@ $(MYLDFLAGS) $(OBJS) -L$(LIB) -llua -llualib $(EXTRA_LIBS) $(DLLIB)
+
+ $(LIB)/liblua.a:
+ cd ..; $(MAKE)
diff --git a/lang/lua/patches/patch-af b/lang/lua/patches/patch-af
new file mode 100644
index 00000000000..c14a24b235a
--- /dev/null
+++ b/lang/lua/patches/patch-af
@@ -0,0 +1,15 @@
+$NetBSD: patch-af,v 1.3 2005/09/04 04:59:36 jlam Exp $
+
+--- src/luac/Makefile.orig Tue Oct 21 11:54:08 2003
++++ src/luac/Makefile
+@@ -12,8 +12,8 @@ T= $(BIN)/luac
+
+ all: $T
+
+-$T: $(OBJS) $(LIB)/liblua.a $(LIB)/liblualib.a
+- $(CC) -o $@ $(MYLDFLAGS) $(OBJS) -L$(LIB) -llua -llualib $(EXTRA_LIBS) $(DLLIB)
++$T: $(OBJS)
++ $(CCLD) -o $@ $(MYLDFLAGS) $(OBJS) -L$(LIB) -llua -llualib $(EXTRA_LIBS) $(DLLIB)
+
+ # print.c needs opcode names from lopcodes.c
+ lopcodes.o: ../lopcodes.c ../lopcodes.h
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-20 11:35:26 +0000