[pkgsrc/trunk]: pkgsrc/net/dip Don't include "net/if_slvar.h" under NetBSD. I...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c6eb0a721adf
branches:  trunk
changeset: 515314:c6eb0a721adf
user:      tron <tron%pkgsrc.org@localhost>
date:      Fri Jun 30 16:13:47 2006 +0000

description:
Don't include "net/if_slvar.h" under NetBSD. It's not necessary under
older NetBSD versions and the file doesn't exist under newer versions.

diffstat:

 net/dip/distinfo         |   4 ++--
 net/dip/patches/patch-ac |  16 +++++++++-------
 2 files changed, 11 insertions(+), 9 deletions(-)

diffs (65 lines):

diff -r f468938cd9fd -r c6eb0a721adf net/dip/distinfo
--- a/net/dip/distinfo  Fri Jun 30 16:01:34 2006 +0000
+++ b/net/dip/distinfo  Fri Jun 30 16:13:47 2006 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2006/02/24 20:48:56 joerg Exp $
+$NetBSD: distinfo,v 1.7 2006/06/30 16:13:47 tron Exp $
 
 SHA1 (bsddip-1.02.tar.Z) = f938ba32fcbb958c6a9632502d6728cb0a8bac4c
 RMD160 (bsddip-1.02.tar.Z) = 799b899cee5ef1b8a49c8a0929a2c4f0d17bcbab
 Size (bsddip-1.02.tar.Z) = 78191 bytes
 SHA1 (patch-aa) = 597aa71afc9cc8bcb38ad4be949d42630db0b840
 SHA1 (patch-ab) = 657e3dd81394df2d8789222776a14ce083a252b6
-SHA1 (patch-ac) = a4d33d3c9703352b394ebafc73c220aa519bd2c3
+SHA1 (patch-ac) = 0bf7e78142ef21167475fd9af4071494054016e9
diff -r f468938cd9fd -r c6eb0a721adf net/dip/patches/patch-ac
--- a/net/dip/patches/patch-ac  Fri Jun 30 16:01:34 2006 +0000
+++ b/net/dip/patches/patch-ac  Fri Jun 30 16:13:47 2006 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.4 2006/02/24 20:48:56 joerg Exp $
+$NetBSD: patch-ac,v 1.5 2006/06/30 16:13:47 tron Exp $
 
---- dip.h.orig 1995-06-30 23:41:05.000000000 +0000
-+++ dip.h
-@@ -43,17 +43,38 @@
+--- dip.h.orig 1995-07-01 00:41:05.000000000 +0100
++++ dip.h      2006-06-30 17:10:38.000000000 +0100
+@@ -43,17 +43,40 @@
  #include <string.h>
  #include <errno.h>
  #include <syslog.h>
@@ -37,13 +37,15 @@
 +#include <net/slcompress.h>
 +#include <net/sl/if_slvar.h>
 +#else
++#if !defined(__NetBSD__)
  #include <net/if_slvar.h>
 -#include <netinet/in.h>
 +#endif
++#endif
  #include <arpa/inet.h>
  #include <netdb.h>
  extern  int h_errno;
-@@ -121,7 +142,7 @@ struct protosw
+@@ -121,7 +144,7 @@
  /*
   *  Pfad- und Dateinamen-Konstanten
   */
@@ -52,7 +54,7 @@
  #define PATH_ETC_DIPHOSTS     "/etc/diphosts"
  #define PATH_BIN_IFCONFIG     "/sbin/ifconfig"
  #define PATH_BIN_ROUTE                "/sbin/route"
-@@ -135,7 +156,6 @@ struct protosw
+@@ -135,7 +158,6 @@
  /*
   * Extern benoetigte Variablen
   */
@@ -60,7 +62,7 @@
  
  extern  short         opt_debg;       /* Debugging-output-flag        */
  extern  short         opt_verb;       /* Verbose-flag                 */
-@@ -231,3 +251,4 @@ int  hanguptty ( void );
+@@ -231,3 +253,4 @@
  int  tty_flush ( void );
  int  tty_close ( void );
  int  tty_open ( char * );