CVS commit: pkgsrc/emulators/qemu

["Leonardo Taccari" <leot%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   leot
Date:           Thu Apr 25 15:29:02 UTC 2019

Modified Files:
        pkgsrc/emulators/qemu: Makefile PLIST

Log Message:
qemu: install documentation and minor updates/fixes

- After the 4.0.0 update documentation was no longer installed.
  To generate documentation and man pages makeinfo, pod2man and
  py-sphinx are needed, add them as tool dependencies.
- Add a SUBST class to override hardcoded sphinx-build program name.
- Remove PYTHON_VERSIONS_INCOMPATIBLE: 2.7 and 3 are supported.
- hicolor icon themes are installed, include hicolor-icon-theme bl3


To generate a diff of this commit:
cvs rdiff -u -r1.204 -r1.205 pkgsrc/emulators/qemu/Makefile
cvs rdiff -u -r1.56 -r1.57 pkgsrc/emulators/qemu/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/emulators/qemu/Makefile
diff -u pkgsrc/emulators/qemu/Makefile:1.204 pkgsrc/emulators/qemu/Makefile:1.205
--- pkgsrc/emulators/qemu/Makefile:1.204        Thu Apr 25 11:33:02 2019
+++ pkgsrc/emulators/qemu/Makefile      Thu Apr 25 15:29:02 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.204 2019/04/25 11:33:02 skrll Exp $
+# $NetBSD: Makefile,v 1.205 2019/04/25 15:29:02 leot Exp $
 
 DISTNAME=      qemu-4.0.0
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    emulators
 MASTER_SITES=  https://download.qemu.org/
 EXTRACT_SUFX=  .tar.xz
@@ -13,12 +13,12 @@ LICENSE=    gnu-gpl-v2 AND gnu-lgpl-v2.1 AN
 
 USE_CURSES=            resize_term wide
 USE_LANGUAGES+=                c c++
-USE_TOOLS+=            bison flex gmake makeinfo perl:build pkg-config
+USE_TOOLS+=            bison flex gmake makeinfo perl:build pod2man pkg-config
 FAKE_NCURSES=          yes
 UNLIMIT_RESOURCES=     datasize
 HAS_CONFIGURE=         yes
 
-BUILD_DEPENDS+=                texi2html-[0-9]*:../../textproc/texi2html
+TOOL_DEPENDS+=         ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
 
 SUBST_CLASSES+=                        prefix
 SUBST_STAGE.prefix=            pre-configure
@@ -26,6 +26,14 @@ SUBST_MESSAGE.prefix=                Setting PREFIX
 SUBST_FILES.prefix+=           configure
 SUBST_VARS.prefix+=            PREFIX
 
+SUBST_CLASSES+=                        sphinx-build
+SUBST_STAGE.sphinx-build=      pre-configure
+SUBST_MESSAGE.sphinx-build=    Fix hardcoded sphinx-build
+SUBST_FILES.sphinx-build+=     Makefile configure
+SUBST_FILES.sphinx-build+=     roms/skiboot/doc/Makefile
+SUBST_FILES.sphinx-build+=     roms/u-boot/Documentation/Makefile
+SUBST_SED.sphinx-build+=       -e 's/sphinx-build/sphinx-build${PYVERSSUFFIX}/g'
+
 .include "options.mk"
 
 .include "../../mk/bsd.prefs.mk"
@@ -37,6 +45,7 @@ CONFIGURE_ARGS+=      --python=${PYTHONBIN}
 CONFIGURE_ARGS+=       --smbd=${PREFIX}/sbin/smbd
 CONFIGURE_ARGS+=       --mandir=${PREFIX}/${PKGMANDIR}
 CONFIGURE_ARGS+=       --enable-curses
+CONFIGURE_ARGS+=       --enable-docs
 CONFIGURE_ARGS+=       --enable-jemalloc
 CONFIGURE_ARGS+=       --disable-opengl
 CONFIGURE_ENV+=                mansuffix=/${PKGMANDIR}
@@ -83,8 +92,6 @@ PKG_SYSCONFSUBDIR=    qemu
 
 REPLACE_PERL+=         scripts/texi2pod.pl
 
-PYTHON_VERSIONS_INCOMPATIBLE=  34 35 36 37 # not yet ported yet as of 2.10.0
-
 INSTALLATION_DIRS=     ${PKGMANDIR}/man1 share/doc/qemu
 
 UE_ARCHS+=             alpha arm armeb cris i386 m68k microblaze mips mipsel
@@ -120,6 +127,7 @@ TEST_TARGET=                check
 post-install:
        ${INSTALL_DATA} ${FILESDIR}/Makefile.multinode-NetBSD \
                ${DESTDIR}${PREFIX}/share/doc/qemu/
+       ${RM} ${DESTDIR}${PREFIX}/share/doc/qemu/interop/.buildinfo
 
 # On Darwin, qemu uses Cocoa and CoreAudio
 .if ${OPSYS} != "Darwin"
@@ -130,6 +138,7 @@ post-install:
 .include "../../devel/jemalloc/buildlink3.mk"
 .include "../../devel/snappy/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../lang/python/extension.mk"
 .include "../../security/libgcrypt/buildlink3.mk"

Index: pkgsrc/emulators/qemu/PLIST
diff -u pkgsrc/emulators/qemu/PLIST:1.56 pkgsrc/emulators/qemu/PLIST:1.57
--- pkgsrc/emulators/qemu/PLIST:1.56    Wed Apr 24 13:59:32 2019
+++ pkgsrc/emulators/qemu/PLIST Thu Apr 25 15:29:02 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.56 2019/04/24 13:59:32 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.57 2019/04/25 15:29:02 leot Exp $
 bin/elf2dmp
 ${PLIST.alpha}bin/qemu-alpha
 ${PLIST.arm}bin/qemu-arm
@@ -58,8 +58,54 @@ bin/qemu-system-xtensa
 bin/qemu-system-xtensaeb
 ${PLIST.unicore32}bin/qemu-unicore32
 ${PLIST.x86_64}bin/qemu-x86_64
+man/man1/qemu-img.1
+man/man1/qemu.1
+man/man7/qemu-block-drivers.7
+man/man7/qemu-cpu-models.7
+man/man7/qemu-ga-ref.7
+man/man7/qemu-qmp-ref.7
+man/man8/qemu-ga.8
+man/man8/qemu-nbd.8
 share/applications/qemu.desktop
 share/doc/qemu/Makefile.multinode-NetBSD
+share/doc/qemu/interop/_static/ajax-loader.gif
+share/doc/qemu/interop/_static/alabaster.css
+share/doc/qemu/interop/_static/basic.css
+share/doc/qemu/interop/_static/comment-bright.png
+share/doc/qemu/interop/_static/comment-close.png
+share/doc/qemu/interop/_static/comment.png
+share/doc/qemu/interop/_static/custom.css
+share/doc/qemu/interop/_static/doctools.js
+share/doc/qemu/interop/_static/documentation_options.js
+share/doc/qemu/interop/_static/down-pressed.png
+share/doc/qemu/interop/_static/down.png
+share/doc/qemu/interop/_static/file.png
+share/doc/qemu/interop/_static/jquery-3.2.1.js
+share/doc/qemu/interop/_static/jquery.js
+share/doc/qemu/interop/_static/language_data.js
+share/doc/qemu/interop/_static/minus.png
+share/doc/qemu/interop/_static/plus.png
+share/doc/qemu/interop/_static/pygments.css
+share/doc/qemu/interop/_static/searchtools.js
+share/doc/qemu/interop/_static/underscore-1.3.1.js
+share/doc/qemu/interop/_static/underscore.js
+share/doc/qemu/interop/_static/up-pressed.png
+share/doc/qemu/interop/_static/up.png
+share/doc/qemu/interop/_static/websupport.js
+share/doc/qemu/interop/bitmaps.html
+share/doc/qemu/interop/genindex.html
+share/doc/qemu/interop/index.html
+share/doc/qemu/interop/live-block-operations.html
+share/doc/qemu/interop/objects.inv
+share/doc/qemu/interop/pr-helper.html
+share/doc/qemu/interop/search.html
+share/doc/qemu/interop/searchindex.js
+share/doc/qemu/qemu-doc.html
+share/doc/qemu/qemu-doc.txt
+share/doc/qemu/qemu-ga-ref.html
+share/doc/qemu/qemu-ga-ref.txt
+share/doc/qemu/qemu-qmp-ref.html
+share/doc/qemu/qemu-qmp-ref.txt
 share/icons/hicolor/128x128/apps/qemu.png
 share/icons/hicolor/16x16/apps/qemu.png
 share/icons/hicolor/24x24/apps/qemu.png