summaryrefslogtreecommitdiff
path: root/ftp
diff options
context:
space:
mode:
authorSunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>2013-07-12 09:02:43 +0000
committerSunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>2013-07-12 09:02:43 +0000
commitfa34a754b3c442d7a15b13918dd52a87fd1c854c (patch)
treef8d678fa944a3ca7806bb650171783f0b5eca5e6 /ftp
parent- update to 0.33 (diff)
- Fix build when security/openssl is installed
- Pet portlint
Notes
Notes: svn path=/head/; revision=322824
Diffstat (limited to 'ftp')
-rw-r--r--ftp/curl/Makefile8
-rw-r--r--ftp/curl/files/patch-lib-url.c (renamed from ftp/curl/files/patch-lib::url.c)0
2 files changed, 5 insertions, 3 deletions
diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile
index 97188b56c580..f19fe7b8fb8e 100644
--- a/ftp/curl/Makefile
+++ b/ftp/curl/Makefile
@@ -198,8 +198,10 @@ CONFIGURE_ARGS+=--disable-ntlm
.endif
.if ${PORT_OPTIONS:MOPENSSL}
-USE_OPENSSL= yes
CONFIGURE_ARGS+=--with-ssl=${OPENSSLBASE}
+CPPFLAGS+= -I${OPENSSLINC}
+LDFLAGS+= -L${OPENSSLLIB}
+USE_OPENSSL= yes
.else
CONFIGURE_ARGS+=--without-ssl
.endif
@@ -239,9 +241,9 @@ CONFIGURE_ARGS+=--disable-threaded-resolver
.endif
.if ${PORT_OPTIONS:MTLS_SRP}
-CONFIGURE_ARGS+= --enable-tls-srp
+CONFIGURE_ARGS+=--enable-tls-srp
.else
-CONFIGURE_ARGS+= --disable-tls-srp
+CONFIGURE_ARGS+=--disable-tls-srp
.endif
post-patch:
diff --git a/ftp/curl/files/patch-lib::url.c b/ftp/curl/files/patch-lib-url.c
index 02d05e16997b..02d05e16997b 100644
--- a/ftp/curl/files/patch-lib::url.c
+++ b/ftp/curl/files/patch-lib-url.c