2 files changed, 10 insertions, 30 deletions
diff --git a/chat/jabberd2/patches/patch-aa b/chat/jabberd2/patches/patch-aa
index 4d92dde6a1d..2da44e996eb 100644
--- a/chat/jabberd2/patches/patch-aa
+++ b/chat/jabberd2/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.2 2004/07/14 00:25:11 xtraeme Exp $
+$NetBSD: patch-aa,v 1.3 2005/05/24 21:02:53 xtraeme Exp $
 
---- Makefile.in.orig	2004-07-14 01:57:51.000000000 +0200
-+++ Makefile.in	2004-07-14 01:58:02.000000000 +0200
-@@ -93,7 +93,7 @@
- install_sh = @install_sh@
- EXTRA_DIST = PROTOCOL Doxyfile.in README.win32
- 
+--- Makefile.in.orig	2005-05-24 22:43:59.000000000 +0200
++++ Makefile.in	2005-05-24 22:44:20.000000000 +0200
+@@ -170,7 +170,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ EXTRA_DIST = PROTOCOL Doxyfile.in README.win32 contrib
 -SUBDIRS = etc tools man expat mio scod subst sx util c2s resolver router s2s sm
 +SUBDIRS = tools man expat mio scod subst sx util c2s resolver router s2s sm
- subdir = .
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ all: config.h
+ 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+ 
diff --git a/chat/jabberd2/patches/patch-ai b/chat/jabberd2/patches/patch-ai
deleted file mode 100644
index 683f21d577d..00000000000
--- a/chat/jabberd2/patches/patch-ai
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2005/01/20 15:08:54 xtraeme Exp $
-
---- ltmain.sh.orig	Tue Nov 30 15:55:46 2004
-+++ ltmain.sh	Tue Nov 30 15:55:59 2004
-@@ -561,7 +561,6 @@
- 	    # Evaluate the configuration.
- 	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
- 	    # user sometimes does CC=<HOST>-gcc so we need to match that to 'gcc'
--	    trimedcc="${CC/${host}-}"
- 	    case "$base_compile " in
- 	    "gcc "* | " gcc "* | "${host}-gcc "* | " ${host}-gcc "*)
- 	    tagname=CC
-@@ -954,7 +953,6 @@
- 	    # Evaluate the configuration.
- 	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
- 	    # user sometimes does CC=<HOST>-gcc so we need to match that to 'gcc'
--	    trimedcc="${CC/${host}-}"
- 	    case $base_compile in
- 	    "gcc "* | " gcc "* | "${host}-gcc "* | " ${host}-gcc "*)
- 	    tagname=CC