diff options
| author | Mathieu Arnold <mat@FreeBSD.org> | 2016-10-21 15:21:13 +0000 |
|---|---|---|
| committer | Mathieu Arnold <mat@FreeBSD.org> | 2016-10-21 15:21:13 +0000 |
| commit | a0bcd2cf684ff6bc2faf242e6678282f20a3ee44 (patch) | |
| tree | a5029ff30555b3a7ee0621f4dd5aacb832fde1d8 /ftp/curl | |
| parent | b7fb6d6f05e67910c9ecd4b0e0e1e0a130f8f54f (diff) | |
| download | ports-a0bcd2cf684ff6bc2faf242e6678282f20a3ee44.tar.gz ports-a0bcd2cf684ff6bc2faf242e6678282f20a3ee44.zip | |
Notes
Diffstat (limited to 'ftp/curl')
| -rw-r--r-- | ftp/curl/Makefile | 2 | ||||
| -rw-r--r-- | ftp/curl/files/patch-configure | 10 |
2 files changed, 1 insertions, 11 deletions
diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile index 60fa37f535a0..630210937fc0 100644 --- a/ftp/curl/Makefile +++ b/ftp/curl/Makefile @@ -158,7 +158,7 @@ IGNORE= unsupported TLS-SRP in LibreSSL post-patch: @${REINPLACE_CMD} -e '/^SUBDIRS = / s|$$| docs scripts|; /^DIST_SUBDIRS = / s| docs scripts||; /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 + @${REINPLACE_CMD} -e 's|\(flags_dbg_off=\)".*"|\1""|; s|\(flags_opt_off=\)".*"|\1""|' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|include <gssapi.h>|include <gssapi/gssapi.h>|' ${WRKSRC}/lib/curl_gssapi.h ${WRKSRC}/lib/urldata.h .if !defined(BUILDING_HIPHOP) diff --git a/ftp/curl/files/patch-configure b/ftp/curl/files/patch-configure index be10172e26d8..86d89feb6516 100644 --- a/ftp/curl/files/patch-configure +++ b/ftp/curl/files/patch-configure @@ -70,16 +70,6 @@ Last-Update: 2010-12-19 if test "$want_optimize" = "yes"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts optimizer enabling options" >&5 -@@ -21417,7 +21425,8 @@ if test "$curl_ssl_msg" = "$init_ssl_msg - 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 @@ -25050,29 +25059,30 @@ $as_echo "found" >&6; } ;; off) |