CVS commit: pkgsrc/wm/awesome

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Thu Jan  4 01:37:09 UTC 2024

Modified Files:
        pkgsrc/wm/awesome: Makefile

Log Message:
awesome: switch back to ImageMagick (7) as a tool dependency

Now that the ImageMagick project has fixed the issue (in both the 6 and
7 releases), we might as well switch back to 7, as it receives more
attention in pkgsrc than 6 does, and 6 shows no greater likelihood of
avoiding regressions, evidently.


To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 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.92 pkgsrc/wm/awesome/Makefile:1.93
--- pkgsrc/wm/awesome/Makefile:1.92     Sun Dec 31 20:44:29 2023
+++ pkgsrc/wm/awesome/Makefile  Thu Jan  4 01:37:09 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.92 2023/12/31 20:44:29 gutteridge Exp $
+# $NetBSD: Makefile,v 1.93 2024/01/04 01:37:09 gutteridge Exp $
 
 DISTNAME=      awesome-4.3
 PKGREVISION=   14
@@ -43,18 +43,9 @@ 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.