mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-02 06:03:50 +00:00
Code Issues Releases Activity

emulators/qemu-devel: fix with DOCS=off [1]

Browse Source 
- Fix for GNUTLS_CONFIGURE_ON [2]
- Fix for PCAP_CONFIGURE_OFF [2]
- Bump PORT Revision

PR:		207719 [1], 205826 [2]
Submitted by:	novel [1], riggs [2]
This commit is contained in:
Muhammad Moinur Rahman 2016-03-09 00:11:05 +00:00
parent e712daf6a2
commit ff9522b10e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=410671
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
emulators/qemu-devel/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= qemu
DISTVERSION= 2.5.0
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= emulators
MASTER_SITES= http://wiki.qemu.org/download/
PKGNAMESUFFIX= -devel
@ -44,7 +44,7 @@ GTK2_USE= GNOME=gtk20,vte
GTK2_USES= gettext
GTK2_CONFIGURE_OFF= --disable-gtk --disable-vte
GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls
GNUTLS_CONFIGURE_OFF= --disable-vnc-tls
GNUTLS_CONFIGURE_OFF= --disable-gnutls
SASL_LIB_DEPENDS= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
SASL_CONFIGURE_OFF= --disable-vnc-sasl
JPEG_USES= jpeg
@ -59,8 +59,7 @@ USBREDIR_BUILD_DEPENDS= usbredir>=0.6:${PORTSDIR}/net/usbredir
USBREDIR_RUN_DEPENDS= usbredir>=0.6:${PORTSDIR}/net/usbredir
USBREDIR_CONFIGURE_OFF= --disable-usb-redir
PCAP_CONFIGURE_ON= --enable-pcap
PCAP_CONFIGURE_OFF= --disable-pcap
PCAP_EXTRA_PATCHES= ${FILESDIR}/pcap-patch
STATIC_LINK_CONFIGURE_ON= --static
STATIC_LINK_PREVENTS= GTK2 X11
STATIC_LINK_PREVENTS_MSG= X11 ui cannot be built static
@ -130,9 +129,6 @@ post-patch-GNS3-on:
@${REINPLACE_CMD} -e 's|(buf\[0\] & 1) && (rctl & E1000_RCTL_MPE)|buf[0] \& 1|' \
${WRKSRC}/hw/net/e1000.c
post-patch-PCAP-on:
@cd ${WRKSRC} && ${PATCH} --quiet < ${FILESDIR}/pcap-patch
# XXX need to disable usb host code on head while it's not ported to the
# new usb stack yet
post-configure:

8
emulators/qemu-devel/files/patch-Makefile
View File

@ -1,18 +1,18 @@
--- Makefile.orig 2015-12-16 20:32:52 UTC
--- Makefile.orig 2015-12-17 20:32:52 UTC
+++ Makefile
@@ -90,7 +90,11 @@ LIBS+=-lz $(LIBS_TOOLS)
@@ -90,7 +90,11 @@
HELPERS-$(CONFIG_LINUX) = qemu-bridge-helper$(EXESUF)
ifdef BUILD_DOCS
+ifdef NOPORTDOCS
+DOCS=qemu.1 qemu-img.1 qemu-nbd.8
+DOCS=qemu.1 qemu-img.1 qemu-nbd.8 qemu-ga.8
+else
DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1 qemu-nbd.8 qemu-ga.8
+endif
DOCS+=qmp-commands.txt
ifdef CONFIG_LINUX
DOCS+=kvm_stat.1
@@ -407,8 +411,10 @@ endif
@@ -407,8 +411,10 @@
install-doc: $(DOCS)
$(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)"