svn commit: r315653 - head/emulators/qemu-devel

[Juergen Lock]

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 <c.kworr at gmail.com>
  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 at 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 <bsd.port.options.mk>
 
@@ -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