From 9a0152036ecbbe5a964424f495e08505521c9f5a Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Mon, 19 Dec 2005 18:27:54 +0000
Subject: Override pth's config.guess and config.sub. Add DragonFly support.

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

diff --git a/chat/jabberd/Makefile b/chat/jabberd/Makefile
index 49ccda38632..3409916e728 100644
--- a/chat/jabberd/Makefile
+++ b/chat/jabberd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/12/05 20:49:53 rillig Exp $
+# $NetBSD: Makefile,v 1.20 2005/12/19 18:27:54 joerg Exp $
 #
 
 DISTNAME=		jabber-1.4.2
@@ -65,6 +65,8 @@ pre-configure:
 		-e "s|@PIDDIR@|${JABBERD_PIDDIR}|g" \
 		-e "s|@SPOOLDIR@|${JABBERD_SPOOLDIR}|g" \
 		${WRKSRC}/jabber.xml.in > ${WRKSRC}/jabber.xml
+	@${CP} ${PKGSRCDIR}/mk/gnu-config/config.guess ${WRKSRC}/jabberd/pth-1.4.0
+	@${CP} ${PKGSRCDIR}/mk/gnu-config/config.sub ${WRKSRC}/jabberd/pth-1.4.0
 
 do-install:
 	${INSTALL_DATA_DIR} ${EGDIR} ${LIBDIR} ${INCDIR} ${INCDIR}/lib
diff --git a/chat/jabberd/distinfo b/chat/jabberd/distinfo
index fe38185620f..9cae761855d 100644
--- a/chat/jabberd/distinfo
+++ b/chat/jabberd/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.4 2005/05/25 11:32:54 wiz Exp $
+$NetBSD: distinfo,v 1.5 2005/12/19 18:27:54 joerg 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) = 726ff89388dca237ac9acb83113a683feca8a356
+SHA1 (patch-aa) = 26ca7e04443789b78e916565772bbbfa02e72f6c
 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 b30df914945..2690500f2ef 100644
--- a/chat/jabberd/patches/patch-aa
+++ b/chat/jabberd/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2004/02/21 05:38:29 xtraeme Exp $
+$NetBSD: patch-aa,v 1.3 2005/12/19 18:27:55 joerg Exp $
 
 --- configure.orig	Mon Feb 11 20:14:06 2002
 +++ configure	Sat Feb 14 01:59:47 2004
-@@ -32,7 +32,8 @@
+@@ -32,7 +32,8 @@ MCFLAGS="$MCFLAGS -shared"
  LDFLAGS="$LDFLAGS"
  LIBS="$LIBS"
  XLDFLAGS="$XLDFLAGS "
@@ -12,7 +12,7 @@ $NetBSD: patch-aa,v 1.2 2004/02/21 05:38:29 xtraeme Exp $
  
  ##
  # Print a cool header
-@@ -76,31 +77,19 @@
+@@ -76,31 +77,19 @@ fi;
  ##
  # Pth check
  ##
@@ -57,3 +57,12 @@ $NetBSD: patch-aa,v 1.2 2004/02/21 05:38:29 xtraeme Exp $
  
  
  
+@@ -123,7 +112,7 @@ case $hosttype in
+         CFLAGS="$CFLAGS -fPIC -D_REENTRANT"
+         SLIBS="$SLIBS /usr/lib/libresolv.a";
+         LIBS="$LIBS -ldl -lsocket -lnsl -lresolv";;
+-    FreeBSD)
++    FreeBSD|DragonFly)
+ 	CFLAGS="$CFLAGS -fPIC"
+         XLDFLAGS="$XLDFLAGS -Wl,-E";;
+     NetBSD)
-- 
cgit v1.2.3