Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 25 Mar 2013 20:32:41 +0900
From:      Hirohisa Yamaguchi <umq@ueo.co.jp>
To:        FreeBSD-gnats-submit@freebsd.org
Cc:        sunpoet@freebsd.org, mm@freebsd.org, portmgr@freebsd.org
Subject:   ports/177369: [patch] ftp/curl update to 7.29.0
Message-ID:  <86ppynhfza.wl%umq@ueo.co.jp>
Resent-Message-ID: <201303251140.r2PBe04l016448@freefall.freebsd.org>

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

>Number:         177369
>Category:       ports
>Synopsis:       [patch] ftp/curl update to 7.29.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Mar 25 11:40:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Hirohisa Yamaguchi
>Release:        FreeBSD 8.3-RELEASE-p3 amd64
>Organization:
<organization of PR author (multiple lines)>
>Environment:
System: FreeBSD **** 8.3-RELEASE-p3 FreeBSD 8.3-RELEASE-p3 #0: Tue Jun 12 00:39:29 UTC 2012 root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC amd64

>Description:
	The new version of ftp/curl 7.29.0 is now available
	(as talked in freebsd-ports@)

	This patch is intended to supersede ports/148094,
	ports/166870, ports/169812, and ports/172325.


	1. the configure script recently introduced a sanity check on
	   CFLAGS and CPPFLAGS
	    [1] https://github.com/bagder/curl/commit/c691037517a969891592e9dbae0a6ed615041881
	    [2] https://github.com/bagder/curl/commit/9d1effad0524bcb4763e06659b728ba134464608
	   This cause `make configure` stop:
