CVS commit: [pkgsrc-2023Q4] pkgsrc/wm/awesome

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Sun Dec 31 21:50:35 UTC 2023

Modified Files:
        pkgsrc/wm/awesome [pkgsrc-2023Q4]: Makefile

Log Message:
Pullup ticket #6827 - requested by gutteridge
wm/awesome: build fix

Revisions pulled up:
- wm/awesome/Makefile                                           1.89

---
   Module Name:    pkgsrc
   Committed By:   gutteridge
   Date:           Thu Dec 28 18:19:03 UTC 2023

   Modified Files:
            pkgsrc/wm/awesome: Makefile

   Log Message:
   awesome: fix builds

   Switched to ImageMagick6 to work around image conversion failures with
   the convert tool provided by the most recent ImageMagick 7 releases.


To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.88.2.1 pkgsrc/wm/awesome/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/wm/awesome/Makefile
diff -u pkgsrc/wm/awesome/Makefile:1.88 pkgsrc/wm/awesome/Makefile:1.88.2.1
--- pkgsrc/wm/awesome/Makefile:1.88     Tue Nov 14 14:02:59 2023
+++ pkgsrc/wm/awesome/Makefile  Sun Dec 31 21:50:35 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.88 2023/11/14 14:02:59 wiz Exp $
+# $NetBSD: Makefile,v 1.88.2.1 2023/12/31 21:50:35 bsiegert Exp $
 
 DISTNAME=      awesome-4.3
 PKGREVISION=   14
@@ -44,9 +44,18 @@ CONF_FILES=  ${EGDIR}/rc.lua ${PKG_SYSCON
 
 .include "../../lang/ruby/rubyversion.mk"
 TOOL_DEPENDS+= ${RUBY_PKGPREFIX}-asciidoctor-[0-9]*:../../textproc/ruby-asciidoctor
-TOOL_DEPENDS+= ImageMagick-[0-9]*:../../graphics/ImageMagick
 DEPENDS+=      ${LUA_PKGPREFIX}-gi>=0.7.0:../../devel/lua-gi
 
+# Switched to ImageMagick6 to work around image conversion failures with
+# the convert tool provided by the most recent ImageMagick 7 releases.
+TOOL_DEPENDS+= ImageMagick6-[0-9]*:../../graphics/ImageMagick6
+
+SUBST_CLASSES+=                convert
+SUBST_STAGE.convert=   pre-configure
+SUBST_MESSAGE.convert= Fixing ImageMagick convert executable name.
+SUBST_FILES.convert+=  awesomeConfig.cmake
+SUBST_SED.convert=     -e 's|CONVERT_EXECUTABLE convert|CONVERT_EXECUTABLE convert6|'
+
 SUBST_CLASSES+=                lua
 SUBST_STAGE.lua=       pre-configure
 SUBST_MESSAGE.lua=     Fixing lua executable name.