[Midnightbsd-cvs] mports [17646] trunk/ftp/curl: curl 7.38.0

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sun Sep 28 19:00:24 EDT 2014 

Revision: 17646
          http://svnweb.midnightbsd.org/mports/?rev=17646
Author:   laffer1
Date:     2014-09-28 19:00:21 -0400 (Sun, 28 Sep 2014)
Log Message:
-----------
curl 7.38.0

Modified Paths:
--------------
    trunk/ftp/curl/Makefile
    trunk/ftp/curl/distinfo

Modified: trunk/ftp/curl/Makefile
===================================================================
--- trunk/ftp/curl/Makefile	2014-09-28 22:56:38 UTC (rev 17645)
+++ trunk/ftp/curl/Makefile	2014-09-28 23:00:21 UTC (rev 17646)
@@ -1,12 +1,10 @@
 # $MidnightBSD$
 
 PORTNAME=	curl
-PORTVERSION=	7.37.1
-PORTREVISION=	1
+PORTVERSION=	7.38.0
 CATEGORIES=	ftp www
 MASTER_SITES=	http://curl.haxx.se/download/ \
 		FREEBSD_LOCAL/sunpoet
-EXTRACT_SUFX=	.tar.lzma
 
 MAINTAINER?=	ports at MidnightBSD.org
 COMMENT?=	Non-interactive tool to get files from FTP, GOPHER, HTTP(S) servers
@@ -13,17 +11,20 @@
 
 LICENSE=	mit
 
-OPTIONS_DEFINE=	CA_BUNDLE COOKIES CURL_DEBUG DEBUG DOCS EXAMPLES GSSAPI IDN IPV6 LDAP LDAPS LIBSSH2 PROXY RTMP SPNEGO TLS_SRP
-OPTIONS_RADIO=	RESOLV SSL
+OPTIONS_DEFINE=	CA_BUNDLE COOKIES CURL_DEBUG DEBUG DOCS EXAMPLES HTTP2 IDN IPV6 LDAP LDAPS LIBSSH2 PROXY RTMP TLS_SRP
+OPTIONS_RADIO=	GSSAPI RESOLV SSL
+OPTIONS_RADIO_GSSAPI=	GSSAPI_BASE HEIMDAL_PORT KRB5_PORT
 OPTIONS_RADIO_RESOLV=	CARES THREADED_RESOLVER
 OPTIONS_RADIO_SSL=	CYASSL GNUTLS NSS OPENSSL POLARSSL
-OPTIONS_DEFAULT=CA_BUNDLE COOKIES GSSAPI IPV6 OPENSSL PROXY RESOLV THREADED_RESOLVER SSL TLS_SRP
+OPTIONS_DEFAULT=CA_BUNDLE COOKIES GSSAPI_BASE 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
+GSSAPI_BASE_DESC=	GSSAPI support via base system
+HEIMDAL_PORT_DESC=	GSSAPI support via security/heimdal
+KRB5_PORT_DESC=	GSSAPI support via security/krb5
 LIBSSH2_DESC=	SCP/SFTP support via libssh2
 RESOLV_DESC=	DNS resolving options
-SPNEGO_DESC=	SPNEGO (RFC 4178) support
 THREADED_RESOLVER_DESC=	Threaded DNS resolver
 TLS_SRP_DESC=	TLS-SRP (Secure Remote Password) support
 
@@ -36,27 +37,36 @@
 USE_PERL5=	build
 USES=		libtool:oldver pathfix perl5 tar:lzma
 
+.if !defined(BUILDING_HIPHOP)
+USE_LDCONFIG=	yes
+USES+=		cpe
+
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
-.if !defined(BUILDING_HIPHOP)
-USE_LDCONFIG=	yes
+CPE_VENDOR=	haxx
 
 DOCS=		BINDINGS BUGS CONTRIBUTE DISTRO-DILEMMA FAQ FEATURES HISTORY \
