Updated kannel to 1.2.0

This is the latest stable version (lots of bug fixes).

6 files changed, 31 insertions, 49 deletions

diff --git a/www/kannel/Makefile b/www/kannel/Makefile
index e3ffb9c2934..b96f7504015 100644
--- a/www/kannel/Makefile
+++ b/www/kannel/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.10 2002/08/01 05:48:24 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2002/08/22 11:31:33 martti Exp $
 #
 
 DISTNAME=	gateway-${KANNEL_VER}
 PKGNAME=	kannel-${KANNEL_VER}
 CATEGORIES=	www net
-MASTER_SITES=	http://www.kannel.3glab.org/download/${KANNEL_VER}/
+MASTER_SITES=	http://www.kannel.org/download/${KANNEL_VER}/
 
 MAINTAINER=	rh@netbsd.org
-HOMEPAGE=	http://www.kannel.org/
-COMMENT=	open source WAP and SMS gateway
+HOMEPAGE=	http://www.kannel.org
+COMMENT=	Open source WAP and SMS gateway
 
-KANNEL_VER=	1.0.3
+KANNEL_VER=	1.2.0
 
 GNU_CONFIGURE=		YES
 USE_BUILDLINK_ONLY=	YES
@@ -19,6 +19,7 @@ USE_PERL5=		YES
 PTHREAD_OPTS+=		require
 
 CONFIGURE_ARGS+=	--disable-docs
+CONFIGURE_ARGS+=	--disable-ssl
 
 .include "../../textproc/libxml2/buildlink.mk"
 .include "../../mk/pthread.buildlink.mk"
diff --git a/www/kannel/PLIST b/www/kannel/PLIST
index b97a1c3acba..2ccc25843f3 100644
--- a/www/kannel/PLIST
+++ b/www/kannel/PLIST
@@ -1,9 +1,13 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 02:17:14 zuntum Exp $
-bin/bearerbox
-bin/smsbox
-bin/wapbox
+@comment $NetBSD: PLIST,v 1.2 2002/08/22 11:31:33 martti Exp $
+bin/seewbmp
 bin/wmlsc
 bin/wmlsdasm
-bin/seewbmp
-bin/run_kannel_box
-bin/start-stop-daemon
+man/man1/seewbmp.1
+man/man1/wmlsc.1
+man/man1/wmlsdasm.1
+man/man8/kannel.8
+man/man8/run_kannel_box.8
+sbin/bearerbox
+sbin/run_kannel_box
+sbin/smsbox
+sbin/wapbox
diff --git a/www/kannel/distinfo b/www/kannel/distinfo
index 3f06dc8c8e8..c8dcb6d4983 100644
--- a/www/kannel/distinfo
+++ b/www/kannel/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.3 2001/07/21 14:16:53 wiz Exp $
+$NetBSD: distinfo,v 1.4 2002/08/22 11:31:34 martti Exp $
 
-SHA1 (gateway-1.0.3.tar.gz) = 5ee499460f9a98b11fdd9bc48ac7607e896206a6
-Size (gateway-1.0.3.tar.gz) = 656472 bytes
-SHA1 (patch-aa) = ebe7f7d88e57620e13c25bb85ff6af5446583417
-SHA1 (patch-ab) = 55cfc733d2cd278b710c5509016342266592ac14
-SHA1 (patch-ac) = bfde3bb30215f18be89c03923d6b2262feb4d060
+SHA1 (gateway-1.2.0.tar.gz) = f81fdfca26be69de8505550a076fb3628f477af2
+Size (gateway-1.2.0.tar.gz) = 2094749 bytes
+SHA1 (patch-aa) = 5982f3ddffe19910aa433b7c47c734f18387bf0e
+SHA1 (patch-ab) = df965c5d3bf3751c46d1650eb3f8e2adcfb66277
diff --git a/www/kannel/patches/patch-aa b/www/kannel/patches/patch-aa
index af575fdbc1e..44833ee7cf7 100644
--- a/www/kannel/patches/patch-aa
+++ b/www/kannel/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.2 2001/07/21 14:16:54 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2002/08/22 11:31:35 martti Exp $
 
---- utils/start-stop-daemon.c.orig	Fri May 26 20:05:53 2000
-+++ utils/start-stop-daemon.c	Fri Jun 29 09:07:15 2001
+--- 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 @@
- #elif defined(__FreeBSD__)
+ #elif defined(__FreeBSD__) || defined(__APPLE__)
  #define FreeBSD
  #else
 +#include <sys/param.h>
diff --git a/www/kannel/patches/patch-ab b/www/kannel/patches/patch-ab
index 39e3a87847e..b0cc30f4055 100644
--- a/www/kannel/patches/patch-ab
+++ b/www/kannel/patches/patch-ab
@@ -1,22 +1,13 @@
-$NetBSD: patch-ab,v 1.2 2001/07/21 14:16:54 wiz Exp $
+$NetBSD: patch-ab,v 1.3 2002/08/22 11:31:35 martti Exp $
 
---- Makefile.in.orig	Tue Feb 13 13:12:02 2001
-+++ Makefile.in	Fri Jun 29 08:59:52 2001
-@@ -87,7 +87,7 @@
+--- Makefile.in.orig	Tue Jun 11 20:59:52 2002
++++ Makefile.in	Sun Jul  7 21:30:27 2002
+@@ -90,7 +90,7 @@
  
  # Set this to something if you want all installed binaries to have a suffix.
  # Version number is common.
--suffix = -$(VERSION)
+-suffix = $(SUFFIX)
 +suffix =
  
  #
  # You probably don't need to touch anything below this, if you're just
-@@ -185,7 +185,7 @@
- install: all
- 	$(INSTALL) -d $(bindir)
- 	for prog in $(progs); do \
--		$(INSTALL) $$prog $(bindir)/`basename $$prog`$(suffix); \
-+		${BSD_INSTALL_PROGRAM} $$prog $(bindir)/`basename $$prog`${suffix}; \
- 	done
- 
- install-docs:
diff --git a/www/kannel/patches/patch-ac b/www/kannel/patches/patch-ac
deleted file mode 100644
index a9f21cc2a12..00000000000
--- a/www/kannel/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2001/07/21 14:16:54 wiz Exp $
-
---- configure.orig	Tue Mar 27 17:23:16 2001
-+++ configure	Fri Jun 29 09:00:47 2001
-@@ -542,7 +542,7 @@
- 
- 
- 
--docdir='${prefix}/doc/kannel'
-+docdir='${prefix}/share/doc/kannel'
- 
- 
- # Extract the first word of "gcc", so it can be a program name with args.