Update the ftp/curl port to 7.16.0.

Bump PORTREVISION of all dependent ports.
Fix the build errors in the few ports that still use the long deprecated,
and now obsoleted, cURL options.

Thanks to everyone who took the time to look over the patch!

Discussed on:	-ports

3 files changed, 52 insertions, 2 deletions

diff --git a/irc/unreal/Makefile b/irc/unreal/Makefile
index 93d7fa932e00..6318c7c13294 100644
--- a/irc/unreal/Makefile
+++ b/irc/unreal/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Unreal
 PORTVERSION=	3.2.5
+PORTREVISION=	1
 CATEGORIES=	irc
 MASTER_SITES=	http://www.ilmarinen.us/unreal/ \
 		http://unrealircd.alert-net.com/ \
@@ -84,9 +85,10 @@ CONFIGURE_ARGS+=	--enable-ssl
 .endif
 
 .if defined(WITH_REMOTE)
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libares.a:${PORTSDIR}/dns/ares
-LIB_DEPENDS+=	curl.3:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=	cares.1:${PORTSDIR}/dns/c-ares curl.4:${PORTSDIR}/ftp/curl
 CONFIGURE_ARGS+=	--enable-libcurl=${LOCALBASE}
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 .endif
 
 .if defined(WITH_PREFIXAQ)
diff --git a/irc/unreal/files/patch-Makefile.in b/irc/unreal/files/patch-Makefile.in
new file mode 100644
index 000000000000..4549ece2e1c1
--- /dev/null
+++ b/irc/unreal/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Tue Dec  5 15:59:38 2006
++++ Makefile.in	Tue Dec  5 15:59:53 2006
+@@ -38,7 +38,7 @@
+ CRYPTOLIB=@CRYPTOLIB@
+ OPENSSLINCLUDES=
+ 
+-XCFLAGS=-I@TREINCDIR@ -I@CARESINCDIR@ @CARESLIBDIR@ @CFLAGS@
++XCFLAGS=-I@TREINCDIR@ @CFLAGS@
+ #
+ # use the following on MIPS:
+ #CFLAGS= -systype bsd43 -DSYSTYPE_BSD43 -I$(INCLUDEDIR)
diff --git a/irc/unreal/files/patch-configure b/irc/unreal/files/patch-configure
new file mode 100644
index 000000000000..4465ac722f8f
--- /dev/null
+++ b/irc/unreal/files/patch-configure
@@ -0,0 +1,37 @@
+--- configure.orig	Tue Dec  5 15:55:45 2006
++++ configure	Tue Dec  5 15:59:10 2006
+@@ -12701,34 +12701,6 @@
+ cd $cur_dir
+ 
+ 
+-cares_version="1.3.0"
+-echo "$as_me:$LINENO: result: extracting c-ares resolver library" >&5
+-echo "${ECHO_T}extracting c-ares resolver library" >&6
+-cur_dir=`pwd`
+-cd extras
+-rm -rf c-ares-$cares_version
+-if test "x$ac_cv_path_GUNZIP" = "x" ; then
+-	tar xfz c-ares.tar.gz
+-else
+-	cp c-ares.tar.gz c-ares.tar.gz.bak
+-	gunzip -f c-ares.tar.gz
+-	cp c-ares.tar.gz.bak c-ares.tar.gz
+-	tar xf c-ares.tar
+-fi
+-echo "$as_me:$LINENO: result: configuring c-ares library" >&5
+-echo "${ECHO_T}configuring c-ares library" >&6
+-cd c-ares-$cares_version
+-./configure --prefix=$cur_dir/extras/c-ares || exit 1
+-echo "$as_me:$LINENO: result: compiling c-ares resolver library" >&5
+-echo "${ECHO_T}compiling c-ares resolver library" >&6
+-$ac_cv_prog_MAKER || exit 1
+-echo "$as_me:$LINENO: result: installing c-ares resolver library" >&5
+-echo "${ECHO_T}installing c-ares resolver library" >&6
+-$ac_cv_prog_MAKER install || exit 1
+-CARESINCDIR="$cur_dir/extras/c-ares/include"
+-
+-CARESLIBDIR="-L../extras/c-ares/lib"
+-
+ CARESLIBS="-lcares"
+ 
+ cd $cur_dir