diff options
| author | vanilla <vanilla@FreeBSD.org> | 2008-03-20 00:20:31 +0800 |
|---|---|---|
| committer | vanilla <vanilla@FreeBSD.org> | 2008-03-20 00:20:31 +0800 |
| commit | 4d3a543b2fe224c39a7b176bc747101ee99568b8 (patch) | |
| tree | b3e45b83203923dcaa9dfb2a36c6e2e718caf0c3 /lang/lua | |
| parent | 06dfbc718f13bcfab92c7562de6d6b4a8bbc7c38 (diff) | |
| download | freebsd-ports-gnome-4d3a543b2fe224c39a7b176bc747101ee99568b8.tar.gz freebsd-ports-gnome-4d3a543b2fe224c39a7b176bc747101ee99568b8.tar.zst freebsd-ports-gnome-4d3a543b2fe224c39a7b176bc747101ee99568b8.zip | |
Integrate with maintainer's patch.
Diffstat (limited to 'lang/lua')
| -rw-r--r-- | lang/lua/Makefile | 21 | ||||
| -rw-r--r-- | lang/lua/pkg-plist | 4 |
2 files changed, 19 insertions, 6 deletions
diff --git a/lang/lua/Makefile b/lang/lua/Makefile index ab160d7ef633..45197b55c700 100644 --- a/lang/lua/Makefile +++ b/lang/lua/Makefile @@ -7,6 +7,7 @@ PORTNAME= lua PORTVERSION= 5.1.3 +PORTREVISION= 1 CATEGORIES= lang MASTER_SITES= http://www.lua.org/ftp/ \ ftp://ftp.tecgraf.puc-rio.br/pub/lua/ \ @@ -30,6 +31,12 @@ LATEST_LINK= ${LUA_SUBDIR} 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 \ @@ -75,15 +82,23 @@ do-install: # 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} -# pkg-config file. - ${INSTALL_DATA} ${WRKSRC}/etc/lua.pc ${PREFIX}/libdata/pkgconfig .if ${MACHINE_ARCH:L} == "amd64" CFLAGS+= -fPIC diff --git a/lang/lua/pkg-plist b/lang/lua/pkg-plist index 7cdc95fa35f2..70baca4ceff9 100644 --- a/lang/lua/pkg-plist +++ b/lang/lua/pkg-plist @@ -10,16 +10,14 @@ bin/luac-%%LUA_VER%% %%LUA_INCDIR%%/luaconf.h %%LUA_INCDIR%%/lualib.h %%LUA_LIBDIR%%/liblua.a -libdata/pkgconfig/lua.pc +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 |