Sun Dec 31 21:50:35 2023 UTC (167d)
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.


(bsiegert)
diff -r1.88 -r1.88.2.1 pkgsrc/wm/awesome/Makefile
cvs diff -r1.88 -r1.88.2.1 pkgsrc/wm/awesome/Makefile (expand / switch to context diff)
--- pkgsrc/wm/awesome/Makefile 2023/11/14 14:02:59 1.88
+++ pkgsrc/wm/awesome/Makefile 2023/12/31 21:50:35 1.88.2.1
@@ -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,8 +44,17 @@
 
 .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