Sun Dec 20 16:51:44 2020 UTC ()
qemu: don't require x11 when x11 is disabled


(spz)
diff -r1.258 -r1.259 pkgsrc/emulators/qemu/Makefile
cvs diff -r1.258 -r1.259 pkgsrc/emulators/qemu/Makefile (expand / switch to unified diff)

--- pkgsrc/emulators/qemu/Makefile 2020/12/15 16:50:08 1.258
+++ pkgsrc/emulators/qemu/Makefile 2020/12/20 16:51:44 1.259
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.258 2020/12/15 16:50:08 maya Exp $ 1# $NetBSD: Makefile,v 1.259 2020/12/20 16:51:44 spz Exp $
2 2
3DISTNAME= qemu-5.1.0 3DISTNAME= qemu-5.1.0
4PKGREVISION= 11 4PKGREVISION= 11
5CATEGORIES= emulators 5CATEGORIES= emulators
6MASTER_SITES= https://download.qemu.org/ 6MASTER_SITES= https://download.qemu.org/
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.qemu-project.org/ 10HOMEPAGE= http://www.qemu-project.org/
11COMMENT= CPU emulator using dynamic translation 11COMMENT= CPU emulator using dynamic translation
12LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 AND mit AND modified-bsd 12LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 AND mit AND modified-bsd
13 13
14USE_CURSES= resize_term wide 14USE_CURSES= resize_term wide
@@ -151,28 +151,32 @@ post-build: @@ -151,28 +151,32 @@ post-build:
151 ${TOUCH} ${WRKSRC}/config-host.mak 151 ${TOUCH} ${WRKSRC}/config-host.mak
152 152
153post-install: 153post-install:
154 ${INSTALL_DATA} ${FILESDIR}/Makefile.multinode-NetBSD \ 154 ${INSTALL_DATA} ${FILESDIR}/Makefile.multinode-NetBSD \
155 ${DESTDIR}${PREFIX}/share/doc/qemu/ 155 ${DESTDIR}${PREFIX}/share/doc/qemu/
156 ${RM} -f ${DESTDIR}${PREFIX}/share/doc/qemu/interop/.buildinfo 156 ${RM} -f ${DESTDIR}${PREFIX}/share/doc/qemu/interop/.buildinfo
157 ${RM} -f ${DESTDIR}${PREFIX}/share/doc/qemu/specs/.buildinfo 157 ${RM} -f ${DESTDIR}${PREFIX}/share/doc/qemu/specs/.buildinfo
158 ${RM} -f ${WRKDIR}/PLIST.STATIC 158 ${RM} -f ${WRKDIR}/PLIST.STATIC
159 cd ${DESTDIR}${PREFIX} && \ 159 cd ${DESTDIR}${PREFIX} && \
160 ${FIND} share/doc/qemu -path '*/_static/*' -type f -print > ${WRKDIR}/PLIST.STATIC 160 ${FIND} share/doc/qemu -path '*/_static/*' -type f -print > ${WRKDIR}/PLIST.STATIC
161 161
162# On Darwin, qemu uses Cocoa and CoreAudio 162# On Darwin, qemu uses Cocoa and CoreAudio
163.if ${OPSYS} != "Darwin" 163.if ${OPSYS} != "Darwin"
 164.if !empty(PKG_OPTIONS:Mx11)
164PLIST.keymap= yes 165PLIST.keymap= yes
165.include "../../x11/libxkbcommon/buildlink3.mk" 166.include "../../x11/libxkbcommon/buildlink3.mk"
 167.else
 168CONFIGURE_ARGS+= --disable-xkbcommon
 169.endif
166.include "../../mk/oss.buildlink3.mk" 170.include "../../mk/oss.buildlink3.mk"
167.endif 171.endif
168.include "../../archivers/lzo/buildlink3.mk" 172.include "../../archivers/lzo/buildlink3.mk"
169.include "../../devel/glib2/buildlink3.mk" 173.include "../../devel/glib2/buildlink3.mk"
170.include "../../devel/jemalloc/buildlink3.mk" 174.include "../../devel/jemalloc/buildlink3.mk"
171.include "../../devel/snappy/buildlink3.mk" 175.include "../../devel/snappy/buildlink3.mk"
172.include "../../devel/zlib/buildlink3.mk" 176.include "../../devel/zlib/buildlink3.mk"
173.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 177.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
174.include "../../graphics/png/buildlink3.mk" 178.include "../../graphics/png/buildlink3.mk"
175.include "../../lang/python/extension.mk" 179.include "../../lang/python/extension.mk"
176.include "../../lang/python/versioned_dependencies.mk" 180.include "../../lang/python/versioned_dependencies.mk"
177.include "../../security/libgcrypt/buildlink3.mk" 181.include "../../security/libgcrypt/buildlink3.mk"
178.include "../../www/curl/buildlink3.mk" 182.include "../../www/curl/buildlink3.mk"