>Number:         13339
>Category:       pkg
>Synopsis:       update for pkgsrc/www/kannel
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Fri Jun 29 04:34:01 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator:     Martti Kuparinen
>Release:        NetBSD 1.5.1
>Organization:
>Environment:
	
System: NetBSD dhcp39 1.5.1 NetBSD 1.5.1 (KAYAK) #6: Mon Jun 18 10:00:41 CEST 2001 root@dhcp39:/usr/src/sys/arch/i386/compile/KAYAK i386


>Description:

Here's an update for the kannel package. Version 0.8 is an old
beta version while 1.0.3 is the latest stable version. ChangeLog
is too long to be included here...

I left MASTER_SITES untouched even though the site appears to be
down (as the company running the site has financial difficulties).
The .tar.gz file is also in FreeBSD's distfiles so don't panic :-)

NOTE: Before applying this patch make sure our pkgsrc has libxml2
      (which I submitted in a separate PR).

>How-To-Repeat:
>Fix:

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/kannel/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- Makefile	2001/06/25 21:51:06	1.6
+++ Makefile	2001/06/29 11:25:54
@@ -1,21 +1,26 @@
 # $NetBSD: Makefile,v 1.6 2001/06/25 21:51:06 zuntum Exp $
 #
 
-DISTNAME=	gateway-0.8
-PKGNAME=	kannel-0.8
+DISTNAME=	gateway-${KANNEL_VERSION}
+PKGNAME=	kannel-${KANNEL_VERSION}
 CATEGORIES=	www net
-MASTER_SITES=	http://www.kannel.org/download/0.8/
+MASTER_SITES=	http://www.kannel.org/download/${KANNEL_VERSION}/
 
 MAINTAINER=	rh@netbsd.org
 HOMEPAGE=	http://www.kannel.org/
 COMMENT=	open source WAP and SMS gateway
 
-USE_BUILDLINK_ONLY=YES
-USE_PERL5=	YES
-USE_GMAKE=	YES
-GNU_CONFIGURE=	YES
-CONFIGURE_ARGS+=--disable-docs
+USE_BUILDLINK_ONLY=	YES
+USE_PERL5=		YES
+USE_GMAKE=		YES
+GNU_CONFIGURE=		YES
+CONFIGURE_ARGS+=	--disable-docs
 
-.include "../../textproc/libxml/buildlink.mk"
+KANNEL_VERSION=	1.0.3
+
+CFLAGS+=	-I${BUILDLINK_DIR}/include/libxml2 \
+		-I${BUILDLINK_DIR}/include/libxml2/libxml
+
+.include "../../textproc/libxml2/buildlink.mk"
 .include "../../devel/pth/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/www/kannel/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo	2001/04/20 12:02:37	1.2
+++ distinfo	2001/06/29 11:25:54
@@ -1,7 +1,7 @@
 $NetBSD: distinfo,v 1.2 2001/04/20 12:02:37 skrll Exp $
 
-SHA1 (gateway-0.8.tar.gz) = c1450db551d2d343ed63fdacc9ad8dd312a4cfda
-Size (gateway-0.8.tar.gz) = 413633 bytes
-SHA1 (patch-aa) = 3e6d7ff5bee28542c3d7028e87ef5706a4508876
-SHA1 (patch-ab) = 0f164cb33bd378b9bd57ef1a2a915f327048a1ad
-SHA1 (patch-ac) = 999876706143fe7e02e753071a13920119134454
+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
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/www/kannel/patches/patch-aa,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-aa
--- patch-aa	2000/05/30 12:46:19	1.1.1.1
+++ patch-aa	2001/06/29 11:25:54
@@ -1,10 +1,10 @@
 $NetBSD: patch-aa,v 1.1.1.1 2000/05/30 12:46:19 rh Exp $
 
---- utils/start-stop-daemon.c.orig	Wed Apr 12 19:06:22 2000
-+++ utils/start-stop-daemon.c	Tue May 30 12:32:29 2000
-@@ -33,8 +33,13 @@
- #elif defined(__sparc__)
- #define OSsunos
+--- 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
+@@ -34,8 +34,13 @@
+ #elif defined(__FreeBSD__)
+ #define FreeBSD
  #else
 +#include <sys/param.h>
 +#if (defined(BSD) && BSD >= 199306)
