From 610d0428a8a489e928bbccbfd37b2e1d6941727c Mon Sep 17 00:00:00 2001
From: itojun <itojun>
Date: Fri, 6 Jun 2003 07:40:40 +0000
Subject: update to 20030606a - with new stanford licensing terms

---
 net/pim6sd/Makefile         |  7 ++-----
 net/pim6sd/distinfo         | 10 +++++-----
 net/pim6sd/patches/patch-ab | 16 ++++------------
 net/pim6sd/patches/patch-ac | 10 +++++-----
 4 files changed, 16 insertions(+), 27 deletions(-)

(limited to 'net/pim6sd')

diff --git a/net/pim6sd/Makefile b/net/pim6sd/Makefile
index e80e6c02f33..bf56ea9614a 100644
--- a/net/pim6sd/Makefile
+++ b/net/pim6sd/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2003/06/02 01:17:47 jschauma Exp $
+# $NetBSD: Makefile,v 1.6 2003/06/06 07:40:41 itojun Exp $
 
-DISTNAME=	pim6sd-20020403a
+DISTNAME=	pim6sd-20030606a
 WRKSRC=		${WRKDIR}/${DISTNAME}/pim6sd/
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.kame.net/pub/kame/misc/
@@ -8,9 +8,6 @@ MASTER_SITES=	ftp://ftp.kame.net/pub/kame/misc/
 MAINTAINER=	tech-pkg@netbsd.org
 COMMENT=	IPv6 PIM sparse mode daemon
 
-# does it seem right?
-LICENSE=	no-commercial-use
-
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/pim6stat.1 ${PREFIX}/man/man1
 
diff --git a/net/pim6sd/distinfo b/net/pim6sd/distinfo
index 743bbcc9ceb..67de9643019 100644
--- a/net/pim6sd/distinfo
+++ b/net/pim6sd/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2002/06/26 18:02:38 agc Exp $
+$NetBSD: distinfo,v 1.5 2003/06/06 07:40:41 itojun Exp $
 
-SHA1 (pim6sd-20020403a.tar.gz) = e00e1b6acdce1d605eb4f61e70618f4b7c37773e
-Size (pim6sd-20020403a.tar.gz) = 165983 bytes
+SHA1 (pim6sd-20030606a.tar.gz) = aa4009494f52b26f6439b711e33be8278c8256ff
+Size (pim6sd-20030606a.tar.gz) = 172146 bytes
 SHA1 (patch-aa) = 8346bedaff00ed1b37226a5f53fb720890f19a68
-SHA1 (patch-ab) = 62399470ea58b735e24d37d2dceb2e68199a8ef5
-SHA1 (patch-ac) = 6dd1b17869ecd85a51825b200edae4a4633849fd
+SHA1 (patch-ab) = d127ae4387d7be9a138b6f0e76922d645182f46f
+SHA1 (patch-ac) = 4fa63aef0c7bf083774973a091fcc88324503c37
diff --git a/net/pim6sd/patches/patch-ab b/net/pim6sd/patches/patch-ab
index 91f31e45735..7b9cf3a5c62 100644
--- a/net/pim6sd/patches/patch-ab
+++ b/net/pim6sd/patches/patch-ab
@@ -1,16 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2002/06/26 18:02:40 agc Exp $
+$NetBSD: patch-ab,v 1.3 2003/06/06 07:40:41 itojun Exp $
 
---- Makefile.orig	Wed Apr  3 06:32:18 2002
-+++ Makefile	Wed Jun 26 19:00:37 2002
-@@ -88,6 +88,7 @@
- 	route.c vif.c timer.c mrt.c pim6.c pim6_proto.c rp.c crc.c trace.c\
- 	cfparse.y cftoken.l
- CLEANFILES+= lex.yy.c y.tab.c y.tab.h
-+YFLAGS+=-d
- 
- .if (${OPSYS} == "BSD/OS")
- CC=	gcc
-@@ -127,6 +128,12 @@
+--- Makefile.orig	2002-12-02 11:42:32.000000000 +0900
++++ Makefile	2003-06-06 16:31:17.000000000 +0900
+@@ -127,6 +127,12 @@
  
  realinstall:
  	install ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
diff --git a/net/pim6sd/patches/patch-ac b/net/pim6sd/patches/patch-ac
index 36c4cc6a5b3..d718eae1373 100644
--- a/net/pim6sd/patches/patch-ac
+++ b/net/pim6sd/patches/patch-ac
@@ -1,12 +1,12 @@
-$NetBSD: patch-ac,v 1.1 2002/04/05 02:02:34 hubertf Exp $
+$NetBSD: patch-ac,v 1.2 2003/06/06 07:40:41 itojun Exp $
 
---- cftoken.l.orig	Wed Apr  3 07:32:18 2002
-+++ cftoken.l
-@@ -44,11 +44,7 @@
+--- cftoken.l-	2003-06-06 16:37:28.000000000 +0900
++++ cftoken.l	2003-06-06 16:37:34.000000000 +0900
+@@ -45,11 +45,7 @@
  #include "vmbuf.h"
  #include "debug.h"
  #include "cfparse-defs.h"
--#ifdef __NetBSD__
+-#if defined(__NetBSD__) && __NetBSD_Version__ >= 106000000	/*XXX*/
 -#include "cfparse.h"
 -#else
  #include "y.tab.h"
-- 
cgit v1.2.3