Attachment #128456 for bug #172325

View | Details | Raw Unified | Return to bug 172325
Collapse All | Expand All




# Created by: Neil Blakey-Milner <nbm@rucus.ru.ac.za>
# Date created:		12 December 1998
# Whom:			Neil Blakey-Milner <nbm@rucus.ru.ac.za>
#
# $FreeBSD$
#

PORTNAME=	curl
PORTVERSION=	7.27.0
PORTREVISION=	1
CATEGORIES=	ftp ipv6 www
MASTER_SITES=	http://curl.haxx.se/download/ \
		LOCAL/sunpoet


LICENSE=	MIT

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
		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

CONFIGURE_ARGS+=--disable-threaded-resolver --disable-werror \
		--enable-imap --enable-pop3 --enable-rtsp --enable-smtp

		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 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 \

		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_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}"

SHLIB_VER=	6
.endif

.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MCA_BUNDLE} && empty(PORT_OPTIONS:MOPENSSL)
IGNORE=		only supports CA bundle with OpenSSL
.endif

.if ${PORT_OPTIONS:MLDAPS} && empty(PORT_OPTIONS:MLDAP)
IGNORE=		only supports LDAPS with LDAP
.endif

.if ${PORT_OPTIONS:MLDAPS} && empty(PORT_OPTIONS:MSSL)
IGNORE=		only supports LDAPS with SSL (OpenSSL or GnuTLS)
.endif

.if ${PORT_OPTIONS:MLIBSSH2} && empty(PORT_OPTIONS:MOPENSSL)
IGNORE=		only supports LIBSSH2 with OpenSSL
IGNORE=		only supports LDAPS with LDAP
.else
.if !defined(WITH_OPENSSL) && !defined(WITH_GNUTLS)
IGNORE=		only supports LDAPS with SSL (OpenSSL or GNUTLS)
.endif

.if ${PORT_OPTIONS:MNTLM} && empty(PORT_OPTIONS:MOPENSSL)
IGNORE=		only supports NTLM with OpenSSL
.endif
.endif

.if ${PORT_OPTIONS:MCA_BUNDLE}
.include "${PORTSDIR}/Mk/bsd.openssl.mk"
CONFIGURE_ARGS+=	--with-ssl=${OPENSSLBASE}
.if !defined(WITHOUT_CA_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
.if defined(WITH_CA_BUNDLE)
IGNORE=			only supports CA bundle with OpenSSL
.endif
.endif

.if ${PORT_OPTIONS:MCURL_DEBUG}
CONFIGURE_ARGS+=--enable-debug
CONFIGURE_ARGS+=	--enable-ares=${LOCALBASE}
.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
.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: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
USE_OPENLDAP=	yes
CONFIGURE_ARGS+=	--enable-ldaps
.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:MNTLM}
CONFIGURE_ARGS+=--enable-ntlm
CONFIGURE_ARGS+=	--with-libssh2=${LOCALBASE}
.else
CONFIGURE_ARGS+=--disable-ntlm
.endif

.if ${PORT_OPTIONS:MOPENSSL}
USE_OPENSSL=	yes
CONFIGURE_ARGS+=--with-ssl=${OPENSSLBASE}

