From owner-svn-ports-head@FreeBSD.ORG Wed Mar 13 21:29:12 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id AE39F21B; Wed, 13 Mar 2013 21:29:12 +0000 (UTC) (envelope-from garga@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 91BBCD0B; Wed, 13 Mar 2013 21:29:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2DLTC4q083810; Wed, 13 Mar 2013 21:29:12 GMT (envelope-from garga@svn.freebsd.org) Received: (from garga@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2DLTBx8083805; Wed, 13 Mar 2013 21:29:11 GMT (envelope-from garga@svn.freebsd.org) Message-Id: <201303132129.r2DLTBx8083805@svn.freebsd.org> From: Renato Botelho Date: Wed, 13 Mar 2013 21:29:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r314114 - in head/x11-wm/awesome: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Mar 2013 21:29:12 -0000 Author: garga Date: Wed Mar 13 21:29:11 2013 New Revision: 314114 URL: http://svnweb.freebsd.org/changeset/ports/314114 Log: Downgrade awesome to 3.4.x while devel/lua-lgi is broken Modified: head/x11-wm/awesome/Makefile head/x11-wm/awesome/distinfo head/x11-wm/awesome/files/patch-CMakeLists.txt head/x11-wm/awesome/files/patch-awesomeConfig.cmake head/x11-wm/awesome/pkg-plist Modified: head/x11-wm/awesome/Makefile ============================================================================== --- head/x11-wm/awesome/Makefile Wed Mar 13 21:20:44 2013 (r314113) +++ head/x11-wm/awesome/Makefile Wed Mar 13 21:29:11 2013 (r314114) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= awesome -PORTVERSION= 3.5 -PORTREVISION= 2 +PORTVERSION= 3.4.15 +PORTEPOCH= 1 CATEGORIES= x11-wm MASTER_SITES= http://awesome.naquadah.org/download/ @@ -14,13 +14,12 @@ LICENSE= GPLv2 BUILD_DEPENDS= asciidoc:${PORTSDIR}/textproc/asciidoc \ convert:${PORTSDIR}/graphics/ImageMagick \ + gperf>=3.0.3:${PORTSDIR}/devel/gperf \ pango>=1.19.3:${PORTSDIR}/x11-toolkits/pango \ xmlto:${PORTSDIR}/textproc/xmlto \ xcb-util>=0.3.8:${PORTSDIR}/x11/xcb-util \ xproto>=7.0.11:${PORTSDIR}/x11/xproto \ - ${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_MODLIBDIR}/lgi/corelgilua51.so:${PORTSDIR}/devel/lua-lgi LIB_DEPENDS= cairo:${PORTSDIR}/graphics/cairo \ ev:${PORTSDIR}/devel/libev \ freetype:${PORTSDIR}/print/freetype2 \ @@ -43,9 +42,10 @@ USE_LUA= 5.1+ USE_XORG= pixman x11 xau xdmcp xext xft xinerama xrandr xrender xproto MAN1= awesome.1 \ - awesome-client.1 + awesome-client.1 \ + awsetbg.1 MAN5= awesomerc.5 -MANLANG= "" de es fr it ru +MANLANG= "" de es fr MANCOMPRESSED= yes PORTDOCS= AUTHORS BUGS LICENSE README @@ -66,16 +66,21 @@ CMAKE_ARGS += -DWITH_DBUS=YES CMAKE_ARGS += -DWITH_DBUS=NO .endif -.if ${PORT_OPTIONS:MDOCS} -CMAKE_ARGS += -DINSTALL_PORTDOCS=YES -DGENERATE_DOC=YES -.else -CMAKE_ARGS += -DINSTALL_PORTDOCS=NO -DGENERATE_DOC=NO +pre-configure: + @${REINPLACE_CMD} \ + -e 's/"generate luadoc" ON/\"generate luadoc" OFF/g' \ + ${WRKSRC}/awesomeConfig.cmake + @${REINPLACE_CMD} \ + -e 's,tr ,env LC_ALL="C" ${TR} ,g' \ + -e 's,gperf,${LOCALBASE}/bin/gperf,g' \ + ${WRKSRC}/build-utils/gperf.sh +.if empty(PORT_OPTIONS:MDOCS) + @${REINPLACE_CMD} \ + -e 's/"install port docs" ON/\"install port docs" OFF/g' \ + ${WRKSRC}/awesomeConfig.cmake .endif post-patch: - @${REINPLACE_CMD} -e "/LUA_EXECUTABLE lua/ s,lua,lua-${LUA_VER}," \ - ${WRKSRC}/awesomeConfig.cmake - @${REINPLACE_CMD} -e "s,^lua ,${LUA_CMD} ," \ - ${WRKSRC}/build-utils/lgi-check.sh + @${RM} -f ${WRKSRC}/lib/awful/placement.lua.in.orig .include Modified: head/x11-wm/awesome/distinfo ============================================================================== --- head/x11-wm/awesome/distinfo Wed Mar 13 21:20:44 2013 (r314113) +++ head/x11-wm/awesome/distinfo Wed Mar 13 21:29:11 2013 (r314114) @@ -1,2 +1,2 @@ -SHA256 (awesome-3.5.tar.xz) = f451abbf1c814fd7206ec1e1adf9dfb3f7a2c7870d4fccc51e988fb979afa47e -SIZE (awesome-3.5.tar.xz) = 712616 +SHA256 (awesome-3.4.15.tar.xz) = 6b053e18113bb21883a0c5b8c618845c3baddaf9dbe558ff6b824f7e320521d5 +SIZE (awesome-3.4.15.tar.xz) = 723640 Modified: head/x11-wm/awesome/files/patch-CMakeLists.txt ============================================================================== --- head/x11-wm/awesome/files/patch-CMakeLists.txt Wed Mar 13 21:20:44 2013 (r314113) +++ head/x11-wm/awesome/files/patch-CMakeLists.txt Wed Mar 13 21:29:11 2013 (r314114) @@ -1,15 +1,6 @@ ---- 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 @@ +--- 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 @@ PATTERN "*.in" EXCLUDE) install(DIRECTORY ${SOURCE_DIR}/themes DESTINATION ${AWESOME_DATA_PATH} PATTERN "*.in" EXCLUDE) @@ -18,5 +9,5 @@ + install(FILES ${AWE_DOC_FILES} DESTINATION ${AWESOME_DOC_PATH}) +endif() install(FILES "awesome.desktop" DESTINATION ${AWESOME_XSESSION_PATH}) - if(GENERATE_DOC) - install(DIRECTORY ${BUILD_DIR}/doc DESTINATION ${AWESOME_DOC_PATH}) + if(GENERATE_LUADOC) + install(DIRECTORY ${BUILD_DIR}/luadoc DESTINATION ${AWESOME_DOC_PATH}) Modified: head/x11-wm/awesome/files/patch-awesomeConfig.cmake ============================================================================== --- head/x11-wm/awesome/files/patch-awesomeConfig.cmake Wed Mar 13 21:20:44 2013 (r314113) +++ head/x11-wm/awesome/files/patch-awesomeConfig.cmake Wed Mar 13 21:29:11 2013 (r314114) @@ -1,14 +1,16 @@ ---- awesomeConfig.cmake.orig 2012-12-21 21:18:18.000000000 -0200 -+++ awesomeConfig.cmake 2013-03-08 11:46:07.000000000 -0300 -@@ -14,6 +14,7 @@ +--- awesomeConfig.cmake.orig 2012-07-15 07:12:21.000000000 -0300 ++++ awesomeConfig.cmake 2012-07-15 20:30:48.000000000 -0300 +@@ -13,7 +13,8 @@ + option(WITH_DBUS "build with D-BUS" ON) option(GENERATE_MANPAGES "generate manpages" ON) option(COMPRESS_MANPAGES "compress manpages" ON) - option(GENERATE_DOC "generate API documentation" ON) +-option(GENERATE_LUADOC "generate luadoc" ON) ++option(GENERATE_LUADOC "generate luadoc" OFF) +option(INSTALL_PORTDOCS "install port docs" ON) # {{{ CFLAGS - add_definitions(-O1 -std=gnu99 -ggdb3 -rdynamic -fno-strict-aliasing -Wall -Wextra -@@ -58,7 +59,7 @@ + add_definitions(-std=gnu99 -ggdb3 -fno-strict-aliasing -Wall -Wextra +@@ -59,7 +60,7 @@ # theme graphics a_find_program(CONVERT_EXECUTABLE convert TRUE) # doxygen @@ -17,7 +19,24 @@ # pkg-config include(FindPkgConfig) # lua 5.1 -@@ -256,7 +257,7 @@ +@@ -162,6 +163,8 @@ + + # Check for libev + a_find_library(LIB_EV ev) ++# Check for libexecinfo on non Glibc system ++a_find_library(LIB_EXECINFO execinfo) + + # Check for backtrace_symbols() + include(CheckFunctionExists) +@@ -200,6 +203,7 @@ + ${AWESOME_COMMON_REQUIRED_LDFLAGS} + ${AWESOME_REQUIRED_LDFLAGS} + ${LIB_EV} ++ ${LIB_EXECINFO} + ${LUA_LIBRARIES}) + + set(AWESOME_REQUIRED_INCLUDE_DIRS +@@ -261,7 +265,7 @@ if(DEFINED AWESOME_MAN_PATH) set(AWESOME_MAN_PATH ${AWESOME_MAN_PATH} CACHE PATH "awesome manpage directory") else() Modified: head/x11-wm/awesome/pkg-plist ============================================================================== --- head/x11-wm/awesome/pkg-plist Wed Mar 13 21:20:44 2013 (r314113) +++ head/x11-wm/awesome/pkg-plist Wed Mar 13 21:29:11 2013 (r314114) @@ -1,6 +1,7 @@ @comment $FreeBSD$ bin/awesome bin/awesome-client +bin/awsetbg etc/xdg/awesome/rc.lua %%DATADIR%%/icons/awesome16.png %%DATADIR%%/icons/awesome32.png @@ -11,11 +12,9 @@ etc/xdg/awesome/rc.lua %%DATADIR%%/lib/awful/client.lua %%DATADIR%%/lib/awful/completion.lua %%DATADIR%%/lib/awful/dbus.lua -%%DATADIR%%/lib/awful/ewmh.lua -%%DATADIR%%/lib/awful/icccm.lua +%%DATADIR%%/lib/awful/hooks.lua %%DATADIR%%/lib/awful/init.lua %%DATADIR%%/lib/awful/key.lua -%%DATADIR%%/lib/awful/keygrabber.lua %%DATADIR%%/lib/awful/layout/init.lua %%DATADIR%%/lib/awful/layout/suit/fair.lua %%DATADIR%%/lib/awful/layout/suit/floating.lua @@ -43,6 +42,10 @@ etc/xdg/awesome/rc.lua %%DATADIR%%/lib/awful/widget/graph.lua %%DATADIR%%/lib/awful/widget/init.lua %%DATADIR%%/lib/awful/widget/launcher.lua +%%DATADIR%%/lib/awful/widget/layout/default.lua +%%DATADIR%%/lib/awful/widget/layout/horizontal.lua +%%DATADIR%%/lib/awful/widget/layout/init.lua +%%DATADIR%%/lib/awful/widget/layout/vertical.lua %%DATADIR%%/lib/awful/widget/layoutbox.lua %%DATADIR%%/lib/awful/widget/progressbar.lua %%DATADIR%%/lib/awful/widget/prompt.lua @@ -50,33 +53,7 @@ etc/xdg/awesome/rc.lua %%DATADIR%%/lib/awful/widget/tasklist.lua %%DATADIR%%/lib/awful/widget/textclock.lua %%DATADIR%%/lib/beautiful.lua -%%DATADIR%%/lib/gears/color.lua -%%DATADIR%%/lib/gears/debug.lua -%%DATADIR%%/lib/gears/init.lua -%%DATADIR%%/lib/gears/object.lua -%%DATADIR%%/lib/gears/sort.lua -%%DATADIR%%/lib/gears/surface.lua -%%DATADIR%%/lib/gears/wallpaper.lua -%%DATADIR%%/lib/menubar/init.lua -%%DATADIR%%/lib/menubar/menu_gen.lua -%%DATADIR%%/lib/menubar/utils.lua %%DATADIR%%/lib/naughty.lua -%%DATADIR%%/lib/wibox/drawable.lua -%%DATADIR%%/lib/wibox/init.lua -%%DATADIR%%/lib/wibox/layout/align.lua -%%DATADIR%%/lib/wibox/layout/base.lua -%%DATADIR%%/lib/wibox/layout/fixed.lua -%%DATADIR%%/lib/wibox/layout/flex.lua -%%DATADIR%%/lib/wibox/layout/init.lua -%%DATADIR%%/lib/wibox/layout/margin.lua -%%DATADIR%%/lib/wibox/layout/mirror.lua -%%DATADIR%%/lib/wibox/layout/rotate.lua -%%DATADIR%%/lib/wibox/widget/background.lua -%%DATADIR%%/lib/wibox/widget/base.lua -%%DATADIR%%/lib/wibox/widget/imagebox.lua -%%DATADIR%%/lib/wibox/widget/init.lua -%%DATADIR%%/lib/wibox/widget/systray.lua -%%DATADIR%%/lib/wibox/widget/textbox.lua %%DATADIR%%/themes/default/README %%DATADIR%%/themes/default/background.png %%DATADIR%%/themes/default/background_white.png @@ -107,6 +84,8 @@ etc/xdg/awesome/rc.lua %%DATADIR%%/themes/default/submenu.png %%DATADIR%%/themes/default/taglist/squarefw.png %%DATADIR%%/themes/default/taglist/squarew.png +%%DATADIR%%/themes/default/tasklist/floating.png +%%DATADIR%%/themes/default/tasklist/floatingw.png %%DATADIR%%/themes/default/theme.lua %%DATADIR%%/themes/default/titlebar/close_focus.png %%DATADIR%%/themes/default/titlebar/close_normal.png @@ -177,30 +156,26 @@ etc/xdg/awesome/rc.lua %%DATADIR%%/themes/zenburn/titlebar/sticky_normal_inactive.png %%DATADIR%%/themes/zenburn/zenburn-background.png share/xsessions/awesome.desktop +@dirrm %%DATADIR%%/icons +@dirrm %%DATADIR%%/lib/awful/layout/suit +@dirrm %%DATADIR%%/lib/awful/layout +@dirrm %%DATADIR%%/lib/awful/mouse +@dirrm %%DATADIR%%/lib/awful/widget/layout +@dirrm %%DATADIR%%/lib/awful/widget +@dirrm %%DATADIR%%/lib/awful +@dirrm %%DATADIR%%/lib +@dirrm %%DATADIR%%/themes/default/layouts +@dirrm %%DATADIR%%/themes/default/taglist +@dirrm %%DATADIR%%/themes/default/tasklist +@dirrm %%DATADIR%%/themes/default/titlebar +@dirrm %%DATADIR%%/themes/default +@dirrm %%DATADIR%%/themes/sky/layouts +@dirrm %%DATADIR%%/themes/sky @dirrm %%DATADIR%%/themes/zenburn/titlebar @dirrm %%DATADIR%%/themes/zenburn/taglist @dirrm %%DATADIR%%/themes/zenburn/layouts @dirrm %%DATADIR%%/themes/zenburn -@dirrm %%DATADIR%%/themes/sky/layouts -@dirrm %%DATADIR%%/themes/sky -@dirrm %%DATADIR%%/themes/default/titlebar -@dirrm %%DATADIR%%/themes/default/taglist -@dirrm %%DATADIR%%/themes/default/layouts -@dirrm %%DATADIR%%/themes/default @dirrm %%DATADIR%%/themes -@dirrm %%DATADIR%%/lib/wibox/widget -@dirrm %%DATADIR%%/lib/wibox/layout -@dirrm %%DATADIR%%/lib/wibox -@dirrm %%DATADIR%%/lib/menubar -@dirrm %%DATADIR%%/lib/gears -@dirrm %%DATADIR%%/lib/awful/widget -@dirrm %%DATADIR%%/lib/awful/mouse -@dirrm %%DATADIR%%/lib/awful/layout/suit -@dirrm %%DATADIR%%/lib/awful/layout -@dirrm %%DATADIR%%/lib/awful -@dirrm %%DATADIR%%/lib/awful -@dirrm %%DATADIR%%/lib -@dirrm %%DATADIR%%/icons @dirrm %%DATADIR%% @dirrmtry etc/xdg/awesome @dirrmtry etc/xdg