configure: using CFLAGS: -O2 -pipe -DLDAP_DEPRECATED -fno-strict-aliasing
configure: CFLAGS error: CFLAGS may only be used to specify C compiler flags, not macro definitions. Use CPPFLAGS for: -DLDAP_DEPRECATED
configure: error: Can not continue. Fix errors mentioned immediately above this line.
===>  Script "configure" failed unexpectedly.

	   `sed -e 's/CFLAGS/CPPFLAGS/' Mk/bsd.ldap.mk` worked for me,
	   so I'd like to request portmgr@ to approve it.


	2. this patch shouldn't break slave port ftp/curl-hiphop, but
	   I'm not sure.

	   The build instruction on github says:
		> Note: If you're building a version of cURL older
		> than 7.28.0 (for whatever reason), you'll need to
		> apply the patch in src/third_party to update it
		> prior to the make step.
	    [3] https://github.com/facebook/hiphop-php/wiki/Building-and-installing-HHVM-on-Ubuntu-12.10
	    [4] https://github.com/facebook/hiphop-php/wiki/Building-and-installing-HHVM-on-CentOS-6.3

	   It is 7.29.0, the MAINTAINER might want to drop extra patch.


	3. dependent ports.
	   following (113) ports have LIB_DEPENDS with SHLIB_VER
	   specified need to be updated:
	    archivers/epkg
	    audio/gbemol
	    audio/gogglesmm
	    audio/grip
	    audio/moc
	    audio/mpdas
	    audio/mpdscribble
	    audio/musicpd
	    audio/ncmpcpp
	    audio/scmpc
	    audio/scrobbler
	    audio/vagalume
	    audio/vorbis-tools
	    audio/xmms2-scrobbler
	    biology/iolib
	    deskutils/cairo-dock
	    deskutils/fbreader
	    deskutils/google-gadgets
	    deskutils/ljit
	    deskutils/logjam
	    deskutils/mdh
	    deskutils/pinot
	    devel/aegis
	    devel/libopkele
	    devel/libwfut
	    devel/mm-common
	    devel/xmltooling
	    editors/libreoffice
	    editors/morla
	    editors/openoffice-3
	    editors/openoffice-devel
	    editors/textroom
	    emulators/virtualbox-ose
	    emulators/virtualbox-ose-legacy
	    finance/libofx
	    ftp/ocaml-ocurl
	    ftp/py-curl
	    ftp/rexx-curl
	    ftp/urlgfe
	    ftp/wmget
	    games/alienarena
	    games/crossfire-server
	    games/daimonin
	    games/deng
	    games/evq3
	    games/f1spirit-remake
	    games/ioquake3
	    games/kartofel
	    games/kuklomenos
	    games/meandmyshadow
	    games/mudmagic
	    games/nexuiz
	    games/openlierox
	    games/springlobby
	    games/supertux-devel
	    games/tmw
	    games/xmoto
	    games/xonotic
	    graphics/feh
	    graphics/gimmage
	    graphics/jp2a
	    graphics/osg
	    graphics/osg-devel
	    irc/unreal
	    japanese/mozc-server
	    lang/gambas
	    lang/hiphop-php
	    lang/q
	    misc/gkrellm-helium
	    multimedia/cclive
	    net-im/centericq
	    net-im/centerim
	    net-im/centerim-devel
	    net-im/cli-msn
	    net-p2p/gtorrentviewer
	    net-p2p/libbt
	    net-p2p/rtorrent
	    net-p2p/transmission-cli
	    net/asterisk
	    net/asterisk10
	    net/asterisk11
	    net/asterisk14
	    net/clamz
	    net/linknx
	    net/mediatomb
	    net/nepenthes
	    net/pecl-oauth
	    net/wmlj
	    polish/sms2
	    print/foomatic-db
	    science/netcdf4
	    security/opensaml2
	    security/osslsigncode
	    security/razorback-api
	    sysutils/apt
	    sysutils/fusefs-curlftpfs
	    sysutils/heartbeat
	    textproc/libnxml
	    textproc/raptor
	    textproc/rss2html
	    www/castget
	    www/mod_auth_mellon
	    www/mod_flickr
	    www/netsurf
	    www/newsbeuter
	    www/nspluginwrapper
	    www/openvrml
	    www/p5-WWW-Curl
	    www/pecl-http
	    www/rubygem-passenger
	    www/thundercache
	    www/thundersnarf
	    x11-wm/ede

	   following (49) ports have either LIB_DEPENDS or
	   BUILD_DEPENDS might need revesion bump:
	    astro/viking
	    audio/amarok-kde4
	    audio/ario
	    audio/libofa
	    audio/osd-lyrics
	    audio/streamtranscoder
	    chinese/fcitx-cloudpinyin
	    comms/gpredict
	    databases/couchdb
	    deskutils/google-gadgets
	    devel/git
	    ftp/R-cran-RCurl
	    games/0ad
	    games/klavaro
	    games/pokerth
	    games/supertuxkart
	    games/ufoai
	    games/warmux
	    graphics/darktable
	    graphics/gnash
	    graphics/mapserver
	    mail/claws-mail
	    mail/dovecot2
	    mail/milter-greylist
	    mail/milter-greylist-devel
	    math/octave
	    multimedia/freetuxtv
	    multimedia/gnome-mplayer
	    multimedia/mkvtoolnix
	    multimedia/xbmc
	    multimedia/xbmc-pvr
	    net-p2p/gnunet
	    net-p2p/jigdo
	    net/pecl-oauth
	    print/foomatic-db-engine
	    science/libkml
	    security/ykclient
	    sysutils/abgx360
	    sysutils/afflib
	    sysutils/condor
	    textproc/libkolabxml
	    textproc/liblrdf
	    textproc/zorba
	    www/cplanet
	    www/gecko-mediaplayer
	    www/mod_spdy
	    www/thundercache
	    www/webkit-gtk2
	    www/webkit-gtk3


	4. Options
	   I've tested several combinations of option, and they looks
	   okay.

	   --with-gssapi failed on some environments (where
	   security/krb5 is present), --with-gssapi-includes and
	   --with-gssapi-libs lead it work

	   Check for SSL (found in ports/172325) just didn't work


>How-To-Repeat:
	N/A
>Fix:

	The patch follows:
	  - renaming ftp/curl/files/patch-lib::url.c (as in ports/172325)
	    would be better, kept old name as is to make patch simple
	  - Mk/bsd.ldap.mk needs modification, as mentioned above

Index: ftp/curl/Makefile
===================================================================
--- ftp/curl/Makefile	(revision 315212)
+++ ftp/curl/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=	2
+PORTVERSION=	7.29.0
 CATEGORIES=	ftp ipv6 www
 MASTER_SITES=	http://curl.haxx.se/download/ \
 		LOCAL/sunpoet
@@ -18,21 +13,15 @@
 
 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
+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 +41,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,46 +54,46 @@
 		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}"
+PLIST_SUB+=	SHLIB_VER="${SHLIB_VER}"
+PORTDOCS=	*
+PORTEXAMPLES=	*
 
-SHLIB_VER=	6
+SHLIB_VER=	7
 .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)
+.if ${PORT_OPTIONS:MLIBSSH2} && empty(PORT_OPTIONS:MOPENSSL)
 IGNORE=		only supports LIBSSH2 with OpenSSL
 .endif
 
