<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0cf084a6997cb7e164cdbff1ec530870717f366a">https://github.com/macports/macports-ports/commit/0cf084a6997cb7e164cdbff1ec530870717f366a</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 0cf084a6997cb7e164cdbff1ec530870717f366a
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat Mar 11 08:17:23 2023 -0700
<span style='display:block; white-space:pre;color:#404040;'> awesome: build with cmake & lua PGs
</span>---
x11/awesome/Portfile | 31 +++++++++++++++++--------------
x11/awesome/files/patch-Makefile.diff | 8 --------
2 files changed, 17 insertions(+), 22 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/awesome/Portfile b/x11/awesome/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 71ecc263247..acea59f2bc3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/awesome/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/awesome/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,12 +2,13 @@
</span>
PortSystem 1.0
PortGroup active_variants 1.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup lua 1.0
</span>
name awesome
version 3.5.6
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> categories x11 x11-wm
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> maintainers nomaintainer
license GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,7 +31,8 @@ master_sites ${homepage}download/
</span> use_xz yes
checksums rmd160 87f834bd4c9b133dce991678c017d5bb4a5bfee1 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 37f49de187825425cb3096fc870959d5fec9302b22ffd0f2874d8a18e85046d7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 37f49de187825425cb3096fc870959d5fec9302b22ffd0f2874d8a18e85046d7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 720112
</span>
depends_build path:bin/cmake:cmake \
port:ImageMagick \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,8 +40,6 @@ depends_build path:bin/cmake:cmake \
</span>
depends_lib path:bin/dbus-daemon:dbus \
path:lib/pkgconfig/gdk-pixbuf-2.0.pc:gdk-pixbuf2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:lua \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:lua-lgi \
</span> path:lib/pkgconfig/glib-2.0.pc:glib2 \
path:lib/pkgconfig/pango.pc:pango \
path:lib/pkgconfig/cairo.pc:cairo \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,31 +55,34 @@ depends_lib path:bin/dbus-daemon:dbus \
</span> port:imlib2 \
port:libev
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# awesomeConfig.cmake uses FindLua51 module
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lua.version 5.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lua.modules lgi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> require_active_variants path:lib/pkgconfig/cairo.pc:cairo x11
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.target-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXX=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CMAKE_ARGS="\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_INSTALL_PREFIX=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPREFIX=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DGENERATE_MANPAGES=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCOMPRESS_MANPAGES=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DGENERATE_DOC=OFF \
</span> -DAWESOME_DOC_PATH=${prefix}/share/doc/awesome \
-DAWESOME_MAN_PATH=${prefix}/share/man \
-DAWESOME_XSESSION_PATH=${prefix}/share/xsessions \
-DSYSCONFDIR=${prefix}/etc \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DXDG_CONFIG_HOME=${prefix}/etc/xdg"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DXDG_CONFIG_HOME=${prefix}/etc/xdg
</span>
patchfiles patch-CMakeLists.txt.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-Makefile.diff \
</span> patch-awesomerc.lua.in.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_configure no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> variant doc description {Build man pages} {
depends_build-append \
port:asciidoc \
port:xmlto \
path:bin/doxygen:doxygen \
path:bin/dot:graphviz
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DGENERATE_MANPAGES=OFF
</span> }
livecheck.type regex
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/awesome/files/patch-Makefile.diff b/x11/awesome/files/patch-Makefile.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7501b0f267a..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/awesome/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.orig 2011-11-23 08:08:50.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile 2012-02-20 12:53:04.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--builddir=.build-$(shell hostname)-$(shell gcc -dumpmachine)-$(shell gcc -dumpversion)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+builddir=build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq (,$(VERBOSE))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MAKEFLAGS:=$(MAKEFLAGS)s
</span></pre><pre style='margin:0'>
</pre>