.if defined(WITH_RTMP)
LIB_DEPENDS+=	rtmp.0:${PORTSDIR}/multimedia/rtmpdump
CONFIGURE_ARGS+=	--with-librtmp=${LOCALBASE}
.else
CONFIGURE_ARGS+=--without-ssl
.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:MTRACKMEMORY}
CONFIGURE_ARGS+=--enable-curldebug
.else
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 ${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 ${PORT_OPTIONS:MEXAMPLES}
	${MKDIR} ${EXAMPLESDIR}/
	cd ${WRKSRC}/docs/examples/ && ${INSTALL_DATA} README Makefile.example makefile* *.c *.cc ${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.
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

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (curl-7.24.0.tar.lzma) = cd683ee8be137ed8a8e97d42fd3cc94f88f63d478b83d4abe38e31b6281e2268	1	SHA256 (curl-7.27.0.tar.lzma) = b986186140e0ef0102e11094873f1e71bca1159d12fe869a8aa2ce649f02b238
2	SIZE (curl-7.24.0.tar.lzma) = 1973811	2	SIZE (curl-7.27.0.tar.lzma) = 2037300




Author: Peter Pentchev <roam@FreeBSD.org>
Last-Update: 2010-12-19

--- configure.orig	2012-07-28 02:25:28.000000000 +0800
+++ configure	2012-09-22 20:54:44.428056025 +0800
@@ -15985,6 +15985,9 @@
     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 @@
     tmp_CFLAGS="$CFLAGS"
     tmp_CPPFLAGS="$CPPFLAGS"
 

     ac_var_stripped=""
   for word1 in $tmp_CFLAGS; do
     ac_var_strip_word="no"
@@ -16015,6 +16018,7 @@
   done
     tmp_CPPFLAGS="$ac_var_stripped"
   squeeze tmp_CPPFLAGS

 
     #
     if test "$want_debug" = "yes"; then
@@ -16232,6 +16236,9 @@
     #
     if test "$honor_optimize_option" = "yes"; then
 

     ac_var_stripped=""
   for word1 in $tmp_CFLAGS; do
     ac_var_strip_word="no"
@@ -16262,6 +16269,7 @@
   done
     tmp_CPPFLAGS="$ac_var_stripped"
   squeeze tmp_CPPFLAGS

 
       if test "$want_optimize" = "yes"; then
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts optimizer enabling options" >&5
@@ -20508,7 +20516,8 @@
         PKGTEST="no"
     PREFIX_OPENSSL=$OPT_SSL
 
-                OPENSSL_PCDIR="$OPT_SSL/lib/pkgconfig"
+                # 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
@@ -23925,29 +23934,30 @@
     ;;
   off)
         LIB_RTMP="-lrtmp"

Lines 3-11 Link Here

(-)files/patch-lib-url.c (-3 / +3 lines)
3	Author: Peter Pentchev <roam@FreeBSD.org>	3	Author: Peter Pentchev <roam@FreeBSD.org>
4	Last-Update: 2010-12-18	4	Last-Update: 2010-12-18
5		5
6	--- lib/url.c.orig 2012-01-23 23:31:30.000000000 +0800	6	--- lib/url.c.orig 2012-07-13 20:21:05.000000000 +0800
7	+++ lib/url.c 2012-02-26 17:52:21.937920303 +0800	7	+++ lib/url.c 2012-09-22 20:54:44.435391726 +0800
8	@@ -797,6 +797,10 @@	8	@@ -812,6 +812,10 @@
9	data->progress.flags \|= PGRS_HIDE;	9	data->progress.flags \|= PGRS_HIDE;
10	data->state.current_speed = -1; /* init to negative == impossible */	10	data->state.current_speed = -1; /* init to negative == impossible */
11		11




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;

Lines 1-6 Link Here

(-)files/patch-src-tool_operate.c (-4 / +4 lines)
1	--- src/tool_operate.c.orig 2012-01-23 23:31:30.000000000 +0800	1	--- src/tool_operate.c.orig 2012-07-24 01:59:20.000000000 +0800
2	+++ src/tool_operate.c 2012-02-26 17:40:00.117907281 +0800	2	+++ src/tool_operate.c 2012-09-22 20:54:44.439408357 +0800
3	@@ -580,22 +580,10 @@	3	@@ -653,22 +653,10 @@
4	DEBUGASSERT(!outs.filename);	4	DEBUGASSERT(!outs.filename);
5	}	5	}
6		6
Lines 26-32 Link Here
26	if(!file) {	26	if(!file) {
27	helpf(config->errors, "Can't open '%s'!\n", outfile);	27	helpf(config->errors, "Can't open '%s'!\n", outfile);
28	res = CURLE_WRITE_ERROR;	28	res = CURLE_WRITE_ERROR;
29	@@ -603,6 +591,19 @@	29	@@ -676,6 +664,19 @@
30	}	30	}
31	outs.fopened = TRUE;	31	outs.fopened = TRUE;
32	outs.stream = file;	32	outs.stream = file;

Return to bug 172325

Lines 1-13 Link Here

