aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--archivers/epkg/Makefile4
-rw-r--r--astro/foxtrotgps/Makefile2
-rw-r--r--astro/viking/Makefile1
-rw-r--r--audio/amarok-kde4/Makefile2
-rw-r--r--audio/ario/Makefile2
-rw-r--r--audio/deadbeef/Makefile2
-rw-r--r--audio/fplib/Makefile1
-rw-r--r--audio/gbemol/Makefile4
-rw-r--r--audio/gogglesmm/Makefile2
-rw-r--r--audio/grip/Makefile2
-rw-r--r--audio/gtkpod/Makefile2
-rw-r--r--audio/herrie/Makefile2
-rw-r--r--audio/icecast2/Makefile2
-rw-r--r--audio/libofa/Makefile2
-rw-r--r--audio/linnya/Makefile1
-rw-r--r--audio/moc/Makefile4
-rw-r--r--audio/mpdas/Makefile4
-rw-r--r--audio/mpdscribble/Makefile3
-rw-r--r--audio/musicpd/Makefile4
-rw-r--r--audio/ncmpcpp/Makefile3
-rw-r--r--audio/osd-lyrics/Makefile1
-rw-r--r--audio/rosegarden/Makefile1
-rw-r--r--audio/scmpc/Makefile3
-rw-r--r--audio/scrobbler/Makefile4
-rw-r--r--audio/streamtranscoder/Makefile2
-rw-r--r--audio/streamtuner/Makefile2
-rw-r--r--audio/vagalume/Makefile4
-rw-r--r--audio/vorbis-tools/Makefile4
-rw-r--r--audio/xmms2-scrobbler/Makefile4
-rw-r--r--audio/xmms2/Makefile2
-rw-r--r--biology/iolib/Makefile1
-rw-r--r--chinese/fcitx-cloudpinyin/Makefile1
-rw-r--r--comms/xastir/Makefile2
-rw-r--r--converters/bibtexconv/Makefile1
-rw-r--r--databases/couchdb/Makefile1
-rw-r--r--deskutils/cairo-dock/Makefile2
-rw-r--r--deskutils/fbreader/Makefile4
-rw-r--r--deskutils/google-gadgets/Makefile4
-rw-r--r--deskutils/growl-for-linux/Makefile2
-rw-r--r--deskutils/libgcal/Makefile1
-rw-r--r--deskutils/ljit/Makefile4
-rw-r--r--deskutils/logjam/Makefile4
-rw-r--r--deskutils/mdh/Makefile4
-rw-r--r--deskutils/pinot/Makefile3
-rw-r--r--deskutils/xfce4-tumbler/Makefile1
-rw-r--r--devel/aegis/Makefile3
-rw-r--r--devel/ecore-file/Makefile1
-rw-r--r--devel/hs-darcs/Makefile2
-rw-r--r--devel/libdap/Makefile1
-rw-r--r--devel/libgutenfetch/Makefile2
-rw-r--r--devel/libopkele/Makefile4
-rw-r--r--devel/libvirt/Makefile1
-rw-r--r--devel/libwfut/Makefile3
-rw-r--r--devel/mm-common/Makefile4
-rw-r--r--devel/xmltooling/Makefile3
-rw-r--r--editors/codelite/Makefile1
-rw-r--r--editors/libreoffice/Makefile2
-rw-r--r--editors/morla/Makefile4
-rw-r--r--editors/openoffice-3/Makefile3
-rw-r--r--editors/openoffice-devel/Makefile3
-rw-r--r--editors/textroom/Makefile4
-rw-r--r--emulators/qemu-devel/Makefile1
-rw-r--r--emulators/qemu/Makefile2
-rw-r--r--emulators/virtualbox-ose-legacy/Makefile3
-rw-r--r--emulators/virtualbox-ose/Makefile2
-rw-r--r--finance/libofx/Makefile3
-rw-r--r--ftp/R-cran-RCurl/Makefile2
-rw-r--r--ftp/curl/Makefile222
-rw-r--r--ftp/curl/distinfo4
-rw-r--r--ftp/curl/files/patch-CVE-2013-217438
-rw-r--r--ftp/curl/files/patch-configure41
-rw-r--r--ftp/curl/files/patch-src-tool_operate.c8
-rw-r--r--ftp/curl/pkg-plist13
-rw-r--r--ftp/curlpp/Makefile2
-rw-r--r--ftp/fpc-libcurl/Makefile2
-rw-r--r--ftp/hs-curl/Makefile2
-rw-r--r--ftp/ocaml-ocurl/Makefile4
-rw-r--r--ftp/php5-curl/Makefile1
-rw-r--r--ftp/php52-curl/Makefile1
-rw-r--r--ftp/php53-curl/Makefile1
-rw-r--r--ftp/py-curl/Makefile4
-rw-r--r--ftp/rexx-curl/Makefile2
-rw-r--r--ftp/wmget/Makefile4
-rw-r--r--games/0ad/Makefile1
-rw-r--r--games/alienarena/Makefile4
-rw-r--r--games/bzflag/Makefile2
-rw-r--r--games/crossfire-client/Makefile2
-rw-r--r--games/crossfire-server/Makefile4
-rw-r--r--games/daimonin/Makefile4
-rw-r--r--games/deng/Makefile4
-rw-r--r--games/evq3/Makefile4
-rw-r--r--games/f1spirit-remake/Makefile2
-rw-r--r--games/frobtads/Makefile1
-rw-r--r--games/ioquake3/Makefile4
-rw-r--r--games/kartofel/Makefile2
-rw-r--r--games/klavaro/Makefile1
-rw-r--r--games/kuklomenos/Makefile4
-rw-r--r--games/meandmyshadow/Makefile2
-rw-r--r--games/megaglest/Makefile2
-rw-r--r--games/mudmagic/Makefile4
-rw-r--r--games/nexuiz/Makefile4
-rw-r--r--games/openlierox/Makefile3
-rw-r--r--games/pokerth/Makefile1
-rw-r--r--games/springlobby/Makefile4
-rw-r--r--games/supertux-devel/Makefile3
-rw-r--r--games/supertuxkart/Makefile1
-rw-r--r--games/tmw/Makefile2
-rw-r--r--games/ufoai/Makefile2
-rw-r--r--games/warmux/Makefile2
-rw-r--r--games/warsow/Makefile2
-rw-r--r--games/worldofpadman/Makefile2
-rw-r--r--games/xmoto/Makefile4
-rw-r--r--games/xonotic/Makefile3
-rw-r--r--graphics/darktable/Makefile1
-rw-r--r--graphics/feh/Makefile4
-rw-r--r--graphics/gdal/Makefile1
-rw-r--r--graphics/gimmage/Makefile4
-rw-r--r--graphics/gimp-app/Makefile2
-rw-r--r--graphics/gnash/Makefile2
-rw-r--r--graphics/jp2a/Makefile4
-rw-r--r--graphics/mapnik/Makefile1
-rw-r--r--graphics/mapserver/Makefile2
-rw-r--r--graphics/osg-devel/Makefile4
-rw-r--r--graphics/osg/Makefile4
-rw-r--r--graphics/telak/Makefile2
-rw-r--r--irc/iroffer-dinoex/Makefile1
-rw-r--r--irc/unreal/Makefile2
-rw-r--r--irc/weechat-devel/Makefile1
-rw-r--r--irc/weechat/Makefile1
-rw-r--r--lang/fpc/Makefile2
-rw-r--r--lang/fpc/Makefile.units2
-rw-r--r--lang/gambas/Makefile4
-rw-r--r--lang/php52/Makefile2
-rw-r--r--lang/php52/Makefile.ext2
-rw-r--r--lang/php53/Makefile.ext2
-rw-r--r--lang/q/Makefile4
-rw-r--r--mail/libetpan/Makefile2
-rw-r--r--math/octave/Makefile2
-rw-r--r--misc/amanda-server/Makefile1
-rw-r--r--misc/amanda26-server/Makefile2
-rw-r--r--misc/amanda32-server/Makefile1
-rw-r--r--misc/esniper/Makefile1
-rw-r--r--misc/gkrellm-helium/Makefile4
-rw-r--r--misc/sword/Makefile2
-rw-r--r--misc/wmweather+/Makefile1
-rw-r--r--multimedia/audacious-plugins/Makefile2
-rw-r--r--multimedia/cclive/Makefile4
-rw-r--r--multimedia/freetuxtv/Makefile2
-rw-r--r--multimedia/gnome-mplayer/Makefile1
-rw-r--r--multimedia/libquvi/Makefile2
-rw-r--r--multimedia/mediainfo/Makefile2
-rw-r--r--multimedia/mkvtoolnix/Makefile1
-rw-r--r--multimedia/qmmp/Makefile2
-rw-r--r--multimedia/quvi/Makefile2
-rw-r--r--multimedia/xbmc-pvr/Makefile2
-rw-r--r--multimedia/xbmc/Makefile2
-rw-r--r--multimedia/xine/Makefile2
-rw-r--r--net-im/centericq/Makefile4
-rw-r--r--net-im/centerim-devel/Makefile3
-rw-r--r--net-im/centerim/Makefile3
-rw-r--r--net-im/cli-msn/Makefile3
-rw-r--r--net-mgmt/collectd/Makefile2
-rw-r--r--net-mgmt/collectd5/Makefile2
-rw-r--r--net-mgmt/sblim-wbemcli/Makefile2
-rw-r--r--net-mgmt/zabbix2-server/Makefile2
-rw-r--r--net-p2p/gnunet/Makefile2
-rw-r--r--net-p2p/gtorrentviewer/Makefile4
-rw-r--r--net-p2p/jigdo/Makefile2
-rw-r--r--net-p2p/libbt/Makefile4
-rw-r--r--net-p2p/rtorrent-devel/Makefile2
-rw-r--r--net-p2p/rtorrent/Makefile4
-rw-r--r--net-p2p/transmission-cli/Makefile4
-rw-r--r--net/asterisk/Makefile2
-rw-r--r--net/asterisk10/Makefile2
-rw-r--r--net/asterisk11/Makefile2
-rw-r--r--net/asterisk14/Makefile4
-rw-r--r--net/boinc-client/Makefile2
-rw-r--r--net/clamz/Makefile4
-rw-r--r--net/ecore-con/Makefile1
-rw-r--r--net/freeswitch-core-devel/Makefile2
-rw-r--r--net/freeswitch-core/Makefile2
-rw-r--r--net/libcmis/Makefile1
-rw-r--r--net/liboauth/Makefile1
-rw-r--r--net/linknx/Makefile4
-rw-r--r--net/mediatomb/Makefile4
-rw-r--r--net/nepenthes/Makefile4
-rw-r--r--net/opennx/Makefile1
-rw-r--r--net/wmlj/Makefile4
-rw-r--r--net/xmlrpc-c-devel/Makefile1
-rw-r--r--net/xmlrpc-c/Makefile1
-rw-r--r--polish/sms2/Makefile4
-rw-r--r--ports-mgmt/fbsdmon/Makefile1
-rw-r--r--ports-mgmt/prhistory/Makefile1
-rw-r--r--print/foomatic-db/Makefile4
-rw-r--r--science/netcdf4/Makefile4
-rw-r--r--security/authforce/Makefile2
-rw-r--r--security/binwalk/Makefile1
-rw-r--r--security/duo/Makefile1
-rw-r--r--security/gnupg/Makefile1
-rw-r--r--security/gnupg1/Makefile1
-rw-r--r--security/opensaml2/Makefile3
-rw-r--r--security/osslsigncode/Makefile4
-rw-r--r--security/p5-Net-SAML/Makefile1
-rw-r--r--security/razorback-api/Makefile3
-rw-r--r--security/squidclamav/Makefile2
-rw-r--r--security/strongswan/Makefile1
-rw-r--r--security/ykclient/Makefile1
-rw-r--r--security/zxid/Makefile1
-rw-r--r--sysutils/afflib/Makefile1
-rw-r--r--sysutils/apt/Makefile4
-rw-r--r--sysutils/ckl/Makefile2
-rw-r--r--sysutils/condor/Makefile1
-rw-r--r--sysutils/conky/Makefile2
-rw-r--r--sysutils/fusefs-curlftpfs/Makefile4
-rw-r--r--sysutils/fusefs-s3fs/Makefile1
-rw-r--r--sysutils/heartbeat/Makefile4
-rw-r--r--sysutils/pacman/Makefile1
-rw-r--r--sysutils/powerman/Makefile1
-rw-r--r--textproc/libkolabxml/Makefile1
-rw-r--r--textproc/liblrdf/Makefile2
-rw-r--r--textproc/libmrss/Makefile2
-rw-r--r--textproc/libnxml/Makefile4
-rw-r--r--textproc/raptor/Makefile4
-rw-r--r--textproc/raptor2/Makefile1
-rw-r--r--textproc/rss2html/Makefile4
-rw-r--r--textproc/zorba/Makefile2
-rw-r--r--www/cas/Makefile2
-rw-r--r--www/castget/Makefile4
-rw-r--r--www/cplanet/Makefile1
-rw-r--r--www/flickcurl/Makefile1
-rw-r--r--www/gecko-mediaplayer/Makefile2
-rw-r--r--www/mod_auth_cas/Makefile1
-rw-r--r--www/mod_auth_mellon/Makefile3
-rw-r--r--www/mod_flickr/Makefile4
-rw-r--r--www/mod_security/Makefile2
-rw-r--r--www/netsurf/Makefile1
-rw-r--r--www/newsbeuter/Makefile4
-rw-r--r--www/nspluginwrapper/Makefile3
-rw-r--r--www/openvrml/Makefile4
-rw-r--r--www/p5-WWW-Curl/Makefile3
-rw-r--r--www/pecl-http/Makefile3
-rw-r--r--www/pecl-solr/Makefile1
-rw-r--r--www/rubygem-passenger/Makefile1
-rw-r--r--www/rubygem-typhoeus/Makefile1
-rw-r--r--www/thundercache/Makefile4
-rw-r--r--www/thundersnarf/Makefile4
-rw-r--r--www/webkit-gtk2/Makefile2
-rw-r--r--www/webkit-gtk3/Makefile1
-rw-r--r--www/wsdlpull/Makefile1
-rw-r--r--www/xshttpd-devel/Makefile1
-rw-r--r--www/xshttpd/Makefile2
-rw-r--r--x11-wm/ede/Makefile4
252 files changed, 505 insertions, 405 deletions
diff --git a/archivers/epkg/Makefile b/archivers/epkg/Makefile
index 3b1ae0a258cb..b25e79a9562c 100644
--- a/archivers/epkg/Makefile
+++ b/archivers/epkg/Makefile
@@ -7,7 +7,7 @@
PORTNAME= epkg
PORTVERSION= 2.3.9
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= archivers
MASTER_SITES= ftp://ftp.feep.net/pub/encap/epkg/
@@ -15,7 +15,7 @@ MAINTAINER= pirzyk@FreeBSD.org
COMMENT= Encap Package Manager
BUILD_DEPENDS= ${LOCALBASE}/lib/libfget.a:${PORTSDIR}/ftp/fget
-LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl \
+LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl \
expat.6:${PORTSDIR}/textproc/expat2
HAS_CONFIGURE= YES
diff --git a/astro/foxtrotgps/Makefile b/astro/foxtrotgps/Makefile
index c00203024e44..f68624073276 100644
--- a/astro/foxtrotgps/Makefile
+++ b/astro/foxtrotgps/Makefile
@@ -3,7 +3,7 @@
PORTNAME= foxtrotgps
PORTVERSION= 1.1.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= astro geography
MASTER_SITES= http://www.foxtrotgps.org/releases/
diff --git a/astro/viking/Makefile b/astro/viking/Makefile
index 892b4321f2f2..0df4f201826e 100644
--- a/astro/viking/Makefile
+++ b/astro/viking/Makefile
@@ -3,6 +3,7 @@
PORTNAME= viking
PORTVERSION= 1.4.1
+PORTREVISION= 1
CATEGORIES= astro
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/
diff --git a/audio/amarok-kde4/Makefile b/audio/amarok-kde4/Makefile
index 9efa6e79f7a3..c030e66d82f1 100644
--- a/audio/amarok-kde4/Makefile
+++ b/audio/amarok-kde4/Makefile
@@ -3,7 +3,7 @@
PORTNAME= amarok
PORTVERSION= 2.7.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTNAME}/${PORTVERSION}/src
diff --git a/audio/ario/Makefile b/audio/ario/Makefile
index 5f2963d6fe95..76118c7baca7 100644
--- a/audio/ario/Makefile
+++ b/audio/ario/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ario
PORTVERSION= 1.5.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= audio
MASTER_SITES= SF/ario-player/ario-player/${PORTVERSION}
diff --git a/audio/deadbeef/Makefile b/audio/deadbeef/Makefile
index ccee5ee6ed6e..ff286b4ba1b1 100644
--- a/audio/deadbeef/Makefile
+++ b/audio/deadbeef/Makefile
@@ -3,7 +3,7 @@
PORTNAME= deadbeef
PORTVERSION= 0.5.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= SF/${PORTNAME}
diff --git a/audio/fplib/Makefile b/audio/fplib/Makefile
index 6c8ef8943587..00e77fb81806 100644
--- a/audio/fplib/Makefile
+++ b/audio/fplib/Makefile
@@ -3,6 +3,7 @@
PORTNAME= fplib
PORTVERSION= 20120911
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= LOCAL/sunpoet
diff --git a/audio/gbemol/Makefile b/audio/gbemol/Makefile
index d0d9b9942e09..02e2124e4152 100644
--- a/audio/gbemol/Makefile
+++ b/audio/gbemol/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gbemol
PORTVERSION= 0.3.2
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= audio
MASTER_SITES= SF
@@ -15,7 +15,7 @@ MAINTAINER= tmh.public@gmail.com
COMMENT= Graphical frontend for the Music Player Daemon
LIB_DEPENDS= mpd.4:${PORTSDIR}/audio/libmpd \
- curl.6:${PORTSDIR}/ftp/curl \
+ curl:${PORTSDIR}/ftp/curl \
xml2.5:${PORTSDIR}/textproc/libxml2
GNU_CONFIGURE= yes
diff --git a/audio/gogglesmm/Makefile b/audio/gogglesmm/Makefile
index a2d17662f16e..62f3c90ef3a1 100644
--- a/audio/gogglesmm/Makefile
+++ b/audio/gogglesmm/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gogglesmm
PORTVERSION= 0.12.7
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= GOOGLE_CODE
diff --git a/audio/grip/Makefile b/audio/grip/Makefile
index e538e80f7363..8c228e5d3007 100644
--- a/audio/grip/Makefile
+++ b/audio/grip/Makefile
@@ -4,7 +4,7 @@
PORTNAME= grip
PORTVERSION= 3.3.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= audio
MASTER_SITES= SF
diff --git a/audio/gtkpod/Makefile b/audio/gtkpod/Makefile
index 610aab5560a5..12e74785d21d 100644
--- a/audio/gtkpod/Makefile
+++ b/audio/gtkpod/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gtkpod
PORTVERSION= 1.0.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= audio
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/audio/herrie/Makefile b/audio/herrie/Makefile
index 39cafd9b5322..6060e75e9278 100644
--- a/audio/herrie/Makefile
+++ b/audio/herrie/Makefile
@@ -3,7 +3,7 @@
PORTNAME= herrie
PORTVERSION= 2.2
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= audio
MASTER_SITES= http://herrie.info/distfiles/ \
http://www.stack.nl/~ed/projects/herrie/distfiles/
diff --git a/audio/icecast2/Makefile b/audio/icecast2/Makefile
index a0a8c620576c..e13fba779304 100644
--- a/audio/icecast2/Makefile
+++ b/audio/icecast2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= icecast2
PORTVERSION= 2.3.2
-PORTREVISION= 9
+PORTREVISION= 10
PORTEPOCH= 1
CATEGORIES= audio net ipv6
MASTER_SITES= http://downloads.xiph.org/releases/icecast/ \
diff --git a/audio/libofa/Makefile b/audio/libofa/Makefile
index bef9697d14e6..f4fc416e16f4 100644
--- a/audio/libofa/Makefile
+++ b/audio/libofa/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libofa
PORTVERSION= 0.9.3
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= audio
MASTER_SITES= GOOGLE_CODE
diff --git a/audio/linnya/Makefile b/audio/linnya/Makefile
index 8a330c207c95..ac695b5e3750 100644
--- a/audio/linnya/Makefile
+++ b/audio/linnya/Makefile
@@ -2,6 +2,7 @@
PORTNAME= linnya
PORTVERSION= 2.3.0
+PORTREVISION= 1
CATEGORIES= audio
MAINTAINER= ghw@7axu.com
diff --git a/audio/moc/Makefile b/audio/moc/Makefile
index 1240ce6b8a28..cd95a7dc98d5 100644
--- a/audio/moc/Makefile
+++ b/audio/moc/Makefile
@@ -3,7 +3,7 @@
PORTNAME= moc
PORTVERSION= 2.4.4
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= audio
MASTER_SITES= ftp://ftp.daper.net/pub/soft/moc/stable/
@@ -105,7 +105,7 @@ CONFIGURE_ARGS+= --without-samplerate
.endif
.if ${PORT_OPTIONS:MCURL}
-LIB_DEPENDS+= curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl
.else
CONFIGURE_ARGS+= --without-curl
.endif
diff --git a/audio/mpdas/Makefile b/audio/mpdas/Makefile
index 966b1bf0f829..6a7122f653ef 100644
--- a/audio/mpdas/Makefile
+++ b/audio/mpdas/Makefile
@@ -3,14 +3,14 @@
PORTNAME= mpdas
PORTVERSION= 0.3.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= audio
MASTER_SITES= http://50hz.ws/mpdas/
MAINTAINER= hrkfdn@gmail.com
COMMENT= MPD AudioScrobbler written in C++ supporting the latest protocol
-LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl \
+LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl \
mpd.4:${PORTSDIR}/audio/libmpd
USE_GNOME= pkgconfig
diff --git a/audio/mpdscribble/Makefile b/audio/mpdscribble/Makefile
index b01086045e1b..ddcda4e5a7e3 100644
--- a/audio/mpdscribble/Makefile
+++ b/audio/mpdscribble/Makefile
@@ -3,6 +3,7 @@
PORTNAME= mpdscribble
PORTVERSION= 0.22
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= SF/musicpd/${PORTNAME}/${PORTVERSION}
@@ -29,7 +30,7 @@ SOUP_DESC= Use libsoup instead of libcurl
LIB_DEPENDS+= soup-2.4.1:${PORTSDIR}/devel/libsoup
CONFIGURE_ARGS+= --with-http-client=soup
.else
-LIB_DEPENDS+= curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl
CONFIGURE_ARGS+= --with-http-client=curl
.endif
diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile
index 774bcf64ee43..c16b997e37d0 100644
--- a/audio/musicpd/Makefile
+++ b/audio/musicpd/Makefile
@@ -2,7 +2,7 @@
PORTNAME= musicpd
PORTVERSION= 0.17.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio ipv6
MASTER_SITES= SF/${PORTNAME}/mpd/${PORTVERSION}
DISTNAME= mpd-${PORTVERSION}
@@ -11,7 +11,7 @@ MAINTAINER= crees@FreeBSD.org
COMMENT= A remote-controllable music daemon
LIB_DEPENDS+= mad.2:${PORTSDIR}/audio/libmad \
- curl.6:${PORTSDIR}/ftp/curl
+ curl:${PORTSDIR}/ftp/curl
LICENSE= GPLv2
diff --git a/audio/ncmpcpp/Makefile b/audio/ncmpcpp/Makefile
index 8a15129429e5..c5f2c2117304 100644
--- a/audio/ncmpcpp/Makefile
+++ b/audio/ncmpcpp/Makefile
@@ -3,6 +3,7 @@
PORTNAME= ncmpcpp
PORTVERSION= 0.5.10
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://unkart.ovh.org/ncmpcpp/ \
http://mirror.mcx2.org/
@@ -44,7 +45,7 @@ PLIST_FILES= bin/ncmpcpp \
PLIST_DIRS= %%DOCSDIR%%
.if ${PORT_OPTIONS:MCURL}
-LIB_DEPENDS+= curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl
CONFIGURE_ARGS+= --with-curl
.else
CONFIGURE_ARGS+= --with-curl=no
diff --git a/audio/osd-lyrics/Makefile b/audio/osd-lyrics/Makefile
index 0078865eebf6..9ded90e35fa7 100644
--- a/audio/osd-lyrics/Makefile
+++ b/audio/osd-lyrics/Makefile
@@ -3,6 +3,7 @@
PORTNAME= osdlyrics
PORTVERSION= 0.4.3
+PORTREVISION= 1
CATEGORIES= audio deskutils
MASTER_SITES= GOOGLE_CODE
PROJECTHOST= osd-lyrics
diff --git a/audio/rosegarden/Makefile b/audio/rosegarden/Makefile
index e7a5dcf6ab17..743a53ff565c 100644
--- a/audio/rosegarden/Makefile
+++ b/audio/rosegarden/Makefile
@@ -3,6 +3,7 @@
PORTNAME= rosegarden
PORTVERSION= 13.04
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/
diff --git a/audio/scmpc/Makefile b/audio/scmpc/Makefile
index c5fcad8b82b5..f921ef9a042a 100644
--- a/audio/scmpc/Makefile
+++ b/audio/scmpc/Makefile
@@ -3,6 +3,7 @@
PORTNAME= scmpc
PORTVERSION= 0.3.1
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://cloud.github.com/downloads/cmende/${PORTNAME}/
@@ -12,7 +13,7 @@ COMMENT= An Audioscrobbler client for MPD
LICENSE= GPLv2
LIB_DEPENDS= confuse.0:${PORTSDIR}/devel/libconfuse \
- curl.6:${PORTSDIR}/ftp/curl
+ curl:${PORTSDIR}/ftp/curl
USES= pkgconfig
USE_BZIP2= yes
diff --git a/audio/scrobbler/Makefile b/audio/scrobbler/Makefile
index b0129245a2a2..422c76c588fb 100644
--- a/audio/scrobbler/Makefile
+++ b/audio/scrobbler/Makefile
@@ -6,7 +6,7 @@
PORTNAME?= scrobbler
PORTVERSION= 0.3.8.1
-PORTREVISION= 14
+PORTREVISION= 15
CATEGORIES= audio
MASTER_SITES= http://static.audioscrobbler.com/plugins/ \
http://www.pipian.com/stuffforchat/
@@ -15,7 +15,7 @@ DISTNAME= xmms-scrobbler-${PORTVERSION}
MAINTAINER?= novel@FreeBSD.org
COMMENT?= XMMS/BMP plugin for Audioscrobbler.com
-LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl
CONFLICTS= bmp-scrobbler-[0-9]* \
xmms-scrobbler-[0-9]*
diff --git a/audio/streamtranscoder/Makefile b/audio/streamtranscoder/Makefile
index 3c394aea15bd..b8a968505e6a 100644
--- a/audio/streamtranscoder/Makefile
+++ b/audio/streamtranscoder/Makefile
@@ -7,7 +7,7 @@
PORTNAME= streamtranscoder
PORTVERSION= 1.2.8
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= audio
MASTER_SITES= http://www.oddsock.org/tools/streamTranscoder/
diff --git a/audio/streamtuner/Makefile b/audio/streamtuner/Makefile
index 53ff6014ea48..8352cc7e3652 100644
--- a/audio/streamtuner/Makefile
+++ b/audio/streamtuner/Makefile
@@ -3,7 +3,7 @@
PORTNAME= streamtuner
PORTVERSION= 0.99.99
-PORTREVISION= 19
+PORTREVISION= 20
CATEGORIES= audio www
MASTER_SITES= SAVANNAH
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/audio/vagalume/Makefile b/audio/vagalume/Makefile
index d1a5726d4e02..da74ede38afe 100644
--- a/audio/vagalume/Makefile
+++ b/audio/vagalume/Makefile
@@ -3,7 +3,7 @@
PORTNAME= vagalume
PORTVERSION= 0.8.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= http://vagalume.igalia.com/files/source/ \
${MASTER_SITE_DEBIAN_POOL}
@@ -13,7 +13,7 @@ MAINTAINER= decke@FreeBSD.org
COMMENT= A GTK+-based client for the Last.fm online radio
LIB_DEPENDS= xml2:${PORTSDIR}/textproc/libxml2 \
- curl.6:${PORTSDIR}/ftp/curl
+ curl:${PORTSDIR}/ftp/curl
GNU_CONFIGURE= yes
USES= pkgconfig
diff --git a/audio/vorbis-tools/Makefile b/audio/vorbis-tools/Makefile
index 7df92dc87eb4..0891f55d589e 100644
--- a/audio/vorbis-tools/Makefile
+++ b/audio/vorbis-tools/Makefile
@@ -3,7 +3,7 @@
PORTNAME= vorbis-tools
PORTVERSION= 1.4.0
-PORTREVISION= 5
+PORTREVISION= 6
PORTEPOCH= 3
CATEGORIES= audio
MASTER_SITES= http://downloads.xiph.org/releases/vorbis/
@@ -12,7 +12,7 @@ MAINTAINER= naddy@FreeBSD.org
COMMENT= Play, encode, and manage Ogg Vorbis files
LIB_DEPENDS= ao.4:${PORTSDIR}/audio/libao \
- curl.6:${PORTSDIR}/ftp/curl \
+ curl:${PORTSDIR}/ftp/curl \
FLAC:${PORTSDIR}/audio/flac \
kate.4:${PORTSDIR}/multimedia/libkate \
speex.1:${PORTSDIR}/audio/speex \
diff --git a/audio/xmms2-scrobbler/Makefile b/audio/xmms2-scrobbler/Makefile
index ce813a85222c..3e85cdaf8e9d 100644
--- a/audio/xmms2-scrobbler/Makefile
+++ b/audio/xmms2-scrobbler/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xmms2-scrobbler
PORTVERSION= 0.4.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= ftp://ftp.code-monkey.de/pub/${PORTNAME}/
@@ -13,7 +13,7 @@ COMMENT= Last.fm submission client for XMMS2
LICENSE= MIT
LIB_DEPENDS= xmmsclient.6:${PORTSDIR}/audio/xmms2 \
- curl.6:${PORTSDIR}/ftp/curl
+ curl:${PORTSDIR}/ftp/curl
USES= pkgconfig
USE_GMAKE= yes
diff --git a/audio/xmms2/Makefile b/audio/xmms2/Makefile
index 8d5ed376a808..db4ba3788ca5 100644
--- a/audio/xmms2/Makefile
+++ b/audio/xmms2/Makefile
@@ -3,7 +3,7 @@
PORTNAME?= xmms2
PORTVERSION= 0.8
-PORTREVISION?= 3
+PORTREVISION?= 4
DISTVERSIONSUFFIX=DrO_o
CATEGORIES?= audio
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20${DISTVERSIONSUFFIX}
diff --git a/biology/iolib/Makefile b/biology/iolib/Makefile
index 1c3f7448614f..40e47c27dc92 100644
--- a/biology/iolib/Makefile
+++ b/biology/iolib/Makefile
@@ -3,6 +3,7 @@
PORTNAME= io_lib
PORTVERSION= 1.13.0
+PORTREVISION= 1
CATEGORIES= biology
MASTER_SITES= SF
MASTER_SITE_SUBDIR= staden/${PORTNAME}/${PORTVERSION}
diff --git a/chinese/fcitx-cloudpinyin/Makefile b/chinese/fcitx-cloudpinyin/Makefile
index 2e7279ba3f0b..efa58222cc1d 100644
--- a/chinese/fcitx-cloudpinyin/Makefile
+++ b/chinese/fcitx-cloudpinyin/Makefile
@@ -7,6 +7,7 @@
PORTNAME= fcitx-cloudpinyin
PORTVERSION= 0.3.0
+PORTREVISION= 1
CATEGORIES= chinese
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
DIST_SUBDIR= fcitx
diff --git a/comms/xastir/Makefile b/comms/xastir/Makefile
index c0445648e600..dbba10fd27d0 100644
--- a/comms/xastir/Makefile
+++ b/comms/xastir/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xastir
PORTVERSION= 2.0.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= comms hamradio
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-stable/${PORTNAME}-${PORTVERSION}
diff --git a/converters/bibtexconv/Makefile b/converters/bibtexconv/Makefile
index be502e1b0247..6e3667f9d3c6 100644
--- a/converters/bibtexconv/Makefile
+++ b/converters/bibtexconv/Makefile
@@ -3,6 +3,7 @@
PORTNAME= bibtexconv
PORTVERSION= 0.9.3
+PORTREVISION= 1
CATEGORIES= converters
MASTER_SITES= http://www.iem.uni-due.de/~dreibh/bibtexconv/download/ \
http://www.exp-math.uni-essen.de/~dreibh/bibtexconv/download/
diff --git a/databases/couchdb/Makefile b/databases/couchdb/Makefile
index 08d4fab1d1fb..70540d7fb09f 100644
--- a/databases/couchdb/Makefile
+++ b/databases/couchdb/Makefile
@@ -3,6 +3,7 @@
PORTNAME= couchdb
PORTVERSION= 1.2.2
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_APACHE}
diff --git a/deskutils/cairo-dock/Makefile b/deskutils/cairo-dock/Makefile
index d50430caf179..8a8a68f11607 100644
--- a/deskutils/cairo-dock/Makefile
+++ b/deskutils/cairo-dock/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cairo-dock
DISTVERSION= 3.2.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= deskutils
MASTER_SITES= https://launchpadlibrarian.net/137290048/ \
http://pazzle.otdux.com.ua/
diff --git a/deskutils/fbreader/Makefile b/deskutils/fbreader/Makefile
index 7971af37492d..8bc1729774c6 100644
--- a/deskutils/fbreader/Makefile
+++ b/deskutils/fbreader/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fbreader
PORTVERSION= 0.12.10
-PORTREVISION= 2
+PORTREVISION= 3
DISTVERSIONPREFIX= sources-
CATEGORIES= deskutils
MASTER_SITES= http://www.fbreader.org/files/sources/ \
@@ -17,7 +17,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= fluffy@FreeBSD.org
COMMENT= Powerful e-book reader
-LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl \
+LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl \
expat.6:${PORTSDIR}/textproc/expat2 \
fribidi.3:${PORTSDIR}/converters/fribidi \
linebreak.2:${PORTSDIR}/textproc/liblinebreak
diff --git a/deskutils/google-gadgets/Makefile b/deskutils/google-gadgets/Makefile
index eb9a4e9be151..c16b4b4331ba 100644
--- a/deskutils/google-gadgets/Makefile
+++ b/deskutils/google-gadgets/Makefile
@@ -3,7 +3,7 @@
PORTNAME= google-gadgets
PORTVERSION= 0.11.2
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= deskutils
MASTER_SITES= http://google-gadgets-for-linux.googlecode.com/files/
DISTNAME= ${PORTNAME}-for-linux-${PORTVERSION}
@@ -21,7 +21,7 @@ BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/dbus-1.pc:${PORTSDIR}/devel/dbus \
LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo \
xml2.5:${PORTSDIR}/textproc/libxml2 \
dbus-1.3:${PORTSDIR}/devel/dbus \
- curl.6:${PORTSDIR}/ftp/curl \
+ curl:${PORTSDIR}/ftp/curl \
rsvg-2.2:${PORTSDIR}/graphics/librsvg2 \
startup-notification-1.0:${PORTSDIR}/x11/startup-notification
RUN_DEPENDS= ${LOCALBASE}/bin/update-mime-database:${PORTSDIR}/misc/shared-mime-info
diff --git a/deskutils/growl-for-linux/Makefile b/deskutils/growl-for-linux/Makefile
index 877bc0b70e0a..66837c056f90 100644
--- a/deskutils/growl-for-linux/Makefile
+++ b/deskutils/growl-for-linux/Makefile
@@ -2,7 +2,7 @@
PORTNAME= growl-for-linux
PORTVERSION= 0.6.8
-#PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= deskutils
MAINTAINER= nivit@FreeBSD.org
diff --git a/deskutils/libgcal/Makefile b/deskutils/libgcal/Makefile
index 92aabe191c8f..45c2f83aa2ee 100644
--- a/deskutils/libgcal/Makefile
+++ b/deskutils/libgcal/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libgcal
PORTVERSION= 0.9.6
+PORTREVISION= 1
CATEGORIES= deskutils
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
diff --git a/deskutils/ljit/Makefile b/deskutils/ljit/Makefile
index 5ef612c221b4..5730880798f4 100644
--- a/deskutils/ljit/Makefile
+++ b/deskutils/ljit/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ljit
PORTVERSION= 0.2.5
-PORTREVISION= 14
+PORTREVISION= 15
CATEGORIES= deskutils
MASTER_SITES= http://kir.vtx.ru/ljit/dl/ \
http://freebsd.nsu.ru/distfiles/
@@ -17,7 +17,7 @@ COMMENT= GUI tool to help LiveJournal users post images
LICENSE= GPLv2
-LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl
RUN_DEPENDS= convert:${PORTSDIR}/graphics/ImageMagick
GNU_CONFIGURE= yes
diff --git a/deskutils/logjam/Makefile b/deskutils/logjam/Makefile
index 12480007f1d4..de2dfd53c01c 100644
--- a/deskutils/logjam/Makefile
+++ b/deskutils/logjam/Makefile
@@ -7,14 +7,14 @@
PORTNAME= logjam
PORTVERSION= 4.6.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= deskutils
MASTER_SITES= http://andy-shev.github.com/LogJam/download/
MAINTAINER= novel@FreeBSD.org
COMMENT= A GTK2 interface to livejournals, ie www.livejournal.com
-LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl \
+LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl \
dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
MAN1= logjam.1
diff --git a/deskutils/mdh/Makefile b/deskutils/mdh/Makefile
index fa3e05a115ce..d84c84904783 100644
--- a/deskutils/mdh/Makefile
+++ b/deskutils/mdh/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mdh
PORTVERSION= 1.9.60
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= deskutils gnome
MASTER_SITES= http://www.gozer.org/programs/gtk/files/
@@ -31,7 +31,7 @@ LIB_DEPENDS+= gtop-2.0:${PORTSDIR}/devel/libgtop
.if defined(WITHOUT_CURL)
CONFIGURE_ARGS+= --disable-curl
.else
-LIB_DEPENDS+= curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl
.endif
post-patch:
diff --git a/deskutils/pinot/Makefile b/deskutils/pinot/Makefile
index c964fc956101..6e4394a858bb 100644
--- a/deskutils/pinot/Makefile
+++ b/deskutils/pinot/Makefile
@@ -3,6 +3,7 @@
PORTNAME= pinot
PORTVERSION= 1.06
+PORTREVISION= 1
CATEGORIES= deskutils
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
#MASTER_SITES= http://colinf.chez.com/pinot/
@@ -25,7 +26,7 @@ LIB_DEPENDS= xapian:${PORTSDIR}/databases/xapian-core \
exiv2.12:${PORTSDIR}/graphics/exiv2 \
gmime-2.4:${PORTSDIR}/mail/gmime24 \
tag.1:${PORTSDIR}/audio/taglib \
- curl.6:${PORTSDIR}/ftp/curl
+ curl:${PORTSDIR}/ftp/curl
RUN_DEPENDS= update-mime-database:${PORTSDIR}/misc/shared-mime-info \
antiword:${PORTSDIR}/textproc/antiword \
xdg-open:${PORTSDIR}/devel/xdg-utils \
diff --git a/deskutils/xfce4-tumbler/Makefile b/deskutils/xfce4-tumbler/Makefile
index b7fd89646426..6a2d20bacacb 100644
--- a/deskutils/xfce4-tumbler/Makefile
+++ b/deskutils/xfce4-tumbler/Makefile
@@ -3,6 +3,7 @@
PORTNAME= tumbler
PORTVERSION= 0.1.29
+PORTREVISION= 1
CATEGORIES= deskutils xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR= src/xfce/${PORTNAME}/${PORTVERSION:R}
diff --git a/devel/aegis/Makefile b/devel/aegis/Makefile
index a0a5d13da238..f54ebd59fec5 100644
--- a/devel/aegis/Makefile
+++ b/devel/aegis/Makefile
@@ -7,13 +7,14 @@
PORTNAME= aegis
PORTVERSION= 4.24.3
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= SF
MAINTAINER= aryeh.friedman@gmail.com
COMMENT= Transaction-based software configuration management system
-LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl
RUN_DEPENDS= tkdiff:${PORTSDIR}/textproc/tkdiff
USES= gettext
diff --git a/devel/ecore-file/Makefile b/devel/ecore-file/Makefile
index b1f805c2f922..17579cfcd31e 100644
--- a/devel/ecore-file/Makefile
+++ b/devel/ecore-file/Makefile
@@ -3,6 +3,7 @@
PORTNAME= file
PORTVERSION= 1.7.7
+PORTREVISION= 1
CATEGORIES= devel enlightenment
MASTER_SITES= http://download.enlightenment.fr/releases/ \
LOCAL/gblach/e17/
diff --git a/devel/hs-darcs/Makefile b/devel/hs-darcs/Makefile
index bebb8c61bcc9..35d9d51fb3fb 100644
--- a/devel/hs-darcs/Makefile
+++ b/devel/hs-darcs/Makefile
@@ -3,7 +3,7 @@
PORTNAME= darcs
PORTVERSION= 2.8.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/libdap/Makefile b/devel/libdap/Makefile
index 68b2fa2da2b1..540180db9c0a 100644
--- a/devel/libdap/Makefile
+++ b/devel/libdap/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libdap
PORTVERSION= 3.11.7
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://www.opendap.org/pub/source/ \
LOCAL/sunpoet
diff --git a/devel/libgutenfetch/Makefile b/devel/libgutenfetch/Makefile
index 83cb1b983859..f9906bf4354a 100644
--- a/devel/libgutenfetch/Makefile
+++ b/devel/libgutenfetch/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libgutenfetch
PORTVERSION= 1.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel
MASTER_SITES= SF
diff --git a/devel/libopkele/Makefile b/devel/libopkele/Makefile
index 9214c9427f49..35e978787d0b 100644
--- a/devel/libopkele/Makefile
+++ b/devel/libopkele/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libopkele
PORTVERSION= 2.0.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= http://kin.klever.net/dist/
@@ -15,7 +15,7 @@ MAINTAINER= zhoushuqun@gmail.com
COMMENT= A c++ implementation of an OpenID decentralized identity system
BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
-LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl \
+LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl \
pcre.3:${PORTSDIR}/devel/pcre \
expat.6:${PORTSDIR}/textproc/expat2 \
tidy:${PORTSDIR}/www/tidy-lib \
diff --git a/devel/libvirt/Makefile b/devel/libvirt/Makefile
index 954e7e7e460e..e443e3a856c1 100644
--- a/devel/libvirt/Makefile
+++ b/devel/libvirt/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libvirt
PORTVERSION= 1.1.0
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://libvirt.org/sources/ \
ftp://libvirt.org/libvirt/
diff --git a/devel/libwfut/Makefile b/devel/libwfut/Makefile
index cb0669a540b1..dd7479f5a296 100644
--- a/devel/libwfut/Makefile
+++ b/devel/libwfut/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libwfut
PORTVERSION= 0.2.2
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= SF/worldforge/libwfut%20%28updates%20library%29/${PORTVERSION}
@@ -10,7 +11,7 @@ MAINTAINER= oliver@FreeBSD.org
COMMENT= WorldForge update library
LIB_DEPENDS= sigc-2.0:${PORTSDIR}/devel/libsigc++20 \
- curl.6:${PORTSDIR}/ftp/curl
+ curl:${PORTSDIR}/ftp/curl
CONFIGURE_ARGS+=--without-python
GNU_CONFIGURE= yes
diff --git a/devel/mm-common/Makefile b/devel/mm-common/Makefile
index d24360cb7976..93f4bd217e64 100644
--- a/devel/mm-common/Makefile
+++ b/devel/mm-common/Makefile
@@ -8,14 +8,14 @@
PORTNAME= mm-common
PORTVERSION= 0.9.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel gnome
MASTER_SITES= GNOME
MAINTAINER= gnome@FreeBSD.org
COMMENT= Common build infrastructure for the GNOME C++ binding libraries
-LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl
USES= pathfix
USE_BZIP2= yes
diff --git a/devel/xmltooling/Makefile b/devel/xmltooling/Makefile
index 7536eb00a099..70a2b78c3cb2 100644
--- a/devel/xmltooling/Makefile
+++ b/devel/xmltooling/Makefile
@@ -3,13 +3,14 @@
PORTNAME= xmltooling
PORTVERSION= 1.5.3
+PORTREVISION= 1
CATEGORIES= devel security
MASTER_SITES= http://shibboleth.net/downloads/c++-opensaml/2.5.3/
MAINTAINER= girgen@FreeBSD.org
COMMENT= Low level XML support for SAML
-LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl \
+LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl \
log4shib.1:${PORTSDIR}/devel/log4shib \
xerces-c.3:${PORTSDIR}/textproc/xerces-c3 \
xml-security-c.17:${PORTSDIR}/security/apache-xml-security-c
diff --git a/editors/codelite/Makefile b/editors/codelite/Makefile
index e96a5913b069..66bdce3437f0 100644
--- a/editors/codelite/Makefile
+++ b/editors/codelite/Makefile
@@ -3,6 +3,7 @@
PORTNAME= codelite
DISTVERSION= 5.1
+PORTREVISION= 1
CATEGORIES= editors devel
MASTER_SITES= SF/${PORTNAME}/Releases/${PORTNAME}-${PORTVERSION}/
DISTNAME= ${PORTNAME}-${PORTVERSION}-gtk.src
diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile
index bb9c2411674f..2463e639bf99 100644
--- a/editors/libreoffice/Makefile
+++ b/editors/libreoffice/Makefile
@@ -26,7 +26,7 @@ BUILD_DEPENDS= p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip \
LIB_DEPENDS= icutu:${PORTSDIR}/devel/icu \
langtag:${PORTSDIR}/devel/liblangtag \
orcus-0.6:${PORTSDIR}/devel/liborcus \
- curl.6:${PORTSDIR}/ftp/curl \
+ curl:${PORTSDIR}/ftp/curl \
cairo.2:${PORTSDIR}/graphics/cairo \
graphite2:${PORTSDIR}/graphics/graphite2 \
jpeg.11:${PORTSDIR}/graphics/jpeg \
diff --git a/editors/morla/Makefile b/editors/morla/Makefile
index e2f728b41873..ea9f668a3c77 100644
--- a/editors/morla/Makefile
+++ b/editors/morla/Makefile
@@ -3,7 +3,7 @@
PORTNAME= morla
PORTVERSION= 0.16.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= editors textproc
MASTER_SITES= http://www.morlardf.net/src/ \
http://nivi.interfree.it/distfiles/${PORTNAME}/${PORTVERSION}/
@@ -14,7 +14,7 @@ COMMENT= A RDF editor
LIB_DEPENDS= nxml.18:${PORTSDIR}/textproc/libnxml \
rdf.0:${PORTSDIR}/textproc/redland \
raptor2.0:${PORTSDIR}/textproc/raptor2 \
- curl.6:${PORTSDIR}/ftp/curl
+ curl:${PORTSDIR}/ftp/curl
BUILD_DEPENDS= dot:${PORTSDIR}/graphics/graphviz
RUN_DEPENDS= dot:${PORTSDIR}/graphics/graphviz
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index cbc9b07e626f..8af61646512a 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -3,6 +3,7 @@
PORTNAME= apache-openoffice
PORTVERSION= 3.4.1
+PORTREVISION= 1
CATEGORIES= editors java
MASTER_SITES= ftp://ftp.riken.jp/net/apache/incubator/ooo/3.4.1/source/ \
${MASTER_SITE_LOCAL:S@%SUBDIR%@maho/openoffice@}:extsrc
@@ -111,7 +112,7 @@ CONFIGURE_ENV+= CC="${OOOCC}" CXX="${OOOCXX}" \
LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo \
expat.6:${PORTSDIR}/textproc/expat2 \
jpeg.11:${PORTSDIR}/graphics/jpeg \
- curl.6:${PORTSDIR}/ftp/curl \
+ curl:${PORTSDIR}/ftp/curl \
hunspell-1.3.0:${PORTSDIR}/textproc/hunspell \
poppler-glib.8:${PORTSDIR}/graphics/poppler-glib \
rdf.0:${PORTSDIR}/textproc/redland \
diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile
index acf5d9cda7b0..9fb5b0170075 100644
--- a/editors/openoffice-devel/Makefile
+++ b/editors/openoffice-devel/Makefile
@@ -3,6 +3,7 @@
PORTNAME= apache-openoffice
PORTVERSION= 4.0.${SVNREVISION}
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= editors java
MASTER_SITES= ${MASTER_SITE_LOCAL}
@@ -112,7 +113,7 @@ CONFIGURE_ENV+= CC="${OOOCC}" CXX="${OOOCXX}" \
LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo \
expat.6:${PORTSDIR}/textproc/expat2 \
jpeg.11:${PORTSDIR}/graphics/jpeg \
- curl.6:${PORTSDIR}/ftp/curl \
+ curl:${PORTSDIR}/ftp/curl \
hunspell-1.3.0:${PORTSDIR}/textproc/hunspell \
poppler-glib.8:${PORTSDIR}/graphics/poppler-glib \
rdf.0:${PORTSDIR}/textproc/redland \
diff --git a/editors/textroom/Makefile b/editors/textroom/Makefile
index e28bc66511ba..2f5c3b0872e6 100644
--- a/editors/textroom/Makefile
+++ b/editors/textroom/Makefile
@@ -3,7 +3,7 @@
PORTNAME= textroom
PORTVERSION= 0.8.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= editors
MASTER_SITES= SF
@@ -12,7 +12,7 @@ COMMENT= Full screen text editor
LIB_DEPENDS= hunspell-1.3:${PORTSDIR}/textproc/hunspell \
xml++-2.6.2:${PORTSDIR}/textproc/libxml++26 \
- curl.6:${PORTSDIR}/ftp/curl
+ curl:${PORTSDIR}/ftp/curl
USES= shared-mime-info
USE_SDL= mixer
diff --git a/emulators/qemu-devel/Makefile b/emulators/qemu-devel/Makefile
index b548682fc6b1..05d6ed5204ef 100644
--- a/emulators/qemu-devel/Makefile
+++ b/emulators/qemu-devel/Makefile
@@ -3,6 +3,7 @@
PORTNAME= qemu
PORTVERSION= 1.5.1
+PORTREVISION= 1
CATEGORIES= emulators
MASTER_SITES= http://wiki.qemu.org/download/:release \
LOCAL/nox:snapshot
diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
index 903711d2c3de..c58b5a05e4d8 100644
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@@ -3,7 +3,7 @@
PORTNAME= qemu
PORTVERSION= 0.11.1
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SAVANNAH} \
http://bellard.org/qemu/
diff --git a/emulators/virtualbox-ose-legacy/Makefile b/emulators/virtualbox-ose-legacy/Makefile
index f21638f9e59b..71857c9965a6 100644
--- a/emulators/virtualbox-ose-legacy/Makefile
+++ b/emulators/virtualbox-ose-legacy/Makefile
@@ -3,6 +3,7 @@
PORTNAME= virtualbox-ose
DISTVERSION= 4.1.24
+PORTREVISION= 1
CATEGORIES= emulators
MASTER_SITES= http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \
http://tmp.chruetertee.ch/ \
@@ -27,7 +28,7 @@ BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm \
cdrecord:${PORTSDIR}/sysutils/cdrtools
LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
xslt.2:${PORTSDIR}/textproc/libxslt \
- curl.6:${PORTSDIR}/ftp/curl
+ curl:${PORTSDIR}/ftp/curl
RUN_DEPENDS= /boot/modules/vboxdrv.ko:${PORTSDIR}/emulators/virtualbox-ose-kmod-legacy \
cdrecord:${PORTSDIR}/sysutils/cdrtools
diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile
index b3a9b845f1a4..dc77d4f27d2b 100644
--- a/emulators/virtualbox-ose/Makefile
+++ b/emulators/virtualbox-ose/Makefile
@@ -27,7 +27,7 @@ BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm \
cdrecord:${PORTSDIR}/sysutils/cdrtools
LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
xslt.2:${PORTSDIR}/textproc/libxslt \
- curl.6:${PORTSDIR}/ftp/curl
+ curl:${PORTSDIR}/ftp/curl
RUN_DEPENDS= ${KMODDIR}/vboxdrv.ko:${PORTSDIR}/emulators/virtualbox-ose-kmod \
cdrecord:${PORTSDIR}/sysutils/cdrtools
diff --git a/finance/libofx/Makefile b/finance/libofx/Makefile
index 935fe870e28e..55a6478aa4b0 100644
--- a/finance/libofx/Makefile
+++ b/finance/libofx/Makefile
@@ -3,13 +3,14 @@
PORTNAME= libofx
PORTVERSION= 0.9.5
+PORTREVISION= 1
CATEGORIES= finance
MASTER_SITES= SF
MAINTAINER= jhale@FreeBSD.org
COMMENT= OpenSource implementation of the OFX (Open Financial eXchange)
-LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl \
+LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl \
xml\\+\\+-2.6.2:${PORTSDIR}/textproc/libxml++26 \
osp.5:${PORTSDIR}/textproc/opensp
diff --git a/ftp/R-cran-RCurl/Makefile b/ftp/R-cran-RCurl/Makefile
index 52cadf3eb9ac..7693c91d7181 100644
--- a/ftp/R-cran-RCurl/Makefile
+++ b/ftp/R-cran-RCurl/Makefile
@@ -3,7 +3,7 @@
PORTNAME= RCurl
DISTVERSION= 1.95-4.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= ftp
DISTNAME= ${PORTNAME}_${DISTVERSION}
diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile
index 1af72f646e15..9d1697b8ebc1 100644
--- a/ftp/curl/Makefile
+++ b/ftp/curl/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= curl
-PORTVERSION= 7.24.0
-PORTREVISION= 4
+PORTVERSION= 7.31.0
CATEGORIES= ftp ipv6 www
MASTER_SITES= http://curl.haxx.se/download/ \
LOCAL/sunpoet
@@ -14,27 +13,29 @@ COMMENT?= Non-interactive tool to get files from FTP, GOPHER, HTTP(S) servers
LICENSE= MIT
-OPTIONS_DEFINE= CARES CURL_DEBUG IPV6 KERBEROS4 LDAP LDAPS LIBIDN LIBSSH2 \
- NTLM CA_BUNDLE PROXY RTMP TRACKMEMORY DOCS EXAMPLES
-OPTIONS_RADIO= SSL
-OPTIONS_RADIO_SSL= OPENSSL GNUTLS
-OPTIONS_DEFAULT= CA_BUNDLE PROXY OPENSSL
-CURL_DEBUG_DESC= curl diagnostic output
-LIBIDN_DESC= Internationalized Domain Names via libidn
-LIBSSH2_DESC= SCP/SFTP support via libssh2
-NTLM_DESC= NTLM authentication
-CA_BUNDLE_DESC= Install CA bundle for OpenSSL
-TRACKMEMORY_DESC= curl memory diagnostic output
+OPTIONS_DEFINE= CA_BUNDLE COOKIES CURL_DEBUG DEBUG DOCS EXAMPLES GSSAPI IDN IPV6 LDAP LDAPS LIBSSH2 NTLM PROXY RTMP SPNEGO TLS_SRP
+OPTIONS_RADIO= RESOLV SSL
+OPTIONS_RADIO_RESOLV= CARES THREADED_RESOLVER
+OPTIONS_RADIO_SSL= CYASSL GNUTLS NSS OPENSSL POLARSSL
+OPTIONS_DEFAULT=CA_BUNDLE GSSAPI IPV6 OPENSSL PROXY RESOLV THREADED_RESOLVER SSL TLS_SRP
+CA_BUNDLE_DESC= Install CA bundle for OpenSSL
+COOKIES_DESC= Cookies support
+CURL_DEBUG_DESC=cURL debug memory tracking
+LIBSSH2_DESC= SCP/SFTP support via libssh2
+RESOLV_DESC= DNS resolving options
+SPNEGO= SPNEGO (RFC 4178) support
+THREADED_RESOLVER_DESC= Threaded DNS resolver
+TLS_SRP_DESC= TLS-SRP (Secure Remote Password) support
CONFIGURE_ARGS+=--disable-threaded-resolver --disable-werror \
- --enable-imap --enable-pop3 --enable-rtsp --enable-smtp
+ --enable-imap --enable-pop3 --enable-rtsp --enable-smtp \
+ --without-axtls
CONFIGURE_ENV= LOCALBASE="${LOCALBASE}"
GNU_CONFIGURE= yes
-MAKE_ENV= SHLIB_VER="${SHLIB_VER}"
MAKE_JOBS_SAFE= yes
-USES= pathfix
-USE_PERL5_BUILD= yes
+USE_PERL5_BUILD=yes
USE_XZ= yes
+USES= pathfix
.if !defined(BUILDING_HIPHOP)
USE_LDCONFIG= yes
@@ -44,7 +45,7 @@ DOCS= BINDINGS BUGS CONTRIBUTE DISTRO-DILEMMA FAQ FEATURES HISTORY \
MANUAL README.netware README.win32 RESOURCES SSLCERTS THANKS \
TODO TheArtOfHttpScripting VERSIONS curl-config.html \
curl-config.pdf curl.html curl.pdf index.html
-MAN1= curl.1 curl-config.1
+MAN1= curl.1 curl-config.1 mk-ca-bundle.1
MAN3= curl_easy_cleanup.3 curl_easy_duphandle.3 curl_easy_escape.3 \
curl_easy_getinfo.3 curl_easy_init.3 curl_easy_pause.3 \
curl_easy_perform.3 curl_easy_recv.3 curl_easy_reset.3 \
@@ -57,59 +58,80 @@ MAN3= curl_easy_cleanup.3 curl_easy_duphandle.3 curl_easy_escape.3 \
curl_multi_info_read.3 curl_multi_init.3 curl_multi_perform.3 \
curl_multi_remove_handle.3 curl_multi_setopt.3 \
curl_multi_socket.3 curl_multi_socket_action.3 \
- curl_multi_strerror.3 curl_multi_timeout.3 \
+ curl_multi_strerror.3 curl_multi_timeout.3 curl_multi_wait.3 \
curl_share_cleanup.3 curl_share_init.3 curl_share_setopt.3 \
curl_share_strerror.3 curl_slist_append.3 \
curl_slist_free_all.3 curl_strequal.3 curl_unescape.3 \
curl_version.3 curl_version_info.3 libcurl.3 libcurl-easy.3 \
libcurl-errors.3 libcurl-multi.3 libcurl-share.3 \
libcurl-tutorial.3
-PLIST_SUB= SHLIB_VER="${SHLIB_VER}"
-
-SHLIB_VER= 6
.endif
+SLAVEDIRS= ftp/curl-hiphop
+
.include <bsd.port.options.mk>
-.if ${PORT_OPTIONS:MLIBSSH2} && ! ${PORT_OPTIONS:MOPENSSL}
-IGNORE= only supports LIBSSH2 with OpenSSL
+.if ${PORT_OPTIONS:MCA_BUNDLE} && !${PORT_OPTIONS:MOPENSSL}
+IGNORE= only supports CA bundle with OpenSSL
.endif
-.if ${PORT_OPTIONS:MNTLM} && ! ${PORT_OPTIONS:MOPENSSL}
-IGNORE= only supports NTLM with OpenSSL
+.if !${PORT_OPTIONS:MGNUTLS} && !${PORT_OPTIONS:MOPENSSL} && ${PORT_OPTIONS:MTLS_SRP}
+IGNORE= only supports TLS-SRP with either OpenSSL or GnuTLS
.endif
-.if ${PORT_OPTIONS:MLDAPS}
-.if ! ${PORT_OPTIONS:MLDAP}
+.if !${PORT_OPTIONS:MLDAP} && ${PORT_OPTIONS:MLDAPS}
IGNORE= only supports LDAPS with LDAP
-.else
-.if ! ${PORT_OPTIONS:MOPENSSL} && ! ${PORT_OPTIONS:MGNUTLS}
-IGNORE= only supports LDAPS with SSL (OpenSSL or GNUTLS)
.endif
+
+.if ${PORT_OPTIONS:MLDAPS} && !${PORT_OPTIONS:MSSL}
+IGNORE= only supports LDAPS with SSL
.endif
+
+.if ${PORT_OPTIONS:MLIBSSH2} && !${PORT_OPTIONS:MOPENSSL}
+IGNORE= only supports LIBSSH2 with OpenSSL
+.endif
+
+.if ${PORT_OPTIONS:MNTLM} && !${PORT_OPTIONS:MCYASSL} && !${PORT_OPTIONS:MGNUTLS} && !${PORT_OPTIONS:MNSS} && !${PORT_OPTIONS:MOPENSSL} && !${PORT_OPTIONS:MPOLARSSL}
+IGNORE= only supports NTLM with SSL
.endif
-.if ${PORT_OPTIONS:MOPENSSL}
-USE_OPENSSL= yes
-CONFIGURE_ARGS+= --with-ssl=${OPENSSLBASE}
.if ${PORT_OPTIONS:MCA_BUNDLE}
RUN_DEPENDS+= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
-CONFIGURE_ARGS+= --with-ca-bundle=${LOCALBASE}/share/certs/ca-root-nss.crt
+CONFIGURE_ARGS+=--with-ca-bundle=${LOCALBASE}/share/certs/ca-root-nss.crt
+.else
+CONFIGURE_ARGS+=--without-ca-bundle
+.endif
+
+.if ${PORT_OPTIONS:MCARES}
+LIB_DEPENDS+= cares:${PORTSDIR}/dns/c-ares
+CONFIGURE_ARGS+=--enable-ares=${LOCALBASE}
.else
-CONFIGURE_ARGS+= --without-ca-bundle
+CONFIGURE_ARGS+=--disable-ares
.endif
+
+.if ${PORT_OPTIONS:MCOOKIES}
+CONFIGURE_ARGS+=--enable-cookies
.else
-CONFIGURE_ARGS+= --without-ssl
-.if ${PORT_OPTIONS:MCA_BUNDLE}
-IGNORE= only supports CA bundle with OpenSSL
+CONFIGURE_ARGS+=--disable-cookies
.endif
+
+.if ${PORT_OPTIONS:MCURL_DEBUG}
+CONFIGURE_ARGS+=--enable-curldebug
+.else
+CONFIGURE_ARGS+=--disable-curldebug
.endif
-.if ${PORT_OPTIONS:MCARES}
-LIB_DEPENDS+= cares:${PORTSDIR}/dns/c-ares
-CONFIGURE_ARGS+= --enable-ares=${LOCALBASE}
+.if ${PORT_OPTIONS:MCYASSL}
+LIB_DEPENDS+= cyassl:${PORTSDIR}/security/yassl
+CONFIGURE_ARGS+=--with-cyassl=${LOCALBASE}
.else
-CONFIGURE_ARGS+= --disable-ares
+CONFIGURE_ARGS+=--without-cyassl
+.endif
+
+.if ${PORT_OPTIONS:MDEBUG}
+CONFIGURE_ARGS+=--enable-debug
+.else
+CONFIGURE_ARGS+=--disable-debug
.endif
.if ${PORT_OPTIONS:MGNUTLS}
@@ -119,88 +141,116 @@ CONFIGURE_ARGS+=--with-gnutls=${LOCALBASE}
CONFIGURE_ARGS+=--without-gnutls
.endif
-.if ${PORT_OPTIONS:MOPENSSL} || ${PORT_OPTIONS:MGNUTLS}
-PLIST_SUB+= SSL=""
+.if ${PORT_OPTIONS:MGSSAPI}
+CONFIGURE_ARGS+=--with-gssapi \
+ --with-gssapi-includes=${INCLUDEDIR} \
+ --with-gssapi-libs=${LIBDIR}
.else
-PLIST_SUB+= SSL="@comment "
+CONFIGURE_ARGS+=--without-gssapi
.endif
-.if ${PORT_OPTIONS:MIPV6}
-CONFIGURE_ARGS+= --enable-ipv6
+.if ${PORT_OPTIONS:MIDN}
+LIB_DEPENDS+= idn:${PORTSDIR}/dns/libidn
+CONFIGURE_ARGS+=--with-libidn=${LOCALBASE}
.else
-CONFIGURE_ARGS+= --disable-ipv6
+CONFIGURE_ARGS+=--without-libidn
.endif
-.if exists(/usr/lib/libkrb.a) && ${PORT_OPTIONS:MKERBEROS4}
-CONFIGURE_ARGS += --with-krb4=/usr
+.if ${PORT_OPTIONS:MIPV6}
+CONFIGURE_ARGS+=--enable-ipv6
.else
-CONFIGURE_ARGS += --without-krb4
+CONFIGURE_ARGS+=--disable-ipv6
.endif
.if ${PORT_OPTIONS:MLDAP}
-CONFIGURE_ARGS+= --enable-ldap
-USE_OPENLDAP= yes
-CFLAGS+= -I${LOCALBASE}/include
+CONFIGURE_ARGS+=--enable-ldap
+CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
+USE_OPENLDAP= yes
+.else
+CONFIGURE_ARGS+=--disable-ldap
+.endif
+
.if ${PORT_OPTIONS:MLDAPS}
-CONFIGURE_ARGS+= --enable-ldaps
+CONFIGURE_ARGS+=--enable-ldaps
.else
-CONFIGURE_ARGS+= --disable-ldaps
+CONFIGURE_ARGS+=--disable-ldaps
.endif
+
+.if ${PORT_OPTIONS:MLIBSSH2}
+LIB_DEPENDS+= ssh2:${PORTSDIR}/security/libssh2
+CONFIGURE_ARGS+=--with-libssh2=${LOCALBASE}
.else
-CONFIGURE_ARGS+= --disable-ldap --disable-ldaps
+CONFIGURE_ARGS+=--without-libssh2
.endif
-.if ${PORT_OPTIONS:MLIBIDN}
-LIB_DEPENDS+= idn.17:${PORTSDIR}/dns/libidn
-CONFIGURE_ARGS+= --with-libidn=${LOCALBASE}
+.if ${PORT_OPTIONS:MNSS}
+LIB_DEPENDS+= nss3:${PORTSDIR}/security/nss
+CONFIGURE_ARGS+=--with-nss=${LOCALBASE}
.else
-CONFIGURE_ARGS+= --without-libidn
+CONFIGURE_ARGS+=--without-nss
.endif
-.if ${PORT_OPTIONS:MLIBSSH2}
-LIB_DEPENDS+= ssh2.1:${PORTSDIR}/security/libssh2
-CONFIGURE_ARGS+= --with-libssh2=${LOCALBASE}
+.if ${PORT_OPTIONS:MNTLM}
+CONFIGURE_ARGS+=--enable-ntlm
.else
-CONFIGURE_ARGS+= --without-libssh2
+CONFIGURE_ARGS+=--disable-ntlm
.endif
-.if ${PORT_OPTIONS:MCURL_DEBUG}
-CONFIGURE_ARGS+= --enable-debug
+.if ${PORT_OPTIONS:MOPENSSL}
+USE_OPENSSL= yes
+CONFIGURE_ARGS+=--with-ssl=${OPENSSLBASE}
+.else
+CONFIGURE_ARGS+=--without-ssl
+.endif
+
+.if ${PORT_OPTIONS:MPOLARSSL}
+LIB_DEPENDS+= polarssl:${PORTSDIR}/security/polarssl
+CONFIGURE_ARGS+=--with-polarssl=${LOCALBASE}
+.else
+CONFIGURE_ARGS+=--without-polarssl
+.endif
+
+.if ${PORT_OPTIONS:MPROXY}
+CONFIGURE_ARGS+=--enable-proxy
+.else
+CONFIGURE_ARGS+=--disable-proxy
.endif
.if ${PORT_OPTIONS:MRTMP}
-LIB_DEPENDS+= rtmp.0:${PORTSDIR}/multimedia/rtmpdump
-CONFIGURE_ARGS+= --with-librtmp=${LOCALBASE}
+LIB_DEPENDS+= rtmp:${PORTSDIR}/multimedia/rtmpdump
+CONFIGURE_ARGS+=--with-librtmp=${LOCALBASE}
.else
-CONFIGURE_ARGS+= --without-librtmp
+CONFIGURE_ARGS+=--without-librtmp
.endif
-.if ${PORT_OPTIONS:MTRACKMEMORY}
-CONFIGURE_ARGS+= --enable-curldebug
+.if ${PORT_OPTIONS:MSPNEGO}
+LIB_DEPENDS+= fbopenssl:${PORTSDIR}/security/fbopenssl
+CPPFLAGS+= -I${LOCALBASE}/include/fbopenssl
+CONFIGURE_ARGS+=--with-spnego=${LOCALBASE}/lib
.else
-CONFIGURE_ARGS+= --disable-curldebug
+CONFIGURE_ARGS+=--without-spnego
.endif
-.if ${PORT_OPTIONS:MNTLM}
-CONFIGURE_ARGS+= --enable-ntlm
+.if ${PORT_OPTIONS:MTHREADED_RESOLVER}
+CONFIGURE_ARGS+=--enable-threaded-resolver
.else
-CONFIGURE_ARGS+= --disable-ntlm
+CONFIGURE_ARGS+=--disable-threaded-resolver
.endif
-.if ${PORT_OPTIONS:MPROXY}
-CONFIGURE_ARGS+= --enable-proxy
+.if ${PORT_OPTIONS:MTLS_SRP}
+CONFIGURE_ARGS+= --enable-tls-srp
.else
-CONFIGURE_ARGS+= --disable-proxy
+CONFIGURE_ARGS+= --disable-tls-srp
.endif
post-patch:
+ @${REINPLACE_CMD} -e 's|\(flags_dbg_off=\)".*"|\1""|; s|\(flags_opt_off=\)".*"|\1""|' ${WRKSRC}/configure
@${REINPLACE_CMD} -e '/^SUBDIRS = / s|$$| docs|; /^DIST_SUBDIRS = / s| docs||; /cd docs &&/d' ${WRKSRC}/Makefile.in
- @${REINPLACE_CMD} -e '/require "valgrind.pm";/d' ${WRKSRC}/tests/runtests.pl
post-install:
.if !defined(BUILDING_HIPHOP)
- ${INSTALL_DATA} ${WRKSRC}/docs/libcurl/libcurl.m4 ${PREFIX}/share/aclocal
+ ${INSTALL_DATA} ${WRKSRC}/docs/libcurl/libcurl.m4 ${PREFIX}/share/aclocal/
.if ${PORT_OPTIONS:MDOCS}
${MKDIR} ${DOCSDIR}/ ${DOCSDIR}/libcurl/
cd ${WRKSRC}/docs/ && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}/
@@ -208,20 +258,20 @@ post-install:
.endif
.if ${PORT_OPTIONS:MEXAMPLES}
${MKDIR} ${EXAMPLESDIR}/
- cd ${WRKSRC}/docs/examples/ && ${INSTALL_DATA} README Makefile.example makefile* *.c *.cc ${EXAMPLESDIR}/
+ cd ${WRKSRC}/docs/examples/ && ${INSTALL_DATA} README Makefile.example makefile* *.c *.cpp ${EXAMPLESDIR}/
.endif
.endif
# Setting LC_ALL=C is a kludge; maybe curl/libcurl shouldn't actually use
# the user's locale when dates are sent to the server.
-test: build
-.if ! ${PORT_OPTIONS:MPROXY}
+regression-test test: build
+.if !${PORT_OPTIONS:MPROXY}
@${ECHO_MSG} "******************************************"
@${ECHO_MSG} "* You have disabled curl proxy support. *"
@${ECHO_MSG} "* Some tests SHALL FAIL! *"
@${ECHO_MSG} "* This is being addressed. *"
@${ECHO_MSG} "******************************************"
.endif
- @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} LC_ALL=C ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test
+ cd ${WRKSRC}/ && ${SETENV} ${MAKE_ENV} LC_ALL=C ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test
.include <bsd.port.mk>
diff --git a/ftp/curl/distinfo b/ftp/curl/distinfo
index 24996a072e3d..4415daa23d82 100644
--- a/ftp/curl/distinfo
+++ b/ftp/curl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (curl-7.24.0.tar.lzma) = cd683ee8be137ed8a8e97d42fd3cc94f88f63d478b83d4abe38e31b6281e2268
-SIZE (curl-7.24.0.tar.lzma) = 1973811
+SHA256 (curl-7.31.0.tar.lzma) = f3ff7ae7f642e7f38b0c51ff3563d6f9f4254f5b05d1bfa8a5386fc91c70f7e4
+SIZE (curl-7.31.0.tar.lzma) = 2172148
diff --git a/ftp/curl/files/patch-CVE-2013-2174 b/ftp/curl/files/patch-CVE-2013-2174
deleted file mode 100644
index e0386e951b79..000000000000
--- a/ftp/curl/files/patch-CVE-2013-2174
+++ /dev/null
@@ -1,38 +0,0 @@
-From 6032f0ff672f09babf69d9d42bcde6eb9eeb5bea Mon Sep 17 00:00:00 2001
-From: Daniel Stenberg <daniel@haxx.se>
-Date: Sun, 19 May 2013 23:24:29 +0200
-Subject: [PATCH] Curl_urldecode: no peeking beyond end of input buffer
-
-Security problem: CVE-2013-2174
-
-If a program would give a string like "%" to curl_easy_unescape(), it
-would still consider the % as start of an encoded character. The
-function then not only read beyond the buffer but it would also deduct
-the *unsigned* counter variable for how many more bytes there's left to
-read in the buffer by two, making the counter wrap. Continuing this, the
-function would go on reading beyond the buffer and soon writing beyond
-the allocated target buffer...
-
-Bug: http://curl.haxx.se/docs/adv_20130622.html
-Reported-by: Timo Sirainen
----
- lib/escape.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git lib/escape.c lib/escape.c
-index 6a26cf8..aa7db2c 100644
---- lib/escape.c
-+++ lib/escape.c
-@@ -159,7 +159,8 @@ CURLcode Curl_urldecode(struct SessionHandle *data,
-
- while(--alloc > 0) {
- in = *string;
-- if(('%' == in) && ISXDIGIT(string[1]) && ISXDIGIT(string[2])) {
-+ if(('%' == in) && (alloc > 2) &&
-+ ISXDIGIT(string[1]) && ISXDIGIT(string[2])) {
- /* this is two hexadecimal digits following a '%' */
- char hexstr[3];
- char *ptr;
---
-1.7.10.4
-
diff --git a/ftp/curl/files/patch-configure b/ftp/curl/files/patch-configure
index 3510088a3f55..530e871c984a 100644
--- a/ftp/curl/files/patch-configure
+++ b/ftp/curl/files/patch-configure
@@ -6,22 +6,9 @@ Forwarded: not-needed
Author: Peter Pentchev <roam@FreeBSD.org>
Last-Update: 2010-12-19
---- configure.orig 2012-02-26 17:52:21.904908587 +0800
-+++ configure 2012-02-26 17:52:21.929909948 +0800
-@@ -15049,10 +15049,10 @@
- flags_dbg_all="$flags_dbg_all -gdwarf-2"
- flags_dbg_all="$flags_dbg_all -gvms"
- flags_dbg_yes="-g"
-- flags_dbg_off="-g0"
-+ flags_dbg_off=""
- flags_opt_all="-O -O0 -O1 -O2 -O3 -Os"
- flags_opt_yes="-O2"
-- flags_opt_off="-O0"
-+ flags_opt_off=""
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-@@ -15892,6 +15892,9 @@
+--- configure.orig 2013-02-06 17:47:26.000000000 +0800
++++ configure 2013-02-18 18:25:16.000000000 +0800
+@@ -16651,6 +16651,9 @@
tmp_CFLAGS="$CFLAGS"
tmp_CPPFLAGS="$CPPFLAGS"
@@ -31,7 +18,7 @@ Last-Update: 2010-12-19
ac_var_stripped=""
for word1 in $tmp_CFLAGS; do
ac_var_strip_word="no"
-@@ -15922,6 +15925,7 @@
+@@ -16681,6 +16684,7 @@
done
tmp_CPPFLAGS="$ac_var_stripped"
squeeze tmp_CPPFLAGS
@@ -39,7 +26,7 @@ Last-Update: 2010-12-19
#
if test "$want_debug" = "yes"; then
-@@ -16139,6 +16143,9 @@
+@@ -16898,6 +16902,9 @@
#
if test "$honor_optimize_option" = "yes"; then
@@ -49,7 +36,7 @@ Last-Update: 2010-12-19
ac_var_stripped=""
for word1 in $tmp_CFLAGS; do
ac_var_strip_word="no"
-@@ -16169,6 +16176,7 @@
+@@ -16928,6 +16935,7 @@
done
tmp_CPPFLAGS="$ac_var_stripped"
squeeze tmp_CPPFLAGS
@@ -57,17 +44,17 @@ Last-Update: 2010-12-19
if test "$want_optimize" = "yes"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts optimizer enabling options" >&5
-@@ -20137,7 +20145,8 @@
+@@ -21379,7 +21387,8 @@
PKGTEST="no"
PREFIX_OPENSSL=$OPT_SSL
- OPENSSL_PCDIR="$OPT_SSL/lib/pkgconfig"
-+ # Use the FreeBSD location of the pkg-config libdir
++ # Use the FreeBSD location of the pkgconf libdir
+ OPENSSL_PCDIR="$LOCALBASE/libdata/pkgconfig"
{ $as_echo "$as_me:${as_lineno-$LINENO}: PKG_CONFIG_LIBDIR will be set to \"$OPENSSL_PCDIR\"" >&5
$as_echo "$as_me: PKG_CONFIG_LIBDIR will be set to \"$OPENSSL_PCDIR\"" >&6;}
if test -f "$OPENSSL_PCDIR/openssl.pc"; then
-@@ -23231,29 +23240,30 @@
+@@ -24725,29 +24734,30 @@
;;
off)
LIB_RTMP="-lrtmp"
@@ -78,9 +65,9 @@ Last-Update: 2010-12-19
*)
PREFIX_RTMP=$OPT_LIBRTMP
+ LIB_RTMP="-lrtmp"
-+ LD_RTMP=-L${PREFIX_RTMP}/lib$libsuff
-+ CPP_RTMP=-I${PREFIX_RTMP}/include
-+ DIR_RTMP=${PREFIX_RTMP}/lib$libsuff
++ LD_RTMP="-L${PREFIX_RTMP}/lib$libsuff"
++ CPP_RTMP="-I${PREFIX_RTMP}/include"
++ DIR_RTMP="${PREFIX_RTMP}/lib$libsuff"
;;
esac
@@ -92,13 +79,13 @@ Last-Update: 2010-12-19
-
LDFLAGS="$LDFLAGS $LD_RTMP"
CPPFLAGS="$CPPFLAGS $CPP_RTMP"
- LIBS="$LIBS $LIB_RTMP"
+ LIBS="$LIB_RTMP $LIBS"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RTMP_Init in -lrtmp" >&5
-$as_echo_n "checking for RTMP_Init in -lrtmp... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RTMP_Init in $LIB_RTMP" >&5
+$as_echo_n "checking for RTMP_Init in $LIB_RTMP... " >&6; }
- if test "${ac_cv_lib_rtmp_RTMP_Init+set}" = set; then :
+ if ${ac_cv_lib_rtmp_RTMP_Init+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
diff --git a/ftp/curl/files/patch-src-tool_operate.c b/ftp/curl/files/patch-src-tool_operate.c
index a168b8bcec40..01c92c9beeed 100644
--- a/ftp/curl/files/patch-src-tool_operate.c
+++ b/ftp/curl/files/patch-src-tool_operate.c
@@ -1,6 +1,6 @@
---- src/tool_operate.c.orig 2012-01-23 23:31:30.000000000 +0800
-+++ src/tool_operate.c 2012-02-26 17:40:00.117907281 +0800
-@@ -580,22 +580,10 @@
+--- src/tool_operate.c.orig 2012-07-24 01:59:20.000000000 +0800
++++ src/tool_operate.c 2012-09-22 20:54:44.439408357 +0800
+@@ -653,22 +653,10 @@
DEBUGASSERT(!outs.filename);
}
@@ -26,7 +26,7 @@
if(!file) {
helpf(config->errors, "Can't open '%s'!\n", outfile);
res = CURLE_WRITE_ERROR;
-@@ -603,6 +591,19 @@
+@@ -676,6 +664,19 @@
}
outs.fopened = TRUE;
outs.stream = file;
diff --git a/ftp/curl/pkg-plist b/ftp/curl/pkg-plist
index 7e3320ebe082..e32aa696c598 100644
--- a/ftp/curl/pkg-plist
+++ b/ftp/curl/pkg-plist
@@ -14,7 +14,7 @@ share/aclocal/libcurl.m4
lib/libcurl.a
lib/libcurl.la
lib/libcurl.so
-lib/libcurl.so.%%SHLIB_VER%%
+lib/libcurl.so.7
libdata/pkgconfig/libcurl.pc
%%PORTDOCS%%%%DOCSDIR%%/BINDINGS
%%PORTDOCS%%%%DOCSDIR%%/BUGS
@@ -117,6 +117,8 @@ libdata/pkgconfig/libcurl.pc
%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_strerror.pdf
%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_timeout.html
%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_timeout.pdf
+%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_wait.html
+%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_wait.pdf
%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_cleanup.html
%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_cleanup.pdf
%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_init.html
@@ -157,6 +159,7 @@ libdata/pkgconfig/libcurl.pc
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile.example
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/anyauthput.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/asiohiper.cpp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cacertinmem.c
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/certinfo.c
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/chkspeed.c
@@ -172,14 +175,16 @@ libdata/pkgconfig/libcurl.pc
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ftpget.c
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ftpgetinfo.c
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ftpgetresp.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ftpsget.c
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ftpupload.c
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ftpuploadresume.c
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/getinfo.c
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/getinmemory.c
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ghiper.c
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hiperfifo.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/href_extractor.c
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/htmltidy.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/htmltitle.cc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/htmltitle.cpp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/http-post.c
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/httpcustomheader.c
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/httpput.c
@@ -191,6 +196,7 @@ libdata/pkgconfig/libcurl.pc
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/multi-double.c
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/multi-post.c
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/multi-single.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/multi-uv.c
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/multithread.c
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/opensslthreadlock.c
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/persistant.c
@@ -204,6 +210,7 @@ libdata/pkgconfig/libcurl.pc
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sampleconv.c
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sepheaders.c
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sendrecv.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sftpget.c
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simple.c
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplepost.c
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplesmtp.c
@@ -214,4 +221,6 @@ libdata/pkgconfig/libcurl.pc
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/synctime.c
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/threaded-ssl.c
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/url2file.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/usercertinmem.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xmlstream.c
%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
diff --git a/ftp/curlpp/Makefile b/ftp/curlpp/Makefile
index ed0428c18869..b8ea2d626c99 100644
--- a/ftp/curlpp/Makefile
+++ b/ftp/curlpp/Makefile
@@ -3,7 +3,7 @@
PORTNAME= curlpp
PORTVERSION= 0.7.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= ftp
MASTER_SITES= GOOGLE_CODE
diff --git a/ftp/fpc-libcurl/Makefile b/ftp/fpc-libcurl/Makefile
index 754b5cb38957..b33eb0d803fb 100644
--- a/ftp/fpc-libcurl/Makefile
+++ b/ftp/fpc-libcurl/Makefile
@@ -1,7 +1,7 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= ftp lang
PKGNAMESUFFIX= -libcurl
diff --git a/ftp/hs-curl/Makefile b/ftp/hs-curl/Makefile
index 87dde24141e4..3d83c4d5d50c 100644
--- a/ftp/hs-curl/Makefile
+++ b/ftp/hs-curl/Makefile
@@ -2,7 +2,7 @@
PORTNAME= curl
PORTVERSION= 1.3.8
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= ftp haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/ftp/ocaml-ocurl/Makefile b/ftp/ocaml-ocurl/Makefile
index 3cd0a7eef247..86b7ffffec56 100644
--- a/ftp/ocaml-ocurl/Makefile
+++ b/ftp/ocaml-ocurl/Makefile
@@ -5,7 +5,7 @@
PORTNAME= ocurl
PORTVERSION= 0.5.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= ftp
MASTER_SITES= SF
PKGNAMEPREFIX= ocaml-
@@ -18,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.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl
WRKSRC= ${WRKDIR}/${PORTNAME}
USE_GMAKE= yes
diff --git a/ftp/php5-curl/Makefile b/ftp/php5-curl/Makefile
index d9da384a99f0..ce23083e72ed 100644
--- a/ftp/php5-curl/Makefile
+++ b/ftp/php5-curl/Makefile
@@ -6,6 +6,7 @@
#
CATEGORIES= ftp
+PORTREVISION= 1
MASTERDIR= ${.CURDIR}/../../lang/php5
diff --git a/ftp/php52-curl/Makefile b/ftp/php52-curl/Makefile
index 9653bcb447a9..8742db636e7f 100644
--- a/ftp/php52-curl/Makefile
+++ b/ftp/php52-curl/Makefile
@@ -6,6 +6,7 @@
#
CATEGORIES= ftp
+PORTREVISION= 15
MASTERDIR= ${.CURDIR}/../../lang/php52
diff --git a/ftp/php53-curl/Makefile b/ftp/php53-curl/Makefile
index 85802cec9467..29f869e5193d 100644
--- a/ftp/php53-curl/Makefile
+++ b/ftp/php53-curl/Makefile
@@ -6,6 +6,7 @@
#
CATEGORIES= ftp
+PORTREVISION= 1
MASTERDIR= ${.CURDIR}/../../lang/php53
diff --git a/ftp/py-curl/Makefile b/ftp/py-curl/Makefile
index 8c66e9dc5740..fd4a56e26e93 100644
--- a/ftp/py-curl/Makefile
+++ b/ftp/py-curl/Makefile
@@ -7,7 +7,7 @@
PORTNAME= curl
PORTVERSION= 7.19.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= ftp python
MASTER_SITES= http://pycurl.sourceforge.net/download/ \
http://pycurl.sourceforge.net/download/00-OLD-VERSIONS/
@@ -17,7 +17,7 @@ DISTNAME= py${PORTNAME}-${PORTVERSION}
MAINTAINER= wenheping@gmail.com
COMMENT= Python interface to libcurl
-LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl
DOCSDIR= ${PREFIX}/share/doc/py-curl
EXAMPLESDIR= ${PREFIX}/share/examples/py-curl
diff --git a/ftp/rexx-curl/Makefile b/ftp/rexx-curl/Makefile
index 8281a668d5c6..0569d20c6159 100644
--- a/ftp/rexx-curl/Makefile
+++ b/ftp/rexx-curl/Makefile
@@ -3,7 +3,7 @@
PORTNAME= curl
PORTVERSION= 1.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= ftp
MASTER_SITES= SF/rexx${PORTNAME}/rexx${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= rexx-
diff --git a/ftp/wmget/Makefile b/ftp/wmget/Makefile
index 9b07a3318ad3..63c165ec2894 100644
--- a/ftp/wmget/Makefile
+++ b/ftp/wmget/Makefile
@@ -6,7 +6,7 @@
PORTNAME= wmget
PORTVERSION= 0.6.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= ftp
MASTER_SITES= http://amtrickey.net/download/ \
${MASTER_SITE_LOCAL}
@@ -16,7 +16,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= uqs@FreeBSD.org
COMMENT= Dock app for Window Maker providing wget functionality
-LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl
USE_XORG= x11 xpm
USE_GMAKE= yes
diff --git a/games/0ad/Makefile b/games/0ad/Makefile
index 9fe737987bfc..59099b5fbb84 100644
--- a/games/0ad/Makefile
+++ b/games/0ad/Makefile
@@ -2,6 +2,7 @@
PORTNAME= 0ad
PORTVERSION= 0.0.13
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= SF/zero-ad/releases
DISTFILES= ${PORTNAME}-${PORTVERSION}-alpha-unix-build.tar.xz \
diff --git a/games/alienarena/Makefile b/games/alienarena/Makefile
index cb1266eea393..0cc3bcdfd3c8 100644
--- a/games/alienarena/Makefile
+++ b/games/alienarena/Makefile
@@ -3,7 +3,7 @@
PORTNAME= alienarena
PORTVERSION= 2011.753
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= games
MASTER_SITES= ftp://ftp.linux.kiev.ua/pub/Linux/Gentoo/distfiles/ \
http://ftp.jeuxlinux.fr/files/ \
@@ -51,7 +51,7 @@ LIBDIR= ${PREFIX}/lib/${PORTNAME}
.if ${PORT_OPTIONS:MCLIENT}
USES+= pkgconfig
-LIB_DEPENDS+= curl.6:${PORTSDIR}/ftp/curl \
+LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl \
freetype.9:${PORTSDIR}/print/freetype2 \
jpeg.11:${PORTSDIR}/graphics/jpeg \
png15:${PORTSDIR}/graphics/png \
diff --git a/games/bzflag/Makefile b/games/bzflag/Makefile
index cebd51f9c62d..031a65005fe1 100644
--- a/games/bzflag/Makefile
+++ b/games/bzflag/Makefile
@@ -2,7 +2,7 @@
PORTNAME= bzflag
PORTVERSION= 2.4.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20source/${PORTVERSION}
diff --git a/games/crossfire-client/Makefile b/games/crossfire-client/Makefile
index 9130a7ae9d82..f08d00612aee 100644
--- a/games/crossfire-client/Makefile
+++ b/games/crossfire-client/Makefile
@@ -3,7 +3,7 @@
PORTNAME= crossfire-client
PORTVERSION= 1.70.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games
MASTER_SITES= SF/crossfire/crossfire-${PORTVERSION}
diff --git a/games/crossfire-server/Makefile b/games/crossfire-server/Makefile
index a2ff4198063b..e317535c98fb 100644
--- a/games/crossfire-server/Makefile
+++ b/games/crossfire-server/Makefile
@@ -3,7 +3,7 @@
PORTNAME= crossfire
PORTVERSION= 1.70.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}
PKGNAMESUFFIX= -server
@@ -14,7 +14,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Server for multiplayer graphical arcade and adventure game
BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash
-LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl \
+LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl \
png15:${PORTSDIR}/graphics/png
LICENSE= GPLv2 GPLv3
diff --git a/games/daimonin/Makefile b/games/daimonin/Makefile
index df230020e7f8..5ab745aad74c 100644
--- a/games/daimonin/Makefile
+++ b/games/daimonin/Makefile
@@ -3,7 +3,7 @@
PORTNAME= daimonin
PORTVERSION= 0.10.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= games
MASTER_SITES= http://daimonin.svn.sourceforge.net/viewvc/daimonin/main/client/?view=tar&pathrev=${SVN_REVISION}&file=
DIST_SUBDIR= ${PORTNAME}
@@ -12,7 +12,7 @@ MAINTAINER= fbsd@opal.com
COMMENT= Free open source Massively Multiplayer On-line Role-playing Game (MMORPG)
LIB_DEPENDS= physfs.1:${PORTSDIR}/devel/physfs \
- curl.6:${PORTSDIR}/ftp/curl
+ curl:${PORTSDIR}/ftp/curl
SVN_REVISION= 6021
FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX}
diff --git a/games/deng/Makefile b/games/deng/Makefile
index 136d5e7df189..5ba0985c1971 100644
--- a/games/deng/Makefile
+++ b/games/deng/Makefile
@@ -3,7 +3,7 @@
PORTNAME= deng
PORTVERSION= 1.9.0b6.9
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/Doomsday%20Engine/1.9.0-beta6.9
DISTNAME= ${PORTNAME}-${PORTVERSION:S/b/-beta/}
@@ -12,7 +12,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Enhanced Doom, Heretic, and Hexen source port
BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip
-LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl \
+LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl \
png15:${PORTSDIR}/graphics/png
RUN_DEPENDS= timidity:${PORTSDIR}/audio/timidity
diff --git a/games/evq3/Makefile b/games/evq3/Makefile
index f4e34949c81f..419ec78339ef 100644
--- a/games/evq3/Makefile
+++ b/games/evq3/Makefile
@@ -7,7 +7,7 @@
PORTNAME= evq3
PORTVERSION= 1.3.20080810
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_LOCAL:S|$|alepulver/|}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
@@ -64,7 +64,7 @@ MAKE_ENV+= HAVE_VM_COMPILED=true
.if ${PORT_OPTIONS:MCLIENT} || !empty(PORT_OPTIONS:MSMP)
# curl
. if ${PORT_OPTIONS:MCURL}
-LIB_DEPENDS+= curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl
MAKE_ENV+= USE_CURL=1
. if ${PORT_OPTIONS:MCURL_DLOPEN}
MAKE_ENV+= USE_CURL_DLOPEN=1
diff --git a/games/f1spirit-remake/Makefile b/games/f1spirit-remake/Makefile
index 4e7d7a7ccaf1..4ecfa2fafa33 100644
--- a/games/f1spirit-remake/Makefile
+++ b/games/f1spirit-remake/Makefile
@@ -3,7 +3,7 @@
PORTNAME= f1spirit-remake
PORTVERSION= 1.0
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= games
# Original braingames site is really slow
MASTER_SITES= http://mirror.amdmi3.ru/distfiles/ \
diff --git a/games/frobtads/Makefile b/games/frobtads/Makefile
index 0ecba1b14694..9f50262bc3b3 100644
--- a/games/frobtads/Makefile
+++ b/games/frobtads/Makefile
@@ -3,6 +3,7 @@
PORTNAME= frobtads
PORTVERSION= 1.2.2
+PORTREVISION= 1
CATEGORIES= games lang
MASTER_SITES= http://www.tads.org/${PORTNAME}/ \
http://www.ifarchive.org/if-archive/programming/tads3/source/
diff --git a/games/ioquake3/Makefile b/games/ioquake3/Makefile
index 5faf483e6de7..aa0b5fe7333f 100644
--- a/games/ioquake3/Makefile
+++ b/games/ioquake3/Makefile
@@ -3,7 +3,7 @@
PORTNAME?= ioquake3
DISTVERSION?= 1.36
-PORTREVISION?= 12
+PORTREVISION?= 13
CATEGORIES= games
MASTER_SITES?= http://ioquake3.org/files/${DISTVERSION}/
# Using zip this way enables slaves to override it.
@@ -117,7 +117,7 @@ IGNORE= needs at least one of CLIENT, DEDICATED and SMP options
.if ${PORT_OPTIONS:MCLIENT} || ${PORT_OPTIONS:MSMP}
# cURL
.if ${PORT_OPTIONS:MCURL}
-LIB_DEPENDS+= curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl
MAKE_ARGS+= USE_CURL=1 USE_CURL_DLOPEN=0
.else
MAKE_ARGS+= USE_CURL=0
diff --git a/games/kartofel/Makefile b/games/kartofel/Makefile
index afc872624c1b..a4ded5aa0e93 100644
--- a/games/kartofel/Makefile
+++ b/games/kartofel/Makefile
@@ -3,7 +3,7 @@
PORTNAME= kartofel
PORTVERSION= 1.2
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= games
MASTER_SITES= http://kartofel.jfedor.org/downloads/ \
http://mirror.amdmi3.ru/distfiles/
diff --git a/games/klavaro/Makefile b/games/klavaro/Makefile
index 87bd222bb921..ea00b8bd434c 100644
--- a/games/klavaro/Makefile
+++ b/games/klavaro/Makefile
@@ -3,6 +3,7 @@
PORTNAME= klavaro
PORTVERSION= 1.9.6
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/
diff --git a/games/kuklomenos/Makefile b/games/kuklomenos/Makefile
index 1632b4bf031e..aa52b0de9200 100644
--- a/games/kuklomenos/Makefile
+++ b/games/kuklomenos/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kuklomenos
PORTVERSION= 0.4.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= http://mbays.freeshell.org/kuklomenos/src/
@@ -16,7 +16,7 @@ COMMENT= Simple but challenging abstract shoot-em-up game
LICENSE= GPLv3
-LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl
OPTIONS_DEFINE= VORBIS
OPTIONS_DEFAULT= VORBIS
diff --git a/games/meandmyshadow/Makefile b/games/meandmyshadow/Makefile
index 49487716bb47..bb12d505151c 100644
--- a/games/meandmyshadow/Makefile
+++ b/games/meandmyshadow/Makefile
@@ -3,7 +3,7 @@
PORTNAME= meandmyshadow
PORTVERSION= 0.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}/
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
diff --git a/games/megaglest/Makefile b/games/megaglest/Makefile
index a39901bbc2e4..c20c97fc29af 100644
--- a/games/megaglest/Makefile
+++ b/games/megaglest/Makefile
@@ -3,7 +3,7 @@
PORTNAME= megaglest
PORTVERSION= 3.7.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}_${PORTVERSION}/
DISTNAME= ${PORTNAME}-source-${PORTVERSION}
diff --git a/games/mudmagic/Makefile b/games/mudmagic/Makefile
index 787c09a6c7a8..794cdde1c6a5 100644
--- a/games/mudmagic/Makefile
+++ b/games/mudmagic/Makefile
@@ -3,14 +3,14 @@
PORTNAME= mudmagic
PORTVERSION= 1.9
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= games
MASTER_SITES= http://www.mudmagic.com/mud-client/downloads/
MAINTAINER= ports@FreeBSD.org
COMMENT= A GTK+ based MUD client
-LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl \
+LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl \
pcre.3:${PORTSDIR}/devel/pcre \
png15:${PORTSDIR}/graphics/png \
expat:${PORTSDIR}/textproc/expat2 \
diff --git a/games/nexuiz/Makefile b/games/nexuiz/Makefile
index fcf9e9df6383..46f40d9e6b5f 100644
--- a/games/nexuiz/Makefile
+++ b/games/nexuiz/Makefile
@@ -3,7 +3,7 @@
PORTNAME= nexuiz
PORTVERSION= 2.5.2
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/NexuizRelease/Nexuiz%20${PORTVERSION} \
SF/${PORTNAME}/mappack/nexmappack_r2:mappack
@@ -13,7 +13,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Fast-paced, chaotic, and intense multiplayer first person shooter
-LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl \
+LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl \
jpeg.11:${PORTSDIR}/graphics/jpeg
LICENSE= GPLv2
diff --git a/games/openlierox/Makefile b/games/openlierox/Makefile
index 8844516fb5c4..ad5e7e8ca71e 100644
--- a/games/openlierox/Makefile
+++ b/games/openlierox/Makefile
@@ -3,6 +3,7 @@
PORTNAME= openlierox
DISTVERSION= 0.59_beta10
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/OpenLieroX%20${DISTVERSION:C/_/%20/}
DISTNAME= OpenLieroX_${DISTVERSION}.src
@@ -12,7 +13,7 @@ COMMENT= Extremely addictive realtime worms shoot-em-up
LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd \
boost_signals:${PORTSDIR}/devel/boost-libs \
- curl.6:${PORTSDIR}/ftp/curl \
+ curl:${PORTSDIR}/ftp/curl \
alut.1:${PORTSDIR}/audio/freealut
USE_BZIP2= yes
diff --git a/games/pokerth/Makefile b/games/pokerth/Makefile
index e66e0adb0f9e..2c1d56749883 100644
--- a/games/pokerth/Makefile
+++ b/games/pokerth/Makefile
@@ -3,6 +3,7 @@
PORTNAME= pokerth
PORTVERSION= 1.0.1
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/1.0
DISTNAME= PokerTH-${PORTVERSION}-src
diff --git a/games/springlobby/Makefile b/games/springlobby/Makefile
index 489bca5a7853..7ceb2e017c2d 100644
--- a/games/springlobby/Makefile
+++ b/games/springlobby/Makefile
@@ -3,7 +3,7 @@
PORTNAME= springlobby
PORTVERSION= 0.143
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games net
MASTER_SITES= http://www.springlobby.info/tarballs/ \
http://mirror.amdmi3.ru/distfiles/
@@ -12,7 +12,7 @@ MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Cross-platform lobby client for the Spring RTS project
RUN_DEPENDS= spring:${PORTSDIR}/games/spring
-LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl
USE_BZIP2= yes
USES= cmake
diff --git a/games/supertux-devel/Makefile b/games/supertux-devel/Makefile
index 20ea6cf57ff6..ba030185eb13 100644
--- a/games/supertux-devel/Makefile
+++ b/games/supertux-devel/Makefile
@@ -2,6 +2,7 @@
PORTNAME= supertux
PORTVERSION= 0.3.3
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
PKGNAMESUFFIX= -devel
@@ -11,7 +12,7 @@ COMMENT= SuperTux is a side-scroller similar to Super Mario Brothers
BUILD_DEPENDS= ${LOCALBASE}/include/boost/smart_ptr.hpp:${PORTSDIR}/devel/boost-libs
LIB_DEPENDS= physfs.1:${PORTSDIR}/devel/physfs \
- curl.6:${PORTSDIR}/ftp/curl \
+ curl:${PORTSDIR}/ftp/curl \
vorbis.4:${PORTSDIR}/audio/libvorbis
USE_BZIP2= yes
diff --git a/games/supertuxkart/Makefile b/games/supertuxkart/Makefile
index 4a364a0392d7..3f6b530bc0a2 100644
--- a/games/supertuxkart/Makefile
+++ b/games/supertuxkart/Makefile
@@ -3,6 +3,7 @@
PORTNAME= supertuxkart
PORTVERSION= 0.8
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= SF/supertuxkart/SuperTuxKart/${PORTVERSION}
EXTRACT_SUFX= -src.tar.bz2
diff --git a/games/tmw/Makefile b/games/tmw/Makefile
index cd84bca3d25b..f9549556ed06 100644
--- a/games/tmw/Makefile
+++ b/games/tmw/Makefile
@@ -3,7 +3,7 @@
PORTNAME= tmw
PORTVERSION= 0.5.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= games
MASTER_SITES= SF/themanaworld/The%20Mana%20World/${PORTVERSION}/:src
DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:src
diff --git a/games/ufoai/Makefile b/games/ufoai/Makefile
index 1ddef2a5078d..3d3d38776e4b 100644
--- a/games/ufoai/Makefile
+++ b/games/ufoai/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ufoai
PORTVERSION= 2.4
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/UFO_AI%202.x/${PORTVERSION}
DISTNAME= ${PORTNAME:S/$/-/}${PORTVERSION}-source
diff --git a/games/warmux/Makefile b/games/warmux/Makefile
index 3db9192286f3..818860ebbe9a 100644
--- a/games/warmux/Makefile
+++ b/games/warmux/Makefile
@@ -3,7 +3,7 @@
PORTNAME= warmux
DISTVERSION= 11.04.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= games
MASTER_SITES= http://download.gna.org/${PORTNAME}/ \
http://download.gna.org/${PORTNAME}/archive/
diff --git a/games/warsow/Makefile b/games/warsow/Makefile
index 470d2c6ddcfe..9a08c2d31714 100644
--- a/games/warsow/Makefile
+++ b/games/warsow/Makefile
@@ -3,7 +3,7 @@
PORTNAME= warsow
PORTVERSION= 0.6.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games
MASTER_SITES= http://www.zcdn.org/dl/
DISTNAME= ${PORTNAME}_${PORTVERSION:R}${PORTVERSION:E}_sdk
diff --git a/games/worldofpadman/Makefile b/games/worldofpadman/Makefile
index e6d642d6ba2a..046788ca985e 100644
--- a/games/worldofpadman/Makefile
+++ b/games/worldofpadman/Makefile
@@ -3,7 +3,7 @@
PORTNAME= worldofpadman
PORTVERSION= 1.2.20080621
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= games
MASTER_SITES= ftp://ftp.snt.utwente.nl/pub/games/worldofpadman/linux/:full,update \
${MASTER_SITE_LOCAL:S|$|alepulver/:source|}
diff --git a/games/xmoto/Makefile b/games/xmoto/Makefile
index 22cecf766b83..5cfab1736da5 100644
--- a/games/xmoto/Makefile
+++ b/games/xmoto/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xmoto
PORTVERSION= 0.5.10
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= games
MASTER_SITES= http://download.tuxfamily.org/xmoto/xmoto/${PORTVERSION}/ \
http://mirror.amdmi3.ru/distfiles/
@@ -14,7 +14,7 @@ COMMENT= Challenging 2D motocross platform game
LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
jpeg.11:${PORTSDIR}/graphics/jpeg \
- curl.6:${PORTSDIR}/ftp/curl \
+ curl:${PORTSDIR}/ftp/curl \
xdg-basedir:${PORTSDIR}/x11/libxdg-basedir
BUILD_DEPENDS= ${LOCALBASE}/lib/libode.a:${PORTSDIR}/devel/ode
diff --git a/games/xonotic/Makefile b/games/xonotic/Makefile
index 75046066799f..4c098a986223 100644
--- a/games/xonotic/Makefile
+++ b/games/xonotic/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xonotic
PORTVERSION= 0.7.0
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= http://nl.dl.xonotic.org/ \
http://mirror.bitmissile.com/xonotic/releases/
@@ -10,7 +11,7 @@ MASTER_SITES= http://nl.dl.xonotic.org/ \
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= A fast-paced, chaotic, and intense multiplayer first person shooter
-LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl \
+LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl \
png15:${PORTSDIR}/graphics/png \
jpeg.11:${PORTSDIR}/graphics/jpeg
diff --git a/graphics/darktable/Makefile b/graphics/darktable/Makefile
index c4f2e0e406ec..385da394730b 100644
--- a/graphics/darktable/Makefile
+++ b/graphics/darktable/Makefile
@@ -3,6 +3,7 @@
PORTNAME= darktable
PORTVERSION= 1.2.2
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R}
diff --git a/graphics/feh/Makefile b/graphics/feh/Makefile
index 3bd9d86bc6a9..9df9dc05b7e7 100644
--- a/graphics/feh/Makefile
+++ b/graphics/feh/Makefile
@@ -3,7 +3,7 @@
PORTNAME= feh
PORTVERSION= 2.9.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= http://feh.finalrewind.org/ \
${MASTER_SITE_LOCAL}
@@ -14,7 +14,7 @@ COMMENT= An image viewer that utilizes Imlib2
LICENSE= MIT
-LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl \
+LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl \
giblib.1:${PORTSDIR}/graphics/giblib
USE_XORG= x11 xt xinerama
diff --git a/graphics/gdal/Makefile b/graphics/gdal/Makefile
index 597a79dd420d..d766e4737ee3 100644
--- a/graphics/gdal/Makefile
+++ b/graphics/gdal/Makefile
@@ -3,6 +3,7 @@
PORTNAME= gdal
PORTVERSION= 1.9.2
+PORTREVISION= 1
CATEGORIES= graphics geography
MASTER_SITES= http://download.osgeo.org/gdal/ \
ftp://ftp.remotesensing.org/pub/gdal/ \
diff --git a/graphics/gimmage/Makefile b/graphics/gimmage/Makefile
index 69e5a798e7b0..7decc5a7c004 100644
--- a/graphics/gimmage/Makefile
+++ b/graphics/gimmage/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gimmage
PORTVERSION= 0.2.3
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= graphics
MASTER_SITES= BERLIOS CENKES
@@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Simple image viewer
LIB_DEPENDS= gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 \
- curl.6:${PORTSDIR}/ftp/curl
+ curl:${PORTSDIR}/ftp/curl
USES= gettext
GNU_CONFIGURE= yes
diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index 8d3ba058ce75..c6fbda4cd153 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -4,7 +4,7 @@
PORTNAME= gimp-app
PORTVERSION= 2.8.6
-PORTREVISION?= 0
+PORTREVISION?= 1
PORTEPOCH?= 1
CATEGORIES?= graphics gnome
MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \
diff --git a/graphics/gnash/Makefile b/graphics/gnash/Makefile
index c4aac1cfb705..4b5399770e38 100644
--- a/graphics/gnash/Makefile
+++ b/graphics/gnash/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gnash
PORTVERSION= 0.8.10
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= graphics
MASTER_SITES= GNU/${PORTNAME}/${PORTVERSION}/
diff --git a/graphics/jp2a/Makefile b/graphics/jp2a/Makefile
index 7c562123dc59..237e6d05bb65 100644
--- a/graphics/jp2a/Makefile
+++ b/graphics/jp2a/Makefile
@@ -7,7 +7,7 @@
PORTNAME= jp2a
PORTVERSION= 1.0.6
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= graphics
MASTER_SITES= SF
@@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Converts JPG images to ASCII
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
- curl.6:${PORTSDIR}/ftp/curl
+ curl:${PORTSDIR}/ftp/curl
USE_BZIP2= yes
GNU_CONFIGURE= yes
diff --git a/graphics/mapnik/Makefile b/graphics/mapnik/Makefile
index 37f366e31c0e..bf6565f827bb 100644
--- a/graphics/mapnik/Makefile
+++ b/graphics/mapnik/Makefile
@@ -4,6 +4,7 @@
PORTNAME= mapnik
PORTVERSION= 2.2.0
DISTVERSIONPREFIX= v
+PORTREVISION= 1
CATEGORIES= graphics geography
MASTER_SITES= http://mapnik.s3.amazonaws.com/dist/v${PORTVERSION}/
diff --git a/graphics/mapserver/Makefile b/graphics/mapserver/Makefile
index 8203889489b5..2d4bc942f2e3 100644
--- a/graphics/mapserver/Makefile
+++ b/graphics/mapserver/Makefile
@@ -3,7 +3,7 @@
PORTNAME= mapserver
PORTVERSION= 6.2.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics www geography
MASTER_SITES= http://download.osgeo.org/mapserver/
diff --git a/graphics/osg-devel/Makefile b/graphics/osg-devel/Makefile
index 8417367d010d..e3442d0f6c24 100644
--- a/graphics/osg-devel/Makefile
+++ b/graphics/osg-devel/Makefile
@@ -3,7 +3,7 @@
PORTNAME= osg
PORTVERSION= 3.1.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= http://www.openscenegraph.org/downloads/developer_releases/ \
http://mirror.amdmi3.ru/distfiles/
@@ -56,7 +56,7 @@ FORCE_REQUIRE= Threads OpenGL X11 JPEG PNG TIFF ZLIB # common & lightweig
# options that affect FIND_PACKAGE
.if ${PORT_OPTIONS:MCURL}
FORCE_REQUIRE+= CURL
-LIB_DEPENDS+= curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl
PLIST_SUB+= CURL=""
.else
FORCE_IGNORE+= CURL
diff --git a/graphics/osg/Makefile b/graphics/osg/Makefile
index 2ae034efdafd..c386639c10c9 100644
--- a/graphics/osg/Makefile
+++ b/graphics/osg/Makefile
@@ -3,7 +3,7 @@
PORTNAME= osg
PORTVERSION= 3.0.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-${PORTVERSION}/source/ \
http://mirror.amdmi3.ru/distfiles/
@@ -57,7 +57,7 @@ FORCE_REQUIRE= Threads OpenGL X11 JPEG PNG TIFF ZLIB # common & lightweig
# options that affect FIND_PACKAGE
.if ${PORT_OPTIONS:MCURL}
FORCE_REQUIRE+= CURL
-LIB_DEPENDS+= curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl
PLIST_SUB+= CURL=""
.else
FORCE_IGNORE+= CURL
diff --git a/graphics/telak/Makefile b/graphics/telak/Makefile
index ec2b23322a27..c3b24005515b 100644
--- a/graphics/telak/Makefile
+++ b/graphics/telak/Makefile
@@ -3,7 +3,7 @@
PORTNAME= telak
PORTVERSION= 0.6
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= http://julien.danjou.info/telak/ \
CRITICAL
diff --git a/irc/iroffer-dinoex/Makefile b/irc/iroffer-dinoex/Makefile
index 1151092d77cd..18ebd875dc67 100644
--- a/irc/iroffer-dinoex/Makefile
+++ b/irc/iroffer-dinoex/Makefile
@@ -2,6 +2,7 @@
PORTNAME= iroffer
PORTVERSION= 3.29
+PORTREVISION= 1
CATEGORIES= irc
MASTER_SITES= http://iroffer.dinoex.net/
PKGNAMESUFFIX= -dinoex${PKGNAMESUFFIX2}
diff --git a/irc/unreal/Makefile b/irc/unreal/Makefile
index fe4319ca8da0..163296cc4399 100644
--- a/irc/unreal/Makefile
+++ b/irc/unreal/Makefile
@@ -3,7 +3,7 @@
PORTNAME= Unreal
PORTVERSION= 3.2.9
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= irc ipv6
MASTER_SITES= http://www.unrealircd.com/downloads/
DISTNAME= ${PORTNAME}${PORTVERSION}
diff --git a/irc/weechat-devel/Makefile b/irc/weechat-devel/Makefile
index 9679f8da375f..701f8ec18b08 100644
--- a/irc/weechat-devel/Makefile
+++ b/irc/weechat-devel/Makefile
@@ -2,6 +2,7 @@
PORTNAME= weechat
PORTVERSION= 20130514
+PORTREVISION= 1
CATEGORIES= irc
MASTER_SITES= http://perturb.me.uk/distfiles/ \
${MASTER_SITE_LOCAL}
diff --git a/irc/weechat/Makefile b/irc/weechat/Makefile
index 34ed6730323c..48b73b84aa24 100644
--- a/irc/weechat/Makefile
+++ b/irc/weechat/Makefile
@@ -3,6 +3,7 @@
PORTNAME= weechat
PORTVERSION= 0.4.1
+PORTREVISION= 1
CATEGORIES= irc
MASTER_SITES= http://weechat.org/files/src/
diff --git a/lang/fpc/Makefile b/lang/fpc/Makefile
index 9aee0d56a793..e809e3ed339e 100644
--- a/lang/fpc/Makefile
+++ b/lang/fpc/Makefile
@@ -3,7 +3,7 @@
PORTNAME= fpc
PORTVERSION= 2.6.2
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES?= lang
MASTER_SITES= ftp://ftp.freepascal.org/pub/fpc/dist/${PORTVERSION}/source/:source \
ftp://planetmirror.com/pub/fpc/dist/${PORTVERSION}/source/:source \
diff --git a/lang/fpc/Makefile.units b/lang/fpc/Makefile.units
index 9548ed918dd6..c5c74ec363af 100644
--- a/lang/fpc/Makefile.units
+++ b/lang/fpc/Makefile.units
@@ -167,7 +167,7 @@ USE_OPENLDAP= yes
.if ${PKGNAMESUFFIX} == "-libcurl"
. if defined(WITH_LIBCURL)
-LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl
. endif
.endif
diff --git a/lang/gambas/Makefile b/lang/gambas/Makefile
index 320a1ec6700c..b8591414dcc5 100644
--- a/lang/gambas/Makefile
+++ b/lang/gambas/Makefile
@@ -6,14 +6,14 @@
PORTNAME= gambas
PORTVERSION= 1.0.19
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= lang
MASTER_SITES= SF
MAINTAINER= thierry@FreeBSD.org
COMMENT= Gambas Almost Means BASic
-LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl \
+LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl \
ml.0:${PORTSDIR}/math/ldouble
USE_AUTOTOOLS= libltdl libtool
diff --git a/lang/php52/Makefile b/lang/php52/Makefile
index 95aebd4da3f1..35cc6e4a5ac7 100644
--- a/lang/php52/Makefile
+++ b/lang/php52/Makefile
@@ -3,7 +3,7 @@
PORTNAME= php52
PORTVERSION= 5.2.17
-PORTREVISION= 14
+PORTREVISION?= 14
CATEGORIES?= lang devel www
MASTER_SITES= ${MASTER_SITE_PHP}
MASTER_SITE_SUBDIR= distributions
diff --git a/lang/php52/Makefile.ext b/lang/php52/Makefile.ext
index 7398479b600f..ae1c4a11e001 100644
--- a/lang/php52/Makefile.ext
+++ b/lang/php52/Makefile.ext
@@ -40,7 +40,7 @@ CONFIGURE_ARGS+=--enable-ctype
.endif
.if ${PHP_MODNAME} == "curl"
-LIB_DEPENDS+= curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl
CONFIGURE_ARGS+=--with-curl=${LOCALBASE}
.endif
diff --git a/lang/php53/Makefile.ext b/lang/php53/Makefile.ext
index 6e23ebcd06d5..bffe0ed6a8e7 100644
--- a/lang/php53/Makefile.ext
+++ b/lang/php53/Makefile.ext
@@ -32,7 +32,7 @@ CONFIGURE_ARGS+=--enable-ctype
.endif
.if ${PHP_MODNAME} == "curl"
-LIB_DEPENDS+= curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl
CONFIGURE_ARGS+=--with-curl=${LOCALBASE}
.endif
diff --git a/lang/q/Makefile b/lang/q/Makefile
index 784f44f2a33a..91affb4562fe 100644
--- a/lang/q/Makefile
+++ b/lang/q/Makefile
@@ -3,7 +3,7 @@
PORTNAME= q
PORTVERSION= 7.11
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= lang
MASTER_SITES= SF/${PORTNAME}-lang/${PORTNAME}/${PORTVERSION}
@@ -14,7 +14,7 @@ DEPRECATED= Q-Lang is no longer supported. See lang/pure instead
EXPIRATION_DATE=2013-08-10
LIB_DEPENDS= MagickWand:${PORTSDIR}/graphics/ImageMagick \
- curl.6:${PORTSDIR}/ftp/curl \
+ curl:${PORTSDIR}/ftp/curl \
freetype.9:${PORTSDIR}/print/freetype2 \
gdbm.4:${PORTSDIR}/databases/gdbm \
gmp.10:${PORTSDIR}/math/gmp \
diff --git a/mail/libetpan/Makefile b/mail/libetpan/Makefile
index c6bcfb3bdb30..f31e277af778 100644
--- a/mail/libetpan/Makefile
+++ b/mail/libetpan/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libetpan
PORTVERSION= 1.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= mail ipv6
MASTER_SITES= SF
diff --git a/math/octave/Makefile b/math/octave/Makefile
index 6ad1f3a49cee..d71288651223 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -3,7 +3,7 @@
PORTNAME= octave
PORTVERSION= 3.6.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= math
MASTER_SITES= ftp://ftp.gnu.org/gnu/octave/ \
ftp://ftp.u-aizu.ac.jp/pub/SciEng/numanal/Octave/bleeding-edge/
diff --git a/misc/amanda-server/Makefile b/misc/amanda-server/Makefile
index 36e8708ef571..3456c23df0e6 100644
--- a/misc/amanda-server/Makefile
+++ b/misc/amanda-server/Makefile
@@ -3,6 +3,7 @@
PORTNAME= amanda
PORTVERSION= 3.3.2
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= misc
MASTER_SITES= SF/amanda/amanda%20-%20stable/${PORTVERSION}
diff --git a/misc/amanda26-server/Makefile b/misc/amanda26-server/Makefile
index 716b95485212..3d2ab27c81d2 100644
--- a/misc/amanda26-server/Makefile
+++ b/misc/amanda26-server/Makefile
@@ -3,7 +3,7 @@
PORTNAME= amanda
PORTVERSION= 2.6.1p2
-PORTREVISION= 4
+PORTREVISION= 5
PORTEPOCH= 1
CATEGORIES= misc
MASTER_SITES= SF/amanda/amanda%20-%20stable/${PORTVERSION}
diff --git a/misc/amanda32-server/Makefile b/misc/amanda32-server/Makefile
index bf12fa9f8831..c03157644ec6 100644
--- a/misc/amanda32-server/Makefile
+++ b/misc/amanda32-server/Makefile
@@ -3,6 +3,7 @@
PORTNAME= amanda
PORTVERSION= 3.2.3
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= misc
MASTER_SITES= SF/amanda/amanda%20-%20stable/${PORTVERSION}
diff --git a/misc/esniper/Makefile b/misc/esniper/Makefile
index d4b014e3130a..fa6b1f3f11b8 100644
--- a/misc/esniper/Makefile
+++ b/misc/esniper/Makefile
@@ -3,6 +3,7 @@
PORTNAME= esniper
DISTVERSION= 2-28-0
+PORTREVISION= 1
CATEGORIES= misc net
MASTER_SITES= SF
EXTRACT_SUFX= .tgz
diff --git a/misc/gkrellm-helium/Makefile b/misc/gkrellm-helium/Makefile
index a3623ee9d7bd..9130b361d31c 100644
--- a/misc/gkrellm-helium/Makefile
+++ b/misc/gkrellm-helium/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gkrellm-helium
PORTVERSION= 2.3.1
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= misc
MASTER_SITES= http://makovick.googlepages.com/
EXTRACT_SUFX= .tgz
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= GKrellM plugin reading data from helium thermometer at Strahov, Prague
BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
-LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS= curl:${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 41038497e1c5..2bbe9b28c3cf 100644
--- a/misc/sword/Makefile
+++ b/misc/sword/Makefile
@@ -3,7 +3,7 @@
PORTNAME= sword
PORTVERSION= 1.6.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= misc
MASTER_SITES= ftp://ftp.crosswire.org/pub/sword/source/v1.6/ \
http://crosswire.org/ftpmirror/pub/sword/source/v1.6/ \
diff --git a/misc/wmweather+/Makefile b/misc/wmweather+/Makefile
index 8c9547915e22..9507576269fb 100644
--- a/misc/wmweather+/Makefile
+++ b/misc/wmweather+/Makefile
@@ -3,6 +3,7 @@
PORTNAME= wmweather+
PORTVERSION= 2.13
+PORTREVISION= 1
CATEGORIES= misc windowmaker geography
MASTER_SITES= SF/wmweatherplus/wmweather%2B/
DISTNAME= wmweather%2B-${PORTVERSION}
diff --git a/multimedia/audacious-plugins/Makefile b/multimedia/audacious-plugins/Makefile
index 33ace8f8d03a..872bc8e8e776 100644
--- a/multimedia/audacious-plugins/Makefile
+++ b/multimedia/audacious-plugins/Makefile
@@ -3,7 +3,7 @@
PORTNAME= audacious-plugins
PORTVERSION= 3.3.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= multimedia audio
MASTER_SITES= http://distfiles.audacious-media-player.org/
diff --git a/multimedia/cclive/Makefile b/multimedia/cclive/Makefile
index 874ba6bbc71c..c9993c72a054 100644
--- a/multimedia/cclive/Makefile
+++ b/multimedia/cclive/Makefile
@@ -3,7 +3,7 @@
PORTNAME= cclive
PORTVERSION= 0.7.11
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= multimedia net
MASTER_SITES= SF/${PORTNAME}/0.7 \
GOOGLE_CODE
@@ -14,7 +14,7 @@ COMMENT= Lightweight command line video extraction tool
LICENSE= GPLv3
LIB_DEPENDS= boost_system:${PORTSDIR}/devel/boost-libs \
- curl.6:${PORTSDIR}/ftp/curl \
+ curl:${PORTSDIR}/ftp/curl \
pcre.3:${PORTSDIR}/devel/pcre \
quvi.7:${PORTSDIR}/multimedia/libquvi
diff --git a/multimedia/freetuxtv/Makefile b/multimedia/freetuxtv/Makefile
index baf82513e02c..00e54420b2cf 100644
--- a/multimedia/freetuxtv/Makefile
+++ b/multimedia/freetuxtv/Makefile
@@ -3,7 +3,7 @@
PORTNAME= freetuxtv
PORTVERSION= 0.6.5
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= multimedia
MASTER_SITES= GOOGLE_CODE
diff --git a/multimedia/gnome-mplayer/Makefile b/multimedia/gnome-mplayer/Makefile
index 55a9dbf7de9e..6e5039de75d1 100644
--- a/multimedia/gnome-mplayer/Makefile
+++ b/multimedia/gnome-mplayer/Makefile
@@ -3,6 +3,7 @@
PORTNAME= gnome-mplayer
PORTVERSION= 1.0.8
+PORTREVISION= 1
CATEGORIES= multimedia gnome
MASTER_SITES= GOOGLE_CODE
diff --git a/multimedia/libquvi/Makefile b/multimedia/libquvi/Makefile
index 5722a5d64ee4..c2253a001324 100644
--- a/multimedia/libquvi/Makefile
+++ b/multimedia/libquvi/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libquvi
PORTVERSION= 0.4.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= multimedia devel
MASTER_SITES= SF/quvi/${PORTVERSION:R}/${PORTNAME}/ \
GOOGLE_CODE
diff --git a/multimedia/mediainfo/Makefile b/multimedia/mediainfo/Makefile
index c9c7b1db0c06..f5cf1b19da7c 100644
--- a/multimedia/mediainfo/Makefile
+++ b/multimedia/mediainfo/Makefile
@@ -3,7 +3,7 @@
PORTNAME= mediainfo
PORTVERSION= 0.7.52
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= multimedia
MASTER_SITES= SF/${PORTNAME}/binary/${PORTNAME}/${PORTVERSION}
DISTNAME= MediaInfo_CLI_${PORTVERSION}_GNU_FromSource
diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile
index 1c8266626b16..a4092417b0b1 100644
--- a/multimedia/mkvtoolnix/Makefile
+++ b/multimedia/mkvtoolnix/Makefile
@@ -3,6 +3,7 @@
PORTNAME= mkvtoolnix
PORTVERSION= 6.3.0
+PORTREVISION= 1
CATEGORIES= multimedia audio
MASTER_SITES= http://www.bunkus.org/videotools/mkvtoolnix/sources/ \
CRITICAL
diff --git a/multimedia/qmmp/Makefile b/multimedia/qmmp/Makefile
index 8105b2f8fcf3..49dd6e9e711e 100644
--- a/multimedia/qmmp/Makefile
+++ b/multimedia/qmmp/Makefile
@@ -3,7 +3,7 @@
PORTNAME= qmmp
PORTVERSION= 0.6.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= multimedia
MASTER_SITES= http://qmmp.ylsoftware.com/files/ \
${MASTER_SITE_GOOGLE_CODE}
diff --git a/multimedia/quvi/Makefile b/multimedia/quvi/Makefile
index 013dfde7966f..d02655acce33 100644
--- a/multimedia/quvi/Makefile
+++ b/multimedia/quvi/Makefile
@@ -3,7 +3,7 @@
PORTNAME= quvi
PORTVERSION= 0.4.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= multimedia devel
MASTER_SITES= SF/${PORTNAME}/${PORTVERSION:R}/${PORTNAME}/ \
GOOGLE_CODE
diff --git a/multimedia/xbmc-pvr/Makefile b/multimedia/xbmc-pvr/Makefile
index e6827198181b..3b2d3e5f1496 100644
--- a/multimedia/xbmc-pvr/Makefile
+++ b/multimedia/xbmc-pvr/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xbmc
PORTVERSION= 70
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= multimedia
MASTER_SITES= LOCAL/nox
PKGNAMESUFFIX= -pvr-ppa-odk
diff --git a/multimedia/xbmc/Makefile b/multimedia/xbmc/Makefile
index 2ef45e5d2349..1792d6dcb3b1 100644
--- a/multimedia/xbmc/Makefile
+++ b/multimedia/xbmc/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xbmc
DISTVERSION= 12.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= multimedia
MASTER_SITES= http://mirrors.xbmc.org/releases/source/
diff --git a/multimedia/xine/Makefile b/multimedia/xine/Makefile
index 87a219948a73..de322e5de47b 100644
--- a/multimedia/xine/Makefile
+++ b/multimedia/xine/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xine
PORTVERSION= 0.99.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= multimedia
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-ui/${PORTVERSION}
DISTNAME= ${PORTNAME}-ui-${PORTVERSION}
diff --git a/net-im/centericq/Makefile b/net-im/centericq/Makefile
index 4fcdc247cca8..4e5808df7df9 100644
--- a/net-im/centericq/Makefile
+++ b/net-im/centericq/Makefile
@@ -3,7 +3,7 @@
PORTNAME= centericq
PORTVERSION= 4.21.0
-PORTREVISION= 14
+PORTREVISION= 15
CATEGORIES= net-im
MASTER_SITES= http://thekonst.net/download/
@@ -62,7 +62,7 @@ CONFIGURE_ARGS+= --with-fribidi
.endif
.if ${PORT_OPTIONS:MMSN}
-LIB_DEPENDS+= curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl
.else
CONFIGURE_ARGS+= --disable-msn
.endif
diff --git a/net-im/centerim-devel/Makefile b/net-im/centerim-devel/Makefile
index 19353cd278c1..2bf86e2ba9ce 100644
--- a/net-im/centerim-devel/Makefile
+++ b/net-im/centerim-devel/Makefile
@@ -3,6 +3,7 @@
PORTNAME= centerim
PORTVERSION= 4.22.10.11
+PORTREVISION= 1
CATEGORIES= net-im
MASTER_SITES= http://www.centerim.org/download/mobshots/ \
ftp://ftp.centerim.org/mobshots/
@@ -13,7 +14,7 @@ COMMENT= Text mode menu- and window-driven IM interface
LICENSE= GPLv2
-LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl
USE_PERL5_RUN= yes
USE_PYTHON_RUN= yes
diff --git a/net-im/centerim/Makefile b/net-im/centerim/Makefile
index 67bb0fade0cc..345c96e8c8d7 100644
--- a/net-im/centerim/Makefile
+++ b/net-im/centerim/Makefile
@@ -3,6 +3,7 @@
PORTNAME= centerim
PORTVERSION= 4.22.10
+PORTREVISION= 1
CATEGORIES= net-im
MASTER_SITES= http://www.centerim.org/download/releases/ \
ftp://ftp.centerim.org/releases/
@@ -10,7 +11,7 @@ MASTER_SITES= http://www.centerim.org/download/releases/ \
MAINTAINER= frank@altpeter.de
COMMENT= Text mode menu- and window-driven IM interface
-LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl
USES= iconv
USE_OPENSSL= yes
diff --git a/net-im/cli-msn/Makefile b/net-im/cli-msn/Makefile
index c03250357b06..4c22e08c4f7a 100644
--- a/net-im/cli-msn/Makefile
+++ b/net-im/cli-msn/Makefile
@@ -7,6 +7,7 @@
PORTNAME= msn
PORTVERSION= 2.3.2
+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.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/net-mgmt/collectd/Makefile b/net-mgmt/collectd/Makefile
index 451211c4098a..af7077684e17 100644
--- a/net-mgmt/collectd/Makefile
+++ b/net-mgmt/collectd/Makefile
@@ -3,7 +3,7 @@
PORTNAME= collectd
PORTVERSION= 4.10.9
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-mgmt
MASTER_SITES= http://collectd.org/files/
diff --git a/net-mgmt/collectd5/Makefile b/net-mgmt/collectd5/Makefile
index 96225b1bd126..a76ff0a0d48a 100644
--- a/net-mgmt/collectd5/Makefile
+++ b/net-mgmt/collectd5/Makefile
@@ -3,7 +3,7 @@
PORTNAME= collectd
PORTVERSION= 5.3.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net-mgmt
MASTER_SITES= http://collectd.org/files/
diff --git a/net-mgmt/sblim-wbemcli/Makefile b/net-mgmt/sblim-wbemcli/Makefile
index 88196a24300f..515e9c7253c7 100644
--- a/net-mgmt/sblim-wbemcli/Makefile
+++ b/net-mgmt/sblim-wbemcli/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sblim-wbemcli
PORTVERSION= 1.6.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-mgmt
MASTER_SITES= SF/sblim/${PORTNAME}/${PORTVERSION}
diff --git a/net-mgmt/zabbix2-server/Makefile b/net-mgmt/zabbix2-server/Makefile
index 79f286c94b76..51c37bd861ac 100644
--- a/net-mgmt/zabbix2-server/Makefile
+++ b/net-mgmt/zabbix2-server/Makefile
@@ -3,7 +3,7 @@
PORTNAME= zabbix2
PORTVERSION= 2.0.6
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= net-mgmt
MASTER_SITES= SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION}
PKGNAMESUFFIX?= -server
diff --git a/net-p2p/gnunet/Makefile b/net-p2p/gnunet/Makefile
index fdd348aeff3b..be040c041534 100644
--- a/net-p2p/gnunet/Makefile
+++ b/net-p2p/gnunet/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gnunet
DISTVERSION= 0.9.3
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= net-p2p ipv6 security
MASTER_SITES= GNU
diff --git a/net-p2p/gtorrentviewer/Makefile b/net-p2p/gtorrentviewer/Makefile
index fe41968492eb..2a09ed82d5d9 100644
--- a/net-p2p/gtorrentviewer/Makefile
+++ b/net-p2p/gtorrentviewer/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gtorrentviewer
PORTVERSION= 0.2b
-PORTREVISION= 15
+PORTREVISION= 16
CATEGORIES= net-p2p
MASTER_SITES= SF/${PORTNAME}/GTorrentViewer/${PORTVERSION}
DISTNAME= GTorrentViewer-${PORTVERSION}
@@ -18,7 +18,7 @@ COMMENT= GTK+2 viewer and editor for BitTorrent meta files
PORTSCOUT= skipv:0.2 # older than current version
-LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl
USE_GNOME= gtk20 gnomehier intlhack
USE_GMAKE= yes
diff --git a/net-p2p/jigdo/Makefile b/net-p2p/jigdo/Makefile
index d72c8e4f37a5..919d988589dd 100644
--- a/net-p2p/jigdo/Makefile
+++ b/net-p2p/jigdo/Makefile
@@ -3,7 +3,7 @@
PORTNAME= jigdo
PORTVERSION= 0.7.3
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= net-p2p
MASTER_SITES= http://atterer.org/sites/atterer/files/2009-08/${PORTNAME}/
diff --git a/net-p2p/libbt/Makefile b/net-p2p/libbt/Makefile
index 5a50da146f71..3c21a194ce8c 100644
--- a/net-p2p/libbt/Makefile
+++ b/net-p2p/libbt/Makefile
@@ -7,14 +7,14 @@
PORTNAME= libbt
PORTVERSION= 1.05
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net-p2p devel
MASTER_SITES= SF
MAINTAINER= flz@FreeBSD.org
COMMENT= C library implementing the core BitTorrent protocol
-LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/net-p2p/rtorrent-devel/Makefile b/net-p2p/rtorrent-devel/Makefile
index 4d10f78e3364..178d9d1f51ac 100644
--- a/net-p2p/rtorrent-devel/Makefile
+++ b/net-p2p/rtorrent-devel/Makefile
@@ -3,7 +3,7 @@
PORTNAME= rtorrent-devel
PORTVERSION= 0.9.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-p2p
MASTER_SITES= http://libtorrent.rakshasa.no/downloads/
DISTNAME= ${PORTNAME:S/-devel//}-${PORTVERSION}
diff --git a/net-p2p/rtorrent/Makefile b/net-p2p/rtorrent/Makefile
index cde4d9993318..35f130511318 100644
--- a/net-p2p/rtorrent/Makefile
+++ b/net-p2p/rtorrent/Makefile
@@ -2,7 +2,7 @@
PORTNAME?= rtorrent
PORTVERSION= 0.9.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net-p2p
MASTER_SITES= http://libtorrent.rakshasa.no/downloads/
@@ -11,7 +11,7 @@ COMMENT= BitTorrent Client written in C++
BUILD_DEPENDS= libtorrent=0.13.2_1:${PORTSDIR}/net-p2p/libtorrent
RUN_DEPENDS= libtorrent=0.13.2_1:${PORTSDIR}/net-p2p/libtorrent
-LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl
CONFLICTS= rtorrent-devel-[0-9]*
diff --git a/net-p2p/transmission-cli/Makefile b/net-p2p/transmission-cli/Makefile
index c321504cc069..546730afca60 100644
--- a/net-p2p/transmission-cli/Makefile
+++ b/net-p2p/transmission-cli/Makefile
@@ -2,7 +2,7 @@
PORTNAME= transmission
PORTVERSION= 2.80
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES?= net-p2p
#MASTER_SITES= http://download.m0k.org/${PORTNAME}/files/
MASTER_SITES= http://transmission.cachefly.net/
@@ -31,7 +31,7 @@ OPTIONS_DEFINE= LITE
LIB_DEPENDS?= ${GEN_LIB_DEPENDS}
# General dependencies
-GEN_LIB_DEPENDS=curl.6:${PORTSDIR}/ftp/curl \
+GEN_LIB_DEPENDS=curl:${PORTSDIR}/ftp/curl \
event-2.0.6:${PORTSDIR}/devel/libevent2
GEN_RUN_DEPENDS=${LOCALBASE}/share/transmission/web/index.html:${PORTSDIR}/www/transmission-web
diff --git a/net/asterisk/Makefile b/net/asterisk/Makefile
index 34a53f506d76..b07255a58b5b 100644
--- a/net/asterisk/Makefile
+++ b/net/asterisk/Makefile
@@ -221,7 +221,7 @@ CONFIGURE_ARGS+= --without-gsm
.if ${PORT_OPTIONS:MCURL}
PLIST_SUB+= WITH_CURL=""
CONFIGURE_ARGS+= --with-libcurl
-LIB_DEPENDS+= curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl
.else
PLIST_SUB+= WITH_CURL="@comment "
CONFIGURE_ARGS+= --with-libcurl=no
diff --git a/net/asterisk10/Makefile b/net/asterisk10/Makefile
index 97a88ce19406..0ebc35760fed 100644
--- a/net/asterisk10/Makefile
+++ b/net/asterisk10/Makefile
@@ -213,7 +213,7 @@ CONFIGURE_ARGS+= --without-gsm
.if ${PORT_OPTIONS:MCURL}
PLIST_SUB+= WITH_CURL=""
CONFIGURE_ARGS+= --with-libcurl
-LIB_DEPENDS+= curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl
.else
PLIST_SUB+= WITH_CURL="@comment "
CONFIGURE_ARGS+= --with-libcurl=no
diff --git a/net/asterisk11/Makefile b/net/asterisk11/Makefile
index 1de587d2a9f3..ba5c7350fada 100644
--- a/net/asterisk11/Makefile
+++ b/net/asterisk11/Makefile
@@ -211,7 +211,7 @@ CONFIGURE_ARGS+= --without-gsm
.if ${PORT_OPTIONS:MCURL}
PLIST_SUB+= WITH_CURL=""
CONFIGURE_ARGS+= --with-libcurl
-LIB_DEPENDS+= curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl
.else
PLIST_SUB+= WITH_CURL="@comment "
CONFIGURE_ARGS+= --with-libcurl=no
diff --git a/net/asterisk14/Makefile b/net/asterisk14/Makefile
index e4e498bb66bc..9ee2dfa03873 100644
--- a/net/asterisk14/Makefile
+++ b/net/asterisk14/Makefile
@@ -3,7 +3,7 @@
PORTNAME= asterisk
PORTVERSION= 1.4.42
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net
MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \
http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
@@ -16,7 +16,7 @@ BUILD_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123
LIB_DEPENDS= speex.1:${PORTSDIR}/audio/speex \
newt.52:${PORTSDIR}/devel/newt \
gsm.1:${PORTSDIR}/audio/gsm \
- curl.6:${PORTSDIR}/ftp/curl
+ curl:${PORTSDIR}/ftp/curl
RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123
ONLY_FOR_ARCHS= i386 sparc64 amd64 powerpc
diff --git a/net/boinc-client/Makefile b/net/boinc-client/Makefile
index 7a8ba0e52915..57ebe529a486 100644
--- a/net/boinc-client/Makefile
+++ b/net/boinc-client/Makefile
@@ -3,7 +3,7 @@
PORTNAME= boinc-client
PORTVERSION= 7.0.28
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= pav
diff --git a/net/clamz/Makefile b/net/clamz/Makefile
index 04b45fa569e2..3b94f074b7d2 100644
--- a/net/clamz/Makefile
+++ b/net/clamz/Makefile
@@ -3,14 +3,14 @@
PORTNAME= clamz
PORTVERSION= 0.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net audio
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
MAINTAINER= glathe.helko@googlemail.com
COMMENT= Command-line program to download MP3 files from Amazon's music store
-LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl \
+LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl \
expat.6:${PORTSDIR}/textproc/expat2 \
gcrypt:${PORTSDIR}/security/libgcrypt
diff --git a/net/ecore-con/Makefile b/net/ecore-con/Makefile
index e2ee68dbcb44..b670b6620b37 100644
--- a/net/ecore-con/Makefile
+++ b/net/ecore-con/Makefile
@@ -3,6 +3,7 @@
PORTNAME= con
PORTVERSION= 1.7.7
+PORTREVISION= 1
CATEGORIES= net enlightenment
MASTER_SITES= http://download.enlightenment.fr/releases/ \
LOCAL/gblach/e17/
diff --git a/net/freeswitch-core-devel/Makefile b/net/freeswitch-core-devel/Makefile
index 1e2499fddd2a..d58943901a7a 100644
--- a/net/freeswitch-core-devel/Makefile
+++ b/net/freeswitch-core-devel/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= freeswitch
-PORTREVISION= 1
+PORTREVISION= 2
DISTVERSION= 1.2.3
CATEGORIES= net
MASTER_SITES= http://files.freeswitch.org/ \
diff --git a/net/freeswitch-core/Makefile b/net/freeswitch-core/Makefile
index 8858f41b7487..40615520d30f 100644
--- a/net/freeswitch-core/Makefile
+++ b/net/freeswitch-core/Makefile
@@ -3,7 +3,7 @@
PORTNAME= freeswitch-core
PORTVERSION= 1.0.7.1
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= net
MASTER_SITES= http://dl.dropbox.com/u/152504/ \
diff --git a/net/libcmis/Makefile b/net/libcmis/Makefile
index 40a21a25c916..fae9a7c87c0b 100644
--- a/net/libcmis/Makefile
+++ b/net/libcmis/Makefile
@@ -2,6 +2,7 @@
PORTNAME= libcmis
PORTVERSION= 0.3.1
+PORTREVISION= 1
CATEGORIES= net devel
MASTER_SITES= SF/${PORTNAME}
diff --git a/net/liboauth/Makefile b/net/liboauth/Makefile
index 5ae3f9a06ba2..1c17221cca98 100644
--- a/net/liboauth/Makefile
+++ b/net/liboauth/Makefile
@@ -2,6 +2,7 @@
PORTNAME= liboauth
PORTVERSION= 1.0.1
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= SF/${PORTNAME}
diff --git a/net/linknx/Makefile b/net/linknx/Makefile
index 585ab480e76a..3a455c8c7b09 100644
--- a/net/linknx/Makefile
+++ b/net/linknx/Makefile
@@ -3,7 +3,7 @@
PORTNAME= linknx
PORTVERSION= 0.0.1.25
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
@@ -33,7 +33,7 @@ CONFIGURE_ARGS+= --disable-smtp
.endif
.if ${PORT_OPTIONS:MLIBCURL}
-LIB_DEPENDS+= curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl
CONFIGURE_ARGS+= --with-libcurl=${LOCALBASE}
.else
CONFIGURE_ARGS+= --without-libcurl
diff --git a/net/mediatomb/Makefile b/net/mediatomb/Makefile
index 994ae88da4de..bcbcd87d1ed3 100644
--- a/net/mediatomb/Makefile
+++ b/net/mediatomb/Makefile
@@ -3,7 +3,7 @@
PORTNAME= mediatomb
PORTVERSION= 0.12.1
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= net multimedia
MASTER_SITES= SF/${PORTNAME}/MediaTomb/${PORTVERSION}
@@ -119,7 +119,7 @@ CONFIGURE_ARGS+= --disable-ffmpegthumbnailer
.if ${PORT_OPTIONS:MCURL} && ${PORT_OPTIONS:MEXTERNAL_TRANSCODING}
CONFIGURE_ARGS+= --enable-curl \
--with-curl-cfg="${LOCALBASE}/bin/curl-config"
-LIB_DEPENDS+= curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl
.else
CONFIGURE_ARGS+= --disable-curl
.endif
diff --git a/net/nepenthes/Makefile b/net/nepenthes/Makefile
index adf4498f2441..ed0be7637df1 100644
--- a/net/nepenthes/Makefile
+++ b/net/nepenthes/Makefile
@@ -3,14 +3,14 @@
PORTNAME= nepenthes
PORTVERSION= 0.2.2
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= net
MASTER_SITES= SF/${PORTNAME}/Nepenthes%20development/${PORTVERSION}
MAINTAINER= systemoperator@gmail.com
COMMENT= Determine the malware activity on a network
-LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl \
+LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl \
magic.1:${PORTSDIR}/sysutils/file \
pcre.3:${PORTSDIR}/devel/pcre \
adns.1:${PORTSDIR}/dns/adns
diff --git a/net/opennx/Makefile b/net/opennx/Makefile
index 1f4ff3e4d112..f432025e2a13 100644
--- a/net/opennx/Makefile
+++ b/net/opennx/Makefile
@@ -3,6 +3,7 @@
PORTNAME= opennx
PORTVERSION= 0.16.0.725
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/CI-source
diff --git a/net/wmlj/Makefile b/net/wmlj/Makefile
index e1dee4bc1c5a..3ee08b6b57a3 100644
--- a/net/wmlj/Makefile
+++ b/net/wmlj/Makefile
@@ -7,14 +7,14 @@
PORTNAME= wmlj
PORTVERSION= 0.4.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= net
MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A dockapp that monitors your friends list at LiveJournal.com
-LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl
GNU_CONFIGURE= yes
USE_GNOME= gtk12
diff --git a/net/xmlrpc-c-devel/Makefile b/net/xmlrpc-c-devel/Makefile
index 2ce00df4b9bc..fb67fe7316d7 100644
--- a/net/xmlrpc-c-devel/Makefile
+++ b/net/xmlrpc-c-devel/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xmlrpc-c
PORTVERSION= 1.33.2
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= LOCAL/garga/xmlrpc-c
PKGNAMESUFFIX= -devel
diff --git a/net/xmlrpc-c/Makefile b/net/xmlrpc-c/Makefile
index d43f749d6910..10a5b2af30bc 100644
--- a/net/xmlrpc-c/Makefile
+++ b/net/xmlrpc-c/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xmlrpc-c
PORTVERSION= 1.25.23
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= SF/${PORTNAME}/Xmlrpc-c%20Super%20Stable/${PORTVERSION}
EXTRACT_SUFX= .tgz
diff --git a/polish/sms2/Makefile b/polish/sms2/Makefile
index 5a17f80fda86..13719ae6cd44 100644
--- a/polish/sms2/Makefile
+++ b/polish/sms2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sms
PORTVERSION= 2.1.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= polish
MASTER_SITES= http://ceti.pl/~miki/komputery/download/sms/ \
http://radioemiter.pl/~mjd/slackware/sms2/ \
@@ -17,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.6:${PORTSDIR}/ftp/curl \
+LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl \
pcre.3:${PORTSDIR}/devel/pcre \
gdbm.4:${PORTSDIR}/databases/gdbm \
pcre\\+\\+.0:${PORTSDIR}/devel/pcre++
diff --git a/ports-mgmt/fbsdmon/Makefile b/ports-mgmt/fbsdmon/Makefile
index c3276143f165..3fbb82e1ec0c 100644
--- a/ports-mgmt/fbsdmon/Makefile
+++ b/ports-mgmt/fbsdmon/Makefile
@@ -3,6 +3,7 @@
PORTNAME= fbsdmon
PORTVERSION= 1.00
+PORTREVISION= 1
CATEGORIES= ports-mgmt sysutils
MASTER_SITES= LOCAL/gblach/
diff --git a/ports-mgmt/prhistory/Makefile b/ports-mgmt/prhistory/Makefile
index 0fb45c6484be..4ee028ed6cef 100644
--- a/ports-mgmt/prhistory/Makefile
+++ b/ports-mgmt/prhistory/Makefile
@@ -3,6 +3,7 @@
PORTNAME= prhistory
PORTVERSION= 1.0
+PORTREVISION= 1
CATEGORIES= ports-mgmt
MASTER_SITES= GH
diff --git a/print/foomatic-db/Makefile b/print/foomatic-db/Makefile
index 4e159a4ca3ec..41a1dfcb7802 100644
--- a/print/foomatic-db/Makefile
+++ b/print/foomatic-db/Makefile
@@ -7,7 +7,7 @@
PORTNAME= db
PORTVERSION= 20090530
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_LOCAL:S,$,acm/foomatic/,} \
${MASTER_SITE_GOOGLE_CODE}
@@ -19,7 +19,7 @@ MAINTAINER= acm@FreeBSD.org
COMMENT= Foomatic database
LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2 \
- curl.6:${PORTSDIR}/ftp/curl
+ curl:${PORTSDIR}/ftp/curl
PROJECTHOST= bsdistfiles
USE_GMAKE= yes
diff --git a/science/netcdf4/Makefile b/science/netcdf4/Makefile
index 27929379774b..d93a3e7aa09e 100644
--- a/science/netcdf4/Makefile
+++ b/science/netcdf4/Makefile
@@ -3,7 +3,7 @@
PORTNAME= netcdf
PORTVERSION= 4.1.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= science
MASTER_SITES= http://www.unidata.ucar.edu/downloads/netcdf/ftp/ \
ftp://ftp.unidata.ucar.edu/pub/netcdf/ \
@@ -41,7 +41,7 @@ MAN3= netcdf.3
.if ${PORT_OPTIONS:MDAP}
CONFIGURE_ARGS+=--enable-dap --with-curl=${LOCALBASE} \
--with-curl-config=${LOCALBASE}/bin/curl-config
-LIB_DEPENDS+= curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl
.else
CONFIGURE_ARGS+=--disable-dap
.endif
diff --git a/security/authforce/Makefile b/security/authforce/Makefile
index e504b58767d3..02fb067a5f14 100644
--- a/security/authforce/Makefile
+++ b/security/authforce/Makefile
@@ -3,7 +3,7 @@
PORTNAME= authforce
PORTVERSION= 0.9.9
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security www
MASTER_SITES= http://cloud.github.com/downloads/zlandau/authforce/
diff --git a/security/binwalk/Makefile b/security/binwalk/Makefile
index 774f336a6323..9379f68f2ceb 100644
--- a/security/binwalk/Makefile
+++ b/security/binwalk/Makefile
@@ -2,6 +2,7 @@
PORTNAME= binwalk
PORTVERSION= 0.5.0
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= GOOGLE_CODE
diff --git a/security/duo/Makefile b/security/duo/Makefile
index 52105ff365ef..2729ac37d9ee 100644
--- a/security/duo/Makefile
+++ b/security/duo/Makefile
@@ -3,6 +3,7 @@
PORTNAME= duo
PORTVERSION= 1.9.2
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= https://dl.duosecurity.com/ \
http://mirrors.rit.edu/zi/
diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index d66c86edf7e1..9aad9878cb19 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -2,6 +2,7 @@
PORTNAME= gnupg
PORTVERSION= 2.0.20
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_GNUPG}
MASTER_SITE_SUBDIR= gnupg
diff --git a/security/gnupg1/Makefile b/security/gnupg1/Makefile
index c3bf31cfd480..017f989c1a64 100644
--- a/security/gnupg1/Makefile
+++ b/security/gnupg1/Makefile
@@ -2,6 +2,7 @@
PORTNAME= gnupg
PORTVERSION= 1.4.13
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_GNUPG}
MASTER_SITE_SUBDIR= gnupg
diff --git a/security/opensaml2/Makefile b/security/opensaml2/Makefile
index 48e6a0ab3741..b932bc711551 100644
--- a/security/opensaml2/Makefile
+++ b/security/opensaml2/Makefile
@@ -3,6 +3,7 @@
PORTNAME= opensaml2
PORTVERSION= 2.5.3
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= http://shibboleth.net/downloads/c++-opensaml/${PORTVERSION}/
DISTNAME= opensaml-${PORTVERSION}
@@ -10,7 +11,7 @@ DISTNAME= opensaml-${PORTVERSION}
MAINTAINER= girgen@FreeBSD.org
COMMENT= Open source implementation of SAML2
-LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl \
+LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl \
log4shib.1:${PORTSDIR}/devel/log4shib \
xerces-c.3:${PORTSDIR}/textproc/xerces-c3 \
xmltooling.6:${PORTSDIR}/devel/xmltooling
diff --git a/security/osslsigncode/Makefile b/security/osslsigncode/Makefile
index c8131be88605..bad8ea9cc6ed 100644
--- a/security/osslsigncode/Makefile
+++ b/security/osslsigncode/Makefile
@@ -7,7 +7,7 @@
PORTNAME= osslsigncode
PORTVERSION= 1.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= security devel
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
@@ -23,7 +23,7 @@ USE_GMAKE= yes
USE_OPENSSL= yes
.if !defined(WITHOUT_CURL)
-LIB_DEPENDS+= curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl
.endif
.include <bsd.port.mk>
diff --git a/security/p5-Net-SAML/Makefile b/security/p5-Net-SAML/Makefile
index b22ea001681d..ae675b196baf 100644
--- a/security/p5-Net-SAML/Makefile
+++ b/security/p5-Net-SAML/Makefile
@@ -2,6 +2,7 @@
PORTNAME= Net-SAML
PORTVERSION= 1.11
+PORTREVISION= 1
CATEGORIES= security perl5
MASTER_SITES= http://zxid.org/ \
CPAN
diff --git a/security/razorback-api/Makefile b/security/razorback-api/Makefile
index bd48e4db6bc6..d77b910c0f43 100644
--- a/security/razorback-api/Makefile
+++ b/security/razorback-api/Makefile
@@ -7,6 +7,7 @@
PORTNAME= api
PORTVERSION= 0.5.0
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= SF/razorbacktm/API
PKGNAMEPREFIX= razorback-
@@ -20,7 +21,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= config.10:${PORTSDIR}/devel/libconfig \
uuid.1:${PORTSDIR}/misc/e2fsprogs-libuuid \
- curl.6:${PORTSDIR}/ftp/curl \
+ curl:${PORTSDIR}/ftp/curl \
json.0:${PORTSDIR}/devel/json-c
OPTIONS_DEFINE= DEBUG ASSERT CNC_DEBUG STOMP_DEBUG
diff --git a/security/squidclamav/Makefile b/security/squidclamav/Makefile
index 856570a77490..2af2b723fa9b 100644
--- a/security/squidclamav/Makefile
+++ b/security/squidclamav/Makefile
@@ -7,7 +7,7 @@
PORTNAME= squidclamav
PORTVERSION= 5.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security
MASTER_SITES= SF
diff --git a/security/strongswan/Makefile b/security/strongswan/Makefile
index a5e194200285..a6d4ca4685fa 100644
--- a/security/strongswan/Makefile
+++ b/security/strongswan/Makefile
@@ -3,6 +3,7 @@
PORTNAME= strongswan
PORTVERSION= 5.0.4
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= http://download.strongswan.org/ \
http://download2.strongswan.org/
diff --git a/security/ykclient/Makefile b/security/ykclient/Makefile
index 132a6eeb44a1..da1c70e1f090 100644
--- a/security/ykclient/Makefile
+++ b/security/ykclient/Makefile
@@ -2,6 +2,7 @@
PORTNAME= ykclient
PORTVERSION= 2.9
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= GOOGLE_CODE
diff --git a/security/zxid/Makefile b/security/zxid/Makefile
index a27548c35e89..66e247a6c3a1 100644
--- a/security/zxid/Makefile
+++ b/security/zxid/Makefile
@@ -3,6 +3,7 @@
PORTNAME= zxid
PORTVERSION= 1.05
+PORTREVISION= 1
CATEGORIES= security www
MASTER_SITES= http://zxid.org/
EXTRACT_SUFX= .tgz
diff --git a/sysutils/afflib/Makefile b/sysutils/afflib/Makefile
index 6814e727907f..f9bc3301325a 100644
--- a/sysutils/afflib/Makefile
+++ b/sysutils/afflib/Makefile
@@ -3,6 +3,7 @@
PORTNAME= afflib
PORTVERSION= 3.7.1
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://cloud.github.com/downloads/simsong/AFFLIBv3/ \
http://www.c-s.li/ports/
diff --git a/sysutils/apt/Makefile b/sysutils/apt/Makefile
index 16904e5fafe0..cfe8a0c25d31 100644
--- a/sysutils/apt/Makefile
+++ b/sysutils/apt/Makefile
@@ -6,7 +6,7 @@
PORTNAME= apt
PORTVERSION= 0.6.46.4.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}
DISTNAME= apt_0.6.46.4-0.1
@@ -19,7 +19,7 @@ BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash \
RUN_DEPENDS:= ${BUILD_DEPENDS} \
dpkg:${PORTSDIR}/archivers/dpkg \
gpg:${PORTSDIR}/security/gnupg1
-LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/sysutils/ckl/Makefile b/sysutils/ckl/Makefile
index aae56ad6f743..c4799b9f41a8 100644
--- a/sysutils/ckl/Makefile
+++ b/sysutils/ckl/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ckl
PORTVERSION= 0.9.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils net
MASTER_SITES= http://packages.cloudkick.com/releases/ckl/
DISTNAME= ckl-${PORTVERSION}
diff --git a/sysutils/condor/Makefile b/sysutils/condor/Makefile
index 838b09c03f41..9f0c8051ca9a 100644
--- a/sysutils/condor/Makefile
+++ b/sysutils/condor/Makefile
@@ -3,6 +3,7 @@
PORTNAME= condor
PORTVERSION= 7.8.7
+PORTREVISION= 1
CATEGORIES= sysutils net
MASTER_SITES= # empty
DISTNAME= condor_src-${PORTVERSION}-all-all
diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile
index 4115e9497b23..f7cea733e916 100644
--- a/sysutils/conky/Makefile
+++ b/sysutils/conky/Makefile
@@ -3,7 +3,7 @@
PORTNAME= conky
PORTVERSION= 1.9.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= SF
diff --git a/sysutils/fusefs-curlftpfs/Makefile b/sysutils/fusefs-curlftpfs/Makefile
index 36dc03318fd0..9cfbc86190ea 100644
--- a/sysutils/fusefs-curlftpfs/Makefile
+++ b/sysutils/fusefs-curlftpfs/Makefile
@@ -3,7 +3,7 @@
PORTNAME= curlftpfs
PORTVERSION= 0.9.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= sysutils
MASTER_SITES= SF
PKGNAMEPREFIX= fusefs-
@@ -13,7 +13,7 @@ COMMENT= Mount remote ftp directories
LICENSE= GPLv2
-LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl
GNU_CONFIGURE= yes
USES= fuse pkgconfig
diff --git a/sysutils/fusefs-s3fs/Makefile b/sysutils/fusefs-s3fs/Makefile
index 519edf46247a..bc91d0904feb 100644
--- a/sysutils/fusefs-s3fs/Makefile
+++ b/sysutils/fusefs-s3fs/Makefile
@@ -3,6 +3,7 @@
PORTNAME= s3fs
DISTVERSION= 1.71
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= GOOGLE_CODE
PKGNAMEPREFIX= fusefs-
diff --git a/sysutils/heartbeat/Makefile b/sysutils/heartbeat/Makefile
index 711568d15a86..3a5fa1952d34 100644
--- a/sysutils/heartbeat/Makefile
+++ b/sysutils/heartbeat/Makefile
@@ -3,7 +3,7 @@
PORTNAME= heartbeat
PORTVERSION= 2.1.4
-PORTREVISION= 18
+PORTREVISION= 19
CATEGORIES= sysutils
#MASTER_SITES= http://hg.linux-ha.org/lha-2.1/archive/STABLE-2.1.4.tar.bz2
MASTER_SITES= ${MASTER_SITE_LOCAL}
@@ -99,7 +99,7 @@ PLIST_SUB+= APCSNMP="@comment "
.if ${PORT_OPTIONS:MDRAC3} || exists (${PREFIX}/lib/libcurl.so)
USE_CURL= yes
-LIB_DEPENDS+= curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl
PLIST_SUB+= DRAC3=""
.else
PLIST_SUB+= DRAC3="@comment "
diff --git a/sysutils/pacman/Makefile b/sysutils/pacman/Makefile
index 3a630f3011fb..15305723cbad 100644
--- a/sysutils/pacman/Makefile
+++ b/sysutils/pacman/Makefile
@@ -3,6 +3,7 @@
PORTNAME= pacman
PORTVERSION= 4.0.3
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.archlinux.org/other/pacman/ \
http://mirror.amdmi3.ru/distfiles/
diff --git a/sysutils/powerman/Makefile b/sysutils/powerman/Makefile
index 6b5d6e0b770d..9ddcf67dd206 100644
--- a/sysutils/powerman/Makefile
+++ b/sysutils/powerman/Makefile
@@ -3,6 +3,7 @@
PORTNAME= powerman
PORTVERSION= 2.3.16
+PORTREVISION= 1
CATEGORIES= sysutils parallel
MASTER_SITES= GOOGLE_CODE
diff --git a/textproc/libkolabxml/Makefile b/textproc/libkolabxml/Makefile
index 3e74cd6dfeb4..b0c47e899c21 100644
--- a/textproc/libkolabxml/Makefile
+++ b/textproc/libkolabxml/Makefile
@@ -2,6 +2,7 @@
PORTNAME= libkolabxml
PORTVERSION= 0.8.4
+PORTREVISION= 1
CATEGORIES= textproc
MASTER_SITES= http://mirror.kolabsys.com/pub/releases/
diff --git a/textproc/liblrdf/Makefile b/textproc/liblrdf/Makefile
index 632d8e5216f8..1142c52606ab 100644
--- a/textproc/liblrdf/Makefile
+++ b/textproc/liblrdf/Makefile
@@ -3,7 +3,7 @@
PORTNAME= liblrdf
PORTVERSION= 0.5.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc
MASTER_SITES= GENTOO/distfiles
diff --git a/textproc/libmrss/Makefile b/textproc/libmrss/Makefile
index c86ca63929f5..2b71bbffdd95 100644
--- a/textproc/libmrss/Makefile
+++ b/textproc/libmrss/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libmrss
PORTVERSION= 0.19.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= textproc
MASTER_SITES= http://www.autistici.org/bakunin/libmrss/
diff --git a/textproc/libnxml/Makefile b/textproc/libnxml/Makefile
index 61a963f0e5e2..2114f55eba59 100644
--- a/textproc/libnxml/Makefile
+++ b/textproc/libnxml/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libnxml
PORTVERSION= 0.18.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc devel
MASTER_SITES= http://www.autistici.org/bakunin/libnxml/ \
http://nivi.interfree.it/distfiles/${PORTNAME}/${PORTVERSION}/
@@ -15,7 +15,7 @@ MASTER_SITES= http://www.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.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/textproc/raptor/Makefile b/textproc/raptor/Makefile
index 50f6ebbc6fe4..00ce5eb69d22 100644
--- a/textproc/raptor/Makefile
+++ b/textproc/raptor/Makefile
@@ -7,7 +7,7 @@
PORTNAME= raptor
PORTVERSION= 1.4.21
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc
MASTER_SITES= SF/librdf/${PORTNAME}/${PORTVERSION} \
http://download.librdf.org/source/
@@ -15,7 +15,7 @@ MASTER_SITES= SF/librdf/${PORTNAME}/${PORTVERSION} \
MAINTAINER= kde@FreeBSD.org
COMMENT= RDF Parser Toolkit for Redland
-LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl
USE_GNOME= gnomehack libxml2
GNU_CONFIGURE= yes
diff --git a/textproc/raptor2/Makefile b/textproc/raptor2/Makefile
index fe98ec4c0546..1948a341f564 100644
--- a/textproc/raptor2/Makefile
+++ b/textproc/raptor2/Makefile
@@ -3,6 +3,7 @@
PORTNAME= raptor2
PORTVERSION= 2.0.9
+PORTREVISION= 1
CATEGORIES= textproc
MASTER_SITES= http://download.librdf.org/source/ \
SF/librdf/${PORTNAME}/${PORTVERSION}
diff --git a/textproc/rss2html/Makefile b/textproc/rss2html/Makefile
index 6016db6b5e5b..dae2a277461c 100644
--- a/textproc/rss2html/Makefile
+++ b/textproc/rss2html/Makefile
@@ -7,14 +7,14 @@
PORTNAME= rss2html
PORTVERSION= 0.8.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc
MASTER_SITES= http://mirror.mcx2.org/
MAINTAINER= dhn@FreeBSD.org
COMMENT= RSS to HTML converter
-LIB_DEPENDS+= curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl
GNU_CONFIGURE= yes
CFLAGS+= "-I${LOCALBASE}/include" "-L${LOCALBASE}/lib"
diff --git a/textproc/zorba/Makefile b/textproc/zorba/Makefile
index 904b9f8efddb..e87d3961caa8 100644
--- a/textproc/zorba/Makefile
+++ b/textproc/zorba/Makefile
@@ -3,7 +3,7 @@
PORTNAME= zorba
PORTVERSION= 2.7.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc
MASTER_SITES= https://launchpadlibrarian.net/119058962/
DISTNAME= ${PORTNAME}-src-${PORTVERSION}
diff --git a/www/cas/Makefile b/www/cas/Makefile
index 4351081ca64d..00783b42c0a7 100644
--- a/www/cas/Makefile
+++ b/www/cas/Makefile
@@ -3,7 +3,7 @@
PORTNAME= cas
PORTVERSION= 3.5.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www devel
MASTER_SITES= http://cas.havoc.ru/download/
diff --git a/www/castget/Makefile b/www/castget/Makefile
index 2b380d10869f..b2a86cdc8d8d 100644
--- a/www/castget/Makefile
+++ b/www/castget/Makefile
@@ -7,7 +7,7 @@
PORTNAME= castget
PORTVERSION= 1.0.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= www
MASTER_SITES= SAVANNAH CENKES
@@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Command-line podcast downloader
LIB_DEPENDS= id3-3.8.3:${PORTSDIR}/audio/id3lib \
- curl.6:${PORTSDIR}/ftp/curl
+ curl:${PORTSDIR}/ftp/curl
USE_LDCONFIG= yes
USE_GNOME= glib20 libxml2
diff --git a/www/cplanet/Makefile b/www/cplanet/Makefile
index e34feeebc256..4cd65bb3b9d2 100644
--- a/www/cplanet/Makefile
+++ b/www/cplanet/Makefile
@@ -2,6 +2,7 @@
PORTNAME= cplanet
PORTVERSION= 0.9
+PORTREVISION= 1
CATEGORIES= www textproc
MASTER_SITES= http://files.etoilebsd.net/cplanet/
diff --git a/www/flickcurl/Makefile b/www/flickcurl/Makefile
index 17f59a8ae529..b83e5047abec 100644
--- a/www/flickcurl/Makefile
+++ b/www/flickcurl/Makefile
@@ -3,6 +3,7 @@
PORTNAME= flickcurl
PORTVERSION= 1.24
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= http://download.dajobe.org/flickcurl/
diff --git a/www/gecko-mediaplayer/Makefile b/www/gecko-mediaplayer/Makefile
index a9d9882bb570..af932fa0e6aa 100644
--- a/www/gecko-mediaplayer/Makefile
+++ b/www/gecko-mediaplayer/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gecko-mediaplayer
PORTVERSION= 1.0.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www multimedia gnome
MASTER_SITES= GOOGLE_CODE
diff --git a/www/mod_auth_cas/Makefile b/www/mod_auth_cas/Makefile
index 4c1161171dbc..12edb3fe0906 100644
--- a/www/mod_auth_cas/Makefile
+++ b/www/mod_auth_cas/Makefile
@@ -7,6 +7,7 @@
PORTNAME= mod_auth_cas
PORTVERSION= 1.0.9.1
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= https://source.jasig.org/cas-clients/mod_auth_cas/tags/mod_auth_cas-${PORTVERSION}/src/
# SVN tags only, *sigh*
diff --git a/www/mod_auth_mellon/Makefile b/www/mod_auth_mellon/Makefile
index 415b11fb9d8a..b22cff119952 100644
--- a/www/mod_auth_mellon/Makefile
+++ b/www/mod_auth_mellon/Makefile
@@ -3,6 +3,7 @@
PORTNAME= mod_auth_mellon
PORTVERSION= 0.5.0
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= http://modmellon.googlecode.com/files/
DIST_SUBDIR= apache2
@@ -11,7 +12,7 @@ MAINTAINER= tj@FreeBSD.org
COMMENT= Apache auth module for identifying SSO users
LIB_DEPENDS= lasso.8:${PORTSDIR}/security/lasso \
- curl.6:${PORTSDIR}/ftp/curl
+ curl:${PORTSDIR}/ftp/curl
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-apxs2=${APXS}
diff --git a/www/mod_flickr/Makefile b/www/mod_flickr/Makefile
index 492499185716..04cb2139242e 100644
--- a/www/mod_flickr/Makefile
+++ b/www/mod_flickr/Makefile
@@ -7,14 +7,14 @@
PORTNAME= mod_flickr
PORTVERSION= 1.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www
MASTER_SITES= http://www.vshank.com/modcode/
MAINTAINER= venkyshankar@yahoo.com
COMMENT= Apache module for Flickr API access
-LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl
MAKE_JOBS_SAFE= yes
diff --git a/www/mod_security/Makefile b/www/mod_security/Makefile
index 7d0cd6be7f2a..d9402525eb6a 100644
--- a/www/mod_security/Makefile
+++ b/www/mod_security/Makefile
@@ -2,7 +2,7 @@
PORTNAME= mod_security
PORTVERSION= 2.7.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www security
MASTER_SITES= http://www.modsecurity.org/tarball/${PORTVERSION}/
PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX}
diff --git a/www/netsurf/Makefile b/www/netsurf/Makefile
index 8d1a50c980ff..94c2d48f2fef 100644
--- a/www/netsurf/Makefile
+++ b/www/netsurf/Makefile
@@ -3,6 +3,7 @@
PORTNAME= netsurf
PORTVERSION= 3.0
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= http://download.netsurf-browser.org/netsurf/releases/source-full/
DISTNAME= ${PORTNAME}-${PORTVERSION}-full-src
diff --git a/www/newsbeuter/Makefile b/www/newsbeuter/Makefile
index daaed820b9cf..35a22a2f9024 100644
--- a/www/newsbeuter/Makefile
+++ b/www/newsbeuter/Makefile
@@ -3,7 +3,7 @@
PORTNAME= newsbeuter
PORTVERSION= 2.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= http://newsbeuter.org/downloads/
@@ -11,7 +11,7 @@ MAINTAINER= arved@FreeBSD.org
COMMENT= An RSS feed reader for the text console
LIB_DEPENDS= stfl.1:${PORTSDIR}/devel/stfl \
- curl.6:${PORTSDIR}/ftp/curl \
+ curl:${PORTSDIR}/ftp/curl \
json.0:${PORTSDIR}/devel/json-c
LICENSE= MIT
diff --git a/www/nspluginwrapper/Makefile b/www/nspluginwrapper/Makefile
index 2d76c70a2520..ed671fc2bee8 100644
--- a/www/nspluginwrapper/Makefile
+++ b/www/nspluginwrapper/Makefile
@@ -7,6 +7,7 @@
PORTNAME= nspluginwrapper
PORTVERSION= 1.4.4
+PORTREVISION= 1
CATEGORIES= www linux emulators
MASTER_SITES= http://nspluginwrapper.org/download/ \
LOCAL/jkim \
@@ -16,7 +17,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${BINFILE}:binfile
MAINTAINER= jkim@FreeBSD.org
COMMENT= A compatibility plugin for Mozilla NPAPI plugins
-LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl
CONFLICTS= nspluginwrapper-1.3.*
diff --git a/www/openvrml/Makefile b/www/openvrml/Makefile
index fe44eb1b83c2..818033d93186 100644
--- a/www/openvrml/Makefile
+++ b/www/openvrml/Makefile
@@ -3,7 +3,7 @@
PORTNAME= openvrml
PORTVERSION= 0.18.9
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= www graphics
MASTER_SITES= SF
@@ -17,7 +17,7 @@ LIB_DEPENDS= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
js.1:${PORTSDIR}/lang/spidermonkey17 \
jpeg.11:${PORTSDIR}/graphics/jpeg \
png15:${PORTSDIR}/graphics/png \
- curl.6:${PORTSDIR}/ftp/curl \
+ curl:${PORTSDIR}/ftp/curl \
gtkglext-x11-1.0:${PORTSDIR}/x11-toolkits/gtkglext
USE_GL= yes
diff --git a/www/p5-WWW-Curl/Makefile b/www/p5-WWW-Curl/Makefile
index 191fc4b79b30..beeeca2b72c6 100644
--- a/www/p5-WWW-Curl/Makefile
+++ b/www/p5-WWW-Curl/Makefile
@@ -3,6 +3,7 @@
PORTNAME= WWW-Curl
PORTVERSION= 4.15
+PORTREVISION= 1
CATEGORIES= www ftp perl5
MASTER_SITES= CPAN \
http://curl.haxx.se/libcurl/perl/
@@ -13,7 +14,7 @@ COMMENT= Perl binding interface for curl
LICENSE= MIT
-LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl:install
PERL_CONFIGURE= yes
diff --git a/www/pecl-http/Makefile b/www/pecl-http/Makefile
index d72c591aa0d7..1a5f1c159361 100644
--- a/www/pecl-http/Makefile
+++ b/www/pecl-http/Makefile
@@ -3,6 +3,7 @@
PORTNAME= http
PORTVERSION= 1.7.5
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= http://pecl.php.net/get/
PKGNAMEPREFIX= pecl-
@@ -12,7 +13,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= miwi@FreeBSD.org
COMMENT= Extended HTTP Support
-LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl
USE_PHP= yes
USE_PHPEXT= yes
diff --git a/www/pecl-solr/Makefile b/www/pecl-solr/Makefile
index a36e979737e2..290de607ab9f 100644
--- a/www/pecl-solr/Makefile
+++ b/www/pecl-solr/Makefile
@@ -3,6 +3,7 @@
PORTNAME= solr
PORTVERSION= 1.0.2
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= http://pecl.php.net/get/
PKGNAMEPREFIX= pecl-
diff --git a/www/rubygem-passenger/Makefile b/www/rubygem-passenger/Makefile
index 90e8da5f976a..caa711317c9e 100644
--- a/www/rubygem-passenger/Makefile
+++ b/www/rubygem-passenger/Makefile
@@ -3,6 +3,7 @@
PORTNAME= passenger
PORTVERSION= 4.0.8
+PORTREVISION= 1
CATEGORIES= www rubygems
MASTER_SITES= RG
PKGNAMEPREFIX= rubygem-
diff --git a/www/rubygem-typhoeus/Makefile b/www/rubygem-typhoeus/Makefile
index 9455f3a6c615..6eb640600f74 100644
--- a/www/rubygem-typhoeus/Makefile
+++ b/www/rubygem-typhoeus/Makefile
@@ -7,6 +7,7 @@
PORTNAME= typhoeus
PORTVERSION= 0.3.3
+PORTREVISION= 1
CATEGORIES= www rubygems
MASTER_SITES= RG
diff --git a/www/thundercache/Makefile b/www/thundercache/Makefile
index 18ce14dd8da0..5137d1ee22e7 100644
--- a/www/thundercache/Makefile
+++ b/www/thundercache/Makefile
@@ -2,7 +2,7 @@
PORTNAME= thundercache
PORTVERSION= 6.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= www
MASTER_SITES= http://www.thundercache.com.br/dist/ \
http://www.bmsoftware.org/packs/ \
@@ -62,7 +62,7 @@ RUN_DEPENDS+= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/pgsql.so:${PORTSDIR}/databases
USE_PHP+= curl pcre bcmath pdo mcrypt mhash session
.endif
-LIB_DEPENDS+= curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl:install
SUB_FILES= pkg-message log.sh test-deps.sh
SUB_LIST= "GREP=${GREP}"
diff --git a/www/thundersnarf/Makefile b/www/thundersnarf/Makefile
index 48a446b38669..498e2b521ecd 100644
--- a/www/thundersnarf/Makefile
+++ b/www/thundersnarf/Makefile
@@ -2,7 +2,7 @@
PORTNAME= thundersnarf
PORTVERSION= 1.3
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= www
MASTER_SITES= http://www.tracanelli.com.br/l/dev/thunder/ \
@@ -42,7 +42,7 @@ RUN_DEPENDS+= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/pdo_pgsql.so:${PORTSDIR}/datab
USE_PHP+= curl pcre bcmath pdo mcrypt mhash session pgsql spl dom xmlrpc ctype openssl simplexml soap json
.endif
-LIB_DEPENDS+= curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl:install
SUB_FILES= pkg-message
diff --git a/www/webkit-gtk2/Makefile b/www/webkit-gtk2/Makefile
index 2c6d72d31600..5c0dc7ec8df7 100644
--- a/www/webkit-gtk2/Makefile
+++ b/www/webkit-gtk2/Makefile
@@ -4,7 +4,7 @@
PORTNAME= webkit
PORTVERSION= 1.8.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= http://webkitgtk.org/releases/
PKGNAMESUFFIX= -gtk2
diff --git a/www/webkit-gtk3/Makefile b/www/webkit-gtk3/Makefile
index 8e050db752e4..d136d775427f 100644
--- a/www/webkit-gtk3/Makefile
+++ b/www/webkit-gtk3/Makefile
@@ -4,6 +4,7 @@
PORTNAME= webkit
PORTVERSION= 1.8.3
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= http://webkitgtk.org/releases/
PKGNAMESUFFIX= -gtk3
diff --git a/www/wsdlpull/Makefile b/www/wsdlpull/Makefile
index 3c679326edf4..66afc6656444 100644
--- a/www/wsdlpull/Makefile
+++ b/www/wsdlpull/Makefile
@@ -8,6 +8,7 @@
PORTNAME= wsdlpull
PORTVERSION= 1.24
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
diff --git a/www/xshttpd-devel/Makefile b/www/xshttpd-devel/Makefile
index c3bbeba69c74..49f4ceb34f72 100644
--- a/www/xshttpd-devel/Makefile
+++ b/www/xshttpd-devel/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xshttpd
DISTVERSION= 3.7b27
+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/www/xshttpd/Makefile b/www/xshttpd/Makefile
index c179c1627a80..9e14209be893 100644
--- a/www/xshttpd/Makefile
+++ b/www/xshttpd/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xshttpd
DISTVERSION= 3.6g01
-PORTREVISION= 6
+PORTREVISION= 7
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-wm/ede/Makefile b/x11-wm/ede/Makefile
index c274cc586cdc..8fea072fb3a5 100644
--- a/x11-wm/ede/Makefile
+++ b/x11-wm/ede/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ede
PORTVERSION= 2.0
-PORTREVSION= 1
+PORTREVISION= 2
CATEGORIES= x11-wm
MASTER_SITES= SF \
SF/${PORTNAME}/${PORTNAME}lib/${PORTVERSION}:edelib
@@ -20,7 +20,7 @@ BUILD_DEPENDS= doxygen:${PORTSDIR}/devel/doxygen \
jam:${PORTSDIR}/devel/jam \
update-mime-database:${PORTSDIR}/misc/shared-mime-info
LIB_DEPENDS= dbus-1.3:${PORTSDIR}/devel/dbus \
- curl.6:${PORTSDIR}/ftp/curl \
+ curl:${PORTSDIR}/ftp/curl \
startup-notification-1.0:${PORTSDIR}/x11/startup-notification \
fltk.1:${PORTSDIR}/x11-toolkits/fltk
RUN_DEPENDS= update-mime-database:${PORTSDIR}/misc/shared-mime-info