summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsbruno <sbruno@FreeBSD.org>2017-01-23 18:11:31 +0000
committersbruno <sbruno@FreeBSD.org>2017-01-23 18:11:31 +0000
commit110ec57fe529a4276d7f376a3e4aa8c75ccc34c6 (patch)
treebb63af7ddc236cd208af89ce908f3364c7c12d9a
parent8cb6880140a36f48101686a4f411fe57ef19732b (diff)
downloadFreeBSD-ports-110ec57fe529a4276d7f376a3e4aa8c75ccc34c6.zip
FreeBSD-ports-110ec57fe529a4276d7f376a3e4aa8c75ccc34c6.tar.gz
Fixup build of port for new and shiny man pages that appeared.
-rw-r--r--emulators/qemu-sbruno/Makefile4
-rw-r--r--emulators/qemu-sbruno/distinfo8
-rw-r--r--emulators/qemu-sbruno/files/patch-Makefile27
-rw-r--r--emulators/qemu-sbruno/pkg-plist8
4 files changed, 38 insertions, 9 deletions
diff --git a/emulators/qemu-sbruno/Makefile b/emulators/qemu-sbruno/Makefile
index 6723a6b..0fd0500 100644
--- a/emulators/qemu-sbruno/Makefile
+++ b/emulators/qemu-sbruno/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= qemu
-PORTVERSION= 2.8.50.g20170121
+PORTVERSION= 2.8.50.g20170123
CATEGORIES= emulators
MASTER_SITES= GH \
LOCAL/nox:dtc \
@@ -72,7 +72,7 @@ USE_GNOME+= glib20
CONFIGURE_ARGS+= --localstatedir=/var
CONFIGURE_ARGS+= --extra-ldflags=-L\"${LOCALBASE}/lib\"
CONFIGURE_ARGS+= --disable-libssh2
-PORTDOCS= docs qemu-doc.html qmp-commands.txt
+PORTDOCS= docs qemu-doc.html
.if defined(QEMU_USER_STATIC)
.if ${ARCH} != "amd64"
diff --git a/emulators/qemu-sbruno/distinfo b/emulators/qemu-sbruno/distinfo
index 2d6ccfc..1feb6dc 100644
--- a/emulators/qemu-sbruno/distinfo
+++ b/emulators/qemu-sbruno/distinfo
@@ -1,5 +1,5 @@
TIMESTAMP = 1482956267
-SHA256 (qemu/2.8.50.g20170121/seanbruno-qemu-bsd-user-2.8.50.g20170121-506a08c_GH0.tar.gz) = d7552b8e55ff5a0c7de504824318ab7ec1090c402537d2187c406137eae5ffef
-SIZE (qemu/2.8.50.g20160121/seanbruno-qemu-bsd-user-2.8.50.g20170121-506a08c_GH0.tar.gz) = 13671923
-SHA256 (qemu/2.8.50.g20170121/dtc-v1.4.0.tar.gz) = 39d0713efd82a27adc065ecb9ef36401c53d5ee87ae1764e2bb243fcd97488e3
-SIZE (qemu/2.8.50.g20170121/dtc-v1.4.0.tar.gz) = 131893
+SHA256 (qemu/2.8.50.g20170123/seanbruno-qemu-bsd-user-2.8.50.g20170123-506a08c_GH0.tar.gz) = d7552b8e55ff5a0c7de504824318ab7ec1090c402537d2187c406137eae5ffef
+SIZE (qemu/2.8.50.g20160121/seanbruno-qemu-bsd-user-2.8.50.g20170123-506a08c_GH0.tar.gz) = 13671923
+SHA256 (qemu/2.8.50.g20170123/dtc-v1.4.0.tar.gz) = 39d0713efd82a27adc065ecb9ef36401c53d5ee87ae1764e2bb243fcd97488e3
+SIZE (qemu/2.8.50.g20170123/dtc-v1.4.0.tar.gz) = 131893
diff --git a/emulators/qemu-sbruno/files/patch-Makefile b/emulators/qemu-sbruno/files/patch-Makefile
index 83389c1..e24edee 100644
--- a/emulators/qemu-sbruno/files/patch-Makefile
+++ b/emulators/qemu-sbruno/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig 2017-01-21 14:04:07.000000000 -0700
-+++ Makefile 2017-01-21 14:18:18.199722000 -0700
+--- Makefile.orig 2017-01-21 21:04:07.000000000 +0000
++++ Makefile 2017-01-23 17:32:06.512839000 +0000
@@ -90,9 +90,13 @@
HELPERS-$(CONFIG_LINUX) = qemu-bridge-helper$(EXESUF)
@@ -14,7 +14,7 @@
ifdef CONFIG_VIRTFS
DOCS+=fsdev/virtfs-proxy-helper.1
endif
-@@ -436,10 +440,12 @@
+@@ -436,15 +440,19 @@
install-doc: $(DOCS)
$(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)"
@@ -27,3 +27,24 @@
ifdef CONFIG_POSIX
$(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1"
$(INSTALL_DATA) qemu.1 "$(DESTDIR)$(mandir)/man1"
+ $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man7"
++ifndef NOPORTDOCS
+ $(INSTALL_DATA) docs/qemu-qmp-ref.7 "$(DESTDIR)$(mandir)/man7"
++endif
+ ifneq ($(TOOLS),)
+ $(INSTALL_DATA) qemu-img.1 "$(DESTDIR)$(mandir)/man1"
+ $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man8"
+@@ -452,11 +460,13 @@
+ 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)"
+ $(INSTALL_DATA) docs/qemu-ga-ref.7 "$(DESTDIR)$(mandir)/man7"
+ endif
+ endif
++endif
+ ifdef CONFIG_VIRTFS
+ $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1"
+ $(INSTALL_DATA) fsdev/virtfs-proxy-helper.1 "$(DESTDIR)$(mandir)/man1"
diff --git a/emulators/qemu-sbruno/pkg-plist b/emulators/qemu-sbruno/pkg-plist
index fa7d214..1ac51e3 100644
--- a/emulators/qemu-sbruno/pkg-plist
+++ b/emulators/qemu-sbruno/pkg-plist
@@ -48,6 +48,8 @@
%%SOFTMMU%%@sample etc/qemu-ifdown.sample
%%SOFTMMU%%man/man1/qemu.1.gz
%%SOFTMMU%%man/man1/qemu-img.1.gz
+%%SOFTMMU%%man/man7/qemu-ga-ref.7.gz
+%%SOFTMMU%%man/man7/qemu-qmp-ref.7.gz
%%SOFTMMU%%man/man8/qemu-ga.8.gz
%%SOFTMMU%%man/man8/qemu-nbd.8.gz
%%SOFTMMU%%%%DATADIR%%/QEMU,cgthree.bin
@@ -132,6 +134,7 @@
%%SOFTMMU%%%%DATADIR%%/vgabios-virtio.bin
%%SOFTMMU%%%%DATADIR%%/vgabios-vmware.bin
%%SOFTMMU%%%%DATADIR%%/vgabios.bin
+%%SOFTMMU%%%%DATADIR%%/skiboot.lid
%%GTK2%%share/locale/bg/LC_MESSAGES/qemu.mo
%%GTK2%%share/locale/de_DE/LC_MESSAGES/qemu.mo
%%GTK2%%share/locale/fr_FR/LC_MESSAGES/qemu.mo
@@ -139,3 +142,8 @@
%%GTK2%%share/locale/it/LC_MESSAGES/qemu.mo
%%GTK2%%share/locale/tr/LC_MESSAGES/qemu.mo
%%GTK2%%share/locale/zh_CN/LC_MESSAGES/qemu.mo
+%%PORTDOCS%%%%DOCSDIR%%/qemu-doc.txt
+%%PORTDOCS%%%%DOCSDIR%%/qemu-ga-ref.html
+%%PORTDOCS%%%%DOCSDIR%%/qemu-ga-ref.txt
+%%PORTDOCS%%%%DOCSDIR%%/qemu-qmp-ref.html
+%%PORTDOCS%%%%DOCSDIR%%/qemu-qmp-ref.txt
OpenPOWER on IntegriCloud