-.if defined(WITH_NTLM) && !defined(WITH_OPENSSL)
+.if ${PORT_OPTIONS:MNTLM} && empty(PORT_OPTIONS:MOPENSSL)
 IGNORE=		only supports NTLM with OpenSSL
 .endif
 
-.if defined(WITH_LDAPS)
-.if !defined(WITH_LDAP)
+.if ${PORT_OPTIONS:MLDAPS}
+.if empty(PORT_OPTIONS:MLDAP)
 IGNORE=		only supports LDAPS with LDAP
-.else
-.if !defined(WITH_OPENSSL) && !defined(WITH_GNUTLS)
-IGNORE=		only supports LDAPS with SSL (OpenSSL or GNUTLS)
+.elif empty(PORT_OPTIONS:MOPENSSL) && empty(PORT_OPTIONS:MGNUTLS)
+IGNORE=		only supports LDAPS with SSL (OpenSSL or GnuTLS)
 .endif
 .endif
-.endif
 
-.if !defined(WITHOUT_OPENSSL)
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+.if ${PORT_OPTIONS:MOPENSSL}
 CONFIGURE_ARGS+=	--with-ssl=${OPENSSLBASE}
-.if !defined(WITHOUT_CA_BUNDLE)
+USE_OPENSSL=		yes
+.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
 .else
@@ -112,49 +101,53 @@
 .endif
 .else
 CONFIGURE_ARGS+=	--without-ssl
-.if defined(WITH_CA_BUNDLE)
-IGNORE=			only supports CA bundle with OpenSSL
 .endif
-.endif
 
-.if defined(WITH_CARES)
-LIB_DEPENDS+=	cares.2:${PORTSDIR}/dns/c-ares
+.if ${PORT_OPTIONS:MCARES}
+LIB_DEPENDS+=	cares:${PORTSDIR}/dns/c-ares
 CONFIGURE_ARGS+=	--enable-ares=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--disable-ares
 .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)
+.if ${PORT_OPTIONS:MOPENSSL} || ${PORT_OPTIONS:MGNUTLS}
 PLIST_SUB+=	SSL=""
 .else
 PLIST_SUB+=	SSL="@comment "
 .endif
 
-.if defined(WITH_IPV6)
+.if ${PORT_OPTIONS:MGSSAPI}
+CONFIGURE_ARGS+=	--with-gssapi-includes=/usr/include \
+			--with-gssapi-libs=/usr/lib
+.else
+CONFIGURE_ARGS+=	--without-gssapi
+.endif
+
+.if ${PORT_OPTIONS:MIPV6}
 CONFIGURE_ARGS+=	--enable-ipv6
 .else
 CONFIGURE_ARGS+=	--disable-ipv6
 .endif
 
-.if exists(/usr/lib/libkrb.a) && defined(WITH_KERBEROS4)
+.if ${PORT_OPTIONS:MKERBEROS4} && exists(/usr/lib/libkrb.a)
 CONFIGURE_ARGS += --with-krb4=/usr
 .else
 CONFIGURE_ARGS += --without-krb4
 .endif
 
-.if defined(WITH_LDAP)
+.if ${PORT_OPTIONS:MLDAP}
 CONFIGURE_ARGS+=	--enable-ldap
 USE_OPENLDAP=	yes
-CFLAGS+=	-I${LOCALBASE}/include
+CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-.if defined(WITH_LDAPS)
+.if ${PORT_OPTIONS:MLDAPS}
 CONFIGURE_ARGS+=	--enable-ldaps
 .else
 CONFIGURE_ARGS+=	--disable-ldaps
@@ -163,44 +156,44 @@
 CONFIGURE_ARGS+=	--disable-ldap --disable-ldaps
 .endif
 
-.if defined(WITH_LIBIDN)
-LIB_DEPENDS+=	idn.17:${PORTSDIR}/dns/libidn
+.if ${PORT_OPTIONS:MIDN}
+LIB_DEPENDS+=	idn:${PORTSDIR}/dns/libidn
 CONFIGURE_ARGS+=	--with-libidn=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--without-libidn
 .endif
 
-.if defined(WITH_LIBSSH2)
-LIB_DEPENDS+=	ssh2.1:${PORTSDIR}/security/libssh2
+.if ${PORT_OPTIONS:MLIBSSH2}
+LIB_DEPENDS+=	ssh2:${PORTSDIR}/security/libssh2
 CONFIGURE_ARGS+=	--with-libssh2=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--without-libssh2
 .endif
 
