Sun Sep 7 14:03:42 2008 UTC ()
Update to 5.1.4:
Bugfix release.


(wiz)
diff -r1.37 -r1.38 pkgsrc/lang/lua/Makefile
diff -r1.9 -r1.10 pkgsrc/lang/lua/PLIST
diff -r1.21 -r1.22 pkgsrc/lang/lua/distinfo
diff -r1.16 -r1.17 pkgsrc/lang/lua/patches/patch-aa
cvs diff -r1.37 -r1.38 pkgsrc/lang/lua/Attic/Makefile (switch to unified diff)

--- pkgsrc/lang/lua/Attic/Makefile 2008/02/27 18:52:16 1.37
+++ pkgsrc/lang/lua/Attic/Makefile 2008/09/07 14:03:42 1.38
@@ -1,81 +1,80 @@ @@ -1,81 +1,80 @@
1# $NetBSD: Makefile,v 1.37 2008/02/27 18:52:16 jlam Exp $ 1# $NetBSD: Makefile,v 1.38 2008/09/07 14:03:42 wiz Exp $
2 2
3DISTNAME= lua-5.1.3 3DISTNAME= lua-5.1.4
4PKGREVISION= 1 
5CATEGORIES= lang 4CATEGORIES= lang
6MASTER_SITES= ftp://ftp.tecgraf.puc-rio.br/pub/lua/ \ 5MASTER_SITES= ftp://ftp.tecgraf.puc-rio.br/pub/lua/ \
7 ftp://ftp.gwdg.de/pub/languages/lua/ \ 6 ftp://ftp.gwdg.de/pub/languages/lua/ \
8 ftp://ftp.u-aizu.ac.jp/pub/lang/lua/ \ 7 ftp://ftp.u-aizu.ac.jp/pub/lang/lua/ \
9 ftp://ftp.chg.ru/pub/lang/lua/ \ 8 ftp://ftp.chg.ru/pub/lang/lua/ \
10 http://www.lua.org/ftp/ \ 9 http://www.lua.org/ftp/ \
11 http://www.tecgraf.puc-rio.br/lua/ftp/ \ 10 http://www.tecgraf.puc-rio.br/lua/ftp/ \
12 http://ftp.gwdg.de/pub/languages/lua/ \ 11 http://ftp.gwdg.de/pub/languages/lua/ \
13 http://mirrors.sunsite.dk/lua/ \ 12 http://mirrors.sunsite.dk/lua/ \
14 http://ftp.chg.ru/pub/lang/lua/ 13 http://ftp.chg.ru/pub/lang/lua/
15 14
16MAINTAINER= pkgsrc-users@NetBSD.org 15MAINTAINER= pkgsrc-users@NetBSD.org
17HOMEPAGE= http://www.lua.org/ 16HOMEPAGE= http://www.lua.org/
18COMMENT= Powerful light-weight language for extending applications 17COMMENT= Powerful light-weight language for extending applications
19 18
20PKG_INSTALLATION_TYPES= overwrite pkgviews 19PKG_INSTALLATION_TYPES= overwrite pkgviews
21PKG_DESTDIR_SUPPORT= user-destdir 20PKG_DESTDIR_SUPPORT= user-destdir
22 21
23USE_LIBTOOL= yes 22USE_LIBTOOL= yes
24USE_TOOLS+= gmake 23USE_TOOLS+= gmake
25MAKE_ENV+= DLLIB=${BUILDLINK_LDADD.dl:Q} 24MAKE_ENV+= DLLIB=${BUILDLINK_LDADD.dl:Q}
26CFLAGS+= -DLUA_ROOT=\"${PREFIX}/\" 25CFLAGS+= -DLUA_ROOT=\"${PREFIX}/\"
27 26
28DOCDIR= ${PREFIX}/share/doc/lua 27DOCDIR= ${PREFIX}/share/doc/lua
29EGDIR= ${PREFIX}/share/examples/lua 28EGDIR= ${PREFIX}/share/examples/lua
30 29
31.include "../../mk/bsd.prefs.mk" 30.include "../../mk/bsd.prefs.mk"
32 31
33.if ${OPSYS} == "FreeBSD" 32.if ${OPSYS} == "FreeBSD"
34BUILD_TARGET= freebsd 33BUILD_TARGET= freebsd
35.elif !empty(OPSYS:M*BSD*) || ${OPSYS} == "DragonFly" 34.elif !empty(OPSYS:M*BSD*) || ${OPSYS} == "DragonFly"
36BUILD_TARGET= bsd 35BUILD_TARGET= bsd
37.elif ${OPSYS} == "Linux" 36.elif ${OPSYS} == "Linux"
38BUILD_TARGET= linux 37BUILD_TARGET= linux
39.elif ${OPSYS} == "Darwin" 38.elif ${OPSYS} == "Darwin"
40BUILD_TARGET= macosx 39BUILD_TARGET= macosx
41.elif ${OPSYS} == "SunOS" 40.elif ${OPSYS} == "SunOS"
42BUILD_TARGET= solaris 41BUILD_TARGET= solaris
43.elif ${OPSYS} == "AIX" 42.elif ${OPSYS} == "AIX"
44BUILD_TARGET= aix 43BUILD_TARGET= aix
45.else 44.else
46BUILD_TARGET= generic 45BUILD_TARGET= generic
47.endif 46.endif
48 47
49PKGCONFIG_OVERRIDE= ${WRKSRC}/etc/lua.pc 48PKGCONFIG_OVERRIDE= ${WRKSRC}/etc/lua.pc
50 49
51SUBST_CLASSES+= pc-prefix 50SUBST_CLASSES+= pc-prefix
52SUBST_FILES.pc-prefix+= ${WRKSRC}/etc/lua.pc 51SUBST_FILES.pc-prefix+= ${WRKSRC}/etc/lua.pc
53SUBST_SED.pc-prefix+= -e "s,/usr/local,${PREFIX}," 52SUBST_SED.pc-prefix+= -e "s,/usr/local,${PREFIX},"
54SUBST_STAGE.pc-prefix= post-build 53SUBST_STAGE.pc-prefix= post-build
55 54
56post-install: 55post-install:
57 ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR} 56 ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
58 set -e; \ 57 set -e; \
59 cd ${WRKSRC}; for f in README COPYRIGHT HISTORY; do \ 58 cd ${WRKSRC}; for f in README COPYRIGHT HISTORY; do \
60 ${INSTALL_DATA} "$$f" ${DESTDIR}${DOCDIR}; \ 59 ${INSTALL_DATA} "$$f" ${DESTDIR}${DOCDIR}; \
61 done 60 done
62 set -e; \ 61 set -e; \
63 cd ${WRKSRC}/doc; for f in *.html *.gif; do \ 62 cd ${WRKSRC}/doc; for f in *.html *.gif; do \
64 ${INSTALL_DATA} "$$f" ${DESTDIR}${DOCDIR}; \ 63 ${INSTALL_DATA} "$$f" ${DESTDIR}${DOCDIR}; \
65 done 64 done
66 ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR} 65 ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
67 set -e; \ 66 set -e; \
68 cd ${WRKSRC}/test; for f in README *.lua; do \ 67 cd ${WRKSRC}/test; for f in README *.lua; do \
69 ${INSTALL_DATA} "$$f" ${DESTDIR}${EGDIR}; \ 68 ${INSTALL_DATA} "$$f" ${DESTDIR}${EGDIR}; \
70 done 69 done
71 ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}/etc 70 ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}/etc
72 set -e; \ 71 set -e; \
73 cd ${WRKSRC}/etc; for f in README *.c *.ico *.lua; do \ 72 cd ${WRKSRC}/etc; for f in README *.c *.ico *.lua; do \
74 ${INSTALL_DATA} "$$f" ${DESTDIR}${EGDIR}/etc; \ 73 ${INSTALL_DATA} "$$f" ${DESTDIR}${EGDIR}/etc; \
75 done 74 done
76 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/pkgconfig 75 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/pkgconfig
77 ${INSTALL_DATA} ${WRKSRC}/etc/lua.pc ${DESTDIR}${PREFIX}/lib/pkgconfig 76 ${INSTALL_DATA} ${WRKSRC}/etc/lua.pc ${DESTDIR}${PREFIX}/lib/pkgconfig
78 77
79.include "../../devel/readline/buildlink3.mk" 78.include "../../devel/readline/buildlink3.mk"
80.include "../../mk/dlopen.buildlink3.mk" 79.include "../../mk/dlopen.buildlink3.mk"
81.include "../../mk/bsd.pkg.mk" 80.include "../../mk/bsd.pkg.mk"
cvs diff -r1.9 -r1.10 pkgsrc/lang/lua/Attic/PLIST (switch to unified diff)