(-)Makefile (-100 / +88 lines)
1	# New ports collection makefile for: curl	1	# Created by: Neil Blakey-Milner <nbm@rucus.ru.ac.za>
2	# Date created: 12 December 1998
3	# Whom: Neil Blakey-Milner <nbm@rucus.ru.ac.za>
4	#
5	# $FreeBSD$	2	# $FreeBSD$
6	#
7		3
8	PORTNAME= curl	4	PORTNAME= curl
9	PORTVERSION= 7.24.0	5	PORTVERSION= 7.27.0
10	PORTREVISION= 1
11	CATEGORIES= ftp ipv6 www	6	CATEGORIES= ftp ipv6 www
12	MASTER_SITES= http://curl.haxx.se/download/ \	7	MASTER_SITES= http://curl.haxx.se/download/ \
13	LOCAL/sunpoet	8	LOCAL/sunpoet
Lines 18-38 Link Here
18		13
19	LICENSE= MIT	14	LICENSE= MIT
20		15
21	OPTIONS= CARES "Asynchronous DNS resolution via c-ares" off \	16	OPTIONS_DEFINE= CA_BUNDLE CARES CURL_DEBUG DOCS EXAMPLES GSSAPI IDN IPV6 KERBEROS4 LDAP LDAPS LIBSSH2 NTLM PROXY RTMP TRACKMEMORY
22	CURL_DEBUG "Enable curl diagnostic output" off \	17	OPTIONS_DEFAULT=CA_BUNDLE IPV6 OPENSSL PROXY SSL
23	GNUTLS "Use GNU TLS if OPENSSL is OFF" off \	18	OPTIONS_SINGLE= SSL
24	IPV6 "IPv6 support" on \	19	OPTIONS_SINGLE_SSL= GNUTLS OPENSSL
25	KERBEROS4 "Kerberos 4 authentication" off \	20	CA_BUNDLE_DESC= Install CA bundle for OpenSSL
26	LDAP "LDAP support" off \	21	CURL_DEBUG_DESC= cURL diagnostic output
27	LDAPS "LDAPS support (requires LDAP and SSL)" off \	22	LIBSSH2_DESC= SCP/SFTP support via libssh2
28	LIBIDN "Internationalized Domain Names via libidn" off \	23	TRACKMEMORY_DESC= cURL memory diagnostic output
29	LIBSSH2 "SCP/SFTP support via libssh2" off \
30	NTLM "NTLM authentication" off \
31	OPENSSL "OpenSSL support" on \
32	CA_BUNDLE "Install CA bundle for OpenSSL" on \
33	PROXY "Proxy support" on \
34	RTMP "RTMP streams support" off \
35	TRACKMEMORY "Enable curl memory diagnostic output" off
36		24
37	CONFIGURE_ARGS+=--disable-threaded-resolver --disable-werror \	25	CONFIGURE_ARGS+=--disable-threaded-resolver --disable-werror \
38	--enable-imap --enable-pop3 --enable-rtsp --enable-smtp	26	--enable-imap --enable-pop3 --enable-rtsp --enable-smtp
Lines 52-58 Link Here
52	MANUAL README.netware README.win32 RESOURCES SSLCERTS THANKS \	40	MANUAL README.netware README.win32 RESOURCES SSLCERTS THANKS \
53	TODO TheArtOfHttpScripting VERSIONS curl-config.html \	41	TODO TheArtOfHttpScripting VERSIONS curl-config.html \
54	curl-config.pdf curl.html curl.pdf index.html	42	curl-config.pdf curl.html curl.pdf index.html
55	MAN1= curl.1 curl-config.1	43	MAN1= curl.1 curl-config.1 mk-ca-bundle.1
56	MAN3= curl_easy_cleanup.3 curl_easy_duphandle.3 curl_easy_escape.3 \	44	MAN3= curl_easy_cleanup.3 curl_easy_duphandle.3 curl_easy_escape.3 \
57	curl_easy_getinfo.3 curl_easy_init.3 curl_easy_pause.3 \	45	curl_easy_getinfo.3 curl_easy_init.3 curl_easy_pause.3 \
58	curl_easy_perform.3 curl_easy_recv.3 curl_easy_reset.3 \	46	curl_easy_perform.3 curl_easy_recv.3 curl_easy_reset.3 \
Lines 65-224 Link Here
65	curl_multi_info_read.3 curl_multi_init.3 curl_multi_perform.3 \	53	curl_multi_info_read.3 curl_multi_init.3 curl_multi_perform.3 \
66	curl_multi_remove_handle.3 curl_multi_setopt.3 \	54	curl_multi_remove_handle.3 curl_multi_setopt.3 \
67	curl_multi_socket.3 curl_multi_socket_action.3 \	55	curl_multi_socket.3 curl_multi_socket_action.3 \
68	curl_multi_strerror.3 curl_multi_timeout.3 \	56	curl_multi_strerror.3 curl_multi_timeout.3 \
69	curl_share_cleanup.3 curl_share_init.3 curl_share_setopt.3 \	57	curl_share_cleanup.3 curl_share_init.3 curl_share_setopt.3 \
70	curl_share_strerror.3 curl_slist_append.3 \	58	curl_share_strerror.3 curl_slist_append.3 \
71	curl_slist_free_all.3 curl_strequal.3 curl_unescape.3 \	59	curl_slist_free_all.3 curl_strequal.3 curl_unescape.3 \
72	curl_version.3 curl_version_info.3 libcurl.3 libcurl-easy.3 \	60	curl_version.3 curl_version_info.3 libcurl.3 libcurl-easy.3 \
73	libcurl-errors.3 libcurl-multi.3 libcurl-share.3 \	61	libcurl-errors.3 libcurl-multi.3 libcurl-share.3 \
74	libcurl-tutorial.3	62	libcurl-tutorial.3
75	PLIST_SUB= SHLIB_VER="${SHLIB_VER}"	63	PLIST_SUB+= SHLIB_VER="${SHLIB_VER}"
76		64
77	SHLIB_VER= 6	65	SHLIB_VER= 6
78	.endif	66	.endif
79		67
80	.include <bsd.port.options.mk>	68	.include <bsd.port.options.mk>
81		69
82	.if defined(WITH_GNUTLS) && defined(WITH_OPENSSL)	70	.if ${PORT_OPTIONS:MCA_BUNDLE} && empty(PORT_OPTIONS:MOPENSSL)
83	IGNORE= may only use GNU TLS if OpenSSL support is disabled	71	IGNORE= only supports CA bundle with OpenSSL
84	.endif	72	.endif
85		73
86	.if defined(WITH_LIBSSH2) && !defined(WITH_OPENSSL)	74	.if ${PORT_OPTIONS:MLDAPS} && empty(PORT_OPTIONS:MLDAP)
87	IGNORE= only supports LIBSSH2 with OpenSSL	75	IGNORE= only supports LDAPS with LDAP
88	.endif	76	.endif
89		77
90	.if defined(WITH_NTLM) && !defined(WITH_OPENSSL)	78	.if ${PORT_OPTIONS:MLDAPS} && empty(PORT_OPTIONS:MSSL)
91	IGNORE= only supports NTLM with OpenSSL	79	IGNORE= only supports LDAPS with SSL (OpenSSL or GnuTLS)
92	.endif	80	.endif
93		81
94	.if defined(WITH_LDAPS)	82	.if ${PORT_OPTIONS:MLIBSSH2} && empty(PORT_OPTIONS:MOPENSSL)
95	.if !defined(WITH_LDAP)	83	IGNORE= only supports LIBSSH2 with OpenSSL
96	IGNORE= only supports LDAPS with LDAP
97	.else
98	.if !defined(WITH_OPENSSL) && !defined(WITH_GNUTLS)
99	IGNORE= only supports LDAPS with SSL (OpenSSL or GNUTLS)
100	.endif	84	.endif
		85
		86	.if ${PORT_OPTIONS:MNTLM} && empty(PORT_OPTIONS:MOPENSSL)
		87	IGNORE= only supports NTLM with OpenSSL
