when looking for libssl, also consider .dylib suffix

3 files changed, 29 insertions, 13 deletions

diff --git a/mail/mailsync/distinfo b/mail/mailsync/distinfo
index 095ea8551db..8f466dc43db 100644
--- a/mail/mailsync/distinfo
+++ b/mail/mailsync/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.6 2005/02/24 09:59:24 agc Exp $
+$NetBSD: distinfo,v 1.7 2008/04/20 22:47:15 dbj Exp $
 
 SHA1 (mailsync_5.2.1.orig.tar.gz) = ce32305c5d2d659ecc41d81036a78a346e97ebe0
 RMD160 (mailsync_5.2.1.orig.tar.gz) = b6aeecee769f67978632bf582ba4df3711fcca69
 Size (mailsync_5.2.1.orig.tar.gz) = 139967 bytes
-SHA1 (patch-ac) = 7805db2f99a0c06c19b30cec3bf3367cf445f717
+SHA1 (patch-ac) = 168e2342fd2a8018098bc96e66595b489d0b5a50
+SHA1 (patch-ad) = f2fb59051d63982ee9cf80bace545363dd510ee7
diff --git a/mail/mailsync/patches/patch-ac b/mail/mailsync/patches/patch-ac
index 14a2879cf63..cfd56f957e8 100644
--- a/mail/mailsync/patches/patch-ac
+++ b/mail/mailsync/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1 2004/11/16 18:56:46 adrianp Exp $
+$NetBSD: patch-ac,v 1.2 2008/04/20 22:47:15 dbj Exp $
 
---- configure.orig	2004-06-30 09:04:12.000000000 +0100
-+++ configure	2004-11-16 15:55:22.000000000 +0000
-@@ -5025,7 +5025,7 @@
+--- configure.orig	2004-06-30 01:04:12.000000000 -0700
++++ configure	2008-04-20 13:35:11.000000000 -0700
+@@ -5025,7 +5025,7 @@ if test "${with_openssl+set}" = set; the
     if test "$withval" = "no" ; then
      OPENSSLLOCATIONS=""
     else
@@ -11,16 +11,18 @@ $NetBSD: patch-ac,v 1.1 2004/11/16 18:56:46 adrianp Exp $
     fi
  
  
-@@ -5035,7 +5035,7 @@
+@@ -5035,8 +5035,8 @@ fi;
   else
    echo "$as_me:$LINENO: checking for libssl" >&5
  echo $ECHO_N "checking for libssl... $ECHO_C" >&6
 -  for p in `eval "echo {${OPENSSLLOCATIONS}}{/lib,/lib64}"` ; do
+-   if test -r "${p}/libssl.a" -o -r "${p}/libssl.so" ; then
 +  for p in ${OPENSSLLOCATIONS} ; do
-    if test -r "${p}/libssl.a" -o -r "${p}/libssl.so" ; then
++   if test -r "${p}/libssl.a" -o -r "${p}/libssl.so" -o -r "${p}/libssl.dylib" ; then
      OPENSSL_LDFLAGS="-L${p}"
      echo "$as_me:$LINENO: result: found in ${p}" >&5
-@@ -5190,7 +5190,7 @@
+ echo "${ECHO_T}found in ${p}" >&6
+@@ -5190,7 +5190,7 @@ fi
     else
      echo "$as_me:$LINENO: checking for openssl/ssl.h" >&5
  echo $ECHO_N "checking for openssl/ssl.h... $ECHO_C" >&6
@@ -29,7 +31,7 @@ $NetBSD: patch-ac,v 1.1 2004/11/16 18:56:46 adrianp Exp $
       if test -r "${p}/openssl/ssl.h" ; then
        OPENSSL_INCLUDES="-I${p}"
        echo "$as_me:$LINENO: result: found in ${p}" >&5
-@@ -5462,7 +5462,7 @@
+@@ -5462,7 +5462,7 @@ if test "${with_c_client+set}" = set; th
     if test "$withval" = "no" ; then
      CCLIENTLOCATIONS=""
     else
@@ -38,7 +40,7 @@ $NetBSD: patch-ac,v 1.1 2004/11/16 18:56:46 adrianp Exp $
     fi
  
  
-@@ -5477,7 +5477,7 @@
+@@ -5477,7 +5477,7 @@ echo "$as_me: error: a working c-client 
  
           echo "$as_me:$LINENO: checking for c-client.h" >&5
  echo $ECHO_N "checking for c-client.h... $ECHO_C" >&6
@@ -47,7 +49,7 @@ $NetBSD: patch-ac,v 1.1 2004/11/16 18:56:46 adrianp Exp $
     if test -r "${p}/c-client.h" -a -r "${p}/linkage.h" -a -r "${p}/linkage.c" ; then
      CCLIENT_INCLUDES="-I${p}"
      CCLIENT_LINKAGE_H="${p}/linkage.h"
-@@ -5501,11 +5501,11 @@
+@@ -5501,11 +5501,11 @@ echo "$as_me: error: a working c-client 
  
              echo "$as_me:$LINENO: checking for c-client library" >&5
  echo $ECHO_N "checking for c-client library... $ECHO_C" >&6
@@ -61,7 +63,7 @@ $NetBSD: patch-ac,v 1.1 2004/11/16 18:56:46 adrianp Exp $
       break
      fi
     done
-@@ -5533,7 +5533,7 @@
+@@ -5533,7 +5533,7 @@ _ACEOF
  if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
    $EGREP "auth_gss" >/dev/null 2>&1; then
  
diff --git a/mail/mailsync/patches/patch-ad b/mail/mailsync/patches/patch-ad
new file mode 100644
index 00000000000..ae8503f07c1
--- /dev/null
+++ b/mail/mailsync/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2008/04/20 22:47:15 dbj Exp $
+
+--- aclocal.m4.orig	2004-06-30 01:04:06.000000000 -0700
++++ aclocal.m4	2008-04-20 13:35:19.000000000 -0700
+@@ -933,7 +933,7 @@ AC_DEFUN(AC_WITH_OPENSSL,[
+  else
+   AC_MSG_CHECKING([for libssl])
+   for p in `eval "echo {${OPENSSLLOCATIONS}}{/lib,/lib64}"` ; do
+-   if test -r "${p}/libssl.a" -o -r "${p}/libssl.so" ; then
++   if test -r "${p}/libssl.a" -o -r "${p}/libssl.so" -o -r "${p}/libssl.dylib" ; then
+     OPENSSL_LDFLAGS="-L${p}"
+     AC_MSG_RESULT([found in ${p}])
+     break