[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Patch to update Lua to version 5.0

Attached to this e-mail there's a patch to update the Lua port to
version 5.0. In addition, a couple of things were changed:

o Added some more sources on MASTER_SITES;
o Changed HOMEPAGE to Lua's new home-page, www.lua.org;
o Removed WRKDIST definition, since, by default, it's defined to
  ${WRKDIR}/${DISTNAME}, which suits this port's needs just fine;
o Remove WWW: ${HOMEPAGE} entry from pkg/DESCR, since it seems not be
  used any longer

Well, that's it. Comments and suggestions will be pretty much
appreciated. Thanks to jolan@ for pointing me out a couple of things.

-p.

Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/lua/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- Makefile	2002/10/27 14:12:48	1.8
+++ Makefile	2003/08/22 19:05:44
@@ -2,7 +2,7 @@
 
 COMMENT=	"powerful, light-weight programming language"
 
-DISTNAME=	lua-4.0
+DISTNAME=	lua-5.0
 CATEGORIES=     lang
 
 MASTER_SITES=	ftp://ftp.tecgraf.puc-rio.br/pub/lua/ \
@@ -13,11 +13,14 @@
 		ftp://ftp.gwdg.de/pub/languages/lua/ \
 		ftp://ftp.u-aizu.ac.jp/pub/lang/lua/ \
 		ftp://ftp.ucore.com/lua/dist/ \
+		ftp://sunsite.dk/pub/languages/lua/ \
+		ftp://ftp.chg.ru/pub/lang/lua/ \
+		http://www.lua.org/ftp/ \
 		http://www.tecgraf.puc-rio.br/lua/ftp/ \
 		http://csg.uwaterloo.ca/~lhf/lua/ftp/ \
 		http://ftp.gwdg.de/pub/languages/lua/
 
-HOMEPAGE=	http://www.tecgraf.puc-rio.br/lua/
+HOMEPAGE=	http://www.lua.org/
 
 MAINTAINER=	David Terrell <dbt@openbsd.org>
 
@@ -26,8 +29,6 @@
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WRKDIST=	${WRKDIR}/lua
-
 post-build:
 	cd ${WRKDIST} && ${CC} ${CFLAGS} -o bin/bin2c etc/bin2c.c
 #	and recompile with shared libs
@@ -53,7 +54,7 @@
 BUILD_SHARED=:
 .else
 BUILD_SHARED=cd ${WRKDIST} && \
-	${CC} ${LDFLAGS} -shared -fPIC -o lib/liblua.so.4.0 src/*.o && \
-	${CC} ${LDFLAGS} -shared -fPIC -o lib/liblualib.so.4.0 src/lib/*.o && \
+	${CC} ${LDFLAGS} -shared -fPIC -o lib/liblua.so.5.0 src/*.o && \
+	${CC} ${LDFLAGS} -shared -fPIC -o lib/liblualib.so.5.0 src/lib/*.o && \
 	rm bin/lua && ${MAKE}
 .endif
Index: distinfo
===================================================================
RCS file: /cvs/ports/lang/lua/distinfo,v
retrieving revision 1.1
diff -u -r1.1 distinfo
--- distinfo	2002/03/21 20:20:47	1.1
+++ distinfo	2003/08/22 19:05:44
@@ -1,3 +1,3 @@
-MD5 (lua-4.0.tar.gz) = be11522d46d33a931868c03694aaeeef
-RMD160 (lua-4.0.tar.gz) = 6ebb072ea14b2e74bd1601cd4e5326ac0b12e7d4
-SHA1 (lua-4.0.tar.gz) = 8d432c73ef6e98b81d252114be1a83182cc9607a
+MD5 (lua-5.0.tar.gz) = 6f14803fad389fb1cb15d17edfeddd91
+RMD160 (lua-5.0.tar.gz) = d5ed101f71e811969efb8e059e0f19aa8b6463e5
+SHA1 (lua-5.0.tar.gz) = 88b1bc057857c0db5ace491c4af2c917a2b803bf
Index: patches/patch-config
===================================================================
RCS file: /cvs/ports/lang/lua/patches/patch-config,v
retrieving revision 1.2
diff -u -r1.2 patch-config
--- patches/patch-config	2001/03/26 08:49:10	1.2
+++ patches/patch-config	2003/08/22 19:05:44
@@ -1,20 +1,19 @@
---- config.orig	Mon Nov  6 21:28:20 2000
-+++ config	Fri Mar 16 18:31:39 2001
-@@ -28,7 +28,7 @@
- # ------------------------------------------------------------------ C compiler
- 
- # You need an ANSI C compiler. gcc is a popular one.
+--- config.orig	Fri Aug 22 15:02:28 2003
++++ config	Fri Aug 22 15:03:18 2003
+@@ -108,7 +108,7 @@
+ # 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
 +#CC= gcc
- WARN= -ansi -pedantic -Wall
+ WARN= -Wall
  
- # On IRIX, cc is a good ANSI compiler.
-@@ -93,7 +93,7 @@ LIB= $(LUA)/lib
+ # ------------------------------------------------------------------ C options
+@@ -173,6 +173,6 @@
  INCS= -I$(INC) $(EXTRA_INCS)
- DEFS= $(COMPAT) $(NUMBER) $(OLD_ANSI) $(EXTRA_DEFS)
- 
--CFLAGS= -O2 $(WARN) $(INCS) $(DEFS)
-+CFLAGS+= -fPIC $(WARN) $(INCS) $(DEFS)
+ DEFS= $(NUMBER) $(EXTRA_DEFS)
  
- V=4.0
+-CFLAGS= $(MYCFLAGS) $(WARN) $(INCS) $(DEFS)
++CFLAGS+= $(MYCFLAGS) $(WARN) $(INCS) $(DEFS)
  
+ # (end of config)
Index: patches/patch-src-lib-Makefile
===================================================================
RCS file: /cvs/ports/lang/lua/patches/patch-src-lib-Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-src-lib-Makefile
--- patches/patch-src-lib-Makefile	2000/08/16 03:15:41	1.1.1.1
+++ patches/patch-src-lib-Makefile	2003/08/22 19:05:44
@@ -1,11 +1,11 @@
---- src/lib/Makefile.old	Tue Aug  8 19:36:25 2000
-+++ src/lib/Makefile	Tue Aug  8 19:35:40 2000
-@@ -5,7 +5,7 @@
+--- src/lib/Makefile.orig	Fri Aug 22 15:05:57 2003
++++ src/lib/Makefile	Fri Aug 22 15:06:06 2003
+@@ -4,7 +4,7 @@
+ 
  include $(LUA)/config
  
- # actually only used in liolib.c
--EXTRA_DEFS= $(POPEN)
-+EXTRA_DEFS+= $(POPEN)
+-EXTRA_DEFS= $(POPEN) $(TMPNAM) $(DEGREES) $(LOADLIB)
++EXTRA_DEFS+= $(POPEN) $(TMPNAM) $(DEGREES) $(LOADLIB)
  
- OBJS= linit.o ldblib.o liolib.o lmathlib.o lstrlib.o
- SRCS= linit.c ldblib.c liolib.c lmathlib.c lstrlib.c
+ OBJS= lauxlib.o lbaselib.o ldblib.o liolib.o lmathlib.o ltablib.o lstrlib.o loadlib.o
+ SRCS= lauxlib.c lbaselib.c ldblib.c liolib.c lmathlib.c ltablib.c lstrlib.c loadlib.c
Index: pkg/DESCR
===================================================================
RCS file: /cvs/ports/lang/lua/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 DESCR
--- pkg/DESCR	2000/08/16 03:15:41	1.1.1.1
+++ pkg/DESCR	2003/08/22 19:05:44
@@ -35,5 +35,3 @@
 Rio de Janeiro in Brazil). TeCGraf is a laboratory of the Department
 of Computer Science. The authors can be contacted by email at
 lua@tecgraf.puc-rio.br.
-
-WWW: ${HOMEPAGE}
Index: pkg/PFRAG.shared
===================================================================
RCS file: /cvs/ports/lang/lua/pkg/PFRAG.shared,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 PFRAG.shared
--- pkg/PFRAG.shared	2000/12/19 06:58:46	1.1.1.2
+++ pkg/PFRAG.shared	2003/08/22 19:05:44
@@ -1,4 +1,4 @@
 @comment $OpenBSD: PFRAG.shared,v 1.1.1.2 2000/12/19 06:58:46 dbt Exp $
-lib/liblua.so.4.0
-lib/liblualib.so.4.0
-DYNLIBDIR(%B)
+lib/liblua.so.5.0
+lib/liblualib.so.5.0
+DYNLIBDIR(%D/lib)
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/lang/lua/pkg/PLIST,v
retrieving revision 1.4
diff -u -r1.4 PLIST
--- pkg/PLIST	2001/03/26 08:42:46	1.4
+++ pkg/PLIST	2003/08/22 19:05:44
@@ -1,21 +1,18 @@
 @comment $OpenBSD: PLIST,v 1.4 2001/03/26 08:42:46 wilfried Exp $
+bin/bin2c
 bin/lua
 bin/luac
-bin/bin2c
 include/lauxlib.h
 include/lua.h
-include/luadebug.h
 include/lualib.h
 lib/liblua.a
 lib/liblualib.a
-%%SHARED%%
-share/doc/lua/idx.html
-share/doc/lua/index.html
+man/man1/lua.1
+man/man1/luac.1
 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
-man/man1/luac.1
-man/man1/lua.1
+%%SHARED%%
 @dirrm share/doc/lua