101	.endif	88	.endif
102	.endif
103		89
104	.if !defined(WITHOUT_OPENSSL)	90	.if ${PORT_OPTIONS:MCA_BUNDLE}
105	.include "${PORTSDIR}/Mk/bsd.openssl.mk"
106	CONFIGURE_ARGS+= --with-ssl=${OPENSSLBASE}
107	.if !defined(WITHOUT_CA_BUNDLE)
108	RUN_DEPENDS+= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss	91	RUN_DEPENDS+= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
109	CONFIGURE_ARGS+= --with-ca-bundle=${LOCALBASE}/share/certs/ca-root-nss.crt	92	CONFIGURE_ARGS+=--with-ca-bundle=${LOCALBASE}/share/certs/ca-root-nss.crt
110	.else	93	.else
111	CONFIGURE_ARGS+= --without-ca-bundle	94	CONFIGURE_ARGS+=--without-ca-bundle
112	.endif	95	.endif
		96
		97	.if ${PORT_OPTIONS:MCARES}
		98	LIB_DEPENDS+= cares:${PORTSDIR}/dns/c-ares
		99	CONFIGURE_ARGS+=--enable-ares=${LOCALBASE}
113	.else	100	.else
114	CONFIGURE_ARGS+= --without-ssl	101	CONFIGURE_ARGS+=--disable-ares
115	.if defined(WITH_CA_BUNDLE)
116	IGNORE= only supports CA bundle with OpenSSL
117	.endif	102	.endif
118	.endif
119		103
120	.if defined(WITH_CARES)	104	.if ${PORT_OPTIONS:MCURL_DEBUG}
121	LIB_DEPENDS+= cares.2:${PORTSDIR}/dns/c-ares	105	CONFIGURE_ARGS+=--enable-debug
122	CONFIGURE_ARGS+= --enable-ares=${LOCALBASE}
123	.else	106	.else
124	CONFIGURE_ARGS+= --disable-ares	107	CONFIGURE_ARGS+=--disable-debug
125	.endif	108	.endif
126		109
127	.if defined(WITH_GNUTLS)	110	.if ${PORT_OPTIONS:MGNUTLS}
128	LIB_DEPENDS+= gnutls:${PORTSDIR}/security/gnutls	111	LIB_DEPENDS+= gnutls:${PORTSDIR}/security/gnutls
129	CONFIGURE_ARGS+=--with-gnutls=${LOCALBASE}	112	CONFIGURE_ARGS+=--with-gnutls=${LOCALBASE}
130	.else	113	.else
131	CONFIGURE_ARGS+=--without-gnutls	114	CONFIGURE_ARGS+=--without-gnutls
132	.endif	115	.endif
133		116
134	.if defined(WITH_OPENSSL) \|\| defined(WITH_GNUTLS)	117	.if ${PORT_OPTIONS:MGSSAPI}
135	PLIST_SUB+= SSL=""	118	CONFIGURE_ARGS+=--with-gssapi
136	.else	119	.else
137	PLIST_SUB+= SSL="@comment "	120	CONFIGURE_ARGS+=--without-gssapi
138	.endif	121	.endif
139		122
140	.if defined(WITH_IPV6)	123	.if ${PORT_OPTIONS:MIDN}
141	CONFIGURE_ARGS+= --enable-ipv6	124	LIB_DEPENDS+= idn:${PORTSDIR}/dns/libidn
		125	CONFIGURE_ARGS+=--with-libidn=${LOCALBASE}
