diff --git a/x11-wm/awesome/Makefile b/x11-wm/awesome/Makefile index 1428c7a79f34..fc4424e2cea5 100644 --- a/x11-wm/awesome/Makefile +++ b/x11-wm/awesome/Makefile @@ -6,7 +6,7 @@ # PORTNAME= awesome -PORTVERSION= 3.3.4 +PORTVERSION= 3.4 CATEGORIES= x11-wm MASTER_SITES= http://awesome.naquadah.org/download/ \ http://redundancy.redundancy.org/mirror/ @@ -27,7 +27,8 @@ LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo \ startup-notification-1.0:${PORTSDIR}/x11/startup-notification \ xdg-basedir.1:${PORTSDIR}/x11/libxdg-basedir \ xcb.2:${PORTSDIR}/x11/libxcb \ - xcb-event.1:${PORTSDIR}/x11/xcb-util + xcb-event.1:${PORTSDIR}/x11/xcb-util \ + execinfo.1:${PORTSDIR}/devel/libexecinfo USE_ICONV= yes USE_CMAKE= yes diff --git a/x11-wm/awesome/distinfo b/x11-wm/awesome/distinfo index d3d914a048bf..5f566e377fa1 100644 --- a/x11-wm/awesome/distinfo +++ b/x11-wm/awesome/distinfo @@ -1,3 +1,3 @@ -MD5 (awesome-3.3.4.tar.gz) = b38075c1a2fc6668ed733508f1a4e56e -SHA256 (awesome-3.3.4.tar.gz) = 734425a93a378a1bac1ab031c62eb8c28538ee330c96f2938f9ef1cad056d88e -SIZE (awesome-3.3.4.tar.gz) = 285297 +MD5 (awesome-3.4.tar.gz) = 4008e85c85694028eea593180ba2195f +SHA256 (awesome-3.4.tar.gz) = 3934fc9446d190ecee87b25bdf0122fcec22e0585337f50ec51fbd924e023660 +SIZE (awesome-3.4.tar.gz) = 315322 diff --git a/x11-wm/awesome/files/patch-awesomeConfig.cmake b/x11-wm/awesome/files/patch-awesomeConfig.cmake index fb9be2703fe4..36a7e997193e 100644 --- a/x11-wm/awesome/files/patch-awesomeConfig.cmake +++ b/x11-wm/awesome/files/patch-awesomeConfig.cmake @@ -1,6 +1,6 @@ ---- awesomeConfig.cmake.orig -+++ awesomeConfig.cmake -@@ -12,8 +12,9 @@ +--- awesomeConfig.cmake.orig 2009-09-28 09:08:15.000000000 -0300 ++++ awesomeConfig.cmake 2009-09-30 16:36:56.000000000 -0300 +@@ -11,8 +11,9 @@ set(CMAKE_BUILD_TYPE RELEASE) option(WITH_DBUS "build with D-BUS" ON) @@ -11,7 +11,7 @@ link_directories(/usr/local/lib) -@@ -61,7 +62,7 @@ +@@ -60,7 +61,7 @@ # theme graphics a_find_program(CONVERT_EXECUTABLE convert TRUE) # doxygen @@ -20,7 +20,24 @@ # pkg-config include(FindPkgConfig) # lua 5.1 -@@ -244,7 +245,7 @@ +@@ -166,6 +167,8 @@ + + # Check for libev + a_find_library(LIB_EV ev) ++# Check for libexecinfo on non Glibc system ++a_find_library(LIB_EXECINFO execinfo) + + # Error check + if(NOT LUA51_FOUND AND NOT LUA50_FOUND) # This is a workaround to a cmake bug +@@ -176,6 +179,7 @@ + ${AWESOME_COMMON_REQUIRED_LDFLAGS} + ${AWESOME_REQUIRED_LIBRARIES} + ${LIB_EV} ++ ${LIB_EXECINFO} + ${LUA_LIBRARIES}) + + set(AWESOME_REQUIRED_INCLUDE_DIRS +@@ -244,7 +248,7 @@ if(DEFINED AWESOME_MAN_PATH) set(AWESOME_MAN_PATH ${AWESOME_MAN_PATH} CACHE PATH "awesome manpage directory") else() diff --git a/x11-wm/awesome/pkg-plist b/x11-wm/awesome/pkg-plist index 828980a5ede8..35e141f12851 100644 --- a/x11-wm/awesome/pkg-plist +++ b/x11-wm/awesome/pkg-plist @@ -7,16 +7,16 @@ etc/xdg/awesome/rc.lua %%DATADIR%%/icons/awesome32.png %%DATADIR%%/icons/awesome48.png %%DATADIR%%/icons/awesome64.png -%%DATADIR%%/icons/invaders/enemy_1.png -%%DATADIR%%/icons/invaders/enemy_2.png -%%DATADIR%%/icons/invaders/enemy_3.png -%%DATADIR%%/icons/invaders/player.png +%%DATADIR%%/lib/awful/autofocus.lua +%%DATADIR%%/lib/awful/autofocus.lua.in %%DATADIR%%/lib/awful/button.lua %%DATADIR%%/lib/awful/button.lua.in %%DATADIR%%/lib/awful/client.lua %%DATADIR%%/lib/awful/client.lua.in %%DATADIR%%/lib/awful/completion.lua %%DATADIR%%/lib/awful/completion.lua.in +%%DATADIR%%/lib/awful/dbus.lua +%%DATADIR%%/lib/awful/dbus.lua.in %%DATADIR%%/lib/awful/hooks.lua %%DATADIR%%/lib/awful/hooks.lua.in %%DATADIR%%/lib/awful/init.lua @@ -35,18 +35,24 @@ etc/xdg/awesome/rc.lua %%DATADIR%%/lib/awful/layout/suit/magnifier.lua.in %%DATADIR%%/lib/awful/layout/suit/max.lua %%DATADIR%%/lib/awful/layout/suit/max.lua.in +%%DATADIR%%/lib/awful/layout/suit/spiral.lua +%%DATADIR%%/lib/awful/layout/suit/spiral.lua.in %%DATADIR%%/lib/awful/layout/suit/tile.lua %%DATADIR%%/lib/awful/layout/suit/tile.lua.in %%DATADIR%%/lib/awful/menu.lua %%DATADIR%%/lib/awful/menu.lua.in -%%DATADIR%%/lib/awful/mouse.lua -%%DATADIR%%/lib/awful/mouse.lua.in +%%DATADIR%%/lib/awful/mouse/finder.lua +%%DATADIR%%/lib/awful/mouse/finder.lua.in +%%DATADIR%%/lib/awful/mouse/init.lua +%%DATADIR%%/lib/awful/mouse/init.lua.in %%DATADIR%%/lib/awful/placement.lua %%DATADIR%%/lib/awful/placement.lua.in %%DATADIR%%/lib/awful/prompt.lua %%DATADIR%%/lib/awful/prompt.lua.in %%DATADIR%%/lib/awful/remote.lua %%DATADIR%%/lib/awful/remote.lua.in +%%DATADIR%%/lib/awful/rules.lua +%%DATADIR%%/lib/awful/rules.lua.in %%DATADIR%%/lib/awful/screen.lua %%DATADIR%%/lib/awful/screen.lua.in %%DATADIR%%/lib/awful/startup_notification.lua @@ -55,33 +61,49 @@ etc/xdg/awesome/rc.lua %%DATADIR%%/lib/awful/tag.lua.in %%DATADIR%%/lib/awful/titlebar.lua %%DATADIR%%/lib/awful/titlebar.lua.in +%%DATADIR%%/lib/awful/tooltip.lua +%%DATADIR%%/lib/awful/tooltip.lua.in %%DATADIR%%/lib/awful/util.lua %%DATADIR%%/lib/awful/util.lua.in +%%DATADIR%%/lib/awful/wibox.lua +%%DATADIR%%/lib/awful/wibox.lua.in %%DATADIR%%/lib/awful/widget/button.lua %%DATADIR%%/lib/awful/widget/button.lua.in %%DATADIR%%/lib/awful/widget/common.lua %%DATADIR%%/lib/awful/widget/common.lua.in +%%DATADIR%%/lib/awful/widget/graph.lua +%%DATADIR%%/lib/awful/widget/graph.lua.in %%DATADIR%%/lib/awful/widget/init.lua %%DATADIR%%/lib/awful/widget/init.lua.in %%DATADIR%%/lib/awful/widget/launcher.lua %%DATADIR%%/lib/awful/widget/launcher.lua.in +%%DATADIR%%/lib/awful/widget/layout/default.lua +%%DATADIR%%/lib/awful/widget/layout/default.lua.in +%%DATADIR%%/lib/awful/widget/layout/horizontal.lua +%%DATADIR%%/lib/awful/widget/layout/horizontal.lua.in +%%DATADIR%%/lib/awful/widget/layout/init.lua +%%DATADIR%%/lib/awful/widget/layout/init.lua.in +%%DATADIR%%/lib/awful/widget/layout/vertical.lua +%%DATADIR%%/lib/awful/widget/layout/vertical.lua.in +%%DATADIR%%/lib/awful/widget/layoutbox.lua +%%DATADIR%%/lib/awful/widget/layoutbox.lua.in +%%DATADIR%%/lib/awful/widget/progressbar.lua +%%DATADIR%%/lib/awful/widget/progressbar.lua.in %%DATADIR%%/lib/awful/widget/prompt.lua %%DATADIR%%/lib/awful/widget/prompt.lua.in %%DATADIR%%/lib/awful/widget/taglist.lua %%DATADIR%%/lib/awful/widget/taglist.lua.in %%DATADIR%%/lib/awful/widget/tasklist.lua %%DATADIR%%/lib/awful/widget/tasklist.lua.in +%%DATADIR%%/lib/awful/widget/textclock.lua +%%DATADIR%%/lib/awful/widget/textclock.lua.in %%DATADIR%%/lib/beautiful.lua %%DATADIR%%/lib/beautiful.lua.in -%%DATADIR%%/lib/invaders.lua -%%DATADIR%%/lib/invaders.lua.in %%DATADIR%%/lib/naughty.lua %%DATADIR%%/lib/naughty.lua.in -%%DATADIR%%/lib/tabulous.lua -%%DATADIR%%/lib/tabulous.lua.in -%%DATADIR%%/lib/telak.lua -%%DATADIR%%/lib/telak.lua.in %%DATADIR%%/themes/default/background.png +%%DATADIR%%/themes/default/layouts/dwindle.png +%%DATADIR%%/themes/default/layouts/dwindlew.png %%DATADIR%%/themes/default/layouts/fairh.png %%DATADIR%%/themes/default/layouts/fairhw.png %%DATADIR%%/themes/default/layouts/fairv.png @@ -94,6 +116,8 @@ etc/xdg/awesome/rc.lua %%DATADIR%%/themes/default/layouts/magnifierw.png %%DATADIR%%/themes/default/layouts/max.png %%DATADIR%%/themes/default/layouts/maxw.png +%%DATADIR%%/themes/default/layouts/spiral.png +%%DATADIR%%/themes/default/layouts/spiralw.png %%DATADIR%%/themes/default/layouts/tile.png %%DATADIR%%/themes/default/layouts/tilebottom.png %%DATADIR%%/themes/default/layouts/tilebottomw.png @@ -141,11 +165,48 @@ etc/xdg/awesome/rc.lua %%DATADIR%%/themes/sky/sky-background.png %%DATADIR%%/themes/sky/theme.lua %%DATADIR%%/themes/sky/theme.lua.in +%%DATADIR%%/themes/zenburn/awesome-icon.png +%%DATADIR%%/themes/zenburn/layouts/dwindle.png +%%DATADIR%%/themes/zenburn/layouts/fairh.png +%%DATADIR%%/themes/zenburn/layouts/fairv.png +%%DATADIR%%/themes/zenburn/layouts/floating.png +%%DATADIR%%/themes/zenburn/layouts/fullscreen.png +%%DATADIR%%/themes/zenburn/layouts/magnifier.png +%%DATADIR%%/themes/zenburn/layouts/max.png +%%DATADIR%%/themes/zenburn/layouts/spiral.png +%%DATADIR%%/themes/zenburn/layouts/tile.png +%%DATADIR%%/themes/zenburn/layouts/tilebottom.png +%%DATADIR%%/themes/zenburn/layouts/tileleft.png +%%DATADIR%%/themes/zenburn/layouts/tiletop.png +%%DATADIR%%/themes/zenburn/taglist/squarefz.png +%%DATADIR%%/themes/zenburn/taglist/squarez.png +%%DATADIR%%/themes/zenburn/theme.lua +%%DATADIR%%/themes/zenburn/theme.lua.in +%%DATADIR%%/themes/zenburn/titlebar/close_focus.png +%%DATADIR%%/themes/zenburn/titlebar/close_normal.png +%%DATADIR%%/themes/zenburn/titlebar/floating_focus_active.png +%%DATADIR%%/themes/zenburn/titlebar/floating_focus_inactive.png +%%DATADIR%%/themes/zenburn/titlebar/floating_normal_active.png +%%DATADIR%%/themes/zenburn/titlebar/floating_normal_inactive.png +%%DATADIR%%/themes/zenburn/titlebar/maximized_focus_active.png +%%DATADIR%%/themes/zenburn/titlebar/maximized_focus_inactive.png +%%DATADIR%%/themes/zenburn/titlebar/maximized_normal_active.png +%%DATADIR%%/themes/zenburn/titlebar/maximized_normal_inactive.png +%%DATADIR%%/themes/zenburn/titlebar/ontop_focus_active.png +%%DATADIR%%/themes/zenburn/titlebar/ontop_focus_inactive.png +%%DATADIR%%/themes/zenburn/titlebar/ontop_normal_active.png +%%DATADIR%%/themes/zenburn/titlebar/ontop_normal_inactive.png +%%DATADIR%%/themes/zenburn/titlebar/sticky_focus_active.png +%%DATADIR%%/themes/zenburn/titlebar/sticky_focus_inactive.png +%%DATADIR%%/themes/zenburn/titlebar/sticky_normal_active.png +%%DATADIR%%/themes/zenburn/titlebar/sticky_normal_inactive.png +%%DATADIR%%/themes/zenburn/zenburn-background.png share/xsessions/awesome.desktop -@dirrm %%DATADIR%%/icons/invaders @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 @@ -156,6 +217,10 @@ share/xsessions/awesome.desktop @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 @dirrm %%DATADIR%% @dirrmtry etc/xdg/awesome