[pkgsrc/trunk]: pkgsrc/net/mouse-pppoe net/if_ether.h and net/ethertypes.h ar...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3dbfd00a137d
branches:  trunk
changeset: 507056:3dbfd00a137d
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Wed Jan 25 17:45:32 2006 +0000

description:
net/if_ether.h and net/ethertypes.h are approximately replacable by
netinet/if_ether.h on FreeBSD and DragonFly.

diffstat:

 net/mouse-pppoe/distinfo         |   4 ++--
 net/mouse-pppoe/patches/patch-aa |  20 +++++++++++++++++---
 2 files changed, 19 insertions(+), 5 deletions(-)

diffs (47 lines):

diff -r 91802544d6f9 -r 3dbfd00a137d net/mouse-pppoe/distinfo
--- a/net/mouse-pppoe/distinfo  Wed Jan 25 17:38:52 2006 +0000
+++ b/net/mouse-pppoe/distinfo  Wed Jan 25 17:45:32 2006 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 12:13:53 agc Exp $
+$NetBSD: distinfo,v 1.4 2006/01/25 17:45:32 joerg Exp $
 
 SHA1 (pppoe.20000912.tar.gz) = e077e02e42cad1266316cdfa87c31bde191e530e
 RMD160 (pppoe.20000912.tar.gz) = c0034484f2dbc54a3e1ea9648dfb37f6f25f0a2e
 Size (pppoe.20000912.tar.gz) = 9621 bytes
-SHA1 (patch-aa) = 9c1b59a7138a7f02329fbabd36026b5554ca1197
+SHA1 (patch-aa) = 7478d6d155cdec4c9b6d11ccdde467a9fddff0c4
diff -r 91802544d6f9 -r 3dbfd00a137d net/mouse-pppoe/patches/patch-aa
--- a/net/mouse-pppoe/patches/patch-aa  Wed Jan 25 17:38:52 2006 +0000
+++ b/net/mouse-pppoe/patches/patch-aa  Wed Jan 25 17:45:32 2006 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.2 2001/02/27 17:41:06 hubertf Exp $
+$NetBSD: patch-aa,v 1.3 2006/01/25 17:45:32 joerg Exp $
 
---- pppoe.c.orig       Fri Apr 21 05:58:32 2000
+--- pppoe.c.orig       2000-04-21 03:58:32.000000000 +0000
 +++ pppoe.c
 @@ -5,6 +5,7 @@
  #include <stdarg.h>
@@ -10,7 +10,21 @@
  #include <net/if.h>
  #include <termios.h>
  #include <strings.h>
-@@ -677,7 +678,6 @@
+@@ -13,8 +14,13 @@
+ #include <net/if_dl.h>
+ #include <sys/ioctl.h>
+ #include <sys/socket.h>
++#if defined(__DragonFly__) || defined(__FreeBSD__)
++#include <netinet/in.h>
++#include <netinet/if_ether.h>
++#else
+ #include <net/if_ether.h>
+ #include <net/ethertypes.h>
++#endif
+ 
+ extern const char *__progname;
+ 
+@@ -677,7 +683,6 @@ static void fork_pppd(void)
      *ap++ = "nodeflate";
      *ap++ = "nodetach";
      *ap++ = "noipdefault";