diff options
| -rw-r--r-- | emulators/qemu-devel/Makefile | 10 | ||||
| -rw-r--r-- | emulators/qemu-devel/files/patch-Makefile | 8 |
2 files changed, 7 insertions, 11 deletions
diff --git a/emulators/qemu-devel/Makefile b/emulators/qemu-devel/Makefile index 90234ee0d496..4ed3397df8e6 100644 --- a/emulators/qemu-devel/Makefile +++ b/emulators/qemu-devel/Makefile @@ -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: diff --git a/emulators/qemu-devel/files/patch-Makefile b/emulators/qemu-devel/files/patch-Makefile index eaa1dd056f8e..d328b46686cd 100644 --- a/emulators/qemu-devel/files/patch-Makefile +++ b/emulators/qemu-devel/files/patch-Makefile @@ -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)" |