Date: Mon, 11 Mar 2013 12:24:48 +0000 (UTC) From: Renato Botelho <garga@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r313874 - in head/x11-wm/awesome: . files Message-ID: <201303111224.r2BCOm4E027466@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: garga Date: Mon Mar 11 12:24:48 2013 New Revision: 313874 URL: http://svnweb.freebsd.org/changeset/ports/313874 Log: - Fix lua-lgi dependency - Fix export-dynamic linker param [1] Submitted by: green dog <fiziologus@gmail.com> [1] Modified: head/x11-wm/awesome/Makefile head/x11-wm/awesome/files/patch-CMakeLists.txt Modified: head/x11-wm/awesome/Makefile ============================================================================== --- head/x11-wm/awesome/Makefile Mon Mar 11 12:23:26 2013 (r313873) +++ head/x11-wm/awesome/Makefile Mon Mar 11 12:24:48 2013 (r313874) @@ -3,7 +3,7 @@ PORTNAME= awesome PORTVERSION= 3.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm MASTER_SITES= http://awesome.naquadah.org/download/ @@ -18,9 +18,9 @@ BUILD_DEPENDS= asciidoc:${PORTSDIR}/text xmlto:${PORTSDIR}/textproc/xmlto \ xcb-util>=0.3.8:${PORTSDIR}/x11/xcb-util \ xproto>=7.0.11:${PORTSDIR}/x11/xproto \ - ${LUA_LIBDIR}/lgi/corelgilua51.so:${PORTSDIR}/devel/lua-lgi \ + ${LUA_MODLIBDIR}/lgi/corelgilua51.so:${PORTSDIR}/devel/lua-lgi \ ${LOCALBASE}/share/xml/docbook/4.5/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml-450 -RUN_DEPENDS= ${LUA_LIBDIR}/lgi/corelgilua51.so:${PORTSDIR}/devel/lua-lgi +RUN_DEPENDS= ${LUA_MODLIBDIR}/lgi/corelgilua51.so:${PORTSDIR}/devel/lua-lgi LIB_DEPENDS= cairo:${PORTSDIR}/graphics/cairo \ ev:${PORTSDIR}/devel/libev \ freetype:${PORTSDIR}/print/freetype2 \ @@ -75,7 +75,7 @@ CMAKE_ARGS += -DINSTALL_PORTDOCS=NO -DGE post-patch: @${REINPLACE_CMD} -e "/LUA_EXECUTABLE lua/ s,lua,lua-${LUA_VER}," \ ${WRKSRC}/awesomeConfig.cmake - @${REINPLACE_CMD} -e '/lgi-check/d' \ - ${WRKSRC}/CMakeLists.txt + @${REINPLACE_CMD} -e "s,^lua ,${LUA_CMD} ," \ + ${WRKSRC}/build-utils/lgi-check.sh .include <bsd.port.post.mk> Modified: head/x11-wm/awesome/files/patch-CMakeLists.txt ============================================================================== --- head/x11-wm/awesome/files/patch-CMakeLists.txt Mon Mar 11 12:23:26 2013 (r313873) +++ head/x11-wm/awesome/files/patch-CMakeLists.txt Mon Mar 11 12:24:48 2013 (r313874) @@ -1,6 +1,15 @@ ---- CMakeLists.txt.orig 2011-01-17 19:38:13.000000000 +0800 -+++ CMakeLists.txt 2011-03-01 19:52:50.000000000 +0800 -@@ -343,7 +344,9 @@ +--- CMakeLists.txt.orig 2012-12-21 21:18:18.000000000 -0200 ++++ CMakeLists.txt 2013-03-11 08:20:10.000000000 -0300 +@@ -95,7 +95,7 @@ + if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") + set_target_properties(${PROJECT_AWE_NAME} + PROPERTIES +- LINK_FLAGS -export-dynamic) ++ LINK_FLAGS -Wl,--export-dynamic) + endif() + + target_link_libraries(${PROJECT_AWE_NAME} +@@ -317,7 +317,9 @@ PATTERN "*.in" EXCLUDE) install(DIRECTORY ${SOURCE_DIR}/themes DESTINATION ${AWESOME_DATA_PATH} PATTERN "*.in" EXCLUDE) @@ -9,5 +18,5 @@ + install(FILES ${AWE_DOC_FILES} DESTINATION ${AWESOME_DOC_PATH}) +endif() install(FILES "awesome.desktop" DESTINATION ${AWESOME_XSESSION_PATH}) - if(GENERATE_LUADOC) - install(DIRECTORY ${BUILD_DIR}/luadoc DESTINATION ${AWESOME_DOC_PATH}) + if(GENERATE_DOC) + install(DIRECTORY ${BUILD_DIR}/doc DESTINATION ${AWESOME_DOC_PATH})
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303111224.r2BCOm4E027466>