-.if defined(WITH_CURL_DEBUG)
+.if ${PORT_OPTIONS:MCURL_DEBUG}
 CONFIGURE_ARGS+=	--enable-debug
 .endif
 
-.if defined(WITH_RTMP)
-LIB_DEPENDS+=	rtmp.0:${PORTSDIR}/multimedia/rtmpdump
+.if ${PORT_OPTIONS:MRTMP}
+LIB_DEPENDS+=	rtmp:${PORTSDIR}/multimedia/rtmpdump
 CONFIGURE_ARGS+=	--with-librtmp=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--without-librtmp
 .endif
 
-.if defined(WITH_TRACKMEMORY)
+.if ${PORT_OPTIONS:MTRACKMEMORY}
 CONFIGURE_ARGS+=	--enable-curldebug
 .else
 CONFIGURE_ARGS+=	--disable-curldebug
 .endif
 
-.if defined(WITH_NTLM)
+.if ${PORT_OPTIONS:MNTLM}
 CONFIGURE_ARGS+=	--enable-ntlm
 .else
 CONFIGURE_ARGS+=	--disable-ntlm
 .endif
 
-.if !defined(WITHOUT_PROXY)
+.if ${PORT_OPTIONS:MPROXY}
 CONFIGURE_ARGS+=	--enable-proxy
 .else
 CONFIGURE_ARGS+=	--disable-proxy
@@ -212,28 +205,28 @@
 
 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}/
+	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 defined(WITHOUT_PROXY)
+regression-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: ftp/curl/distinfo
===================================================================
--- ftp/curl/distinfo	(revision 315212)
+++ ftp/curl/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.29.0.tar.lzma) = 4ae953ef144bc6cb7c8c0a054ce80f93ea174318cf9b18a2e2cc3cbf062d9b21
+SIZE (curl-7.29.0.tar.lzma) = 2100412
Index: ftp/curl/files/patch-configure
===================================================================
--- ftp/curl/files/patch-configure	(revision 315212)
+++ ftp/curl/files/patch-configure	(working copy)
@@ -8,20 +8,7 @@
 
 --- 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 @@
+@@ -16651,6 +16651,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 @@
+@@ -16681,6 +16684,7 @@
    done
      tmp_CPPFLAGS="$ac_var_stripped"
    squeeze tmp_CPPFLAGS
@@ -39,7 +26,7 @@
  
      #
      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 @@
      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,7 +44,7 @@
  
        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
  
@@ -67,7 +54,7 @@
      { $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"
@@ -92,13 +79,13 @@
 -
    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
Index: ftp/curl/files/patch-lib::url.c
===================================================================
--- ftp/curl/files/patch-lib::url.c	(revision 315212)
+++ ftp/curl/files/patch-lib::url.c	(working copy)
@@ -5,7 +5,7 @@
 
 --- 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 @@
+@@ -610,6 +610,10 @@
      data->progress.flags |= PGRS_HIDE;
      data->state.current_speed = -1; /* init to negative == impossible */
  
Index: ftp/curl/files/patch-src-tool_operate.c
===================================================================
--- ftp/curl/files/patch-src-tool_operate.c	(revision 315212)
+++ ftp/curl/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 @@
+@@ -649,22 +649,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 @@
+@@ -672,6 +660,19 @@
              }
              outs.fopened = TRUE;
              outs.stream = file;
Index: ftp/curl/pkg-plist
===================================================================
--- ftp/curl/pkg-plist	(revision 315212)
+++ ftp/curl/pkg-plist	(working copy)
@@ -10,208 +10,9 @@
 include/curl/stdcheaders.h
 include/curl/typecheck-gcc.h
 share/aclocal/libcurl.m4
-@dirrm include/curl
 lib/libcurl.a
 lib/libcurl.la
 lib/libcurl.so
 lib/libcurl.so.%%SHLIB_VER%%
 libdata/pkgconfig/libcurl.pc