142	.else	126	.else
143	CONFIGURE_ARGS+= --disable-ipv6	127	CONFIGURE_ARGS+=--without-libidn
144	.endif	128	.endif
145		129
146	.if exists(/usr/lib/libkrb.a) && defined(WITH_KERBEROS4)	130	.if ${PORT_OPTIONS:MIPV6}
147	CONFIGURE_ARGS += --with-krb4=/usr	131	CONFIGURE_ARGS+=--enable-ipv6
148	.else	132	.else
149	CONFIGURE_ARGS += --without-krb4	133	CONFIGURE_ARGS+=--disable-ipv6
150	.endif	134	.endif
151		135
152	.if defined(WITH_LDAP)	136	.if ${PORT_OPTIONS:MKERBEROS4} && exists(/usr/lib/libkrb.a)
153	CONFIGURE_ARGS+= --enable-ldap	137	CONFIGURE_ARGS+=--with-krb4=/usr
154	USE_OPENLDAP= yes	138	.else
		139	CONFIGURE_ARGS+=--without-krb4
		140	.endif
		141
		142	.if ${PORT_OPTIONS:MLDAP}
155	CFLAGS+= -I${LOCALBASE}/include	143	CFLAGS+= -I${LOCALBASE}/include
		144	CONFIGURE_ARGS+=--enable-ldap
156	LDFLAGS+= -L${LOCALBASE}/lib	145	LDFLAGS+= -L${LOCALBASE}/lib
157	.if defined(WITH_LDAPS)	146	USE_OPENLDAP= yes
158	CONFIGURE_ARGS+= --enable-ldaps
159	.else	147	.else
160	CONFIGURE_ARGS+= --disable-ldaps	148	CONFIGURE_ARGS+=--disable-ldap
161	.endif	149	.endif
		150
		151	.if ${PORT_OPTIONS:MLDAPS}
		152	CONFIGURE_ARGS+=--enable-ldaps
