Date: Sat, 28 Mar 2015 11:13:16 +0000 (UTC) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r382459 - head/ftp/curl Message-ID: <201503281113.t2SBDGSt074675@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sunpoet Date: Sat Mar 28 11:13:15 2015 New Revision: 382459 URL: https://svnweb.freebsd.org/changeset/ports/382459 QAT: https://qat.redports.org/buildarchive/r382459/ Log: - Use USES=gssapi - Adjust options: - Change GSSAPI from radio to single - Rename HEIMDAL_PORT to GSSAPI_HEIMDAL - Rename KRB5_PORT to GSSAPI_MIT - Add GSSAPI_NONE Modified: head/ftp/curl/Makefile Modified: head/ftp/curl/Makefile ============================================================================== --- head/ftp/curl/Makefile Sat Mar 28 10:51:13 2015 (r382458) +++ head/ftp/curl/Makefile Sat Mar 28 11:13:15 2015 (r382459) @@ -13,17 +13,19 @@ COMMENT?= Non-interactive tool to get fi LICENSE= MIT 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 SSL +OPTIONS_SINGLE= GSSAPI OPTIONS_RADIO_RESOLV= CARES THREADED_RESOLVER OPTIONS_RADIO_SSL= GNUTLS NSS OPENSSL POLARSSL +OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE 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 +GSSAPI_HEIMDAL_DESC= GSSAPI support via security/heimdal +GSSAPI_MIT_DESC= GSSAPI support via security/krb5 +GSSAPI_NONE_DESC= Disable GSSAPI support LIBSSH2_DESC= SCP/SFTP support via libssh2 RESOLV_DESC= DNS resolving options THREADED_RESOLVER_DESC= Threaded DNS resolver @@ -59,9 +61,6 @@ DOCS= BINDINGS BUGS CONTRIBUTE DISTRO-D SLAVEDIRS= ftp/curl-hiphop -HEIMDAL_HOME?= ${PREFIX} -KRB5_HOME?= ${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 @@ -77,12 +76,22 @@ DEBUG_CONFIGURE_ON= --enable-debug GNUTLS_CONFIGURE_OFF= --without-gnutls GNUTLS_CONFIGURE_ON= --with-gnutls=${LOCALBASE} 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 +GSSAPI_BASE_CONFIGURE_ON= --with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS} +GSSAPI_BASE_CPPFLAGS= ${GSSAPICPPFLAGS} +GSSAPI_BASE_LDFLAGS= ${GSSAPILDFLAGS} +GSSAPI_BASE_LIBS= ${GSSAPILIBS} +GSSAPI_BASE_USES= gssapi +GSSAPI_HEIMDAL_CONFIGURE_ON= --with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS} +GSSAPI_HEIMDAL_CPPFLAGS=${GSSAPICPPFLAGS} +GSSAPI_HEIMDAL_LDFLAGS= ${GSSAPILDFLAGS} +GSSAPI_HEIMDAL_LIBS= ${GSSAPILIBS} +GSSAPI_HEIMDAL_USES= gssapi:heimdal +GSSAPI_MIT_CONFIGURE_ON= --with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS} +GSSAPI_MIT_CPPFLAGS= ${GSSAPICPPFLAGS} +GSSAPI_MIT_LDFLAGS= ${GSSAPILDFLAGS} +GSSAPI_MIT_LIBS= ${GSSAPILIBS} +GSSAPI_MIT_USES= gssapi:mit +GSSAPI_NONE_CONFIGURE_ON= --without-gssapi HTTP2_BUILD_DEPENDS= nghttp2>=0.6.0:${PORTSDIR}/www/nghttp2 HTTP2_CONFIGURE_OFF= --without-nghttp2 HTTP2_CONFIGURE_ON= --with-nghttp2=${LOCALBASE} @@ -95,10 +104,6 @@ IDN_LIB_DEPENDS= libidn.so:${PORTSDIR}/d 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 @@ -153,10 +158,6 @@ IGNORE= only supports LDAPS with SSL 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 '/^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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503281113.t2SBDGSt074675>