2.1a4

5 files changed, 18 insertions, 48 deletions

diff --git a/net/arpwatch/Makefile b/net/arpwatch/Makefile
index e3456d3b6ad..9afd03e1661 100644
--- a/net/arpwatch/Makefile
+++ b/net/arpwatch/Makefile
@@ -1,13 +1,15 @@
-# $NetBSD: Makefile,v 1.4 1998/06/22 12:58:33 agc Exp $
+# $NetBSD: Makefile,v 1.5 1998/11/04 17:25:12 mycroft Exp $
 #
 
-DISTNAME=	arpwatch-2.0.2
+DISTNAME=	arpwatch-2.1a4
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.ee.lbl.gov/
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	bouyer@netbsd.org
 
+CONFLICTS=	arpwatch-2.0.2
+
 GNU_CONFIGURE=	yes
 
 post-install:
diff --git a/net/arpwatch/files/md5 b/net/arpwatch/files/md5
index 21dcbaa28b1..f5450494e1e 100644
--- a/net/arpwatch/files/md5
+++ b/net/arpwatch/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1998/08/07 13:25:09 agc Exp $
+$NetBSD: md5,v 1.3 1998/11/04 17:25:12 mycroft Exp $
 
-MD5 (arpwatch-2.0.2.tar.Z) = 8d58b252a098d4dbebc380d652fefa0b
+MD5 (arpwatch-2.1a4.tar.Z) = 7f5ed680480e6b0b1bbf27a5634b0bd4
diff --git a/net/arpwatch/patches/patch-ab b/net/arpwatch/patches/patch-ab
index 532caae2584..eb78f0356a0 100644
--- a/net/arpwatch/patches/patch-ab
+++ b/net/arpwatch/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.3 1998/08/09 20:37:17 kim Exp $
+$NetBSD: patch-ab,v 1.4 1998/11/04 17:25:12 mycroft Exp $
 
---- Makefile.in.orig	Thu Apr 24 23:02:01 1997
-+++ Makefile.in	Sun Aug  9 16:27:51 1998
+--- Makefile.in.orig	Wed Jul 29 01:16:45 1998
++++ Makefile.in	Wed Nov  4 12:12:31 1998
 @@ -30,8 +30,10 @@
  BINDEST = @sbindir@
  # Pathname of directory to install the man page
@@ -18,9 +18,9 @@ $NetBSD: patch-ab,v 1.3 1998/08/09 20:37:17 kim Exp $
  CC = @CC@
  CCOPT = @V_CCOPT@
  INCLS = -I. @V_INCLS@
--DEFS = -DDEBUG @DEFS@ -DARPDIR=\"$(ARPDIR)\"
-+DEFS = -DDEBUG @DEFS@ -DARPDIR=\"$(ARPDIR)\" \
-+    -DETHERCODES=\"$(ETCDEST)/ethercodes.dat\"
+-DEFS = -DDEBUG @DEFS@ -DARPDIR=\"$(ARPDIR)\" -DPATH_SENDMAIL=\"$(SENDMAIL)\"
++DEFS = -DDEBUG @DEFS@ -DARPDIR=\"$(ARPDIR)\" -DPATH_SENDMAIL=\"$(SENDMAIL)\" \
++       -DETHERCODES=\"$(ETCDEST)/ethercodes.dat\"
  
  # Standard CFLAGS
  CFLAGS = $(CCOPT) $(DEFS) $(INCLS)
diff --git a/net/arpwatch/patches/patch-ac b/net/arpwatch/patches/patch-ac
index a26731f418a..028ba55afc9 100644
--- a/net/arpwatch/patches/patch-ac
+++ b/net/arpwatch/patches/patch-ac
@@ -1,11 +1,11 @@
-$NetBSD: patch-ac,v 1.2 1998/08/07 11:10:36 agc Exp $
+$NetBSD: patch-ac,v 1.3 1998/11/04 17:25:12 mycroft Exp $
 
---- arpwatch.h.orig	Mon Apr 27 19:41:46 1998
-+++ arpwatch.h	Mon Apr 27 19:42:16 1998
-@@ -3,7 +3,9 @@
- #define NEWARPFILE "arp.dat.new"
+--- arpwatch.h.orig	Mon Feb  9 19:35:15 1998
++++ arpwatch.h	Wed Nov  4 12:15:33 1998
+@@ -1,7 +1,9 @@
+ /* @(#) $Header: /cvsroot/pkgsrc/net/arpwatch/patches/patch-ac,v 1.3 1998/11/04 17:25:12 mycroft Exp $ (LBL) */
+ 
  #define ARPFILE "arp.dat"
- #define OLDARPFILE "arp.dat-"
 +#ifndef ETHERCODES
  #define ETHERCODES "ethercodes.dat"
 +#endif
diff --git a/net/arpwatch/patches/patch-ad b/net/arpwatch/patches/patch-ad
deleted file mode 100644
index 9fc4647d890..00000000000
--- a/net/arpwatch/patches/patch-ad
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ad,v 1.2 1998/08/07 11:10:36 agc Exp $
-
---- report.c.original	Thu Jun 25 13:01:29 1998
-+++ report.c	Thu Jun 25 13:07:26 1998
-@@ -45,6 +45,7 @@
- 
- #include <ctype.h>
- #include <errno.h>
-+#include <paths.h>
- #include <signal.h>
- #include <stdio.h>
- #include <stdlib.h>
-@@ -68,8 +69,8 @@
- #include "setsignal.h"
- #include "util.h"
- 
--#ifndef PATH_SENDMAIL
--#define PATH_SENDMAIL "/usr/lib/sendmail"
-+#ifndef _PATH_SENDMAIL
-+#define _PATH_SENDMAIL "/usr/lib/sendmail"
- #endif
- 
- #define PLURAL(n) ((n) == 1 || (n) == -1 ? "" : "s")
-@@ -249,7 +250,7 @@
- 	char *fmt = "%20s: %s\n";
- 	char *watcher = WATCHER;
- 	char *watchee = WATCHEE;
--	char *sendmail = PATH_SENDMAIL;
-+	char *sendmail = _PATH_SENDMAIL;
- 	char *unknown = "<unknown>";
- 	char buf[132];
- 	static int init = 0;