162	.else	153	.else
163	CONFIGURE_ARGS+= --disable-ldap --disable-ldaps	154	CONFIGURE_ARGS+=--disable-ldaps
164	.endif	155	.endif
165		156
166	.if defined(WITH_LIBIDN)	157	.if ${PORT_OPTIONS:MLIBSSH2}
167	LIB_DEPENDS+= idn.17:${PORTSDIR}/dns/libidn	158	LIB_DEPENDS+= ssh2:${PORTSDIR}/security/libssh2
168	CONFIGURE_ARGS+= --with-libidn=${LOCALBASE}	159	CONFIGURE_ARGS+=--with-libssh2=${LOCALBASE}
169	.else	160	.else
170	CONFIGURE_ARGS+= --without-libidn	161	CONFIGURE_ARGS+=--without-libssh2
171	.endif	162	.endif
172		163
173	.if defined(WITH_LIBSSH2)	164	.if ${PORT_OPTIONS:MNTLM}
174	LIB_DEPENDS+= ssh2.1:${PORTSDIR}/security/libssh2	165	CONFIGURE_ARGS+=--enable-ntlm
175	CONFIGURE_ARGS+= --with-libssh2=${LOCALBASE}
176	.else	166	.else
177	CONFIGURE_ARGS+= --without-libssh2	167	CONFIGURE_ARGS+=--disable-ntlm
178	.endif	168	.endif
179		169
180	.if defined(WITH_CURL_DEBUG)	170	.if ${PORT_OPTIONS:MOPENSSL}
181	CONFIGURE_ARGS+= --enable-debug	171	USE_OPENSSL= yes
182	.endif	172	CONFIGURE_ARGS+=--with-ssl=${OPENSSLBASE}
183
184	.if defined(WITH_RTMP)
185	LIB_DEPENDS+= rtmp.0:${PORTSDIR}/multimedia/rtmpdump
186	CONFIGURE_ARGS+= --with-librtmp=${LOCALBASE}
187	.else	173	.else
188	CONFIGURE_ARGS+= --without-librtmp	174	CONFIGURE_ARGS+=--without-ssl
189	.endif	175	.endif
190		176
191	.if defined(WITH_TRACKMEMORY)	177	.if ${PORT_OPTIONS:MPROXY}
192	CONFIGURE_ARGS+= --enable-curldebug	178	CONFIGURE_ARGS+=--enable-proxy
193	.else	179	.else
194	CONFIGURE_ARGS+= --disable-curldebug	180	CONFIGURE_ARGS+=--disable-proxy
195	.endif	181	.endif
196		182
197	.if defined(WITH_NTLM)	183	.if ${PORT_OPTIONS:MRTMP}
198	CONFIGURE_ARGS+= --enable-ntlm	184	LIB_DEPENDS+= rtmp:${PORTSDIR}/multimedia/rtmpdump
		185	CONFIGURE_ARGS+=--with-librtmp=${LOCALBASE}
199	.else	186	.else
200	CONFIGURE_ARGS+= --disable-ntlm	187	CONFIGURE_ARGS+=--without-librtmp
201	.endif	188	.endif
202		189
203	.if !defined(WITHOUT_PROXY)	190	.if ${PORT_OPTIONS:MTRACKMEMORY}
204	CONFIGURE_ARGS+= --enable-proxy	191	CONFIGURE_ARGS+=--enable-curldebug
205	.else	192	.else
206	CONFIGURE_ARGS+= --disable-proxy	193	CONFIGURE_ARGS+=--disable-curldebug
207	.endif	194	.endif
208		195
209	post-patch:	196	post-patch:
		197	@${REINPLACE_CMD} -e 's\|\(flags_dbg_off=\)"."\|\1""\|; s\|\(flags_opt_off=\)"."\|\1""\|' ${WRKSRC}/configure
