svn commit: r322824 - in head/ftp/curl: . files

[Sunpoet Po-Chuan Hsieh]

Author: sunpoet
Date: Fri Jul 12 09:02:43 2013
New Revision: 322824
URL: http://svnweb.freebsd.org/changeset/ports/322824

Log:
  - Fix build when security/openssl is installed
  - Pet portlint

Added:
     - copied unchanged from r322767, head/ftp/curl/files/patch-lib::url.c
Directory Properties:
  head/ftp/curl/files/patch-lib-url.c   (props changed)
Deleted:
  head/ftp/curl/files/patch-lib::url.c
Modified:
  head/ftp/curl/Makefile

Modified: head/ftp/curl/Makefile
==============================================================================
--- head/ftp/curl/Makefile	Fri Jul 12 08:49:32 2013	(r322823)
+++ head/ftp/curl/Makefile	Fri Jul 12 09:02:43 2013	(r322824)
@@ -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-resol
 .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:

Copied: head/ftp/curl/files/patch-lib-url.c (from r322767, head/ftp/curl/files/patch-lib::url.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/ftp/curl/files/patch-lib-url.c	Fri Jul 12 09:02:43 2013	(r322824, copy of r322767, head/ftp/curl/files/patch-lib::url.c)
@@ -0,0 +1,18 @@
+Description: Different handling of signals and threads.
+Forwarded: not-needed
+Author: Peter Pentchev <roam at 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;