Hi again ports@,
I have updated the Makefile for the Awesome WM port. For those who don't know what it is, Awesome WM is a window manager that is configurable and scriptable with the Lua language. It's very flexible and lightweight on resources. The 4.3 version comes with a huge number of changes (see [1]) and was released last January. I contacted the maintainer but got no reply, so I went ahead and made this update. The update was pretty straightforward: version bump, applying the patches and tweak them so they would apply cleanly. I took the liberty of removing the code that prevented manpages from gzipping. They don't get gzipped unless you tell them too. I also removed the hardcoded CFLAGS that were patched in. IIRC, they should be already inherited by whatever the system provides, right? One thing though, to make the manpages, asciidoctor, a ruby package, must be installed. It can be trivially created with portgen. Tomorrow I'll post the generated Makefile. Looking forward to feedback, Enric [1] https://github.com/awesomeWM/awesome/releases/tag/v4.3 Index: Makefile =================================================================== RCS file: /cvs/ports/x11/awesome/Makefile,v retrieving revision 1.110 diff -u -r1.110 Makefile --- Makefile 12 Jul 2019 20:51:08 -0000 1.110 +++ Makefile 11 Oct 2019 00:12:42 -0000 @@ -2,7 +2,7 @@ COMMENT= highly configurable framework window manager -VER= 4.2 +VER= 4.3 DISTNAME= awesome-${VER} REVISION= 1 EXTRACT_SUFX= .tar.xz @@ -11,7 +11,7 @@ HOMEPAGE= https://awesomewm.org/ # GPLv2+ -PERMIT_PACKAGE= Yes +PERMIT_PACKAGE= Yes WANTLIB= X11 c cairo dbus-1 execinfo \ gdk_pixbuf-2.0 glib-2.0 gobject-2.0 \ Index: distinfo =================================================================== RCS file: /cvs/ports/x11/awesome/distinfo,v retrieving revision 1.28 diff -u -r1.28 distinfo --- distinfo 5 Aug 2017 20:18:11 -0000 1.28 +++ distinfo 11 Oct 2019 00:12:42 -0000 @@ -1,2 +1,2 @@ -SHA256 (awesome-4.2.tar.xz) = rF2hqZ9frQg4IZk9K1bRzZWUFk6vwL4r61QFmDRdl08= -SIZE (awesome-4.2.tar.xz) = 987024 +SHA256 (awesome-4.3.tar.xz) = eCZNbwEjULNx4zkSespIUmC8Cqk17/V4unXOGgDhF1M= +SIZE (awesome-4.3.tar.xz) = 1037816 Index: patches/patch-CMakeLists_txt =================================================================== RCS file: /cvs/ports/x11/awesome/patches/patch-CMakeLists_txt,v retrieving revision 1.19 diff -u -r1.19 patch-CMakeLists_txt --- patches/patch-CMakeLists_txt 5 Aug 2017 20:18:11 -0000 1.19 +++ patches/patch-CMakeLists_txt 11 Oct 2019 00:12:42 -0000 @@ -1,15 +1,9 @@ -$OpenBSD: patch-CMakeLists_txt,v 1.19 2017/08/05 20:18:11 dcoppa Exp $ - -These auto-generated (db2man.xsl) manpages contain a mixture of ISO -latin-1 characters and numerical HTML entities that neither mandoc -nor groff can fully understand: do not install them. - -Fix usage of -export-dynamic +$OpenBSD$ Index: CMakeLists.txt --- CMakeLists.txt.orig +++ CMakeLists.txt -@@ -97,7 +97,6 @@ set(AWE_MAN_SRCS +@@ -95,7 +95,6 @@ set(AWE_MAN_SRCS ${SOURCE_DIR}/manpages/awesome.1.txt ${SOURCE_DIR}/manpages/awesome-client.1.txt ${SOURCE_DIR}/manpages/awesomerc.5.txt) @@ -17,192 +11,20 @@ # Don't strip RPATH if compiling on Solaris if (${CMAKE_SYSTEM_NAME} MATCHES "SunOS") -@@ -111,12 +110,11 @@ add_executable(${PROJECT_AWE_NAME} - - # CFLAGS - set(AWESOME_C_FLAGS -- -O1 -std=gnu99 -ggdb3 -fno-strict-aliasing -Wall -Wextra -- -Wchar-subscripts -Wundef -Wshadow -Wcast-align -Wwrite-strings -- -Wsign-compare -Wunused -Wno-unused-parameter -Wuninitialized -Winit-self -- -Wpointer-arith -Wformat-nonliteral -- -Wno-format-zero-length -Wmissing-format-attribute -Wmissing-prototypes -- -Wstrict-prototypes -+ -std=gnu99 -fgnu89-inline -fno-strict-aliasing -+ -Wchar-subscripts -Wcast-align -Wwrite-strings -Wsign-compare -+ -Wunused -Wno-unused-parameter -Wuninitialized -Wpointer-arith -+ -Wno-format-zero-length -Wmissing-format-attribute -+ -Wmissing-prototypes -Wstrict-prototypes - CACHE STRING "CFLAGS used to compile ${PROJECT_AWE_NAME}") - mark_as_advanced(AWESOME_C_FLAGS) - target_compile_options(${PROJECT_AWE_NAME} PRIVATE ${AWESOME_C_FLAGS}) -@@ -124,23 +122,11 @@ target_compile_options(${PROJECT_AWE_NAME} PRIVATE ${A - # Make sure awesomerc.lua is generated - add_dependencies(${PROJECT_AWE_NAME} generate_awesomerc) +@@ -134,11 +133,11 @@ if(DEFINED CMAKE_SHARED_LIBRARY_LINK_C_FLAGS AND + $<$<AND:$<PLATFORM_ID:Linux>,$<C_COMPILER_ID:GNU>>:-rdynamic>) + endif() --# Linux w/ GCC requires -rdynamic to get backtrace to fully work. --# --# For "historical reasons", CMake adds the option to the linker flags --# unnoticeably for Linux w/ GCC through its modules Linux-GNU.cmake --# and Linux-GNU-C.cmake. Our build system has counted on that. But --# just in case CMake should do away with the convention suddenly... --if(DEFINED CMAKE_SHARED_LIBRARY_LINK_C_FLAGS AND -- NOT CMAKE_SHARED_LIBRARY_LINK_C_FLAGS MATCHES "-rdynamic") -- target_link_libraries(${PROJECT_AWE_NAME} -- $<$<AND:$<PLATFORM_ID:Linux>,$<C_COMPILER_ID:GNU>>:-rdynamic>) --endif() -- -# FreeBSD requires dynamic linking -if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") +- set_target_properties(${PROJECT_AWE_NAME} +- PROPERTIES +- LINK_FLAGS -export-dynamic) +# FreeBSD and OpenBSD require dynamic linking +if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR CMAKE_SYSTEM_NAME MATCHES "OpenBSD") - set_target_properties(${PROJECT_AWE_NAME} - PROPERTIES -- LINK_FLAGS -export-dynamic) ++ set_target_properties(${PROJECT_AWE_NAME} ++ PROPERTIES + LINK_FLAGS -Wl,--export-dynamic) endif() target_link_libraries(${PROJECT_AWE_NAME} -@@ -148,10 +134,6 @@ target_link_libraries(${PROJECT_AWE_NAME} - ${AWESOME_REQUIRED_LDFLAGS} - ${AWESOME_OPTIONAL_LDFLAGS}) - --# check for lgi and the needed gobject introspection files --add_custom_target(lgi-check ALL -- COMMAND ${SOURCE_DIR}/build-utils/lgi-check.sh) -- - # {{{ Generated sources - # atoms - file(MAKE_DIRECTORY ${BUILD_DIR}/common) -@@ -202,68 +184,45 @@ if(GENERATE_MANPAGES) - if(NOT BUILD_DIR STREQUAL SOURCE_DIR) - file(MAKE_DIRECTORY ${BUILD_DIR}/manpages) - endif() -+ foreach(txtfile ${AWE_MAN_SRCS}) -+ string(REGEX REPLACE ".txt\$" ".xml" xmlfile ${txtfile}) -+ string(REPLACE ${SOURCE_DIR} -+ ${BUILD_DIR} xmlfile ${xmlfile}) -+ string(REGEX REPLACE ".xml\$" ".gz" gzfile ${xmlfile}) -+ string(REGEX REPLACE ".gz\$" "" manfile ${gzfile}) - -- # add the default translation to the list of languages -- set(AWE_MAN_LANGS default ${AWE_MAN_LANGS}) -+ add_custom_command( -+ COMMAND ${ASCIIDOC_EXECUTABLE} -d manpage -b docbook -o ${xmlfile} - < ${txtfile} -+ WORKING_DIRECTORY ${BUILD_DIR}/manpages -+ OUTPUT ${xmlfile} -+ DEPENDS ${txtfile} -+ VERBATIM) -+ add_custom_command( -+ COMMAND ${XMLTO_EXECUTABLE} --skip-validation man ${xmlfile} -+ OUTPUT ${manfile} -+ WORKING_DIRECTORY ${BUILD_DIR}/manpages -+ DEPENDS ${xmlfile}) - -- foreach(lang ${AWE_MAN_LANGS}) -- -- foreach(txtfile ${AWE_MAN_SRCS}) -- # figure the base name of the file (ie "awesome.1") -- GET_FILENAME_COMPONENT(tmpname ${txtfile} NAME) -- string(REGEX REPLACE ".txt\$" "" basename ${tmpname}) -- -- # figure the relative path of the file -- GET_FILENAME_COMPONENT(tmppath ${txtfile} PATH) -- string(REPLACE ${SOURCE_DIR}/ "" relpath ${tmppath}) -- -- # figure the manpage section to install to from filename -- string(REGEX REPLACE "^.*\\.([0-9])$" "\\1" section ${basename}) -- -- # construct the language specific versions of the basename and path -- if (lang STREQUAL default) -- set(basename2 ${basename}) -- set(relpath2 ${relpath}/man${section}) -- else() -- set(basename2 ${basename}.${lang}) -- set(relpath2 ${relpath}/${lang}/man${section}) -- endif() -- -- # create the build directory (if it does not exist) -- file(MAKE_DIRECTORY ${BUILD_DIR}/${relpath2}) -- -- # set the final filenames -- set(txtfile ${SOURCE_DIR}/${relpath}/${basename2}.txt) -- set(xmlfile ${BUILD_DIR}/${relpath2}/${basename}.xml) -- set(gzfile ${BUILD_DIR}/${relpath2}/${basename}.gz) -- set(manfile ${BUILD_DIR}/${relpath2}/${basename}) -- -+ if(COMPRESS_MANPAGES) - add_custom_command( -- COMMAND ${ASCIIDOC_EXECUTABLE} -d manpage -b docbook -o ${xmlfile} - < ${txtfile} -- WORKING_DIRECTORY ${BUILD_DIR}/${relpath2} -- OUTPUT ${xmlfile} -- DEPENDS ${txtfile} -+ COMMAND ${GZIP_EXECUTABLE} < ${manfile} > ${gzfile} -+ OUTPUT ${gzfile} -+ WORKING_DIRECTORY ${BUILD_DIR}/manpages -+ DEPENDS ${manfile} - VERBATIM) -- add_custom_command( -- COMMAND ${XMLTO_EXECUTABLE} man ${xmlfile} -- OUTPUT ${manfile} -- WORKING_DIRECTORY ${BUILD_DIR}/${relpath2} -- DEPENDS ${xmlfile}) - -- if(COMPRESS_MANPAGES) -- add_custom_command( -- COMMAND ${GZIP_EXECUTABLE} < ${manfile} > ${gzfile} -- OUTPUT ${gzfile} -- WORKING_DIRECTORY ${BUILD_DIR}/${relpath2} -- DEPENDS ${manfile} -- VERBATIM) -+ set(MAN_FILES ${MAN_FILES} ${gzfile}) -+ else() -+ set(MAN_FILES ${MAN_FILES} ${manfile}) -+ endif() - -- set(MAN_FILES ${MAN_FILES} ${gzfile}) -- else() -- set(MAN_FILES ${MAN_FILES} ${manfile}) -- endif() -- endforeach() -- -+ # figure out in what section to install to from filename -+ string(REGEX REPLACE "^.*\\.([0-9])\\.gz\$" "\\1" section ${gzfile}) -+ if(COMPRESS_MANPAGES) -+ set(AWE_MAN${section}_FILES ${AWE_MAN${section}_FILES} ${gzfile}) -+ else() -+ set(AWE_MAN${section}_FILES ${AWE_MAN${section}_FILES} ${manfile}) -+ endif() - endforeach() - - add_custom_target(man ALL DEPENDS ${MAN_FILES}) -@@ -374,13 +333,8 @@ install(DIRECTORY ${BUILD_DIR}/lib DESTINATION ${AWESO - install(FILES ${BUILD_DIR}/awesomerc.lua DESTINATION ${AWESOME_SYSCONFDIR} - RENAME rc.lua) - if(GENERATE_MANPAGES) -- if(COMPRESS_MANPAGES) -- set(regex "\\.(xml|txt|[0-9])$") -- else() -- set(regex "\\.(xml|txt|gz)$") -- endif() -- install(DIRECTORY ${BUILD_DIR}/${relpath}/ DESTINATION ${AWESOME_MAN_PATH} -- REGEX ${regex} EXCLUDE ) -+ install(FILES ${AWE_MAN1_FILES} DESTINATION ${AWESOME_MAN_PATH}/man1) -+ install(FILES ${AWE_MAN5_FILES} DESTINATION ${AWESOME_MAN_PATH}/man5) - endif() - install(DIRECTORY ${AWE_ICON_DIR} DESTINATION ${AWESOME_DATA_PATH}) - install(DIRECTORY ${SOURCE_DIR}/themes DESTINATION ${AWESOME_DATA_PATH} -@@ -394,6 +348,7 @@ if(GENERATE_DOC) - endif() - # }}} - -+#[[ - # {{{ Tests - add_executable(test-gravity tests/test-gravity.c) - target_link_libraries(test-gravity -@@ -450,5 +405,6 @@ add_custom_target(check DEPENDS ${CHECK_TARGETS} check - # }}} - - INCLUDE(${CMAKE_SOURCE_DIR}/Packaging.cmake) -+]] - - # vim: filetype=cmake:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80:foldmethod=marker Index: patches/patch-awesomeConfig_cmake =================================================================== RCS file: /cvs/ports/x11/awesome/patches/patch-awesomeConfig_cmake,v retrieving revision 1.23 diff -u -r1.23 patch-awesomeConfig_cmake --- patches/patch-awesomeConfig_cmake 5 Aug 2017 20:18:11 -0000 1.23 +++ patches/patch-awesomeConfig_cmake 11 Oct 2019 00:12:42 -0000 @@ -1,8 +1,9 @@ -$OpenBSD: patch-awesomeConfig_cmake,v 1.23 2017/08/05 20:18:11 dcoppa Exp $ +$OpenBSD$ + Index: awesomeConfig.cmake --- awesomeConfig.cmake.orig +++ awesomeConfig.cmake -@@ -236,11 +236,7 @@ endif() +@@ -222,19 +222,11 @@ endif() # {{{ Install path and configuration variables #If a sysconfdir is specified, use it instead #of the default configuration dir. @@ -11,11 +12,20 @@ -else() - set(SYSCONFDIR ${CMAKE_INSTALL_PREFIX}/etc CACHE PATH "config directory") -endif() -+set(SYSCONFDIR ${SYSCONFDIR} CACHE PATH "config directory") ++set(SYSCONFDIR ${CMAKE_INSTALL_PREFIX}/etc CACHE PATH "config directory") #If an XDG Config Dir is specificed, use it instead #of the default XDG configuration dir. -@@ -275,7 +271,7 @@ endif() +-if(DEFINED XDG_CONFIG_DIR) +- set(XDG_CONFIG_DIR ${XDG_CONFIG_DIR} CACHE PATH "xdg config directory") +-else() +- set(XDG_CONFIG_DIR ${SYSCONFDIR}/xdg CACHE PATH "xdg config directory") +-endif() ++set(XDG_CONFIG_DIR ${SYSCONFDIR}/xdg CACHE PATH "xdg config directory") + + # setting AWESOME_DATA_PATH + if(DEFINED AWESOME_DATA_PATH) +@@ -261,7 +253,7 @@ endif() if(DEFINED AWESOME_MAN_PATH) set(AWESOME_MAN_PATH ${AWESOME_MAN_PATH} CACHE PATH "awesome manpage directory") else() @@ -24,16 +34,25 @@ endif() # Hide to avoid confusion -@@ -361,15 +357,14 @@ file(MAKE_DIRECTORY ${BUILD_DIR}/script_files/) +@@ -365,7 +357,7 @@ add_custom_command(TARGET setup_directories add_custom_command( OUTPUT ${BUILD_DIR}/docs/06-appearance.md - COMMAND lua ${SOURCE_DIR}/docs/06-appearance.md.lua + COMMAND ${MODLUA_BIN} ${SOURCE_DIR}/docs/06-appearance.md.lua ${BUILD_DIR}/docs/06-appearance.md -- DEPENDS lgi-check - ) + DEPENDS + lgi-check-run +@@ -375,7 +367,7 @@ add_custom_command( + + add_custom_command( + OUTPUT ${BUILD_DIR}/docs/common/rules_index.ldoc +- COMMAND lua ${SOURCE_DIR}/docs/build_rules_index.lua ++ COMMAND ${MODLUA_BIN} ${SOURCE_DIR}/docs/build_rules_index.lua + ${BUILD_DIR}/docs/common/rules_index.ldoc + # Cheap trick until the ldoc `configure_file` is ported to be a build +@@ -392,7 +384,7 @@ add_custom_command( add_custom_command( OUTPUT ${BUILD_DIR}/awesomerc.lua ${BUILD_DIR}/docs/05-awesomerc.md ${BUILD_DIR}/script_files/rc.lua @@ -42,7 +61,7 @@ ${BUILD_DIR}/docs/05-awesomerc.md ${SOURCE_DIR}/awesomerc.lua ${BUILD_DIR}/awesomerc.lua ${BUILD_DIR}/script_files/rc.lua -@@ -377,7 +372,7 @@ add_custom_command( +@@ -401,7 +393,7 @@ add_custom_command( add_custom_command( OUTPUT ${BUILD_DIR}/script_files/theme.lua Index: patches/patch-awesomerc_lua =================================================================== RCS file: /cvs/ports/x11/awesome/patches/patch-awesomerc_lua,v retrieving revision 1.3 diff -u -r1.3 patch-awesomerc_lua --- patches/patch-awesomerc_lua 5 Aug 2017 20:18:11 -0000 1.3 +++ patches/patch-awesomerc_lua 11 Oct 2019 00:12:42 -0000 @@ -2,7 +2,7 @@ Index: awesomerc.lua --- awesomerc.lua.orig +++ awesomerc.lua -@@ -49,7 +49,7 @@ beautiful.init(gears.filesystem.get_themes_dir() .. "d +@@ -53,7 +53,7 @@ beautiful.init(gears.filesystem.get_themes_dir() .. "d -- @DOC_DEFAULT_APPLICATIONS@ -- This is used later as the default terminal and editor to run. terminal = "xterm" Index: patches/patch-docs_06-appearance_md_lua =================================================================== RCS file: /cvs/ports/x11/awesome/patches/patch-docs_06-appearance_md_lua,v retrieving revision 1.1 diff -u -r1.1 patch-docs_06-appearance_md_lua --- patches/patch-docs_06-appearance_md_lua 5 Aug 2017 20:18:11 -0000 1.1 +++ patches/patch-docs_06-appearance_md_lua 11 Oct 2019 00:12:42 -0000 @@ -7,5 +7,5 @@ -#! /usr/bin/lua +#!${MODLUA_BIN} local args = {...} + local parser = require("docs._parser") - local gio = require("lgi").Gio Index: patches/patch-lib_awful_completion_lua =================================================================== RCS file: /cvs/ports/x11/awesome/patches/patch-lib_awful_completion_lua,v retrieving revision 1.2 diff -u -r1.2 patch-lib_awful_completion_lua --- patches/patch-lib_awful_completion_lua 5 Aug 2017 20:18:11 -0000 1.2 +++ patches/patch-lib_awful_completion_lua 11 Oct 2019 00:12:42 -0000 @@ -2,7 +2,7 @@ Index: lib/awful/completion.lua --- lib/awful/completion.lua.orig +++ lib/awful/completion.lua -@@ -31,7 +31,7 @@ local bashcomp_src = "@SYSCONFDIR@/bash_completion" +@@ -34,7 +34,7 @@ local bashcomp_src = "@SYSCONFDIR@/bash_completion" -- @param src The bash completion source file, /etc/bash_completion by default. function completion.bashcomp_load(src) if src then bashcomp_src = src end @@ -11,7 +11,7 @@ if c then while true do local line = c:read("*line") -@@ -120,13 +120,13 @@ function completion.shell(command, cur_pos, ncomp, she +@@ -123,13 +123,13 @@ function completion.shell(command, cur_pos, ncomp, she if comptype == "file" then -- NOTE: ${~:-"..."} turns on GLOB_SUBST, useful for expansion of -- "~/" ($HOME). ${:-"foo"} is the string "foo" as var. @@ -27,7 +27,7 @@ "pwd_exe=(*(N*:t) *(NF:t)); ".. "res=( ".. "\"${(k)commands[@]}\" \"${(k)aliases[@]}\" \"${(k)builtins[@]}\" \"${(k)functions[@]}\" ".. -@@ -138,13 +138,13 @@ function completion.shell(command, cur_pos, ncomp, she +@@ -141,13 +141,13 @@ function completion.shell(command, cur_pos, ncomp, she else if bashcomp_funcs[words[1]] then -- fairly complex command with inline bash script to get the possible completions Index: patches/patch-lib_awful_util_lua =================================================================== RCS file: /cvs/ports/x11/awesome/patches/patch-lib_awful_util_lua,v retrieving revision 1.3 diff -u -r1.3 patch-lib_awful_util_lua --- patches/patch-lib_awful_util_lua 5 Aug 2017 20:18:11 -0000 1.3 +++ patches/patch-lib_awful_util_lua 11 Oct 2019 00:12:42 -0000 @@ -2,7 +2,7 @@ Index: lib/awful/util.lua --- lib/awful/util.lua.orig +++ lib/awful/util.lua -@@ -236,12 +236,12 @@ end +@@ -222,12 +222,12 @@ end -- given extensions for the icon filename. -- @param iconname The name of the icon to search for. -- @param exts Table of image extensions allowed, otherwise { 'png', gif' } Index: patches/patch-lib_beautiful_init_lua =================================================================== RCS file: /cvs/ports/x11/awesome/patches/patch-lib_beautiful_init_lua,v retrieving revision 1.3 diff -u -r1.3 patch-lib_beautiful_init_lua --- patches/patch-lib_beautiful_init_lua 5 Aug 2017 20:18:11 -0000 1.3 +++ patches/patch-lib_beautiful_init_lua 11 Oct 2019 00:12:42 -0000 @@ -2,7 +2,7 @@ Index: lib/beautiful/init.lua --- lib/beautiful/init.lua.orig +++ lib/beautiful/init.lua -@@ -89,7 +89,7 @@ local active_font +@@ -91,7 +91,7 @@ local active_font -- @beautiful beautiful.wallpaper -- The icon theme name. Index: patches/patch-lib_gears_filesystem_lua =================================================================== RCS file: /cvs/ports/x11/awesome/patches/patch-lib_gears_filesystem_lua,v retrieving revision 1.1 diff -u -r1.1 patch-lib_gears_filesystem_lua --- patches/patch-lib_gears_filesystem_lua 5 Aug 2017 20:18:11 -0000 1.1 +++ patches/patch-lib_gears_filesystem_lua 11 Oct 2019 00:12:42 -0000 @@ -3,7 +3,7 @@ Index: lib/gears/filesystem.lua --- lib/gears/filesystem.lua.orig +++ lib/gears/filesystem.lua -@@ -92,7 +92,7 @@ end +@@ -103,7 +103,7 @@ end --- Get the data dirs according to the XDG basedir specification. -- @treturn table the data dirs (XDG_DATA_DIRS) with a slash at the end of each entry. function filesystem.get_xdg_data_dirs() Index: patches/patch-lib_naughty_core_lua =================================================================== RCS file: /cvs/ports/x11/awesome/patches/patch-lib_naughty_core_lua,v retrieving revision 1.3 diff -u -r1.3 patch-lib_naughty_core_lua --- patches/patch-lib_naughty_core_lua 5 Aug 2017 20:18:11 -0000 1.3 +++ patches/patch-lib_naughty_core_lua 11 Oct 2019 00:12:42 -0000 @@ -2,7 +2,7 @@ Index: lib/naughty/core.lua --- lib/naughty/core.lua.orig +++ lib/naughty/core.lua -@@ -41,7 +41,7 @@ Naughty configuration - a table containing common popu +@@ -42,7 +42,7 @@ Naughty configuration - a table containing common popu @tfield[opt=apply_dpi(4)] int padding Space between popups and edge of the workarea. @tfield[opt=apply_dpi(1)] int spacing Spacing between popups. @@ -11,7 +11,7 @@ that will be checked by `getIcon()`. @tfield[opt={ "png", "gif" }] table icon_formats List of formats that will be checked by `getIcon()`. -@@ -66,7 +66,7 @@ notifications, e.g. +@@ -67,7 +67,7 @@ notifications, e.g. naughty.config = { padding = dpi(4), spacing = dpi(1), Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/x11/awesome/pkg/PLIST,v retrieving revision 1.17 diff -u -r1.17 PLIST --- pkg/PLIST 5 Aug 2017 20:18:11 -0000 1.17 +++ pkg/PLIST 11 Oct 2019 00:12:42 -0000 @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.17 2017/08/05 20:18:11 dcoppa Exp $ +@comment $OpenBSD: PLIST,v$ @bin bin/awesome bin/awesome-client @man man/man1/awesome-client.1 @@ -28,6 +28,7 @@ share/awesome/lib/awful/hotkeys_popup/keys/firefox.lua share/awesome/lib/awful/hotkeys_popup/keys/init.lua share/awesome/lib/awful/hotkeys_popup/keys/qutebrowser.lua +share/awesome/lib/awful/hotkeys_popup/keys/termite.lua share/awesome/lib/awful/hotkeys_popup/keys/tmux.lua share/awesome/lib/awful/hotkeys_popup/keys/vim.lua share/awesome/lib/awful/hotkeys_popup/widget.lua @@ -52,6 +53,7 @@ share/awesome/lib/awful/mouse/resize.lua share/awesome/lib/awful/mouse/snap.lua share/awesome/lib/awful/placement.lua +share/awesome/lib/awful/popup.lua share/awesome/lib/awful/prompt.lua share/awesome/lib/awful/remote.lua share/awesome/lib/awful/rules.lua @@ -74,6 +76,7 @@ share/awesome/lib/awful/widget/keyboardlayout.lua share/awesome/lib/awful/widget/launcher.lua share/awesome/lib/awful/widget/layoutbox.lua +share/awesome/lib/awful/widget/layoutlist.lua share/awesome/lib/awful/widget/only_on_screen.lua share/awesome/lib/awful/widget/progressbar.lua share/awesome/lib/awful/widget/prompt.lua @@ -83,6 +86,7 @@ share/awesome/lib/awful/widget/watch.lua share/awesome/lib/beautiful/ share/awesome/lib/beautiful.lua +share/awesome/lib/beautiful/gtk.lua share/awesome/lib/beautiful/init.lua share/awesome/lib/beautiful/theme_assets.lua share/awesome/lib/beautiful/xresources.lua @@ -100,6 +104,9 @@ share/awesome/lib/gears/object/properties.lua share/awesome/lib/gears/protected_call.lua share/awesome/lib/gears/shape.lua +share/awesome/lib/gears/sort/ +share/awesome/lib/gears/sort/init.lua +share/awesome/lib/gears/sort/topological.lua share/awesome/lib/gears/string.lua share/awesome/lib/gears/surface.lua share/awesome/lib/gears/table.lua @@ -155,6 +162,7 @@ share/awesome/lib/wibox/widget/init.lua share/awesome/lib/wibox/widget/piechart.lua share/awesome/lib/wibox/widget/progressbar.lua +share/awesome/lib/wibox/widget/separator.lua share/awesome/lib/wibox/widget/slider.lua share/awesome/lib/wibox/widget/systray.lua share/awesome/lib/wibox/widget/textbox.lua @@ -223,6 +231,8 @@ share/awesome/themes/default/titlebar/sticky_focus_inactive.png share/awesome/themes/default/titlebar/sticky_normal_active.png share/awesome/themes/default/titlebar/sticky_normal_inactive.png +share/awesome/themes/gtk/ +share/awesome/themes/gtk/theme.lua share/awesome/themes/sky/ share/awesome/themes/sky/awesome-icon.png share/awesome/themes/sky/layouts/ @@ -295,10 +305,10 @@ share/doc/awesome/01-readme.md share/doc/awesome/02-contributing.md share/doc/awesome/LICENSE -share/examples/awesome/ -share/examples/awesome/rc.lua @sample ${SYSCONFDIR}/xdg/ @sample ${SYSCONFDIR}/xdg/awesome/ +share/examples/awesome/ @sample ${SYSCONFDIR}/xdg/awesome/rc.lua +share/examples/awesome/rc.lua share/xsessions/ share/xsessions/awesome.desktop
