diff options
author | roam <roam@FreeBSD.org> | 2006-12-13 12:41:35 +0000 |
---|---|---|
committer | roam <roam@FreeBSD.org> | 2006-12-13 12:41:35 +0000 |
commit | de4cf73f5446a2a8a2c782e21edd36968046a9e7 (patch) | |
tree | a8af6bc7bac65179902c59b7a1f9ab026c6203c4 /net | |
parent | f6df9e67cbe8aa509adda747e0c3bcbe05c8c99b (diff) | |
download | FreeBSD-ports-de4cf73f5446a2a8a2c782e21edd36968046a9e7.zip FreeBSD-ports-de4cf73f5446a2a8a2c782e21edd36968046a9e7.tar.gz |
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
Diffstat (limited to 'net')
-rw-r--r-- | net/asterisk-bristuff/Makefile | 4 | ||||
-rw-r--r-- | net/asterisk/Makefile | 4 | ||||
-rw-r--r-- | net/asterisk10/Makefile | 4 | ||||
-rw-r--r-- | net/asterisk12/Makefile | 4 | ||||
-rw-r--r-- | net/asterisk14/Makefile | 4 | ||||
-rw-r--r-- | net/asterisk16/Makefile | 4 | ||||
-rw-r--r-- | net/boinc-client/Makefile | 1 | ||||
-rw-r--r-- | net/nepenthes/Makefile | 4 | ||||
-rw-r--r-- | net/nepenthes/files/patch-modules-download-curl-download-curl.cpp | 12 | ||||
-rw-r--r-- | net/wmlj/Makefile | 4 |
10 files changed, 29 insertions, 16 deletions
diff --git a/net/asterisk-bristuff/Makefile b/net/asterisk-bristuff/Makefile index 2ff8a2c..5c62b4a 100644 --- a/net/asterisk-bristuff/Makefile +++ b/net/asterisk-bristuff/Makefile @@ -7,7 +7,7 @@ PORTNAME= asterisk PORTVERSION= 1.2.13 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net MASTER_SITES= http://ftp.digium.com/pub/asterisk/ \ http://ftp.digium.com/pub/asterisk/old-releases/ @@ -26,7 +26,7 @@ COMMENT= An Open Source PBX and telephony toolkit BUILD_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 LIB_DEPENDS= speex.3:${PORTSDIR}/audio/speex \ newt.51:${PORTSDIR}/devel/newt \ - curl.3:${PORTSDIR}/ftp/curl + curl.4:${PORTSDIR}/ftp/curl RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 ONLY_FOR_ARCHS= i386 sparc64 amd64 diff --git a/net/asterisk/Makefile b/net/asterisk/Makefile index 34b5093..2cda18d 100644 --- a/net/asterisk/Makefile +++ b/net/asterisk/Makefile @@ -7,7 +7,7 @@ PORTNAME= asterisk PORTVERSION= 1.2.13 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://ftp.digium.com/pub/asterisk/ \ http://ftp.digium.com/pub/asterisk/old-releases/ @@ -26,7 +26,7 @@ COMMENT= An Open Source PBX and telephony toolkit BUILD_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 LIB_DEPENDS= speex.3:${PORTSDIR}/audio/speex \ newt.51:${PORTSDIR}/devel/newt \ - curl.3:${PORTSDIR}/ftp/curl + curl.4:${PORTSDIR}/ftp/curl RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 ONLY_FOR_ARCHS= i386 sparc64 amd64 diff --git a/net/asterisk10/Makefile b/net/asterisk10/Makefile index 34b5093..2cda18d 100644 --- a/net/asterisk10/Makefile +++ b/net/asterisk10/Makefile @@ -7,7 +7,7 @@ PORTNAME= asterisk PORTVERSION= 1.2.13 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://ftp.digium.com/pub/asterisk/ \ http://ftp.digium.com/pub/asterisk/old-releases/ @@ -26,7 +26,7 @@ COMMENT= An Open Source PBX and telephony toolkit BUILD_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 LIB_DEPENDS= speex.3:${PORTSDIR}/audio/speex \ newt.51:${PORTSDIR}/devel/newt \ - curl.3:${PORTSDIR}/ftp/curl + curl.4:${PORTSDIR}/ftp/curl RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 ONLY_FOR_ARCHS= i386 sparc64 amd64 diff --git a/net/asterisk12/Makefile b/net/asterisk12/Makefile index 34b5093..2cda18d 100644 --- a/net/asterisk12/Makefile +++ b/net/asterisk12/Makefile @@ -7,7 +7,7 @@ PORTNAME= asterisk PORTVERSION= 1.2.13 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://ftp.digium.com/pub/asterisk/ \ http://ftp.digium.com/pub/asterisk/old-releases/ @@ -26,7 +26,7 @@ COMMENT= An Open Source PBX and telephony toolkit BUILD_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 LIB_DEPENDS= speex.3:${PORTSDIR}/audio/speex \ newt.51:${PORTSDIR}/devel/newt \ - curl.3:${PORTSDIR}/ftp/curl + curl.4:${PORTSDIR}/ftp/curl RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 ONLY_FOR_ARCHS= i386 sparc64 amd64 diff --git a/net/asterisk14/Makefile b/net/asterisk14/Makefile index 34b5093..2cda18d 100644 --- a/net/asterisk14/Makefile +++ b/net/asterisk14/Makefile @@ -7,7 +7,7 @@ PORTNAME= asterisk PORTVERSION= 1.2.13 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://ftp.digium.com/pub/asterisk/ \ http://ftp.digium.com/pub/asterisk/old-releases/ @@ -26,7 +26,7 @@ COMMENT= An Open Source PBX and telephony toolkit BUILD_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 LIB_DEPENDS= speex.3:${PORTSDIR}/audio/speex \ newt.51:${PORTSDIR}/devel/newt \ - curl.3:${PORTSDIR}/ftp/curl + curl.4:${PORTSDIR}/ftp/curl RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 ONLY_FOR_ARCHS= i386 sparc64 amd64 diff --git a/net/asterisk16/Makefile b/net/asterisk16/Makefile index 34b5093..2cda18d 100644 --- a/net/asterisk16/Makefile +++ b/net/asterisk16/Makefile @@ -7,7 +7,7 @@ PORTNAME= asterisk PORTVERSION= 1.2.13 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://ftp.digium.com/pub/asterisk/ \ http://ftp.digium.com/pub/asterisk/old-releases/ @@ -26,7 +26,7 @@ COMMENT= An Open Source PBX and telephony toolkit BUILD_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 LIB_DEPENDS= speex.3:${PORTSDIR}/audio/speex \ newt.51:${PORTSDIR}/devel/newt \ - curl.3:${PORTSDIR}/ftp/curl + curl.4:${PORTSDIR}/ftp/curl RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 ONLY_FOR_ARCHS= i386 sparc64 amd64 diff --git a/net/boinc-client/Makefile b/net/boinc-client/Makefile index 970b339..91c6d5d 100644 --- a/net/boinc-client/Makefile +++ b/net/boinc-client/Makefile @@ -7,6 +7,7 @@ PORTNAME= boinc-client PORTVERSION= 5.4.9 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= pav diff --git a/net/nepenthes/Makefile b/net/nepenthes/Makefile index decdc33..e27ff375 100644 --- a/net/nepenthes/Makefile +++ b/net/nepenthes/Makefile @@ -7,7 +7,7 @@ PORTNAME= nepenthes PORTVERSION= 0.1.7 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= nepenthes @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= nepenthes MAINTAINER= systemoperator@gmail.com COMMENT= Determine the malware activity on a network -LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl \ +LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl \ magic.1:${PORTSDIR}/sysutils/file \ pcre.0:${PORTSDIR}/devel/pcre \ adns.1:${PORTSDIR}/dns/adns diff --git a/net/nepenthes/files/patch-modules-download-curl-download-curl.cpp b/net/nepenthes/files/patch-modules-download-curl-download-curl.cpp new file mode 100644 index 0000000..5e0c0a4 --- /dev/null +++ b/net/nepenthes/files/patch-modules-download-curl-download-curl.cpp @@ -0,0 +1,12 @@ +--- modules/download-curl/download-curl.cpp.orig Tue Dec 5 15:53:24 2006 ++++ modules/download-curl/download-curl.cpp Tue Dec 5 15:54:09 2006 +@@ -230,7 +230,9 @@ + down->getDownloadUrl()->getPort(), + down->getDownloadUrl()->getPath().c_str()); + // string auth = down->getDownloadUrl()->getUser() + ":" + down->getDownloadUrl()->getPass(); ++#if LIBCURL_VERSION_NUM < 0x071000 + curl_easy_setopt(pCurlHandle, CURLOPT_SOURCE_USERPWD,(char *)down->getDownloadUrl()->getAuth().c_str()); ++#endif + curl_easy_setopt(pCurlHandle, CURLOPT_USERPWD,(char *)down->getDownloadUrl()->getAuth().c_str()); + curl_easy_setopt(pCurlHandle, CURLOPT_URL , url); + curl_easy_setopt(pCurlHandle, CURLOPT_FTP_RESPONSE_TIMEOUT, 120); // 2 min ftp timeout diff --git a/net/wmlj/Makefile b/net/wmlj/Makefile index 73a9349..8f0dd08 100644 --- a/net/wmlj/Makefile +++ b/net/wmlj/Makefile @@ -7,7 +7,7 @@ PORTNAME= wmlj PORTVERSION= 0.4.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= laszlof@FreeBSD.org COMMENT= A dockapp that monitors your friends list at LiveJournal.com -LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl +LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl GNU_CONFIGURE= yes USE_GNOME= gtk12 |