Updated kannel to 1.4.0:

    Many bugfixes and feature additions since last update to numereous to
    list here.

5 files changed, 63 insertions, 21 deletions

diff --git a/www/kannel/Makefile b/www/kannel/Makefile
index 6ba2a063953..6124f04deac 100644
--- a/www/kannel/Makefile
+++ b/www/kannel/Makefile
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.24 2004/10/03 00:18:26 tv Exp $
+# $NetBSD: Makefile,v 1.25 2005/01/24 13:59:47 wulf Exp $
 #
 
 DISTNAME=	gateway-${KANNEL_VER}
 PKGNAME=	kannel-${KANNEL_VER}
-PKGREVISION=	5
 CATEGORIES=	www net
 MASTER_SITES=	http://www.kannel.org/download/${KANNEL_VER}/
+EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	rh@NetBSD.org
+MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.kannel.org/
 COMMENT=	Open source WAP and SMS gateway
 
-KANNEL_VER=	1.2.1
+KANNEL_VER=	1.4.0
 
 GNU_CONFIGURE=		YES
 USE_BUILDLINK3=		YES
diff --git a/www/kannel/PLIST b/www/kannel/PLIST
index 3c479ac6329..a46f3762b30 100644
--- a/www/kannel/PLIST
+++ b/www/kannel/PLIST
@@ -1,7 +1,47 @@
-@comment $NetBSD: PLIST,v 1.3 2002/08/25 21:52:11 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2005/01/24 13:59:47 wulf Exp $
+bin/gw-config
+bin/mtbatch
 bin/seewbmp
 bin/wmlsc
 bin/wmlsdasm
+include/kannel/gw-config.h
+include/kannel/gwlib/accesslog.h
+include/kannel/gwlib/cfg.h
+include/kannel/gwlib/charset.h
+include/kannel/gwlib/conn.h
+include/kannel/gwlib/counter.h
+include/kannel/gwlib/date.h
+include/kannel/gwlib/dbpool.h
+include/kannel/gwlib/dbpool_p.h
+include/kannel/gwlib/dict.h
+include/kannel/gwlib/fdset.h
+include/kannel/gwlib/gw-getopt.h
+include/kannel/gwlib/gw-prioqueue.h
+include/kannel/gwlib/gw-rwlock.h
+include/kannel/gwlib/gw_uuid.h
+include/kannel/gwlib/gw_uuid_types.h
+include/kannel/gwlib/gwassert.h
+include/kannel/gwlib/gwlib.h
+include/kannel/gwlib/gwmem.h
+include/kannel/gwlib/gwpoll.h
+include/kannel/gwlib/gwthread.h
+include/kannel/gwlib/http.h
+include/kannel/gwlib/list.h
+include/kannel/gwlib/log.h
+include/kannel/gwlib/md5.h
+include/kannel/gwlib/mime.h
+include/kannel/gwlib/octstr.h
+include/kannel/gwlib/parse.h
+include/kannel/gwlib/pcre.h
+include/kannel/gwlib/pki.h
+include/kannel/gwlib/protected.h
+include/kannel/gwlib/regex.h
+include/kannel/gwlib/semaphore.h
+include/kannel/gwlib/socket.h
+include/kannel/gwlib/ssl.h
+include/kannel/gwlib/thread.h
+include/kannel/gwlib/utils.h
+include/kannel/gwlib/xmlrpc.h
 man/man1/seewbmp.1
 man/man1/wmlsc.1
 man/man1/wmlsdasm.1
@@ -11,3 +51,5 @@ sbin/bearerbox
 sbin/run_kannel_box
 sbin/smsbox
 sbin/wapbox
+@dirrm include/kannel/gwlib
+@dirrm include/kannel
diff --git a/www/kannel/distinfo b/www/kannel/distinfo
index 9a755490ec6..6078c58ef68 100644
--- a/www/kannel/distinfo
+++ b/www/kannel/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2002/11/05 13:13:04 martti Exp $
+$NetBSD: distinfo,v 1.7 2005/01/24 13:59:47 wulf Exp $
 
