Date: Tue, 15 Oct 2013 19:20:01 GMT From: asomers@gmail.com To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/182892: Make devel/atf create a tests user Message-ID: <201310151920.r9FJK1o5027000@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/182892; it has been noted by GNATS. From: asomers@gmail.com To: bug-followup@FreeBSD.org, julio@meroh.net Cc: Subject: Re: ports/182892: Make devel/atf create a tests user Date: Tue, 15 Oct 2013 13:11:05 -0600 Julio's patch works for me, but I made two changes: 1) Up the portrevision to 2 due to other recent changes. 2) Use SUB_FILES and SUB_LIST instead of running a manual sed comand on lua-5.2.pc Attached is my updated patch Index: Makefile =================================================================== --- Makefile (revision 330331) +++ Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= lua PORTVERSION= 5.2.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang MASTER_SITES= http://www.lua.org/ftp/ @@ -12,7 +12,6 @@ LICENSE= MIT -#USE_LUA= 5.2 LUA_VER= 5.2 LUA_VER_SH= 1 LUA_VER_STR= 52 @@ -25,6 +24,7 @@ LUA_MODSHAREDIR= ${LUA_PREFIX}/share/lua/${LUA_VER} ALL_TARGET= freebsd +USES= pkgconfig USE_LDCONFIG= yes MAKE_ENV= LUA_SONAME="liblua-${LUA_VER}.so.${LUA_VER_SH}" \ MYCFLAGS="${CFLAGS}" MYLDFLAGS="${LDFLAGS}" @@ -58,6 +58,10 @@ @${REINPLACE_CMD} -e "/LUA_ROOT/s|/usr/local|${LUA_PREFIX}|" \ ${WRKSRC}/src/luaconf.h +SUB_FILES= lua-5.2.pc +SUB_LIST= VERSION=${PORTVERSION} LIBDIR=${LUA_LIBDIR} \ + INCLUDEDIR=${LUA_INCDIR} + post-install: .for f in lua luac ${LN} -sf ${LUA_BINDIR}/${f} ${PREFIX}/bin/${f}-${LUA_VER} @@ -65,6 +69,7 @@ ${LN} -sf ${LUA_LIBDIR}/liblua-${LUA_VER}.so.${LUA_VER_SH} ${LUA_LIBDIR}/liblua.so ${LN} -sf ${LUA_SUBDIR}/liblua-${LUA_VER}.so.${LUA_VER_SH} ${PREFIX}/lib ${LN} -sf liblua-${LUA_VER}.so.${LUA_VER_SH} ${PREFIX}/lib/liblua-${LUA_VER}.so + ${INSTALL_DATA} ${WRKDIR}/lua-${LUA_VER}.pc ${PREFIX}/libdata/pkgconfig # Documentation. .if ${PORT_OPTIONS:MDOCS} Index: files/lua-5.2.pc.in =================================================================== --- files/lua-5.2.pc.in (revision 0) +++ files/lua-5.2.pc.in (working copy) @@ -0,0 +1,11 @@ +# $FreeBSD$ + +version=%%VERSION%% +libdir=%%LIBDIR%% +includedir=%%INCLUDEDIR%% + +Name: Lua +Description: An Extensible Extension Language +Version: ${version} +Libs: -L${libdir} -llua -lm +Cflags: -I${includedir} Index: pkg-plist =================================================================== --- pkg-plist (revision 330331) +++ pkg-plist (working copy) @@ -12,6 +12,7 @@ lib/lua52/liblua-5.2.so.1 lib/lua52/liblua.a lib/lua52/liblua.so +libdata/pkgconfig/lua-5.2.pc %%PORTDOCS%%%%DOCSDIR%%/contents.html %%PORTDOCS%%%%DOCSDIR%%/logo.gif %%PORTDOCS%%%%DOCSDIR%%/lua.css
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310151920.r9FJK1o5027000>