Date: Fri, 6 Oct 2017 18:54:53 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r451400 - in branches/2017Q4/emulators/qemu: . files Message-ID: <201710061854.v96Isr6r011889@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Fri Oct 6 18:54:53 2017 New Revision: 451400 URL: https://svnweb.freebsd.org/changeset/ports/451400 Log: MFH: r451399 emulators/qemu: Fix build without DOCS - While here also add missing X11 dependencies to the GTK2 option /usr/bin/install -c -c -m 0644 docs/qemu-qmp-ref.7 "/wrkdirs/usr/ports/emulators/qemu/work/stage/usr/local/man/man7" install: docs/qemu-qmp-ref.7: No such file or directory gmake[1]: *** [Makefile:576: install-doc] Error 71 gmake[1]: Leaving directory '/wrkdirs/usr/ports/emulators/qemu/work/qemu-2.9.0' PR: 221749 Submitted by: smh Reviewed by: novel Approved by: bofh Approved by: ports-secteam blanket Modified: branches/2017Q4/emulators/qemu/Makefile branches/2017Q4/emulators/qemu/files/patch-Makefile Directory Properties: branches/2017Q4/ (props changed) Modified: branches/2017Q4/emulators/qemu/Makefile ============================================================================== --- branches/2017Q4/emulators/qemu/Makefile Fri Oct 6 18:53:00 2017 (r451399) +++ branches/2017Q4/emulators/qemu/Makefile Fri Oct 6 18:54:53 2017 (r451400) @@ -47,7 +47,7 @@ OPTIONS_DEFAULT=X11 GTK2 OPENGL GNUTLS SASL JPEG PNG C OPTIONS_SUB= yes X11_USE= SDL=sdl XORG=x11,xext GNOME=gdkpixbuf2 X11_CONFIGURE_ENABLE= sdl -GTK2_USE= GNOME=gtk20,vte +GTK2_USE= GNOME=gtk20,vte,gdkpixbuf2 XORG=x11,xext GTK2_USES= gettext GTK2_CONFIGURE_OFF= --disable-gtk --disable-vte GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls Modified: branches/2017Q4/emulators/qemu/files/patch-Makefile ============================================================================== --- branches/2017Q4/emulators/qemu/files/patch-Makefile Fri Oct 6 18:53:00 2017 (r451399) +++ branches/2017Q4/emulators/qemu/files/patch-Makefile Fri Oct 6 18:54:53 2017 (r451400) @@ -1,11 +1,12 @@ --- Makefile.orig 2017-04-20 14:57:00 UTC +++ Makefile -@@ -206,9 +206,13 @@ LIBS+=-lz $(LIBS_TOOLS) +@@ -206,9 +206,14 @@ LIBS+=-lz $(LIBS_TOOLS) HELPERS-$(CONFIG_LINUX) = qemu-bridge-helper$(EXESUF) ifdef BUILD_DOCS +ifdef NOPORTDOCS +DOCS=qemu.1 qemu-img.1 qemu-nbd.8 qemu-ga.8 ++DOCS+=docs/qemu-qmp-ref.7 docs/qemu-ga-ref.7 +else DOCS=qemu-doc.html qemu-doc.txt qemu.1 qemu-img.1 qemu-nbd.8 qemu-ga.8 DOCS+=docs/qemu-qmp-ref.html docs/qemu-qmp-ref.txt docs/qemu-qmp-ref.7 @@ -14,7 +15,7 @@ ifdef CONFIG_VIRTFS DOCS+=fsdev/virtfs-proxy-helper.1 endif -@@ -558,11 +562,13 @@ BLOBS= +@@ -558,11 +563,13 @@ BLOBS= endif install-doc: $(DOCS) @@ -28,3 +29,14 @@ ifdef CONFIG_POSIX $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1" $(INSTALL_DATA) qemu.1 "$(DESTDIR)$(mandir)/man1" +@@ -575,8 +582,10 @@ ifneq ($(TOOLS),) + endif + ifneq (,$(findstring qemu-ga,$(TOOLS))) + $(INSTALL_DATA) qemu-ga.8 "$(DESTDIR)$(mandir)/man8" ++ifndef NOPORTDOCS + $(INSTALL_DATA) docs/qemu-ga-ref.html "$(DESTDIR)$(qemu_docdir)" + $(INSTALL_DATA) docs/qemu-ga-ref.txt "$(DESTDIR)$(qemu_docdir)" ++endif + $(INSTALL_DATA) docs/qemu-ga-ref.7 "$(DESTDIR)$(mandir)/man7" + endif + endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201710061854.v96Isr6r011889>