Index: head/UPDATING =================================================================== --- head/UPDATING +++ head/UPDATING @@ -5,6 +5,29 @@ You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20170410: + AFFECTS: users of x11-wm/awesome + AUTHOR: garga@FreeBSD.org + + Awesome Window Manager (x11-wm/awesome) was upgraded to 4.1 and its config + is not backward compatible with 3.5. A new port was created to keep 3.5 + version available at x11-wm/awesome3 and it will be available for 6 months + until users have time to upgrade configuration. + + There are references about what has changed in 4.0 at: + + https://awesomewm.org/apidoc/documentation/89-NEWS.md.html#v4 + + And configuration porting tips at: + + https://awesomewm.org/apidoc/documentation/17-porting-tips.md.html#v4 + + If you would like to keep using 3.x, please run the collowing command to + update pkg database: + + # pkg set -n awesome:awesome3 + # pkg set -o x11-wm/awesome:x11-wm/awesome3 + 20170404: AFFECTS: users of Xapian 1.2.x and www/ikiwiki AUTHOR: sunpoet@FreeBSD.org Index: head/x11-wm/Makefile =================================================================== --- head/x11-wm/Makefile +++ head/x11-wm/Makefile @@ -9,6 +9,7 @@ SUBDIR += amiwm SUBDIR += antiwm SUBDIR += awesome + SUBDIR += awesome3 SUBDIR += awesome-vicious SUBDIR += awesome2 SUBDIR += bbkeys Index: head/x11-wm/awesome/Makefile =================================================================== --- head/x11-wm/awesome/Makefile +++ head/x11-wm/awesome/Makefile @@ -2,10 +2,10 @@ # $FreeBSD$ PORTNAME= awesome -PORTVERSION= 3.5.9 +PORTVERSION= 4.1 +DISTVERSIONPREFIX= v PORTEPOCH= 1 CATEGORIES= x11-wm -MASTER_SITES= http://awesome.naquadah.org/download/ MAINTAINER= garga@FreeBSD.org COMMENT= Highly configurable, next generation framework window manager @@ -15,39 +15,40 @@ BUILD_DEPENDS= asciidoc:textproc/asciidoc \ convert:graphics/ImageMagick \ - pango>=1.19.3:x11-toolkits/pango \ xmlto:textproc/xmlto \ - xcb-util>=0.3.8:x11/xcb-util \ - xproto>=7.0.11:x11/xproto \ - ${LUA_MODLIBDIR}/lgi/corelgilua${LUA_VER_STR}.so:devel/lua-lgi \ - docbook-xml>0:textproc/docbook-xml -RUN_DEPENDS= ${LUA_MODLIBDIR}/lgi/corelgilua${LUA_VER_STR}.so:devel/lua-lgi + xproto>=7.0.15:x11/xproto \ + ${LUA_MODLIBDIR}/lgi/corelgilua${LUA_VER_STR}.so:devel/lua-lgi +RUN_DEPENDS= ${LUA_MODLIBDIR}/lgi/corelgilua${LUA_VER_STR}.so:devel/lua-lgi \ + bash:shells/bash LIB_DEPENDS= libcairo.so:graphics/cairo \ - libev.so:devel/libev \ - libfreetype.so:print/freetype2 \ libstartup-notification-1.so:x11/startup-notification \ libxdg-basedir.so:x11/libxdg-basedir \ - libxcb-util.so:x11/xcb-util \ libxcb-cursor.so:x11/xcb-util-cursor \ + libxcb-util.so:x11/xcb-util \ libxcb-keysyms.so:x11/xcb-util-keysyms \ libxcb-icccm.so:x11/xcb-util-wm \ - libImlib2.so:graphics/imlib2 + libxcb-xrm.so:x11/xcb-util-xrm \ + libxkbcommon.so:x11/libxkbcommon -USES= cmake execinfo gettext iconv pkgconfig lua tar:xz -CMAKE_ARGS+= -DSYSCONFDIR=${PREFIX}/etc +CONFLICTS_INSTALL= x11-wm/awesome3 + +USE_GITHUB= yes +GH_ACCOUNT= awesomewm +USES= cmake:outsource execinfo gettext iconv pkgconfig lua shebangfix +SHEBANG_FILES= utils/awesome-client +CMAKE_ARGS+= -DSYSCONFDIR=${PREFIX}/etc \ + -DAWESOME_MAN_PATH=${MANPREFIX}/man \ + -DGENERATE_DOC=OFF USE_GNOME= glib20 pango gdkpixbuf2 USE_XORG= pixman x11 xau xcb xdmcp xext xft xinerama xrandr xrender \ xproto -LDFLAGS+= ${ICONV_LIB} - -PORTDOCS= AUTHORS BUGS LICENSE README OPTIONS_DEFINE= DBUS DOCS OPTIONS_DEFAULT=DBUS DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus -DBUS_CMAKE_ON= -DWITH_DBUS=YES -DBUS_CMAKE_OFF= -DWITH_DBUS=NO +DBUS_CMAKE_ON= -DWITH_DBUS=ON +DBUS_CMAKE_OFF= -DWITH_DBUS=OFF .include @@ -57,10 +58,8 @@ .endif post-patch: - @${REINPLACE_CMD} -e "/LUA_EXECUTABLE lua/ s,lua,lua${LUA_VER_STR}," \ - -e '/Lua51/d' \ - -e 's/glib-2.0/lua-${LUA_VER} glib-2.0/g' \ - -e '/LUA51_FOUND/,+2d' \ + # Ref https://github.com/awesomeWM/awesome/issues/1377 + @${REINPLACE_CMD} -e "/COMMAND lua/ s,lua,${LUA_CMD}," \ ${WRKSRC}/awesomeConfig.cmake @${REINPLACE_CMD} -e "s,^lua ,${LUA_CMD} ," \ ${WRKSRC}/build-utils/lgi-check.sh Index: head/x11-wm/awesome/distinfo =================================================================== --- head/x11-wm/awesome/distinfo +++ head/x11-wm/awesome/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1465660246 -SHA256 (awesome-3.5.9.tar.xz) = c7f8b5e4578751688d70ec8c410c55316e22bca8ec1195c622274f1f7254d64f -SIZE (awesome-3.5.9.tar.xz) = 723084 +TIMESTAMP = 1491833539 +SHA256 (awesomewm-awesome-v4.1_GH0.tar.gz) = 4db6d8783a63d4a0b6fca2d0792bf1d0c7af3bb36bcdcf84f9d2cb25292d9820 +SIZE (awesomewm-awesome-v4.1_GH0.tar.gz) = 1097942 Index: head/x11-wm/awesome/files/patch-CMakeLists.txt =================================================================== --- head/x11-wm/awesome/files/patch-CMakeLists.txt +++ head/x11-wm/awesome/files/patch-CMakeLists.txt @@ -1,22 +0,0 @@ ---- CMakeLists.txt.orig 2016-01-15 15:51:19 UTC -+++ CMakeLists.txt -@@ -95,7 +95,7 @@ add_executable(${PROJECT_AWE_NAME} - 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 @@ install(DIRECTORY ${BUILD_DIR}/themes DE - PATTERN "*.in" EXCLUDE) - install(DIRECTORY ${SOURCE_DIR}/themes DESTINATION ${AWESOME_DATA_PATH} - PATTERN "*.in" EXCLUDE) --install(FILES ${AWE_DOC_FILES} DESTINATION ${AWESOME_DOC_PATH}) -+if(INSTALL_PORTDOCS) -+ 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}) Index: head/x11-wm/awesome/files/patch-awesomeConfig.cmake =================================================================== --- head/x11-wm/awesome/files/patch-awesomeConfig.cmake +++ head/x11-wm/awesome/files/patch-awesomeConfig.cmake @@ -1,28 +0,0 @@ ---- awesomeConfig.cmake.orig 2016-01-15 15:51:19 UTC -+++ awesomeConfig.cmake -@@ -14,6 +14,7 @@ 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(INSTALL_PORTDOCS "install port docs" ON) - - # {{{ CFLAGS - add_definitions(-O1 -std=gnu99 -ggdb3 -rdynamic -fno-strict-aliasing -Wall -Wextra -@@ -61,7 +62,7 @@ endif() - # theme graphics - a_find_program(CONVERT_EXECUTABLE convert TRUE) - # doxygen --include(FindDoxygen) -+#include(FindDoxygen) - # pkg-config - include(FindPkgConfig) - # lua 5.1 -@@ -264,7 +265,7 @@ endif() - if(DEFINED AWESOME_MAN_PATH) - set(AWESOME_MAN_PATH ${AWESOME_MAN_PATH} CACHE PATH "awesome manpage directory") - else() -- set(AWESOME_MAN_PATH ${CMAKE_INSTALL_PREFIX}/share/man CACHE PATH "awesome manpage directory") -+ set(AWESOME_MAN_PATH ${CMAKE_INSTALL_PREFIX}/man CACHE PATH "awesome manpage directory") - endif() - - # Hide to avoid confusion Index: head/x11-wm/awesome/pkg-plist =================================================================== --- head/x11-wm/awesome/pkg-plist +++ head/x11-wm/awesome/pkg-plist @@ -23,80 +23,142 @@ %%DATADIR%%/icons/awesome32.png %%DATADIR%%/icons/awesome48.png %%DATADIR%%/icons/awesome64.png -%%DATADIR%%/lib/awful/autofocus.lua -%%DATADIR%%/lib/awful/button.lua -%%DATADIR%%/lib/awful/client.lua -%%DATADIR%%/lib/awful/completion.lua -%%DATADIR%%/lib/awful/dbus.lua -%%DATADIR%%/lib/awful/ewmh.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 -%%DATADIR%%/lib/awful/layout/suit/init.lua -%%DATADIR%%/lib/awful/layout/suit/magnifier.lua -%%DATADIR%%/lib/awful/layout/suit/max.lua -%%DATADIR%%/lib/awful/layout/suit/spiral.lua -%%DATADIR%%/lib/awful/layout/suit/tile.lua -%%DATADIR%%/lib/awful/menu.lua -%%DATADIR%%/lib/awful/mouse/finder.lua -%%DATADIR%%/lib/awful/mouse/init.lua -%%DATADIR%%/lib/awful/placement.lua -%%DATADIR%%/lib/awful/prompt.lua -%%DATADIR%%/lib/awful/remote.lua -%%DATADIR%%/lib/awful/rules.lua -%%DATADIR%%/lib/awful/screen.lua -%%DATADIR%%/lib/awful/startup_notification.lua -%%DATADIR%%/lib/awful/tag.lua -%%DATADIR%%/lib/awful/titlebar.lua -%%DATADIR%%/lib/awful/tooltip.lua -%%DATADIR%%/lib/awful/util.lua -%%DATADIR%%/lib/awful/wibox.lua -%%DATADIR%%/lib/awful/widget/button.lua -%%DATADIR%%/lib/awful/widget/common.lua -%%DATADIR%%/lib/awful/widget/graph.lua -%%DATADIR%%/lib/awful/widget/init.lua -%%DATADIR%%/lib/awful/widget/launcher.lua -%%DATADIR%%/lib/awful/widget/layoutbox.lua -%%DATADIR%%/lib/awful/widget/progressbar.lua -%%DATADIR%%/lib/awful/widget/prompt.lua -%%DATADIR%%/lib/awful/widget/taglist.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/constraint.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%%/%%LUA_LIBDIR%%/awful/autofocus.lua +%%DATADIR%%/%%LUA_LIBDIR%%/awful/button.lua +%%DATADIR%%/%%LUA_LIBDIR%%/awful/client.lua +%%DATADIR%%/%%LUA_LIBDIR%%/awful/client/focus.lua +%%DATADIR%%/%%LUA_LIBDIR%%/awful/client/shape.lua +%%DATADIR%%/%%LUA_LIBDIR%%/awful/client/urgent.lua +%%DATADIR%%/%%LUA_LIBDIR%%/awful/completion.lua +%%DATADIR%%/%%LUA_LIBDIR%%/awful/dbus.lua +%%DATADIR%%/%%LUA_LIBDIR%%/awful/ewmh.lua +%%DATADIR%%/%%LUA_LIBDIR%%/awful/hotkeys_popup/init.lua +%%DATADIR%%/%%LUA_LIBDIR%%/awful/hotkeys_popup/keys/init.lua +%%DATADIR%%/%%LUA_LIBDIR%%/awful/hotkeys_popup/keys/vim.lua +%%DATADIR%%/%%LUA_LIBDIR%%/awful/hotkeys_popup/widget.lua +%%DATADIR%%/%%LUA_LIBDIR%%/awful/init.lua +%%DATADIR%%/%%LUA_LIBDIR%%/awful/key.lua +%%DATADIR%%/%%LUA_LIBDIR%%/awful/keygrabber.lua +%%DATADIR%%/%%LUA_LIBDIR%%/awful/layout/init.lua +%%DATADIR%%/%%LUA_LIBDIR%%/awful/layout/suit/corner.lua +%%DATADIR%%/%%LUA_LIBDIR%%/awful/layout/suit/fair.lua +%%DATADIR%%/%%LUA_LIBDIR%%/awful/layout/suit/floating.lua +%%DATADIR%%/%%LUA_LIBDIR%%/awful/layout/suit/init.lua +%%DATADIR%%/%%LUA_LIBDIR%%/awful/layout/suit/magnifier.lua +%%DATADIR%%/%%LUA_LIBDIR%%/awful/layout/suit/max.lua +%%DATADIR%%/%%LUA_LIBDIR%%/awful/layout/suit/spiral.lua +%%DATADIR%%/%%LUA_LIBDIR%%/awful/layout/suit/tile.lua +%%DATADIR%%/%%LUA_LIBDIR%%/awful/menu.lua +%%DATADIR%%/%%LUA_LIBDIR%%/awful/mouse/drag_to_tag.lua +%%DATADIR%%/%%LUA_LIBDIR%%/awful/mouse/init.lua +%%DATADIR%%/%%LUA_LIBDIR%%/awful/mouse/resize.lua +%%DATADIR%%/%%LUA_LIBDIR%%/awful/mouse/snap.lua +%%DATADIR%%/%%LUA_LIBDIR%%/awful/placement.lua +%%DATADIR%%/%%LUA_LIBDIR%%/awful/prompt.lua +%%DATADIR%%/%%LUA_LIBDIR%%/awful/remote.lua +%%DATADIR%%/%%LUA_LIBDIR%%/awful/rules.lua +%%DATADIR%%/%%LUA_LIBDIR%%/awful/screen.lua +%%DATADIR%%/%%LUA_LIBDIR%%/awful/spawn.lua +%%DATADIR%%/%%LUA_LIBDIR%%/awful/startup_notification.lua +%%DATADIR%%/%%LUA_LIBDIR%%/awful/tag.lua +%%DATADIR%%/%%LUA_LIBDIR%%/awful/titlebar.lua +%%DATADIR%%/%%LUA_LIBDIR%%/awful/tooltip.lua +%%DATADIR%%/%%LUA_LIBDIR%%/awful/util.lua +%%DATADIR%%/%%LUA_LIBDIR%%/awful/wibar.lua +%%DATADIR%%/%%LUA_LIBDIR%%/awful/wibox.lua +%%DATADIR%%/%%LUA_LIBDIR%%/awful/widget/button.lua +%%DATADIR%%/%%LUA_LIBDIR%%/awful/widget/clienticon.lua +%%DATADIR%%/%%LUA_LIBDIR%%/awful/widget/common.lua +%%DATADIR%%/%%LUA_LIBDIR%%/awful/widget/graph.lua +%%DATADIR%%/%%LUA_LIBDIR%%/awful/widget/init.lua +%%DATADIR%%/%%LUA_LIBDIR%%/awful/widget/keyboardlayout.lua +%%DATADIR%%/%%LUA_LIBDIR%%/awful/widget/launcher.lua +%%DATADIR%%/%%LUA_LIBDIR%%/awful/widget/layoutbox.lua +%%DATADIR%%/%%LUA_LIBDIR%%/awful/widget/only_on_screen.lua +%%DATADIR%%/%%LUA_LIBDIR%%/awful/widget/progressbar.lua +%%DATADIR%%/%%LUA_LIBDIR%%/awful/widget/prompt.lua +%%DATADIR%%/%%LUA_LIBDIR%%/awful/widget/taglist.lua +%%DATADIR%%/%%LUA_LIBDIR%%/awful/widget/tasklist.lua +%%DATADIR%%/%%LUA_LIBDIR%%/awful/widget/textclock.lua +%%DATADIR%%/%%LUA_LIBDIR%%/awful/widget/watch.lua +%%DATADIR%%/%%LUA_LIBDIR%%/beautiful.lua +%%DATADIR%%/%%LUA_LIBDIR%%/beautiful/init.lua +%%DATADIR%%/%%LUA_LIBDIR%%/beautiful/theme_assets.lua +%%DATADIR%%/%%LUA_LIBDIR%%/beautiful/xresources.lua +%%DATADIR%%/%%LUA_LIBDIR%%/gears/cache.lua +%%DATADIR%%/%%LUA_LIBDIR%%/gears/color.lua +%%DATADIR%%/%%LUA_LIBDIR%%/gears/debug.lua +%%DATADIR%%/%%LUA_LIBDIR%%/gears/filesystem.lua +%%DATADIR%%/%%LUA_LIBDIR%%/gears/geometry.lua +%%DATADIR%%/%%LUA_LIBDIR%%/gears/init.lua +%%DATADIR%%/%%LUA_LIBDIR%%/gears/math.lua +%%DATADIR%%/%%LUA_LIBDIR%%/gears/matrix.lua +%%DATADIR%%/%%LUA_LIBDIR%%/gears/object.lua +%%DATADIR%%/%%LUA_LIBDIR%%/gears/object/properties.lua +%%DATADIR%%/%%LUA_LIBDIR%%/gears/protected_call.lua +%%DATADIR%%/%%LUA_LIBDIR%%/gears/shape.lua +%%DATADIR%%/%%LUA_LIBDIR%%/gears/string.lua +%%DATADIR%%/%%LUA_LIBDIR%%/gears/surface.lua +%%DATADIR%%/%%LUA_LIBDIR%%/gears/table.lua +%%DATADIR%%/%%LUA_LIBDIR%%/gears/timer.lua +%%DATADIR%%/%%LUA_LIBDIR%%/gears/wallpaper.lua +%%DATADIR%%/%%LUA_LIBDIR%%/menubar/icon_theme.lua +%%DATADIR%%/%%LUA_LIBDIR%%/menubar/index_theme.lua +%%DATADIR%%/%%LUA_LIBDIR%%/menubar/init.lua +%%DATADIR%%/%%LUA_LIBDIR%%/menubar/menu_gen.lua +%%DATADIR%%/%%LUA_LIBDIR%%/menubar/utils.lua +%%DATADIR%%/%%LUA_LIBDIR%%/naughty.lua +%%DATADIR%%/%%LUA_LIBDIR%%/naughty/core.lua +%%DATADIR%%/%%LUA_LIBDIR%%/naughty/dbus.lua +%%DATADIR%%/%%LUA_LIBDIR%%/naughty/init.lua +%%DATADIR%%/%%LUA_LIBDIR%%/wibox/container/arcchart.lua +%%DATADIR%%/%%LUA_LIBDIR%%/wibox/container/background.lua +%%DATADIR%%/%%LUA_LIBDIR%%/wibox/container/constraint.lua +%%DATADIR%%/%%LUA_LIBDIR%%/wibox/container/init.lua +%%DATADIR%%/%%LUA_LIBDIR%%/wibox/container/margin.lua +%%DATADIR%%/%%LUA_LIBDIR%%/wibox/container/mirror.lua +%%DATADIR%%/%%LUA_LIBDIR%%/wibox/container/place.lua +%%DATADIR%%/%%LUA_LIBDIR%%/wibox/container/radialprogressbar.lua +%%DATADIR%%/%%LUA_LIBDIR%%/wibox/container/rotate.lua +%%DATADIR%%/%%LUA_LIBDIR%%/wibox/container/scroll.lua +%%DATADIR%%/%%LUA_LIBDIR%%/wibox/drawable.lua +%%DATADIR%%/%%LUA_LIBDIR%%/wibox/hierarchy.lua +%%DATADIR%%/%%LUA_LIBDIR%%/wibox/init.lua +%%DATADIR%%/%%LUA_LIBDIR%%/wibox/layout/align.lua +%%DATADIR%%/%%LUA_LIBDIR%%/wibox/layout/constraint.lua +%%DATADIR%%/%%LUA_LIBDIR%%/wibox/layout/fixed.lua +%%DATADIR%%/%%LUA_LIBDIR%%/wibox/layout/flex.lua +%%DATADIR%%/%%LUA_LIBDIR%%/wibox/layout/grid.lua +%%DATADIR%%/%%LUA_LIBDIR%%/wibox/layout/init.lua +%%DATADIR%%/%%LUA_LIBDIR%%/wibox/layout/margin.lua +%%DATADIR%%/%%LUA_LIBDIR%%/wibox/layout/mirror.lua +%%DATADIR%%/%%LUA_LIBDIR%%/wibox/layout/ratio.lua +%%DATADIR%%/%%LUA_LIBDIR%%/wibox/layout/rotate.lua +%%DATADIR%%/%%LUA_LIBDIR%%/wibox/layout/scroll.lua +%%DATADIR%%/%%LUA_LIBDIR%%/wibox/layout/stack.lua +%%DATADIR%%/%%LUA_LIBDIR%%/wibox/widget/background.lua +%%DATADIR%%/%%LUA_LIBDIR%%/wibox/widget/base.lua +%%DATADIR%%/%%LUA_LIBDIR%%/wibox/widget/checkbox.lua +%%DATADIR%%/%%LUA_LIBDIR%%/wibox/widget/graph.lua +%%DATADIR%%/%%LUA_LIBDIR%%/wibox/widget/imagebox.lua +%%DATADIR%%/%%LUA_LIBDIR%%/wibox/widget/init.lua +%%DATADIR%%/%%LUA_LIBDIR%%/wibox/widget/piechart.lua +%%DATADIR%%/%%LUA_LIBDIR%%/wibox/widget/progressbar.lua +%%DATADIR%%/%%LUA_LIBDIR%%/wibox/widget/slider.lua +%%DATADIR%%/%%LUA_LIBDIR%%/wibox/widget/systray.lua +%%DATADIR%%/%%LUA_LIBDIR%%/wibox/widget/textbox.lua +%%DATADIR%%/%%LUA_LIBDIR%%/wibox/widget/textclock.lua %%DATADIR%%/themes/default/README %%DATADIR%%/themes/default/background.png %%DATADIR%%/themes/default/background_white.png +%%DATADIR%%/themes/default/layouts/cornerne.png +%%DATADIR%%/themes/default/layouts/cornernew.png +%%DATADIR%%/themes/default/layouts/cornernw.png +%%DATADIR%%/themes/default/layouts/cornernww.png +%%DATADIR%%/themes/default/layouts/cornerse.png +%%DATADIR%%/themes/default/layouts/cornersew.png +%%DATADIR%%/themes/default/layouts/cornersw.png +%%DATADIR%%/themes/default/layouts/cornersww.png %%DATADIR%%/themes/default/layouts/dwindle.png %%DATADIR%%/themes/default/layouts/dwindlew.png %%DATADIR%%/themes/default/layouts/fairh.png @@ -135,6 +197,8 @@ %%DATADIR%%/themes/default/titlebar/maximized_focus_inactive.png %%DATADIR%%/themes/default/titlebar/maximized_normal_active.png %%DATADIR%%/themes/default/titlebar/maximized_normal_inactive.png +%%DATADIR%%/themes/default/titlebar/minimize_focus.png +%%DATADIR%%/themes/default/titlebar/minimize_normal.png %%DATADIR%%/themes/default/titlebar/ontop_focus_active.png %%DATADIR%%/themes/default/titlebar/ontop_focus_inactive.png %%DATADIR%%/themes/default/titlebar/ontop_normal_active.png @@ -144,6 +208,10 @@ %%DATADIR%%/themes/default/titlebar/sticky_normal_active.png %%DATADIR%%/themes/default/titlebar/sticky_normal_inactive.png %%DATADIR%%/themes/sky/awesome-icon.png +%%DATADIR%%/themes/sky/layouts/cornerne.png +%%DATADIR%%/themes/sky/layouts/cornernw.png +%%DATADIR%%/themes/sky/layouts/cornerse.png +%%DATADIR%%/themes/sky/layouts/cornersw.png %%DATADIR%%/themes/sky/layouts/dwindle.png %%DATADIR%%/themes/sky/layouts/fairh.png %%DATADIR%%/themes/sky/layouts/fairv.png @@ -158,7 +226,13 @@ %%DATADIR%%/themes/sky/layouts/tiletop.png %%DATADIR%%/themes/sky/sky-background.png %%DATADIR%%/themes/sky/theme.lua +%%DATADIR%%/themes/xresources/assets.lua +%%DATADIR%%/themes/xresources/theme.lua %%DATADIR%%/themes/zenburn/awesome-icon.png +%%DATADIR%%/themes/zenburn/layouts/cornerne.png +%%DATADIR%%/themes/zenburn/layouts/cornernw.png +%%DATADIR%%/themes/zenburn/layouts/cornerse.png +%%DATADIR%%/themes/zenburn/layouts/cornersw.png %%DATADIR%%/themes/zenburn/layouts/dwindle.png %%DATADIR%%/themes/zenburn/layouts/fairh.png %%DATADIR%%/themes/zenburn/layouts/fairv.png @@ -193,4 +267,8 @@ %%DATADIR%%/themes/zenburn/titlebar/sticky_normal_active.png %%DATADIR%%/themes/zenburn/titlebar/sticky_normal_inactive.png %%DATADIR%%/themes/zenburn/zenburn-background.png +%%PORTDOCS%%%%DOCSDIR%%/00-authors.md +%%PORTDOCS%%%%DOCSDIR%%/01-readme.md +%%PORTDOCS%%%%DOCSDIR%%/02-contributing.md +%%PORTDOCS%%%%DOCSDIR%%/LICENSE share/xsessions/awesome.desktop Index: head/x11-wm/awesome3/Makefile =================================================================== --- head/x11-wm/awesome3/Makefile +++ head/x11-wm/awesome3/Makefile @@ -0,0 +1,74 @@ +# Created by: Nikos Ntarmos +# $FreeBSD$ + +PORTNAME= awesome +PORTVERSION= 3.5.9 +PORTEPOCH= 1 +CATEGORIES= x11-wm +MASTER_SITES= http://awesome.naquadah.org/download/ +PKGNAMESUFFIX= 3 + +MAINTAINER= garga@FreeBSD.org +COMMENT= Highly configurable, next generation framework window manager + +LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/LICENSE + +BUILD_DEPENDS= asciidoc:textproc/asciidoc \ + convert:graphics/ImageMagick \ + pango>=1.19.3:x11-toolkits/pango \ + xmlto:textproc/xmlto \ + xcb-util>=0.3.8:x11/xcb-util \ + xproto>=7.0.11:x11/xproto \ + ${LUA_MODLIBDIR}/lgi/corelgilua${LUA_VER_STR}.so:devel/lua-lgi \ + docbook-xml>0:textproc/docbook-xml +RUN_DEPENDS= ${LUA_MODLIBDIR}/lgi/corelgilua${LUA_VER_STR}.so:devel/lua-lgi +LIB_DEPENDS= libcairo.so:graphics/cairo \ + libev.so:devel/libev \ + libfreetype.so:print/freetype2 \ + libstartup-notification-1.so:x11/startup-notification \ + libxdg-basedir.so:x11/libxdg-basedir \ + libxcb-util.so:x11/xcb-util \ + libxcb-cursor.so:x11/xcb-util-cursor \ + libxcb-keysyms.so:x11/xcb-util-keysyms \ + libxcb-icccm.so:x11/xcb-util-wm \ + libImlib2.so:graphics/imlib2 + +CONFLICTS_INSTALL= x11-wm/awesome + +DEPRECATED= Awesome WM 3.x is deprecated use 4.x instead +EXPIRATION_DATE=2017-10-10 + +USES= cmake execinfo gettext iconv pkgconfig lua tar:xz +CMAKE_ARGS+= -DSYSCONFDIR=${PREFIX}/etc +USE_GNOME= glib20 pango gdkpixbuf2 +USE_XORG= pixman x11 xau xcb xdmcp xext xft xinerama xrandr xrender \ + xproto +LDFLAGS+= ${ICONV_LIB} + +PORTDOCS= AUTHORS BUGS LICENSE README + +OPTIONS_DEFINE= DBUS DOCS +OPTIONS_DEFAULT=DBUS + +DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus +DBUS_CMAKE_ON= -DWITH_DBUS=YES +DBUS_CMAKE_OFF= -DWITH_DBUS=NO + +.include + +.if (exists(${LOCALBASE}/libdata/pkgconfig/cairo.pc) && \ + !exists(${LOCALBASE}/libdata/pkgconfig/cairo-xcb.pc)) +IGNORE= cannot find dependency: The cairo exists but not with XCB support. Please reinstall graphics/cairo with XCB support +.endif + +post-patch: + @${REINPLACE_CMD} -e "/LUA_EXECUTABLE lua/ s,lua,lua${LUA_VER_STR}," \ + -e '/Lua51/d' \ + -e 's/glib-2.0/lua-${LUA_VER} glib-2.0/g' \ + -e '/LUA51_FOUND/,+2d' \ + ${WRKSRC}/awesomeConfig.cmake + @${REINPLACE_CMD} -e "s,^lua ,${LUA_CMD} ," \ + ${WRKSRC}/build-utils/lgi-check.sh + +.include Index: head/x11-wm/awesome3/distinfo =================================================================== --- head/x11-wm/awesome3/distinfo +++ head/x11-wm/awesome3/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1465660246 +SHA256 (awesome-3.5.9.tar.xz) = c7f8b5e4578751688d70ec8c410c55316e22bca8ec1195c622274f1f7254d64f +SIZE (awesome-3.5.9.tar.xz) = 723084 Index: head/x11-wm/awesome3/files/patch-CMakeLists.txt =================================================================== --- head/x11-wm/awesome3/files/patch-CMakeLists.txt +++ head/x11-wm/awesome3/files/patch-CMakeLists.txt @@ -0,0 +1,22 @@ +--- CMakeLists.txt.orig 2016-01-15 15:51:19 UTC ++++ CMakeLists.txt +@@ -95,7 +95,7 @@ add_executable(${PROJECT_AWE_NAME} + 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 @@ install(DIRECTORY ${BUILD_DIR}/themes DE + PATTERN "*.in" EXCLUDE) + install(DIRECTORY ${SOURCE_DIR}/themes DESTINATION ${AWESOME_DATA_PATH} + PATTERN "*.in" EXCLUDE) +-install(FILES ${AWE_DOC_FILES} DESTINATION ${AWESOME_DOC_PATH}) ++if(INSTALL_PORTDOCS) ++ 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}) Index: head/x11-wm/awesome3/files/patch-awesomeConfig.cmake =================================================================== --- head/x11-wm/awesome3/files/patch-awesomeConfig.cmake +++ head/x11-wm/awesome3/files/patch-awesomeConfig.cmake @@ -0,0 +1,28 @@ +--- awesomeConfig.cmake.orig 2016-01-15 15:51:19 UTC ++++ awesomeConfig.cmake +@@ -14,6 +14,7 @@ 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(INSTALL_PORTDOCS "install port docs" ON) + + # {{{ CFLAGS + add_definitions(-O1 -std=gnu99 -ggdb3 -rdynamic -fno-strict-aliasing -Wall -Wextra +@@ -61,7 +62,7 @@ endif() + # theme graphics + a_find_program(CONVERT_EXECUTABLE convert TRUE) + # doxygen +-include(FindDoxygen) ++#include(FindDoxygen) + # pkg-config + include(FindPkgConfig) + # lua 5.1 +@@ -264,7 +265,7 @@ endif() + if(DEFINED AWESOME_MAN_PATH) + set(AWESOME_MAN_PATH ${AWESOME_MAN_PATH} CACHE PATH "awesome manpage directory") + else() +- set(AWESOME_MAN_PATH ${CMAKE_INSTALL_PREFIX}/share/man CACHE PATH "awesome manpage directory") ++ set(AWESOME_MAN_PATH ${CMAKE_INSTALL_PREFIX}/man CACHE PATH "awesome manpage directory") + endif() + + # Hide to avoid confusion Index: head/x11-wm/awesome3/pkg-descr =================================================================== --- head/x11-wm/awesome3/pkg-descr +++ head/x11-wm/awesome3/pkg-descr @@ -0,0 +1,9 @@ +awesome is a highly configurable, next generation framework window +manager for X. It is very fast, small, dynamic, heavily extensible using +the Lua programming language, and licensed under the GNU GPLv2 license. + +It is primarly targeted at power users, developers and any people +dealing with every day computing tasks and who want to have fine-grained +control on theirs graphical environment. + +WWW: https://awesomewm.org/ Index: head/x11-wm/awesome3/pkg-plist =================================================================== --- head/x11-wm/awesome3/pkg-plist +++ head/x11-wm/awesome3/pkg-plist @@ -0,0 +1,196 @@ +bin/awesome +bin/awesome-client +etc/xdg/awesome/rc.lua +man/de/man1/awesome-client.1.gz +man/de/man1/awesome.1.gz +man/de/man5/awesomerc.5.gz +man/es/man1/awesome-client.1.gz +man/es/man1/awesome.1.gz +man/es/man5/awesomerc.5.gz +man/fr/man1/awesome-client.1.gz +man/fr/man1/awesome.1.gz +man/fr/man5/awesomerc.5.gz +man/it/man1/awesome-client.1.gz +man/it/man1/awesome.1.gz +man/it/man5/awesomerc.5.gz +man/man1/awesome-client.1.gz +man/man1/awesome.1.gz +man/man5/awesomerc.5.gz +man/ru/man1/awesome-client.1.gz +man/ru/man1/awesome.1.gz +man/ru/man5/awesomerc.5.gz +%%DATADIR%%/icons/awesome16.png +%%DATADIR%%/icons/awesome32.png +%%DATADIR%%/icons/awesome48.png +%%DATADIR%%/icons/awesome64.png +%%DATADIR%%/lib/awful/autofocus.lua +%%DATADIR%%/lib/awful/button.lua +%%DATADIR%%/lib/awful/client.lua +%%DATADIR%%/lib/awful/completion.lua +%%DATADIR%%/lib/awful/dbus.lua +%%DATADIR%%/lib/awful/ewmh.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 +%%DATADIR%%/lib/awful/layout/suit/init.lua +%%DATADIR%%/lib/awful/layout/suit/magnifier.lua +%%DATADIR%%/lib/awful/layout/suit/max.lua +%%DATADIR%%/lib/awful/layout/suit/spiral.lua +%%DATADIR%%/lib/awful/layout/suit/tile.lua +%%DATADIR%%/lib/awful/menu.lua +%%DATADIR%%/lib/awful/mouse/finder.lua +%%DATADIR%%/lib/awful/mouse/init.lua +%%DATADIR%%/lib/awful/placement.lua +%%DATADIR%%/lib/awful/prompt.lua +%%DATADIR%%/lib/awful/remote.lua +%%DATADIR%%/lib/awful/rules.lua +%%DATADIR%%/lib/awful/screen.lua +%%DATADIR%%/lib/awful/startup_notification.lua +%%DATADIR%%/lib/awful/tag.lua +%%DATADIR%%/lib/awful/titlebar.lua +%%DATADIR%%/lib/awful/tooltip.lua +%%DATADIR%%/lib/awful/util.lua +%%DATADIR%%/lib/awful/wibox.lua +%%DATADIR%%/lib/awful/widget/button.lua +%%DATADIR%%/lib/awful/widget/common.lua +%%DATADIR%%/lib/awful/widget/graph.lua +%%DATADIR%%/lib/awful/widget/init.lua +%%DATADIR%%/lib/awful/widget/launcher.lua +%%DATADIR%%/lib/awful/widget/layoutbox.lua +%%DATADIR%%/lib/awful/widget/progressbar.lua +%%DATADIR%%/lib/awful/widget/prompt.lua +%%DATADIR%%/lib/awful/widget/taglist.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/constraint.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 +%%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 +%%DATADIR%%/themes/default/layouts/fairvw.png +%%DATADIR%%/themes/default/layouts/floating.png +%%DATADIR%%/themes/default/layouts/floatingw.png +%%DATADIR%%/themes/default/layouts/fullscreen.png +%%DATADIR%%/themes/default/layouts/fullscreenw.png +%%DATADIR%%/themes/default/layouts/magnifier.png +%%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 +%%DATADIR%%/themes/default/layouts/tileleft.png +%%DATADIR%%/themes/default/layouts/tileleftw.png +%%DATADIR%%/themes/default/layouts/tiletop.png +%%DATADIR%%/themes/default/layouts/tiletopw.png +%%DATADIR%%/themes/default/layouts/tilew.png +%%DATADIR%%/themes/default/submenu.png +%%DATADIR%%/themes/default/taglist/squarefw.png +%%DATADIR%%/themes/default/taglist/squarew.png +%%DATADIR%%/themes/default/theme.lua +%%DATADIR%%/themes/default/titlebar/close_focus.png +%%DATADIR%%/themes/default/titlebar/close_normal.png +%%DATADIR%%/themes/default/titlebar/floating_focus_active.png +%%DATADIR%%/themes/default/titlebar/floating_focus_inactive.png +%%DATADIR%%/themes/default/titlebar/floating_normal_active.png +%%DATADIR%%/themes/default/titlebar/floating_normal_inactive.png +%%DATADIR%%/themes/default/titlebar/maximized_focus_active.png +%%DATADIR%%/themes/default/titlebar/maximized_focus_inactive.png +%%DATADIR%%/themes/default/titlebar/maximized_normal_active.png +%%DATADIR%%/themes/default/titlebar/maximized_normal_inactive.png +%%DATADIR%%/themes/default/titlebar/ontop_focus_active.png +%%DATADIR%%/themes/default/titlebar/ontop_focus_inactive.png +%%DATADIR%%/themes/default/titlebar/ontop_normal_active.png +%%DATADIR%%/themes/default/titlebar/ontop_normal_inactive.png +%%DATADIR%%/themes/default/titlebar/sticky_focus_active.png +%%DATADIR%%/themes/default/titlebar/sticky_focus_inactive.png +%%DATADIR%%/themes/default/titlebar/sticky_normal_active.png +%%DATADIR%%/themes/default/titlebar/sticky_normal_inactive.png +%%DATADIR%%/themes/sky/awesome-icon.png +%%DATADIR%%/themes/sky/layouts/dwindle.png +%%DATADIR%%/themes/sky/layouts/fairh.png +%%DATADIR%%/themes/sky/layouts/fairv.png +%%DATADIR%%/themes/sky/layouts/floating.png +%%DATADIR%%/themes/sky/layouts/fullscreen.png +%%DATADIR%%/themes/sky/layouts/magnifier.png +%%DATADIR%%/themes/sky/layouts/max.png +%%DATADIR%%/themes/sky/layouts/spiral.png +%%DATADIR%%/themes/sky/layouts/tile.png +%%DATADIR%%/themes/sky/layouts/tilebottom.png +%%DATADIR%%/themes/sky/layouts/tileleft.png +%%DATADIR%%/themes/sky/layouts/tiletop.png +%%DATADIR%%/themes/sky/sky-background.png +%%DATADIR%%/themes/sky/theme.lua +%%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/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