Sat Dec 30 01:12:40 2023 UTC (170d)
awesome: note the precarious position of successful building


(gutteridge)
diff -r1.90 -r1.91 pkgsrc/wm/awesome/Makefile
cvs diff -r1.90 -r1.91 pkgsrc/wm/awesome/Makefile (switch to unified diff)

--- pkgsrc/wm/awesome/Makefile 2023/12/28 18:20:02 1.90
+++ pkgsrc/wm/awesome/Makefile 2023/12/30 01:12:40 1.91
@@ -1,84 +1,86 @@ @@ -1,84 +1,86 @@
1# $NetBSD: Makefile,v 1.90 2023/12/28 18:20:02 gutteridge Exp $ 1# $NetBSD: Makefile,v 1.91 2023/12/30 01:12:40 gutteridge 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
15CONFLICTS+= awesome<3.0 15CONFLICTS+= awesome<3.0
16 16
17USE_TOOLS+= bash pkg-config 17USE_TOOLS+= bash pkg-config
18USE_CMAKE= yes 18USE_CMAKE= yes
19USE_LANGUAGES= c c++ 19USE_LANGUAGES= c c++
20REPLACE_BASH+= utils/awesome-client 20REPLACE_BASH+= utils/awesome-client
21 21
22.include "../../wm/awesome/options.mk" 22.include "../../wm/awesome/options.mk"
23 23
24PKG_SYSCONFSUBDIR= xdg/awesome 24PKG_SYSCONFSUBDIR= xdg/awesome
25 25
26CONFIGURE_DIRS= build 26CONFIGURE_DIRS= build
27CMAKE_ARG_PATH= ${WRKSRC} 27CMAKE_ARG_PATH= ${WRKSRC}
28 28
29# lua-gi 29# lua-gi
30LUA_VERSIONS_ACCEPTED= 53 52 51 30LUA_VERSIONS_ACCEPTED= 53 52 51
31 31
32.include "../../lang/lua/luaversion.mk" 32.include "../../lang/lua/luaversion.mk"
33 33
34CMAKE_ARGS+= -DCOMPRESS_MANPAGES=${MANZ:Q} 34CMAKE_ARGS+= -DCOMPRESS_MANPAGES=${MANZ:Q}
35CMAKE_ARGS+= -DAWESOME_MAN_PATH=${PREFIX}/${PKGMANDIR} 35CMAKE_ARGS+= -DAWESOME_MAN_PATH=${PREFIX}/${PKGMANDIR}
36CMAKE_ARGS+= -DOVERRIDE_VERSION=${PKGVERSION_NOREV} 36CMAKE_ARGS+= -DOVERRIDE_VERSION=${PKGVERSION_NOREV}
37CMAKE_ARGS+= -DLUA_INCLUDE_DIR=${PREFIX}/${LUA_INCDIR} 37CMAKE_ARGS+= -DLUA_INCLUDE_DIR=${PREFIX}/${LUA_INCDIR}
38CMAKE_ARGS+= -DXDG_CONFIG_DIR=${PKG_SYSCONFBASEDIR}/xdg 38CMAKE_ARGS+= -DXDG_CONFIG_DIR=${PKG_SYSCONFBASEDIR}/xdg
39CMAKE_ARGS+= -DGENERATE_DOC=OFF 39CMAKE_ARGS+= -DGENERATE_DOC=OFF
40 40
41EGDIR= ${PREFIX}/share/examples/awesome 41EGDIR= ${PREFIX}/share/examples/awesome
42CONF_FILES= ${EGDIR}/rc.lua ${PKG_SYSCONFDIR}/rc.lua 42CONF_FILES= ${EGDIR}/rc.lua ${PKG_SYSCONFDIR}/rc.lua
43 43
44.include "../../lang/ruby/rubyversion.mk" 44.include "../../lang/ruby/rubyversion.mk"
45TOOL_DEPENDS+= ${RUBY_PKGPREFIX}-asciidoctor-[0-9]*:../../textproc/ruby-asciidoctor 45TOOL_DEPENDS+= ${RUBY_PKGPREFIX}-asciidoctor-[0-9]*:../../textproc/ruby-asciidoctor
46DEPENDS+= ${LUA_PKGPREFIX}-gi>=0.7.0:../../devel/lua-gi 46DEPENDS+= ${LUA_PKGPREFIX}-gi>=0.7.0:../../devel/lua-gi
47 47
48# Switched to ImageMagick6 to work around image conversion failures with 48# Switched to ImageMagick6 to work around image conversion failures with
49# the convert tool provided by the most recent ImageMagick 7 releases. 49# the convert tool provided by the most recent ImageMagick 7 releases.
 50# NB the latest ImageMagick 6 releases (not yet in pkgsrc) also exhibit this
 51# changed behaviour. Needs further investigation.
