Update to mouse-pppoe-20000912nb1:

* rename binary from pppoe to mouse-pppoe, so this pkg can be installed
   together with rp-pppoe
 * rename the pkg from mouse_pppoe to mouse-pppoe
 * our pppd does not understand "noipx" - leave that out!

net/mouse-pppoe/Makefile

@@ -1,22 +1,20 @@
-# $NetBSD: Makefile,v 1.5 2001/02/17 18:19:08 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2001/02/27 17:41:05 hubertf Exp $
 
 DISTNAME=		pppoe.20000912
-PKGNAME=		mouse_${DISTNAME:S/./-/}
+PKGNAME=		mouse-${DISTNAME:S/./-/}nb1
 CATEGORIES=		net
 MASTER_SITES=		ftp://ftp.netbsd.org/pub/NetBSD/misc/mouse/pppoe/
 
 MAINTAINER=		mouse@netbsd.org
 COMMENT=		derMouse's PPP over Ethernet program
 
-CONFLICTS+=		rp-pppoe-*
-
 NO_WRKSUBDIR=		yes
 
 do-build:
 	(cd ${WRKSRC} ; ${CC} -O2 -o pppoe pppoe.c)
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/pppoe ${PREFIX}/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/pppoe ${PREFIX}/sbin/mouse-pppoe
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mouse_pppoe
 	${INSTALL_DATA} ${WRKSRC}/pppoe.readme ${PREFIX}/share/doc/mouse_pppoe
 

net/mouse-pppoe/files/patch-sum

@@ -1,3 +1,3 @@
-$NetBSD: patch-sum,v 1.1 2000/09/14 22:51:26 wiz Exp $
+$NetBSD: patch-sum,v 1.2 2001/02/27 17:41:05 hubertf Exp $
 
-MD5 (patch-aa) = 6f4b11368495243e8a0aa8045399a9e9
+MD5 (patch-aa) = bd22b897fdd9ab9da767fe3b192edaf8

net/mouse-pppoe/patches/patch-aa

@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.1 2000/09/14 22:51:26 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2001/02/27 17:41:06 hubertf Exp $
 
---- pppoe.c.orig	Wed Sep 13 02:11:53 2000
+--- pppoe.c.orig	Fri Apr 21 05:58:32 2000
 +++ pppoe.c
 @@ -5,6 +5,7 @@
  #include <stdarg.h>
@@ -10,3 +10,11 @@ $NetBSD: patch-aa,v 1.1 2000/09/14 22:51:26 wiz Exp $
  #include <net/if.h>
  #include <termios.h>
  #include <strings.h>
+@@ -677,7 +678,6 @@
+     *ap++ = "nodeflate";
+     *ap++ = "nodetach";
+     *ap++ = "noipdefault";
+-    *ap++ = "noipx";
+     *ap++ = "nopcomp";
+     *ap++ = "nopersist";
+     *ap++ = "nopredictor1";

net/mouse-pppoe/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2000/09/14 22:51:26 wiz Exp $
-sbin/pppoe
+@comment $NetBSD: PLIST,v 1.4 2001/02/27 17:41:07 hubertf Exp $
+sbin/mouse-pppoe
 share/doc/mouse_pppoe/pppoe.readme
 @dirrm share/doc/mouse_pppoe