-SHA1 (gateway-1.2.1.tar.gz) = 023bdf8ab9e769ef76872d4010af6bbd0da4c5ba
-Size (gateway-1.2.1.tar.gz) = 2134160 bytes
-SHA1 (patch-aa) = 5982f3ddffe19910aa433b7c47c734f18387bf0e
-SHA1 (patch-ab) = df965c5d3bf3751c46d1650eb3f8e2adcfb66277
+SHA1 (gateway-1.4.0.tar.bz2) = 095de9f42541d74cff30bba898383c84fcc629c3
+Size (gateway-1.4.0.tar.bz2) = 2132627 bytes
+SHA1 (patch-aa) = b629c1460039c47baba017c107baf4199a517341
+SHA1 (patch-ab) = 87aed599d51f03f57bb1ddb058afe34f18802d23
diff --git a/www/kannel/patches/patch-aa b/www/kannel/patches/patch-aa
index f29dc5d844d..5915c828fcf 100644
--- a/www/kannel/patches/patch-aa
+++ b/www/kannel/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2002/08/25 21:52:11 jlam Exp $
+$NetBSD: patch-aa,v 1.5 2005/01/24 13:59:47 wulf Exp $
 
---- utils/start-stop-daemon.c.orig	Mon Apr 23 16:52:29 2001
-+++ utils/start-stop-daemon.c	Sun Jul  7 21:28:04 2002
-@@ -34,8 +34,13 @@
+--- utils/start-stop-daemon.c.orig	2004-01-23 00:38:25.000000000 +1030
++++ utils/start-stop-daemon.c	2005-01-22 13:43:30.000000000 +1030
+@@ -90,8 +90,13 @@
  #elif defined(__FreeBSD__) || defined(__APPLE__)
  #define FreeBSD
  #else
@@ -16,7 +16,7 @@ $NetBSD: patch-aa,v 1.4 2002/08/25 21:52:11 jlam Exp $
  
  #ifdef HAVE_HURH_H
  #include <hurd.h>
-@@ -607,6 +612,46 @@
+@@ -663,6 +668,46 @@
  }
  #endif /*FreeBSD*/
  
@@ -63,7 +63,7 @@ $NetBSD: patch-aa,v 1.4 2002/08/25 21:52:11 jlam Exp $
  static void
  check(int pid)
  {
-@@ -641,7 +686,7 @@
+@@ -697,7 +742,7 @@
  
  /* WTA: this  needs to be an autoconf check for /proc/pid existance.
   */
@@ -72,7 +72,7 @@ $NetBSD: patch-aa,v 1.4 2002/08/25 21:52:11 jlam Exp $
  static void
  do_procinit(void)
  {
-@@ -859,7 +904,7 @@
+@@ -915,7 +960,7 @@
  		close(fd);
  		chdir("/");
  		umask(022); /* set a default for dumb programs */
diff --git a/www/kannel/patches/patch-ab b/www/kannel/patches/patch-ab
index 099d58a9054..e52950a4eeb 100644
--- a/www/kannel/patches/patch-ab
+++ b/www/kannel/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.4 2002/08/25 21:52:12 jlam Exp $
+$NetBSD: patch-ab,v 1.5 2005/01/24 13:59:47 wulf Exp $
 
---- Makefile.in.orig	Tue Jun 11 20:59:52 2002
-+++ Makefile.in	Sun Jul  7 21:30:27 2002
-@@ -90,7 +90,7 @@
+--- Makefile.in.orig	2004-08-25 07:20:09.000000000 +0930
++++ Makefile.in	2005-01-22 13:43:38.000000000 +1030
+@@ -94,7 +94,7 @@
  
  # Set this to something if you want all installed binaries to have a suffix.
  # Version number is common.