diff options
author | Stanislav Sedov <stas@FreeBSD.org> | 2008-03-15 14:13:05 +0000 |
---|---|---|
committer | Stanislav Sedov <stas@FreeBSD.org> | 2008-03-15 14:13:05 +0000 |
commit | 22e34d48162aaec6e07312a60f060d550079a961 (patch) | |
tree | 9da5b239d31b65a9a998374fbec7eb85e97c50a6 /net/ecore-con | |
parent | a9dff0bde845f39b871924efb9078aaca45b7206 (diff) |
- Fix openssl dependency checking in configure script.
Reported by: lippe
Notes
Notes:
svn path=/head/; revision=209116
Diffstat (limited to 'net/ecore-con')
-rw-r--r-- | net/ecore-con/Makefile | 2 | ||||
-rw-r--r-- | net/ecore-con/files/patch-configure | 39 |
2 files changed, 14 insertions, 27 deletions
diff --git a/net/ecore-con/Makefile b/net/ecore-con/Makefile index 0c72e6d2252e..9d867682b317 100644 --- a/net/ecore-con/Makefile +++ b/net/ecore-con/Makefile @@ -7,7 +7,7 @@ PORTNAME= con PORTVERSION= 0.9.9.042 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/ \ http://download.enlightenment.org/snapshots/2008-01-25/ diff --git a/net/ecore-con/files/patch-configure b/net/ecore-con/files/patch-configure index f94b78947228..9c95cd81df94 100644 --- a/net/ecore-con/files/patch-configure +++ b/net/ecore-con/files/patch-configure @@ -1,18 +1,9 @@ ---- configure.orig 2008-02-23 22:33:06.000000000 +0300 -+++ configure 2008-02-23 22:36:34.000000000 +0300 -@@ -20543,94 +20543,15 @@ - if test "${enable_openssl+set}" = set; then - enableval=$enable_openssl; want_openssl=$enableval +--- configure.orig 2008-03-15 01:32:14.000000000 +0300 ++++ configure 2008-03-15 01:37:43.000000000 +0300 +@@ -20552,70 +20552,9 @@ + { echo "$as_me:$LINENO: checking for SSL" >&5 + echo $ECHO_N "checking for SSL... $ECHO_C" >&6; } --fi -- -- --if test "x$want_openssl" = "xyes"; then -- --pkg_failed=no --{ echo "$as_me:$LINENO: checking for SSL" >&5 --echo $ECHO_N "checking for SSL... $ECHO_C" >&6; } -- -if test -n "$PKG_CONFIG"; then - if test -n "$SSL_CFLAGS"; then - pkg_cv_SSL_CFLAGS="$SSL_CFLAGS" @@ -73,25 +64,21 @@ - -elif test $pkg_failed = untried; then - have_openssl="no" -- + -else - SSL_CFLAGS=$pkg_cv_SSL_CFLAGS - SSL_LIBS=$pkg_cv_SSL_LIBS -- { echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6; } -- -- - cat >>confdefs.h <<\_ACEOF - #define USE_OPENSSL 1 - _ACEOF ++ SSL_CFLAGS="" ++ SSL_LIBS="-lssl -lcrypto" + { echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6; } -- requirements_ecore_con="$requirements_ecore_con openssl" +@@ -20628,8 +20567,6 @@ # no need to add it to req_ecore_ipc, since they # depends on ecore_con anyway. have_openssl="yes" - - fi +- -fi + fi want_curl="yes" - have_curl="no" |