From 07059723af9bcb7deca2fdebb41e108448a1cf2f Mon Sep 17 00:00:00 2001
From: obache <obache>
Date: Sun, 3 Aug 2008 05:17:40 +0000
Subject: Force to pick up prefer OpenSSL. Fixes PR 39198.

---
 chat/jabberd/Makefile         |  3 ++-
 chat/jabberd/distinfo         |  4 ++--
 chat/jabberd/patches/patch-aa | 15 ++++++++++++---
 3 files changed, 16 insertions(+), 6 deletions(-)

(limited to 'chat/jabberd')

diff --git a/chat/jabberd/Makefile b/chat/jabberd/Makefile
index de7ae914b9a..f6428795ca8 100644
--- a/chat/jabberd/Makefile
+++ b/chat/jabberd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2008/03/03 02:19:52 jlam Exp $
+# $NetBSD: Makefile,v 1.31 2008/08/03 05:17:40 obache Exp $
 #
 
 DISTNAME=		jabber-1.4.2
@@ -23,6 +23,7 @@ USE_TOOLS+=			gmake
 
 CONFIGURE_ARGS+=	--enable-ssl
 CONFIGURE_ENV+=		prefix=${PREFIX}
+CONFIGURE_ENV+=		SSLBASE=${SSLBASE}
 
 RCD_SCRIPTS=		jabberd
 PKG_SYSCONFSUBDIR=	jabberd
diff --git a/chat/jabberd/distinfo b/chat/jabberd/distinfo
index 90a3bc82b99..2a71593f598 100644
--- a/chat/jabberd/distinfo
+++ b/chat/jabberd/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2008/08/02 20:32:09 dholland Exp $
+$NetBSD: distinfo,v 1.7 2008/08/03 05:17:40 obache Exp $
 
 SHA1 (jabber-1.4.2.tar.gz) = aa0bc2e9815e4fa4a1ca8ba7f320bfd3c85ba11f
 RMD160 (jabber-1.4.2.tar.gz) = bff5a02d3b76243ce59ddb66873ca1c51ef4bb5f
 Size (jabber-1.4.2.tar.gz) = 690217 bytes
-SHA1 (patch-aa) = d1fbf5a5533367ff689114c4d5e9099cfa308649
+SHA1 (patch-aa) = 5e62a744f35697961fc6708c2be2c374a9782505
 SHA1 (patch-ab) = 8722b0db3870e14eaf3e40f5493544db8a813fc1
 SHA1 (patch-ac) = 3b17761c9ea2d1e17f3194ac8cf54fbca4c80367
 SHA1 (patch-ad) = 0e8f2faa154e8c147b129aa3ca3cfd2dbaff1093
diff --git a/chat/jabberd/patches/patch-aa b/chat/jabberd/patches/patch-aa
index 0d2d264f2db..ded076a1a65 100644
--- a/chat/jabberd/patches/patch-aa
+++ b/chat/jabberd/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.4 2008/08/02 20:32:10 dholland Exp $
+$NetBSD: patch-aa,v 1.5 2008/08/03 05:17:40 obache Exp $
 
---- configure.orig	2002-02-11 14:14:06.000000000 -0500
-+++ configure	2008-08-02 16:29:13.000000000 -0400
+--- configure.orig	2002-02-11 19:14:06.000000000 +0000
++++ configure
 @@ -32,7 +32,8 @@ MCFLAGS="$MCFLAGS -shared"
  LDFLAGS="$LDFLAGS"
  LIBS="$LIBS"
@@ -12,6 +12,15 @@ $NetBSD: patch-aa,v 1.4 2008/08/02 20:32:10 dholland Exp $
  
  ##
  # Print a cool header
+@@ -45,7 +46,7 @@ printf "========================\n\n"
+ ##
+ if [ $WANT_SSL -eq 1 ]; then
+     printf "Searching for SSL...";
+-    for dir in ${prefix} /usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr; do
++    for dir in ${SSLBASE}; do
+         ssldir="$dir"
+         if test -f "$dir/include/openssl/ssl.h"; then
+             found_ssl="yes";
 @@ -76,31 +77,19 @@ fi;
  ##
  # Pth check
-- 
cgit v1.2.3