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
--- Makefile12 Jul 2019 20:51:08 - 1.110
+++ Makefile11 Oct 2019 00:12:42 -
@@ -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
--- distinfo5 Aug 2017 20:18:11 - 1.28
+++ distinfo11 Oct 2019 00:12:42 -
@@ -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_txt5 Aug 2017 20:18:11 - 1.19
+++ patches/patch-CMakeLists_txt11 Oct 2019 00:12:42 -
@@ -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
+ $<$,$>:-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
