[pkgsrc/trunk]: pkgsrc/net/netbsd-tap Adapt to 2.99.16. Bump version.

[cube <cube%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d4938a0b50b1
branches:  trunk
changeset: 489062:d4938a0b50b1
user:      cube <cube%pkgsrc.org@localhost>
date:      Tue Feb 15 21:23:07 2005 +0000

description:
Adapt to 2.99.16.  Bump version.

diffstat:

 net/netbsd-tap/Makefile            |   4 ++--
 net/netbsd-tap/files/if_tap.c      |   7 ++++---
 net/netbsd-tap/files/if_tap_stub.c |  10 +++++-----
 net/netbsd-tap/files/if_tap_stub.h |   7 ++++++-
 4 files changed, 17 insertions(+), 11 deletions(-)

diffs (86 lines):

diff -r 526607cc0249 -r d4938a0b50b1 net/netbsd-tap/Makefile
--- a/net/netbsd-tap/Makefile   Tue Feb 15 21:13:34 2005 +0000
+++ b/net/netbsd-tap/Makefile   Tue Feb 15 21:23:07 2005 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/01/20 18:02:38 cube Exp $
+# $NetBSD: Makefile,v 1.2 2005/02/15 21:23:07 cube Exp $
 
-DISTNAME=      netbsd-tap-20050120
+DISTNAME=      netbsd-tap-20050215
 CATEGORIES=    net
 MASTER_SITES=  # empty
 DISTFILES=     # empty
diff -r 526607cc0249 -r d4938a0b50b1 net/netbsd-tap/files/if_tap.c
--- a/net/netbsd-tap/files/if_tap.c     Tue Feb 15 21:13:34 2005 +0000
+++ b/net/netbsd-tap/files/if_tap.c     Tue Feb 15 21:23:07 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_tap.c,v 1.2 2005/01/25 10:26:52 cube Exp $  */
+/*     $NetBSD: if_tap.c,v 1.3 2005/02/15 21:23:07 cube Exp $  */
 
 /*
  *  Copyright (c) 2003, 2004 The NetBSD Foundation.
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1.2 2005/01/25 10:26:52 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1.3 2005/02/15 21:23:07 cube Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "bpfilter.h"
@@ -730,7 +730,8 @@
 
        sc->sc_flags |= TAP_INUSE;
 
-       return tap_fdclone(p, fp, fd, &tap_fileops, (void *)(intptr_t)sc->sc_dev.dv_unit);
+       return tap_fdclone(p, fp, fd, FREAD|FWRITE, &tap_fileops,
+           (void *)(intptr_t)sc->sc_dev.dv_unit);
 }
 
 /*
diff -r 526607cc0249 -r d4938a0b50b1 net/netbsd-tap/files/if_tap_stub.c
--- a/net/netbsd-tap/files/if_tap_stub.c        Tue Feb 15 21:13:34 2005 +0000
+++ b/net/netbsd-tap/files/if_tap_stub.c        Tue Feb 15 21:23:07 2005 +0000
@@ -1,7 +1,7 @@
-/*     $NetBSD: if_tap_stub.c,v 1.1.1.1 2005/01/20 18:02:40 cube Exp $ */
+/*     $NetBSD: if_tap_stub.c,v 1.2 2005/02/15 21:23:08 cube Exp $     */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tap_stub.c,v 1.1.1.1 2005/01/20 18:02:40 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tap_stub.c,v 1.2 2005/02/15 21:23:08 cube Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -15,10 +15,10 @@
 /* 2.99.10 is gray area.  Oh, well. */
 #if __NetBSD_Version__ < 299001100
 int
-tap_fdclone(struct proc *p, struct file *fp, int fd, struct fileops *fops,
-    void *data)
+tap_fdclone(struct proc *p, struct file *fp, int flags, int fd,
+    struct fileops *fops, void *data)
 {
-       fp->f_flag = FREAD | FWRITE;
+       fp->f_flag = flags;
        fp->f_type = DTYPE_MISC;
        fp->f_ops = fops;
        fp->f_data = data;
diff -r 526607cc0249 -r d4938a0b50b1 net/netbsd-tap/files/if_tap_stub.h
--- a/net/netbsd-tap/files/if_tap_stub.h        Tue Feb 15 21:13:34 2005 +0000
+++ b/net/netbsd-tap/files/if_tap_stub.h        Tue Feb 15 21:23:07 2005 +0000
@@ -1,9 +1,14 @@
 #if __NetBSD_Version__ < 299001100
-int    tap_fdclone(struct proc *, struct file *, int, struct fileops *, void *);
+int    tap_fdclone(struct proc *, struct file *, int, int, struct fileops *, void *);
 int    tap_fnullop_fcntl(struct file *, u_int, void *, struct proc *);
 int    tap_fbadop_stat(struct file *, struct stat *, struct proc *);
 #else
+/* 2.99.15 is gray area.  Oh, well. */
+# if __NetBSD_Version__ < 299001600
+#define tap_fdclone(p,fp,fl,fd,fops,data)              fdclone(p,fp,fd,fops,data)
+# else
 #define tap_fdclone            fdclone
+# endif
 #define tap_fnullop_fcntl      fnullop_fcntl
 #define tap_fbadop_stat                fbadop_stat
 #endif