[pkgsrc/pkgsrc-2008Q2]: pkgsrc/chat/jabberd pullup ticket #2484 - requested b...

[rtr <rtr%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/704c38ce5419
branches:  pkgsrc-2008Q2
changeset: 544247:704c38ce5419
user:      rtr <rtr%pkgsrc.org@localhost>
date:      Thu Aug 14 08:31:46 2008 +0000

description:
pullup ticket #2484 - requested by obache
jabberd: force preference on openssl (fixes pr)

revisions pulled up:
pkgsrc/chat/jabberd/Makefile            1.31
pkgsrc/chat/jabberd/distinfo            1.7
pkgsrc/chat/jabberd/patches/patch-aa    1.5

   Module Name: pkgsrc
   Committed By:        obache
   Date:                Sun Aug  3 05:17:40 UTC 2008

   Modified Files:
        pkgsrc/chat/jabberd: Makefile distinfo
        pkgsrc/chat/jabberd/patches: patch-aa

   Log Message:
   Force to pick up prefer OpenSSL.
   Fixes PR 39198.

diffstat:

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

diffs (79 lines):

diff -r 2fa5ee5e025e -r 704c38ce5419 chat/jabberd/Makefile
--- a/chat/jabberd/Makefile     Thu Aug 14 08:20:32 2008 +0000
+++ b/chat/jabberd/Makefile     Thu Aug 14 08:31:46 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2008/03/03 02:19:52 jlam Exp $
+# $NetBSD: Makefile,v 1.30.6.1 2008/08/14 08:31:46 rtr Exp $
 #
 
 DISTNAME=              jabber-1.4.2
@@ -23,6 +23,7 @@
 
 CONFIGURE_ARGS+=       --enable-ssl
 CONFIGURE_ENV+=                prefix=${PREFIX}
+CONFIGURE_ENV+=                SSLBASE=${SSLBASE}
 
 RCD_SCRIPTS=           jabberd
 PKG_SYSCONFSUBDIR=     jabberd
diff -r 2fa5ee5e025e -r 704c38ce5419 chat/jabberd/distinfo
--- a/chat/jabberd/distinfo     Thu Aug 14 08:20:32 2008 +0000
+++ b/chat/jabberd/distinfo     Thu Aug 14 08:31:46 2008 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.5 2005/12/19 18:27:54 joerg Exp $
+$NetBSD: distinfo,v 1.5.24.1 2008/08/14 08:31:46 rtr 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) = 26ca7e04443789b78e916565772bbbfa02e72f6c
+SHA1 (patch-aa) = 5e62a744f35697961fc6708c2be2c374a9782505
 SHA1 (patch-ab) = 8722b0db3870e14eaf3e40f5493544db8a813fc1
 SHA1 (patch-ac) = 3b17761c9ea2d1e17f3194ac8cf54fbca4c80367
 SHA1 (patch-ad) = 0e8f2faa154e8c147b129aa3ca3cfd2dbaff1093
diff -r 2fa5ee5e025e -r 704c38ce5419 chat/jabberd/patches/patch-aa
--- a/chat/jabberd/patches/patch-aa     Thu Aug 14 08:20:32 2008 +0000
+++ b/chat/jabberd/patches/patch-aa     Thu Aug 14 08:31:46 2008 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.3 2005/12/19 18:27:55 joerg Exp $
+$NetBSD: patch-aa,v 1.3.24.1 2008/08/14 08:31:46 rtr Exp $
 
---- configure.orig     Mon Feb 11 20:14:06 2002
-+++ configure  Sat Feb 14 01:59:47 2004
+--- 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 @@
  
  ##
  # 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
@@ -57,7 +66,7 @@
  
  
  
-@@ -123,7 +112,7 @@ case $hosttype in
+@@ -123,10 +112,11 @@ case $hosttype in
          CFLAGS="$CFLAGS -fPIC -D_REENTRANT"
          SLIBS="$SLIBS /usr/lib/libresolv.a";
          LIBS="$LIBS -ldl -lsocket -lnsl -lresolv";;
@@ -66,3 +75,7 @@
        CFLAGS="$CFLAGS -fPIC"
          XLDFLAGS="$XLDFLAGS -Wl,-E";;
      NetBSD)
++      CFLAGS="$CFLAGS -fPIC"
+         LIBS="$LIBS -lresolv"
+         SLIBS="$SLIBS /usr/lib/libresolv.a";
+         XLDFLAGS="$XLDFLAGS -Wl,--export-dynamic";;