Date: Sat, 23 Feb 2008 22:40:02 GMT From: Andrew Turner <andrew+ports@fubar.geek.nz> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/120542: [patch] lang/lua update 5.1.3 (revised) Message-ID: <200802232240.m1NMe2V6053549@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/120542; it has been noted by GNATS. From: Andrew Turner <andrew+ports@fubar.geek.nz> To: bug-followup@FreeBSD.org, umq@ueo.co.jp Cc: Subject: Re: ports/120542: [patch] lang/lua update 5.1.3 (revised) Date: Sun, 24 Feb 2008 11:20:54 +1300 --MP_/R.qR88uXXDbrL9tNAau_Xhx Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline I've taken the patch and merged it in with my update for Lua to 5.1.3 (attached). This patch also stops installing duplicate files ie. lua.pc and lua.hpp The attached patch is ready to be committed. Andrew --MP_/R.qR88uXXDbrL9tNAau_Xhx Content-Type: text/x-patch; name=lua-5.1.3.diff Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=lua-5.1.3.diff Index: Makefile =================================================================== RCS file: /cvsroot/ports/lang/lua/Makefile,v retrieving revision 1.29 diff -u -u -r1.29 Makefile --- Makefile 31 Mar 2007 20:40:55 -0000 1.29 +++ Makefile 23 Feb 2008 22:04:55 -0000 @@ -6,8 +6,7 @@ # PORTNAME= lua -PORTVERSION= 5.1.1 -PORTREVISION= 2 +PORTVERSION= 5.1.3 CATEGORIES= lang MASTER_SITES= http://www.lua.org/ftp/ \ ftp://ftp.tecgraf.puc-rio.br/pub/lua/ \ @@ -21,7 +20,8 @@ USE_LUA= 5.1 LUA_COMPS= # only define variables -ALL_TARGET= bsd +ALL_TARGET= freebsd +USE_GNOME= pkgconfig MAN1= lua-${LUA_VER}.1 luac-${LUA_VER}.1 DOCSDIR= ${PREFIX}/share/doc/${LUA_SUBDIR} @@ -30,16 +30,33 @@ LUA_BIN= lua luac LUA_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp LUA_MAN= ${LUA_BIN:S/$/.1/} +LUA_ETC= Makefile README all.c lua.ico luavs.bat min.c \ + noparser.c strict.lua +LUA_TEST= README bisect.lua cf.lua echo.lua env.lua factorial.lua \ + fib.lua fibfor.lua globals.lua hello.lua life.lua luac.lua \ + printf.lua readonly.lua sieve.lua sort.lua table.lua \ + trace-calls.lua trace-globals.lua xd.lua post-patch: @${REINPLACE_CMD} -Ee \ - 's|^(CC=).*|\1 ${CC}| ; \ + 's|(INSTALL_TOP=).*|\1 ${PREFIX}| ; \ + s|^(CC=).*|\1 ${CC}| ; \ s|^(CFLAGS=)|\1 ${CFLAGS}| ; \ s|/usr/local|${PREFIX}|' \ ${WRKSRC}/Makefile ${WRKSRC}/src/Makefile - -post-build: - @${RM} -f ${WRKSRC}/test/lua ${WRKSRC}/test/luac + @${REINPLACE_CMD} -Ee \ + 's|^(prefix=).*|\1 ${PREFIX}| ; \ + s|^(libdir=).*|\1 ${LUA_LIBDIR}| ; \ + s|^(includedir=).*|\1 ${LUA_INCDIR}| ; \ + s|^(INSTALL_BIN=).*|\1 ${LUA_BINDIR}| ; \ + s|^(INSTALL_INC=).*|\1 ${LUA_INCDIR}| ; \ + s|^(INSTALL_LIB=).*|\1 ${LUA_LIBDIR}| ; \ + s|^(INSTALL_CMOD=).*|\1 ${LUA_MODLIBDIR}| ; \ + s|^(INSTALL_LMOD=).*|\1 ${LUA_MODSHAREDIR}|' \ + ${WRKSRC}/etc/lua.pc + @${REINPLACE_CMD} -Ee \ + 's|/usr/local|${PREFIX}|' \ + ${WRKSRC}/src/luaconf.h do-install: # Programs. @@ -64,10 +81,20 @@ # Documentation. .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} + ${MKDIR} ${DOCSDIR}/etc + ${MKDIR} ${DOCSDIR}/test ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} cd ${WRKSRC}/doc && ${INSTALL_DATA} *.html *.gif ${DOCSDIR} - ${CP} -r ${WRKSRC}/etc ${WRKSRC}/test ${DOCSDIR} +.for f in ${LUA_ETC} + ${INSTALL_DATA} ${WRKSRC}/etc/${f} ${DOCSDIR}/etc +.endfor +.for f in ${LUA_TEST} + ${INSTALL_DATA} ${WRKSRC}/test/${f} ${DOCSDIR}/test +.endfor .endif +# lua.pc + ${MKDIR} ${LOCALBASE}/libdata/pkgconfig + ${INSTALL_DATA} ${WRKSRC}/etc/lua.pc ${LOCALBASE}/libdata/pkgconfig/lua-${LUA_VER}.pc # Module directories. ${MKDIR} ${LUA_MODLIBDIR} ${MKDIR} ${LUA_MODSHAREDIR} Index: distinfo =================================================================== RCS file: /cvsroot/ports/lang/lua/distinfo,v retrieving revision 1.11 diff -u -u -r1.11 distinfo --- distinfo 22 Aug 2006 09:02:29 -0000 1.11 +++ distinfo 9 Feb 2008 23:31:08 -0000 @@ -1,3 +1,3 @@ -MD5 (lua-5.1.1.tar.gz) = 22f4f912f20802c11006fe9b84d5c461 -SHA256 (lua-5.1.1.tar.gz) = c5daeed0a75d8e4dd2328b7c7a69888247868154acbda69110e97d4a6e17d1f0 -SIZE (lua-5.1.1.tar.gz) = 207810 +MD5 (lua-5.1.3.tar.gz) = a70a8dfaa150e047866dc01a46272599 +SHA256 (lua-5.1.3.tar.gz) = 6b5df2edaa5e02bf1a2d85e1442b2e329493b30b0c0780f77199d24f087d296d +SIZE (lua-5.1.3.tar.gz) = 215817 Index: pkg-plist =================================================================== RCS file: /cvsroot/ports/lang/lua/pkg-plist,v retrieving revision 1.7 diff -u -u -r1.7 pkg-plist --- pkg-plist 15 Sep 2006 08:17:08 -0000 1.7 +++ pkg-plist 23 Feb 2008 22:07:29 -0000 @@ -10,14 +10,14 @@ %%LUA_INCDIR%%/luaconf.h %%LUA_INCDIR%%/lualib.h %%LUA_LIBDIR%%/liblua.a +libdata/pkgconfig/lua-%%LUA_VER%%.pc %%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/amazon.gif %%PORTDOCS%%%%DOCSDIR%%/contents.html %%PORTDOCS%%%%DOCSDIR%%/etc/Makefile %%PORTDOCS%%%%DOCSDIR%%/etc/README %%PORTDOCS%%%%DOCSDIR%%/etc/all.c -%%PORTDOCS%%%%DOCSDIR%%/etc/lua.hpp %%PORTDOCS%%%%DOCSDIR%%/etc/lua.ico -%%PORTDOCS%%%%DOCSDIR%%/etc/lua.pc %%PORTDOCS%%%%DOCSDIR%%/etc/luavs.bat %%PORTDOCS%%%%DOCSDIR%%/etc/min.c %%PORTDOCS%%%%DOCSDIR%%/etc/noparser.c --MP_/R.qR88uXXDbrL9tNAau_Xhx--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200802232240.m1NMe2V6053549>