- Fix libcurl probe for emulators/qemu and add proper dependencies and knobs.

- Bump PORTREVISIONs.

PR:		ports/145591
Submitted by:	gcooper

4 files changed, 44 insertions, 1 deletions

diff --git a/emulators/qemu-devel/Makefile b/emulators/qemu-devel/Makefile
index 68aa7e8ec82..4b525220f59 100644
--- a/emulators/qemu-devel/Makefile
+++ b/emulators/qemu-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	qemu
 PORTVERSION=	0.12.3
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}:release \
 		${MASTER_SITE_LOCAL}:snapshot \
@@ -33,6 +34,7 @@ OPTIONS=	RTL8139_TIMER "allow use of re(4) nic with FreeBSD guests" Off \
 		SAMBA "samba dependency (for -smb)" Off \
 		SDL "SDL/X dependency (graphical output)" On \
 		GNUTLS "gnutls dependency (vnc encryption)" On \
+		CURL "libcurl dependency (remote images)" On \
 		PCAP "pcap dependency (networking with bpf)" On \
 		CDROM_DMA "IDE CDROM DMA" On \
 		ADD_AUDIO "Emulate more audio hardware (experimental!)" Off \
@@ -63,6 +65,12 @@ CONFIGURE_ARGS+=	--disable-vnc-tls
 LIB_DEPENDS+=	gnutls:${PORTSDIR}/security/gnutls
 .endif
 
+.if defined(WITHOUT_CURL)
+CONFIGURE_ARGS+=	--disable-curl
+.else
+LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
+.endif
+
 .if defined(WITH_PCAP)
 CONFIGURE_ARGS+=	--enable-pcap
 .endif
diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
index 9278dd1c89f..909cb23b6ad 100644
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qemu
 PORTVERSION=	0.11.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SAVANNAH} \
 		http://bellard.org/qemu/
@@ -32,6 +32,7 @@ OPTIONS=	KQEMU "Build with (alpha!) accelerator module" Off \
 		SAMBA "samba dependency (for -smb)" Off \
 		SDL "SDL/X dependency (graphical output)" On \
 		GNUTLS "gnutls dependency (vnc encryption)" On \
+		CURL "libcurl dependency (remote images)" On \
 		PCAP "pcap dependency (networking with bpf)" On \
 		CDROM_DMA "IDE CDROM DMA" On \
 		ADD_AUDIO "Emulate more audio hardware (experimental!)" Off \
@@ -62,6 +63,12 @@ CONFIGURE_ARGS+=	--disable-vnc-tls
 LIB_DEPENDS+=	gnutls:${PORTSDIR}/security/gnutls
 .endif
 
+.if defined(WITHOUT_CURL)
+CONFIGURE_ARGS+=	--disable-curl
+.else
+LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
+.endif
+
 .if defined(WITH_PCAP)
 CONFIGURE_ARGS+=	--enable-pcap
 .endif
diff --git a/emulators/qemu/files/patch-Makefile b/emulators/qemu/files/patch-Makefile
index 93eddc84660..ef7e69d4f3e 100644
--- a/emulators/qemu/files/patch-Makefile
+++ b/emulators/qemu/files/patch-Makefile
@@ -11,6 +11,15 @@ Index: qemu/Makefile
  else
  DOCS=
  endif
+@@ -190,6 +190,8 @@
+ obj-$(CONFIG_XEN) += xen_backend.o xen_devconfig.o
+ obj-$(CONFIG_XEN) += xen_console.o xenfb.o xen_disk.o xen_nic.o
+ 
++QEMU_CFLAGS+=$(CURL_CFLAGS)
++
+ LIBS+=$(CURL_LIBS)
+ 
+ cocoa.o: cocoa.m
 @@ -260,13 +264,13 @@
  endif
  
diff --git a/emulators/qemu/files/patch-configure b/emulators/qemu/files/patch-configure
index 39faa2e311b..23f4f37da2f 100644
--- a/emulators/qemu/files/patch-configure
+++ b/emulators/qemu/files/patch-configure
@@ -1,4 +1,15 @@
 Index: qemu/configure
+@@ -1154,8 +1154,9 @@
+ #include <curl/curl.h>
+ int main(void) { return curl_easy_init(); }
+ EOF
++  curl_cflags=`curl-config --cflags 2>/dev/null`
+   curl_libs=`curl-config --libs 2>/dev/null`
+- if $cc $ARCH_CFLAGS $curl_libs -o $TMPE $TMPC > /dev/null 2> /dev/null ; then
++ if $cc $ARCH_CFLAGS $curl_cflags $curl_libs -o $TMPE $TMPC > /dev/null 2> /dev/null ; then
+     curl=yes
+   fi
+ fi # test "$curl"
 @@ -1395,9 +1395,9 @@
  fi
  
@@ -12,3 +23,11 @@ Index: qemu/configure
  
  ##########################################
  # Do we need librt
+@@ -1760,6 +1761,7 @@
+   echo "CONFIG_CURL=y" >> $config_host_mak
+   echo "CURL_LIBS=$curl_libs" >> $config_host_mak
+   echo "#define CONFIG_CURL 1" >> $config_host_h
++  echo "CURL_CFLAGS=$curl_cflags" >> $config_host_mak
+ fi
+ if test "$brlapi" = "yes" ; then
+   echo "CONFIG_BRLAPI=y" >> $config_host_mak