210	@${REINPLACE_CMD} -e '/^SUBDIRS = / s\|$$\| docs\|; /^DIST_SUBDIRS = / s\| docs\|\|; /cd docs &&/d' ${WRKSRC}/Makefile.in	198	@${REINPLACE_CMD} -e '/^SUBDIRS = / s\|$$\| docs\|; /^DIST_SUBDIRS = / s\| docs\|\|; /cd docs &&/d' ${WRKSRC}/Makefile.in
211	@${REINPLACE_CMD} -e '/require "valgrind.pm";/d' ${WRKSRC}/tests/runtests.pl	199	@${REINPLACE_CMD} -e '/require "valgrind.pm";/d' ${WRKSRC}/tests/runtests.pl
212		200
213	post-install:	201	post-install:
214	.if !defined(BUILDING_HIPHOP)	202	.if !defined(BUILDING_HIPHOP)
215	${INSTALL_DATA} ${WRKSRC}/docs/libcurl/libcurl.m4 ${PREFIX}/share/aclocal	203	${INSTALL_DATA} ${WRKSRC}/docs/libcurl/libcurl.m4 ${PREFIX}/share/aclocal/
216	.if !defined(NOPORTDOCS)	204	.if ${PORT_OPTIONS:MDOCS}
217	${MKDIR} ${DOCSDIR}/ ${DOCSDIR}/libcurl/	205	${MKDIR} ${DOCSDIR}/ ${DOCSDIR}/libcurl/
218	cd ${WRKSRC}/docs/ && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}/	206	cd ${WRKSRC}/docs/ && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}/
219	cd ${WRKSRC}/docs/libcurl/ && ${INSTALL_DATA} ABI .html .pdf *.m4 ${DOCSDIR}/libcurl/	207	cd ${WRKSRC}/docs/libcurl/ && ${INSTALL_DATA} ABI .html .pdf *.m4 ${DOCSDIR}/libcurl/
220	.endif	208	.endif
221	.if !defined(NOPORTEXAMPLES)	209	.if ${PORT_OPTIONS:MEXAMPLES}
222	${MKDIR} ${EXAMPLESDIR}/	210	${MKDIR} ${EXAMPLESDIR}/
223	cd ${WRKSRC}/docs/examples/ && ${INSTALL_DATA} README Makefile.example makefile* .c .cc ${EXAMPLESDIR}/	211	cd ${WRKSRC}/docs/examples/ && ${INSTALL_DATA} README Makefile.example makefile* .c .cc ${EXAMPLESDIR}/
224	.endif	212	.endif
Lines 226-239 Link Here
226		214
227	# Setting LC_ALL=C is a kludge; maybe curl/libcurl shouldn't actually use	215	# Setting LC_ALL=C is a kludge; maybe curl/libcurl shouldn't actually use
228	# the user's locale when dates are sent to the server.	216	# the user's locale when dates are sent to the server.
229	test: build	217	regression-test test: build
230	.if defined(WITHOUT_PROXY)	218	.if empty(PORT_OPTIONS:MPROXY)
231	@${ECHO_MSG} "******************************************"	219	@${ECHO_MSG} "******************************************"
232	@${ECHO_MSG} "* You have disabled curl proxy support. *"	220	@${ECHO_MSG} "* You have disabled curl proxy support. *"
233	@${ECHO_MSG} "* Some tests SHALL FAIL! *"	221	@${ECHO_MSG} "* Some tests SHALL FAIL! *"
234	@${ECHO_MSG} "* This is being addressed. *"	222	@${ECHO_MSG} "* This is being addressed. *"
235	@${ECHO_MSG} "******************************************"	223	@${ECHO_MSG} "******************************************"
236	.endif	224	.endif
237	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} LC_ALL=C ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test	225	cd ${WRKSRC}/ && ${SETENV} ${MAKE_ENV} LC_ALL=C ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test
238		226
239	.include <bsd.port.mk>	227	.include <bsd.port.mk>

Lines 6-27 Link Here