-		INSTALL INSTALL.devcpp INTERNALS KNOWN_BUGS LICENSE-MIXING \
-		MANUAL README.netware README.win32 RESOURCES SSLCERTS THANKS \
-		TODO TheArtOfHttpScripting VERSIONS curl-config.html \
-		curl-config.pdf curl.html curl.pdf index.html
+		HTTP-COOKIES INSTALL INSTALL.devcpp INTERNALS KNOWN_BUGS \
+		LIBCURL-STRUCTS LICENSE-MIXING MAIL-ETIQUETTE MANUAL \
+		README.netware README.win32 RELEASE-PROCEDURE RESOURCES \
+		SECURITY SSL-PROBLEMS SSLCERTS THANKS TODO \
+		TheArtOfHttpScripting VERSIONS curl-config.html \
+		curl-config.pdf curl.html curl.pdf index.html \
+		mk-ca-bundle.html mk-ca-bundle.pdf
 .endif
 
 SLAVEDIRS=	ftp/curl-hiphop
 
+HEIMDAL_HOME?=	${TRUE_PREFIX}
+KRB5_HOME?=	${TRUE_PREFIX}
+
 CA_BUNDLE_CONFIGURE_OFF=--without-ca-bundle
 CA_BUNDLE_CONFIGURE_ON=	--with-ca-bundle=${LOCALBASE}/share/certs/ca-root-nss.crt
 CA_BUNDLE_RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
 CARES_CONFIGURE_OFF=	--disable-ares
 CARES_CONFIGURE_ON=	--enable-ares=${LOCALBASE}
-CARES_LIB_DEPENDS=	cares:${PORTSDIR}/dns/c-ares
+CARES_LIB_DEPENDS=	libcares.so:${PORTSDIR}/dns/c-ares
 COOKIES_CONFIGURE_OFF=	--disable-cookies
 COOKIES_CONFIGURE_ON=	--enable-cookies
 CURL_DEBUG_CONFIGURE_OFF=	--disable-curldebug
@@ -63,20 +73,34 @@
 CURL_DEBUG_CONFIGURE_ON=--enable-curldebug
 CYASSL_CONFIGURE_OFF=	--without-cyassl
 CYASSL_CONFIGURE_ON=	--with-cyassl=${LOCALBASE}
-CYASSL_LIB_DEPENDS=	cyassl:${PORTSDIR}/security/yassl
+CYASSL_LIB_DEPENDS=	libcyassl.so:${PORTSDIR}/security/yassl
 DEBUG_CONFIGURE_OFF=	--disable-debug
 DEBUG_CONFIGURE_ON=	--enable-debug
 GNUTLS_CONFIGURE_OFF=	--without-gnutls
 GNUTLS_CONFIGURE_ON=	--with-gnutls=${LOCALBASE}
-GNUTLS_LIB_DEPENDS=	gnutls:${PORTSDIR}/security/gnutls
-GSSAPI_CONFIGURE_OFF=	--without-gssapi
-GSSAPI_CONFIGURE_ON=	--with-gssapi=/usr
-GSSAPI_CPPFLAGS=	-I${INCLUDEDIR}/gssapi
+GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
+GSSAPI_BASE_CONFIGURE_ON=	--with-gssapi=/usr
+GSSAPI_BASE_CPPFLAGS=	-I${INCLUDEDIR}
+HEIMDAL_PORT_CONFIGURE_ON=	--with-gssapi=${HEIMDAL_HOME}
+HEIMDAL_PORT_CPPFLAGS=	-I${HEIMDAL_HOME}/include
+HEIMDAL_PORT_LDFLAGS=	-L${HEIMDAL_HOME}/lib
+HEIMDAL_PORT_LIB_DEPENDS=	libgssapi.so.3:${PORTSDIR}/security/heimdal
+HTTP2_BUILD_DEPENDS=	nghttp2>=0.6.0:${PORTSDIR}/www/nghttp2
+HTTP2_CONFIGURE_OFF=	--without-nghttp2
+HTTP2_CONFIGURE_ON=	--with-nghttp2=${LOCALBASE}
+HTTP2_LIB_DEPENDS=	libnghttp2.so:${PORTSDIR}/www/nghttp2
+HTTP2_RUN_DEPENDS=	nghttp2>=0.6.0:${PORTSDIR}/www/nghttp2
+HTTP2_USES=		pkgconfig
 IDN_CONFIGURE_OFF=	--without-libidn
 IDN_CONFIGURE_ON=	--with-libidn=${LOCALBASE}
 IDN_LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn
+IPV6_CATEGORIES=	ipv6
 IPV6_CONFIGURE_OFF=	--disable-ipv6
 IPV6_CONFIGURE_ON=	--enable-ipv6