--- pkgsrc/lang/lua/Attic/PLIST 2007/06/15 17:45:37 1.9
+++ pkgsrc/lang/lua/Attic/PLIST 2008/09/07 14:03:42 1.10
@@ -1,51 +1,57 @@ @@ -1,51 +1,57 @@
1@comment $NetBSD: PLIST,v 1.9 2007/06/15 17:45:37 obache Exp $ 1@comment $NetBSD: PLIST,v 1.10 2008/09/07 14:03:42 wiz Exp $
2bin/lua 2bin/lua
3bin/luac 3bin/luac
4include/lauxlib.h 4include/lauxlib.h
5include/lua.h 5include/lua.h
6include/lua.hpp 6include/lua.hpp
7include/luaconf.h 7include/luaconf.h
8include/lualib.h 8include/lualib.h
9lib/liblua.la 9lib/liblua.la
10lib/pkgconfig/lua.pc 10lib/pkgconfig/lua.pc
11man/man1/lua.1 11man/man1/lua.1
12man/man1/luac.1 12man/man1/luac.1
13share/doc/lua/COPYRIGHT 13share/doc/lua/COPYRIGHT
14share/doc/lua/HISTORY 14share/doc/lua/HISTORY
15share/doc/lua/README 15share/doc/lua/README
16share/doc/lua/amazon.gif 16share/doc/lua/amazon.gif
17share/doc/lua/contents.html 17share/doc/lua/contents.html
18share/doc/lua/logo.gif 18share/doc/lua/logo.gif
19share/doc/lua/lua.html 19share/doc/lua/lua.html
20share/doc/lua/luac.html 20share/doc/lua/luac.html
21share/doc/lua/manual.html 21share/doc/lua/manual.html
22share/doc/lua/readme.html 22share/doc/lua/readme.html
23share/examples/lua/README 23share/examples/lua/README
24share/examples/lua/bisect.lua 24share/examples/lua/bisect.lua
25share/examples/lua/cf.lua 25share/examples/lua/cf.lua
26share/examples/lua/echo.lua 26share/examples/lua/echo.lua
27share/examples/lua/env.lua 27share/examples/lua/env.lua
28share/examples/lua/etc/README 28share/examples/lua/etc/README
29share/examples/lua/etc/all.c 29share/examples/lua/etc/all.c
30share/examples/lua/etc/lua.ico 30share/examples/lua/etc/lua.ico
31share/examples/lua/etc/min.c 31share/examples/lua/etc/min.c
32share/examples/lua/etc/noparser.c 32share/examples/lua/etc/noparser.c
33share/examples/lua/etc/strict.lua 33share/examples/lua/etc/strict.lua
34share/examples/lua/factorial.lua 34share/examples/lua/factorial.lua
35share/examples/lua/fib.lua 35share/examples/lua/fib.lua
36share/examples/lua/fibfor.lua 36share/examples/lua/fibfor.lua
37share/examples/lua/globals.lua 37share/examples/lua/globals.lua
38share/examples/lua/hello.lua 38share/examples/lua/hello.lua
39share/examples/lua/life.lua 39share/examples/lua/life.lua
40share/examples/lua/luac.lua 40share/examples/lua/luac.lua
41share/examples/lua/printf.lua 41share/examples/lua/printf.lua
42share/examples/lua/readonly.lua 42share/examples/lua/readonly.lua
43share/examples/lua/sieve.lua 43share/examples/lua/sieve.lua
44share/examples/lua/sort.lua 44share/examples/lua/sort.lua
45share/examples/lua/table.lua 45share/examples/lua/table.lua
46share/examples/lua/trace-calls.lua 46share/examples/lua/trace-calls.lua
47share/examples/lua/trace-globals.lua 47share/examples/lua/trace-globals.lua
48share/examples/lua/xd.lua 48share/examples/lua/xd.lua
 49@exec ${MKDIR} %D/share/lua/5.1
 50@dirrm share/lua/5.1
 51@dirrm share/lua
