[Midnightbsd-cvs] mports [16089] trunk/ftp/curl/Makefile: update build

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat Mar 22 19:11:13 EDT 2014


Revision: 16089
          http://svnweb.midnightbsd.org/mports/?rev=16089
Author:   laffer1
Date:     2014-03-22 19:11:12 -0400 (Sat, 22 Mar 2014)
Log Message:
-----------
update build

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

Modified: trunk/ftp/curl/Makefile
===================================================================
--- trunk/ftp/curl/Makefile	2014-03-22 23:05:52 UTC (rev 16088)
+++ trunk/ftp/curl/Makefile	2014-03-22 23:11:12 UTC (rev 16089)
@@ -2,7 +2,7 @@
 
 PORTNAME=	curl
 PORTVERSION=	7.35.0
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	ftp ipv6 www
 MASTER_SITES=	http://curl.haxx.se/download/ \
 		FREEBSD_LOCAL/sunpoet
@@ -13,11 +13,11 @@
 
 LICENSE=	mit
 
-OPTIONS_DEFINE=	CA_BUNDLE COOKIES CURL_DEBUG DEBUG DOCS EXAMPLES GSSAPI IDN IPV6 LDAP LDAPS LIBSSH2 NTLM PROXY RTMP SPNEGO TLS_SRP
+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_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
+OPTIONS_DEFAULT=CA_BUNDLE COOKIES 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
@@ -27,15 +27,19 @@
 THREADED_RESOLVER_DESC=	Threaded DNS resolver
 TLS_SRP_DESC=	TLS-SRP (Secure Remote Password) support
 
-CONFIGURE_ARGS+=--disable-threaded-resolver --disable-werror \
+CONFIGURE_ARGS+=--disable-werror \
 		--enable-imap --enable-pop3 --enable-rtsp --enable-smtp \
 		--without-axtls
-CONFIGURE_ENV=	LOCALBASE="${LOCALBASE}"
+CONFIGURE_ENV+=	LOCALBASE=${LOCALBASE}
 GNU_CONFIGURE=	yes
+MAKE_ENV+=	INSTALL_STRIP_FLAG=${STRIP}
 USE_PERL5=	build
 USE_XZ=		yes
 USES=		pathfix perl5
 
+PORTDOCS=	*
+PORTEXAMPLES=	*
+
 .if !defined(BUILDING_HIPHOP)
 USE_LDCONFIG=	yes
 
@@ -44,30 +48,72 @@
 		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
-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 \
-		curl_easy_send.3 curl_easy_setopt.3 curl_easy_strerror.3 \
-		curl_easy_unescape.3 curl_escape.3 curl_formadd.3 \
-		curl_formfree.3 curl_formget.3 curl_free.3 curl_getdate.3 \
-		curl_getenv.3 curl_global_cleanup.3 curl_global_init.3 \
-		curl_global_init_mem.3 curl_mprintf.3 curl_multi_add_handle.3 \
-		curl_multi_assign.3 curl_multi_cleanup.3 curl_multi_fdset.3 \
-		curl_multi_info_read.3 curl_multi_init.3 curl_multi_perform.3 \
-		curl_multi_remove_handle.3 curl_multi_setopt.3 \
-		curl_multi_socket.3 curl_multi_socket_action.3 \
-	 	curl_multi_strerror.3 curl_multi_timeout.3 curl_multi_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
 .endif
 
 SLAVEDIRS=	ftp/curl-hiphop
 
