From sunpoet@sunpoet.net  Thu Oct  4 15:45:38 2012
Return-Path: <sunpoet@sunpoet.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 404811065670
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  4 Oct 2012 15:45:38 +0000 (UTC)
	(envelope-from sunpoet@sunpoet.net)
Received: from sunpoet.net (sunpoet.net [220.133.12.240])
	by mx1.freebsd.org (Postfix) with ESMTP id 9F3698FC17
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  4 Oct 2012 15:45:37 +0000 (UTC)
Received: by sunpoet.net (Postfix, from userid 1000)
	id 3XXdk721WXz7B4; Thu,  4 Oct 2012 23:46:23 +0800 (CST)
Message-Id: <3XXdk721WXz7B4@sunpoet.net>
Date: Thu,  4 Oct 2012 23:46:23 +0800 (CST)
From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [exp-run] ftp/curl: update to 7.31.0
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         172325
>Category:       ports
>Synopsis:       [exp-run] ftp/curl: update to 7.31.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    sunpoet
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Oct 04 15:50:09 UTC 2012
>Closed-Date:    Thu Jul 11 16:38:33 UTC 2013
>Last-Modified:  Thu Jul 11 16:38:33 UTC 2013
>Originator:     Sunpoet Po-Chuan Hsieh
>Release:        FreeBSD 9.1-PRERELEASE amd64
>Organization:
The FreeBSD Project
>Environment:
System: FreeBSD bonjour.sunpoet.net 9.1-PRERELEASE FreeBSD 9.1-PRERELEASE #0: Sat Sep  8 01:52:48 CST
>Description:

Request for exp-run. The attached patch is also available at [1].

[1] http://people.freebsd.org/~sunpoet/curl.patch

- Update to 7.27.0
- Convert to new options framework
- Adjust option: LIBIDN -> IDN
- Add option: GSSAPI (off by default to keep package unchanged in this update)
- Sort option handler
- Cosmetic change

Changes:	http://curl.haxx.se/changes.html

Generated with FreeBSD Port Tools 0.99_6 (mode: update, diff: SVN)
>How-To-Repeat:
>Fix:

--- curl-7.27.0.patch begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 305261)
+++ Makefile	(working copy)
@@ -1,13 +1,8 @@
-# New ports collection makefile for:	curl
-# Date created:		12 December 1998
-# Whom:			Neil Blakey-Milner <nbm@rucus.ru.ac.za>
-#
+# Created by: Neil Blakey-Milner <nbm@rucus.ru.ac.za>
 # $FreeBSD$
-#
 
 PORTNAME=	curl
-PORTVERSION=	7.24.0
-PORTREVISION=	1
+PORTVERSION=	7.27.0
 CATEGORIES=	ftp ipv6 www
 MASTER_SITES=	http://curl.haxx.se/download/ \
 		LOCAL/sunpoet
@@ -18,21 +13,14 @@
 
 LICENSE=	MIT
 
-OPTIONS=	CARES "Asynchronous DNS resolution via c-ares" off \
-		CURL_DEBUG "Enable curl diagnostic output" off \
-		GNUTLS "Use GNU TLS if OPENSSL is OFF" off \
-		IPV6 "IPv6 support" on \
-		KERBEROS4 "Kerberos 4 authentication" off \
-		LDAP "LDAP support" off \
-		LDAPS "LDAPS support (requires LDAP and SSL)" off \
-		LIBIDN "Internationalized Domain Names via libidn" off \
-		LIBSSH2 "SCP/SFTP support via libssh2" off \
-		NTLM "NTLM authentication" off \
-		OPENSSL "OpenSSL support" on \
-		CA_BUNDLE "Install CA bundle for OpenSSL" on \
-		PROXY "Proxy support" on \
-		RTMP "RTMP streams support" off \
-		TRACKMEMORY "Enable curl memory diagnostic output" off
+OPTIONS_DEFINE=	CA_BUNDLE CARES CURL_DEBUG DOCS EXAMPLES GSSAPI IDN IPV6 KERBEROS4 LDAP LDAPS LIBSSH2 NTLM PROXY RTMP TRACKMEMORY
+OPTIONS_DEFAULT=CA_BUNDLE IPV6 OPENSSL PROXY SSL
+OPTIONS_SINGLE=	SSL
+OPTIONS_SINGLE_SSL=	GNUTLS OPENSSL
+CA_BUNDLE_DESC=	Install CA bundle for OpenSSL
+CURL_DEBUG_DESC=	cURL diagnostic output
+LIBSSH2_DESC=	SCP/SFTP support via libssh2
+TRACKMEMORY_DESC=	cURL memory diagnostic output
 
 CONFIGURE_ARGS+=--disable-threaded-resolver --disable-werror \
 		--enable-imap --enable-pop3 --enable-rtsp --enable-smtp
@@ -52,7 +40,7 @@
 		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 \
@@ -65,160 +53,160 @@
 		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_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}"
+PLIST_SUB+=	SHLIB_VER="${SHLIB_VER}"
 
 SHLIB_VER=	6
 .endif
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_GNUTLS) && defined(WITH_OPENSSL)
-IGNORE=		may only use GNU TLS if OpenSSL support is disabled
+.if ${PORT_OPTIONS:MCA_BUNDLE} && empty(PORT_OPTIONS:MOPENSSL)
+IGNORE=		only supports CA bundle with OpenSSL
 .endif
 
-.if defined(WITH_LIBSSH2) && !defined(WITH_OPENSSL)
-IGNORE=		only supports LIBSSH2 with OpenSSL
+.if ${PORT_OPTIONS:MLDAPS} && empty(PORT_OPTIONS:MLDAP)
+IGNORE=		only supports LDAPS with LDAP
 .endif
 
-.if defined(WITH_NTLM) && !defined(WITH_OPENSSL)
-IGNORE=		only supports NTLM with OpenSSL
+.if ${PORT_OPTIONS:MLDAPS} && empty(PORT_OPTIONS:MSSL)
+IGNORE=		only supports LDAPS with SSL (OpenSSL or GnuTLS)
 .endif
 
-.if defined(WITH_LDAPS)
-.if !defined(WITH_LDAP)
-IGNORE=		only supports LDAPS with LDAP
-.else
-.if !defined(WITH_OPENSSL) && !defined(WITH_GNUTLS)
-IGNORE=		only supports LDAPS with SSL (OpenSSL or GNUTLS)
+.if ${PORT_OPTIONS:MLIBSSH2} && empty(PORT_OPTIONS:MOPENSSL)
+IGNORE=		only supports LIBSSH2 with OpenSSL
 .endif
+
+.if ${PORT_OPTIONS:MNTLM} && empty(PORT_OPTIONS:MOPENSSL)
+IGNORE=		only supports NTLM with OpenSSL
 .endif
-.endif
 