-%%PORTDOCS%%%%DOCSDIR%%/BINDINGS
-%%PORTDOCS%%%%DOCSDIR%%/BUGS
-%%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTE
-%%PORTDOCS%%%%DOCSDIR%%/DISTRO-DILEMMA
-%%PORTDOCS%%%%DOCSDIR%%/FAQ
-%%PORTDOCS%%%%DOCSDIR%%/FEATURES
-%%PORTDOCS%%%%DOCSDIR%%/HISTORY
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL.devcpp
-%%PORTDOCS%%%%DOCSDIR%%/INTERNALS
-%%PORTDOCS%%%%DOCSDIR%%/KNOWN_BUGS
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE-MIXING
-%%PORTDOCS%%%%DOCSDIR%%/MANUAL
-%%PORTDOCS%%%%DOCSDIR%%/README.netware
-%%PORTDOCS%%%%DOCSDIR%%/README.win32
-%%PORTDOCS%%%%DOCSDIR%%/RESOURCES
-%%PORTDOCS%%%%DOCSDIR%%/SSLCERTS
-%%PORTDOCS%%%%DOCSDIR%%/THANKS
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/TheArtOfHttpScripting
-%%PORTDOCS%%%%DOCSDIR%%/VERSIONS
-%%PORTDOCS%%%%DOCSDIR%%/curl-config.html
-%%PORTDOCS%%%%DOCSDIR%%/curl-config.pdf
-%%PORTDOCS%%%%DOCSDIR%%/curl.html
-%%PORTDOCS%%%%DOCSDIR%%/curl.pdf
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/ABI
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_cleanup.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_cleanup.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_duphandle.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_duphandle.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_escape.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_escape.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_getinfo.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_getinfo.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_init.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_init.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_pause.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_pause.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_perform.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_perform.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_recv.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_recv.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_reset.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_reset.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_send.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_send.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_setopt.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_setopt.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_strerror.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_strerror.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_unescape.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_unescape.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_escape.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_escape.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_formadd.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_formadd.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_formfree.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_formfree.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_formget.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_formget.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_free.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_free.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_getdate.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_getdate.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_getenv.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_getenv.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_global_cleanup.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_global_cleanup.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_global_init.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_global_init.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_global_init_mem.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_global_init_mem.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_mprintf.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_mprintf.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_add_handle.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_add_handle.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_assign.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_assign.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_cleanup.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_cleanup.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_fdset.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_fdset.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_info_read.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_info_read.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_init.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_init.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_perform.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_perform.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_remove_handle.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_remove_handle.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_setopt.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_setopt.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_socket.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_socket.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_socket_action.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_socket_action.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_strerror.html
-%%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_share_cleanup.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_cleanup.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_init.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_init.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_setopt.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_setopt.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_strerror.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_strerror.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_slist_append.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_slist_append.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_slist_free_all.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_slist_free_all.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_strequal.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_strequal.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_unescape.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_unescape.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_version.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_version.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_version_info.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_version_info.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/index.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-easy.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-easy.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-errors.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-errors.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-multi.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-multi.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-share.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-share.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-tutorial.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-tutorial.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl.m4
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl.pdf
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/libcurl
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/10-at-a-time.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile.example
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/anyauthput.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cacertinmem.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/certinfo.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/chkspeed.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cookie_interface.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/curlgtk.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/curlx.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/debug.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/evhiperfifo.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/externalsocket.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fileupload.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fopen.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ftp-wildcard.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ftpget.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ftpgetinfo.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ftpgetresp.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%%/htmltidy.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/htmltitle.cc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/http-post.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/httpcustomheader.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/httpput.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/https.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/imap.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/makefile.dj
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/multi-app.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/multi-debugcallback.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/multi-double.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/multi-post.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/multi-single.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/multithread.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/opensslthreadlock.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/persistant.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pop3s.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pop3slist.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/post-callback.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/postit2.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/progressfunc.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/resolve.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rtsp.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sampleconv.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sepheaders.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sendrecv.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simple.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplepost.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplesmtp.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplessl.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/smooth-gtk-thread.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/smtp-multi.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/smtp-tls.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/synctime.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/threaded-ssl.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/url2file.c
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+@dirrm include/curl
Index: Mk/bsd.ldap.mk
===================================================================
--- Mk/bsd.ldap.mk	(revision 315212)
+++ Mk/bsd.ldap.mk	(working copy)
@@ -64,7 +64,7 @@
 .endif
 .endif
 
-CFLAGS+=	-DLDAP_DEPRECATED
+CPPFLAGS+=	-DLDAP_DEPRECATED
 
 _OPENLDAP_CLIENT_PKG!=	${PKG_INFO} -Ex openldap.\*-client 2>/dev/null || ${TRUE}
 _OPENLDAP_FLAVOUR=	${_OPENLDAP_CLIENT_PKG:C/openldap//:C/-client-.*//}

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?86ppynhfza.wl%umq>