Sun Dec 31 21:50:35 2023 UTC (143d)
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 unified 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,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.88 2023/11/14 14:02:59 wiz Exp $ 1# $NetBSD: Makefile,v 1.88.2.1 2023/12/31 21:50:35 bsiegert Exp $
2 2
3DISTNAME= awesome-4.3 3DISTNAME= awesome-4.3
4PKGREVISION= 14 4PKGREVISION= 14
5CATEGORIES= wm lua 5CATEGORIES= wm lua
6EXTRACT_SUFX= .tar.xz 6EXTRACT_SUFX= .tar.xz
7MASTER_SITES= ${MASTER_SITE_GITHUB:=awesomeWM/} 7MASTER_SITES= ${MASTER_SITE_GITHUB:=awesomeWM/}
8GITHUB_RELEASE= v${PKGVERSION_NOREV} 8GITHUB_RELEASE= v${PKGVERSION_NOREV}
9 9
10MAINTAINER= pallegra@gmail.com 10MAINTAINER= pallegra@gmail.com
11HOMEPAGE= https://awesomewm.org/ 11HOMEPAGE= https://awesomewm.org/
12COMMENT= Window manager based on dwm, with Lua integration 12COMMENT= Window manager based on dwm, with Lua integration
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
@@ -34,29 +34,38 @@ LUA_VERSIONS_ACCEPTED= 53 52 51 @@ -34,29 +34,38 @@ LUA_VERSIONS_ACCEPTED= 53 52 51
34#CMAKE_ARGS+= -DCOMPRESS_MANPAGES=${MANZ:Q} 34#CMAKE_ARGS+= -DCOMPRESS_MANPAGES=${MANZ:Q}
35CMAKE_ARGS+= -DCOMPRESS_MANPAGES=${MANZ:Q} 35CMAKE_ARGS+= -DCOMPRESS_MANPAGES=${MANZ:Q}
36CMAKE_ARGS+= -DAWESOME_MAN_PATH=${PREFIX}/${PKGMANDIR} 36CMAKE_ARGS+= -DAWESOME_MAN_PATH=${PREFIX}/${PKGMANDIR}
37CMAKE_ARGS+= -DOVERRIDE_VERSION=${PKGVERSION_NOREV} 37CMAKE_ARGS+= -DOVERRIDE_VERSION=${PKGVERSION_NOREV}
38CMAKE_ARGS+= -DLUA_INCLUDE_DIR=${PREFIX}/${LUA_INCDIR} 38CMAKE_ARGS+= -DLUA_INCLUDE_DIR=${PREFIX}/${LUA_INCDIR}
39CMAKE_ARGS+= -DXDG_CONFIG_DIR=${PKG_SYSCONFBASEDIR}/xdg 39CMAKE_ARGS+= -DXDG_CONFIG_DIR=${PKG_SYSCONFBASEDIR}/xdg
40CMAKE_ARGS+= -DGENERATE_DOC=OFF 40CMAKE_ARGS+= -DGENERATE_DOC=OFF
41 41
42EGDIR= ${PREFIX}/share/examples/awesome 42EGDIR= ${PREFIX}/share/examples/awesome
43CONF_FILES= ${EGDIR}/rc.lua ${PKG_SYSCONFDIR}/rc.lua 43CONF_FILES= ${EGDIR}/rc.lua ${PKG_SYSCONFDIR}/rc.lua
44 44
45.include "../../lang/ruby/rubyversion.mk" 45.include "../../lang/ruby/rubyversion.mk"
46TOOL_DEPENDS+= ${RUBY_PKGPREFIX}-asciidoctor-[0-9]*:../../textproc/ruby-asciidoctor 46TOOL_DEPENDS+= ${RUBY_PKGPREFIX}-asciidoctor-[0-9]*:../../textproc/ruby-asciidoctor
47TOOL_DEPENDS+= ImageMagick-[0-9]*:../../graphics/ImageMagick 
48DEPENDS+= ${LUA_PKGPREFIX}-gi>=0.7.0:../../devel/lua-gi 47DEPENDS+= ${LUA_PKGPREFIX}-gi>=0.7.0:../../devel/lua-gi
49 48
 49# Switched to ImageMagick6 to work around image conversion failures with
 50# the convert tool provided by the most recent ImageMagick 7 releases.
 51TOOL_DEPENDS+= ImageMagick6-[0-9]*:../../graphics/ImageMagick6
 52
 53SUBST_CLASSES+= convert
 54SUBST_STAGE.convert= pre-configure
 55SUBST_MESSAGE.convert= Fixing ImageMagick convert executable name.
 56SUBST_FILES.convert+= awesomeConfig.cmake
 57SUBST_SED.convert= -e 's|CONVERT_EXECUTABLE convert|CONVERT_EXECUTABLE convert6|'
 58
50SUBST_CLASSES+= lua 59SUBST_CLASSES+= lua
51SUBST_STAGE.lua= pre-configure 60SUBST_STAGE.lua= pre-configure
52SUBST_MESSAGE.lua= Fixing lua executable name. 61SUBST_MESSAGE.lua= Fixing lua executable name.
53SUBST_FILES.lua+= awesomeConfig.cmake 62SUBST_FILES.lua+= awesomeConfig.cmake
54SUBST_SED.lua= -e 's|COMMAND lua|COMMAND ${LUA_INTERPRETER}|g' 63SUBST_SED.lua= -e 's|COMMAND lua|COMMAND ${LUA_INTERPRETER}|g'
55 64
56pre-configure: 65pre-configure:
57 ${RUN} mkdir -p ${WRKSRC}/build 66 ${RUN} mkdir -p ${WRKSRC}/build
58 67
59.include "../../devel/glib2/buildlink3.mk" 68.include "../../devel/glib2/buildlink3.mk"
60.include "../../devel/pango/buildlink3.mk" 69.include "../../devel/pango/buildlink3.mk"
61BUILDLINK_API_DEPENDS.cairo+= cairo>=1.18 70BUILDLINK_API_DEPENDS.cairo+= cairo>=1.18
62.include "../../graphics/cairo/buildlink3.mk" 71.include "../../graphics/cairo/buildlink3.mk"