Sun Aug 3 05:17:40 2008 UTC ()
Force to pick up prefer OpenSSL.
Fixes PR 39198.


(obache)
diff -r1.30 -r1.31 pkgsrc/chat/jabberd/Makefile
diff -r1.6 -r1.7 pkgsrc/chat/jabberd/distinfo
diff -r1.4 -r1.5 pkgsrc/chat/jabberd/patches/patch-aa
cvs diff -r1.30 -r1.31 pkgsrc/chat/jabberd/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/chat/jabberd/Attic/Makefile 2008/03/03 02:19:52 1.30
+++ pkgsrc/chat/jabberd/Attic/Makefile 2008/08/03 05:17:40 1.31
@@ -1,38 +1,39 @@ @@ -1,38 +1,39 @@
1# $NetBSD: Makefile,v 1.30 2008/03/03 02:19:52 jlam Exp $ 1# $NetBSD: Makefile,v 1.31 2008/08/03 05:17:40 obache Exp $
2# 2#
3 3
4DISTNAME= jabber-1.4.2 4DISTNAME= jabber-1.4.2
5PKGNAME= jabberd-1.4.2 5PKGNAME= jabberd-1.4.2
6PKGREVISION= 6 6PKGREVISION= 6
7CATEGORIES= chat 7CATEGORIES= chat
8MASTER_SITES= http://download.jabberd.org/jabberd14/ 8MASTER_SITES= http://download.jabberd.org/jabberd14/
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://jabberstudio.org/projects/jabberd 11HOMEPAGE= http://jabberstudio.org/projects/jabberd
12COMMENT= Instant messaging server 12COMMENT= Instant messaging server
13 13
14CONFLICTS= jabberd2-[0-9]* 14CONFLICTS= jabberd2-[0-9]*
15 15
16PKG_INSTALLATION_TYPES= overwrite pkgviews 16PKG_INSTALLATION_TYPES= overwrite pkgviews
17PKG_DESTDIR_SUPPORT= user-destdir 17PKG_DESTDIR_SUPPORT= user-destdir
18 18
19# A self-made configure script, and GNU ones in subdirectories. 19# A self-made configure script, and GNU ones in subdirectories.
20HAS_CONFIGURE= yes 20HAS_CONFIGURE= yes
21OVERRIDE_GNU_CONFIG_SCRIPTS= yes 21OVERRIDE_GNU_CONFIG_SCRIPTS= yes
22USE_TOOLS+= gmake 22USE_TOOLS+= gmake
23 23
24CONFIGURE_ARGS+= --enable-ssl 24CONFIGURE_ARGS+= --enable-ssl
25CONFIGURE_ENV+= prefix=${PREFIX} 25CONFIGURE_ENV+= prefix=${PREFIX}
 26CONFIGURE_ENV+= SSLBASE=${SSLBASE}
