From owner-svn-ports-all@FreeBSD.ORG Mon Apr 1 14:57:55 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 7FC108B5; Mon, 1 Apr 2013 14:57:55 +0000 (UTC) (envelope-from nox@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 59ECCAB5; Mon, 1 Apr 2013 14:57:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r31EvtkA003054; Mon, 1 Apr 2013 14:57:55 GMT (envelope-from nox@svn.freebsd.org) Received: (from nox@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r31Evtwk003053; Mon, 1 Apr 2013 14:57:55 GMT (envelope-from nox@svn.freebsd.org) Message-Id: <201304011457.r31Evtwk003053@svn.freebsd.org> From: Juergen Lock Date: Mon, 1 Apr 2013 14:57:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r315653 - head/emulators/qemu-devel X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Apr 2013 14:57:55 -0000 Author: nox Date: Mon Apr 1 14:57:54 2013 New Revision: 315653 URL: http://svnweb.freebsd.org/changeset/ports/315653 Log: Remove CURL knob as --disable-curl is now broken upstream. PR: ports/177488 Reported by: Volodymyr Kostyrko Approved by: portmgr (erwin) Modified: head/emulators/qemu-devel/Makefile Modified: head/emulators/qemu-devel/Makefile ============================================================================== --- head/emulators/qemu-devel/Makefile Mon Apr 1 14:46:13 2013 (r315652) +++ head/emulators/qemu-devel/Makefile Mon Apr 1 14:57:54 2013 (r315653) @@ -13,7 +13,8 @@ DIST_SUBDIR= qemu/${PORTVERSION} MAINTAINER= nox@FreeBSD.org COMMENT= QEMU CPU Emulator - development version -LIB_DEPENDS= pixman-1:${PORTSDIR}/x11/pixman +LIB_DEPENDS= pixman-1:${PORTSDIR}/x11/pixman \ + curl:${PORTSDIR}/ftp/curl HAS_CONFIGURE= yes USE_BZIP2= yes @@ -29,7 +30,7 @@ ONLY_FOR_ARCHS= amd64 i386 powerpc # XXX CONFLICTS_INSTALL= qemu-[0-9]* MAKE_JOBS_SAFE= yes -OPTIONS_DEFINE= SAMBA SDL OPENGL GNUTLS SASL JPEG PNG CURL CDROM_DMA PCAP \ +OPTIONS_DEFINE= SAMBA SDL OPENGL GNUTLS SASL JPEG PNG CDROM_DMA PCAP \ USBREDIR GNS3 ADD_AUDIO CLANG_HACK X86_TARGETS BSD_USER \ STATIC_LINK SAMBA_DESC= samba dependency (for -smb) @@ -37,7 +38,6 @@ GNUTLS_DESC= gnutls dependency (vnc enc SASL_DESC= cyrus-sasl dependency (vnc encryption) JPEG_DESC= jpeg dependency (vnc lossy compression) PNG_DESC= png dependency (vnc compression) -CURL_DESC= libcurl dependency (remote images) CDROM_DMA_DESC= IDE CDROM DMA PCAP_DESC= pcap dependency (networking with bpf) SEABIOS_GIT_DESC= add seabios snapshot (-bios bios.bin-1.6.3.1) @@ -48,7 +48,7 @@ CLANG_HACK_DESC= clang workaround (resu X86_TARGETS_DESC= Don't build non-x86 system targets BSD_USER_DESC= Also build bsd-user targets (for testing) STATIC_LINK_DESC= Statically link the executables -OPTIONS_DEFAULT=SDL OPENGL GNUTLS SASL JPEG PNG CURL CDROM_DMA PCAP +OPTIONS_DEFAULT=SDL OPENGL GNUTLS SASL JPEG PNG CDROM_DMA PCAP .include @@ -150,12 +150,6 @@ CONFIGURE_ARGS+= --disable-vnc-png LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png .endif -.if empty(PORT_OPTIONS:MCURL) -CONFIGURE_ARGS+= --disable-curl -.else -LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl -.endif - .if empty(PORT_OPTIONS:MOPENGL) CONFIGURE_ARGS+= --disable-opengl .else