-.if !defined(WITHOUT_OPENSSL)
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
-CONFIGURE_ARGS+=	--with-ssl=${OPENSSLBASE}
-.if !defined(WITHOUT_CA_BUNDLE)
+.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
+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-ssl
-.if defined(WITH_CA_BUNDLE)
-IGNORE=			only supports CA bundle with OpenSSL
+CONFIGURE_ARGS+=--disable-ares
 .endif
-.endif
 
-.if defined(WITH_CARES)
-LIB_DEPENDS+=	cares.2:${PORTSDIR}/dns/c-ares
-CONFIGURE_ARGS+=	--enable-ares=${LOCALBASE}
+.if ${PORT_OPTIONS:MCURL_DEBUG}
+CONFIGURE_ARGS+=--enable-debug
 .else
-CONFIGURE_ARGS+=	--disable-ares
+CONFIGURE_ARGS+=--disable-debug
 .endif
 
-.if defined(WITH_GNUTLS)
+.if ${PORT_OPTIONS:MGNUTLS}
 LIB_DEPENDS+=	gnutls:${PORTSDIR}/security/gnutls
 CONFIGURE_ARGS+=--with-gnutls=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=--without-gnutls
 .endif
 
-.if defined(WITH_OPENSSL) || defined(WITH_GNUTLS)
-PLIST_SUB+=	SSL=""
+.if ${PORT_OPTIONS:MGSSAPI}
+CONFIGURE_ARGS+=--with-gssapi
 .else
-PLIST_SUB+=	SSL="@comment "
+CONFIGURE_ARGS+=--without-gssapi
 .endif
 
-.if defined(WITH_IPV6)
-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) && defined(WITH_KERBEROS4)
-CONFIGURE_ARGS += --with-krb4=/usr
+.if ${PORT_OPTIONS:MIPV6}
+CONFIGURE_ARGS+=--enable-ipv6
 .else
-CONFIGURE_ARGS += --without-krb4
+CONFIGURE_ARGS+=--disable-ipv6
 .endif
 
-.if defined(WITH_LDAP)
-CONFIGURE_ARGS+=	--enable-ldap
-USE_OPENLDAP=	yes
+.if ${PORT_OPTIONS:MKERBEROS4} && exists(/usr/lib/libkrb.a)
+CONFIGURE_ARGS+=--with-krb4=/usr
+.else
+CONFIGURE_ARGS+=--without-krb4
+.endif
+
+.if ${PORT_OPTIONS:MLDAP}
 CFLAGS+=	-I${LOCALBASE}/include
+CONFIGURE_ARGS+=--enable-ldap
 LDFLAGS+=	-L${LOCALBASE}/lib
-.if defined(WITH_LDAPS)
-CONFIGURE_ARGS+=	--enable-ldaps
+USE_OPENLDAP=	yes
 .else
-CONFIGURE_ARGS+=	--disable-ldaps
+CONFIGURE_ARGS+=--disable-ldap
 .endif
+
+.if ${PORT_OPTIONS:MLDAPS}
+CONFIGURE_ARGS+=--enable-ldaps
 .else
-CONFIGURE_ARGS+=	--disable-ldap --disable-ldaps
+CONFIGURE_ARGS+=--disable-ldaps
 .endif
 
-.if defined(WITH_LIBIDN)
-LIB_DEPENDS+=	idn.17:${PORTSDIR}/dns/libidn
-CONFIGURE_ARGS+=	--with-libidn=${LOCALBASE}
+.if ${PORT_OPTIONS:MLIBSSH2}
+LIB_DEPENDS+=	ssh2:${PORTSDIR}/security/libssh2
+CONFIGURE_ARGS+=--with-libssh2=${LOCALBASE}
 .else
-CONFIGURE_ARGS+=	--without-libidn
+CONFIGURE_ARGS+=--without-libssh2
 .endif
 
-.if defined(WITH_LIBSSH2)
-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 defined(WITH_CURL_DEBUG)
-CONFIGURE_ARGS+=	--enable-debug
-.endif
-
-.if defined(WITH_RTMP)
-LIB_DEPENDS+=	rtmp.0:${PORTSDIR}/multimedia/rtmpdump
-CONFIGURE_ARGS+=	--with-librtmp=${LOCALBASE}
+.if ${PORT_OPTIONS:MOPENSSL}
+USE_OPENSSL=	yes
+CONFIGURE_ARGS+=--with-ssl=${OPENSSLBASE}
 .else
-CONFIGURE_ARGS+=	--without-librtmp
+CONFIGURE_ARGS+=--without-ssl
 .endif
 
-.if defined(WITH_TRACKMEMORY)
-CONFIGURE_ARGS+=	--enable-curldebug
+.if ${PORT_OPTIONS:MPROXY}
+CONFIGURE_ARGS+=--enable-proxy
 .else
-CONFIGURE_ARGS+=	--disable-curldebug
+CONFIGURE_ARGS+=--disable-proxy
 .endif
 
-.if defined(WITH_NTLM)
-CONFIGURE_ARGS+=	--enable-ntlm
+.if ${PORT_OPTIONS:MRTMP}
+LIB_DEPENDS+=	rtmp:${PORTSDIR}/multimedia/rtmpdump
+CONFIGURE_ARGS+=--with-librtmp=${LOCALBASE}
 .else
-CONFIGURE_ARGS+=	--disable-ntlm
+CONFIGURE_ARGS+=--without-librtmp
 .endif
 
-.if !defined(WITHOUT_PROXY)
-CONFIGURE_ARGS+=	--enable-proxy
+.if ${PORT_OPTIONS:MTRACKMEMORY}
+CONFIGURE_ARGS+=--enable-curldebug
 .else
-CONFIGURE_ARGS+=	--disable-proxy
+CONFIGURE_ARGS+=--disable-curldebug
 .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
-.if !defined(NOPORTDOCS)
+	${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}/
 	cd ${WRKSRC}/docs/libcurl/ && ${INSTALL_DATA} ABI *.html *.pdf *.m4 ${DOCSDIR}/libcurl/
 .endif
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	${MKDIR} ${EXAMPLESDIR}/
 	cd ${WRKSRC}/docs/examples/ && ${INSTALL_DATA} README Makefile.example makefile* *.c *.cc ${EXAMPLESDIR}/
 .endif
@@ -226,14 +214,14 @@
 
 # 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 defined(WITHOUT_PROXY)