+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
+COOKIES_CONFIGURE_OFF=	--disable-cookies
+COOKIES_CONFIGURE_ON=	--enable-cookies
+CURL_DEBUG_CONFIGURE_OFF=	--disable-curldebug
+CURL_DEBUG_CONFIGURE_ON=--enable-curldebug
+CYASSL_CONFIGURE_OFF=	--without-cyassl
+CYASSL_CONFIGURE_ON=	--with-cyassl=${LOCALBASE}
+CYASSL_LIB_DEPENDS=	cyassl:${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
+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
+LDAP_CONFIGURE_OFF=	--disable-ldap
+LDAP_CONFIGURE_ON=	--enable-ldap
+LDAP_CPPFLAGS=		-I${LOCALBASE}/include
+LDAP_LDFLAGS=		-L${LOCALBASE}/lib
+LDAP_USE=		OPENLDAP=yes
+LDAPS_CONFIGURE_OFF=	--disable-ldaps
+LDAPS_CONFIGURE_ON=	--enable-ldaps
+LIBSSH2_CONFIGURE_OFF=	--without-libssh2
+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_LIB_DEPENDS=	libnss3.so:${PORTSDIR}/security/nss
+OPENSSL_CONFIGURE_OFF=	--without-ssl
+OPENSSL_CONFIGURE_ON=	--with-ssl=${OPENSSLBASE}
+OPENSSL_CPPFLAGS=	-I${OPENSSLINC}
+OPENSSL_LDFLAGS=	-L${OPENSSLLIB}
+OPENSSL_USE=		OPENSSL=yes
+POLARSSL_CONFIGURE_OFF=	--without-polarssl
+POLARSSL_CONFIGURE_ON=	--with-polarssl=${LOCALBASE}
+POLARSSL_LIB_DEPENDS=	libpolarssl.so:${PORTSDIR}/security/polarssl
+PROXY_CONFIGURE_OFF=	--disable-proxy
+PROXY_CONFIGURE_ON=	--enable-proxy
+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
+TLS_SRP_CONFIGURE_ON=	--enable-tls-srp
+
 .include <bsd.mport.options.mk>
 
 .if ${PORT_OPTIONS:MCA_BUNDLE} && !${PORT_OPTIONS:MOPENSSL}
@@ -82,7 +128,7 @@
 IGNORE=		only supports LDAPS with LDAP
 .endif
 
-.if ${PORT_OPTIONS:MLDAPS} && !${PORT_OPTIONS:MSSL}
+.if ${PORT_OPTIONS:MLDAPS} && !${PORT_OPTIONS:MCYASSL} && !${PORT_OPTIONS:MGNUTLS} && !${PORT_OPTIONS:MNSS} && !${PORT_OPTIONS:MOPENSSL} && !${PORT_OPTIONS:MPOLARSSL}
 IGNORE=		only supports LDAPS with SSL
 .endif
 
@@ -90,192 +136,23 @@
 IGNORE=		only supports LIBSSH2 with OpenSSL
 .endif
 
-.if ${PORT_OPTIONS:MNTLM} && !${PORT_OPTIONS:MCYASSL} && !${PORT_OPTIONS:MGNUTLS} && !${PORT_OPTIONS:MNSS} && !${PORT_OPTIONS:MOPENSSL} && !${PORT_OPTIONS:MPOLARSSL}
-IGNORE=		only supports NTLM with SSL
-.endif
-
-.if ${PORT_OPTIONS: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
-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+=--disable-ares
-.endif
-
-.if ${PORT_OPTIONS:MCOOKIES}
-CONFIGURE_ARGS+=--enable-cookies
-.else
-CONFIGURE_ARGS+=--disable-cookies
-.endif
-
-.if ${PORT_OPTIONS:MCURL_DEBUG}
-CONFIGURE_ARGS+=--enable-curldebug
-.else
-CONFIGURE_ARGS+=--disable-curldebug
-.endif
-
-.if ${PORT_OPTIONS:MCYASSL}
-LIB_DEPENDS+=	cyassl:${PORTSDIR}/security/yassl
-CONFIGURE_ARGS+=--with-cyassl=${LOCALBASE}
-.else
-CONFIGURE_ARGS+=--without-cyassl
-.endif
-
-.if ${PORT_OPTIONS:MDEBUG}
-CONFIGURE_ARGS+=--enable-debug
-.else
-CONFIGURE_ARGS+=--disable-debug
-.endif
-
-.if ${PORT_OPTIONS:MGNUTLS}
-LIB_DEPENDS+=	gnutls:${PORTSDIR}/security/gnutls
-CONFIGURE_ARGS+=--with-gnutls=${LOCALBASE}
-.else
-CONFIGURE_ARGS+=--without-gnutls
-.endif
-
-.if ${PORT_OPTIONS:MGSSAPI}
-CONFIGURE_ARGS+=--with-gssapi \
-		--with-gssapi-includes=${INCLUDEDIR} \
-		--with-gssapi-libs=${LIBDIR}
-.else
-CONFIGURE_ARGS+=--without-gssapi
-.endif
-
-.if ${PORT_OPTIONS:MIDN}
-LIB_DEPENDS+=	idn:${PORTSDIR}/dns/libidn
-CONFIGURE_ARGS+=--with-libidn=${LOCALBASE}
-.else
-CONFIGURE_ARGS+=--without-libidn
-.endif
-
-.if ${PORT_OPTIONS:MIPV6}
-CONFIGURE_ARGS+=--enable-ipv6
-.else
-CONFIGURE_ARGS+=--disable-ipv6
-.endif
-
-.if ${PORT_OPTIONS:MLDAP}
-CONFIGURE_ARGS+=--enable-ldap
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-USE_OPENLDAP=	yes
-.else
-CONFIGURE_ARGS+=--disable-ldap
-.endif
-
-.if ${PORT_OPTIONS:MLDAPS}
-CONFIGURE_ARGS+=--enable-ldaps
-.else
-CONFIGURE_ARGS+=--disable-ldaps
-.endif
-
-.if ${PORT_OPTIONS:MLIBSSH2}
-LIB_DEPENDS+=	ssh2:${PORTSDIR}/security/libssh2
-CONFIGURE_ARGS+=--with-libssh2=${LOCALBASE}
-.else
-CONFIGURE_ARGS+=--without-libssh2
-.endif
-
-.if ${PORT_OPTIONS:MNSS}
-LIB_DEPENDS+=	nss3:${PORTSDIR}/security/nss
-CONFIGURE_ARGS+=--with-nss=${LOCALBASE}
-.else
-CONFIGURE_ARGS+=--without-nss
-.endif
-
-.if ${PORT_OPTIONS:MNTLM}
-CONFIGURE_ARGS+=--enable-ntlm
-.else
-CONFIGURE_ARGS+=--disable-ntlm
-.endif
-
-.if ${PORT_OPTIONS:MOPENSSL}
-CONFIGURE_ARGS+=--with-ssl=${OPENSSLBASE}
-CPPFLAGS+=	-I${OPENSSLINC}
-LDFLAGS+=	-L${OPENSSLLIB}
-USE_OPENSSL=	yes
-.else
-CONFIGURE_ARGS+=--without-ssl
-.endif
-
-.if ${PORT_OPTIONS:MPOLARSSL}
-LIB_DEPENDS+=	polarssl:${PORTSDIR}/security/polarssl
-CONFIGURE_ARGS+=--with-polarssl=${LOCALBASE}
-.else
-CONFIGURE_ARGS+=--without-polarssl
-.endif
-
-.if ${PORT_OPTIONS:MPROXY}
-CONFIGURE_ARGS+=--enable-proxy
-.else
-CONFIGURE_ARGS+=--disable-proxy
-.endif
-
-.if ${PORT_OPTIONS:MRTMP}
-LIB_DEPENDS+=	rtmp:${PORTSDIR}/multimedia/rtmpdump
-CONFIGURE_ARGS+=--with-librtmp=${LOCALBASE}
-.else
-CONFIGURE_ARGS+=--without-librtmp
-.endif
-
-.if ${PORT_OPTIONS:MSPNEGO}
-LIB_DEPENDS+=	fbopenssl:${PORTSDIR}/security/fbopenssl
-CPPFLAGS+=	-I${LOCALBASE}/include/fbopenssl
-CONFIGURE_ARGS+=--with-spnego=${LOCALBASE}/lib
-.else
-CONFIGURE_ARGS+=--without-spnego
-.endif
-
-.if ${PORT_OPTIONS:MTHREADED_RESOLVER}
-CONFIGURE_ARGS+=--enable-threaded-resolver
-.else
-CONFIGURE_ARGS+=--disable-threaded-resolver
-.endif
-
-.if ${PORT_OPTIONS:MTLS_SRP}
-CONFIGURE_ARGS+=--enable-tls-srp
-.else
-CONFIGURE_ARGS+=--disable-tls-srp
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|\(flags_dbg_off=\)".*"|\1""|; s|\(flags_opt_off=\)".*"|\1""|' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e '/^SUBDIRS = / s|$$| docs|; /^DIST_SUBDIRS = / s| docs||; /cd docs &&/d' ${WRKSRC}/Makefile.in
 
-pre-configure:
-.if ${PORT_OPTIONS:MLDAP}
-	@${ECHO_MSG} "Note:"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "  Enabling LDAP option is known to fail with unpatched Mk/bsd.ldap.mk."
-	@${ECHO_MSG} "  See PR/177401 for detailed information."
-	@${ECHO_MSG} "  URL: http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/177401"
-	@${ECHO_MSG} ""
-.endif
-
 post-install:
 .if !defined(BUILDING_HIPHOP)
-	${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/
+	${INSTALL_DATA} ${WRKSRC}/docs/libcurl/libcurl.m4 ${STAGEDIR}${PREFIX}/share/aclocal/
+	${MKDIR} ${STAGEDIR}${DOCSDIR}/ ${STAGEDIR}${DOCSDIR}/libcurl/
+	cd ${WRKSRC}/docs/ && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}/
+	cd ${WRKSRC}/docs/libcurl/ && ${INSTALL_DATA} ABI *.html *.pdf *.m4 ${STAGEDIR}${DOCSDIR}/libcurl/
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/
+	cd ${WRKSRC}/docs/examples/ && ${INSTALL_DATA} README Makefile.example makefile* *.c *.cpp ${STAGEDIR}${EXAMPLESDIR}/
 .endif
-.if ${PORT_OPTIONS:MEXAMPLES}
-	${MKDIR} ${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.
-regression-test test: build
+x-regression-test test: build
 .if !${PORT_OPTIONS:MPROXY}
 	@${ECHO_MSG} "******************************************"
 	@${ECHO_MSG} "* You have disabled curl proxy support.  *"



More information about the Midnightbsd-cvs mailing list