49@dirrm share/examples/lua/etc 52@dirrm share/examples/lua/etc
50@dirrm share/examples/lua 53@dirrm share/examples/lua
51@dirrm share/doc/lua 54@dirrm share/doc/lua
 55@exec ${MKDIR} %D/lib/lua/5.1
 56@dirrm lib/lua/5.1
 57@dirrm lib/lua
cvs diff -r1.21 -r1.22 pkgsrc/lang/lua/Attic/distinfo (switch to unified diff)

--- pkgsrc/lang/lua/Attic/distinfo 2008/02/11 19:54:55 1.21
+++ pkgsrc/lang/lua/Attic/distinfo 2008/09/07 14:03:42 1.22
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.21 2008/02/11 19:54:55 adam Exp $ 1$NetBSD: distinfo,v 1.22 2008/09/07 14:03:42 wiz Exp $
2 2
3SHA1 (lua-5.1.3.tar.gz) = 89bc9f5a351402565b8077e8123327e7cd15f004 3SHA1 (lua-5.1.4.tar.gz) = 2b11c8e60306efb7f0734b747588f57995493db7
4RMD160 (lua-5.1.3.tar.gz) = 1c5979dd4986057fef325aa2af0c872bbecab92e 4RMD160 (lua-5.1.4.tar.gz) = c867c8364295d3e4fb4e4d8ebb27fa2b2312cdef
5Size (lua-5.1.3.tar.gz) = 215817 bytes 5Size (lua-5.1.4.tar.gz) = 216679 bytes
6SHA1 (patch-aa) = 69ea99c9c51cba00b1c01dc587fce355928ade9d 6SHA1 (patch-aa) = e1ae20d568097f2694abb2d2366082c829195ba8
7SHA1 (patch-ab) = 3c7a47f9e513b46003d1a05dd3bb99d42070885c 7SHA1 (patch-ab) = 3c7a47f9e513b46003d1a05dd3bb99d42070885c
8SHA1 (patch-ac) = 9e882a3fd420a45ab4ac0dca55d1b2fac46eb7de 8SHA1 (patch-ac) = 9e882a3fd420a45ab4ac0dca55d1b2fac46eb7de
cvs diff -r1.16 -r1.17 pkgsrc/lang/lua/patches/Attic/patch-aa (switch to unified diff)

