Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 8 Dec 2006 19:57:59 +0200
From:      Peter Pentchev <roam@ringlet.net>
To:        ports@FreeBSD.org
Subject:   Re: [CFR] ftp/curl update and API incompatibility
Message-ID:  <20061208175759.GA53807@straylight.m.ringlet.net>
In-Reply-To: <20061206125657.GB1814@straylight.m.ringlet.net>
References:  <20061206125657.GB1814@straylight.m.ringlet.net>

next in thread | previous in thread | raw e-mail | index | archive | help

--W5WqUoFLvi1M7tJE
Content-Type: multipart/mixed; boundary="XWOWbaMNXpFDWE00"
Content-Disposition: inline


--XWOWbaMNXpFDWE00
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Wed, Dec 06, 2006 at 02:56:57PM +0200, Peter Pentchev wrote:
> Hi,
>=20
> I'm writing to you all because you are listed as maintainers of ports
> that depend directly on ftp/curl.  Attached is a patch that updates
> ftp/curl to version 7.16.0; however, this update might need some testing.

After some comments from some of the maintainers, here's an updated
version of the patch, which also takes care of the ports that do not
specify a shared library version in the curl dependency (i.e. they depend
on "curl", not "curl.3").  This patch also:
- bumps the PORTREVISION of the ftp/php4-curl, ftp/php5-curl, and
  www/pecl-pecl_http ports;
- no longer adds an explicit curl library version dependency to gnupg;
- drops net-p2p/amule2, since it does not use curl at all.

The patch itself is also available at
http://people.FreeBSD.org/~roam/patches/curl/
If there are no objections, I will commit it in a couple of days.

So - this patch updates cURL to 7.16.0, and tries to fix all dependent
ports.  The updates to the ports are trivial, with the following exceptions:

arhivers/epkg
- Fix dependencies: move curl to LIB_DEPENDS, since epkg picks up
  the shared library to link with.

astro/gaia
- Update blindly, it's forbidden for license reasons.

audio/icecast2
audio/vorbis-tools
ftp/php4-curl
ftp/php5-curl
ftp/py-curl
ftp/rexx-curl
lang/q
net/nepenthes
security/authforce
- #ifdef the obsolete options based on the libcurl version.

audio/xmms2
- Fix the packing list for the !lastfm case and the !mdns cases.
- Do not allow both MDNS_APPLE and MDNS_AVAHI to be selected.

irc/unreal
- Remove the dependency on dns/ares - it is not used at all, Unreal uses
  its own bundled copy of c-ares!
- Add a dependency on dns/c-ares, now that version 1.3.2 of the port comes
  with the ares_config_info patch.
- Patch the configure script not to build the bundled c-ares, and
  the Makefile not to try to link against it.

www/osb-nrcit
- Update blindly, it does not build because lang/osb-jscore is broken.

x11/ecore
- Fix the packing list for the !x11 case.

G'luck,
Peter

--=20
Peter Pentchev	roam@ringlet.net    roam@cnsys.bg    roam@FreeBSD.org
PGP key:	http://people.FreeBSD.org/~roam/roam.key.asc
Key fingerprint	FDBA FD79 C26F 3C51 C95E  DF9E ED18 B68D 1619 4553
Thit sentence is not self-referential because "thit" is not a word.

--XWOWbaMNXpFDWE00
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="curl-16-02.patch"
Content-Transfer-Encoding: quoted-printable

Index: ftp/curl/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/ftp/curl/Makefile,v
retrieving revision 1.82
diff -u -r1.82 Makefile
--- ftp/curl/Makefile	7 Nov 2006 17:07:41 -0000	1.82
+++ ftp/curl/Makefile	6 Dec 2006 12:29:18 -0000
@@ -6,8 +6,7 @@
 #
=20
 PORTNAME=3D	curl
-PORTVERSION=3D	7.15.5
-PORTREVISION=3D	1
+PORTVERSION=3D	7.16.0
 CATEGORIES=3D	ftp ipv6 www
 MASTER_SITES=3D	http://curl.haxx.se/download/ \
 		${MASTER_SITE_SOURCEFORGE} \
@@ -40,7 +39,7 @@
 		libcurl-multi.3 libcurl-share.3 libcurl-tutorial.3
=20
 USE_LDCONFIG=3D	yes
-SHLIB_VER=3D	3
+SHLIB_VER=3D	4
=20
 MAKE_ENV=3D	SHLIB_VER=3D"${SHLIB_VER}"
 PLIST_SUB=3D	SHLIB_VER=3D"${SHLIB_VER}"
Index: ftp/curl/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/ftp/curl/distinfo,v
retrieving revision 1.46
diff -u -r1.46 distinfo
--- ftp/curl/distinfo	18 Sep 2006 12:46:29 -0000	1.46
+++ ftp/curl/distinfo	6 Dec 2006 12:29:18 -0000
@@ -1,3 +1,3 @@
-MD5 (curl-7.15.5.tar.bz2) =3D 594142c7d53bbdd988e8cef6354eeeff
-SHA256 (curl-7.15.5.tar.bz2) =3D 2980815e53f4caeafc5e35d183d9379bcaaec49f7=
59be1a4ac628cfb6c392fe0
-SIZE (curl-7.15.5.tar.bz2) =3D 1543007
+MD5 (curl-7.16.0.tar.bz2) =3D 5819f56e93d04cde2992fe88b54cbfad
+SHA256 (curl-7.16.0.tar.bz2) =3D fc8dcda5a933c370c15c832bf1e7316a0690f473f=
dd6000454d233edaa33bc23
+SIZE (curl-7.16.0.tar.bz2) =3D 1566391
Index: ftp/curl/pkg-plist
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/ftp/curl/pkg-plist,v
retrieving revision 1.21
diff -u -r1.21 pkg-plist
--- ftp/curl/pkg-plist	18 Sep 2006 12:46:29 -0000	1.21
+++ ftp/curl/pkg-plist	6 Dec 2006 12:29:18 -0000
@@ -45,6 +45,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/curl.1
 %%PORTDOCS%%%%DOCSDIR%%/curl.html
 %%PORTDOCS%%%%DOCSDIR%%/curl.pdf
+%%PORTDOCS%%%%DOCSDIR%%/examples/10-at-a-time.c
 %%PORTDOCS%%%%DOCSDIR%%/examples/Makefile
 %%PORTDOCS%%%%DOCSDIR%%/examples/Makefile.am
 %%PORTDOCS%%%%DOCSDIR%%/examples/Makefile.example
@@ -65,6 +66,8 @@
 %%PORTDOCS%%%%DOCSDIR%%/examples/ftpuploadresume.c
 %%PORTDOCS%%%%DOCSDIR%%/examples/getinfo.c
 %%PORTDOCS%%%%DOCSDIR%%/examples/getinmemory.c
+%%PORTDOCS%%%%DOCSDIR%%/examples/ghiper.c
+%%PORTDOCS%%%%DOCSDIR%%/examples/hiperfifo.c
 %%PORTDOCS%%%%DOCSDIR%%/examples/htmltidy.c
 %%PORTDOCS%%%%DOCSDIR%%/examples/htmltitle.cc
 %%PORTDOCS%%%%DOCSDIR%%/examples/http-post.c
Index: ftp/curl/files/patch-lib::url.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/ftp/curl/files/patch-lib::url.c,v
retrieving revision 1.2
diff -u -r1.2 patch-lib::url.c
--- ftp/curl/files/patch-lib::url.c	3 Jun 2004 22:41:40 -0000	1.2
+++ ftp/curl/files/patch-lib::url.c	6 Dec 2006 12:29:18 -0000
@@ -1,6 +1,6 @@
---- lib/url.c.orig	Wed Jun  2 14:45:18 2004
-+++ lib/url.c	Wed Jun  2 14:45:40 2004
-@@ -329,6 +329,10 @@
+--- lib/url.c.orig	Mon Oct 30 00:46:27 2006
++++ lib/url.c	Fri Dec  1 14:04:02 2006
+@@ -542,6 +542,10 @@
      data->set.httpauth =3D CURLAUTH_BASIC;  /* defaults to basic */
      data->set.proxyauth =3D CURLAUTH_BASIC; /* defaults to basic */
 =20
@@ -8,6 +8,6 @@
 +    data->set.no_signal =3D TRUE; /* different handling of signals and th=
reads */
 +#endif /* __FreeBSD_version */
 +
-     /* create an array with connection data struct pointers */
-     data->state.numconnects =3D 5; /* hard-coded right now */
-     data->state.connects =3D (struct connectdata **)
+     /* This no longer creates a connection cache here. It is instead made=
 on
+        the first call to curl_easy_perform() or when the handle is added =
to a
+        multi stack. */
Index: archivers/epkg/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/archivers/epkg/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- archivers/epkg/Makefile	6 Sep 2006 15:28:19 -0000	1.2
+++ archivers/epkg/Makefile	7 Dec 2006 15:09:07 -0000
@@ -7,16 +7,16 @@
=20
 PORTNAME=3D	epkg
 PORTVERSION=3D	2.3.9
-PORTREVISION=3D	1
+PORTREVISION=3D	2
 CATEGORIES=3D	archivers
 MASTER_SITES=3D	ftp://ftp.feep.net/pub/encap/epkg/
=20
 MAINTAINER=3D	pirzyk@freebsd.org
 COMMENT=3D	Encap Package Manager
=20
-BUILD_DEPENDS=3D	${LOCALBASE}/lib/libexpat.a:${PORTSDIR}/textproc/expat2 \
-			${LOCALBASE}/lib/libfget.a:${PORTSDIR}/ftp/fget \
-			${LOCALBASE}/lib/libcurl.a:${PORTSDIR}/ftp/curl
+BUILD_DEPENDS=3D	${LOCALBASE}/lib/libfget.a:${PORTSDIR}/ftp/fget
+LIB_DEPENDS=3D	curl.4:${PORTSDIR}/ftp/curl \
+		expat.6:${PORTSDIR}/textproc/expat2
=20
 HAS_CONFIGURE=3D	YES
 CONFIGURE_ENV=3D	CPPFLAGS=3D-I${LOCALBASE}/include LDFLAGS=3D-L${PREFIX}/l=
ib
Index: archivers/xar/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/archivers/xar/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- archivers/xar/Makefile	15 Apr 2006 15:50:56 -0000	1.2
+++ archivers/xar/Makefile	7 Dec 2006 15:15:18 -0000
@@ -7,6 +7,7 @@
=20
 PORTNAME=3D	xar
 DISTVERSION=3D	1.4
+PORTREVISION=3D	1
 CATEGORIES=3D	archivers
 MASTER_SITES=3D	http://www.opendarwin.org/projects/xar/ \
 		http://distfiles-msn.opendarwin.org/ \
Index: astro/gaia/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/astro/gaia/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- astro/gaia/Makefile	26 Nov 2006 22:58:06 -0000	1.3
+++ astro/gaia/Makefile	6 Dec 2006 11:22:18 -0000
@@ -7,13 +7,14 @@
=20
 PORTNAME=3D	gaia
 PORTVERSION=3D	0.1.0
+PORTREVISION=3D	1
 CATEGORIES=3D	astro
 MASTER_SITES=3D	http://gaia.serezhkin.com/
=20
 MAINTAINER=3D	se@FreeBSD.org
 COMMENT=3D	Display geographic maps with optional GPS tracking support
=20
-LIB_DEPENDS=3D	curl.3:${PORTSDIR}/ftp/curl \
+LIB_DEPENDS=3D	curl.4:${PORTSDIR}/ftp/curl \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		SDL.11:${PORTSDIR}/devel/sdl12
Index: audio/gmpccaa/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/audio/gmpccaa/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- audio/gmpccaa/Makefile	10 Apr 2006 11:07:55 -0000	1.1
+++ audio/gmpccaa/Makefile	6 Dec 2006 11:25:05 -0000
@@ -7,6 +7,7 @@
=20
 PORTNAME=3D	gmpccaa
 PORTVERSION=3D	0.1.0
+PORTREVISION=3D	1
 CATEGORIES=3D	audio
 MASTER_SITES=3D	http://download.qballcow.nl/programs/gmpc-0.13/Plugins/
=20
@@ -14,7 +15,7 @@
 COMMENT=3D	Amazon cover art provider for gmpc
=20
 LIB_DEPENDS=3D	mpd:${PORTSDIR}/audio/libmpd \
-		curl.3:${PORTSDIR}/ftp/curl
+		curl.4:${PORTSDIR}/ftp/curl
 BUILD_DEPENDS=3D	${X11BASE}/include/gmpc/cover-art.h:${PORTSDIR}/audio/gmpc
 RUN_DEPEND=3D	gmpc:${PORTSDIR}/audio/gmpc
=20
Index: audio/grip/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/audio/grip/Makefile,v
retrieving revision 1.73
diff -u -r1.73 Makefile
--- audio/grip/Makefile	14 Oct 2006 08:52:32 -0000	1.73
+++ audio/grip/Makefile	6 Dec 2006 11:17:41 -0000
@@ -7,7 +7,7 @@
=20
 PORTNAME=3D	grip
 PORTVERSION=3D	3.2.0
-PORTREVISION=3D	11
+PORTREVISION=3D	12
 CATEGORIES=3D	audio
 MASTER_SITES=3D	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=3D	${PORTNAME}
@@ -16,7 +16,7 @@
 COMMENT=3D	GTK front-end to external cd rippers and audio encoders
=20
 LIB_DEPENDS=3D	id3-3.8.3:${PORTSDIR}/audio/id3lib \
-		curl.3:${PORTSDIR}/ftp/curl
+		curl.4:${PORTSDIR}/ftp/curl
 PATCH_DEPENDS=3D	iconv:${PORTSDIR}/converters/libiconv
=20
 USE_XLIB=3D	yes