26 27
27RCD_SCRIPTS= jabberd 28RCD_SCRIPTS= jabberd
28PKG_SYSCONFSUBDIR= jabberd 29PKG_SYSCONFSUBDIR= jabberd
29 30
30EGDIR= ${PREFIX}/share/examples/jabberd 31EGDIR= ${PREFIX}/share/examples/jabberd
31LIBDIR= ${PREFIX}/lib/jabberd 32LIBDIR= ${PREFIX}/lib/jabberd
32INCDIR= ${PREFIX}/include/jabberd 33INCDIR= ${PREFIX}/include/jabberd
33 34
34.include "options.mk" 35.include "options.mk"
35 36
36# some systems don't have u_intN_t 37# some systems don't have u_intN_t
37CPPFLAGS+= -Du_int8_t=uint8_t 38CPPFLAGS+= -Du_int8_t=uint8_t
38 39
cvs diff -r1.6 -r1.7 pkgsrc/chat/jabberd/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/chat/jabberd/Attic/distinfo 2008/08/02 20:32:09 1.6
+++ pkgsrc/chat/jabberd/Attic/distinfo 2008/08/03 05:17:40 1.7
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.6 2008/08/02 20:32:09 dholland Exp $ 1$NetBSD: distinfo,v 1.7 2008/08/03 05:17:40 obache Exp $
2 2
3SHA1 (jabber-1.4.2.tar.gz) = aa0bc2e9815e4fa4a1ca8ba7f320bfd3c85ba11f 3SHA1 (jabber-1.4.2.tar.gz) = aa0bc2e9815e4fa4a1ca8ba7f320bfd3c85ba11f
4RMD160 (jabber-1.4.2.tar.gz) = bff5a02d3b76243ce59ddb66873ca1c51ef4bb5f 4RMD160 (jabber-1.4.2.tar.gz) = bff5a02d3b76243ce59ddb66873ca1c51ef4bb5f
5Size (jabber-1.4.2.tar.gz) = 690217 bytes 5Size (jabber-1.4.2.tar.gz) = 690217 bytes
6SHA1 (patch-aa) = d1fbf5a5533367ff689114c4d5e9099cfa308649 6SHA1 (patch-aa) = 5e62a744f35697961fc6708c2be2c374a9782505
7SHA1 (patch-ab) = 8722b0db3870e14eaf3e40f5493544db8a813fc1 7SHA1 (patch-ab) = 8722b0db3870e14eaf3e40f5493544db8a813fc1
8SHA1 (patch-ac) = 3b17761c9ea2d1e17f3194ac8cf54fbca4c80367 8SHA1 (patch-ac) = 3b17761c9ea2d1e17f3194ac8cf54fbca4c80367
9SHA1 (patch-ad) = 0e8f2faa154e8c147b129aa3ca3cfd2dbaff1093 9SHA1 (patch-ad) = 0e8f2faa154e8c147b129aa3ca3cfd2dbaff1093
cvs diff -r1.4 -r1.5 pkgsrc/chat/jabberd/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/chat/jabberd/patches/Attic/patch-aa 2008/08/02 20:32:10 1.4
+++ pkgsrc/chat/jabberd/patches/Attic/patch-aa 2008/08/03 05:17:40 1.5
@@ -1,27 +1,36 @@ @@ -1,27 +1,36 @@
1$NetBSD: patch-aa,v 1.4 2008/08/02 20:32:10 dholland Exp $ 1$NetBSD: patch-aa,v 1.5 2008/08/03 05:17:40 obache Exp $
2 2
3--- configure.orig 2002-02-11 14:14:06.000000000 -0500 3--- configure.orig 2002-02-11 19:14:06.000000000 +0000
4+++ configure 2008-08-02 16:29:13.000000000 -0400 4+++ configure
5@@ -32,7 +32,8 @@ MCFLAGS="$MCFLAGS -shared" 5@@ -32,7 +32,8 @@ MCFLAGS="$MCFLAGS -shared"
6 LDFLAGS="$LDFLAGS" 6 LDFLAGS="$LDFLAGS"
7 LIBS="$LIBS" 7 LIBS="$LIBS"
8 XLDFLAGS="$XLDFLAGS " 8 XLDFLAGS="$XLDFLAGS "
9-JHOME=`pwd` 9-JHOME=`pwd`
10+JHOME=${PKG_SYSCONFDIR} 10+JHOME=${PKG_SYSCONFDIR}
11+WRKSRC="`cat .wrksrc-freebsd`" 11+WRKSRC="`cat .wrksrc-freebsd`"
12  12
13 ## 13 ##
14 # Print a cool header 14 # Print a cool header
 15@@ -45,7 +46,7 @@ printf "========================\n\n"
 16 ##
 17 if [ $WANT_SSL -eq 1 ]; then
 18 printf "Searching for SSL...";
 19- for dir in ${prefix} /usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr; do
 20+ for dir in ${SSLBASE}; do
 21 ssldir="$dir"
 22 if test -f "$dir/include/openssl/ssl.h"; then
 23 found_ssl="yes";
15@@ -76,31 +77,19 @@ fi; 24@@ -76,31 +77,19 @@ fi;
16 ## 25 ##
17 # Pth check 26 # Pth check
18 ## 27 ##
19-printf "Getting pth settings..." 28-printf "Getting pth settings..."
20-PTH_CFLAGS=`pth-config --cflags` 29-PTH_CFLAGS=`pth-config --cflags`
21-PTH_LDFLAGS=`pth-config --ldflags` 30-PTH_LDFLAGS=`pth-config --ldflags`
22-PTH_LIBS=`pth-config --libs` 31-PTH_LIBS=`pth-config --libs`
23-PTH_LIBDIR=`pth-config --libdir` 32-PTH_LIBDIR=`pth-config --libdir`
24-if [ -n "$PTH_CFLAGS" ]; then 33-if [ -n "$PTH_CFLAGS" ]; then
25- CFLAGS="$CFLAGS $PTH_CFLAGS"; 34- CFLAGS="$CFLAGS $PTH_CFLAGS";
26- LDFLAGS="$LDFLAGS $PTH_LDFLAGS"; 35- LDFLAGS="$LDFLAGS $PTH_LDFLAGS";
27- LIBS="$LIBS $PTH_LIBS"; 36- LIBS="$LIBS $PTH_LIBS";