diff options
| author | garga <garga@FreeBSD.org> | 2013-03-11 20:24:48 +0800 |
|---|---|---|
| committer | garga <garga@FreeBSD.org> | 2013-03-11 20:24:48 +0800 |
| commit | e1cb9a21a36ebd444c052baac32c5dc8cc4c757f (patch) | |
| tree | e4740a663c84cacf23a5a613f7137d0a391ef0b2 /x11-wm | |
| parent | a07d3ebcdf3cdc4362540b87229cafece6f77982 (diff) | |
| download | freebsd-ports-gnome-e1cb9a21a36ebd444c052baac32c5dc8cc4c757f.tar.gz freebsd-ports-gnome-e1cb9a21a36ebd444c052baac32c5dc8cc4c757f.tar.zst freebsd-ports-gnome-e1cb9a21a36ebd444c052baac32c5dc8cc4c757f.zip | |
- Fix lua-lgi dependency
- Fix export-dynamic linker param [1]
Submitted by: green dog <fiziologus@gmail.com> [1]
Diffstat (limited to 'x11-wm')
| -rw-r--r-- | x11-wm/awesome/Makefile | 10 | ||||
| -rw-r--r-- | x11-wm/awesome/files/patch-CMakeLists.txt | 19 |
2 files changed, 19 insertions, 10 deletions
diff --git a/x11-wm/awesome/Makefile b/x11-wm/awesome/Makefile index 17156ab66daa..5088ba773422 100644 --- a/x11-wm/awesome/Makefile +++ b/x11-wm/awesome/Makefile @@ -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}/textproc/asciidoc \ 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 -DGENERATE_DOC=NO 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> diff --git a/x11-wm/awesome/files/patch-CMakeLists.txt b/x11-wm/awesome/files/patch-CMakeLists.txt index 24a4b2a7a605..2e1893377ebc 100644 --- a/x11-wm/awesome/files/patch-CMakeLists.txt +++ b/x11-wm/awesome/files/patch-CMakeLists.txt @@ -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}) |