Index: audio/herrie/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/audio/herrie/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- audio/herrie/Makefile	3 Dec 2006 22:51:49 -0000	1.8
+++ audio/herrie/Makefile	7 Dec 2006 15:18:43 -0000
@@ -7,6 +7,7 @@
=20
 PORTNAME=3D	herrie
 PORTVERSION=3D	1.0.1
+PORTREVISION=3D	1
 CATEGORIES=3D	audio
 MASTER_SITES=3D	http://www.il.fontys.nl/~ed/projects/herrie/distfiles/ \
 		http://www.stack.nl/~ed/projects/herrie/distfiles/
Index: audio/icecast2/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/audio/icecast2/Makefile,v
retrieving revision 1.53
diff -u -r1.53 Makefile
--- audio/icecast2/Makefile	3 Aug 2006 20:39:08 -0000	1.53
+++ audio/icecast2/Makefile	7 Dec 2006 15:30:39 -0000
@@ -7,7 +7,7 @@
=20
 PORTNAME=3D	icecast2
 PORTVERSION=3D	2.3.1
-PORTREVISION=3D	3
+PORTREVISION=3D	4
 PORTEPOCH=3D	1
 CATEGORIES=3D	audio net ipv6
 MASTER_SITES=3D	http://svn.xiph.org/releases/icecast/
Index: audio/icecast2/files/patch-src::auth_url.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: audio/icecast2/files/patch-src::auth_url.c
diff -N audio/icecast2/files/patch-src::auth_url.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ audio/icecast2/files/patch-src::auth_url.c	7 Dec 2006 15:27:24 -0000
@@ -0,0 +1,12 @@
+--- src/auth_url.c.orig	Thu Dec  7 17:26:49 2006
++++ src/auth_url.c	Thu Dec  7 17:27:05 2006
+@@ -518,7 +518,9 @@
+     curl_easy_setopt (url_info->handle, CURLOPT_WRITEDATA, url_info->hand=
le);
+     curl_easy_setopt (url_info->handle, CURLOPT_NOSIGNAL, 1L);
+     curl_easy_setopt (url_info->handle, CURLOPT_TIMEOUT, 15L);
++#if LIBCURL_VERSION_NUM < 0x071000
+     curl_easy_setopt (url_info->handle, CURLOPT_PASSWDFUNCTION, my_getpas=
s);
++#endif
+     curl_easy_setopt (url_info->handle, CURLOPT_ERRORBUFFER, &url_info->e=
rrormsg[0]);
+=20
+     if (url_info->username && url_info->password)
Index: audio/libofa/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/audio/libofa/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- audio/libofa/Makefile	3 Nov 2006 03:49:33 -0000	1.8
+++ audio/libofa/Makefile	6 Dec 2006 11:25:12 -0000
@@ -7,6 +7,7 @@
=20
 PORTNAME=3D	libofa
 PORTVERSION=3D	0.9.3
+PORTREVISION=3D	1
 CATEGORIES=3D	audio
 MASTER_SITES=3D	http://www.musicdns.org/files/
=20
@@ -15,7 +16,7 @@
=20
 LIB_DEPENDS=3D	fftw3.4:${PORTSDIR}/math/fftw3 \
 		expat.6:${PORTSDIR}/textproc/expat2 \
-		curl.3:${PORTSDIR}/ftp/curl
+		curl.4:${PORTSDIR}/ftp/curl
=20
 USE_GNOME=3D	pkgconfig
 GNU_CONFIGURE=3D	yes
Index: audio/moc/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/audio/moc/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- audio/moc/Makefile	15 Apr 2006 16:00:18 -0000	1.11
+++ audio/moc/Makefile	6 Dec 2006 11:25:22 -0000
@@ -7,7 +7,7 @@
=20
 PORTNAME=3D	moc
 PORTVERSION=3D	2.4.0
-PORTREVISION=3D	1
+PORTREVISION=3D	2
 CATEGORIES=3D	audio
 MASTER_SITES=3D	ftp://ftp.daper.net/pub/soft/moc/stable/
=20
@@ -111,7 +111,7 @@
 .endif
=20
 .if defined(WITH_CURL)
-LIB_DEPENDS+=3D	curl.3:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=3D	curl.4:${PORTSDIR}/ftp/curl
 .else
 CONFIGURE_ARGS+=3D	--without-curl
 .endif
Index: audio/scrobbler/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/audio/scrobbler/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- audio/scrobbler/Makefile	23 Feb 2006 10:34:40 -0000	1.7
+++ audio/scrobbler/Makefile	6 Dec 2006 11:25:16 -0000
@@ -6,7 +6,7 @@
=20
 PORTNAME?=3D	scrobbler
 PORTVERSION=3D	0.3.8.1
-PORTREVISION=3D	3
+PORTREVISION=3D	4
 CATEGORIES=3D	audio
 MASTER_SITES=3D	http://static.audioscrobbler.com/plugins/ \
 		http://www.pipian.com/stuffforchat/
@@ -16,7 +16,7 @@
 COMMENT?=3D	XMMS/BMP plugin for Audioscrobbler.com
=20
 LIB_DEPENDS=3D	musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
-		curl.3:${PORTSDIR}/ftp/curl
+		curl.4:${PORTSDIR}/ftp/curl
=20
 CONFLICTS=3D	bmp-scrobbler-[0-9]* \
 		xmms-scrobbler-[0-9]*
Index: audio/streamtranscoder/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/audio/streamtranscoder/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- audio/streamtranscoder/Makefile	3 May 2006 05:14:28 -0000	1.4
+++ audio/streamtranscoder/Makefile	7 Dec 2006 15:31:44 -0000
@@ -7,6 +7,7 @@
=20
 PORTNAME=3D	streamtranscoder
 PORTVERSION=3D	1.2.8
+PORTREVISION=3D	1
 CATEGORIES=3D	audio
 MASTER_SITES=3D	http://www.oddsock.org/tools/streamTranscoder/
=20
Index: audio/streamtuner/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/audio/streamtuner/Makefile,v
retrieving revision 1.31
diff -u -r1.31 Makefile
--- audio/streamtuner/Makefile	14 Oct 2006 08:52:35 -0000	1.31
+++ audio/streamtuner/Makefile	7 Dec 2006 15:33:32 -0000
@@ -7,7 +7,7 @@
=20
 PORTNAME=3D		streamtuner
 PORTVERSION=3D		0.99.99
