Thu Oct 24 18:22:00 2019 UTC ()
qemu: deal with static files generated by Sphinx


(adam)
diff -r1.218 -r1.219 pkgsrc/emulators/qemu/Makefile
diff -r1.61 -r1.62 pkgsrc/emulators/qemu/PLIST
cvs diff -r1.218 -r1.219 pkgsrc/emulators/qemu/Makefile (expand / switch to unified diff)

--- pkgsrc/emulators/qemu/Makefile 2019/10/21 21:45:39 1.218
+++ pkgsrc/emulators/qemu/Makefile 2019/10/24 18:22:00 1.219
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.218 2019/10/21 21:45:39 adam Exp $ 1# $NetBSD: Makefile,v 1.219 2019/10/24 18:22:00 adam Exp $
2 2
3DISTNAME= qemu-4.1.0 3DISTNAME= qemu-4.1.0
4PKGREVISION= 1 4PKGREVISION= 2
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
15USE_LANGUAGES+= c c++ 15USE_LANGUAGES+= c c++
16USE_TOOLS+= bison flex gmake makeinfo perl:build pod2man pkg-config 16USE_TOOLS+= bison flex gmake makeinfo perl:build pod2man pkg-config
17FAKE_NCURSES= yes 17FAKE_NCURSES= yes
@@ -126,32 +126,39 @@ PLIST.nbd= yes @@ -126,32 +126,39 @@ PLIST.nbd= yes
126PLIST.ivshmem= yes 126PLIST.ivshmem= yes
127PLIST.pr-helper= yes 127PLIST.pr-helper= yes
128PLIST.virtfs-proxy-helper=yes 128PLIST.virtfs-proxy-helper=yes
129.elif !empty(MACHINE_PLATFORM:MSunOS-5.11-*) 129.elif !empty(MACHINE_PLATFORM:MSunOS-5.11-*)
130PLIST.nbd= yes 130PLIST.nbd= yes
131CONFIGURE_ARGS+= --disable-coroutine-pool 131CONFIGURE_ARGS+= --disable-coroutine-pool
132.endif 132.endif
133 133
134PLIST_VARS+= ${UE_ARCHS} bridge-helper ivshmem nbd pr-helper virtfs-proxy-helper 134PLIST_VARS+= ${UE_ARCHS} bridge-helper ivshmem nbd pr-helper virtfs-proxy-helper
135.for pvar in ${USER_EMUL} 135.for pvar in ${USER_EMUL}
136PLIST.${pvar}= yes 136PLIST.${pvar}= yes
137.endfor 137.endfor
138 138
 139# different versions of Sphinx generate different static files
 140PLIST_SRC= PLIST ${WRKDIR}/PLIST.STATIC
 141
139TEST_TARGET= check 142TEST_TARGET= check
140 143
141post-install: 144post-install:
142 ${INSTALL_DATA} ${FILESDIR}/Makefile.multinode-NetBSD \ 145 ${INSTALL_DATA} ${FILESDIR}/Makefile.multinode-NetBSD \
143 ${DESTDIR}${PREFIX}/share/doc/qemu/ 146 ${DESTDIR}${PREFIX}/share/doc/qemu/
144 ${RM} -f ${DESTDIR}${PREFIX}/share/doc/qemu/interop/.buildinfo 147 ${RM} -f ${DESTDIR}${PREFIX}/share/doc/qemu/interop/.buildinfo
 148 ${RM} -f ${DESTDIR}${PREFIX}/share/doc/qemu/specs/.buildinfo
 149 ${RM} -f ${WRKDIR}/PLIST.STATIC
 150 cd ${DESTDIR}${PREFIX} && \
 151 ${FIND} share/doc/qemu -path '*/_static/*' -type f -print > ${WRKDIR}/PLIST.STATIC
145 152
146# On Darwin, qemu uses Cocoa and CoreAudio 153# On Darwin, qemu uses Cocoa and CoreAudio
147.if ${OPSYS} != "Darwin" 154.if ${OPSYS} != "Darwin"
148.include "../../mk/oss.buildlink3.mk" 155.include "../../mk/oss.buildlink3.mk"
149.endif 156.endif
150.include "../../archivers/lzo/buildlink3.mk" 157.include "../../archivers/lzo/buildlink3.mk"
151.include "../../devel/glib2/buildlink3.mk" 158.include "../../devel/glib2/buildlink3.mk"
152.include "../../devel/jemalloc/buildlink3.mk" 159.include "../../devel/jemalloc/buildlink3.mk"
153.include "../../devel/snappy/buildlink3.mk" 160.include "../../devel/snappy/buildlink3.mk"
154.include "../../devel/zlib/buildlink3.mk" 161.include "../../devel/zlib/buildlink3.mk"
155.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 162.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
156.include "../../graphics/png/buildlink3.mk" 163.include "../../graphics/png/buildlink3.mk"
157.include "../../lang/python/extension.mk" 164.include "../../lang/python/extension.mk"
cvs diff -r1.61 -r1.62 pkgsrc/emulators/qemu/PLIST (expand / switch to unified diff)