+KRB5_PORT_CONFIGURE_ON=	--with-gssapi=${KRB5_HOME}
+KRB5_PORT_CPPFLAGS=	-I${KRB5_HOME}/include
+KRB5_PORT_LDFLAGS=	-L${KRB5_HOME}/lib
+KRB5_PORT_LIB_DEPENDS=	libgssapi_krb5.so.2:${PORTSDIR}/security/krb5
 LDAP_CONFIGURE_OFF=	--disable-ldap
 LDAP_CONFIGURE_ON=	--enable-ldap
 LDAP_CPPFLAGS=		-I${LOCALBASE}/include
@@ -88,8 +112,9 @@
 LIBSSH2_CONFIGURE_ON=	--with-libssh2=${LOCALBASE}
 LIBSSH2_LIB_DEPENDS=	libssh2.so:${PORTSDIR}/security/libssh2
 NSS_CONFIGURE_OFF=	--without-nss
-NSS_CONFIGURE_ON=	--with-nss=${LOCALBASE}
+NSS_CONFIGURE_ON=	--with-nss=yes
 NSS_LIB_DEPENDS=	libnss3.so:${PORTSDIR}/security/nss
+NSS_USES=		pkgconfig
 OPENSSL_CONFIGURE_OFF=	--without-ssl
 OPENSSL_CONFIGURE_ON=	--with-ssl=${OPENSSLBASE}
 OPENSSL_CPPFLAGS=	-I${OPENSSLINC}
@@ -103,10 +128,6 @@
 RTMP_CONFIGURE_OFF=	--without-librtmp
 RTMP_CONFIGURE_ON=	--with-librtmp=${LOCALBASE}
 RTMP_LIB_DEPENDS=	librtmp.so:${PORTSDIR}/multimedia/librtmp
-SPNEGO_CONFIGURE_OFF=	--without-spnego
-SPNEGO_CONFIGURE_ON=	--with-spnego=${LOCALBASE}/lib
-SPNEGO_CPPFLAGS=	-I${LOCALBASE}/include/fbopenssl
-SPNEGO_LIB_DEPENDS=	libfbopenssl.so:${PORTSDIR}/security/fbopenssl
 THREADED_RESOLVER_CONFIGURE_OFF=--disable-threaded-resolver
 THREADED_RESOLVER_CONFIGURE_ON=	--enable-threaded-resolver
 TLS_SRP_CONFIGURE_OFF=	--disable-tls-srp
@@ -134,9 +155,14 @@
 IGNORE=		only supports LIBSSH2 with OpenSSL
 .endif
 
+.if !${PORT_OPTIONS:MGSSAPI_BASE} && !${PORT_OPTIONS:MHEIMDAL_PORT} && !${PORT_OPTIONS:MKRB5_PORT}
+CONFIGURE_ARGS+=--without-gssapi
+.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 's|\(flags_dbg_off=\)".*"|\1""|; s|\(flags_opt_off=\)".*"|\1""|; s|lib/pkgconfig|libdata/pkgconfig|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|include <gssapi.h>|include <gssapi/gssapi.h>|' ${WRKSRC}/lib/curl_gssapi.h ${WRKSRC}/lib/urldata.h
 
 post-install:
 .if !defined(BUILDING_HIPHOP)
@@ -148,8 +174,6 @@
 	cd ${WRKSRC}/docs/examples/ && ${INSTALL_DATA} README Makefile.example makefile* *.c *.cpp ${STAGEDIR}${EXAMPLESDIR}/
 .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.
 x-regression-test test: build
 .if !${PORT_OPTIONS:MPROXY}
 	@${ECHO_MSG} "******************************************"
@@ -158,6 +182,6 @@
 	@${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_CMD} test
 
 .include <bsd.port.mk>

Modified: trunk/ftp/curl/distinfo
===================================================================
--- trunk/ftp/curl/distinfo	2014-09-28 22:56:38 UTC (rev 17645)
+++ trunk/ftp/curl/distinfo	2014-09-28 23:00:21 UTC (rev 17646)
@@ -1,2 +1,2 @@
-SHA256 (curl-7.37.1.tar.lzma) = add81a810081a9f8009d68eecdc2f53c4504cd8368084507917371e42181ce83
-SIZE (curl-7.37.1.tar.lzma) = 2597059
+SHA256 (curl-7.38.0.tar.lzma) = 5bcf1ebe05c691866d0322d687598068e4a8707cc9bcf1bb514dc92d3fef77d5
+SIZE (curl-7.38.0.tar.lzma) = 2607254

More information about the Midnightbsd-cvs mailing list