-PORTREVISION=3D		5
+PORTREVISION=3D		6
 CATEGORIES=3D		audio www
 MASTER_SITES=3D		${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=3D	${PORTNAME}
Index: audio/vorbis-tools/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/audio/vorbis-tools/Makefile,v
retrieving revision 1.39
diff -u -r1.39 Makefile
--- audio/vorbis-tools/Makefile	9 Jul 2006 20:59:24 -0000	1.39
+++ audio/vorbis-tools/Makefile	6 Dec 2006 11:25:19 -0000
@@ -7,7 +7,7 @@
=20
 PORTNAME=3D	vorbis-tools
 PORTVERSION=3D	1.1.1
-PORTREVISION=3D	1
+PORTREVISION=3D	2
 PORTEPOCH=3D	3
 CATEGORIES=3D	audio
 MASTER_SITES=3D	http://downloads.xiph.org/releases/vorbis/
@@ -16,7 +16,7 @@
 COMMENT=3D	Play, encode, and manage Ogg Vorbis files
=20
 LIB_DEPENDS=3D	ao.3:${PORTSDIR}/audio/libao \
-		curl.3:${PORTSDIR}/ftp/curl \
+		curl.4:${PORTSDIR}/ftp/curl \
 		FLAC.7:${PORTSDIR}/audio/flac \
 		speex.3:${PORTSDIR}/audio/speex \
 		vorbis.3:${PORTSDIR}/audio/libvorbis
Index: audio/vorbis-tools/files/patch-ogg123_http_transport.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: audio/vorbis-tools/files/patch-ogg123_http_transport.c
diff -N audio/vorbis-tools/files/patch-ogg123_http_transport.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ audio/vorbis-tools/files/patch-ogg123_http_transport.c	1 Dec 2006 14:30=
:21 -0000
@@ -0,0 +1,12 @@
+--- ogg123/http_transport.c.orig	Fri Dec  1 16:25:40 2006
++++ ogg123/http_transport.c	Fri Dec  1 16:29:16 2006
+@@ -116,7 +116,9 @@
+   if (inputOpts.ProxyTunnel)
+     curl_easy_setopt (handle, CURLOPT_HTTPPROXYTUNNEL, inputOpts.ProxyTun=
nel);
+   */
++#if LIBCURL_VERSION_NUM < 0x071000
+   curl_easy_setopt(handle, CURLOPT_MUTE, 1);
++#endif
+   curl_easy_setopt(handle, CURLOPT_ERRORBUFFER, private->error);
+   curl_easy_setopt(handle, CURLOPT_PROGRESSFUNCTION, progress_callback);
+   curl_easy_setopt(handle, CURLOPT_PROGRESSDATA, private);
Index: audio/xmms2/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/audio/xmms2/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- audio/xmms2/Makefile	3 Dec 2006 04:10:25 -0000	1.22
+++ audio/xmms2/Makefile	8 Dec 2006 17:43:56 -0000
@@ -7,6 +7,7 @@
=20
 PORTNAME?=3D	xmms2
 PORTVERSION=3D	0.2.d.8
+PORTREVISION=3D	1
 DISTVERSION=3D	0.2DrHouse
 CATEGORIES?=3D	audio
 MASTER_SITES=3D	${MASTER_SITE_SOURCEFORGE}
@@ -77,7 +78,7 @@
=20
 .if !defined(XMMS2_SLAVE)
 .if !defined(WITHOUT_CURL)
-LIB_DEPENDS+=3D	curl.3:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=3D	curl.4:${PORTSDIR}/ftp/curl
 PLIST_SUB+=3D	CURL=3D""
 .else
 EXCLUDE+=3D	curl
@@ -91,7 +92,7 @@
 PLIST_SUB+=3D	LASTFM=3D""
 .else
 EXCLUDE+=3D	lastfm lastfmeta
-PLIST_SUB+=3D	LASTMFM=3D"@comment "
+PLIST_SUB+=3D	LASTFM=3D"@comment "
 .endif
=20
 .if defined(WITH_SID)
@@ -229,6 +230,9 @@
 .endif
=20
 .if defined(WITH_MDNS_AVAHI)
+.if defined(WITH_MDNS_APPLE)
+BROKEN=3D		You may choose either MDNS_APPLE or MDNS_AVAHI, but not both
+.endif
 LIB_DEPENDS+=3D	avahi-core:${PORTSDIR}/net/avahi
 PLIST_SUB+=3D	MDNS_AVAHI=3D""
 .else
@@ -237,6 +241,9 @@
 .endif
=20
 .if !defined (WITHOUT_MDNS_APPLE)
+.if defined(WITH_MDNS_AVAHI)
+BROKEN=3D		You may choose either MDNS_APPLE or MDNS_AVAHI, but not both
+.endif
 LIB_DEPENDS+=3D	dns_sd:${PORTSDIR}/net/mDNSResponder
 PLIST_SUB+=3D	MDNS_APPLE=3D""
 .else
Index: audio/xmms2/pkg-plist
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/audio/xmms2/pkg-plist,v
retrieving revision 1.11
diff -u -r1.11 pkg-plist
--- audio/xmms2/pkg-plist	3 Dec 2006 04:10:25 -0000	1.11
+++ audio/xmms2/pkg-plist	8 Dec 2006 17:37:29 -0000
@@ -101,7 +101,8 @@
 libdata/pkgconfig/xmms2-plugin.pc
 %%DATADIR%%/mind.in.a.box-lament_snipplet.ogg
 %%DATADIR%%/scripts/startup.d/xmms2-et-launcher.sh
-%%DATADIR%%/scripts/startup.d/xmms2-mdns-launcher.sh
+%%MDNS_AVAHI%%%%DATADIR%%/scripts/startup.d/xmms2-mdns-launcher.sh
+%%MDNS_APPLE%%%%DATADIR%%/scripts/startup.d/xmms2-mdns-launcher.sh
 @dirrm %%DATADIR%%/scripts/startup.d
 @dirrm %%DATADIR%%/scripts
 @dirrm %%DATADIR%%
Index: comms/xastir/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/comms/xastir/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- comms/xastir/Makefile	23 Sep 2006 23:44:15 -0000	1.12
+++ comms/xastir/Makefile	7 Dec 2006 15:51:20 -0000
@@ -7,7 +7,7 @@
=20
 PORTNAME=3D	xastir
 PORTVERSION=3D	1.8.2
-PORTREVISION=3D	1
+PORTREVISION=3D	2
 CATEGORIES=3D	comms hamradio
 MASTER_SITES=3D	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=3D	xastir
Index: deskutils/drivel/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/deskutils/drivel/Makefile,v
retrieving revision 1.31
diff -u -r1.31 Makefile
--- deskutils/drivel/Makefile	14 Oct 2006 08:52:41 -0000	1.31
+++ deskutils/drivel/Makefile	6 Dec 2006 11:24:57 -0000
@@ -7,7 +7,7 @@
=20
 PORTNAME=3D	drivel
 PORTVERSION=3D	2.0.2
-PORTREVISION=3D	2
+PORTREVISION=3D	3
 CATEGORIES=3D	deskutils gnome
 MASTER_SITES=3D	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=3D	${PORTNAME}
@@ -15,7 +15,7 @@
 MAINTAINER=3D	jbq@caraldi.com
 COMMENT=3D	Blog editor for GNOME
=20
-LIB_DEPENDS=3D	curl.3:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=3D	curl.4:${PORTSDIR}/ftp/curl
=20
 INSTALLS_ICONS=3D	yes
 USE_X_PREFIX=3D	yes
Index: deskutils/ljit/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/deskutils/ljit/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- deskutils/ljit/Makefile	4 May 2006 21:40:15 -0000	1.7
+++ deskutils/ljit/Makefile	6 Dec 2006 11:24:51 -0000
@@ -7,7 +7,7 @@
=20
 PORTNAME=3D	ljit
 PORTVERSION=3D	0.2.5
-PORTREVISION=3D	4
+PORTREVISION=3D	5
 CATEGORIES=3D	deskutils
 MASTER_SITES=3D	http://kir.vtx.ru/ljit/dl/ \
 		http://freebsd.nsu.ru/distfiles/
@@ -15,7 +15,7 @@
 MAINTAINER=3D	danfe@FreeBSD.org
 COMMENT=3D	GUI tool to help LiveJournal users post images
=20
-LIB_DEPENDS=3D	curl.3:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=3D	curl.4:${PORTSDIR}/ftp/curl
 RUN_DEPENDS=3D	convert:${PORTSDIR}/graphics/ImageMagick
=20
 GNU_CONFIGURE=3D	yes
Index: deskutils/logjam/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/deskutils/logjam/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- deskutils/logjam/Makefile	20 Aug 2006 09:35:46 -0000	1.24
+++ deskutils/logjam/Makefile	6 Dec 2006 11:24:14 -0000
@@ -7,14 +7,14 @@
=20
 PORTNAME=3D	logjam
 PORTVERSION=3D	4.5.3
-PORTREVISION=3D	1
+PORTREVISION=3D	2
 CATEGORIES=3D	deskutils
 MASTER_SITES=3D	http://logjam.danga.com/download/
=20
 MAINTAINER=3D	novel@FreeBSD.org
 COMMENT=3D	A GTK2 interface to livejournals, ie www.livejournal.com
=20
-LIB_DEPENDS=3D	curl.3:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=3D	curl.4:${PORTSDIR}/ftp/curl
=20
 MAN1=3D		logjam.1
=20
Index: deskutils/mdh/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/deskutils/mdh/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- deskutils/mdh/Makefile	28 May 2006 05:04:55 -0000	1.13
+++ deskutils/mdh/Makefile	6 Dec 2006 11:24:54 -0000
@@ -7,7 +7,7 @@
=20
 PORTNAME=3D	mdh
 PORTVERSION=3D	1.9.59
-PORTREVISION=3D	1
+PORTREVISION=3D	2
 CATEGORIES=3D	deskutils gnome
 MASTER_SITES=3D	http://www.gozer.org/my_stuff/gtk/gtk/mdh/
=20
@@ -34,7 +34,7 @@
 .if defined(WITHOUT_CURL)
 CONFIGURE_ARGS+=3D	--disable-curl
 .else
-LIB_DEPENDS+=3D	curl.3:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=3D	curl.4:${PORTSDIR}/ftp/curl
 .endif
=20
 post-patch:
Index: devel/cogito/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/devel/cogito/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- devel/cogito/Makefile	9 Apr 2006 18:05:41 -0000	1.4
+++ devel/cogito/Makefile	7 Dec 2006 15:56:04 -0000
@@ -7,6 +7,7 @@
=20
 PORTNAME=3D	cogito
 PORTVERSION=3D	0.17.2
+PORTREVISION=3D	1
 CATEGORIES=3D	devel
 MASTER_SITES=3D	http://www.kernel.org/pub/software/scm/cogito/ \
 		http://www.uk.kernel.org/pub/software/scm/cogito/ \
Index: devel/darcs/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/devel/darcs/Makefile,v
retrieving revision 1.39
diff -u -r1.39 Makefile
--- devel/darcs/Makefile	17 Jun 2006 10:37:44 -0000	1.39
+++ devel/darcs/Makefile	8 Dec 2006 12:53:27 -0000
@@ -7,6 +7,7 @@
=20
 PORTNAME=3D	darcs
 PORTVERSION=3D	1.0.8
+PORTREVISION=3D	1
 CATEGORIES=3D	devel
 MASTER_SITES=3D	http://darcs.net/
=20
Index: devel/evfs/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/devel/evfs/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- devel/evfs/Makefile	8 Oct 2006 13:48:22 -0000	1.1
+++ devel/evfs/Makefile	6 Dec 2006 11:24:10 -0000
@@ -8,6 +8,7 @@
=20
 PORTNAME=3D	evfs
 PORTVERSION=3D	20060926
+PORTREVISION=3D	1
 CATEGORIES=3D	devel
 MASTER_SITES=3D	http://sunner.elcomnet.ru/~stas/
=20
@@ -38,8 +39,8 @@
 CONFIGURE_ARGS+=3D--disable-samba
 .endif
=20
-.if !defined(WITHOUT_FTP) || exists(${LOCALBASE}/lib/libcurl.so.3)
-LIB_DEPENDS+=3D	curl.3:${PORTSDIR}/ftp/curl
+.if !defined(WITHOUT_FTP) || exists(${LOCALBASE}/lib/libcurl.so.4)
+LIB_DEPENDS+=3D	curl.4:${PORTSDIR}/ftp/curl
 PLIST_SUB+=3D	FTP=3D""
 .else
 PLIST_SUB+=3D	FTP=3D"@comment "
Index: devel/libgutenfetch/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/devel/libgutenfetch/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- devel/libgutenfetch/Makefile	12 Apr 2005 03:25:12 -0000	1.3
+++ devel/libgutenfetch/Makefile	8 Dec 2006 14:57:29 -0000
@@ -7,6 +7,7 @@
=20
 PORTNAME=3D	libgutenfetch
 PORTVERSION=3D	1.2
+PORTREVISION=3D	1
 CATEGORIES=3D	devel
 MASTER_SITES=3D	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=3D	libgutenfetch
Index: finance/libofx/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/finance/libofx/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- finance/libofx/Makefile	9 Oct 2006 08:00:11 -0000	1.17
+++ finance/libofx/Makefile	6 Dec 2006 11:24:04 -0000
@@ -7,6 +7,7 @@
=20
 PORTNAME=3D	libofx
 PORTVERSION=3D	0.8.2
+PORTREVISION=3D	1
 CATEGORIES=3D	finance
 MASTER_SITES=3D	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=3D	${PORTNAME}
@@ -14,7 +15,7 @@
 MAINTAINER=3D	ports@FreeBSD.org
 COMMENT=3D	OpenSource implementation of the OFX (Open Financial eXchange)
=20
-LIB_DEPENDS=3D	curl.3:${PORTSDIR}/ftp/curl \
+LIB_DEPENDS=3D	curl.4:${PORTSDIR}/ftp/curl \
 		xml\\+\\+-1.0.1:${PORTSDIR}/textproc/libxml++ \
 		osp.3:${PORTSDIR}/textproc/opensp
=20
Index: ftp/curlpp/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/ftp/curlpp/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- ftp/curlpp/Makefile	26 Sep 2006 14:46:01 -0000	1.15
+++ ftp/curlpp/Makefile	6 Dec 2006 11:23:56 -0000
@@ -8,13 +8,14 @@
=20
 PORTNAME=3D	curlpp
 PORTVERSION=3D	0.6.1
+PORTREVISION=3D	1
 CATEGORIES=3D	ftp
 MASTER_SITES=3D	http://rrette.com/downloads/sources/
=20
 MAINTAINER=3D	roam@FreeBSD.org
 COMMENT=3D	A C++ wrapper for libcurl
=20
-LIB_DEPENDS=3D	curl.3:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=3D	curl.4:${PORTSDIR}/ftp/curl
=20
 USE_GCC=3D	3.4
 GNU_CONFIGURE=3D	yes
Index: ftp/ocaml-ocurl/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/ftp/ocaml-ocurl/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- ftp/ocaml-ocurl/Makefile	14 Jun 2006 21:38:07 -0000	1.7
+++ ftp/ocaml-ocurl/Makefile	6 Dec 2006 11:23:49 -0000
@@ -5,6 +5,7 @@
=20
 PORTNAME=3D	ocurl
 PORTVERSION=3D	0.2.1
+PORTREVISION=3D	1
 CATEGORIES=3D	ftp
 MASTER_SITES=3D	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=3D	${PORTNAME}
@@ -17,7 +18,7 @@
 		ocamlfind:${PORTSDIR}/devel/ocaml-findlib
 RUN_DEPENDS=3D	ocamlc:${PORTSDIR}/lang/ocaml \
 		ocamlfind:${PORTSDIR}/devel/ocaml-findlib
-LIB_DEPENDS=3D	curl.3:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=3D	curl.4:${PORTSDIR}/ftp/curl
=20
 USE_GMAKE=3D	yes
 GNU_CONFIGURE=3D	yes
Index: ftp/php4-curl/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/ftp/php4-curl/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- ftp/php4-curl/Makefile	19 Jul 2004 08:04:47 -0000	1.1
+++ ftp/php4-curl/Makefile	8 Dec 2006 17:19:10 -0000
@@ -11,4 +11,6 @@
=20
 PKGNAMESUFFIX=3D	-curl
=20
+PORTREVISION=3D	2
+
 .include "${MASTERDIR}/Makefile"
Index: ftp/php4-curl/files/patch-curl.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: ftp/php4-curl/files/patch-curl.c
diff -N ftp/php4-curl/files/patch-curl.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ ftp/php4-curl/files/patch-curl.c	6 Dec 2006 09:13:39 -0000
@@ -0,0 +1,22 @@
+--- curl.c.orig	Wed Dec  6 11:12:37 2006
++++ curl.c	Wed Dec  6 11:13:27 2006
+@@ -258,7 +258,9 @@
+ 	REGISTER_CURL_CONSTANT(CURLOPT_FTPAPPEND);
+ 	REGISTER_CURL_CONSTANT(CURLOPT_NETRC);
+ 	REGISTER_CURL_CONSTANT(CURLOPT_FOLLOWLOCATION);
++#if CURLOPT_FTPASCII !=3D 0
+ 	REGISTER_CURL_CONSTANT(CURLOPT_FTPASCII);
++#endif
+ 	REGISTER_CURL_CONSTANT(CURLOPT_PUT);
+ #if CURLOPT_MUTE !=3D 0
+ 	REGISTER_CURL_CONSTANT(CURLOPT_MUTE);
+@@ -296,7 +298,9 @@
+ 	REGISTER_CURL_CONSTANT(CURLOPT_FILETIME);
+ 	REGISTER_CURL_CONSTANT(CURLOPT_WRITEFUNCTION);
+ 	REGISTER_CURL_CONSTANT(CURLOPT_READFUNCTION);
++#if CURLOPT_PASSWDFUNCTION !=3D 0
+ 	REGISTER_CURL_CONSTANT(CURLOPT_PASSWDFUNCTION);
++#endif
+ 	REGISTER_CURL_CONSTANT(CURLOPT_HEADERFUNCTION);
+ 	REGISTER_CURL_CONSTANT(CURLOPT_MAXREDIRS);
+ 	REGISTER_CURL_CONSTANT(CURLOPT_MAXCONNECTS);
Index: ftp/php5-curl/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/ftp/php5-curl/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- ftp/php5-curl/Makefile	19 Jul 2004 09:08:46 -0000	1.1
+++ ftp/php5-curl/Makefile	8 Dec 2006 17:18:04 -0000
@@ -11,4 +11,6 @@
=20
 PKGNAMESUFFIX=3D	-curl
=20
+PORTREVISION=3D	2
+
 .include "${MASTERDIR}/Makefile"
Index: ftp/php5-curl/files/patch-interface.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: ftp/php5-curl/files/patch-interface.c
diff -N ftp/php5-curl/files/patch-interface.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ ftp/php5-curl/files/patch-interface.c	5 Dec 2006 14:55:10 -0000
@@ -0,0 +1,48 @@
+--- interface.c.orig	Tue Dec  5 16:50:11 2006
++++ interface.c	Tue Dec  5 16:50:25 2006
+@@ -369,7 +369,9 @@
+ 	REGISTER_CURL_CONSTANT(CURLOPT_FTPAPPEND);
+ 	REGISTER_CURL_CONSTANT(CURLOPT_NETRC);
+ 	REGISTER_CURL_CONSTANT(CURLOPT_FOLLOWLOCATION);
++#if CURLOPT_FTPASCII !=3D 0
+ 	REGISTER_CURL_CONSTANT(CURLOPT_FTPASCII);
++#endif
+ 	REGISTER_CURL_CONSTANT(CURLOPT_PUT);
+ #if CURLOPT_MUTE !=3D 0
+ 	REGISTER_CURL_CONSTANT(CURLOPT_MUTE);
+@@ -409,7 +411,9 @@
+ 	REGISTER_CURL_CONSTANT(CURLOPT_FILETIME);
+ 	REGISTER_CURL_CONSTANT(CURLOPT_WRITEFUNCTION);
+ 	REGISTER_CURL_CONSTANT(CURLOPT_READFUNCTION);
++#if CURLOPT_PASSWDFUNCTION !=3D 0
+ 	REGISTER_CURL_CONSTANT(CURLOPT_PASSWDFUNCTION);
++#endif
+ 	REGISTER_CURL_CONSTANT(CURLOPT_HEADERFUNCTION);
+ 	REGISTER_CURL_CONSTANT(CURLOPT_MAXREDIRS);
+ 	REGISTER_CURL_CONSTANT(CURLOPT_MAXCONNECTS);
+@@ -1158,11 +1162,13 @@
+ 	dupch->handlers->read->fp =3D ch->handlers->read->fp;
+ 	dupch->handlers->read->fd =3D ch->handlers->read->fd;
+=20
++#if CURLOPT_PASSWDFUNCTION !=3D 0
+ 	if (ch->handlers->passwd) {
+ 		zval_add_ref(&ch->handlers->passwd);
+ 		dupch->handlers->passwd =3D ch->handlers->passwd;
+ 		curl_easy_setopt(ch->cp, CURLOPT_PASSWDDATA, (void *) dupch);
+ 	}
++#endif
+ 	if (ch->handlers->write->func_name) {
+ 		zval_add_ref(&ch->handlers->write->func_name);
+ 		dupch->handlers->write->func_name =3D ch->handlers->write->func_name;
+@@ -1915,9 +1921,11 @@
+ 	if (ch->handlers->write_header->func_name) {
+ 		zval_ptr_dtor(&ch->handlers->write_header->func_name);
+ 	}
++#if CURLOPT_PASSWDFUNCTION !=3D 0
+ 	if (ch->handlers->passwd) {
+ 		zval_ptr_dtor(&ch->handlers->passwd);
+ 	}
++#endif
+ 	if (ch->header.str_len > 0) {
+ 		efree(ch->header.str);
+ 	}
Index: ftp/py-curl/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/ftp/py-curl/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- ftp/py-curl/Makefile	22 Apr 2006 05:20:19 -0000	1.24
+++ ftp/py-curl/Makefile	6 Dec 2006 11:23:39 -0000
@@ -7,6 +7,7 @@
=20
 PORTNAME=3D	curl
 PORTVERSION=3D	7.15.2
+PORTREVISION=3D	1
 CATEGORIES=3D	ftp python
 MASTER_SITES=3D	http://pycurl.sourceforge.net/download/ \
 		http://pycurl.sourceforge.net/download/00-OLD-VERSIONS/
@@ -16,7 +17,7 @@
 MAINTAINER=3D	perky@FreeBSD.org
 COMMENT=3D	Python interface to libcurl
=20
-LIB_DEPENDS=3D	curl.3:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=3D	curl.4:${PORTSDIR}/ftp/curl
=20
 USE_PYTHON=3D	yes
 USE_PYDISTUTILS=3D	yes
Index: ftp/py-curl/files/patch-src-pycurl.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: ftp/py-curl/files/patch-src-pycurl.c
diff -N ftp/py-curl/files/patch-src-pycurl.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ ftp/py-curl/files/patch-src-pycurl.c	5 Dec 2006 15:13:27 -0000
@@ -0,0 +1,48 @@
+--- src/pycurl.c.orig	Tue Dec  5 17:11:38 2006
++++ src/pycurl.c	Tue Dec  5 17:13:03 2006
+@@ -1109,9 +1109,11 @@
+         case CURLOPT_URL:
+         case CURLOPT_USERAGENT:
+         case CURLOPT_USERPWD:
++#if LIBCURL_VERSION_NUM < 0x071000
+         case CURLOPT_SOURCE_HOST:
+         case CURLOPT_SOURCE_USERPWD:
+         case CURLOPT_SOURCE_PATH:
++#endif
+ /* FIXME: check if more of these options allow binary data */
+             str =3D PyString_AsString_NoNUL(obj);
+             if (str =3D=3D NULL)
+@@ -1279,12 +1281,14 @@
+         case CURLOPT_PREQUOTE:
+             old_slist =3D &self->prequote;
+             break;
++#if LIBCURL_VERSION_NUM < 0x071000
+         case CURLOPT_SOURCE_PREQUOTE:
+             old_slist =3D &self->source_prequote;
+             break;
+         case CURLOPT_SOURCE_POSTQUOTE:
+             old_slist =3D &self->source_postquote;
+             break;
++#endif
+         case CURLOPT_HTTPPOST:
+             break;
+         default:
+@@ -2689,14 +2693,18 @@
+     insint_c(d, "FTP_SSL", CURLOPT_FTP_SSL);
+     insint_c(d, "POSTFIELDSIZE_LARGE", CURLOPT_POSTFIELDSIZE_LARGE);
+     insint_c(d, "TCP_NODELAY", CURLOPT_TCP_NODELAY);
++#if LIBCURL_VERSION_NUM < 0x071000
+     insint_c(d, "SOURCE_USERPWD", CURLOPT_SOURCE_USERPWD);
+     insint_c(d, "SOURCE_PREQUOTE", CURLOPT_SOURCE_PREQUOTE);
+     insint_c(d, "SOURCE_POSTQUOTE", CURLOPT_SOURCE_POSTQUOTE);
++#endif
+     insint_c(d, "FTPSSLAUTH", CURLOPT_FTPSSLAUTH);
+     insint_c(d, "IOCTLFUNCTION", CURLOPT_IOCTLFUNCTION);
+     insint_c(d, "IOCTLDATA", CURLOPT_IOCTLDATA);
++#if LIBCURL_VERSION_NUM < 0x071000
+     insint_c(d, "SOURCE_URL", CURLOPT_SOURCE_URL);
+     insint_c(d, "SOURCE_QUOTE", CURLOPT_SOURCE_QUOTE);
++#endif
+     insint_c(d, "FTP_ACCOUNT", CURLOPT_FTP_ACCOUNT);
+     insint_c(d, "IGNORE_CONTENT_LENGTH", CURLOPT_IGNORE_CONTENT_LENGTH);
+     insint_c(d, "COOKIELIST", CURLOPT_COOKIELIST);
Index: ftp/rexx-curl/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/ftp/rexx-curl/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- ftp/rexx-curl/Makefile	14 Aug 2006 23:06:29 -0000	1.11
+++ ftp/rexx-curl/Makefile	6 Dec 2006 11:23:25 -0000
@@ -8,6 +8,7 @@
=20
 PORTNAME=3D	curl
 PORTVERSION=3D	1.4
+PORTREVISION=3D	1
 CATEGORIES=3D	ftp
 MASTER_SITES=3D	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=3D	rexx${PORTNAME}
@@ -18,7 +19,7 @@
 COMMENT=3D	External function package providing an interface to the cURL pa=
ckage
=20
 BUILD_DEPENDS=3D	rexx:${PORTSDIR}/lang/rexx-regina
-LIB_DEPENDS=3D	curl.3:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=3D	curl.4:${PORTSDIR}/ftp/curl
 RUN_DEPENDS=3D	rexx:${PORTSDIR}/lang/rexx-regina
=20
 USE_GMAKE=3D	yes
Index: ftp/rexx-curl/files/patch-rexxcurl.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: ftp/rexx-curl/files/patch-rexxcurl.c
diff -N ftp/rexx-curl/files/patch-rexxcurl.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ ftp/rexx-curl/files/patch-rexxcurl.c	5 Dec 2006 14:31:26 -0000
@@ -0,0 +1,11 @@
+--- rexxcurl.c.orig	Tue Dec  5 16:30:55 2006
++++ rexxcurl.c	Tue Dec  5 16:31:14 2006
+@@ -323,7 +323,7 @@
+    { "RANGE"           ,CURLOPT_RANGE           ,RXCURLOPT_STRING      },
+    { "REFERER"         ,CURLOPT_REFERER         ,RXCURLOPT_STRING      },
+    { "RESUMEFROM"      ,CURLOPT_RESUME_FROM     ,RXCURLOPT_LONGLONG    },
+-#if LIBCURL_VERSION_NUM >=3D 0x070d00
++#if LIBCURL_VERSION_NUM >=3D 0x070d00 && LIBCURL_VERSION_NUM < 0x071000
+    { "SOURCEPOSTQUOTE" ,CURLOPT_SOURCE_POSTQUOTE,RXCURLOPT_LIST        },
+    { "SOURCEPREQUOTE"  ,CURLOPT_SOURCE_PREQUOTE ,RXCURLOPT_LIST        },
+    { "SOURCEQUOTE"     ,CURLOPT_SOURCE_QUOTE    ,RXCURLOPT_LIST        },
Index: ftp/urlgfe/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/ftp/urlgfe/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- ftp/urlgfe/Makefile	7 May 2006 11:09:21 -0000	1.8
+++ ftp/urlgfe/Makefile	6 Dec 2006 11:23:17 -0000
@@ -7,7 +7,7 @@
=20
 PORTNAME=3D	urlgfe
 PORTVERSION=3D	0.7.1
-PORTREVISION?=3D	4
+PORTREVISION?=3D	5
 CATEGORIES=3D	ftp www
 MASTER_SITES=3D	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=3D	urlget
@@ -15,7 +15,7 @@
 MAINTAINER=3D	chip-set@mail.ru
 COMMENT=3D	A download manager
=20
-LIB_DEPENDS=3D	curl.3:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=3D	curl.4:${PORTSDIR}/ftp/curl
=20
 USE_GNOME=3D	gtk20 lthack
 WANT_GNOME=3D	yes
Index: ftp/wmget/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/ftp/wmget/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- ftp/wmget/Makefile	29 May 2006 20:46:12 -0000	1.7
+++ ftp/wmget/Makefile	6 Dec 2006 11:23:13 -0000
@@ -6,6 +6,7 @@
=20
 PORTNAME=3D	wmget
 PORTVERSION=3D	0.6.0
+PORTREVISION=3D	1
 CATEGORIES=3D	ftp
 MASTER_SITES=3D	http://amtrickey.net/download/
 DISTNAME=3D	${PORTNAME}-${PORTVERSION}-src
@@ -13,7 +14,7 @@
 MAINTAINER=3D	uspoerlein@gmail.com
 COMMENT=3D	Dock app for Window Maker providing wget functionality
=20
-LIB_DEPENDS=3D	curl.3:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=3D	curl.4:${PORTSDIR}/ftp/curl
=20
 USE_X_PREFIX=3D	yes
 USE_GMAKE=3D	yes
Index: games/bzflag/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/games/bzflag/Makefile,v
retrieving revision 1.38
diff -u -r1.38 Makefile
--- games/bzflag/Makefile	20 Sep 2006 11:20:56 -0000	1.38
+++ games/bzflag/Makefile	6 Dec 2006 11:23:07 -0000
@@ -7,7 +7,7 @@
=20
 PORTNAME=3D	bzflag
 PORTVERSION=3D	2.0.8
-PORTREVISION=3D	1
+PORTREVISION=3D	2
 CATEGORIES=3D	games
 MASTER_SITES=3D	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=3D	${PORTNAME}
@@ -15,7 +15,7 @@
 MAINTAINER=3D	chuck@pkix.net
 COMMENT=3D	A multiplayer 3D tank battle game
=20
-LIB_DEPENDS=3D	curl.3:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=3D	curl.4:${PORTSDIR}/ftp/curl
=20
 USE_BZIP2=3D	yes
 USE_SDL=3D	yes
Index: games/fgsd/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/games/fgsd/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- games/fgsd/Makefile	10 Apr 2006 10:58:24 -0000	1.1
+++ games/fgsd/Makefile	8 Dec 2006 14:24:09 -0000
@@ -7,6 +7,7 @@
=20
 PORTNAME=3D	fgsd
 DISTVERSION=3D	0.3.1a
+PORTREVISION=3D	1
 CATEGORIES=3D	games
 MASTER_SITES=3D	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=3D	${PORTNAME}
Index: games/mudmagic/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/games/mudmagic/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- games/mudmagic/Makefile	7 Oct 2006 09:33:44 -0000	1.2
+++ games/mudmagic/Makefile	6 Dec 2006 11:22:41 -0000
@@ -7,13 +7,14 @@
=20
 PORTNAME=3D	mudmagic
 PORTVERSION=3D	1.9
+PORTREVISION=3D	1
 CATEGORIES=3D	games
 MASTER_SITES=3D	http://www.mudmagic.com/mud-client/downloads/
=20
 MAINTAINER=3D	trasz@pin.if.uz.zgora.pl
 COMMENT=3D	A GTK+ based MUD client
=20
-LIB_DEPENDS=3D	curl.3:${PORTSDIR}/ftp/curl \
+LIB_DEPENDS=3D	curl.4:${PORTSDIR}/ftp/curl \
 		pcre.0:${PORTSDIR}/devel/pcre \
 		png.5:${PORTSDIR}/graphics/png \
 		expat:${PORTSDIR}/textproc/expat2 \
Index: games/planeshift/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/games/planeshift/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- games/planeshift/Makefile	30 Nov 2006 20:25:32 -0000	1.6
+++ games/planeshift/Makefile	6 Dec 2006 11:22:47 -0000
@@ -7,6 +7,7 @@
=20
 PORTNAME=3D	planeshift
 PORTVERSION=3D	0.3.017
+PORTREVISION=3D	1
 CATEGORIES=3D	games
 MASTER_SITES=3D	http://alex.foxybanana.com/freebsd/
=20
@@ -18,7 +19,7 @@
 		cel-config:${PORTSDIR}/graphics/crystalentitylayer-devel \
 		${LOCALBASE}/lib/libbfd.a:${PORTSDIR}/devel/libbfd
 LIB_DEPENDS=3D	cal3d.12:${PORTSDIR}/graphics/cal3d \
-		curl.3:${PORTSDIR}/ftp/curl
+		curl.4:${PORTSDIR}/ftp/curl
=20
 USE_BZIP2=3D	yes
 GNU_CONFIGURE=3D	yes
Index: games/r1q2/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/games/r1q2/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- games/r1q2/Makefile	20 Sep 2006 11:21:23 -0000	1.5
+++ games/r1q2/Makefile	6 Dec 2006 11:22:54 -0000
@@ -7,7 +7,7 @@
=20
 PORTNAME=3D	r1q2
 PORTVERSION=3D	6557
-PORTREVISION=3D	3
+PORTREVISION=3D	4
 CATEGORIES=3D	games
 MASTER_SITES=3D	http://www.r1ch.net/stuff/r1q2/src/
 DISTNAME=3D	${PORTNAME}-b${PORTVERSION}-src
@@ -93,7 +93,7 @@
 .endif
=20
 .if !defined(WITHOUT_HTTP)
-LIB_DEPENDS+=3D	curl.3:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=3D	curl.4:${PORTSDIR}/ftp/curl
 MAKE_ENV+=3D	WITH_HTTP_DOWNLOAD_SUPPORT=3DYES
 .endif
=20
Index: games/tmw/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/games/tmw/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- games/tmw/Makefile	16 Nov 2006 21:20:29 -0000	1.9
+++ games/tmw/Makefile	6 Dec 2006 11:23:04 -0000
@@ -7,6 +7,7 @@
=20
 PORTNAME=3D	tmw
 PORTVERSION=3D	0.0.21.1
+PORTREVISION=3D	1
 CATEGORIES=3D	games
 MASTER_SITES=3D	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=3D	themanaworld
@@ -16,7 +17,7 @@
=20
 LIB_DEPENDS=3D	xml2.5:${PORTSDIR}/textproc/libxml2 \
 		png.5:${PORTSDIR}/graphics/png \
-		curl.3:${PORTSDIR}/ftp/curl \
+		curl.4:${PORTSDIR}/ftp/curl \
 		physfs-1.0.1:${PORTSDIR}/devel/physfs
 BUILD_DEPENDS=3D	guichan>=3D0.5.0:${PORTSDIR}/devel/guichan
 RUN_DEPENDS=3D	guichan>=3D0.5.0:${PORTSDIR}/devel/guichan
Index: games/warsow/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/games/warsow/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- games/warsow/Makefile	20 Sep 2006 11:21:35 -0000	1.6
+++ games/warsow/Makefile	6 Dec 2006 11:22:50 -0000
@@ -7,7 +7,7 @@
=20
 PORTNAME=3D	warsow
 PORTVERSION=3D	0.12
-PORTREVISION=3D	3
+PORTREVISION=3D	4
 CATEGORIES=3D	games
 MASTER_SITES=3D	http://warsow.aditsystems.com/ \
 		http://ftp.club-internet.fr/pub/games/nofrag/warsow/ \
@@ -49,7 +49,7 @@
 .endif
=20
 .if !defined(WITHOUT_CLIENT)
-LIB_DEPENDS=3D	curl.3:${PORTSDIR}/ftp/curl \
+LIB_DEPENDS=3D	curl.4:${PORTSDIR}/ftp/curl \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
 USE_GL=3D		yes
 USE_SDL=3D	yes
Index: games/xmoto/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/games/xmoto/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- games/xmoto/Makefile	6 Oct 2006 15:43:29 -0000	1.13
+++ games/xmoto/Makefile	6 Dec 2006 11:22:58 -0000
@@ -7,7 +7,7 @@
=20
 PORTNAME=3D	xmoto
 PORTVERSION=3D	0.2.2
-PORTREVISION=3D	1
+PORTREVISION=3D	2
 CATEGORIES=3D	games
 MASTER_SITES=3D	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=3D	${PORTNAME}
@@ -47,7 +47,7 @@
 .include <bsd.port.pre.mk>
=20
 .if !defined(WITHOUT_WWW)
-LIB_DEPENDS+=3D	curl.3:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=3D	curl.4:${PORTSDIR}/ftp/curl
 CONFIGURE_ARGS+=3D	--with-enable-www=3D1
 .else
 CONFIGURE_ARGS+=3D	--with-enable-www=3D0
Index: graphics/jp2a/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/graphics/jp2a/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- graphics/jp2a/Makefile	25 Sep 2006 14:21:51 -0000	1.7
+++ graphics/jp2a/Makefile	6 Dec 2006 11:22:25 -0000
@@ -7,6 +7,7 @@
=20
 PORTNAME=3D	jp2a
 PORTVERSION=3D	1.0.6
+PORTREVISION=3D	1
 CATEGORIES=3D	graphics
 MASTER_SITES=3D	SF
=20
@@ -14,7 +15,7 @@
 COMMENT=3D	Converts JPG images to ASCII
=20
 LIB_DEPENDS=3D	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		curl.3:${PORTSDIR}/ftp/curl
+		curl.4:${PORTSDIR}/ftp/curl
=20
 USE_BZIP2=3D	yes
 GNU_CONFIGURE=3D	yes
Index: graphics/mapserver/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/graphics/mapserver/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- graphics/mapserver/Makefile	9 Oct 2006 08:18:34 -0000	1.14
+++ graphics/mapserver/Makefile	6 Dec 2006 11:22:35 -0000
@@ -7,7 +7,7 @@
=20
 PORTNAME=3D		mapserver
 PORTVERSION=3D		4.4.1
-PORTREVISION=3D		2
+PORTREVISION=3D		3
 CATEGORIES=3D		graphics www
 MASTER_SITES=3D		http://cvs.gis.umn.edu/dist/
=20
@@ -106,7 +106,7 @@
 .endif
=20
 .if defined(WITH_CURL)
-LIB_DEPENDS+=3D		curl.3:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=3D		curl.4:${PORTSDIR}/ftp/curl
 CONFIGURE_ARGS+=3D	--with-curl=3D${LOCALBASE}
 .endif
=20
Index: graphics/paintlib/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/graphics/paintlib/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- graphics/paintlib/Makefile	14 Aug 2006 23:06:37 -0000	1.6
+++ graphics/paintlib/Makefile	8 Dec 2006 14:54:21 -0000
@@ -7,7 +7,7 @@
=20
 PORTNAME=3D	paintlib
 PORTVERSION=3D	2.6.1
-PORTREVISION=3D	1
+PORTREVISION=3D	2
 CATEGORIES=3D	graphics devel
 MASTER_SITES=3D	http://www.paintlib.de/paintlib/
=20
Index: graphics/telak/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/graphics/telak/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- graphics/telak/Makefile	16 Jun 2006 10:00:35 -0000	1.4
+++ graphics/telak/Makefile	6 Dec 2006 11:22:31 -0000
@@ -7,6 +7,7 @@
=20
 PORTNAME=3D	telak
 PORTVERSION=3D	0.5
+PORTREVISION=3D	1
 CATEGORIES=3D	graphics
 MASTER_SITES=3D	http://julien.danjou.info/telak/ \
 		http://critical.ch/distfiles/ \
@@ -15,7 +16,7 @@
 MAINTAINER=3D	ehaupt@FreeBSD.org
 COMMENT=3D	A tool to draw pictures on your root window
=20
-LIB_DEPENDS=3D	curl.3:${PORTSDIR}/ftp/curl \
+LIB_DEPENDS=3D	curl.4:${PORTSDIR}/ftp/curl \
 		gcrypt.13:${PORTSDIR}/security/libgcrypt \
 		Imlib2.3:${PORTSDIR}/graphics/imlib2
=20
Index: irc/unreal/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/irc/unreal/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- irc/unreal/Makefile	1 Jul 2006 19:57:15 -0000	1.8
+++ irc/unreal/Makefile	6 Dec 2006 11:18:03 -0000
@@ -7,6 +7,7 @@
=20
 PORTNAME=3D	Unreal
 PORTVERSION=3D	3.2.5
+PORTREVISION=3D	1
 CATEGORIES=3D	irc
 MASTER_SITES=3D	http://www.ilmarinen.us/unreal/ \
 		http://unrealircd.alert-net.com/ \
@@ -84,9 +85,10 @@
 .endif
=20
 .if defined(WITH_REMOTE)
-BUILD_DEPENDS+=3D	${LOCALBASE}/lib/libares.a:${PORTSDIR}/dns/ares
-LIB_DEPENDS+=3D	curl.3:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=3D	cares.1:${PORTSDIR}/dns/c-ares curl.4:${PORTSDIR}/ftp/curl
 CONFIGURE_ARGS+=3D	--enable-libcurl=3D${LOCALBASE}
+CPPFLAGS+=3D	-I${LOCALBASE}/include
+LDFLAGS+=3D	-L${LOCALBASE}/lib
 .endif
=20
 .if defined(WITH_PREFIXAQ)
Index: irc/unreal/files/patch-Makefile.in
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: irc/unreal/files/patch-Makefile.in
diff -N irc/unreal/files/patch-Makefile.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ irc/unreal/files/patch-Makefile.in	5 Dec 2006 14:00:09 -0000
@@ -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=3D@CRYPTOLIB@
+ OPENSSLINCLUDES=3D
+=20
+-XCFLAGS=3D-I@TREINCDIR@ -I@CARESINCDIR@ @CARESLIBDIR@ @CFLAGS@
++XCFLAGS=3D-I@TREINCDIR@ @CFLAGS@
+ #
+ # use the following on MIPS:
+ #CFLAGS=3D -systype bsd43 -DSYSTYPE_BSD43 -I$(INCLUDEDIR)
Index: irc/unreal/files/patch-configure
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: irc/unreal/files/patch-configure
diff -N irc/unreal/files/patch-configure
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ irc/unreal/files/patch-configure	5 Dec 2006 13:59:23 -0000
@@ -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
+=20
+=20
+-cares_version=3D"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=3D`pwd`
+-cd extras
+-rm -rf c-ares-$cares_version
+-if test "x$ac_cv_path_GUNZIP" =3D "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=3D$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=3D"$cur_dir/extras/c-ares/include"
+-
+-CARESLIBDIR=3D"-L../extras/c-ares/lib"
+-
+ CARESLIBS=3D"-lcares"
+=20
+ cd $cur_dir
Index: lang/gambas/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/lang/gambas/Makefile,v
retrieving revision 1.51
diff -u -r1.51 Makefile
--- lang/gambas/Makefile	20 Sep 2006 11:21:46 -0000	1.51
+++ lang/gambas/Makefile	6 Dec 2006 11:18:19 -0000
@@ -6,7 +6,7 @@
=20
 PORTNAME=3D		gambas
 PORTVERSION=3D		1.0.17
-PORTREVISION=3D	1
+PORTREVISION=3D	2
 CATEGORIES=3D		lang
 MASTER_SITES=3D		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=3D	${PORTNAME}
@@ -14,7 +14,7 @@
 MAINTAINER=3D		thierry@FreeBSD.org
 COMMENT=3D		Gambas Almost Means BASic
=20
-LIB_DEPENDS=3D		curl.3:${PORTSDIR}/ftp/curl	\
+LIB_DEPENDS=3D		curl.4:${PORTSDIR}/ftp/curl	\
 			ml.0:${PORTSDIR}/math/ldouble
=20
 USE_AUTOTOOLS=3D		libltdl:15 libtool:15
Index: lang/php4/Makefile.ext
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/lang/php4/Makefile.ext,v
retrieving revision 1.29
diff -u -r1.29 Makefile.ext
--- lang/php4/Makefile.ext	10 Sep 2006 16:30:59 -0000	1.29
+++ lang/php4/Makefile.ext	6 Dec 2006 09:11:25 -0000
@@ -44,7 +44,7 @@
 .endif
=20
 .if ${PHP_MODNAME} =3D=3D "curl"
-LIB_DEPENDS+=3D	curl.3:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=3D	curl.4:${PORTSDIR}/ftp/curl
=20
 CONFIGURE_ARGS+=3D--with-curl=3D${LOCALBASE}
 .endif
Index: lang/php5/Makefile.ext
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/lang/php5/Makefile.ext,v
retrieving revision 1.33
diff -u -r1.33 Makefile.ext
--- lang/php5/Makefile.ext	6 Nov 2006 17:43:10 -0000	1.33
+++ lang/php5/Makefile.ext	5 Dec 2006 14:37:52 -0000
@@ -38,7 +38,7 @@
 .endif
=20
 .if ${PHP_MODNAME} =3D=3D "curl"
-LIB_DEPENDS+=3D	curl.3:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=3D	curl.4:${PORTSDIR}/ftp/curl
=20
 CONFIGURE_ARGS+=3D--with-curl=3D${LOCALBASE}
 .endif
Index: lang/q/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/lang/q/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- lang/q/Makefile	9 Oct 2006 18:51:19 -0000	1.21
+++ lang/q/Makefile	8 Dec 2006 12:00:08 -0000
@@ -7,7 +7,7 @@
=20
 PORTNAME=3D	q
 PORTVERSION=3D	6.2
-PORTREVISION=3D	5
+PORTREVISION=3D	6
 CATEGORIES=3D	lang
 MASTER_SITES=3D	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=3D	q-lang
Index: lang/q/files/patch-modules-curl-curl.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: lang/q/files/patch-modules-curl-curl.c
diff -N lang/q/files/patch-modules-curl-curl.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lang/q/files/patch-modules-curl-curl.c	8 Dec 2006 16:59:33 -0000
@@ -0,0 +1,35 @@
+--- modules/curl/curl.c.orig	Fri Dec  8 18:58:07 2006
++++ modules/curl/curl.c	Fri Dec  8 18:59:12 2006
+@@ -461,7 +461,9 @@
+   CURLOPT_WRITEFUNCTION,
+   CURLOPT_READFUNCTION,
+   CURLOPT_PROGRESSFUNCTION,
++#if LIBCURL_VERSION_NUM < 0x071000
+   CURLOPT_PASSWDFUNCTION,
++#endif
+   CURLOPT_HEADERFUNCTION,
+   CURLOPT_DEBUGFUNCTION,
+=20
+@@ -660,7 +662,9 @@
+      mkint(CURLOPT_WRITEFUNCTION),
+      mkint(CURLOPT_READFUNCTION),
+      mkint(CURLOPT_PROGRESSFUNCTION),
++#if LIBCURL_VERSION_NUM < 0x071000
+      mkint(CURLOPT_PASSWDFUNCTION),
++#endif
+      mkint(CURLOPT_HEADERFUNCTION),
+      mkint(CURLOPT_DEBUGFUNCTION),
+=20
+@@ -964,10 +968,12 @@
+ 	cb =3D (int(*)())progress_cb;
+ 	dataopt =3D CURLOPT_PROGRESSDATA;
+ 	break;
++#if LIBCURL_VERSION_NUM < 0x071000
+       case CURLOPT_PASSWDFUNCTION:
+ 	cb =3D (int(*)())passwd_cb;
+ 	dataopt =3D CURLOPT_PASSWDDATA;
+ 	break;
++#endif
+       case CURLOPT_HEADERFUNCTION:
+ 	cb =3D (int(*)())header_cb;
+ 	dataopt =3D CURLOPT_WRITEHEADER;
Index: lang/scriba/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/lang/scriba/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- lang/scriba/Makefile	9 May 2006 20:52:21 -0000	1.15
+++ lang/scriba/Makefile	6 Dec 2006 11:18:26 -0000
@@ -7,6 +7,7 @@
=20
 PORTNAME=3D	scriba
 PORTVERSION=3D	20b0
+PORTREVISION=3D	1
 CATEGORIES=3D	lang
 MASTER_SITES=3D	http://www.scriptbasic.com/download/
 DISTNAME=3D	${PORTNAME}-v2.0b0-source
@@ -49,7 +50,7 @@
 .endif
=20
 .if defined(WITH_CURL)
-LIB_DEPENDS+=3D	curl.3:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=3D	curl.4:${PORTSDIR}/ftp/curl
 PLIST_SUB+=3D	CURL=3D""
 .else
 PLIST_SUB+=3D	CURL=3D"@comment "
Index: mail/freepops/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/mail/freepops/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- mail/freepops/Makefile	10 May 2006 22:36:51 -0000	1.9
+++ mail/freepops/Makefile	8 Dec 2006 14:58:56 -0000
@@ -7,7 +7,7 @@
=20
 PORTNAME=3D	freepops
 PORTVERSION=3D	0.0.96
-PORTREVISION=3D	1
+PORTREVISION=3D	2
 CATEGORIES=3D	mail
 MASTER_SITES=3D	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=3D	freepops
Index: mail/sylpheed-claws-gtkhtml2_viewer/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/mail/sylpheed-claws-gtkhtml2_viewer/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- mail/sylpheed-claws-gtkhtml2_viewer/Makefile	3 Dec 2006 18:43:56 -0000	=
1.7
+++ mail/sylpheed-claws-gtkhtml2_viewer/Makefile	6 Dec 2006 11:18:35 -0000
@@ -7,7 +7,7 @@
=20
 PORTNAME=3D	gtkhtml2_viewer
 PORTVERSION=3D	0.12
-PORTREVISION=3D	1
+PORTREVISION=3D	2
 CATEGORIES=3D	mail
 MASTER_SITES=3D	http://sylpheed-claws.net/downloads/plugins/
 PKGNAMEPREFIX=3D	sylpheed-claws-
@@ -15,7 +15,7 @@
 MAINTAINER=3D	c0rn@o2.pl
 COMMENT=3D	HTML renderer plugin for sylpheed-claws
=20
-LIB_DEPENDS=3D	curl.3:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=3D	curl.4:${PORTSDIR}/ftp/curl
 BUILD_DEPENDS=3D	sylpheed-claws>=3D2.5:${PORTSDIR}/mail/sylpheed-claws
 RUN_DEPENDS=3D	sylpheed-claws>=3D2.5:${PORTSDIR}/mail/sylpheed-claws
=20
Index: mail/sylpheed-claws-rssyl/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/mail/sylpheed-claws-rssyl/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- mail/sylpheed-claws-rssyl/Makefile	3 Dec 2006 18:43:57 -0000	1.10
+++ mail/sylpheed-claws-rssyl/Makefile	6 Dec 2006 11:18:31 -0000
@@ -7,7 +7,7 @@
=20
 PORTNAME=3D	rssyl
 PORTVERSION=3D	0.7
-PORTREVISION=3D	1
+PORTREVISION=3D	2
 PORTEPOCH=3D	1
 CATEGORIES=3D	mail
 MASTER_SITES=3D	http://sylpheed-claws.net/downloads/plugins/
@@ -16,7 +16,7 @@
 MAINTAINER=3D	c0rn@o2.pl
 COMMENT=3D	A RSS/Atom plugin for sylheed-claws
=20
-LIB_DEPENDS=3D	curl.3:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=3D	curl.4:${PORTSDIR}/ftp/curl
 BUILD_DEPENDS=3D	sylpheed-claws>=3D2.5:${PORTSDIR}/mail/sylpheed-claws
 RUN_DEPENDS=3D	sylpheed-claws>=3D2.5:${PORTSDIR}/mail/sylpheed-claws
=20
Index: mail/sylpheed-claws-vcalendar/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/mail/sylpheed-claws-vcalendar/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- mail/sylpheed-claws-vcalendar/Makefile	3 Dec 2006 18:43:57 -0000	1.8
+++ mail/sylpheed-claws-vcalendar/Makefile	6 Dec 2006 11:18:38 -0000
@@ -7,7 +7,7 @@
=20
 PORTNAME=3D	vcalendar
 PORTVERSION=3D	1.89.1
-PORTREVISION=3D	2
+PORTREVISION=3D	3
 CATEGORIES=3D	mail
 MASTER_SITES=3D	http://sylpheed-claws.net/downloads/plugins/ \
 		${MASTER_SITE_LOCAL}
@@ -17,7 +17,7 @@
 MAINTAINER=3D	c0rn@o2.pl
 COMMENT=3D	vCalendar plugin for sylpheed-claws
=20
-LIB_DEPENDS=3D	curl.3:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=3D	curl.4:${PORTSDIR}/ftp/curl
 BUILD_DEPENDS=3D	sylpheed-claws>=3D2.5:${PORTSDIR}/mail/sylpheed-claws
 RUN_DEPENDS=3D	sylpheed-claws>=3D2.5:${PORTSDIR}/mail/sylpheed-claws
=20
Index: misc/bidwatcher/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/misc/bidwatcher/Makefile,v
retrieving revision 1.54
diff -u -r1.54 Makefile
--- misc/bidwatcher/Makefile	26 Jun 2006 18:01:17 -0000	1.54
+++ misc/bidwatcher/Makefile	6 Dec 2006 11:19:12 -0000
@@ -8,7 +8,7 @@
=20
 PORTNAME=3D	bidwatcher
 PORTVERSION=3D	1.3.17
-PORTREVISION?=3D	4
+PORTREVISION?=3D	5
 CATEGORIES=3D	misc
 MASTER_SITES=3D	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=3D	${PORTNAME}
@@ -20,7 +20,7 @@
 MAINTAINER=3D	obrien@FreeBSD.org
 COMMENT=3D	Bid monitor for eBay
=20
-LIB_DEPENDS=3D	curl.3:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=3D	curl.4:${PORTSDIR}/ftp/curl
=20
 PLIST_FILES=3D	bin/bidwatcher
 USE_GCC=3D	3.2+
Index: misc/esniper/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/misc/esniper/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- misc/esniper/Makefile	8 Nov 2006 21:06:02 -0000	1.3
+++ misc/esniper/Makefile	6 Dec 2006 11:18:52 -0000
@@ -6,6 +6,7 @@
=20
 PORTNAME=3D	esniper
 DISTVERSION=3D	2-15-0
+PORTREVISION=3D	1
 CATEGORIES=3D	misc net
 MASTER_SITES=3D	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=3D	${PORTNAME}
@@ -14,7 +15,7 @@
 MAINTAINER=3D	lewiz@compsoc.man.ac.uk
 COMMENT=3D	Lightweight tool for sniping ebay auctions
=20
-LIB_DEPENDS=3D	curl.3:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=3D	curl.4:${PORTSDIR}/ftp/curl
=20
 GNU_CONFIGURE=3D	yes
 USE_OPENSSL=3D	yes
Index: misc/gkrellm-helium/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/misc/gkrellm-helium/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- misc/gkrellm-helium/Makefile	10 May 2006 22:37:17 -0000	1.11
+++ misc/gkrellm-helium/Makefile	6 Dec 2006 11:19:18 -0000
@@ -7,7 +7,7 @@
=20
 PORTNAME=3D	gkrellm-helium
 PORTVERSION=3D	2.3.1
-PORTREVISION=3D	1
+PORTREVISION=3D	2
 CATEGORIES=3D	misc
 MASTER_SITES=3D	http://kmlinux.fjfi.cvut.cz/~makovick/gkrellm/
 EXTRACT_SUFX=3D	.tgz
@@ -16,7 +16,7 @@
 COMMENT=3D	GKrellM plugin reading data from helium thermometer at Strahov,=
 Prague
=20
 BUILD_DEPENDS=3D	${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutil=
s/gkrellm2
-LIB_DEPENDS=3D	curl.3:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=3D	curl.4:${PORTSDIR}/ftp/curl
 RUN_DEPENDS=3D	gkrellm:${PORTSDIR}/sysutils/gkrellm2
=20
 PLIST_FILES=3D	libexec/gkrellm2/plugins/helium.so
Index: misc/sword/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/misc/sword/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- misc/sword/Makefile	31 Oct 2006 04:56:09 -0000	1.23
+++ misc/sword/Makefile	8 Dec 2006 14:59:02 -0000
@@ -7,7 +7,7 @@
=20
 PORTNAME=3D	sword
 PORTVERSION=3D	1.5.9
-PORTREVISION=3D	1
+PORTREVISION=3D	2
 CATEGORIES=3D	misc
 MASTER_SITES=3D	ftp://ftp.crosswire.org/pub/sword/source/v1.5/ \
     		http://www.goodking.ca/pub/files/
Index: misc/wmweather/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/misc/wmweather/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- misc/wmweather/Makefile	23 Apr 2005 23:01:56 -0000	1.17
+++ misc/wmweather/Makefile	6 Dec 2006 11:19:26 -0000
@@ -6,13 +6,14 @@
=20
 PORTNAME=3D	wmweather
 PORTVERSION=3D	2.4.3
+PORTREVISION=3D	1
 CATEGORIES=3D	misc windowmaker
 MASTER_SITES=3D	http://www.godisch.de/debian/wmweather/
=20
 MAINTAINER=3D	kris@FreeBSD.org
 COMMENT=3D	A WMaker dockapp which displays meteorological data for your ci=
ty
=20
-LIB_DEPENDS=3D	curl.3:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=3D	curl.4:${PORTSDIR}/ftp/curl
 BUILD_DEPENDS=3D	xmessage:${X_CLIENTS_PORT}
 RUN_DEPENDS=3D	xmessage:${X_CLIENTS_PORT}
=20
Index: multimedia/xine/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/multimedia/xine/Makefile,v
retrieving revision 1.69
diff -u -r1.69 Makefile
--- multimedia/xine/Makefile	7 Dec 2006 17:17:44 -0000	1.69
+++ multimedia/xine/Makefile	8 Dec 2006 17:13:40 -0000
@@ -18,7 +18,7 @@
=20
 LIB_DEPENDS=3D	xine.16:${PORTSDIR}/multimedia/libxine \
 		png.5:${PORTSDIR}/graphics/png \
-		curl.3:${PORTSDIR}/ftp/curl
+		curl.4:${PORTSDIR}/ftp/curl
=20
 USE_GETTEXT=3D	yes
 USE_X_PREFIX=3D	yes
Index: net-im/centericq/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/net-im/centericq/Makefile,v
retrieving revision 1.110
diff -u -r1.110 Makefile
--- net-im/centericq/Makefile	13 Sep 2006 21:24:19 -0000	1.110
+++ net-im/centericq/Makefile	6 Dec 2006 11:21:36 -0000
@@ -8,7 +8,7 @@
=20
 PORTNAME=3D	centericq
 PORTVERSION=3D	4.21.0
-PORTREVISION=3D	6
+PORTREVISION=3D	7
 CATEGORIES=3D	net-im
 MASTER_SITES=3D	http://centericq.de/archive/source/releases/ \
 		http://thekonst.net/download/
@@ -65,7 +65,7 @@
 .if !defined(WITH_MSN)
 CONFIGURE_ARGS+=3D	--disable-msn
 .else
-LIB_DEPENDS+=3D		curl.3:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=3D		curl.4:${PORTSDIR}/ftp/curl
 .endif
=20
 .if !defined(WITH_YAHOO)
Index: net-im/cli-msn/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/net-im/cli-msn/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- net-im/cli-msn/Makefile	23 Jul 2006 02:45:14 -0000	1.3
+++ net-im/cli-msn/Makefile	6 Dec 2006 11:21:46 -0000
@@ -7,6 +7,7 @@
=20
 PORTNAME=3D	msn
 PORTVERSION=3D	2.3
+PORTREVISION=3D	1
 CATEGORIES=3D	net-im
 MASTER_SITES=3D	http://mor-pah.net/code/
 PKGNAMEPREFIX=3D	cli-
@@ -15,7 +16,7 @@
 MAINTAINER=3D	acm@FreeBSD.org
 COMMENT=3D	Command line msn messenger
=20
-LIB_DEPENDS=3D	curl.3:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=3D	curl.4:${PORTSDIR}/ftp/curl
=20
 USE_GMAKE=3D	yes
 GNU_CONFIGURE=3D	yes
Index: net-im/libmsn/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/net-im/libmsn/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- net-im/libmsn/Makefile	15 Aug 2006 00:56:19 -0000	1.7
+++ net-im/libmsn/Makefile	6 Dec 2006 11:21:41 -0000
@@ -8,7 +8,7 @@
=20
 PORTNAME=3D	libmsn
 PORTVERSION=3D	3.2
-PORTREVISION=3D	1
+PORTREVISION=3D	2
 CATEGORIES=3D	net-im
 MASTER_SITES=3D	http://libmsn.bdash.net.nz/files/ \
 		${MASTER_SITE_SOURCEFORGE}
@@ -17,7 +17,7 @@
 MAINTAINER=3D	ports@FreeBSD.org
 COMMENT=3D	A library for connecting to MSN Messenger service
=20
-LIB_DEPENDS=3D	curl.3:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=3D	curl.4:${PORTSDIR}/ftp/curl
=20
 GNU_CONFIGURE=3D	yes
 USE_LDCONFIG=3D	yes
Index: net-p2p/amule1/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/net-p2p/amule1/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- net-p2p/amule1/Makefile	1 Dec 2006 07:38:58 -0000	1.23
+++ net-p2p/amule1/Makefile	6 Dec 2006 11:21:50 -0000
@@ -7,7 +7,7 @@
=20
 PORTNAME=3D	aMule
 PORTVERSION=3D	1.2.8
-PORTREVISION=3D	5
+PORTREVISION=3D	6
 CATEGORIES=3D	net-p2p
 #MASTER_SITES=3D	http://download.berlios.de/amule/
 MASTER_SITES=3D	${MASTER_SITE_SOURCEFORGE}
@@ -18,7 +18,7 @@
=20
 DEPRECATED=3D	use net-p2p/amule2 if you are running OSVERSION > 500000
=20
-LIB_DEPENDS=3D	curl.3:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=3D	curl.4:${PORTSDIR}/ftp/curl
=20
 LATEST_LINK=3D	aMule1
 CONFLICTS=3D	aMule-2.* aMule-devel-[0-9]*
Index: net-p2p/gtorrentviewer/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/net-p2p/gtorrentviewer/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- net-p2p/gtorrentviewer/Makefile	14 Oct 2006 08:54:41 -0000	1.9
+++ net-p2p/gtorrentviewer/Makefile	6 Dec 2006 11:22:00 -0000
@@ -7,7 +7,7 @@
=20
 PORTNAME=3D	gtorrentviewer
 PORTVERSION=3D	0.2b
-PORTREVISION=3D	5
+PORTREVISION=3D	6
 CATEGORIES=3D	net-p2p
 MASTER_SITES=3D	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=3D	${PORTNAME}
@@ -16,7 +16,7 @@
 MAINTAINER=3D	ports@FreeBSD.org
 COMMENT=3D	GTK+2 viewer and editor for BitTorrent meta files
=20
-LIB_DEPENDS=3D	curl.3:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=3D	curl.4:${PORTSDIR}/ftp/curl
=20
 USE_GNOME=3D	gtk20 gnomehier intlhack
 USE_XLIB=3D	yes
Index: net-p2p/jigdo/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/net-p2p/jigdo/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- net-p2p/jigdo/Makefile	11 Sep 2006 23:38:51 -0000	1.17
+++ net-p2p/jigdo/Makefile	8 Dec 2006 14:18:17 -0000
@@ -7,6 +7,7 @@
=20
 PORTNAME=3D	jigdo
 PORTVERSION=3D	0.7.3
+PORTREVISION=3D	1
 CATEGORIES=3D	net-p2p
 MASTER_SITES=3D	http://www.atterer.net/jigdo/
=20
Index: net-p2p/libbt/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/net-p2p/libbt/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- net-p2p/libbt/Makefile	18 Sep 2006 10:20:32 -0000	1.17
+++ net-p2p/libbt/Makefile	6 Dec 2006 11:22:07 -0000
@@ -7,6 +7,7 @@
=20
 PORTNAME=3D	libbt
 PORTVERSION=3D	1.05
+PORTREVISION=3D	1
 CATEGORIES=3D	net-p2p devel
 MASTER_SITES=3D	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=3D	${PORTNAME}
@@ -14,7 +15,7 @@
 MAINTAINER=3D	flz@FreeBSD.org
 COMMENT=3D	C library implementing the core BitTorrent protocol
=20
-LIB_DEPENDS=3D	curl.3:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=3D	curl.4:${PORTSDIR}/ftp/curl
=20
 GNU_CONFIGURE=3D	yes
 USE_GMAKE=3D	yes
Index: net-p2p/rtorrent/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/net-p2p/rtorrent/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- net-p2p/rtorrent/Makefile	8 Nov 2006 12:11:38 -0000	1.23
+++ net-p2p/rtorrent/Makefile	6 Dec 2006 11:22:12 -0000
@@ -7,7 +7,7 @@
=20
 PORTNAME?=3D	rtorrent
 PORTVERSION?=3D	0.6.4
-PORTREVISION?=3D	0
+PORTREVISION?=3D	1
 CATEGORIES=3D	net-p2p
 MASTER_SITES=3D	http://libtorrent.rakshasa.no/downloads/
=20
@@ -15,7 +15,7 @@
 COMMENT?=3D	BitTorrent Client written in C++
=20
 LIB_DEPENDS?=3D	torrent.9:${PORTSDIR}/net-p2p/libtorrent
-LIB_DEPENDS+=3D	curl.3:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=3D	curl.4:${PORTSDIR}/ftp/curl
=20
 CONFLICTS?=3D	rtorrent-devel-[0-9]*
=20
Index: net/asterisk/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/net/asterisk/Makefile,v
retrieving revision 1.62
diff -u -r1.62 Makefile
--- net/asterisk/Makefile	5 Dec 2006 10:14:29 -0000	1.62
+++ net/asterisk/Makefile	6 Dec 2006 11:19:45 -0000
@@ -7,7 +7,7 @@
=20
 PORTNAME=3D	asterisk
 PORTVERSION=3D	1.2.13
-PORTREVISION=3D	1
+PORTREVISION=3D	2
 CATEGORIES=3D	net
 MASTER_SITES=3D	http://ftp.digium.com/pub/asterisk/ \
 		http://ftp.digium.com/pub/asterisk/old-releases/
@@ -26,7 +26,7 @@
 BUILD_DEPENDS=3D	mpg123:${PORTSDIR}/audio/mpg123
 LIB_DEPENDS=3D	speex.3:${PORTSDIR}/audio/speex \
 		newt.51:${PORTSDIR}/devel/newt \
-		curl.3:${PORTSDIR}/ftp/curl
+		curl.4:${PORTSDIR}/ftp/curl
 RUN_DEPENDS=3D	mpg123:${PORTSDIR}/audio/mpg123
=20
 ONLY_FOR_ARCHS=3D	i386 sparc64 amd64
Index: net/asterisk-bristuff/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/net/asterisk-bristuff/Makefile,v
retrieving revision 1.63
diff -u -r1.63 Makefile
--- net/asterisk-bristuff/Makefile	30 Nov 2006 18:24:51 -0000	1.63
+++ net/asterisk-bristuff/Makefile	6 Dec 2006 11:20:01 -0000
@@ -7,7 +7,7 @@
=20
 PORTNAME=3D	asterisk
 PORTVERSION=3D	1.2.13
-PORTREVISION=3D	2
+PORTREVISION=3D	3
 CATEGORIES=3D	net
 MASTER_SITES=3D	http://ftp.digium.com/pub/asterisk/ \
 		http://ftp.digium.com/pub/asterisk/old-releases/
@@ -26,7 +26,7 @@
 BUILD_DEPENDS=3D	mpg123:${PORTSDIR}/audio/mpg123
 LIB_DEPENDS=3D	speex.3:${PORTSDIR}/audio/speex \
 		newt.51:${PORTSDIR}/devel/newt \
-		curl.3:${PORTSDIR}/ftp/curl
+		curl.4:${PORTSDIR}/ftp/curl
 RUN_DEPENDS=3D	mpg123:${PORTSDIR}/audio/mpg123
=20
 ONLY_FOR_ARCHS=3D	i386 sparc64 amd64
Index: net/boinc-client/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/net/boinc-client/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- net/boinc-client/Makefile	2 Dec 2006 12:33:28 -0000	1.22
+++ net/boinc-client/Makefile	8 Dec 2006 14:59:13 -0000
@@ -7,6 +7,7 @@
=20
 PORTNAME=3D	boinc-client
 PORTVERSION=3D	5.4.9
+PORTREVISION=3D	1
 CATEGORIES=3D	net
 MASTER_SITES=3D	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=3D	pav
Index: net/nepenthes/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/net/nepenthes/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- net/nepenthes/Makefile	27 Nov 2006 01:19:55 -0000	1.8
+++ net/nepenthes/Makefile	6 Dec 2006 11:19:48 -0000
@@ -7,7 +7,7 @@
=20
 PORTNAME=3D	nepenthes
 PORTVERSION=3D	0.1.7
-PORTREVISION=3D	2
+PORTREVISION=3D	3
 CATEGORIES=3D	net
 MASTER_SITES=3D	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=3D	nepenthes
@@ -15,7 +15,7 @@
 MAINTAINER=3D	systemoperator@gmail.com
 COMMENT=3D	Determine the malware activity on a network
=20
-LIB_DEPENDS=3D	curl.3:${PORTSDIR}/ftp/curl \
+LIB_DEPENDS=3D	curl.4:${PORTSDIR}/ftp/curl \
 		magic.1:${PORTSDIR}/sysutils/file \
 		pcre.0:${PORTSDIR}/devel/pcre \
 		adns.1:${PORTSDIR}/dns/adns
Index: net/nepenthes/files/patch-modules-download-curl-download-curl.cpp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: net/nepenthes/files/patch-modules-download-curl-download-curl.cpp
diff -N net/nepenthes/files/patch-modules-download-curl-download-curl.cpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ net/nepenthes/files/patch-modules-download-curl-download-curl.cpp	5 Dec=
 2006 13:54:33 -0000
@@ -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 =3D down->getDownloadUrl()->getUser() + ":" + down-=
>getDownloadUrl()->getPass();
++#if LIBCURL_VERSION_NUM < 0x071000
+ 		curl_easy_setopt(pCurlHandle, CURLOPT_SOURCE_USERPWD,(char *)down->getD=
ownloadUrl()->getAuth().c_str());
++#endif
+ 		curl_easy_setopt(pCurlHandle, CURLOPT_USERPWD,(char *)down->getDownload=
Url()->getAuth().c_str());
+ 		curl_easy_setopt(pCurlHandle, CURLOPT_URL			, url);
+ 		curl_easy_setopt(pCurlHandle, CURLOPT_FTP_RESPONSE_TIMEOUT, 120);	// 2 =
min ftp timeout
Index: net/wmlj/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/net/wmlj/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- net/wmlj/Makefile	7 Nov 2006 15:37:04 -0000	1.14
+++ net/wmlj/Makefile	6 Dec 2006 11:19:53 -0000
@@ -7,7 +7,7 @@
=20
 PORTNAME=3D	wmlj
 PORTVERSION=3D	0.4.0
-PORTREVISION=3D	1
+PORTREVISION=3D	2
 CATEGORIES=3D	net
 MASTER_SITES=3D	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=3D	${PORTNAME}
@@ -15,7 +15,7 @@
 MAINTAINER=3D	laszlof@FreeBSD.org
 COMMENT=3D	A dockapp that monitors your friends list at LiveJournal.com
=20
-LIB_DEPENDS=3D	curl.3:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=3D	curl.4:${PORTSDIR}/ftp/curl
=20
 GNU_CONFIGURE=3D	yes
 USE_GNOME=3D	gtk12
Index: polish/sms2/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/polish/sms2/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- polish/sms2/Makefile	8 Aug 2005 04:16:53 -0000	1.18
+++ polish/sms2/Makefile	6 Dec 2006 11:20:08 -0000
@@ -7,6 +7,7 @@
=20
 PORTNAME=3D	sms
 PORTVERSION=3D	2.0.3
+PORTREVISION=3D	1
 CATEGORIES=3D	polish
 MASTER_SITES=3D	http://ceti.pl/~miki/komputery/download/sms/ \
 		http://radioemiter.pl/~mjd/slackware/sms2/ \
@@ -16,7 +17,7 @@
 MAINTAINER=3D	pyzmen@kam.pl
 COMMENT=3D	Send SMS to cellular phones in Poland (Idea, ERA, Plus)
=20
-LIB_DEPENDS=3D	curl.3:${PORTSDIR}/ftp/curl \
+LIB_DEPENDS=3D	curl.4:${PORTSDIR}/ftp/curl \
 		pcre.0:${PORTSDIR}/devel/pcre \
 		gdbm.3:${PORTSDIR}/databases/gdbm \
 		pcre\\+\\+.0:${PORTSDIR}/devel/pcre++
Index: print/foomatic-db/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/print/foomatic-db/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- print/foomatic-db/Makefile	6 Nov 2006 16:39:53 -0000	1.21
+++ print/foomatic-db/Makefile	6 Dec 2006 11:20:17 -0000
@@ -7,6 +7,7 @@
=20
 PORTNAME=3D	db
 PORTVERSION=3D	20061031
+PORTREVISION=3D	1
 CATEGORIES=3D	print
 MASTER_SITES=3D	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=3D	acm/foomatic
@@ -18,7 +19,7 @@
 COMMENT=3D	Foomatic database
=20
 LIB_DEPENDS=3D	xml2.5:${PORTSDIR}/textproc/libxml2 \
-		curl.3:${PORTSDIR}/ftp/curl
+		curl.4:${PORTSDIR}/ftp/curl
=20
 USE_GMAKE=3D	yes
 USE_PERL5=3D	yes
Index: security/authforce/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/security/authforce/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- security/authforce/Makefile	4 Dec 2005 10:58:18 -0000	1.11
+++ security/authforce/Makefile	6 Dec 2006 11:20:22 -0000
@@ -7,14 +7,14 @@
=20
 PORTNAME=3D	authforce
 PORTVERSION=3D	0.9.6
-PORTREVISION=3D	4
+PORTREVISION=3D	5
 CATEGORIES=3D	security www
 MASTER_SITES=3D	http://www.divineinvasion.net/authforce/
=20
 MAINTAINER=3D	ache@FreeBSD.org
 COMMENT=3D	HTTP authentication brute forcer
=20
-LIB_DEPENDS=3D	curl.3:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=3D	curl.4:${PORTSDIR}/ftp/curl
=20
 USE_BZIP2=3D	yes
 USE_GETOPT_LONG=3Dyes
Index: security/authforce/files/patch-ae
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: security/authforce/files/patch-ae
diff -N security/authforce/files/patch-ae
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ security/authforce/files/patch-ae	5 Dec 2006 14:06:52 -0000
@@ -0,0 +1,12 @@
+--- src/http.c.orig	Tue Dec  5 16:06:36 2006
++++ src/http.c	Tue Dec  5 16:06:24 2006
+@@ -68,7 +68,9 @@
+ 		curl_easy_setopt(curl, CURLOPT_FAILONERROR, 1);
+ 		curl_easy_setopt(curl, CURLOPT_USERPWD, authstring);
+ 		curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
++#if LIBCURL_VERSION_NUM < 0x071000
+ 		curl_easy_setopt(curl, CURLOPT_MUTE, 1);
++#endif
+ 		curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 1);
+ 		curl_easy_setopt(curl, CURLOPT_USERAGENT, user_agent);
+ 		if (strcmp(proxy, "undef"))
Index: security/clamav/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/security/clamav/Makefile,v
retrieving revision 1.84
diff -u -r1.84 Makefile
--- security/clamav/Makefile	6 Nov 2006 11:03:43 -0000	1.84
+++ security/clamav/Makefile	6 Dec 2006 11:20:29 -0000
@@ -7,6 +7,7 @@
=20
 PORTNAME=3D	clamav
 PORTVERSION=3D	0.88.6
+PORTREVISION=3D	1
 CATEGORIES=3D	security
 MASTER_SITES=3D	SF
=20
@@ -115,7 +116,7 @@
 .endif
=20
 .if defined(WITH_CURL)
-LIB_DEPENDS+=3D		curl.3:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=3D		curl.4:${PORTSDIR}/ftp/curl
 CONFIGURE_ARGS+=3D	--with-libcurl
 .else
 CONFIGURE_ARGS+=3D	--without-libcurl
Index: security/gnupg/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/security/gnupg/Makefile,v
retrieving revision 1.91
diff -u -r1.91 Makefile
--- security/gnupg/Makefile	7 Dec 2006 00:34:16 -0000	1.91
+++ security/gnupg/Makefile	8 Dec 2006 17:12:57 -0000
@@ -7,6 +7,7 @@
=20
 PORTNAME=3D	gnupg
 PORTVERSION=3D	1.4.6
+PORTREVISION=3D	1
 CATEGORIES=3D	security
 MASTER_SITES=3D	${MASTER_SITE_GNUPG}
 MASTER_SITE_SUBDIR=3D	gnupg
Index: security/osslsigncode/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/security/osslsigncode/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- security/osslsigncode/Makefile	11 Nov 2006 13:55:05 -0000	1.1
+++ security/osslsigncode/Makefile	6 Dec 2006 11:20:34 -0000
@@ -7,6 +7,7 @@
=20
 PORTNAME=3D	osslsigncode
 PORTVERSION=3D	1.2
+PORTREVISION=3D	1
 CATEGORIES=3D	security devel
 MASTER_SITES=3D	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=3D	${PORTNAME}
@@ -24,7 +25,7 @@
 USE_OPENSSL=3D	yes
=20
 .if !defined(WITHOUT_CURL)
-LIB_DEPENDS+=3D	curl.3:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=3D	curl.4:${PORTSDIR}/ftp/curl
 .endif
=20
 .include <bsd.port.mk>
Index: sysutils/fusefs-curlftpfs/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/sysutils/fusefs-curlftpfs/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- sysutils/fusefs-curlftpfs/Makefile	30 Jul 2006 22:46:02 -0000	1.4
+++ sysutils/fusefs-curlftpfs/Makefile	6 Dec 2006 11:20:45 -0000
@@ -7,6 +7,7 @@
=20
 PORTNAME=3D	curlftpfs
 PORTVERSION=3D	0.8
+PORTREVISION=3D	1
 CATEGORIES=3D	sysutils
 MASTER_SITES=3D	SF
 PKGNAMEPREFIX=3D	fusefs-
@@ -15,7 +16,7 @@
 COMMENT=3D	Mount remote ftp directories
=20
 LIB_DEPENDS=3D	fuse.2:${PORTSDIR}/sysutils/fusefs-libs \
-		curl.3:${PORTSDIR}/ftp/curl
+		curl.4:${PORTSDIR}/ftp/curl
 RUN_DEPENDS=3D	${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-km=
od
=20
 GNU_CONFIGURE=3D	yes
Index: sysutils/heartbeat/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/sysutils/heartbeat/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- sysutils/heartbeat/Makefile	13 Nov 2006 12:33:03 -0000	1.9
+++ sysutils/heartbeat/Makefile	6 Dec 2006 11:20:39 -0000
@@ -7,7 +7,7 @@
=20
 PORTNAME=3D	heartbeat
 PORTVERSION=3D	1.2.5
-PORTREVISION=3D	1
+PORTREVISION=3D	2
 CATEGORIES=3D	sysutils
 MASTER_SITES=3D	http://linux-ha.org/download/
=20
@@ -15,7 +15,7 @@
 COMMENT=3D	Subsystem for High-Availability Clustering
=20
 BUILD_DEPENDS=3D	libnet*>=3D1.1.2,1:${PORTSDIR}/net/libnet
-LIB_DEPENDS=3D	curl.3:${PORTSDIR}/ftp/curl \
+LIB_DEPENDS=3D	curl.4:${PORTSDIR}/ftp/curl \
 		xml2.5:${PORTSDIR}/textproc/libxml2
=20
 GNU_CONFIGURE=3D	yes
Index: textproc/libnxml/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/textproc/libnxml/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- textproc/libnxml/Makefile	8 Nov 2006 23:36:25 -0000	1.7
+++ textproc/libnxml/Makefile	6 Dec 2006 11:20:58 -0000
@@ -7,6 +7,7 @@
=20
 PORTNAME=3D	libnxml
 PORTVERSION=3D	0.15
+PORTREVISION=3D	1
 CATEGORIES=3D	textproc devel
 MASTER_SITES=3D	http://www2.autistici.org/bakunin/libnxml/ \
 		http://nivi.interfree.it/distfiles/${PORTNAME}/${PORTVERSION}/
@@ -14,7 +15,7 @@
 MAINTAINER=3D	nivit@email.it
 COMMENT=3D	A C library for writing XML 1.0/1.1 files or streams
=20
-LIB_DEPENDS=3D	curl.3:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=3D	curl.4:${PORTSDIR}/ftp/curl
=20
 GNU_CONFIGURE=3D	yes
 CONFIGURE_ENV+=3D	CFLAGS=3D"${CFLAGS} -I/${LOCALBASE}/include" LDFLAGS=3D"=
${LDFLAGS} -L${LOCALBASE}/lib"
Index: textproc/raptor/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/textproc/raptor/Makefile,v
retrieving revision 1.38
diff -u -r1.38 Makefile
--- textproc/raptor/Makefile	28 Jul 2006 13:26:02 -0000	1.38
+++ textproc/raptor/Makefile	6 Dec 2006 11:20:51 -0000
@@ -8,7 +8,7 @@
=20
 PORTNAME=3D	raptor
 PORTVERSION=3D	1.4.9
-#PORTREVISION=3D	1
+PORTREVISION=3D	1
 CATEGORIES=3D	textproc
 MASTER_SITES=3D	${MASTER_SITE_SOURCEFORGE} \
 		http://download.librdf.org/source/
@@ -17,7 +17,7 @@
 MAINTAINER=3D	chuck@pkix.net
 COMMENT=3D	RDF Parser Toolkit for Redland
=20
-LIB_DEPENDS=3D	curl.3:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=3D	curl.4:${PORTSDIR}/ftp/curl
=20
 USE_GNOME=3D	gnomehack gnometarget libxml2
 USE_GETOPT_LONG=3D	yes
Index: www/osb-nrcit/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/www/osb-nrcit/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- www/osb-nrcit/Makefile	15 Aug 2006 01:11:32 -0000	1.10
+++ www/osb-nrcit/Makefile	6 Dec 2006 11:21:15 -0000
@@ -7,7 +7,7 @@
=20
 PORTNAME=3D	osb-nrcit
 PORTVERSION=3D	0.5.0
-PORTREVISION=3D	2
+PORTREVISION=3D	3
 CATEGORIES=3D	www
 MASTER_SITES=3D	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=3D	gtk-webcore
@@ -16,7 +16,7 @@
 COMMENT=3D	Embeddable web component using KJS, KHTML and KWIQ
=20
 LIB_DEPENDS=3D	nrcore.0:${PORTSDIR}/www/osb-nrcore \
-		curl.3:${PORTSDIR}/ftp/curl
+		curl.4:${PORTSDIR}/ftp/curl
=20
 USE_GNOME=3D	gtk20 gnomehack
 USE_LDCONFIG=3D	yes
Index: www/p5-WWW-Curl/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/www/p5-WWW-Curl/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- www/p5-WWW-Curl/Makefile	13 Jul 2006 14:22:26 -0000	1.5
+++ www/p5-WWW-Curl/Makefile	6 Dec 2006 11:21:21 -0000
@@ -7,6 +7,7 @@
=20
 PORTNAME=3D	WWW-Curl
 PORTVERSION=3D	3.02
+PORTREVISION=3D	1
 CATEGORIES=3D	www ftp perl5
 MASTER_SITES=3D	${MASTER_SITE_PERL_CPAN} \
 		http://curl.haxx.se/libcurl/perl/
@@ -16,7 +17,7 @@
 MAINTAINER=3D	roam@FreeBSD.org
 COMMENT=3D	Perl binding interface for curl
=20
-LIB_DEPENDS=3D	curl.3:${PORTSDIR}/ftp/curl:install
+LIB_DEPENDS=3D	curl.4:${PORTSDIR}/ftp/curl:install
=20
 PERL_CONFIGURE=3D	yes
=20
Index: www/pecl-pecl_http/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/www/pecl-pecl_http/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- www/pecl-pecl_http/Makefile	31 Oct 2006 06:40:04 -0000	1.11
+++ www/pecl-pecl_http/Makefile	8 Dec 2006 17:19:29 -0000
@@ -7,6 +7,7 @@
=20
 PORTNAME=3D	pecl_http
 DISTVERSION=3D	1.3.3
+PORTREVISION=3D	1
 CATEGORIES=3D	www pear
 MASTER_SITES=3D	http://pecl.php.net/get/
 PKGNAMEPREFIX=3D	pecl-
@@ -32,7 +33,7 @@
 .include <bsd.port.pre.mk>
=20
 .if defined(WITH_CURL)
-LIB_DEPENDS+=3D	curl.3:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=3D	curl.4:${PORTSDIR}/ftp/curl
 CONFIGURE_ARGS+=3D--with-http-curl-requests=3D${LOCALBASE}
 .else
 CONFIGURE_ARGS+=3D--without-http-curl-requests
Index: www/wsdlpull/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/www/wsdlpull/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- www/wsdlpull/Makefile	1 Dec 2006 23:48:07 -0000	1.11
+++ www/wsdlpull/Makefile	6 Dec 2006 11:21:28 -0000
@@ -8,6 +8,7 @@
=20
 PORTNAME=3D	wsdlpull
 PORTVERSION=3D	1.12
+PORTREVISION=3D	1
 CATEGORIES=3D	www
 MASTER_SITES=3D	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=3D	${PORTNAME}
@@ -15,7 +16,7 @@
 MAINTAINER=3D	ports@FreeBSD.org
 COMMENT=3D	C++ WSDL Parser
=20
-LIB_DEPENDS=3D	curl.3:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=3D	curl.4:${PORTSDIR}/ftp/curl
=20
 USE_GNOME=3D	gnometarget
 USE_GCC=3D	3.4+
Index: www/xshttpd-devel/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/www/xshttpd-devel/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- www/xshttpd-devel/Makefile	27 Nov 2006 18:05:38 -0000	1.17
+++ www/xshttpd-devel/Makefile	8 Dec 2006 14:59:21 -0000
@@ -7,6 +7,7 @@
=20
 PORTNAME=3D	xshttpd
 DISTVERSION=3D	3.4b20
+PORTREVISION=3D	1
 CATEGORIES=3D	www ipv6
 MASTER_SITES=3D	ftp://ftp.stack.nl/pub/xs-httpd/release/ \
 		ftp://mud.stack.nl/pub/xs-httpd/release/
Index: x11/ecore/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/x11/ecore/Makefile,v
retrieving revision 1.34
diff -u -r1.34 Makefile
--- x11/ecore/Makefile	19 Oct 2006 13:30:29 -0000	1.34
+++ x11/ecore/Makefile	6 Dec 2006 11:21:32 -0000
@@ -7,7 +7,7 @@
=20
 PORTNAME=3D	ecore
 PORTVERSION=3D	20060926
-PORTREVISION=3D	1
+PORTREVISION=3D	2
 PORTEPOCH=3D	1
 CATEGORIES=3D	x11
 MASTER_SITES=3D	http://sunner.elcomnet.ru/~stas/
@@ -55,7 +55,7 @@
=20
 .if !defined(WITHOUT_CURL)
 CONFIGURE_ARGS+=3D	--enable-curl
-LIB_DEPENDS+=3D		curl.3:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=3D		curl.4:${PORTSDIR}/ftp/curl
 PLIST_SUB+=3D		CURL=3D""
 .else
 CONFIGURE_ARGS+=3D	--disable-curl
Index: x11/ecore/pkg-plist
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/x11/ecore/pkg-plist,v
retrieving revision 1.6
diff -u -r1.6 pkg-plist
--- x11/ecore/pkg-plist	8 Oct 2006 13:48:36 -0000	1.6
+++ x11/ecore/pkg-plist	4 Dec 2006 12:36:55 -0000
@@ -59,7 +59,7 @@
 lib/libecore_txt.la
 lib/libecore_txt.so
 lib/libecore_txt.so.1
-lib/libecore_x.a
+%%X11%%lib/libecore_x.a
 %%X11%%lib/libecore_x.la
 %%X11%%lib/libecore_x.so
 %%X11%%lib/libecore_x.so.1

--XWOWbaMNXpFDWE00
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="curl-16-02.patch.asc"

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (FreeBSD)

iD8DBQBFeaYE7Ri2jRYZRVMRAvWPAKClsmQdQhsbsXmyGceYHjY96Id1kwCfcr1s
06crNYw/4evDYbmp0+VEOWI=
=k0OJ
-----END PGP SIGNATURE-----

--XWOWbaMNXpFDWE00--

--W5WqUoFLvi1M7tJE
Content-Type: application/pgp-signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (FreeBSD)

iD8DBQFFeaen7Ri2jRYZRVMRAvKCAJ44mkzoCSkyHQSUaKA3s7H/8AWqVwCePjQT
5ZTMkQmmonpqQvHaNcOT+NU=
=zF4u
-----END PGP SIGNATURE-----

--W5WqUoFLvi1M7tJE--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20061208175759.GA53807>