--- pkgsrc/emulators/qemu/PLIST 2019/08/16 15:12:19 1.61
+++ pkgsrc/emulators/qemu/PLIST 2019/10/24 18:22:00 1.62
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.61 2019/08/16 15:12:19 adam Exp $ 1@comment $NetBSD: PLIST,v 1.62 2019/10/24 18:22:00 adam Exp $
2bin/elf2dmp 2bin/elf2dmp
3${PLIST.ivshmem}bin/ivshmem-client 3${PLIST.ivshmem}bin/ivshmem-client
4${PLIST.ivshmem}bin/ivshmem-server 4${PLIST.ivshmem}bin/ivshmem-server
5${PLIST.aarch64}bin/qemu-aarch64 5${PLIST.aarch64}bin/qemu-aarch64
6${PLIST.aarch64_be}bin/qemu-aarch64_be 6${PLIST.aarch64_be}bin/qemu-aarch64_be
7${PLIST.alpha}bin/qemu-alpha 7${PLIST.alpha}bin/qemu-alpha
8${PLIST.arm}bin/qemu-arm 8${PLIST.arm}bin/qemu-arm
9${PLIST.armeb}bin/qemu-armeb 9${PLIST.armeb}bin/qemu-armeb
10${PLIST.cris}bin/qemu-cris 10${PLIST.cris}bin/qemu-cris
11bin/qemu-edid 11bin/qemu-edid
12bin/qemu-ga 12bin/qemu-ga
13${PLIST.hppa}bin/qemu-hppa 13${PLIST.hppa}bin/qemu-hppa
14${PLIST.i386}bin/qemu-i386 14${PLIST.i386}bin/qemu-i386
@@ -77,91 +77,42 @@ ${PLIST.xtensaeb}bin/qemu-xtensaeb @@ -77,91 +77,42 @@ ${PLIST.xtensaeb}bin/qemu-xtensaeb
77${PLIST.virtfs-proxy-helper}bin/virtfs-proxy-helper 77${PLIST.virtfs-proxy-helper}bin/virtfs-proxy-helper
78${PLIST.bridge-helper}libexec/qemu-bridge-helper 78${PLIST.bridge-helper}libexec/qemu-bridge-helper
79man/man1/qemu-img.1 79man/man1/qemu-img.1
80man/man1/qemu.1 80man/man1/qemu.1
81${PLIST.virtfs-proxy-helper}man/man1/virtfs-proxy-helper.1 81${PLIST.virtfs-proxy-helper}man/man1/virtfs-proxy-helper.1
82man/man7/qemu-block-drivers.7 82man/man7/qemu-block-drivers.7
83man/man7/qemu-cpu-models.7 83man/man7/qemu-cpu-models.7
84man/man7/qemu-ga-ref.7 84man/man7/qemu-ga-ref.7
85man/man7/qemu-qmp-ref.7 85man/man7/qemu-qmp-ref.7
86man/man8/qemu-ga.8 86man/man8/qemu-ga.8
87man/man8/qemu-nbd.8 87man/man8/qemu-nbd.8
88share/applications/qemu.desktop 88share/applications/qemu.desktop
89share/doc/qemu/Makefile.multinode-NetBSD 89share/doc/qemu/Makefile.multinode-NetBSD
90share/doc/qemu/interop/_static/ajax-loader.gif 
91share/doc/qemu/interop/_static/alabaster.css 
92share/doc/qemu/interop/_static/basic.css 
93share/doc/qemu/interop/_static/comment-bright.png 
94share/doc/qemu/interop/_static/comment-close.png 
95share/doc/qemu/interop/_static/comment.png 
96share/doc/qemu/interop/_static/custom.css 
97share/doc/qemu/interop/_static/doctools.js 
98share/doc/qemu/interop/_static/documentation_options.js 
99share/doc/qemu/interop/_static/down-pressed.png 
100share/doc/qemu/interop/_static/down.png 
101share/doc/qemu/interop/_static/file.png 
102share/doc/qemu/interop/_static/jquery-3.2.1.js 
103share/doc/qemu/interop/_static/jquery.js 
104share/doc/qemu/interop/_static/language_data.js 
105share/doc/qemu/interop/_static/minus.png 
106share/doc/qemu/interop/_static/plus.png 
107share/doc/qemu/interop/_static/pygments.css 
108share/doc/qemu/interop/_static/searchtools.js 
109share/doc/qemu/interop/_static/underscore-1.3.1.js 
110share/doc/qemu/interop/_static/underscore.js 
111share/doc/qemu/interop/_static/up-pressed.png 
112share/doc/qemu/interop/_static/up.png 
113share/doc/qemu/interop/_static/websupport.js 
114share/doc/qemu/interop/bitmaps.html 90share/doc/qemu/interop/bitmaps.html
115share/doc/qemu/interop/genindex.html 91share/doc/qemu/interop/genindex.html
116share/doc/qemu/interop/index.html 92share/doc/qemu/interop/index.html
117share/doc/qemu/interop/live-block-operations.html 93share/doc/qemu/interop/live-block-operations.html
118share/doc/qemu/interop/objects.inv 94share/doc/qemu/interop/objects.inv
119share/doc/qemu/interop/pr-helper.html 95share/doc/qemu/interop/pr-helper.html
120share/doc/qemu/interop/search.html 96share/doc/qemu/interop/search.html
121share/doc/qemu/interop/searchindex.js 97share/doc/qemu/interop/searchindex.js
122share/doc/qemu/interop/vhost-user-gpu.html 98share/doc/qemu/interop/vhost-user-gpu.html
123share/doc/qemu/interop/vhost-user.html 99share/doc/qemu/interop/vhost-user.html
124share/doc/qemu/qemu-doc.html 100share/doc/qemu/qemu-doc.html
125share/doc/qemu/qemu-doc.txt 101share/doc/qemu/qemu-doc.txt
126share/doc/qemu/qemu-ga-ref.html 102share/doc/qemu/qemu-ga-ref.html
127share/doc/qemu/qemu-ga-ref.txt 103share/doc/qemu/qemu-ga-ref.txt
128share/doc/qemu/qemu-qmp-ref.html 104share/doc/qemu/qemu-qmp-ref.html
129share/doc/qemu/qemu-qmp-ref.txt 105share/doc/qemu/qemu-qmp-ref.txt
130share/doc/qemu/specs/.buildinfo 
131share/doc/qemu/specs/_static/ajax-loader.gif 
132share/doc/qemu/specs/_static/alabaster.css 
133share/doc/qemu/specs/_static/basic.css 
134share/doc/qemu/specs/_static/comment-bright.png 
135share/doc/qemu/specs/_static/comment-close.png 
136share/doc/qemu/specs/_static/comment.png 
137share/doc/qemu/specs/_static/custom.css 
138share/doc/qemu/specs/_static/doctools.js 
139share/doc/qemu/specs/_static/documentation_options.js 
140share/doc/qemu/specs/_static/down-pressed.png 
141share/doc/qemu/specs/_static/down.png 
142share/doc/qemu/specs/_static/file.png 
143share/doc/qemu/specs/_static/jquery-3.2.1.js 
144share/doc/qemu/specs/_static/jquery.js 
145share/doc/qemu/specs/_static/language_data.js 
146share/doc/qemu/specs/_static/minus.png 
147share/doc/qemu/specs/_static/plus.png 
148share/doc/qemu/specs/_static/pygments.css 
149share/doc/qemu/specs/_static/searchtools.js 
150share/doc/qemu/specs/_static/underscore-1.3.1.js 
151share/doc/qemu/specs/_static/underscore.js 
152share/doc/qemu/specs/_static/up-pressed.png 
153share/doc/qemu/specs/_static/up.png 
154share/doc/qemu/specs/_static/websupport.js 
155share/doc/qemu/specs/genindex.html 106share/doc/qemu/specs/genindex.html
156share/doc/qemu/specs/index.html 107share/doc/qemu/specs/index.html
157share/doc/qemu/specs/objects.inv 108share/doc/qemu/specs/objects.inv
158share/doc/qemu/specs/ppc-spapr-xive.html 109share/doc/qemu/specs/ppc-spapr-xive.html
159share/doc/qemu/specs/ppc-xive.html 110share/doc/qemu/specs/ppc-xive.html
160share/doc/qemu/specs/search.html 111share/doc/qemu/specs/search.html
161share/doc/qemu/specs/searchindex.js 112share/doc/qemu/specs/searchindex.js
162share/icons/hicolor/128x128/apps/qemu.png 113share/icons/hicolor/128x128/apps/qemu.png
163share/icons/hicolor/16x16/apps/qemu.png 114share/icons/hicolor/16x16/apps/qemu.png
164share/icons/hicolor/24x24/apps/qemu.png 115share/icons/hicolor/24x24/apps/qemu.png
165share/icons/hicolor/256x256/apps/qemu.png 116share/icons/hicolor/256x256/apps/qemu.png
166share/icons/hicolor/32x32/apps/qemu.bmp 117share/icons/hicolor/32x32/apps/qemu.bmp
167share/icons/hicolor/32x32/apps/qemu.png 118share/icons/hicolor/32x32/apps/qemu.png