From owner-svn-ports-head@freebsd.org Sun Apr 14 17:55:37 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BE843157C895; Sun, 14 Apr 2019 17:55:37 +0000 (UTC) (envelope-from bofh@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 95F937395A; Sun, 14 Apr 2019 17:54:48 +0000 (UTC) (envelope-from bofh@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 720A623FDA; Sun, 14 Apr 2019 17:54:45 +0000 (UTC) (envelope-from bofh@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3EHsjBT023864; Sun, 14 Apr 2019 17:54:45 GMT (envelope-from bofh@FreeBSD.org) Received: (from bofh@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3EHsjIu023863; Sun, 14 Apr 2019 17:54:45 GMT (envelope-from bofh@FreeBSD.org) Message-Id: <201904141754.x3EHsjIu023863@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bofh set sender to bofh@FreeBSD.org using -f From: Muhammad Moinur Rahman Date: Sun, 14 Apr 2019 17:54:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r498941 - head/emulators/qemu-devel X-SVN-Group: ports-head X-SVN-Commit-Author: bofh X-SVN-Commit-Paths: head/emulators/qemu-devel X-SVN-Commit-Revision: 498941 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 95F937395A X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.957,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Apr 2019 17:55:38 -0000 Author: bofh Date: Sun Apr 14 17:54:45 2019 New Revision: 498941 URL: https://svnweb.freebsd.org/changeset/ports/498941 Log: emulators/qemu-devel: Remove OPTIONS GNS3 - Since 2.5.0 GNS3 patch iis no longer required - Fix noX and noOpenGL builds [1] PR: 237283 [1] Submitted by: sbruno [1] Modified: head/emulators/qemu-devel/Makefile Modified: head/emulators/qemu-devel/Makefile ============================================================================== --- head/emulators/qemu-devel/Makefile Sun Apr 14 17:53:40 2019 (r498940) +++ head/emulators/qemu-devel/Makefile Sun Apr 14 17:54:45 2019 (r498941) @@ -21,7 +21,7 @@ LIB_DEPENDS= libnettle.so:security/nettle \ libepoxy.so:graphics/libepoxy \ libpcre2-8.so:devel/pcre2 -USES= cpe gl gmake gnome pkgconfig bison perl5 python:2.7,build tar:xz +USES= cpe gmake gnome pkgconfig bison perl5 python:2.7,build tar:xz USE_GNOME= cairo glib20 libxml2 USE_PERL5= build USE_XORG= pixman @@ -35,7 +35,7 @@ HAS_CONFIGURE= yes MAKE_ENV+= BSD_MAKE="${MAKE}" V=1 OPTIONS_DEFINE= SAMBA X11 GTK3 OPENGL GNUTLS SASL JPEG PNG CURL \ - VDE CDROM_DMA PCAP USBREDIR GNS3 X86_TARGETS \ + VDE CDROM_DMA PCAP USBREDIR X86_TARGETS \ STATIC_LINK DOCS NCURSES SAMBA_DESC= samba dependency (for -smb) GNUTLS_DESC= gnutls dependency (vnc encryption) @@ -45,11 +45,10 @@ PNG_DESC= png dependency (vnc compression) CDROM_DMA_DESC= IDE CDROM DMA PCAP_DESC= pcap dependency (networking with bpf) USBREDIR_DESC= usb device network redirection (experimental!) -GNS3_DESC= gns3 patches (promiscuous multicast) X86_TARGETS_DESC= Build only x86 system targets STATIC_LINK_DESC= Statically link the executables VDE_DESC= vde dependency (for vde networking) -OPTIONS_DEFAULT=X11 GTK3 OPENGL GNUTLS SASL JPEG PNG CDROM_DMA CURL PCAP GNS3 NCURSES VDE +OPTIONS_DEFAULT=X11 GTK3 OPENGL GNUTLS SASL JPEG PNG CDROM_DMA CURL PCAP NCURSES VDE OPTIONS_SUB= yes X11_USE= SDL=sdl XORG=x11,xext GNOME=gdkpixbuf2 X11_USES= sdl @@ -148,10 +147,6 @@ post-patch: post-patch-CDROM_DMA-off: @${REINPLACE_CMD} -e '/USE_DMA_CDROM/d' ${WRKSRC}/include/hw/ide/internal.h - -post-patch-GNS3-on: - @${REINPLACE_CMD} -e 's|(buf\[0\] & 1) && (rctl & E1000_RCTL_MPE)|buf[0] \& 1|' \ - ${WRKSRC}/hw/net/e1000.c # XXX need to disable usb host code on head while it's not ported to the # new usb stack yet