50TOOL_DEPENDS+= ImageMagick6-[0-9]*:../../graphics/ImageMagick6 52TOOL_DEPENDS+= ImageMagick6-[0-9]*:../../graphics/ImageMagick6
51 53
52SUBST_CLASSES+= convert 54SUBST_CLASSES+= convert
53SUBST_STAGE.convert= pre-configure 55SUBST_STAGE.convert= pre-configure
54SUBST_MESSAGE.convert= Fixing ImageMagick convert executable name. 56SUBST_MESSAGE.convert= Fixing ImageMagick convert executable name.
55SUBST_FILES.convert+= awesomeConfig.cmake 57SUBST_FILES.convert+= awesomeConfig.cmake
56SUBST_SED.convert= -e 's|CONVERT_EXECUTABLE convert|CONVERT_EXECUTABLE convert6|' 58SUBST_SED.convert= -e 's|CONVERT_EXECUTABLE convert|CONVERT_EXECUTABLE convert6|'
57 59
58SUBST_CLASSES+= lua 60SUBST_CLASSES+= lua
59SUBST_STAGE.lua= pre-configure 61SUBST_STAGE.lua= pre-configure
60SUBST_MESSAGE.lua= Fixing lua executable name. 62SUBST_MESSAGE.lua= Fixing lua executable name.
61SUBST_FILES.lua+= awesomeConfig.cmake 63SUBST_FILES.lua+= awesomeConfig.cmake
62SUBST_SED.lua= -e 's|COMMAND lua|COMMAND ${LUA_INTERPRETER}|g' 64SUBST_SED.lua= -e 's|COMMAND lua|COMMAND ${LUA_INTERPRETER}|g'
63 65
64pre-configure: 66pre-configure:
65 ${RUN} mkdir -p ${WRKSRC}/build 67 ${RUN} mkdir -p ${WRKSRC}/build
66 68
67.include "../../devel/glib2/buildlink3.mk" 69.include "../../devel/glib2/buildlink3.mk"
68.include "../../devel/pango/buildlink3.mk" 70.include "../../devel/pango/buildlink3.mk"
69BUILDLINK_API_DEPENDS.cairo+= cairo>=1.18 71BUILDLINK_API_DEPENDS.cairo+= cairo>=1.18
70.include "../../graphics/cairo/buildlink3.mk" 72.include "../../graphics/cairo/buildlink3.mk"
71.include "../../graphics/gdk-pixbuf2/buildlink3.mk" 73.include "../../graphics/gdk-pixbuf2/buildlink3.mk"
72.include "../../lang/lua/buildlink3.mk" 74.include "../../lang/lua/buildlink3.mk"
73.include "../../x11/libX11/buildlink3.mk" 75.include "../../x11/libX11/buildlink3.mk"
74.include "../../x11/libxcb/buildlink3.mk" 76.include "../../x11/libxcb/buildlink3.mk"
75.include "../../x11/libxdg-basedir/buildlink3.mk" 77.include "../../x11/libxdg-basedir/buildlink3.mk"
76.include "../../x11/libxkbcommon/buildlink3.mk" 78.include "../../x11/libxkbcommon/buildlink3.mk"
77.include "../../x11/xcb-util/buildlink3.mk" 79.include "../../x11/xcb-util/buildlink3.mk"
78.include "../../x11/xcb-util-cursor/buildlink3.mk" 80.include "../../x11/xcb-util-cursor/buildlink3.mk"
79.include "../../x11/xcb-util-keysyms/buildlink3.mk" 81.include "../../x11/xcb-util-keysyms/buildlink3.mk"
80.include "../../x11/xcb-util-wm/buildlink3.mk" 82.include "../../x11/xcb-util-wm/buildlink3.mk"
81.include "../../x11/xcb-util-xrm/buildlink3.mk" 83.include "../../x11/xcb-util-xrm/buildlink3.mk"
82.include "../../x11/xorgproto/buildlink3.mk" 84.include "../../x11/xorgproto/buildlink3.mk"
83.include "../../x11/startup-notification/buildlink3.mk" 85.include "../../x11/startup-notification/buildlink3.mk"
84.include "../../mk/bsd.pkg.mk" 86.include "../../mk/bsd.pkg.mk"