--- pkgsrc/lang/lua/patches/Attic/patch-aa 2008/02/11 19:54:55 1.16
+++ pkgsrc/lang/lua/patches/Attic/patch-aa 2008/09/07 14:03:42 1.17
@@ -1,44 +1,44 @@ @@ -1,44 +1,44 @@
1$NetBSD: patch-aa,v 1.16 2008/02/11 19:54:55 adam Exp $ 1$NetBSD: patch-aa,v 1.17 2008/09/07 14:03:42 wiz Exp $
2 2
3--- Makefile.orig 2008-01-17 18:53:37.000000000 +0100 3--- Makefile.orig 2008-08-12 02:40:48.000000000 +0200
4+++ Makefile 4+++ Makefile
5@@ -12,11 +12,11 @@ PLAT= none 5@@ -9,11 +9,11 @@ PLAT= none
6 # doc directory.) You may want to make these paths consistent with LUA_ROOT, 6
7 # LUA_LDIR, and LUA_CDIR in luaconf.h (and also with etc/lua.pc). 7 # Where to install. The installation starts in the src and doc directories,
8 # 8 # so take care if INSTALL_TOP is not an absolute path.
9-INSTALL_TOP= /usr/local 9-INSTALL_TOP= /usr/local
10+INSTALL_TOP= ${PREFIX} 10+INSTALL_TOP= ${PREFIX}
11 INSTALL_BIN= $(INSTALL_TOP)/bin 11 INSTALL_BIN= $(INSTALL_TOP)/bin
12 INSTALL_INC= $(INSTALL_TOP)/include 12 INSTALL_INC= $(INSTALL_TOP)/include
13 INSTALL_LIB= $(INSTALL_TOP)/lib 13 INSTALL_LIB= $(INSTALL_TOP)/lib
14-INSTALL_MAN= $(INSTALL_TOP)/man/man1 14-INSTALL_MAN= $(INSTALL_TOP)/man/man1
15+INSTALL_MAN= $(INSTALL_TOP)/${PKGMANDIR}/man1 15+INSTALL_MAN= $(INSTALL_TOP)/${PKGMANDIR}/man1
16 INSTALL_LMOD= $(INSTALL_TOP)/share/lua/$V 16 #
17 INSTALL_CMOD= $(INSTALL_TOP)/lib/lua/$V 17 # You probably want to make INSTALL_LMOD and INSTALL_CMOD consistent with
18  18 # LUA_ROOT, LUA_LDIR, and LUA_CDIR in luaconf.h (and also with etc/lua.pc).
19@@ -38,7 +38,7 @@ PLATS= aix ansi bsd freebsd generic linu 19@@ -43,7 +43,7 @@ PLATS= aix ansi bsd freebsd generic linu
20 # What to install. 20 # What to install.
21 TO_BIN= lua luac 21 TO_BIN= lua luac
22 TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp 22 TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp
23-TO_LIB= liblua.a 23-TO_LIB= liblua.a
24+TO_LIB= liblua.la 24+TO_LIB= liblua.la
25 TO_MAN= lua.1 luac.1 25 TO_MAN= lua.1 luac.1
26  26
27 # Lua version and release. 27 # Lua version and release.
28@@ -54,11 +54,11 @@ test: dummy 28@@ -59,11 +59,11 @@ test: dummy
29 src/lua test/hello.lua 29 src/lua test/hello.lua
30  30
31 install: dummy 31 install: dummy
32- cd src && $(MKDIR) -p $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD) 32- cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD)
33- cd src && $(INSTALL_EXEC) $(TO_BIN) $(INSTALL_BIN) 33- cd src && $(INSTALL_EXEC) $(TO_BIN) $(INSTALL_BIN)
34- cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC) 34- cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
35- cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB) 35- cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB)
36- cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN) 36- cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN)
37+ cd src && $(MKDIR) -p ${DESTDIR}$(INSTALL_BIN) ${DESTDIR}$(INSTALL_INC) ${DESTDIR}$(INSTALL_LIB) ${DESTDIR}$(INSTALL_MAN) ${DESTDIR}$(INSTALL_LMOD) ${DESTDIR}$(INSTALL_CMOD) 37+ cd src && $(MKDIR) $(DESTDIR)$(INSTALL_BIN) $(DESTDIR)$(INSTALL_INC) $(DESTDIR)$(INSTALL_LIB) $(DESTDIR)$(INSTALL_MAN) $(DESTDIR)$(INSTALL_LMOD) $(DESTDIR)$(INSTALL_CMOD)
38+ cd src && $(LIBTOOL) --mode=install $(BSD_INSTALL_PROGRAM) $(TO_BIN) ${DESTDIR}$(INSTALL_BIN) 38+ cd src && $(LIBTOOL) --mode=install $(BSD_INSTALL_PROGRAM) $(TO_BIN) $(DESTDIR)$(INSTALL_BIN)
39+ cd src && $(BSD_INSTALL_DATA) $(TO_INC) ${DESTDIR}$(INSTALL_INC) 39+ cd src && $(INSTALL_DATA) $(TO_INC) $(DESTDIR)$(INSTALL_INC)
40+ cd src && $(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) $(TO_LIB) ${DESTDIR}$(INSTALL_LIB) 40+ cd src && $(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) $(TO_LIB) $(DESTDIR)$(INSTALL_LIB)
41+ cd doc && $(BSD_INSTALL_MAN) $(TO_MAN) ${DESTDIR}$(INSTALL_MAN) 41+ cd doc && $(INSTALL_DATA) $(TO_MAN) $(DESTDIR)$(INSTALL_MAN)
42  42
43 local: 43 ranlib:
44 $(MAKE) install INSTALL_TOP=.. 44 cd src && cd $(INSTALL_LIB) && $(RANLIB) $(TO_LIB)