Date: Tue, 05 Feb 2008 19:39:58 +0900 From: Hirohisa Yamaguchi <umq@ueo.co.jp> To: freebsd-ports-bugs@FreeBSD.ORG Subject: Re: ports/120278: [patch] lang/lua update to 5.1.3 Message-ID: <86wspjlm9t.wl%umq@ueo.co.jp> In-Reply-To: <86zluflqiv.wl%umq@ueo.co.jp> References: <200802050330.m153U1I0000354@freefall.freebsd.org> <86zluflqiv.wl%umq@ueo.co.jp>
next in thread | previous in thread | raw e-mail | index | archive | help
--Multipart_Tue_Feb__5_19:39:58_2008-1 Content-Type: text/plain; charset=US-ASCII Hi. ; resent since bug-followup@ rejected previous message. I prefer pkg-config to work. Here's an update to the patch. -- Hirohisa Yamaguchi umq@ueo.co.jp --Multipart_Tue_Feb__5_19:39:58_2008-1 Content-Type: application/octet-stream; type=patch Content-Disposition: attachment; filename="lang_lua.patch" Content-Transfer-Encoding: 7bit Index: Makefile =================================================================== RCS file: /home/ncvs/ports/lang/lua/Makefile,v retrieving revision 1.29 diff -u -p -r1.29 Makefile --- Makefile 31 Mar 2007 20:40:55 -0000 1.29 +++ Makefile 5 Feb 2008 09:34:01 -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 @@ COMMENT= Small, compilable scripting lan 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} @@ -33,10 +33,21 @@ LUA_MAN= ${LUA_BIN:S/$/.1/} post-patch: @${REINPLACE_CMD} -Ee \ - 's|^(CC=).*|\1 ${CC}| ; \ + '/^INSTALL_.*=/s/INSTALL_TOP/prefix/ ; \ + s|^(CC=).*|\1 ${CC}| ; \ s|^(CFLAGS=)|\1 ${CFLAGS}| ; \ s|/usr/local|${PREFIX}|' \ ${WRKSRC}/Makefile ${WRKSRC}/src/Makefile + @${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 && ${RM} ${WRKSRC}/etc/lua.pc.bak post-build: @${RM} -f ${WRKSRC}/test/lua ${WRKSRC}/test/luac @@ -71,6 +82,8 @@ do-install: # Module directories. ${MKDIR} ${LUA_MODLIBDIR} ${MKDIR} ${LUA_MODSHAREDIR} +# pkg-config file. + ${INSTALL_DATA} ${WRKSRC}/etc/lua.pc ${PREFIX}/libdata/pkgconfig .if ${MACHINE_ARCH:L} == "amd64" CFLAGS+= -fPIC Index: distinfo =================================================================== RCS file: /home/ncvs/ports/lang/lua/distinfo,v retrieving revision 1.11 diff -u -p -r1.11 distinfo --- distinfo 22 Aug 2006 09:02:29 -0000 1.11 +++ distinfo 5 Feb 2008 09:34:01 -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: /home/ncvs/ports/lang/lua/pkg-plist,v retrieving revision 1.7 diff -u -p -r1.7 pkg-plist --- pkg-plist 15 Sep 2006 08:17:08 -0000 1.7 +++ pkg-plist 5 Feb 2008 09:34:01 -0000 @@ -10,7 +10,9 @@ bin/luac-%%LUA_VER%% %%LUA_INCDIR%%/luaconf.h %%LUA_INCDIR%%/lualib.h %%LUA_LIBDIR%%/liblua.a +libdata/pkgconfig/lua.pc %%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/amazon.gif %%PORTDOCS%%%%DOCSDIR%%/contents.html %%PORTDOCS%%%%DOCSDIR%%/etc/Makefile %%PORTDOCS%%%%DOCSDIR%%/etc/README --Multipart_Tue_Feb__5_19:39:58_2008-1--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?86wspjlm9t.wl%umq>