(-)files/patch-configure (-22 / +9 lines)
6	Author: Peter Pentchev <roam@FreeBSD.org>	6	Author: Peter Pentchev <roam@FreeBSD.org>
7	Last-Update: 2010-12-19	7	Last-Update: 2010-12-19
8		8
9	--- configure.orig 2012-02-26 17:52:21.904908587 +0800	9	--- configure.orig 2012-07-28 02:25:28.000000000 +0800
10	+++ configure 2012-02-26 17:52:21.929909948 +0800	10	+++ configure 2012-09-22 20:54:44.428056025 +0800
11	@@ -15049,10 +15049,10 @@	11	@@ -15985,6 +15985,9 @@
12	flags_dbg_all="$flags_dbg_all -gdwarf-2"
13	flags_dbg_all="$flags_dbg_all -gvms"
14	flags_dbg_yes="-g"
15	- flags_dbg_off="-g0"
16	+ flags_dbg_off=""
17	flags_opt_all="-O -O0 -O1 -O2 -O3 -Os"
18	flags_opt_yes="-O2"
19	- flags_opt_off="-O0"
20	+ flags_opt_off=""
21	else
22	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
23	$as_echo "no" >&6; }
24	@@ -15892,6 +15892,9 @@
25	tmp_CFLAGS="$CFLAGS"	12	tmp_CFLAGS="$CFLAGS"
26	tmp_CPPFLAGS="$CPPFLAGS"	13	tmp_CPPFLAGS="$CPPFLAGS"
27		14
Lines 31-37 Link Here
31	ac_var_stripped=""	18	ac_var_stripped=""
32	for word1 in $tmp_CFLAGS; do	19	for word1 in $tmp_CFLAGS; do
33	ac_var_strip_word="no"	20	ac_var_strip_word="no"
34	@@ -15922,6 +15925,7 @@	21	@@ -16015,6 +16018,7 @@
35	done	22	done
36	tmp_CPPFLAGS="$ac_var_stripped"	23	tmp_CPPFLAGS="$ac_var_stripped"
37	squeeze tmp_CPPFLAGS	24	squeeze tmp_CPPFLAGS
Lines 39-45 Link Here
39		26
40	#	27	#
41	if test "$want_debug" = "yes"; then	28	if test "$want_debug" = "yes"; then
42	@@ -16139,6 +16143,9 @@	29	@@ -16232,6 +16236,9 @@
43	#	30	#
44	if test "$honor_optimize_option" = "yes"; then	31	if test "$honor_optimize_option" = "yes"; then
45		32
Lines 49-55 Link Here
49	ac_var_stripped=""	36	ac_var_stripped=""
50	for word1 in $tmp_CFLAGS; do	37	for word1 in $tmp_CFLAGS; do
51	ac_var_strip_word="no"	38	ac_var_strip_word="no"
52	@@ -16169,6 +16176,7 @@	39	@@ -16262,6 +16269,7 @@
53	done	40	done
54	tmp_CPPFLAGS="$ac_var_stripped"	41	tmp_CPPFLAGS="$ac_var_stripped"
55	squeeze tmp_CPPFLAGS	42	squeeze tmp_CPPFLAGS
Lines 57-73 Link Here
57		44
58	if test "$want_optimize" = "yes"; then	45	if test "$want_optimize" = "yes"; then
59	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts optimizer enabling options" >&5	46	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts optimizer enabling options" >&5
60	@@ -20137,7 +20145,8 @@	47	@@ -20508,7 +20516,8 @@
61	PKGTEST="no"	48	PKGTEST="no"
62	PREFIX_OPENSSL=$OPT_SSL	49	PREFIX_OPENSSL=$OPT_SSL
63		50
64	- OPENSSL_PCDIR="$OPT_SSL/lib/pkgconfig"	51	- OPENSSL_PCDIR="$OPT_SSL/lib/pkgconfig"
65	+ # Use the FreeBSD location of the pkg-config libdir	52	+ # Use the FreeBSD location of the pkgconf libdir
66	+ OPENSSL_PCDIR="$LOCALBASE/libdata/pkgconfig"	53	+ OPENSSL_PCDIR="$LOCALBASE/libdata/pkgconfig"
67	{ $as_echo "$as_me:${as_lineno-$LINENO}: PKG_CONFIG_LIBDIR will be set to \"$OPENSSL_PCDIR\"" >&5	54	{ $as_echo "$as_me:${as_lineno-$LINENO}: PKG_CONFIG_LIBDIR will be set to \"$OPENSSL_PCDIR\"" >&5
68	$as_echo "$as_me: PKG_CONFIG_LIBDIR will be set to \"$OPENSSL_PCDIR\"" >&6;}	55	$as_echo "$as_me: PKG_CONFIG_LIBDIR will be set to \"$OPENSSL_PCDIR\"" >&6;}
69	if test -f "$OPENSSL_PCDIR/openssl.pc"; then	56	if test -f "$OPENSSL_PCDIR/openssl.pc"; then
70	@@ -23231,29 +23240,30 @@	57	@@ -23925,29 +23934,30 @@
71	;;	58	;;
72	off)	59	off)
73	LIB_RTMP="-lrtmp"	60	LIB_RTMP="-lrtmp"

Lines 1-18 Link Here

(-)files/patch-lib::url.c (-18 lines)
1	Description: Different handling of signals and threads.
2	Forwarded: not-needed
3	Author: Peter Pentchev <roam@FreeBSD.org>
4	Last-Update: 2010-12-18
5
6	--- lib/url.c.orig 2012-01-23 23:31:30.000000000 +0800
7	+++ lib/url.c 2012-02-26 17:52:21.937920303 +0800
8	@@ -797,6 +797,10 @@
9	data->progress.flags \|= PGRS_HIDE;
10	data->state.current_speed = -1; /* init to negative == impossible */
11
12	+#if defined(__FreeBSD_version)
13	+ data->set.no_signal = TRUE; /* different handling of signals and threads */
14	+#endif /* __FreeBSD_version */
15	+
16	data->wildcard.state = CURLWC_INIT;
17	data->wildcard.filelist = NULL;
18	data->set.fnmatch = ZERO_NULL;