+regression-test test: build
+.if empty(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>
Index: distinfo
===================================================================
--- distinfo	(revision 305261)
+++ distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (curl-7.24.0.tar.lzma) = cd683ee8be137ed8a8e97d42fd3cc94f88f63d478b83d4abe38e31b6281e2268
-SIZE (curl-7.24.0.tar.lzma) = 1973811
+SHA256 (curl-7.27.0.tar.lzma) = b986186140e0ef0102e11094873f1e71bca1159d12fe869a8aa2ce649f02b238
+SIZE (curl-7.27.0.tar.lzma) = 2037300
Index: files/patch-configure
===================================================================
--- files/patch-configure	(revision 305261)
+++ files/patch-configure	(working copy)
@@ -6,22 +6,9 @@
 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	2012-07-28 02:25:28.000000000 +0800
++++ configure	2012-09-22 20:54:44.428056025 +0800
+@@ -15985,6 +15985,9 @@
      tmp_CFLAGS="$CFLAGS"
      tmp_CPPFLAGS="$CPPFLAGS"
  
@@ -31,7 +18,7 @@
      ac_var_stripped=""
    for word1 in $tmp_CFLAGS; do
      ac_var_strip_word="no"
-@@ -15922,6 +15925,7 @@
+@@ -16015,6 +16018,7 @@
    done
      tmp_CPPFLAGS="$ac_var_stripped"
    squeeze tmp_CPPFLAGS
@@ -39,7 +26,7 @@
  
      #
      if test "$want_debug" = "yes"; then
-@@ -16139,6 +16143,9 @@
+@@ -16232,6 +16236,9 @@
      #
      if test "$honor_optimize_option" = "yes"; then
  
@@ -49,7 +36,7 @@
      ac_var_stripped=""
    for word1 in $tmp_CFLAGS; do
      ac_var_strip_word="no"
-@@ -16169,6 +16176,7 @@
+@@ -16262,6 +16269,7 @@
    done
      tmp_CPPFLAGS="$ac_var_stripped"
    squeeze tmp_CPPFLAGS
@@ -57,17 +44,17 @@
  
        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 @@
+@@ -20508,7 +20516,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 @@
+@@ -23925,29 +23934,30 @@
      ;;
    off)
          LIB_RTMP="-lrtmp"
Index: files/patch-lib-url.c
===================================================================
--- files/patch-lib-url.c	(working copy)
+++ files/patch-lib-url.c	(working copy)
@@ -3,9 +3,9 @@
 Author: Peter Pentchev <roam@FreeBSD.org>
 Last-Update: 2010-12-18
 
---- lib/url.c.orig	2012-01-23 23:31:30.000000000 +0800
-+++ lib/url.c	2012-02-26 17:52:21.937920303 +0800
-@@ -797,6 +797,10 @@
+--- lib/url.c.orig	2012-07-13 20:21:05.000000000 +0800
++++ lib/url.c	2012-09-22 20:54:44.435391726 +0800
+@@ -812,6 +812,10 @@
      data->progress.flags |= PGRS_HIDE;
      data->state.current_speed = -1; /* init to negative == impossible */
  