@@ -16,10 +16,10 @@
  
  #ifdef HAVE_HURH_H
  #include <hurd.h>
-@@ -570,6 +575,46 @@
- #endif /*OSsunos*/
+@@ -607,6 +612,46 @@
+ }
+ #endif /*FreeBSD*/
  
- 
 +#if defined(BSD)
 +/*
 +pid_is_user, takes the pid and a uid, normally ours, but can be someone
@@ -63,24 +63,21 @@
  static void
  check(int pid)
  {
-@@ -604,7 +649,7 @@
+@@ -641,7 +686,7 @@
  
  /* WTA: this  needs to be an autoconf check for /proc/pid existance.
   */
--#if defined(OSLinux) || defined (OSsunos)
-+#if defined(OSLinux) || defined (OSsunos) || defined(OSBSD)
+-#if defined(OSLinux) || defined (SunOS) || defined(FreeBSD)
++#if defined(OSLinux) || defined (SunOS) || defined(OSBSD)
  static void
  do_procinit(void)
  {
-@@ -822,7 +867,11 @@
+@@ -859,7 +904,7 @@
  		close(fd);
  		chdir("/");
  		umask(022); /* set a default for dumb programs */
-+#ifdef OSBSD
-+		setpgid(0, getpid());	/* set the process group */
-+#else
+-#ifndef FreeBSD
++#ifndef OSBSD
  		setpgrp();  /* set the process group */
-+#endif
- 		fd=open("/dev/null", O_RDWR); /* stdin */
- 		dup(fd); /* stdout */
- 		dup(fd); /* stderr */
+ #else
+ 		setpgrp(0, runas_gid);  /* set the process group */
Index: patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/www/kannel/patches/patch-ab,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-ab
--- patch-ab	2000/05/30 12:46:19	1.1.1.1
+++ patch-ab	2001/06/29 11:25:54
@@ -1,17 +1,17 @@
 $NetBSD: patch-ab,v 1.1.1.1 2000/05/30 12:46:19 rh Exp $
 
---- Makefile.in.orig	Sun Apr  9 19:45:02 2000
-+++ Makefile.in	Tue May 30 12:49:32 2000
-@@ -90,7 +90,7 @@
+--- Makefile.in.orig	Tue Feb 13 13:12:02 2001
++++ Makefile.in	Fri Jun 29 08:59:52 2001
+@@ -87,7 +87,7 @@
  
  # Set this to something if you want all installed binaries to have a suffix.
- # Version number if common.
+ # Version number is common.
 -suffix = -$(VERSION)
 +suffix =
  
  #
  # You probably don't need to touch anything below this, if you're just
-@@ -180,7 +180,7 @@
+@@ -185,7 +185,7 @@
  install: all
  	$(INSTALL) -d $(bindir)
  	for prog in $(progs); do \
Index: patches/patch-ac
===================================================================
RCS file: /cvsroot/pkgsrc/www/kannel/patches/patch-ac,v
retrieving revision 1.2
diff -u -r1.2 patch-ac
--- patch-ac	2000/08/07 09:07:16	1.2
+++ patch-ac	2001/06/29 11:25:55
@@ -1,7 +1,7 @@
 $NetBSD: patch-ac,v 1.2 2000/08/07 09:07:16 rh Exp $
 
---- configure.orig	Sun Apr 23 22:41:16 2000
-+++ configure	Mon Aug  7 11:04:43 2000
+--- configure.orig	Tue Mar 27 17:23:16 2001
++++ configure	Fri Jun 29 09:00:47 2001
 @@ -542,7 +542,7 @@
  
  
@@ -11,13 +11,3 @@
  
  
  # Extract the first word of "gcc", so it can be a program name with args.
-@@ -1345,8 +1345,7 @@
- #define HAVE_LIBXML_1_8_6 1
- EOF
-  ;; 
--1.8.7) ;; 
--*) echo "Libxml is too old. You need at least 1.8.6." ; exit 1 ;; 
-+*) ;; 
- esac
- 
- echo $ac_n "checking for library containing inet_aton""... $ac_c" 1>&6
>Release-Note:
>Audit-Trail:
>Unformatted: