Update chat/centericq to 4.21.0

Added patches from debian to handle wrong configure check
The update should fix PR 31629

11 files changed, 222 insertions, 15 deletions

diff --git a/chat/centericq/Makefile b/chat/centericq/Makefile
index 28bf6e694dd..49321424220 100644
--- a/chat/centericq/Makefile
+++ b/chat/centericq/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.53 2005/09/19 19:42:11 adrianp Exp $
+# $NetBSD: Makefile,v 1.54 2005/10/16 19:28:03 tonio Exp $
 #
 
-DISTNAME=	centericq-4.20.0
-PKGREVISION=	2
+DISTNAME=	centericq-4.21.0
 CATEGORIES=	chat
 MASTER_SITES=	http://konst.org.ua/download/ \
 		http://centericq.de/archive/source/releases/
diff --git a/chat/centericq/distinfo b/chat/centericq/distinfo
index 43f706b836e..35fdcb39b0e 100644
--- a/chat/centericq/distinfo
+++ b/chat/centericq/distinfo
@@ -1,16 +1,24 @@
-$NetBSD: distinfo,v 1.18 2005/09/19 19:42:11 adrianp Exp $
+$NetBSD: distinfo,v 1.19 2005/10/16 19:28:03 tonio Exp $
 
-SHA1 (centericq-4.20.0.tar.bz2) = 14b37c5257039853f0a1b948c7eaa49581a5913c
-RMD160 (centericq-4.20.0.tar.bz2) = 7f17cd87aa4b98269fa65173b3e6317143c7c8ca
-Size (centericq-4.20.0.tar.bz2) = 1287040 bytes
+SHA1 (centericq-4.21.0.tar.bz2) = 26b07c4bdcbe8c6888ceab98140b33007bec8554
+RMD160 (centericq-4.21.0.tar.bz2) = 69207fcaf5c90b9ae4609221526b839659c5ccfc
+Size (centericq-4.21.0.tar.bz2) = 1422126 bytes
 SHA1 (patch-aa) = ba75c486f52d17cb9a0bf8354bf6b01b065b6716
 SHA1 (patch-ab) = 6d9beb28024666bbfef2e95cab648d7058f8136c
 SHA1 (patch-ac) = 74ae25e19bf5d250a407a937bf78405b38cc86da
 SHA1 (patch-ad) = be8ba5c952bf560b0758c97ba81c4faef04ffe49
-SHA1 (patch-ae) = 01b4bf2e26c9974b189ffe5d0361651aabaef549
+SHA1 (patch-ae) = f8e9317634f0c5d838f0309c1a59dcb2f3e55d86
 SHA1 (patch-af) = 5104572b93c4bc1872340ac4d179d74f74958fe8
 SHA1 (patch-ag) = c63b3e1011205f7635ca1710a6e5b39f7ef8986c
 SHA1 (patch-ah) = 2e643c6cfd5812f5f35a08e29cfa858902e1760b
 SHA1 (patch-ai) = 2ac32940347733dbb63e12bdd54212435795b30d
 SHA1 (patch-aj) = 1e4ea16dfc5c8eeae9b70b4bda01a2b367ea2879
 SHA1 (patch-ak) = 155067c43db79d398465bac2d70878e8b714fa8b
+SHA1 (patch-al) = 8866a5601d8242f5b309e1917abd388b47b48af0
+SHA1 (patch-am) = 5011cd97a05f332c430371382a2b27742bd0e2da
+SHA1 (patch-an) = 2fa7bea74bdd6d6aa36f071359459a549dff530a
+SHA1 (patch-ao) = 2b53f7e406046d504280b564e19e919ddd02fb9c
+SHA1 (patch-ap) = 3092f56b292a3fe57cb80ad7a9fe26d8c6842840
+SHA1 (patch-aq) = ce0db172171d874cd35c4b0293ea96f5a580810e
+SHA1 (patch-ar) = b06ba8fad9a2dbcfacb0c81e2689cca02a38dd01
+SHA1 (patch-as) = 55822a88a4fd17e57a06f0f186a6649fe3e4b092
diff --git a/chat/centericq/patches/patch-ae b/chat/centericq/patches/patch-ae
index 46dd6943eeb..72107410674 100644
--- a/chat/centericq/patches/patch-ae
+++ b/chat/centericq/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.1 2005/07/16 18:55:23 adrianp Exp $
+$NetBSD: patch-ae,v 1.2 2005/10/16 19:28:03 tonio Exp $
 
---- src/hooks/gaduhook.cc.orig	2005-01-18 23:20:17.000000000 +0000
+--- src/hooks/gaduhook.cc.orig	2005-08-25 23:39:36.000000000 +0200
 +++ src/hooks/gaduhook.cc
 @@ -893,6 +893,7 @@ static char *token_ocr(const char *ocr, 
  string gaduhook::handletoken(struct gg_http *h) {
@@ -10,12 +10,12 @@ $NetBSD: patch-ae,v 1.1 2005/07/16 18:55:23 adrianp Exp $
  
      if(!h)
  	return "";
-@@ -906,8 +907,22 @@ string gaduhook::handletoken(struct gg_h
-     if(!(t = (struct gg_token *) h->data) || !h->body)
+@@ -907,8 +908,22 @@ string gaduhook::handletoken(struct gg_h
  	return "";
  
--    fname = (getenv("TMPDIR") ? getenv("TMPDIR") : "/tmp");
--    fname += "/gg.token." + i2str(getpid());
+     do {
+-	fname = (getenv("TMPDIR") ? getenv("TMPDIR") : "/tmp");
+-	fname += "/gg.token." + i2str(getpid()) + i2str(time(0));
 +    while (tmpfilep == NULL) {
 +      char tmpnam[100];
 +      int tmpfiledes;
@@ -32,6 +32,6 @@ $NetBSD: patch-ae,v 1.1 2005/07/16 18:55:23 adrianp Exp $
 +      }
 +      fname = tmpnam;
 +    }
+     } while(!access(fname.c_str(), F_OK));
  
      ofstream bf(fname.c_str());
- 
diff --git a/chat/centericq/patches/patch-al b/chat/centericq/patches/patch-al
new file mode 100644
index 00000000000..6c2168a6d2f
--- /dev/null
+++ b/chat/centericq/patches/patch-al
@@ -0,0 +1,25 @@
+$NetBSD: patch-al,v 1.1 2005/10/16 19:28:03 tonio Exp $
+
+--- connwrap-0.1/configure.orig	2005-09-02 16:45:54.000000000 +0200
++++ connwrap-0.1/configure
+@@ -388,13 +388,13 @@ EOF
+     ;;
+ 
+   *)
+-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
+-      echo "configure: warning: $ac_option: invalid host type" 1>&2
+-    fi
+-    if test "x$nonopt" != xNONE; then
+-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
+-    fi
+-    nonopt="$ac_option"
++    #if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
++    #  echo "configure: warning: $ac_option: invalid host type" 1>&2
++    #fi
++    #if test "x$nonopt" != xNONE; then
++    #  { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
++    #fi
++    #nonopt="$ac_option"
+     ;;
+ 
+   esac
diff --git a/chat/centericq/patches/patch-am b/chat/centericq/patches/patch-am
new file mode 100644
index 00000000000..905db050a86
--- /dev/null
+++ b/chat/centericq/patches/patch-am
@@ -0,0 +1,25 @@
+$NetBSD: patch-am,v 1.1 2005/10/16 19:28:03 tonio Exp $
+
+--- kkconsui-0.1/configure.orig	2005-09-02 16:45:56.000000000 +0200
++++ kkconsui-0.1/configure
+@@ -387,13 +387,13 @@ EOF
+     ;;
+ 
+   *)
+-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
+-      echo "configure: warning: $ac_option: invalid host type" 1>&2
+-    fi
+-    if test "x$nonopt" != xNONE; then
+-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
+-    fi
+-    nonopt="$ac_option"
++    #if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
++    #  echo "configure: warning: $ac_option: invalid host type" 1>&2
++    #fi
++    #if test "x$nonopt" != xNONE; then
++    #  { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
++    #fi
++    #nonopt="$ac_option"
+     ;;
+ 
+   esac
diff --git a/chat/centericq/patches/patch-an b/chat/centericq/patches/patch-an
new file mode 100644
index 00000000000..a5f6293aee9
--- /dev/null
+++ b/chat/centericq/patches/patch-an
@@ -0,0 +1,25 @@
+$NetBSD: patch-an,v 1.1 2005/10/16 19:28:03 tonio Exp $
+
+--- kkstrtext-0.1/configure.orig	2005-09-02 16:45:56.000000000 +0200
++++ kkstrtext-0.1/configure
+@@ -387,13 +387,13 @@ EOF
+     ;;
+ 
+   *)
+-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
+-      echo "configure: warning: $ac_option: invalid host type" 1>&2
+-    fi
+-    if test "x$nonopt" != xNONE; then
+-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
+-    fi
+-    nonopt="$ac_option"
++    #if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
++    #  echo "configure: warning: $ac_option: invalid host type" 1>&2
++    #fi
++    #if test "x$nonopt" != xNONE; then
++    #  { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
++    #fi
++    #nonopt="$ac_option"
+     ;;
+ 
+   esac
diff --git a/chat/centericq/patches/patch-ao b/chat/centericq/patches/patch-ao
new file mode 100644
index 00000000000..6d4d7b8e44a
--- /dev/null
+++ b/chat/centericq/patches/patch-ao
@@ -0,0 +1,25 @@
+$NetBSD: patch-ao,v 1.1 2005/10/16 19:28:03 tonio Exp $
+
+--- kksystr-0.1/configure.orig	2005-09-02 16:45:56.000000000 +0200
++++ kksystr-0.1/configure
+@@ -380,13 +380,13 @@ EOF
+     ;;
+ 
+   *)
+-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
+-      echo "configure: warning: $ac_option: invalid host type" 1>&2
+-    fi
+-    if test "x$nonopt" != xNONE; then
+-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
+-    fi
+-    nonopt="$ac_option"
++    #if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
++    #  echo "configure: warning: $ac_option: invalid host type" 1>&2
++    #fi
++    #if test "x$nonopt" != xNONE; then
++    #  { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
++    #fi
++    #nonopt="$ac_option"
+     ;;
+ 
+   esac
diff --git a/chat/centericq/patches/patch-ap b/chat/centericq/patches/patch-ap
new file mode 100644
index 00000000000..d9bc054ea60
--- /dev/null
+++ b/chat/centericq/patches/patch-ap
@@ -0,0 +1,25 @@
+$NetBSD: patch-ap,v 1.1 2005/10/16 19:28:03 tonio Exp $
+
+--- libicq2000-0.1/configure.orig	2005-09-02 16:45:58.000000000 +0200
++++ libicq2000-0.1/configure
+@@ -380,13 +380,13 @@ EOF
+     ;;
+ 
+   *)
+-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
+-      echo "configure: warning: $ac_option: invalid host type" 1>&2
+-    fi
+-    if test "x$nonopt" != xNONE; then
+-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
+-    fi
+-    nonopt="$ac_option"
++    #if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
++    #  echo "configure: warning: $ac_option: invalid host type" 1>&2
++    #fi
++    #if test "x$nonopt" != xNONE; then
++    #  { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
++    #fi
++    #nonopt="$ac_option"
+     ;;
+ 
+   esac
diff --git a/chat/centericq/patches/patch-aq b/chat/centericq/patches/patch-aq
new file mode 100644
index 00000000000..e093f894f6c
--- /dev/null
+++ b/chat/centericq/patches/patch-aq
@@ -0,0 +1,25 @@
+$NetBSD: patch-aq,v 1.1 2005/10/16 19:28:03 tonio Exp $
+
+--- libjabber-0.1/configure.orig	2005-09-02 16:45:58.000000000 +0200
++++ libjabber-0.1/configure
+@@ -382,13 +382,13 @@ EOF
+     ;;
+ 
+   *)
+-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
+-      echo "configure: warning: $ac_option: invalid host type" 1>&2
+-    fi
+-    if test "x$nonopt" != xNONE; then
+-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
+-    fi
+-    nonopt="$ac_option"
++    #if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
++    #  echo "configure: warning: $ac_option: invalid host type" 1>&2
++    #fi
++    #if test "x$nonopt" != xNONE; then
++    #  { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
++    #fi
++    #nonopt="$ac_option"
+     ;;
+ 
+   esac
diff --git a/chat/centericq/patches/patch-ar b/chat/centericq/patches/patch-ar
new file mode 100644
index 00000000000..abd4f21900d
--- /dev/null
+++ b/chat/centericq/patches/patch-ar
@@ -0,0 +1,25 @@
+$NetBSD: patch-ar,v 1.1 2005/10/16 19:28:03 tonio Exp $
+
+--- libmsn-0.1/configure.orig	2005-09-02 16:45:59.000000000 +0200
++++ libmsn-0.1/configure
+@@ -384,13 +384,13 @@ EOF
+     ;;
+ 
+   *)
+-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
+-      echo "configure: warning: $ac_option: invalid host type" 1>&2
+-    fi
+-    if test "x$nonopt" != xNONE; then
+-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
+-    fi
+-    nonopt="$ac_option"
++    #if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
++    #  echo "configure: warning: $ac_option: invalid host type" 1>&2
++    #fi
++    #if test "x$nonopt" != xNONE; then
++    #  { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
++    #fi
++    #nonopt="$ac_option"
+     ;;
+ 
+   esac
diff --git a/chat/centericq/patches/patch-as b/chat/centericq/patches/patch-as
new file mode 100644
index 00000000000..0a43c2c607d
--- /dev/null
+++ b/chat/centericq/patches/patch-as
@@ -0,0 +1,25 @@
+$NetBSD: patch-as,v 1.1 2005/10/16 19:28:03 tonio Exp $
+
+--- libyahoo2-0.1/configure.orig	2005-09-02 16:45:59.000000000 +0200
++++ libyahoo2-0.1/configure
+@@ -382,13 +382,13 @@ EOF
+     ;;
+ 
+   *)
+-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
+-      echo "configure: warning: $ac_option: invalid host type" 1>&2
+-    fi
+-    if test "x$nonopt" != xNONE; then
+-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
+-    fi
+-    nonopt="$ac_option"
++    #if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
++    #  echo "configure: warning: $ac_option: invalid host type" 1>&2
++    #fi
++    #if test "x$nonopt" != xNONE; then
++    #  { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
++    #fi
++    #nonopt="$ac_option"
+     ;;
+ 
+   esac