Index: files/patch-lib::url.c
===================================================================
--- files/patch-lib::url.c	(revision 305261)
+++ files/patch-lib::url.c	(working copy)
@@ -1,18 +0,0 @@
-Description: Different handling of signals and threads.
-Forwarded: not-needed
-Author: Peter Pentchev <roam@FreeBSD.org>
-Last-Update: 2010-12-18
-
---- lib/url.c.orig	2012-01-23 23:31:30.000000000 +0800
-+++ lib/url.c	2012-02-26 17:52:21.937920303 +0800
-@@ -797,6 +797,10 @@
-     data->progress.flags |= PGRS_HIDE;
-     data->state.current_speed = -1; /* init to negative == impossible */
- 
-+#if defined(__FreeBSD_version)
-+    data->set.no_signal = TRUE; /* different handling of signals and threads */
-+#endif /* __FreeBSD_version */
-+
-     data->wildcard.state = CURLWC_INIT;
-     data->wildcard.filelist = NULL;
-     data->set.fnmatch = ZERO_NULL;
Index: files/patch-src-tool_operate.c
===================================================================
--- files/patch-src-tool_operate.c	(revision 305261)
+++ files/patch-src-tool_operate.c	(working copy)
@@ -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;
--- curl-7.27.0.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->sunpoet 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Thu Oct 4 15:50:21 UTC 2012 
Responsible-Changed-Why:  
Submitter is maintainer and has GNATS access (via the GNATS Auto Assign 
Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=172325 
Responsible-Changed-From-To: sunpoet->portmgr 
Responsible-Changed-By: sunpoet 
Responsible-Changed-When: Thu Oct 4 16:08:13 UTC 2012 
Responsible-Changed-Why:  
Request exp-run 

http://www.freebsd.org/cgi/query-pr.cgi?pr=172325 
State-Changed-From-To: open->analyzed 
State-Changed-By: linimon 
State-Changed-When: Mon Oct 22 01:22:26 UTC 2012 
State-Changed-Why:  
Take. 

fwiw, files/patch-lib-url.c looks like a null patch. 


Responsible-Changed-From-To: portmgr->linimon 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Mon Oct 22 01:22:26 UTC 2012 
Responsible-Changed-Why:  

http://www.freebsd.org/cgi/query-pr.cgi?pr=172325 
State-Changed-From-To: analyzed->feedback 
State-Changed-By: linimon 
State-Changed-When: Mon Oct 22 18:21:15 UTC 2012 
State-Changed-Why:  
The results are in and there are a few minor regressions: 

http://pointyhat-west.isc.freebsd.org/errorlogs/amd64-errorlogs/e.9.20121022001644.pointyhat-west/boinc-setiathome-enhanced-6.12_7.log 
http://pointyhat-west.isc.freebsd.org/errorlogs/amd64-errorlogs/e.9.20121022001644.pointyhat-west/boinc-simap-5.10.5.09_4.log 
http://pointyhat-west.isc.freebsd.org/errorlogs/amd64-errorlogs/e.9.20121022001644.pointyhat-west/boinc_curses-0.2.2_1.log 
http://pointyhat-west.isc.freebsd.org/errorlogs/amd64-errorlogs/e.9.20121022001644.pointyhat-west/createrepo-0.9.8.log 

mcl 


Responsible-Changed-From-To: linimon->sunpoet 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Mon Oct 22 18:21:15 UTC 2012 
Responsible-Changed-Why:  

http://www.freebsd.org/cgi/query-pr.cgi?pr=172325 

From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To: bug-followup <bug-followup@freebsd.org>
Cc:  
Subject: Re: ports/172325: [exp-run] ftp/curl: update to 7.27.0
Date: Sun, 23 Jun 2013 11:19:22 +0800

 --14dae94ed96f61fa9f04dfc9c409
 Content-Type: text/plain; charset=UTF-8
 
 Request for -exp run. New patch for 7.31.0 update is at [1][2].
 
 [1] http://people.FreeBSD.org/~sunpoet/curl-7.31.0.patch
 [2] http://people.FreeBSD.org/~sunpoet/curl-7.31.0.bump.patch
 
 --14dae94ed96f61fa9f04dfc9c409
 Content-Type: text/html; charset=UTF-8
 Content-Transfer-Encoding: quoted-printable
 
 <div dir=3D"ltr"><div style>Request for -exp run. New patch for 7.31.0 upda=
 te is at [1][2].</div><div><br></div><div>[1]=C2=A0<a href=3D"http://people=
 .FreeBSD.org/~sunpoet/curl-7.31.0.patch">http://people.FreeBSD.org/~sunpoet=
 /curl-7.31.0.patch</a></div>
 
 <div>[2]=C2=A0<a href=3D"http://people.FreeBSD.org/~sunpoet/curl-7.31.0.bum=
 p.patch">http://people.FreeBSD.org/~sunpoet/curl-7.31.0.bump.patch</a></div=
 ></div>
 
 --14dae94ed96f61fa9f04dfc9c409--
Responsible-Changed-From-To: sunpoet->portmgr 
Responsible-Changed-By: sunpoet 
Responsible-Changed-When: Sun Jun 23 03:23:42 UTC 2013 
Responsible-Changed-Why:  
Request for -exp run. New patch for 7.31.0 update is at [1][2]. 

[1] http://people.FreeBSD.org/~sunpoet/curl-7.31.0.patch [2] 
http://people.FreeBSD.org/~sunpoet/curl-7.31.0.bump.patch 


http://www.freebsd.org/cgi/query-pr.cgi?pr=172325 
Responsible-Changed-From-To: portmgr->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Thu Jun 27 03:10:20 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=172325 
Responsible-Changed-From-To: miwi->sunpoet 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Thu Jul 11 13:15:19 UTC 2013 
Responsible-Changed-Why:  
back to submitter, exp is ready to go 

http://www.freebsd.org/cgi/query-pr.cgi?pr=172325 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/172325: commit references a PR
Date: Thu, 11 Jul 2013 16:27:00 +0000 (UTC)

 Author: sunpoet
 Date: Thu Jul 11 16:26:26 2013
 New Revision: 322783
 URL: http://svnweb.freebsd.org/changeset/ports/322783
 
 Log:
   - Update to 7.31.0
   - Bump PORTREVISION for ftp/curl shlib change
   - Add TEST_DEPENDS
   - Convert to new options framework
   - Adjust options:
     - Add COOKIES
     - Add CYASSL, NSS, POLARSSL, THREADED_RESOLVER, TLS_SRP [1]
     - Add GSSAPI and SPNEGO [2]
     - Remove KERBEROS4
     - Rename LIBIDN to IDN
     - Remove TRACKMEMORY [1]
   - Sort option handler
   - Add SLAVEDIRS: ftp/curl-hiphop
   - Cosmetic change
   - Cleanup Makefile header
   - While I'm here, fix typo (PORTREVSION) in x11-wm/ede/Makefile
   
   Changes:	http://curl.haxx.se/changes.html
   PR:		ports/172325 (-exp run), ports/177369 (based on) [1]
   Submitted by:	Hirohisa Yamaguchi <umq@ueo.co.jp> [1], hrs (via email) [2]
   Exp run by:	miwi
 
 Deleted:
   head/ftp/curl/files/patch-CVE-2013-2174
 Modified:
   head/archivers/epkg/Makefile   (contents, props changed)
   head/astro/foxtrotgps/Makefile
   head/astro/viking/Makefile
   head/audio/amarok-kde4/Makefile
   head/audio/ario/Makefile
   head/audio/deadbeef/Makefile
   head/audio/fplib/Makefile
   head/audio/gbemol/Makefile   (contents, props changed)
   head/audio/gogglesmm/Makefile
   head/audio/grip/Makefile   (contents, props changed)
   head/audio/gtkpod/Makefile
   head/audio/herrie/Makefile
   head/audio/icecast2/Makefile   (contents, props changed)
   head/audio/libofa/Makefile   (contents, props changed)
   head/audio/linnya/Makefile
   head/audio/moc/Makefile   (contents, props changed)
   head/audio/mpdas/Makefile   (contents, props changed)
   head/audio/mpdscribble/Makefile   (contents, props changed)
   head/audio/musicpd/Makefile
   head/audio/ncmpcpp/Makefile
   head/audio/osd-lyrics/Makefile
   head/audio/rosegarden/Makefile
   head/audio/scmpc/Makefile   (contents, props changed)
   head/audio/scrobbler/Makefile
   head/audio/streamtranscoder/Makefile   (contents, props changed)
   head/audio/streamtuner/Makefile   (contents, props changed)
   head/audio/vagalume/Makefile
   head/audio/vorbis-tools/Makefile
   head/audio/xmms2-scrobbler/Makefile   (contents, props changed)
   head/audio/xmms2/Makefile
   head/biology/iolib/Makefile
   head/chinese/fcitx-cloudpinyin/Makefile
   head/comms/xastir/Makefile
   head/converters/bibtexconv/Makefile
   head/databases/couchdb/Makefile
   head/deskutils/cairo-dock/Makefile
   head/deskutils/fbreader/Makefile
   head/deskutils/google-gadgets/Makefile
   head/deskutils/growl-for-linux/Makefile
   head/deskutils/libgcal/Makefile
   head/deskutils/ljit/Makefile
   head/deskutils/logjam/Makefile   (contents, props changed)
   head/deskutils/mdh/Makefile   (contents, props changed)
   head/deskutils/pinot/Makefile
   head/deskutils/xfce4-tumbler/Makefile
   head/devel/aegis/Makefile
   head/devel/ecore-file/Makefile   (contents, props changed)
   head/devel/hs-darcs/Makefile   (contents, props changed)
   head/devel/libdap/Makefile
   head/devel/libgutenfetch/Makefile   (contents, props changed)
   head/devel/libopkele/Makefile   (contents, props changed)
   head/devel/libvirt/Makefile
   head/devel/libwfut/Makefile
   head/devel/mm-common/Makefile   (contents, props changed)
   head/devel/xmltooling/Makefile
   head/editors/codelite/Makefile
   head/editors/libreoffice/Makefile
   head/editors/morla/Makefile
   head/editors/openoffice-3/Makefile   (contents, props changed)
   head/editors/openoffice-devel/Makefile   (contents, props changed)
   head/editors/textroom/Makefile   (contents, props changed)
   head/emulators/qemu-devel/Makefile
   head/emulators/qemu/Makefile
   head/emulators/virtualbox-ose-legacy/Makefile
   head/emulators/virtualbox-ose/Makefile
   head/finance/libofx/Makefile
   head/ftp/R-cran-RCurl/Makefile
   head/ftp/curl/Makefile
   head/ftp/curl/distinfo   (contents, props changed)
   head/ftp/curl/files/patch-configure   (contents, props changed)
   head/ftp/curl/files/patch-src-tool_operate.c   (contents, props changed)
   head/ftp/curl/pkg-plist
   head/ftp/curlpp/Makefile
   head/ftp/fpc-libcurl/Makefile
   head/ftp/hs-curl/Makefile   (contents, props changed)
   head/ftp/ocaml-ocurl/Makefile   (contents, props changed)
   head/ftp/php5-curl/Makefile   (contents, props changed)
   head/ftp/php52-curl/Makefile   (contents, props changed)
   head/ftp/php53-curl/Makefile   (contents, props changed)
   head/ftp/py-curl/Makefile   (contents, props changed)
   head/ftp/rexx-curl/Makefile
   head/ftp/wmget/Makefile   (contents, props changed)
   head/games/0ad/Makefile
   head/games/alienarena/Makefile   (contents, props changed)
   head/games/bzflag/Makefile
   head/games/crossfire-client/Makefile   (contents, props changed)
   head/games/crossfire-server/Makefile   (contents, props changed)
   head/games/daimonin/Makefile   (contents, props changed)
   head/games/deng/Makefile
   head/games/evq3/Makefile   (contents, props changed)
   head/games/f1spirit-remake/Makefile   (contents, props changed)
   head/games/frobtads/Makefile
   head/games/ioquake3/Makefile
   head/games/kartofel/Makefile
   head/games/klavaro/Makefile
   head/games/kuklomenos/Makefile   (contents, props changed)
   head/games/meandmyshadow/Makefile
   head/games/megaglest/Makefile
   head/games/mudmagic/Makefile
   head/games/nexuiz/Makefile   (contents, props changed)
   head/games/openlierox/Makefile
   head/games/pokerth/Makefile
   head/games/springlobby/Makefile
   head/games/supertux-devel/Makefile
   head/games/supertuxkart/Makefile
   head/games/tmw/Makefile
   head/games/ufoai/Makefile
   head/games/warmux/Makefile
   head/games/warsow/Makefile   (contents, props changed)
   head/games/worldofpadman/Makefile   (contents, props changed)
   head/games/xmoto/Makefile
   head/games/xonotic/Makefile   (contents, props changed)
   head/graphics/darktable/Makefile
   head/graphics/feh/Makefile   (contents, props changed)
   head/graphics/gdal/Makefile
   head/graphics/gimmage/Makefile
   head/graphics/gimp-app/Makefile
   head/graphics/gnash/Makefile
   head/graphics/jp2a/Makefile   (contents, props changed)
   head/graphics/mapnik/Makefile
   head/graphics/mapserver/Makefile   (contents, props changed)
   head/graphics/osg-devel/Makefile
   head/graphics/osg/Makefile
   head/graphics/telak/Makefile   (contents, props changed)
   head/irc/iroffer-dinoex/Makefile   (contents, props changed)
   head/irc/unreal/Makefile
   head/irc/weechat-devel/Makefile
   head/irc/weechat/Makefile
   head/lang/fpc/Makefile   (contents, props changed)
   head/lang/fpc/Makefile.units   (contents, props changed)
   head/lang/gambas/Makefile
   head/lang/php52/Makefile
   head/lang/php52/Makefile.ext
   head/lang/php53/Makefile.ext
   head/lang/q/Makefile
   head/mail/libetpan/Makefile
   head/math/octave/Makefile
   head/misc/amanda-server/Makefile   (contents, props changed)
   head/misc/amanda26-server/Makefile   (contents, props changed)
   head/misc/amanda32-server/Makefile   (contents, props changed)
   head/misc/esniper/Makefile
   head/misc/gkrellm-helium/Makefile   (contents, props changed)
   head/misc/sword/Makefile   (contents, props changed)
   head/misc/wmweather+/Makefile
   head/multimedia/audacious-plugins/Makefile
   head/multimedia/cclive/Makefile
   head/multimedia/freetuxtv/Makefile
   head/multimedia/gnome-mplayer/Makefile
   head/multimedia/libquvi/Makefile
   head/multimedia/mediainfo/Makefile
   head/multimedia/mkvtoolnix/Makefile
   head/multimedia/qmmp/Makefile
   head/multimedia/quvi/Makefile
   head/multimedia/xbmc-pvr/Makefile
   head/multimedia/xbmc/Makefile
   head/multimedia/xine/Makefile
   head/net-im/centericq/Makefile
   head/net-im/centerim-devel/Makefile
   head/net-im/centerim/Makefile
   head/net-im/cli-msn/Makefile   (contents, props changed)
   head/net-mgmt/collectd/Makefile
   head/net-mgmt/collectd5/Makefile
   head/net-mgmt/sblim-wbemcli/Makefile   (contents, props changed)
   head/net-mgmt/zabbix2-server/Makefile
   head/net-p2p/gnunet/Makefile
   head/net-p2p/gtorrentviewer/Makefile   (contents, props changed)
   head/net-p2p/jigdo/Makefile
   head/net-p2p/libbt/Makefile   (contents, props changed)
   head/net-p2p/rtorrent-devel/Makefile
   head/net-p2p/rtorrent/Makefile
   head/net-p2p/transmission-cli/Makefile
   head/net/asterisk/Makefile
   head/net/asterisk10/Makefile
   head/net/asterisk11/Makefile
   head/net/asterisk14/Makefile   (contents, props changed)
   head/net/boinc-client/Makefile
   head/net/clamz/Makefile   (contents, props changed)
   head/net/ecore-con/Makefile
   head/net/freeswitch-core-devel/Makefile
   head/net/freeswitch-core/Makefile
   head/net/libcmis/Makefile   (contents, props changed)
   head/net/liboauth/Makefile   (contents, props changed)
   head/net/linknx/Makefile   (contents, props changed)
   head/net/mediatomb/Makefile
   head/net/nepenthes/Makefile   (contents, props changed)
   head/net/opennx/Makefile
   head/net/wmlj/Makefile   (contents, props changed)
   head/net/xmlrpc-c-devel/Makefile
   head/net/xmlrpc-c/Makefile   (contents, props changed)
   head/polish/sms2/Makefile   (contents, props changed)
   head/ports-mgmt/fbsdmon/Makefile
   head/ports-mgmt/prhistory/Makefile
   head/print/foomatic-db/Makefile   (contents, props changed)
   head/science/netcdf4/Makefile   (contents, props changed)
   head/security/authforce/Makefile
   head/security/binwalk/Makefile
   head/security/duo/Makefile
   head/security/gnupg/Makefile
   head/security/gnupg1/Makefile
   head/security/opensaml2/Makefile
   head/security/osslsigncode/Makefile   (contents, props changed)
   head/security/p5-Net-SAML/Makefile   (contents, props changed)
   head/security/razorback-api/Makefile   (contents, props changed)
   head/security/squidclamav/Makefile   (contents, props changed)
   head/security/strongswan/Makefile   (contents, props changed)
   head/security/ykclient/Makefile
   head/security/zxid/Makefile   (contents, props changed)
   head/sysutils/afflib/Makefile
   head/sysutils/apt/Makefile
   head/sysutils/ckl/Makefile   (contents, props changed)
   head/sysutils/condor/Makefile
   head/sysutils/conky/Makefile
   head/sysutils/fusefs-curlftpfs/Makefile
   head/sysutils/fusefs-s3fs/Makefile
   head/sysutils/heartbeat/Makefile
   head/sysutils/pacman/Makefile
   head/sysutils/powerman/Makefile   (contents, props changed)
   head/textproc/libkolabxml/Makefile
   head/textproc/liblrdf/Makefile
   head/textproc/libmrss/Makefile   (contents, props changed)
   head/textproc/libnxml/Makefile   (contents, props changed)
   head/textproc/raptor/Makefile   (contents, props changed)
   head/textproc/raptor2/Makefile
   head/textproc/rss2html/Makefile   (contents, props changed)
   head/textproc/zorba/Makefile
   head/www/cas/Makefile
   head/www/castget/Makefile   (contents, props changed)
   head/www/cplanet/Makefile   (contents, props changed)
   head/www/flickcurl/Makefile
   head/www/gecko-mediaplayer/Makefile
   head/www/mod_auth_cas/Makefile
   head/www/mod_auth_mellon/Makefile   (contents, props changed)
   head/www/mod_flickr/Makefile   (contents, props changed)
   head/www/mod_security/Makefile
   head/www/netsurf/Makefile
   head/www/newsbeuter/Makefile
   head/www/nspluginwrapper/Makefile
   head/www/openvrml/Makefile
   head/www/p5-WWW-Curl/Makefile   (contents, props changed)
   head/www/pecl-http/Makefile
   head/www/pecl-solr/Makefile
   head/www/rubygem-passenger/Makefile
   head/www/rubygem-typhoeus/Makefile   (contents, props changed)
   head/www/thundercache/Makefile   (contents, props changed)
   head/www/thundersnarf/Makefile   (contents, props changed)
   head/www/webkit-gtk2/Makefile
   head/www/webkit-gtk3/Makefile
   head/www/wsdlpull/Makefile   (contents, props changed)
   head/www/xshttpd-devel/Makefile   (contents, props changed)
   head/www/xshttpd/Makefile   (contents, props changed)
   head/x11-wm/ede/Makefile
 
 Modified: head/archivers/epkg/Makefile
 ==============================================================================
 --- head/archivers/epkg/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/archivers/epkg/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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
 
 Modified: head/astro/foxtrotgps/Makefile
 ==============================================================================
 --- head/astro/foxtrotgps/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/astro/foxtrotgps/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -3,7 +3,7 @@
  
  PORTNAME=	foxtrotgps
  PORTVERSION=	1.1.1
 -PORTREVISION=	3
 +PORTREVISION=	4
  CATEGORIES=	astro geography
  MASTER_SITES=	http://www.foxtrotgps.org/releases/
  
 
 Modified: head/astro/viking/Makefile
 ==============================================================================
 --- head/astro/viking/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/astro/viking/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -3,6 +3,7 @@
  
  PORTNAME=	viking
  PORTVERSION=	1.4.1
 +PORTREVISION=	1
  CATEGORIES=	astro
  MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/
  
 
 Modified: head/audio/amarok-kde4/Makefile
 ==============================================================================
 --- head/audio/amarok-kde4/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/audio/amarok-kde4/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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
 
 Modified: head/audio/ario/Makefile
 ==============================================================================
 --- head/audio/ario/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/audio/ario/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -3,7 +3,7 @@
  
  PORTNAME=	ario
  PORTVERSION=	1.5.1
 -PORTREVISION=	5
 +PORTREVISION=	6
  CATEGORIES=	audio
  MASTER_SITES=	SF/ario-player/ario-player/${PORTVERSION}
  
 
 Modified: head/audio/deadbeef/Makefile
 ==============================================================================
 --- head/audio/deadbeef/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/audio/deadbeef/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -3,7 +3,7 @@
  
  PORTNAME=	deadbeef
  PORTVERSION=	0.5.5
 -PORTREVISION=	2
 +PORTREVISION=	3
  CATEGORIES=	audio
  MASTER_SITES=	SF/${PORTNAME}
  
 
 Modified: head/audio/fplib/Makefile
 ==============================================================================
 --- head/audio/fplib/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/audio/fplib/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -3,6 +3,7 @@
  
  PORTNAME=	fplib
  PORTVERSION=	20120911
 +PORTREVISION=	1
  CATEGORIES=	audio
  MASTER_SITES=	LOCAL/sunpoet
  
 
 Modified: head/audio/gbemol/Makefile
 ==============================================================================
 --- head/audio/gbemol/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/audio/gbemol/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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
 
 Modified: head/audio/gogglesmm/Makefile
 ==============================================================================
 --- head/audio/gogglesmm/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/audio/gogglesmm/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -3,7 +3,7 @@
  
  PORTNAME=	gogglesmm
  PORTVERSION=	0.12.7
 -PORTREVISION=	2
 +PORTREVISION=	3
  CATEGORIES=	audio
  MASTER_SITES=	GOOGLE_CODE
  
 
 Modified: head/audio/grip/Makefile
 ==============================================================================
 --- head/audio/grip/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/audio/grip/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -4,7 +4,7 @@
  
  PORTNAME=	grip
  PORTVERSION=	3.3.1
 -PORTREVISION=	5
 +PORTREVISION=	6
  CATEGORIES=	audio
  MASTER_SITES=	SF
  
 
 Modified: head/audio/gtkpod/Makefile
 ==============================================================================
 --- head/audio/gtkpod/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/audio/gtkpod/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -3,7 +3,7 @@
  
  PORTNAME=	gtkpod
  PORTVERSION=	1.0.0
 -PORTREVISION=	3
 +PORTREVISION=	4
  CATEGORIES=	audio
  MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
  
 
 Modified: head/audio/herrie/Makefile
 ==============================================================================
 --- head/audio/herrie/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/audio/herrie/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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/
 
 Modified: head/audio/icecast2/Makefile
 ==============================================================================
 --- head/audio/icecast2/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/audio/icecast2/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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/ \
 
 Modified: head/audio/libofa/Makefile
 ==============================================================================
 --- head/audio/libofa/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/audio/libofa/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -7,7 +7,7 @@
  
  PORTNAME=	libofa
  PORTVERSION=	0.9.3
 -PORTREVISION=	7
 +PORTREVISION=	8
  CATEGORIES=	audio
  MASTER_SITES=	GOOGLE_CODE
  
 
 Modified: head/audio/linnya/Makefile
 ==============================================================================
 --- head/audio/linnya/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/audio/linnya/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -2,6 +2,7 @@
  
  PORTNAME=	linnya
  PORTVERSION=	2.3.0
 +PORTREVISION=	1
  CATEGORIES=	audio
  
  MAINTAINER=	ghw@7axu.com
 
 Modified: head/audio/moc/Makefile
 ==============================================================================
 --- head/audio/moc/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/audio/moc/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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
 
 Modified: head/audio/mpdas/Makefile
 ==============================================================================
 --- head/audio/mpdas/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/audio/mpdas/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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
 
 Modified: head/audio/mpdscribble/Makefile
 ==============================================================================
 --- head/audio/mpdscribble/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/audio/mpdscribble/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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 libcur
  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
  
 
 Modified: head/audio/musicpd/Makefile
 ==============================================================================
 --- head/audio/musicpd/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/audio/musicpd/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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
  
 
 Modified: head/audio/ncmpcpp/Makefile
 ==============================================================================
 --- head/audio/ncmpcpp/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/audio/ncmpcpp/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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
 
 Modified: head/audio/osd-lyrics/Makefile
 ==============================================================================
 --- head/audio/osd-lyrics/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/audio/osd-lyrics/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -3,6 +3,7 @@
  
  PORTNAME=	osdlyrics
  PORTVERSION=	0.4.3
 +PORTREVISION=	1
  CATEGORIES=	audio deskutils
  MASTER_SITES=	GOOGLE_CODE
  PROJECTHOST=	osd-lyrics
 
 Modified: head/audio/rosegarden/Makefile
 ==============================================================================
 --- head/audio/rosegarden/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/audio/rosegarden/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -3,6 +3,7 @@
  
  PORTNAME=	rosegarden
  PORTVERSION=	13.04
 +PORTREVISION=	1
  CATEGORIES=	audio
  MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/
  
 
 Modified: head/audio/scmpc/Makefile
 ==============================================================================
 --- head/audio/scmpc/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/audio/scmpc/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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 MP
  LICENSE=	GPLv2
  
  LIB_DEPENDS=	confuse.0:${PORTSDIR}/devel/libconfuse \
 -		curl.6:${PORTSDIR}/ftp/curl
 +		curl:${PORTSDIR}/ftp/curl
  
  USES=		pkgconfig
  USE_BZIP2=	yes
 
 Modified: head/audio/scrobbler/Makefile
 ==============================================================================
 --- head/audio/scrobbler/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/audio/scrobbler/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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]*
 
 Modified: head/audio/streamtranscoder/Makefile
 ==============================================================================
 --- head/audio/streamtranscoder/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/audio/streamtranscoder/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -7,7 +7,7 @@
  
  PORTNAME=	streamtranscoder
  PORTVERSION=	1.2.8
 -PORTREVISION=	9
 +PORTREVISION=	10
  CATEGORIES=	audio
  MASTER_SITES=	http://www.oddsock.org/tools/streamTranscoder/
  
 
 Modified: head/audio/streamtuner/Makefile
 ==============================================================================
 --- head/audio/streamtuner/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/audio/streamtuner/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -3,7 +3,7 @@
  
  PORTNAME=	streamtuner
  PORTVERSION=	0.99.99
 -PORTREVISION=	19
 +PORTREVISION=	20
  CATEGORIES=	audio www
  MASTER_SITES=	SAVANNAH
  MASTER_SITE_SUBDIR=	${PORTNAME}
 
 Modified: head/audio/vagalume/Makefile
 ==============================================================================
 --- head/audio/vagalume/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/audio/vagalume/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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
 
 Modified: head/audio/vorbis-tools/Makefile
 ==============================================================================
 --- head/audio/vorbis-tools/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/audio/vorbis-tools/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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 \
 
 Modified: head/audio/xmms2-scrobbler/Makefile
 ==============================================================================
 --- head/audio/xmms2-scrobbler/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/audio/xmms2-scrobbler/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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 X
  LICENSE=	MIT
  
  LIB_DEPENDS=	xmmsclient.6:${PORTSDIR}/audio/xmms2 \
 -		curl.6:${PORTSDIR}/ftp/curl
 +		curl:${PORTSDIR}/ftp/curl
  
  USES=		pkgconfig
  USE_GMAKE=	yes
 
 Modified: head/audio/xmms2/Makefile
 ==============================================================================
 --- head/audio/xmms2/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/audio/xmms2/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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}
 
 Modified: head/biology/iolib/Makefile
 ==============================================================================
 --- head/biology/iolib/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/biology/iolib/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -3,6 +3,7 @@
  
  PORTNAME=	io_lib
  PORTVERSION=	1.13.0
 +PORTREVISION=	1
  CATEGORIES=	biology
  MASTER_SITES=	SF
  MASTER_SITE_SUBDIR=	staden/${PORTNAME}/${PORTVERSION}
 
 Modified: head/chinese/fcitx-cloudpinyin/Makefile
 ==============================================================================
 --- head/chinese/fcitx-cloudpinyin/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/chinese/fcitx-cloudpinyin/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -7,6 +7,7 @@
  
  PORTNAME=	fcitx-cloudpinyin
  PORTVERSION=	0.3.0
 +PORTREVISION=	1
  CATEGORIES=	chinese
  MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
  DIST_SUBDIR=	fcitx
 
 Modified: head/comms/xastir/Makefile
 ==============================================================================
 --- head/comms/xastir/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/comms/xastir/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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}
  
 
 Modified: head/converters/bibtexconv/Makefile
 ==============================================================================
 --- head/converters/bibtexconv/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/converters/bibtexconv/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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/
 
 Modified: head/databases/couchdb/Makefile
 ==============================================================================
 --- head/databases/couchdb/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/databases/couchdb/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -3,6 +3,7 @@
  
  PORTNAME=	couchdb
  PORTVERSION=	1.2.2
 +PORTREVISION=	1
  PORTEPOCH=	1
  CATEGORIES=	databases
  MASTER_SITES=	${MASTER_SITE_APACHE}
 
 Modified: head/deskutils/cairo-dock/Makefile
 ==============================================================================
 --- head/deskutils/cairo-dock/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/deskutils/cairo-dock/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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/
 
 Modified: head/deskutils/fbreader/Makefile
 ==============================================================================
 --- head/deskutils/fbreader/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/deskutils/fbreader/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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
 
 Modified: head/deskutils/google-gadgets/Makefile
 ==============================================================================
 --- head/deskutils/google-gadgets/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/deskutils/google-gadgets/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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/pkgc
  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
 
 Modified: head/deskutils/growl-for-linux/Makefile
 ==============================================================================
 --- head/deskutils/growl-for-linux/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/deskutils/growl-for-linux/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -2,7 +2,7 @@
  
  PORTNAME=	growl-for-linux
  PORTVERSION=	0.6.8
 -#PORTREVISION=	0
 +PORTREVISION=	1
  CATEGORIES=	deskutils
  
  MAINTAINER=	nivit@FreeBSD.org
 
 Modified: head/deskutils/libgcal/Makefile
 ==============================================================================
 --- head/deskutils/libgcal/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/deskutils/libgcal/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -3,6 +3,7 @@
  
  PORTNAME=	libgcal
  PORTVERSION=	0.9.6
 +PORTREVISION=	1
  CATEGORIES=	deskutils
  MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
  
 
 Modified: head/deskutils/ljit/Makefile
 ==============================================================================
 --- head/deskutils/ljit/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/deskutils/ljit/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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 us
  
  LICENSE=	GPLv2
  
 -LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl
 +LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl
  RUN_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick
  
  GNU_CONFIGURE=	yes
 
 Modified: head/deskutils/logjam/Makefile
 ==============================================================================
 --- head/deskutils/logjam/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/deskutils/logjam/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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
 
 Modified: head/deskutils/mdh/Makefile
 ==============================================================================
 --- head/deskutils/mdh/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/deskutils/mdh/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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
  .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:
 
 Modified: head/deskutils/pinot/Makefile
 ==============================================================================
 --- head/deskutils/pinot/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/deskutils/pinot/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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}/database
  		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			\
 
 Modified: head/deskutils/xfce4-tumbler/Makefile
 ==============================================================================
 --- head/deskutils/xfce4-tumbler/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/deskutils/xfce4-tumbler/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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}
 
 Modified: head/devel/aegis/Makefile
 ==============================================================================
 --- head/devel/aegis/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/devel/aegis/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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
 
 Modified: head/devel/ecore-file/Makefile
 ==============================================================================
 --- head/devel/ecore-file/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/devel/ecore-file/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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/
 
 Modified: head/devel/hs-darcs/Makefile
 ==============================================================================
 --- head/devel/hs-darcs/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/devel/hs-darcs/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -3,7 +3,7 @@
  
  PORTNAME=	darcs
  PORTVERSION=	2.8.4
 -PORTREVISION=	1
 +PORTREVISION=	2
  CATEGORIES=	devel haskell
  
  MAINTAINER=	haskell@FreeBSD.org
 
 Modified: head/devel/libdap/Makefile
 ==============================================================================
 --- head/devel/libdap/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/devel/libdap/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -3,6 +3,7 @@
  
  PORTNAME=	libdap
  PORTVERSION=	3.11.7
 +PORTREVISION=	1
  CATEGORIES=	devel
  MASTER_SITES=	http://www.opendap.org/pub/source/ \
  		LOCAL/sunpoet
 
 Modified: head/devel/libgutenfetch/Makefile
 ==============================================================================
 --- head/devel/libgutenfetch/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/devel/libgutenfetch/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -3,7 +3,7 @@
  
  PORTNAME=	libgutenfetch
  PORTVERSION=	1.2
 -PORTREVISION=	3
 +PORTREVISION=	4
  CATEGORIES=	devel
  MASTER_SITES=	SF
  
 
 Modified: head/devel/libopkele/Makefile
 ==============================================================================
 --- head/devel/libopkele/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/devel/libopkele/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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 \
 
 Modified: head/devel/libvirt/Makefile
 ==============================================================================
 --- head/devel/libvirt/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/devel/libvirt/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -3,6 +3,7 @@
  
  PORTNAME=	libvirt
  PORTVERSION=	1.1.0
 +PORTREVISION=	1
  CATEGORIES=	devel
  MASTER_SITES=	http://libvirt.org/sources/ \
  		ftp://libvirt.org/libvirt/
 
 Modified: head/devel/libwfut/Makefile
 ==============================================================================
 --- head/devel/libwfut/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/devel/libwfut/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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
 
 Modified: head/devel/mm-common/Makefile
 ==============================================================================
 --- head/devel/mm-common/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/devel/mm-common/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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
 
 Modified: head/devel/xmltooling/Makefile
 ==============================================================================
 --- head/devel/xmltooling/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/devel/xmltooling/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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
 
 Modified: head/editors/codelite/Makefile
 ==============================================================================
 --- head/editors/codelite/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/editors/codelite/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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
 
 Modified: head/editors/libreoffice/Makefile
 ==============================================================================
 --- head/editors/libreoffice/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/editors/libreoffice/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -26,7 +26,7 @@ BUILD_DEPENDS=	p5-Archive-Zip>=0:${PORTS
  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 \
 
 Modified: head/editors/morla/Makefile
 ==============================================================================
 --- head/editors/morla/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/editors/morla/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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
  
 
 Modified: head/editors/openoffice-3/Makefile
 ==============================================================================
 --- head/editors/openoffice-3/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/editors/openoffice-3/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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="${OOO
  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 \
 
 Modified: head/editors/openoffice-devel/Makefile
 ==============================================================================
 --- head/editors/openoffice-devel/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/editors/openoffice-devel/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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="${OOO
  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 \
 
 Modified: head/editors/textroom/Makefile
 ==============================================================================
 --- head/editors/textroom/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/editors/textroom/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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
 
 Modified: head/emulators/qemu-devel/Makefile
 ==============================================================================
 --- head/emulators/qemu-devel/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/emulators/qemu-devel/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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
 
 Modified: head/emulators/qemu/Makefile
 ==============================================================================
 --- head/emulators/qemu/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/emulators/qemu/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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/
 
 Modified: head/emulators/virtualbox-ose-legacy/Makefile
 ==============================================================================
 --- head/emulators/virtualbox-ose-legacy/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/emulators/virtualbox-ose-legacy/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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/ya
  		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
  
 
 Modified: head/emulators/virtualbox-ose/Makefile
 ==============================================================================
 --- head/emulators/virtualbox-ose/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/emulators/virtualbox-ose/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -27,7 +27,7 @@ BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/ya
  		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
  
 
 Modified: head/finance/libofx/Makefile
 ==============================================================================
 --- head/finance/libofx/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/finance/libofx/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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
  
 
 Modified: head/ftp/R-cran-RCurl/Makefile
 ==============================================================================
 --- head/ftp/R-cran-RCurl/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/ftp/R-cran-RCurl/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -3,7 +3,7 @@
  
  PORTNAME=	RCurl
  DISTVERSION=	1.95-4.1
 -PORTREVISION=	1
 +PORTREVISION=	2
  CATEGORIES=	ftp
  DISTNAME=	${PORTNAME}_${DISTVERSION}
  
 
 Modified: head/ftp/curl/Makefile
 ==============================================================================
 --- head/ftp/curl/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/ftp/curl/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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 fi
  
  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
 
 *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: feedback->closed 
State-Changed-By: sunpoet 
State-Changed-When: Thu Jul 11 16:38:33 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=172325 
>Unformatted:
