diff options
120 files changed, 823 insertions, 148 deletions
diff --git a/archivers/epkg/Makefile b/archivers/epkg/Makefile index 2f33fa82b786..fe3764e305b6 100644 --- a/archivers/epkg/Makefile +++ b/archivers/epkg/Makefile @@ -7,16 +7,16 @@ PORTNAME= epkg PORTVERSION= 2.3.9 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= archivers MASTER_SITES= ftp://ftp.feep.net/pub/encap/epkg/ MAINTAINER= pirzyk@freebsd.org COMMENT= Encap Package Manager -BUILD_DEPENDS= ${LOCALBASE}/lib/libexpat.a:${PORTSDIR}/textproc/expat2 \ - ${LOCALBASE}/lib/libfget.a:${PORTSDIR}/ftp/fget \ - ${LOCALBASE}/lib/libcurl.a:${PORTSDIR}/ftp/curl +BUILD_DEPENDS= ${LOCALBASE}/lib/libfget.a:${PORTSDIR}/ftp/fget +LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl \ + expat.6:${PORTSDIR}/textproc/expat2 HAS_CONFIGURE= YES CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${PREFIX}/lib diff --git a/archivers/xar/Makefile b/archivers/xar/Makefile index cd27b9be7569..0e6d5cbfe61b 100644 --- a/archivers/xar/Makefile +++ b/archivers/xar/Makefile @@ -7,6 +7,7 @@ PORTNAME= xar DISTVERSION= 1.4 +PORTREVISION= 1 CATEGORIES= archivers MASTER_SITES= http://www.opendarwin.org/projects/xar/ \ http://distfiles-msn.opendarwin.org/ \ diff --git a/astro/gaia/Makefile b/astro/gaia/Makefile index 69130d651fe6..ae86b4c791d4 100644 --- a/astro/gaia/Makefile +++ b/astro/gaia/Makefile @@ -7,6 +7,7 @@ PORTNAME= gaia PORTVERSION= 0.1.2 +PORTREVISION= 1 CATEGORIES= astro MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= gaia-clean @@ -14,7 +15,7 @@ MASTER_SITE_SUBDIR= gaia-clean MAINTAINER= se@FreeBSD.org COMMENT= Display geographic maps with optional GPS tracking support -LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl \ +LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl \ jpeg.9:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ SDL.11:${PORTSDIR}/devel/sdl12 diff --git a/audio/gmpccaa/Makefile b/audio/gmpccaa/Makefile index 65dd6125fa09..8bafe81d9ed7 100644 --- a/audio/gmpccaa/Makefile +++ b/audio/gmpccaa/Makefile @@ -7,6 +7,7 @@ PORTNAME= gmpccaa PORTVERSION= 0.1.0 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= http://download.qballcow.nl/programs/gmpc-0.13/Plugins/ @@ -14,7 +15,7 @@ MAINTAINER= redchrom@gmail.com COMMENT= Amazon cover art provider for gmpc LIB_DEPENDS= mpd:${PORTSDIR}/audio/libmpd \ - curl.3:${PORTSDIR}/ftp/curl + curl.4:${PORTSDIR}/ftp/curl BUILD_DEPENDS= ${X11BASE}/include/gmpc/cover-art.h:${PORTSDIR}/audio/gmpc RUN_DEPEND= gmpc:${PORTSDIR}/audio/gmpc diff --git a/audio/grip/Makefile b/audio/grip/Makefile index 7f6b7c578dcd..de30a23b23bb 100644 --- a/audio/grip/Makefile +++ b/audio/grip/Makefile @@ -7,7 +7,7 @@ PORTNAME= grip PORTVERSION= 3.2.0 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -16,7 +16,7 @@ MAINTAINER= multimedia@FreeBSD.org COMMENT= GTK front-end to external cd rippers and audio encoders LIB_DEPENDS= id3-3.8.3:${PORTSDIR}/audio/id3lib \ - curl.3:${PORTSDIR}/ftp/curl + curl.4:${PORTSDIR}/ftp/curl PATCH_DEPENDS= iconv:${PORTSDIR}/converters/libiconv USE_XLIB= yes diff --git a/audio/herrie/Makefile b/audio/herrie/Makefile index 459a3addc7a9..a472901c1312 100644 --- a/audio/herrie/Makefile +++ b/audio/herrie/Makefile @@ -7,6 +7,7 @@ PORTNAME= herrie PORTVERSION= 1.0.2 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= http://www.il.fontys.nl/~ed/projects/herrie/distfiles/ \ http://www.stack.nl/~ed/projects/herrie/distfiles/ diff --git a/audio/icecast2/Makefile b/audio/icecast2/Makefile index 3ef7902fc3d9..1728ed7410c1 100644 --- a/audio/icecast2/Makefile +++ b/audio/icecast2/Makefile @@ -7,7 +7,7 @@ PORTNAME= icecast2 PORTVERSION= 2.3.1 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= audio net ipv6 MASTER_SITES= http://svn.xiph.org/releases/icecast/ diff --git a/audio/icecast2/files/patch-src::auth_url.c b/audio/icecast2/files/patch-src::auth_url.c new file mode 100644 index 000000000000..d70bf74b9e70 --- /dev/null +++ b/audio/icecast2/files/patch-src::auth_url.c @@ -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->handle); + 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_getpass); ++#endif + curl_easy_setopt (url_info->handle, CURLOPT_ERRORBUFFER, &url_info->errormsg[0]); + + if (url_info->username && url_info->password) diff --git a/audio/libofa/Makefile b/audio/libofa/Makefile index 0e5dc15b78b7..5543abe4a1cf 100644 --- a/audio/libofa/Makefile +++ b/audio/libofa/Makefile @@ -7,6 +7,7 @@ PORTNAME= libofa PORTVERSION= 0.9.3 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= http://www.musicdns.org/files/ @@ -15,7 +16,7 @@ COMMENT= The Open Fingerprint Architecture Library LIB_DEPENDS= fftw3.4:${PORTSDIR}/math/fftw3 \ expat.6:${PORTSDIR}/textproc/expat2 \ - curl.3:${PORTSDIR}/ftp/curl + curl.4:${PORTSDIR}/ftp/curl USE_GNOME= pkgconfig GNU_CONFIGURE= yes diff --git a/audio/moc/Makefile b/audio/moc/Makefile index 42a2d21281f5..c3f355542945 100644 --- a/audio/moc/Makefile +++ b/audio/moc/Makefile @@ -7,7 +7,7 @@ PORTNAME= moc PORTVERSION= 2.4.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= ftp://ftp.daper.net/pub/soft/moc/stable/ @@ -111,7 +111,7 @@ CONFIGURE_ARGS+= --without-samplerate .endif .if defined(WITH_CURL) -LIB_DEPENDS+= curl.3:${PORTSDIR}/ftp/curl +LIB_DEPENDS+= curl.4:${PORTSDIR}/ftp/curl .else CONFIGURE_ARGS+= --without-curl .endif diff --git a/audio/scrobbler/Makefile b/audio/scrobbler/Makefile index 02bbc7eb3321..4fe73d9a07d7 100644 --- a/audio/scrobbler/Makefile +++ b/audio/scrobbler/Makefile @@ -6,7 +6,7 @@ PORTNAME?= scrobbler PORTVERSION= 0.3.8.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= audio MASTER_SITES= http://static.audioscrobbler.com/plugins/ \ http://www.pipian.com/stuffforchat/ @@ -16,7 +16,7 @@ MAINTAINER?= novel@FreeBSD.org COMMENT?= XMMS/BMP plugin for Audioscrobbler.com LIB_DEPENDS= musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \ - curl.3:${PORTSDIR}/ftp/curl + curl.4:${PORTSDIR}/ftp/curl CONFLICTS= bmp-scrobbler-[0-9]* \ xmms-scrobbler-[0-9]* diff --git a/audio/streamtranscoder/Makefile b/audio/streamtranscoder/Makefile index 76ef1201085b..70fbebb25182 100644 --- a/audio/streamtranscoder/Makefile +++ b/audio/streamtranscoder/Makefile @@ -7,6 +7,7 @@ PORTNAME= streamtranscoder PORTVERSION= 1.2.8 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= http://www.oddsock.org/tools/streamTranscoder/ diff --git a/audio/streamtuner/Makefile b/audio/streamtuner/Makefile index 4f3e990a018c..527007d110fd 100644 --- a/audio/streamtuner/Makefile +++ b/audio/streamtuner/Makefile @@ -7,7 +7,7 @@ PORTNAME= streamtuner PORTVERSION= 0.99.99 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= audio www MASTER_SITES= ${MASTER_SITE_SAVANNAH} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/audio/vorbis-tools/Makefile b/audio/vorbis-tools/Makefile index 1d2f389d29df..fe5a04cf5ee2 100644 --- a/audio/vorbis-tools/Makefile +++ b/audio/vorbis-tools/Makefile @@ -7,7 +7,7 @@ PORTNAME= vorbis-tools PORTVERSION= 1.1.1 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 3 CATEGORIES= audio MASTER_SITES= http://downloads.xiph.org/releases/vorbis/ @@ -16,7 +16,7 @@ MAINTAINER= naddy@FreeBSD.org COMMENT= Play, encode, and manage Ogg Vorbis files LIB_DEPENDS= 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 diff --git a/audio/vorbis-tools/files/patch-ogg123_http_transport.c b/audio/vorbis-tools/files/patch-ogg123_http_transport.c new file mode 100644 index 000000000000..4d9d9e07b4ce --- /dev/null +++ b/audio/vorbis-tools/files/patch-ogg123_http_transport.c @@ -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.ProxyTunnel); + */ ++#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); diff --git a/audio/xmms2/Makefile b/audio/xmms2/Makefile index 69e9a283f9f2..abd113f89a5c 100644 --- a/audio/xmms2/Makefile +++ b/audio/xmms2/Makefile @@ -7,6 +7,7 @@ PORTNAME?= xmms2 PORTVERSION= 0.2.d.8 +PORTREVISION= 1 DISTVERSION= 0.2DrHouse CATEGORIES?= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} @@ -77,7 +78,7 @@ EXCLUDE+= python ruby java xmmsclient-ecore xmmsclient++ xmmsclient++-glib .if !defined(XMMS2_SLAVE) .if !defined(WITHOUT_CURL) -LIB_DEPENDS+= curl.3:${PORTSDIR}/ftp/curl +LIB_DEPENDS+= curl.4:${PORTSDIR}/ftp/curl PLIST_SUB+= CURL="" .else EXCLUDE+= curl @@ -91,7 +92,7 @@ LIB_DEPENDS+= curl.3:${PORTSDIR}/ftp/curl PLIST_SUB+= LASTFM="" .else EXCLUDE+= lastfm lastfmeta -PLIST_SUB+= LASTMFM="@comment " +PLIST_SUB+= LASTFM="@comment " .endif .if defined(WITH_SID) @@ -229,6 +230,9 @@ PLIST_SUB+= AO="@comment " .endif .if defined(WITH_MDNS_AVAHI) +.if defined(WITH_MDNS_APPLE) +BROKEN= You may choose either MDNS_APPLE or MDNS_AVAHI, but not both +.endif LIB_DEPENDS+= avahi-core:${PORTSDIR}/net/avahi PLIST_SUB+= MDNS_AVAHI="" .else @@ -237,6 +241,9 @@ PLIST_SUB+= MDNS_AVAHI="@comment " .endif .if !defined (WITHOUT_MDNS_APPLE) +.if defined(WITH_MDNS_AVAHI) +BROKEN= You may choose either MDNS_APPLE or MDNS_AVAHI, but not both +.endif LIB_DEPENDS+= dns_sd:${PORTSDIR}/net/mDNSResponder PLIST_SUB+= MDNS_APPLE="" .else diff --git a/audio/xmms2/pkg-plist b/audio/xmms2/pkg-plist index 5f10e60691bc..73060e12259a 100644 --- a/audio/xmms2/pkg-plist +++ b/audio/xmms2/pkg-plist @@ -101,7 +101,8 @@ libdata/pkgconfig/xmms2-client.pc 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%% diff --git a/comms/xastir/Makefile b/comms/xastir/Makefile index 2723659c047a..348d76eb13d1 100644 --- a/comms/xastir/Makefile +++ b/comms/xastir/Makefile @@ -7,6 +7,7 @@ PORTNAME= xastir PORTVERSION= 1.8.4 +PORTREVISION= 1 CATEGORIES= comms hamradio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= xastir diff --git a/deskutils/drivel/Makefile b/deskutils/drivel/Makefile index 8a8a69ee299d..2c65bb92fc3c 100644 --- a/deskutils/drivel/Makefile +++ b/deskutils/drivel/Makefile @@ -7,7 +7,7 @@ PORTNAME= drivel PORTVERSION= 2.0.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= deskutils gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= jbq@caraldi.com COMMENT= Blog editor for GNOME -LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl +LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl INSTALLS_ICONS= yes USE_X_PREFIX= yes diff --git a/deskutils/ljit/Makefile b/deskutils/ljit/Makefile index 855f787b032b..5fc05bcdc5bc 100644 --- a/deskutils/ljit/Makefile +++ b/deskutils/ljit/Makefile @@ -7,7 +7,7 @@ PORTNAME= ljit PORTVERSION= 0.2.5 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= deskutils MASTER_SITES= http://kir.vtx.ru/ljit/dl/ \ http://freebsd.nsu.ru/distfiles/ @@ -15,7 +15,7 @@ MASTER_SITES= http://kir.vtx.ru/ljit/dl/ \ MAINTAINER= danfe@FreeBSD.org COMMENT= GUI tool to help LiveJournal users post images -LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl +LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl RUN_DEPENDS= convert:${PORTSDIR}/graphics/ImageMagick GNU_CONFIGURE= yes diff --git a/deskutils/logjam/Makefile b/deskutils/logjam/Makefile index 2c4ddfd9a765..f75ceca01f59 100644 --- a/deskutils/logjam/Makefile +++ b/deskutils/logjam/Makefile @@ -7,14 +7,14 @@ PORTNAME= logjam PORTVERSION= 4.5.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= deskutils MASTER_SITES= http://logjam.danga.com/download/ MAINTAINER= novel@FreeBSD.org COMMENT= A GTK2 interface to livejournals, ie www.livejournal.com -LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl +LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl MAN1= logjam.1 diff --git a/deskutils/mdh/Makefile b/deskutils/mdh/Makefile index 317a261c1e1e..94b92e43de3c 100644 --- a/deskutils/mdh/Makefile +++ b/deskutils/mdh/Makefile @@ -7,7 +7,7 @@ PORTNAME= mdh PORTVERSION= 1.9.59 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= deskutils gnome MASTER_SITES= http://www.gozer.org/my_stuff/gtk/gtk/mdh/ @@ -34,7 +34,7 @@ LIB_DEPENDS+= gtop-2.0:${PORTSDIR}/devel/libgtop .if defined(WITHOUT_CURL) CONFIGURE_ARGS+= --disable-curl .else -LIB_DEPENDS+= curl.3:${PORTSDIR}/ftp/curl +LIB_DEPENDS+= curl.4:${PORTSDIR}/ftp/curl .endif post-patch: diff --git a/devel/cogito/Makefile b/devel/cogito/Makefile index 72a8a8fce383..1f232bb3df7c 100644 --- a/devel/cogito/Makefile +++ b/devel/cogito/Makefile @@ -7,6 +7,7 @@ PORTNAME= cogito PORTVERSION= 0.17.2 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://www.kernel.org/pub/software/scm/cogito/ \ http://www.uk.kernel.org/pub/software/scm/cogito/ \ diff --git a/devel/darcs/Makefile b/devel/darcs/Makefile index 96fa7c8246f4..b9827ec2c300 100644 --- a/devel/darcs/Makefile +++ b/devel/darcs/Makefile @@ -7,6 +7,7 @@ PORTNAME= darcs PORTVERSION= 1.0.8 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://darcs.net/ diff --git a/devel/evfs/Makefile b/devel/evfs/Makefile index 2246b2fdd93b..dc86eb2737b3 100644 --- a/devel/evfs/Makefile +++ b/devel/evfs/Makefile @@ -8,6 +8,7 @@ PORTNAME= evfs PORTVERSION= 20060926 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://sunner.elcomnet.ru/~stas/ @@ -38,8 +39,8 @@ PLIST_SUB+= SAMBA="@comment " CONFIGURE_ARGS+=--disable-samba .endif -.if !defined(WITHOUT_FTP) || exists(${LOCALBASE}/lib/libcurl.so.3) -LIB_DEPENDS+= curl.3:${PORTSDIR}/ftp/curl +.if !defined(WITHOUT_FTP) || exists(${LOCALBASE}/lib/libcurl.so.4) +LIB_DEPENDS+= curl.4:${PORTSDIR}/ftp/curl PLIST_SUB+= FTP="" .else PLIST_SUB+= FTP="@comment " diff --git a/devel/hs-darcs/Makefile b/devel/hs-darcs/Makefile index 96fa7c8246f4..b9827ec2c300 100644 --- a/devel/hs-darcs/Makefile +++ b/devel/hs-darcs/Makefile @@ -7,6 +7,7 @@ PORTNAME= darcs PORTVERSION= 1.0.8 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://darcs.net/ diff --git a/devel/libgutenfetch/Makefile b/devel/libgutenfetch/Makefile index b1ff59dcab26..7d2173a9de30 100644 --- a/devel/libgutenfetch/Makefile +++ b/devel/libgutenfetch/Makefile @@ -7,6 +7,7 @@ PORTNAME= libgutenfetch PORTVERSION= 1.2 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= libgutenfetch diff --git a/finance/libofx/Makefile b/finance/libofx/Makefile index 7f158fc913e0..904667594b1d 100644 --- a/finance/libofx/Makefile +++ b/finance/libofx/Makefile @@ -7,6 +7,7 @@ PORTNAME= libofx PORTVERSION= 0.8.2 +PORTREVISION= 1 CATEGORIES= finance MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -14,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= OpenSource implementation of the OFX (Open Financial eXchange) -LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl \ +LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl \ xml\\+\\+-1.0.1:${PORTSDIR}/textproc/libxml++ \ osp.3:${PORTSDIR}/textproc/opensp diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile index 755b5f772c9c..732bea073e60 100644 --- a/ftp/curl/Makefile +++ b/ftp/curl/Makefile @@ -6,8 +6,7 @@ # PORTNAME= curl -PORTVERSION= 7.15.5 -PORTREVISION= 1 +PORTVERSION= 7.16.0 CATEGORIES= ftp ipv6 www MASTER_SITES= http://curl.haxx.se/download/ \ ${MASTER_SITE_SOURCEFORGE} \ @@ -40,7 +39,7 @@ MAN3= curl_easy_cleanup.3 curl_easy_duphandle.3 \ libcurl-multi.3 libcurl-share.3 libcurl-tutorial.3 USE_LDCONFIG= yes -SHLIB_VER= 3 +SHLIB_VER= 4 MAKE_ENV= SHLIB_VER="${SHLIB_VER}" PLIST_SUB= SHLIB_VER="${SHLIB_VER}" diff --git a/ftp/curl/distinfo b/ftp/curl/distinfo index 56de83f19740..b21da0362fc7 100644 --- a/ftp/curl/distinfo +++ b/ftp/curl/distinfo @@ -1,3 +1,3 @@ -MD5 (curl-7.15.5.tar.bz2) = 594142c7d53bbdd988e8cef6354eeeff -SHA256 (curl-7.15.5.tar.bz2) = 2980815e53f4caeafc5e35d183d9379bcaaec49f759be1a4ac628cfb6c392fe0 -SIZE (curl-7.15.5.tar.bz2) = 1543007 +MD5 (curl-7.16.0.tar.bz2) = 5819f56e93d04cde2992fe88b54cbfad +SHA256 (curl-7.16.0.tar.bz2) = fc8dcda5a933c370c15c832bf1e7316a0690f473fdd6000454d233edaa33bc23 +SIZE (curl-7.16.0.tar.bz2) = 1566391 diff --git a/ftp/curl/files/patch-lib::url.c b/ftp/curl/files/patch-lib::url.c index bc19abd1e208..6adc665de34d 100644 --- a/ftp/curl/files/patch-lib::url.c +++ b/ftp/curl/files/patch-lib::url.c @@ -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 = CURLAUTH_BASIC; /* defaults to basic */ data->set.proxyauth = CURLAUTH_BASIC; /* defaults to basic */ @@ -8,6 +8,6 @@ + data->set.no_signal = TRUE; /* different handling of signals and threads */ +#endif /* __FreeBSD_version */ + - /* create an array with connection data struct pointers */ - data->state.numconnects = 5; /* hard-coded right now */ - data->state.connects = (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. */ diff --git a/ftp/curl/pkg-plist b/ftp/curl/pkg-plist index f95009ea9ffb..50e773f665ba 100644 --- a/ftp/curl/pkg-plist +++ b/ftp/curl/pkg-plist @@ -45,6 +45,7 @@ libdata/pkgconfig/libcurl.pc %%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 @@ libdata/pkgconfig/libcurl.pc %%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 diff --git a/ftp/curlpp/Makefile b/ftp/curlpp/Makefile index c4a75ca8c9b9..452f2dad462d 100644 --- a/ftp/curlpp/Makefile +++ b/ftp/curlpp/Makefile @@ -8,13 +8,14 @@ PORTNAME= curlpp PORTVERSION= 0.6.1 +PORTREVISION= 1 CATEGORIES= ftp MASTER_SITES= http://rrette.com/downloads/sources/ MAINTAINER= roam@FreeBSD.org COMMENT= A C++ wrapper for libcurl -LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl +LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl USE_GCC= 3.4 GNU_CONFIGURE= yes diff --git a/ftp/ocaml-ocurl/Makefile b/ftp/ocaml-ocurl/Makefile index 1f807c2742d1..1b4ef808797c 100644 --- a/ftp/ocaml-ocurl/Makefile +++ b/ftp/ocaml-ocurl/Makefile @@ -5,6 +5,7 @@ PORTNAME= ocurl PORTVERSION= 0.2.1 +PORTREVISION= 1 CATEGORIES= ftp MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -17,7 +18,7 @@ BUILD_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml \ ocamlfind:${PORTSDIR}/devel/ocaml-findlib RUN_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml \ ocamlfind:${PORTSDIR}/devel/ocaml-findlib -LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl +LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/ftp/php4-curl/Makefile b/ftp/php4-curl/Makefile index d41004f301e6..376245d6adad 100644 --- a/ftp/php4-curl/Makefile +++ b/ftp/php4-curl/Makefile @@ -11,4 +11,6 @@ MASTERDIR= ${.CURDIR}/../../lang/php4 PKGNAMESUFFIX= -curl +PORTREVISION= 2 + .include "${MASTERDIR}/Makefile" diff --git a/ftp/php4-curl/files/patch-curl.c b/ftp/php4-curl/files/patch-curl.c new file mode 100644 index 000000000000..1c703f38578c --- /dev/null +++ b/ftp/php4-curl/files/patch-curl.c @@ -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 != 0 + REGISTER_CURL_CONSTANT(CURLOPT_FTPASCII); ++#endif + REGISTER_CURL_CONSTANT(CURLOPT_PUT); + #if CURLOPT_MUTE != 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 != 0 + REGISTER_CURL_CONSTANT(CURLOPT_PASSWDFUNCTION); ++#endif + REGISTER_CURL_CONSTANT(CURLOPT_HEADERFUNCTION); + REGISTER_CURL_CONSTANT(CURLOPT_MAXREDIRS); + REGISTER_CURL_CONSTANT(CURLOPT_MAXCONNECTS); diff --git a/ftp/php5-curl/Makefile b/ftp/php5-curl/Makefile index d9da384a99f0..08eed1c64df6 100644 --- a/ftp/php5-curl/Makefile +++ b/ftp/php5-curl/Makefile @@ -11,4 +11,6 @@ MASTERDIR= ${.CURDIR}/../../lang/php5 PKGNAMESUFFIX= -curl +PORTREVISION= 1 + .include "${MASTERDIR}/Makefile" diff --git a/ftp/php5-curl/files/patch-interface.c b/ftp/php5-curl/files/patch-interface.c new file mode 100644 index 000000000000..e645cd481d30 --- /dev/null +++ b/ftp/php5-curl/files/patch-interface.c @@ -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 != 0 + REGISTER_CURL_CONSTANT(CURLOPT_FTPASCII); ++#endif + REGISTER_CURL_CONSTANT(CURLOPT_PUT); + #if CURLOPT_MUTE != 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 != 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 = ch->handlers->read->fp; + dupch->handlers->read->fd = ch->handlers->read->fd; + ++#if CURLOPT_PASSWDFUNCTION != 0 + if (ch->handlers->passwd) { + zval_add_ref(&ch->handlers->passwd); + dupch->handlers->passwd = 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 = 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 != 0 + if (ch->handlers->passwd) { + zval_ptr_dtor(&ch->handlers->passwd); + } ++#endif + if (ch->header.str_len > 0) { + efree(ch->header.str); + } diff --git a/ftp/py-curl/Makefile b/ftp/py-curl/Makefile index f97278324870..300735971501 100644 --- a/ftp/py-curl/Makefile +++ b/ftp/py-curl/Makefile @@ -7,6 +7,7 @@ PORTNAME= curl PORTVERSION= 7.15.2 +PORTREVISION= 1 CATEGORIES= ftp python MASTER_SITES= http://pycurl.sourceforge.net/download/ \ http://pycurl.sourceforge.net/download/00-OLD-VERSIONS/ @@ -16,7 +17,7 @@ DISTNAME= py${PORTNAME}-${PORTVERSION} MAINTAINER= perky@FreeBSD.org COMMENT= Python interface to libcurl -LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl +LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl USE_PYTHON= yes USE_PYDISTUTILS= yes diff --git a/ftp/py-curl/files/patch-src-pycurl.c b/ftp/py-curl/files/patch-src-pycurl.c new file mode 100644 index 000000000000..c358c6df71e9 --- /dev/null +++ b/ftp/py-curl/files/patch-src-pycurl.c @@ -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 = PyString_AsString_NoNUL(obj); + if (str == NULL) +@@ -1279,12 +1281,14 @@ + case CURLOPT_PREQUOTE: + old_slist = &self->prequote; + break; ++#if LIBCURL_VERSION_NUM < 0x071000 + case CURLOPT_SOURCE_PREQUOTE: + old_slist = &self->source_prequote; + break; + case CURLOPT_SOURCE_POSTQUOTE: + old_slist = &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); diff --git a/ftp/rexx-curl/Makefile b/ftp/rexx-curl/Makefile index 1853ca513eb0..88ec3bfda3a6 100644 --- a/ftp/rexx-curl/Makefile +++ b/ftp/rexx-curl/Makefile @@ -8,6 +8,7 @@ PORTNAME= curl PORTVERSION= 1.4 +PORTREVISION= 1 CATEGORIES= ftp MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= rexx${PORTNAME} @@ -18,7 +19,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= External function package providing an interface to the cURL package BUILD_DEPENDS= rexx:${PORTSDIR}/lang/rexx-regina -LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl +LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl RUN_DEPENDS= rexx:${PORTSDIR}/lang/rexx-regina USE_GMAKE= yes diff --git a/ftp/rexx-curl/files/patch-rexxcurl.c b/ftp/rexx-curl/files/patch-rexxcurl.c new file mode 100644 index 000000000000..b2832bbbe4b6 --- /dev/null +++ b/ftp/rexx-curl/files/patch-rexxcurl.c @@ -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 >= 0x070d00 ++#if LIBCURL_VERSION_NUM >= 0x070d00 && LIBCURL_VERSION_NUM < 0x071000 + { "SOURCEPOSTQUOTE" ,CURLOPT_SOURCE_POSTQUOTE,RXCURLOPT_LIST }, + { "SOURCEPREQUOTE" ,CURLOPT_SOURCE_PREQUOTE ,RXCURLOPT_LIST }, + { "SOURCEQUOTE" ,CURLOPT_SOURCE_QUOTE ,RXCURLOPT_LIST }, diff --git a/ftp/urlgfe/Makefile b/ftp/urlgfe/Makefile index 48f30929121c..d1d91350cfc6 100644 --- a/ftp/urlgfe/Makefile +++ b/ftp/urlgfe/Makefile @@ -7,7 +7,7 @@ PORTNAME= urlgfe PORTVERSION= 0.7.1 -PORTREVISION?= 4 +PORTREVISION?= 5 CATEGORIES= ftp www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= urlget @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= urlget MAINTAINER= chip-set@mail.ru COMMENT= A download manager -LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl +LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl USE_GNOME= gtk20 lthack WANT_GNOME= yes diff --git a/ftp/wmget/Makefile b/ftp/wmget/Makefile index ad1227636304..e35432789e13 100644 --- a/ftp/wmget/Makefile +++ b/ftp/wmget/Makefile @@ -6,6 +6,7 @@ PORTNAME= wmget PORTVERSION= 0.6.0 +PORTREVISION= 1 CATEGORIES= ftp MASTER_SITES= http://amtrickey.net/download/ DISTNAME= ${PORTNAME}-${PORTVERSION}-src @@ -13,7 +14,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-src MAINTAINER= uspoerlein@gmail.com COMMENT= Dock app for Window Maker providing wget functionality -LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl +LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl USE_X_PREFIX= yes USE_GMAKE= yes diff --git a/games/bzflag/Makefile b/games/bzflag/Makefile index 9b13e248db4d..93265da66325 100644 --- a/games/bzflag/Makefile +++ b/games/bzflag/Makefile @@ -7,7 +7,7 @@ PORTNAME= bzflag PORTVERSION= 2.0.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= chuck@pkix.net COMMENT= A multiplayer 3D tank battle game -LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl +LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl USE_BZIP2= yes USE_SDL= yes diff --git a/games/fgsd/Makefile b/games/fgsd/Makefile index cd8e7d4cd89d..16c996049c24 100644 --- a/games/fgsd/Makefile +++ b/games/fgsd/Makefile @@ -7,6 +7,7 @@ PORTNAME= fgsd DISTVERSION= 0.3.1a +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/games/mudmagic/Makefile b/games/mudmagic/Makefile index 9407178c0c37..5fc5c0e3a96a 100644 --- a/games/mudmagic/Makefile +++ b/games/mudmagic/Makefile @@ -7,13 +7,14 @@ PORTNAME= mudmagic PORTVERSION= 1.9 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://www.mudmagic.com/mud-client/downloads/ MAINTAINER= trasz@pin.if.uz.zgora.pl COMMENT= A GTK+ based MUD client -LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl \ +LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl \ pcre.0:${PORTSDIR}/devel/pcre \ png.5:${PORTSDIR}/graphics/png \ expat:${PORTSDIR}/textproc/expat2 \ diff --git a/games/planeshift/Makefile b/games/planeshift/Makefile index 808d4678be2f..d2eabe415ba4 100644 --- a/games/planeshift/Makefile +++ b/games/planeshift/Makefile @@ -7,6 +7,7 @@ PORTNAME= planeshift PORTVERSION= 0.3.017 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://alex.foxybanana.com/freebsd/ @@ -18,7 +19,7 @@ BUILD_DEPENDS= jam:${PORTSDIR}/devel/jam \ cel-config:${PORTSDIR}/graphics/crystalentitylayer-devel \ ${LOCALBASE}/lib/libbfd.a:${PORTSDIR}/devel/libbfd LIB_DEPENDS= cal3d.12:${PORTSDIR}/graphics/cal3d \ - curl.3:${PORTSDIR}/ftp/curl + curl.4:${PORTSDIR}/ftp/curl USE_BZIP2= yes GNU_CONFIGURE= yes diff --git a/games/r1q2/Makefile b/games/r1q2/Makefile index a1dca0401099..545b5ff9018f 100644 --- a/games/r1q2/Makefile +++ b/games/r1q2/Makefile @@ -7,7 +7,7 @@ PORTNAME= r1q2 PORTVERSION= 6557 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= http://www.r1ch.net/stuff/r1q2/src/ DISTNAME= ${PORTNAME}-b${PORTVERSION}-src @@ -93,7 +93,7 @@ PLIST_SUB+= GLX="@comment " .endif .if !defined(WITHOUT_HTTP) -LIB_DEPENDS+= curl.3:${PORTSDIR}/ftp/curl +LIB_DEPENDS+= curl.4:${PORTSDIR}/ftp/curl MAKE_ENV+= WITH_HTTP_DOWNLOAD_SUPPORT=YES .endif diff --git a/games/tmw/Makefile b/games/tmw/Makefile index c8a420ec9325..2421c2a57cc9 100644 --- a/games/tmw/Makefile +++ b/games/tmw/Makefile @@ -7,6 +7,7 @@ PORTNAME= tmw PORTVERSION= 0.0.21.1 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= themanaworld @@ -16,7 +17,7 @@ COMMENT= A free open source 2D MMORPG in development LIB_DEPENDS= 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= guichan>=0.5.0:${PORTSDIR}/devel/guichan RUN_DEPENDS= guichan>=0.5.0:${PORTSDIR}/devel/guichan diff --git a/games/warsow/Makefile b/games/warsow/Makefile index 28d5836f4c87..ff95d816abbe 100644 --- a/games/warsow/Makefile +++ b/games/warsow/Makefile @@ -7,7 +7,7 @@ PORTNAME= warsow PORTVERSION= 0.12 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= http://warsow.aditsystems.com/ \ http://ftp.club-internet.fr/pub/games/nofrag/warsow/ \ @@ -49,7 +49,7 @@ PLIST_SUB+= ARCHSUFFIX=${ARCHSUFFIX} .endif .if !defined(WITHOUT_CLIENT) -LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl \ +LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl \ jpeg.9:${PORTSDIR}/graphics/jpeg USE_GL= yes USE_SDL= yes diff --git a/games/xmoto/Makefile b/games/xmoto/Makefile index 677e6fc68cfb..2ac476acac46 100644 --- a/games/xmoto/Makefile +++ b/games/xmoto/Makefile @@ -7,7 +7,7 @@ PORTNAME= xmoto PORTVERSION= 0.2.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -47,7 +47,7 @@ MAN6= xmoto.6 xmoto-edit.6 .include <bsd.port.pre.mk> .if !defined(WITHOUT_WWW) -LIB_DEPENDS+= curl.3:${PORTSDIR}/ftp/curl +LIB_DEPENDS+= curl.4:${PORTSDIR}/ftp/curl CONFIGURE_ARGS+= --with-enable-www=1 .else CONFIGURE_ARGS+= --with-enable-www=0 diff --git a/graphics/jp2a/Makefile b/graphics/jp2a/Makefile index 17785fa2c490..8c2217f062b0 100644 --- a/graphics/jp2a/Makefile +++ b/graphics/jp2a/Makefile @@ -7,6 +7,7 @@ PORTNAME= jp2a PORTVERSION= 1.0.6 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF @@ -14,7 +15,7 @@ MAINTAINER= infofarmer@FreeBSD.org COMMENT= Converts JPG images to ASCII LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ - curl.3:${PORTSDIR}/ftp/curl + curl.4:${PORTSDIR}/ftp/curl USE_BZIP2= yes GNU_CONFIGURE= yes diff --git a/graphics/mapserver/Makefile b/graphics/mapserver/Makefile index 939734c9e367..ce87c11e77ec 100644 --- a/graphics/mapserver/Makefile +++ b/graphics/mapserver/Makefile @@ -7,7 +7,7 @@ PORTNAME= mapserver PORTVERSION= 4.4.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics www MASTER_SITES= http://cvs.gis.umn.edu/dist/ @@ -106,7 +106,7 @@ PLIST_SUB+= WITH_PERL="@comment " .endif .if defined(WITH_CURL) -LIB_DEPENDS+= curl.3:${PORTSDIR}/ftp/curl +LIB_DEPENDS+= curl.4:${PORTSDIR}/ftp/curl CONFIGURE_ARGS+= --with-curl=${LOCALBASE} .endif diff --git a/graphics/paintlib/Makefile b/graphics/paintlib/Makefile index 37b9836e2dbc..eb0a63d00425 100644 --- a/graphics/paintlib/Makefile +++ b/graphics/paintlib/Makefile @@ -7,7 +7,7 @@ PORTNAME= paintlib PORTVERSION= 2.6.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics devel MASTER_SITES= http://www.paintlib.de/paintlib/ diff --git a/graphics/telak/Makefile b/graphics/telak/Makefile index c6efc7cba8a4..c00c6f9c0014 100644 --- a/graphics/telak/Makefile +++ b/graphics/telak/Makefile @@ -7,6 +7,7 @@ PORTNAME= telak PORTVERSION= 0.5 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://julien.danjou.info/telak/ \ http://critical.ch/distfiles/ \ @@ -15,7 +16,7 @@ MASTER_SITES= http://julien.danjou.info/telak/ \ MAINTAINER= ehaupt@FreeBSD.org COMMENT= A tool to draw pictures on your root window -LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl \ +LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl \ gcrypt.13:${PORTSDIR}/security/libgcrypt \ Imlib2.3:${PORTSDIR}/graphics/imlib2 diff --git a/irc/unreal/Makefile b/irc/unreal/Makefile index 93d7fa932e00..6318c7c13294 100644 --- a/irc/unreal/Makefile +++ b/irc/unreal/Makefile @@ -7,6 +7,7 @@ PORTNAME= Unreal PORTVERSION= 3.2.5 +PORTREVISION= 1 CATEGORIES= irc MASTER_SITES= http://www.ilmarinen.us/unreal/ \ http://unrealircd.alert-net.com/ \ @@ -84,9 +85,10 @@ CONFIGURE_ARGS+= --enable-ssl .endif .if defined(WITH_REMOTE) -BUILD_DEPENDS+= ${LOCALBASE}/lib/libares.a:${PORTSDIR}/dns/ares -LIB_DEPENDS+= curl.3:${PORTSDIR}/ftp/curl +LIB_DEPENDS+= cares.1:${PORTSDIR}/dns/c-ares curl.4:${PORTSDIR}/ftp/curl CONFIGURE_ARGS+= --enable-libcurl=${LOCALBASE} +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .endif .if defined(WITH_PREFIXAQ) diff --git a/irc/unreal/files/patch-Makefile.in b/irc/unreal/files/patch-Makefile.in new file mode 100644 index 000000000000..4549ece2e1c1 --- /dev/null +++ b/irc/unreal/files/patch-Makefile.in @@ -0,0 +1,11 @@ +--- Makefile.in.orig Tue Dec 5 15:59:38 2006 ++++ Makefile.in Tue Dec 5 15:59:53 2006 +@@ -38,7 +38,7 @@ + CRYPTOLIB=@CRYPTOLIB@ + OPENSSLINCLUDES= + +-XCFLAGS=-I@TREINCDIR@ -I@CARESINCDIR@ @CARESLIBDIR@ @CFLAGS@ ++XCFLAGS=-I@TREINCDIR@ @CFLAGS@ + # + # use the following on MIPS: + #CFLAGS= -systype bsd43 -DSYSTYPE_BSD43 -I$(INCLUDEDIR) diff --git a/irc/unreal/files/patch-configure b/irc/unreal/files/patch-configure new file mode 100644 index 000000000000..4465ac722f8f --- /dev/null +++ b/irc/unreal/files/patch-configure @@ -0,0 +1,37 @@ +--- configure.orig Tue Dec 5 15:55:45 2006 ++++ configure Tue Dec 5 15:59:10 2006 +@@ -12701,34 +12701,6 @@ + cd $cur_dir + + +-cares_version="1.3.0" +-echo "$as_me:$LINENO: result: extracting c-ares resolver library" >&5 +-echo "${ECHO_T}extracting c-ares resolver library" >&6 +-cur_dir=`pwd` +-cd extras +-rm -rf c-ares-$cares_version +-if test "x$ac_cv_path_GUNZIP" = "x" ; then +- tar xfz c-ares.tar.gz +-else +- cp c-ares.tar.gz c-ares.tar.gz.bak +- gunzip -f c-ares.tar.gz +- cp c-ares.tar.gz.bak c-ares.tar.gz +- tar xf c-ares.tar +-fi +-echo "$as_me:$LINENO: result: configuring c-ares library" >&5 +-echo "${ECHO_T}configuring c-ares library" >&6 +-cd c-ares-$cares_version +-./configure --prefix=$cur_dir/extras/c-ares || exit 1 +-echo "$as_me:$LINENO: result: compiling c-ares resolver library" >&5 +-echo "${ECHO_T}compiling c-ares resolver library" >&6 +-$ac_cv_prog_MAKER || exit 1 +-echo "$as_me:$LINENO: result: installing c-ares resolver library" >&5 +-echo "${ECHO_T}installing c-ares resolver library" >&6 +-$ac_cv_prog_MAKER install || exit 1 +-CARESINCDIR="$cur_dir/extras/c-ares/include" +- +-CARESLIBDIR="-L../extras/c-ares/lib" +- + CARESLIBS="-lcares" + + cd $cur_dir diff --git a/lang/gambas/Makefile b/lang/gambas/Makefile index e7e065da06bd..9028cf178fd0 100644 --- a/lang/gambas/Makefile +++ b/lang/gambas/Makefile @@ -6,7 +6,7 @@ PORTNAME= gambas PORTVERSION= 1.0.17 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= thierry@FreeBSD.org COMMENT= Gambas Almost Means BASic -LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl \ +LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl \ ml.0:${PORTSDIR}/math/ldouble USE_AUTOTOOLS= libltdl:15 libtool:15 diff --git a/lang/php4/Makefile.ext b/lang/php4/Makefile.ext index ca74031fa479..e10df4e186b2 100644 --- a/lang/php4/Makefile.ext +++ b/lang/php4/Makefile.ext @@ -44,7 +44,7 @@ CONFIGURE_ARGS+=--enable-ctype .endif .if ${PHP_MODNAME} == "curl" -LIB_DEPENDS+= curl.3:${PORTSDIR}/ftp/curl +LIB_DEPENDS+= curl.4:${PORTSDIR}/ftp/curl CONFIGURE_ARGS+=--with-curl=${LOCALBASE} .endif diff --git a/lang/php5/Makefile.ext b/lang/php5/Makefile.ext index cbc91b754f16..77fe93b9c567 100644 --- a/lang/php5/Makefile.ext +++ b/lang/php5/Makefile.ext @@ -38,7 +38,7 @@ CONFIGURE_ARGS+=--enable-ctype .endif .if ${PHP_MODNAME} == "curl" -LIB_DEPENDS+= curl.3:${PORTSDIR}/ftp/curl +LIB_DEPENDS+= curl.4:${PORTSDIR}/ftp/curl CONFIGURE_ARGS+=--with-curl=${LOCALBASE} .endif diff --git a/lang/php53/Makefile.ext b/lang/php53/Makefile.ext index cbc91b754f16..77fe93b9c567 100644 --- a/lang/php53/Makefile.ext +++ b/lang/php53/Makefile.ext @@ -38,7 +38,7 @@ CONFIGURE_ARGS+=--enable-ctype .endif .if ${PHP_MODNAME} == "curl" -LIB_DEPENDS+= curl.3:${PORTSDIR}/ftp/curl +LIB_DEPENDS+= curl.4:${PORTSDIR}/ftp/curl CONFIGURE_ARGS+=--with-curl=${LOCALBASE} .endif diff --git a/lang/q/Makefile b/lang/q/Makefile index eec9dc5d373c..61f80e866b03 100644 --- a/lang/q/Makefile +++ b/lang/q/Makefile @@ -7,7 +7,7 @@ PORTNAME= q PORTVERSION= 6.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= q-lang diff --git a/lang/q/files/patch-modules-curl-curl.c b/lang/q/files/patch-modules-curl-curl.c new file mode 100644 index 000000000000..9e9cf77518ff --- /dev/null +++ b/lang/q/files/patch-modules-curl-curl.c @@ -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, + +@@ -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), + +@@ -964,10 +968,12 @@ + cb = (int(*)())progress_cb; + dataopt = CURLOPT_PROGRESSDATA; + break; ++#if LIBCURL_VERSION_NUM < 0x071000 + case CURLOPT_PASSWDFUNCTION: + cb = (int(*)())passwd_cb; + dataopt = CURLOPT_PASSWDDATA; + break; ++#endif + case CURLOPT_HEADERFUNCTION: + cb = (int(*)())header_cb; + dataopt = CURLOPT_WRITEHEADER; diff --git a/lang/scriba/Makefile b/lang/scriba/Makefile index 0cf3cea684a9..a17ba5dea03f 100644 --- a/lang/scriba/Makefile +++ b/lang/scriba/Makefile @@ -7,6 +7,7 @@ PORTNAME= scriba PORTVERSION= 20b0 +PORTREVISION= 1 CATEGORIES= lang MASTER_SITES= http://www.scriptbasic.com/download/ DISTNAME= ${PORTNAME}-v2.0b0-source @@ -49,7 +50,7 @@ PLIST_SUB+= BDB="@comment " .endif .if defined(WITH_CURL) -LIB_DEPENDS+= curl.3:${PORTSDIR}/ftp/curl +LIB_DEPENDS+= curl.4:${PORTSDIR}/ftp/curl PLIST_SUB+= CURL="" .else PLIST_SUB+= CURL="@comment " diff --git a/mail/claws-mail-gtkhtml2_viewer/Makefile b/mail/claws-mail-gtkhtml2_viewer/Makefile index 14ae88a5b0d5..54d37199fa68 100644 --- a/mail/claws-mail-gtkhtml2_viewer/Makefile +++ b/mail/claws-mail-gtkhtml2_viewer/Makefile @@ -7,7 +7,7 @@ PORTNAME= gtkhtml2_viewer PORTVERSION= 0.12 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= http://sylpheed-claws.net/downloads/plugins/ PKGNAMEPREFIX= sylpheed-claws- @@ -15,7 +15,7 @@ PKGNAMEPREFIX= sylpheed-claws- MAINTAINER= c0rn@o2.pl COMMENT= HTML renderer plugin for sylpheed-claws -LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl +LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl BUILD_DEPENDS= sylpheed-claws>=2.5:${PORTSDIR}/mail/sylpheed-claws RUN_DEPENDS= sylpheed-claws>=2.5:${PORTSDIR}/mail/sylpheed-claws diff --git a/mail/claws-mail-rssyl/Makefile b/mail/claws-mail-rssyl/Makefile index eaee17131ba2..7f43aa6c3d49 100644 --- a/mail/claws-mail-rssyl/Makefile +++ b/mail/claws-mail-rssyl/Makefile @@ -7,7 +7,7 @@ PORTNAME= rssyl PORTVERSION= 0.7 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= mail MASTER_SITES= http://sylpheed-claws.net/downloads/plugins/ @@ -16,7 +16,7 @@ PKGNAMEPREFIX= sylpheed-claws- MAINTAINER= c0rn@o2.pl COMMENT= A RSS/Atom plugin for sylheed-claws -LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl +LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl BUILD_DEPENDS= sylpheed-claws>=2.5:${PORTSDIR}/mail/sylpheed-claws RUN_DEPENDS= sylpheed-claws>=2.5:${PORTSDIR}/mail/sylpheed-claws diff --git a/mail/claws-mail-vcalendar/Makefile b/mail/claws-mail-vcalendar/Makefile index 63a09101ada3..e291b4de6816 100644 --- a/mail/claws-mail-vcalendar/Makefile +++ b/mail/claws-mail-vcalendar/Makefile @@ -7,7 +7,7 @@ PORTNAME= vcalendar PORTVERSION= 1.89.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= mail MASTER_SITES= http://sylpheed-claws.net/downloads/plugins/ \ ${MASTER_SITE_LOCAL} @@ -17,7 +17,7 @@ PKGNAMEPREFIX= sylpheed-claws- MAINTAINER= c0rn@o2.pl COMMENT= vCalendar plugin for sylpheed-claws -LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl +LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl BUILD_DEPENDS= sylpheed-claws>=2.5:${PORTSDIR}/mail/sylpheed-claws RUN_DEPENDS= sylpheed-claws>=2.5:${PORTSDIR}/mail/sylpheed-claws diff --git a/mail/freepops/Makefile b/mail/freepops/Makefile index 7b5c66659252..a073889759e0 100644 --- a/mail/freepops/Makefile +++ b/mail/freepops/Makefile @@ -7,7 +7,7 @@ PORTNAME= freepops PORTVERSION= 0.0.96 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= freepops diff --git a/mail/sylpheed-claws-gtkhtml2_viewer/Makefile b/mail/sylpheed-claws-gtkhtml2_viewer/Makefile index 14ae88a5b0d5..54d37199fa68 100644 --- a/mail/sylpheed-claws-gtkhtml2_viewer/Makefile +++ b/mail/sylpheed-claws-gtkhtml2_viewer/Makefile @@ -7,7 +7,7 @@ PORTNAME= gtkhtml2_viewer PORTVERSION= 0.12 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= http://sylpheed-claws.net/downloads/plugins/ PKGNAMEPREFIX= sylpheed-claws- @@ -15,7 +15,7 @@ PKGNAMEPREFIX= sylpheed-claws- MAINTAINER= c0rn@o2.pl COMMENT= HTML renderer plugin for sylpheed-claws -LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl +LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl BUILD_DEPENDS= sylpheed-claws>=2.5:${PORTSDIR}/mail/sylpheed-claws RUN_DEPENDS= sylpheed-claws>=2.5:${PORTSDIR}/mail/sylpheed-claws diff --git a/mail/sylpheed-claws-rssyl/Makefile b/mail/sylpheed-claws-rssyl/Makefile index eaee17131ba2..7f43aa6c3d49 100644 --- a/mail/sylpheed-claws-rssyl/Makefile +++ b/mail/sylpheed-claws-rssyl/Makefile @@ -7,7 +7,7 @@ PORTNAME= rssyl PORTVERSION= 0.7 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= mail MASTER_SITES= http://sylpheed-claws.net/downloads/plugins/ @@ -16,7 +16,7 @@ PKGNAMEPREFIX= sylpheed-claws- MAINTAINER= c0rn@o2.pl COMMENT= A RSS/Atom plugin for sylheed-claws -LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl +LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl BUILD_DEPENDS= sylpheed-claws>=2.5:${PORTSDIR}/mail/sylpheed-claws RUN_DEPENDS= sylpheed-claws>=2.5:${PORTSDIR}/mail/sylpheed-claws diff --git a/mail/sylpheed-claws-vcalendar/Makefile b/mail/sylpheed-claws-vcalendar/Makefile index 63a09101ada3..e291b4de6816 100644 --- a/mail/sylpheed-claws-vcalendar/Makefile +++ b/mail/sylpheed-claws-vcalendar/Makefile @@ -7,7 +7,7 @@ PORTNAME= vcalendar PORTVERSION= 1.89.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= mail MASTER_SITES= http://sylpheed-claws.net/downloads/plugins/ \ ${MASTER_SITE_LOCAL} @@ -17,7 +17,7 @@ PKGNAMEPREFIX= sylpheed-claws- MAINTAINER= c0rn@o2.pl COMMENT= vCalendar plugin for sylpheed-claws -LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl +LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl BUILD_DEPENDS= sylpheed-claws>=2.5:${PORTSDIR}/mail/sylpheed-claws RUN_DEPENDS= sylpheed-claws>=2.5:${PORTSDIR}/mail/sylpheed-claws diff --git a/misc/bidwatcher/Makefile b/misc/bidwatcher/Makefile index 0de620b7ef3f..c2210cea95d5 100644 --- a/misc/bidwatcher/Makefile +++ b/misc/bidwatcher/Makefile @@ -8,7 +8,7 @@ PORTNAME= bidwatcher PORTVERSION= 1.3.17 -PORTREVISION?= 4 +PORTREVISION?= 5 CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -20,7 +20,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= obrien@FreeBSD.org COMMENT= Bid monitor for eBay -LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl +LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl PLIST_FILES= bin/bidwatcher USE_GCC= 3.2+ diff --git a/misc/esniper/Makefile b/misc/esniper/Makefile index 35565c3ceb97..833cdb544921 100644 --- a/misc/esniper/Makefile +++ b/misc/esniper/Makefile @@ -6,6 +6,7 @@ PORTNAME= esniper DISTVERSION= 2-15-0 +PORTREVISION= 1 CATEGORIES= misc net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -14,7 +15,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= lewiz@compsoc.man.ac.uk COMMENT= Lightweight tool for sniping ebay auctions -LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl +LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl GNU_CONFIGURE= yes USE_OPENSSL= yes diff --git a/misc/gkrellm-helium/Makefile b/misc/gkrellm-helium/Makefile index 74ef8c9c3454..e5fc0f5556a9 100644 --- a/misc/gkrellm-helium/Makefile +++ b/misc/gkrellm-helium/Makefile @@ -7,7 +7,7 @@ PORTNAME= gkrellm-helium PORTVERSION= 2.3.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= misc MASTER_SITES= http://kmlinux.fjfi.cvut.cz/~makovick/gkrellm/ EXTRACT_SUFX= .tgz @@ -16,7 +16,7 @@ MAINTAINER= pav@FreeBSD.org COMMENT= GKrellM plugin reading data from helium thermometer at Strahov, Prague BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 -LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl +LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2 PLIST_FILES= libexec/gkrellm2/plugins/helium.so diff --git a/misc/sword/Makefile b/misc/sword/Makefile index 611fc9a3850a..b84a69ff6144 100644 --- a/misc/sword/Makefile +++ b/misc/sword/Makefile @@ -7,7 +7,7 @@ PORTNAME= sword PORTVERSION= 1.5.9 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= misc MASTER_SITES= ftp://ftp.crosswire.org/pub/sword/source/v1.5/ \ http://www.goodking.ca/pub/files/ diff --git a/misc/sword15/Makefile b/misc/sword15/Makefile index 611fc9a3850a..b84a69ff6144 100644 --- a/misc/sword15/Makefile +++ b/misc/sword15/Makefile @@ -7,7 +7,7 @@ PORTNAME= sword PORTVERSION= 1.5.9 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= misc MASTER_SITES= ftp://ftp.crosswire.org/pub/sword/source/v1.5/ \ http://www.goodking.ca/pub/files/ diff --git a/misc/wmweather/Makefile b/misc/wmweather/Makefile index 0dd515758b2e..80df7eb39831 100644 --- a/misc/wmweather/Makefile +++ b/misc/wmweather/Makefile @@ -6,13 +6,14 @@ PORTNAME= wmweather PORTVERSION= 2.4.3 +PORTREVISION= 1 CATEGORIES= misc windowmaker MASTER_SITES= http://www.godisch.de/debian/wmweather/ MAINTAINER= kris@FreeBSD.org COMMENT= A WMaker dockapp which displays meteorological data for your city -LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl +LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl BUILD_DEPENDS= xmessage:${X_CLIENTS_PORT} RUN_DEPENDS= xmessage:${X_CLIENTS_PORT} diff --git a/multimedia/xine/Makefile b/multimedia/xine/Makefile index 3b6207e6b660..c31cf96a6ffb 100644 --- a/multimedia/xine/Makefile +++ b/multimedia/xine/Makefile @@ -18,7 +18,7 @@ COMMENT= An X11 multimedia player LIB_DEPENDS= xine.16:${PORTSDIR}/multimedia/libxine \ png.5:${PORTSDIR}/graphics/png \ - curl.3:${PORTSDIR}/ftp/curl + curl.4:${PORTSDIR}/ftp/curl USE_GETTEXT= yes USE_X_PREFIX= yes diff --git a/net-im/centericq/Makefile b/net-im/centericq/Makefile index 25c11141a7cb..b25450b7134d 100644 --- a/net-im/centericq/Makefile +++ b/net-im/centericq/Makefile @@ -8,7 +8,7 @@ PORTNAME= centericq PORTVERSION= 4.21.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= net-im MASTER_SITES= http://centericq.de/archive/source/releases/ \ http://thekonst.net/download/ @@ -65,7 +65,7 @@ CONFIGURE_ARGS+= --with-fribidi .if !defined(WITH_MSN) CONFIGURE_ARGS+= --disable-msn .else -LIB_DEPENDS+= curl.3:${PORTSDIR}/ftp/curl +LIB_DEPENDS+= curl.4:${PORTSDIR}/ftp/curl .endif .if !defined(WITH_YAHOO) diff --git a/net-im/cli-msn/Makefile b/net-im/cli-msn/Makefile index 935f5083b3e6..02ce0276a167 100644 --- a/net-im/cli-msn/Makefile +++ b/net-im/cli-msn/Makefile @@ -7,6 +7,7 @@ PORTNAME= msn PORTVERSION= 2.3 +PORTREVISION= 1 CATEGORIES= net-im MASTER_SITES= http://mor-pah.net/code/ PKGNAMEPREFIX= cli- @@ -15,7 +16,7 @@ DISTNAME= CLI-MSN-${PORTVERSION} MAINTAINER= acm@FreeBSD.org COMMENT= Command line msn messenger -LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl +LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/net-im/libmsn/Makefile b/net-im/libmsn/Makefile index 17b86cf09d02..45ee8dc98e38 100644 --- a/net-im/libmsn/Makefile +++ b/net-im/libmsn/Makefile @@ -8,7 +8,7 @@ PORTNAME= libmsn PORTVERSION= 3.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-im MASTER_SITES= http://libmsn.bdash.net.nz/files/ \ ${MASTER_SITE_SOURCEFORGE} @@ -17,7 +17,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= A library for connecting to MSN Messenger service -LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl +LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/net-p2p/amule1/Makefile b/net-p2p/amule1/Makefile index f50282230827..ddc8e6b0f785 100644 --- a/net-p2p/amule1/Makefile +++ b/net-p2p/amule1/Makefile @@ -7,7 +7,7 @@ PORTNAME= aMule PORTVERSION= 1.2.8 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net-p2p #MASTER_SITES= http://download.berlios.de/amule/ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} @@ -18,7 +18,7 @@ COMMENT= The all-platform eMule p2p client DEPRECATED= use net-p2p/amule2 if you are running OSVERSION > 500000 -LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl +LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl LATEST_LINK= aMule1 CONFLICTS= aMule-2.* aMule-devel-[0-9]* diff --git a/net-p2p/gtorrentviewer/Makefile b/net-p2p/gtorrentviewer/Makefile index 06b3d9ea895e..71bc9dfffc55 100644 --- a/net-p2p/gtorrentviewer/Makefile +++ b/net-p2p/gtorrentviewer/Makefile @@ -7,7 +7,7 @@ PORTNAME= gtorrentviewer PORTVERSION= 0.2b -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net-p2p MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -16,7 +16,7 @@ DISTNAME= GTorrentViewer-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= GTK+2 viewer and editor for BitTorrent meta files -LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl +LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl USE_GNOME= gtk20 gnomehier intlhack USE_XLIB= yes diff --git a/net-p2p/jigdo/Makefile b/net-p2p/jigdo/Makefile index 5ae4b5d57637..89c2cecdd720 100644 --- a/net-p2p/jigdo/Makefile +++ b/net-p2p/jigdo/Makefile @@ -7,6 +7,7 @@ PORTNAME= jigdo PORTVERSION= 0.7.3 +PORTREVISION= 1 CATEGORIES= net-p2p MASTER_SITES= http://www.atterer.net/jigdo/ diff --git a/net-p2p/libbt/Makefile b/net-p2p/libbt/Makefile index 890a8cb6427d..2ed23c47fb87 100644 --- a/net-p2p/libbt/Makefile +++ b/net-p2p/libbt/Makefile @@ -7,6 +7,7 @@ PORTNAME= libbt PORTVERSION= 1.05 +PORTREVISION= 1 CATEGORIES= net-p2p devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -14,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= flz@FreeBSD.org COMMENT= C library implementing the core BitTorrent protocol -LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl +LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/net-p2p/rtorrent/Makefile b/net-p2p/rtorrent/Makefile index 22239641d6dc..c0d9467eabfd 100644 --- a/net-p2p/rtorrent/Makefile +++ b/net-p2p/rtorrent/Makefile @@ -7,7 +7,7 @@ PORTNAME?= rtorrent PORTVERSION?= 0.6.4 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= net-p2p MASTER_SITES= http://libtorrent.rakshasa.no/downloads/ @@ -15,7 +15,7 @@ MAINTAINER?= flz@FreeBSD.org COMMENT?= BitTorrent Client written in C++ LIB_DEPENDS?= torrent.9:${PORTSDIR}/net-p2p/libtorrent -LIB_DEPENDS+= curl.3:${PORTSDIR}/ftp/curl +LIB_DEPENDS+= curl.4:${PORTSDIR}/ftp/curl CONFLICTS?= rtorrent-devel-[0-9]* diff --git a/net/asterisk-bristuff/Makefile b/net/asterisk-bristuff/Makefile index 2ff8a2ce07f2..5c62b4a4ef3e 100644 --- a/net/asterisk-bristuff/Makefile +++ b/net/asterisk-bristuff/Makefile @@ -7,7 +7,7 @@ PORTNAME= asterisk PORTVERSION= 1.2.13 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net MASTER_SITES= http://ftp.digium.com/pub/asterisk/ \ http://ftp.digium.com/pub/asterisk/old-releases/ @@ -26,7 +26,7 @@ COMMENT= An Open Source PBX and telephony toolkit BUILD_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 LIB_DEPENDS= speex.3:${PORTSDIR}/audio/speex \ newt.51:${PORTSDIR}/devel/newt \ - curl.3:${PORTSDIR}/ftp/curl + curl.4:${PORTSDIR}/ftp/curl RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 ONLY_FOR_ARCHS= i386 sparc64 amd64 diff --git a/net/asterisk/Makefile b/net/asterisk/Makefile index 34b5093c34ef..2cda18d7590c 100644 --- a/net/asterisk/Makefile +++ b/net/asterisk/Makefile @@ -7,7 +7,7 @@ PORTNAME= asterisk PORTVERSION= 1.2.13 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://ftp.digium.com/pub/asterisk/ \ http://ftp.digium.com/pub/asterisk/old-releases/ @@ -26,7 +26,7 @@ COMMENT= An Open Source PBX and telephony toolkit BUILD_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 LIB_DEPENDS= speex.3:${PORTSDIR}/audio/speex \ newt.51:${PORTSDIR}/devel/newt \ - curl.3:${PORTSDIR}/ftp/curl + curl.4:${PORTSDIR}/ftp/curl RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 ONLY_FOR_ARCHS= i386 sparc64 amd64 diff --git a/net/asterisk10/Makefile b/net/asterisk10/Makefile index 34b5093c34ef..2cda18d7590c 100644 --- a/net/asterisk10/Makefile +++ b/net/asterisk10/Makefile @@ -7,7 +7,7 @@ PORTNAME= asterisk PORTVERSION= 1.2.13 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://ftp.digium.com/pub/asterisk/ \ http://ftp.digium.com/pub/asterisk/old-releases/ @@ -26,7 +26,7 @@ COMMENT= An Open Source PBX and telephony toolkit BUILD_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 LIB_DEPENDS= speex.3:${PORTSDIR}/audio/speex \ newt.51:${PORTSDIR}/devel/newt \ - curl.3:${PORTSDIR}/ftp/curl + curl.4:${PORTSDIR}/ftp/curl RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 ONLY_FOR_ARCHS= i386 sparc64 amd64 diff --git a/net/asterisk12/Makefile b/net/asterisk12/Makefile index 34b5093c34ef..2cda18d7590c 100644 --- a/net/asterisk12/Makefile +++ b/net/asterisk12/Makefile @@ -7,7 +7,7 @@ PORTNAME= asterisk PORTVERSION= 1.2.13 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://ftp.digium.com/pub/asterisk/ \ http://ftp.digium.com/pub/asterisk/old-releases/ @@ -26,7 +26,7 @@ COMMENT= An Open Source PBX and telephony toolkit BUILD_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 LIB_DEPENDS= speex.3:${PORTSDIR}/audio/speex \ newt.51:${PORTSDIR}/devel/newt \ - curl.3:${PORTSDIR}/ftp/curl + curl.4:${PORTSDIR}/ftp/curl RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 ONLY_FOR_ARCHS= i386 sparc64 amd64 diff --git a/net/asterisk14/Makefile b/net/asterisk14/Makefile index 34b5093c34ef..2cda18d7590c 100644 --- a/net/asterisk14/Makefile +++ b/net/asterisk14/Makefile @@ -7,7 +7,7 @@ PORTNAME= asterisk PORTVERSION= 1.2.13 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://ftp.digium.com/pub/asterisk/ \ http://ftp.digium.com/pub/asterisk/old-releases/ @@ -26,7 +26,7 @@ COMMENT= An Open Source PBX and telephony toolkit BUILD_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 LIB_DEPENDS= speex.3:${PORTSDIR}/audio/speex \ newt.51:${PORTSDIR}/devel/newt \ - curl.3:${PORTSDIR}/ftp/curl + curl.4:${PORTSDIR}/ftp/curl RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 ONLY_FOR_ARCHS= i386 sparc64 amd64 diff --git a/net/asterisk16/Makefile b/net/asterisk16/Makefile index 34b5093c34ef..2cda18d7590c 100644 --- a/net/asterisk16/Makefile +++ b/net/asterisk16/Makefile @@ -7,7 +7,7 @@ PORTNAME= asterisk PORTVERSION= 1.2.13 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://ftp.digium.com/pub/asterisk/ \ http://ftp.digium.com/pub/asterisk/old-releases/ @@ -26,7 +26,7 @@ COMMENT= An Open Source PBX and telephony toolkit BUILD_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 LIB_DEPENDS= speex.3:${PORTSDIR}/audio/speex \ newt.51:${PORTSDIR}/devel/newt \ - curl.3:${PORTSDIR}/ftp/curl + curl.4:${PORTSDIR}/ftp/curl RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 ONLY_FOR_ARCHS= i386 sparc64 amd64 diff --git a/net/boinc-client/Makefile b/net/boinc-client/Makefile index 970b3391e969..91c6d5d62829 100644 --- a/net/boinc-client/Makefile +++ b/net/boinc-client/Makefile @@ -7,6 +7,7 @@ PORTNAME= boinc-client PORTVERSION= 5.4.9 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= pav diff --git a/net/nepenthes/Makefile b/net/nepenthes/Makefile index decdc3339549..e27ff3756f7a 100644 --- a/net/nepenthes/Makefile +++ b/net/nepenthes/Makefile @@ -7,7 +7,7 @@ PORTNAME= nepenthes PORTVERSION= 0.1.7 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= nepenthes @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= nepenthes MAINTAINER= systemoperator@gmail.com COMMENT= Determine the malware activity on a network -LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl \ +LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl \ magic.1:${PORTSDIR}/sysutils/file \ pcre.0:${PORTSDIR}/devel/pcre \ adns.1:${PORTSDIR}/dns/adns diff --git a/net/nepenthes/files/patch-modules-download-curl-download-curl.cpp b/net/nepenthes/files/patch-modules-download-curl-download-curl.cpp new file mode 100644 index 000000000000..5e0c0a4d1969 --- /dev/null +++ b/net/nepenthes/files/patch-modules-download-curl-download-curl.cpp @@ -0,0 +1,12 @@ +--- modules/download-curl/download-curl.cpp.orig Tue Dec 5 15:53:24 2006 ++++ modules/download-curl/download-curl.cpp Tue Dec 5 15:54:09 2006 +@@ -230,7 +230,9 @@ + down->getDownloadUrl()->getPort(), + down->getDownloadUrl()->getPath().c_str()); + // string auth = down->getDownloadUrl()->getUser() + ":" + down->getDownloadUrl()->getPass(); ++#if LIBCURL_VERSION_NUM < 0x071000 + curl_easy_setopt(pCurlHandle, CURLOPT_SOURCE_USERPWD,(char *)down->getDownloadUrl()->getAuth().c_str()); ++#endif + curl_easy_setopt(pCurlHandle, CURLOPT_USERPWD,(char *)down->getDownloadUrl()->getAuth().c_str()); + curl_easy_setopt(pCurlHandle, CURLOPT_URL , url); + curl_easy_setopt(pCurlHandle, CURLOPT_FTP_RESPONSE_TIMEOUT, 120); // 2 min ftp timeout diff --git a/net/wmlj/Makefile b/net/wmlj/Makefile index 73a934937196..8f0dd08f152b 100644 --- a/net/wmlj/Makefile +++ b/net/wmlj/Makefile @@ -7,7 +7,7 @@ PORTNAME= wmlj PORTVERSION= 0.4.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= laszlof@FreeBSD.org COMMENT= A dockapp that monitors your friends list at LiveJournal.com -LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl +LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl GNU_CONFIGURE= yes USE_GNOME= gtk12 diff --git a/polish/sms2/Makefile b/polish/sms2/Makefile index fef2f7ce56e7..c14c5c797664 100644 --- a/polish/sms2/Makefile +++ b/polish/sms2/Makefile @@ -7,6 +7,7 @@ PORTNAME= sms PORTVERSION= 2.0.3 +PORTREVISION= 1 CATEGORIES= polish MASTER_SITES= http://ceti.pl/~miki/komputery/download/sms/ \ http://radioemiter.pl/~mjd/slackware/sms2/ \ @@ -16,7 +17,7 @@ MASTER_SITES= http://ceti.pl/~miki/komputery/download/sms/ \ MAINTAINER= pyzmen@kam.pl COMMENT= Send SMS to cellular phones in Poland (Idea, ERA, Plus) -LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl \ +LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl \ pcre.0:${PORTSDIR}/devel/pcre \ gdbm.3:${PORTSDIR}/databases/gdbm \ pcre\\+\\+.0:${PORTSDIR}/devel/pcre++ diff --git a/print/foomatic-db/Makefile b/print/foomatic-db/Makefile index 8ad241b3cda5..df7be2ffb726 100644 --- a/print/foomatic-db/Makefile +++ b/print/foomatic-db/Makefile @@ -7,6 +7,7 @@ PORTNAME= db PORTVERSION= 20061031 +PORTREVISION= 1 CATEGORIES= print MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= acm/foomatic @@ -18,7 +19,7 @@ MAINTAINER= acm@FreeBSD.org COMMENT= Foomatic database LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2 \ - curl.3:${PORTSDIR}/ftp/curl + curl.4:${PORTSDIR}/ftp/curl USE_GMAKE= yes USE_PERL5= yes diff --git a/security/authforce/Makefile b/security/authforce/Makefile index 27fd7b5213f5..9b8cdef9ee84 100644 --- a/security/authforce/Makefile +++ b/security/authforce/Makefile @@ -7,14 +7,14 @@ PORTNAME= authforce PORTVERSION= 0.9.6 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= security www MASTER_SITES= http://www.divineinvasion.net/authforce/ MAINTAINER= ache@FreeBSD.org COMMENT= HTTP authentication brute forcer -LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl +LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl USE_BZIP2= yes USE_GETOPT_LONG=yes diff --git a/security/authforce/files/patch-ae b/security/authforce/files/patch-ae new file mode 100644 index 000000000000..33a04ebcca41 --- /dev/null +++ b/security/authforce/files/patch-ae @@ -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")) diff --git a/security/clamav/Makefile b/security/clamav/Makefile index 8a5e7ff4455b..079c78a89a8b 100644 --- a/security/clamav/Makefile +++ b/security/clamav/Makefile @@ -7,6 +7,7 @@ PORTNAME= clamav PORTVERSION= 0.88.7 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= SF @@ -115,7 +116,7 @@ PLIST_SUB+= CLAMAV-MILTER="@comment " .endif .if defined(WITH_CURL) -LIB_DEPENDS+= curl.3:${PORTSDIR}/ftp/curl +LIB_DEPENDS+= curl.4:${PORTSDIR}/ftp/curl CONFIGURE_ARGS+= --with-libcurl .else CONFIGURE_ARGS+= --without-libcurl diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile index ea66f01bdf4c..5c2a0d44cc4f 100644 --- a/security/gnupg/Makefile +++ b/security/gnupg/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnupg PORTVERSION= 1.4.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_GNUPG} MASTER_SITE_SUBDIR= gnupg diff --git a/security/osslsigncode/Makefile b/security/osslsigncode/Makefile index bb541aee61bb..67fbbd10020f 100644 --- a/security/osslsigncode/Makefile +++ b/security/osslsigncode/Makefile @@ -7,6 +7,7 @@ PORTNAME= osslsigncode PORTVERSION= 1.2 +PORTREVISION= 1 CATEGORIES= security devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -24,7 +25,7 @@ USE_GMAKE= yes USE_OPENSSL= yes .if !defined(WITHOUT_CURL) -LIB_DEPENDS+= curl.3:${PORTSDIR}/ftp/curl +LIB_DEPENDS+= curl.4:${PORTSDIR}/ftp/curl .endif .include <bsd.port.mk> diff --git a/sysutils/fusefs-curlftpfs/Makefile b/sysutils/fusefs-curlftpfs/Makefile index c09640ec87f0..7cfa525ac727 100644 --- a/sysutils/fusefs-curlftpfs/Makefile +++ b/sysutils/fusefs-curlftpfs/Makefile @@ -7,6 +7,7 @@ PORTNAME= curlftpfs PORTVERSION= 0.8 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= SF PKGNAMEPREFIX= fusefs- @@ -15,7 +16,7 @@ MAINTAINER= infofarmer@FreeBSD.org COMMENT= Mount remote ftp directories LIB_DEPENDS= fuse.2:${PORTSDIR}/sysutils/fusefs-libs \ - curl.3:${PORTSDIR}/ftp/curl + curl.4:${PORTSDIR}/ftp/curl RUN_DEPENDS= ${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod GNU_CONFIGURE= yes diff --git a/sysutils/heartbeat/Makefile b/sysutils/heartbeat/Makefile index f8628fcc7bdb..06fbbeb4ad1a 100644 --- a/sysutils/heartbeat/Makefile +++ b/sysutils/heartbeat/Makefile @@ -7,7 +7,7 @@ PORTNAME= heartbeat PORTVERSION= 1.2.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= http://linux-ha.org/download/ @@ -15,7 +15,7 @@ MAINTAINER= scott-ports@tummy.com COMMENT= Subsystem for High-Availability Clustering BUILD_DEPENDS= libnet*>=1.1.2,1:${PORTSDIR}/net/libnet -LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl \ +LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl \ xml2.5:${PORTSDIR}/textproc/libxml2 GNU_CONFIGURE= yes diff --git a/sysutils/heartbeat2/Makefile b/sysutils/heartbeat2/Makefile index f8628fcc7bdb..06fbbeb4ad1a 100644 --- a/sysutils/heartbeat2/Makefile +++ b/sysutils/heartbeat2/Makefile @@ -7,7 +7,7 @@ PORTNAME= heartbeat PORTVERSION= 1.2.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= http://linux-ha.org/download/ @@ -15,7 +15,7 @@ MAINTAINER= scott-ports@tummy.com COMMENT= Subsystem for High-Availability Clustering BUILD_DEPENDS= libnet*>=1.1.2,1:${PORTSDIR}/net/libnet -LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl \ +LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl \ xml2.5:${PORTSDIR}/textproc/libxml2 GNU_CONFIGURE= yes diff --git a/textproc/libnxml/Makefile b/textproc/libnxml/Makefile index 7a62664b3958..2b0e9945e37e 100644 --- a/textproc/libnxml/Makefile +++ b/textproc/libnxml/Makefile @@ -7,6 +7,7 @@ PORTNAME= libnxml PORTVERSION= 0.15 +PORTREVISION= 1 CATEGORIES= textproc devel MASTER_SITES= http://www2.autistici.org/bakunin/libnxml/ \ http://nivi.interfree.it/distfiles/${PORTNAME}/${PORTVERSION}/ @@ -14,7 +15,7 @@ MASTER_SITES= http://www2.autistici.org/bakunin/libnxml/ \ MAINTAINER= nivit@FreeBSD.org COMMENT= A C library for writing XML 1.0/1.1 files or streams -LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl +LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl GNU_CONFIGURE= yes CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I/${LOCALBASE}/include" LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" diff --git a/textproc/raptor/Makefile b/textproc/raptor/Makefile index cf971d9b5e1d..fe9c99811de0 100644 --- a/textproc/raptor/Makefile +++ b/textproc/raptor/Makefile @@ -8,6 +8,7 @@ PORTNAME= raptor PORTVERSION= 1.4.13 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://download.librdf.org/source/ @@ -16,7 +17,7 @@ MASTER_SITE_SUBDIR= librdf MAINTAINER= chuck@pkix.net COMMENT= RDF Parser Toolkit for Redland -LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl +LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl USE_GNOME= gnomehack gnometarget libxml2 USE_GETOPT_LONG= yes diff --git a/textproc/raptor/files/patch-configure b/textproc/raptor/files/patch-configure new file mode 100644 index 000000000000..9501209fda7c --- /dev/null +++ b/textproc/raptor/files/patch-configure @@ -0,0 +1,178 @@ +--- configure.orig Mon Dec 11 15:16:01 2006 ++++ configure Mon Dec 11 15:28:29 2006 +@@ -19868,6 +19868,74 @@ + + + ++# Check whether --with-curl-config was given. ++if test "${with_curl_config+set}" = set; then ++ withval=$with_curl_config; curl_config="$withval" ++else ++ curl_config="" ++fi ++ ++ ++if test "X$curl_config" != "X" ; then ++ { echo "$as_me:$LINENO: checking for $curl_config" >&5 ++echo $ECHO_N "checking for $curl_config... $ECHO_C" >&6; } ++ ++ if test -f $curl_config ; then ++ CURL_CONFIG=$curl_config ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } ++ else ++ { echo "$as_me:$LINENO: result: no - searching PATH" >&5 ++echo "${ECHO_T}no - searching PATH" >&6; } ++ fi ++fi ++if test "X$CURL_CONFIG" = "X"; then ++ for ac_prog in curl-config ++do ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++set dummy $ac_prog; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_CURL_CONFIG+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$CURL_CONFIG"; then ++ ac_cv_prog_CURL_CONFIG="$CURL_CONFIG" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_CURL_CONFIG="$ac_prog" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++CURL_CONFIG=$ac_cv_prog_CURL_CONFIG ++if test -n "$CURL_CONFIG"; then ++ { echo "$as_me:$LINENO: result: $CURL_CONFIG" >&5 ++echo "${ECHO_T}$CURL_CONFIG" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++ test -n "$CURL_CONFIG" && break ++done ++ ++fi ++ ++oCPPFLAGS="$CPPFLAGS" ++CPPFLAGS="$CPPFLAGS `$CURL_CONFIG --cflags`" + + for ac_header in errno.h stdlib.h unistd.h string.h limits.h dmalloc.h getopt.h sys/stat.h curl/curl.h libxml/nanohttp.h sys/param.h sys/time.h + do +@@ -20037,6 +20105,9 @@ + + done + ++CPPFLAGS="$oCPPFLAGS" ++LIBS="$oLIBS" ++ + { echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5 + echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6; } + if test "${ac_cv_header_time+set}" = set; then +@@ -23931,72 +24002,6 @@ + fi + + +-# Check whether --with-curl-config was given. +-if test "${with_curl_config+set}" = set; then +- withval=$with_curl_config; curl_config="$withval" +-else +- curl_config="" +-fi +- +- +-if test "X$curl_config" != "X" ; then +- { echo "$as_me:$LINENO: checking for $curl_config" >&5 +-echo $ECHO_N "checking for $curl_config... $ECHO_C" >&6; } +- +- if test -f $curl_config ; then +- CURL_CONFIG=$curl_config +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } +- else +- { echo "$as_me:$LINENO: result: no - searching PATH" >&5 +-echo "${ECHO_T}no - searching PATH" >&6; } +- fi +-fi +-if test "X$CURL_CONFIG" = "X"; then +- for ac_prog in curl-config +-do +- # Extract the first word of "$ac_prog", so it can be a program name with args. +-set dummy $ac_prog; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_prog_CURL_CONFIG+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test -n "$CURL_CONFIG"; then +- ac_cv_prog_CURL_CONFIG="$CURL_CONFIG" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_CURL_CONFIG="$ac_prog" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +- +-fi +-fi +-CURL_CONFIG=$ac_cv_prog_CURL_CONFIG +-if test -n "$CURL_CONFIG"; then +- { echo "$as_me:$LINENO: result: $CURL_CONFIG" >&5 +-echo "${ECHO_T}$CURL_CONFIG" >&6; } +-else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +-fi +- +- +- test -n "$CURL_CONFIG" && break +-done +- +-fi +- + + oLIBS="$LIBS" + +@@ -25623,7 +25628,9 @@ + + oCPPFLAGS="$CPPFLAGS" + if test "X$CURL_CONFIG" != X; then ++ oCPPFLAGS="$CPPFLAGS" + oLIBS="$LIBS" ++ CPPFLAGS="$CPPFLAGS `$CURL_CONFIG --cflags`" + LIBS="$LIBS `$CURL_CONFIG --libs`" + { echo "$as_me:$LINENO: checking for curl_easy_init" >&5 + echo $ECHO_N "checking for curl_easy_init... $ECHO_C" >&6; } +@@ -25728,6 +25735,7 @@ + have_curl_easy_init=no + fi + ++ CPPFLAGS="$oCPPFLAGS" + LIBS="$oLIBS" + { echo "$as_me:$LINENO: checking for libcurl library" >&5 + echo $ECHO_N "checking for libcurl library... $ECHO_C" >&6; } diff --git a/textproc/raptor2/Makefile b/textproc/raptor2/Makefile index cf971d9b5e1d..fe9c99811de0 100644 --- a/textproc/raptor2/Makefile +++ b/textproc/raptor2/Makefile @@ -8,6 +8,7 @@ PORTNAME= raptor PORTVERSION= 1.4.13 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://download.librdf.org/source/ @@ -16,7 +17,7 @@ MASTER_SITE_SUBDIR= librdf MAINTAINER= chuck@pkix.net COMMENT= RDF Parser Toolkit for Redland -LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl +LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl USE_GNOME= gnomehack gnometarget libxml2 USE_GETOPT_LONG= yes diff --git a/textproc/raptor2/files/patch-configure b/textproc/raptor2/files/patch-configure new file mode 100644 index 000000000000..9501209fda7c --- /dev/null +++ b/textproc/raptor2/files/patch-configure @@ -0,0 +1,178 @@ +--- configure.orig Mon Dec 11 15:16:01 2006 ++++ configure Mon Dec 11 15:28:29 2006 +@@ -19868,6 +19868,74 @@ + + + ++# Check whether --with-curl-config was given. ++if test "${with_curl_config+set}" = set; then ++ withval=$with_curl_config; curl_config="$withval" ++else ++ curl_config="" ++fi ++ ++ ++if test "X$curl_config" != "X" ; then ++ { echo "$as_me:$LINENO: checking for $curl_config" >&5 ++echo $ECHO_N "checking for $curl_config... $ECHO_C" >&6; } ++ ++ if test -f $curl_config ; then ++ CURL_CONFIG=$curl_config ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } ++ else ++ { echo "$as_me:$LINENO: result: no - searching PATH" >&5 ++echo "${ECHO_T}no - searching PATH" >&6; } ++ fi ++fi ++if test "X$CURL_CONFIG" = "X"; then ++ for ac_prog in curl-config ++do ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++set dummy $ac_prog; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_CURL_CONFIG+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$CURL_CONFIG"; then ++ ac_cv_prog_CURL_CONFIG="$CURL_CONFIG" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_CURL_CONFIG="$ac_prog" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++CURL_CONFIG=$ac_cv_prog_CURL_CONFIG ++if test -n "$CURL_CONFIG"; then ++ { echo "$as_me:$LINENO: result: $CURL_CONFIG" >&5 ++echo "${ECHO_T}$CURL_CONFIG" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++ test -n "$CURL_CONFIG" && break ++done ++ ++fi ++ ++oCPPFLAGS="$CPPFLAGS" ++CPPFLAGS="$CPPFLAGS `$CURL_CONFIG --cflags`" + + for ac_header in errno.h stdlib.h unistd.h string.h limits.h dmalloc.h getopt.h sys/stat.h curl/curl.h libxml/nanohttp.h sys/param.h sys/time.h + do +@@ -20037,6 +20105,9 @@ + + done + ++CPPFLAGS="$oCPPFLAGS" ++LIBS="$oLIBS" ++ + { echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5 + echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6; } + if test "${ac_cv_header_time+set}" = set; then +@@ -23931,72 +24002,6 @@ + fi + + +-# Check whether --with-curl-config was given. +-if test "${with_curl_config+set}" = set; then +- withval=$with_curl_config; curl_config="$withval" +-else +- curl_config="" +-fi +- +- +-if test "X$curl_config" != "X" ; then +- { echo "$as_me:$LINENO: checking for $curl_config" >&5 +-echo $ECHO_N "checking for $curl_config... $ECHO_C" >&6; } +- +- if test -f $curl_config ; then +- CURL_CONFIG=$curl_config +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } +- else +- { echo "$as_me:$LINENO: result: no - searching PATH" >&5 +-echo "${ECHO_T}no - searching PATH" >&6; } +- fi +-fi +-if test "X$CURL_CONFIG" = "X"; then +- for ac_prog in curl-config +-do +- # Extract the first word of "$ac_prog", so it can be a program name with args. +-set dummy $ac_prog; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_prog_CURL_CONFIG+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test -n "$CURL_CONFIG"; then +- ac_cv_prog_CURL_CONFIG="$CURL_CONFIG" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_CURL_CONFIG="$ac_prog" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +- +-fi +-fi +-CURL_CONFIG=$ac_cv_prog_CURL_CONFIG +-if test -n "$CURL_CONFIG"; then +- { echo "$as_me:$LINENO: result: $CURL_CONFIG" >&5 +-echo "${ECHO_T}$CURL_CONFIG" >&6; } +-else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +-fi +- +- +- test -n "$CURL_CONFIG" && break +-done +- +-fi +- + + oLIBS="$LIBS" + +@@ -25623,7 +25628,9 @@ + + oCPPFLAGS="$CPPFLAGS" + if test "X$CURL_CONFIG" != X; then ++ oCPPFLAGS="$CPPFLAGS" + oLIBS="$LIBS" ++ CPPFLAGS="$CPPFLAGS `$CURL_CONFIG --cflags`" + LIBS="$LIBS `$CURL_CONFIG --libs`" + { echo "$as_me:$LINENO: checking for curl_easy_init" >&5 + echo $ECHO_N "checking for curl_easy_init... $ECHO_C" >&6; } +@@ -25728,6 +25735,7 @@ + have_curl_easy_init=no + fi + ++ CPPFLAGS="$oCPPFLAGS" + LIBS="$oLIBS" + { echo "$as_me:$LINENO: checking for libcurl library" >&5 + echo $ECHO_N "checking for libcurl library... $ECHO_C" >&6; } diff --git a/www/osb-nrcit/Makefile b/www/osb-nrcit/Makefile index d3f797b09cae..c955ff9da27b 100644 --- a/www/osb-nrcit/Makefile +++ b/www/osb-nrcit/Makefile @@ -7,7 +7,7 @@ PORTNAME= osb-nrcit PORTVERSION= 0.5.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= gtk-webcore @@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Embeddable web component using KJS, KHTML and KWIQ LIB_DEPENDS= nrcore.0:${PORTSDIR}/www/osb-nrcore \ - curl.3:${PORTSDIR}/ftp/curl + curl.4:${PORTSDIR}/ftp/curl USE_GNOME= gtk20 gnomehack USE_LDCONFIG= yes diff --git a/www/p5-WWW-Curl/Makefile b/www/p5-WWW-Curl/Makefile index 95fe84353eb8..e340ea3324ae 100644 --- a/www/p5-WWW-Curl/Makefile +++ b/www/p5-WWW-Curl/Makefile @@ -7,6 +7,7 @@ PORTNAME= WWW-Curl PORTVERSION= 3.02 +PORTREVISION= 1 CATEGORIES= www ftp perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} \ http://curl.haxx.se/libcurl/perl/ @@ -16,7 +17,7 @@ PKGNAMEPREFIX= p5- MAINTAINER= roam@FreeBSD.org COMMENT= Perl binding interface for curl -LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl:install +LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl:install PERL_CONFIGURE= yes diff --git a/www/pecl-pecl_http/Makefile b/www/pecl-pecl_http/Makefile index d2ee37ea2371..2c4131ad0a03 100644 --- a/www/pecl-pecl_http/Makefile +++ b/www/pecl-pecl_http/Makefile @@ -7,6 +7,7 @@ PORTNAME= pecl_http DISTVERSION= 1.3.3 +PORTREVISION= 1 CATEGORIES= www pear MASTER_SITES= http://pecl.php.net/get/ PKGNAMEPREFIX= pecl- @@ -32,7 +33,7 @@ OPTIONS= CURL "Enable cURL HTTP requests" on \ .include <bsd.port.pre.mk> .if defined(WITH_CURL) -LIB_DEPENDS+= curl.3:${PORTSDIR}/ftp/curl +LIB_DEPENDS+= curl.4:${PORTSDIR}/ftp/curl CONFIGURE_ARGS+=--with-http-curl-requests=${LOCALBASE} .else CONFIGURE_ARGS+=--without-http-curl-requests diff --git a/www/wsdlpull/Makefile b/www/wsdlpull/Makefile index ed86dc2b85b2..a30cb552d8bd 100644 --- a/www/wsdlpull/Makefile +++ b/www/wsdlpull/Makefile @@ -8,6 +8,7 @@ PORTNAME= wsdlpull PORTVERSION= 1.12 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -15,7 +16,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= C++ WSDL Parser -LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl +LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl USE_GNOME= gnometarget USE_GCC= 3.4+ diff --git a/www/xshttpd-devel/Makefile b/www/xshttpd-devel/Makefile index b77e6a1fa858..b9eb1ef6101b 100644 --- a/www/xshttpd-devel/Makefile +++ b/www/xshttpd-devel/Makefile @@ -7,6 +7,7 @@ PORTNAME= xshttpd DISTVERSION= 3.4b21 +PORTREVISION= 1 CATEGORIES= www ipv6 MASTER_SITES= ftp://ftp.stack.nl/pub/xs-httpd/release/ \ ftp://mud.stack.nl/pub/xs-httpd/release/ diff --git a/x11/ecore/Makefile b/x11/ecore/Makefile index ce558930705f..9b2c57420c87 100644 --- a/x11/ecore/Makefile +++ b/x11/ecore/Makefile @@ -7,7 +7,7 @@ PORTNAME= ecore PORTVERSION= 20060926 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= x11 MASTER_SITES= http://sunner.elcomnet.ru/~stas/ @@ -55,7 +55,7 @@ PLIST_SUB+= EVAS="@comment " .if !defined(WITHOUT_CURL) CONFIGURE_ARGS+= --enable-curl -LIB_DEPENDS+= curl.3:${PORTSDIR}/ftp/curl +LIB_DEPENDS+= curl.4:${PORTSDIR}/ftp/curl PLIST_SUB+= CURL="" .else CONFIGURE_ARGS+= --disable-curl diff --git a/x11/ecore/pkg-plist b/x11/ecore/pkg-plist index 3b4fbcc50e74..0d8aec39c52d 100644 --- a/x11/ecore/pkg-plist +++ b/x11/ecore/pkg-plist @@ -59,7 +59,7 @@ lib/libecore_txt.a 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 |