Add a -m option to specify the mail address to be used.

Bump PORTREVISION.

PR:		25288
Submitted by:	Andre Albsmeier <andre.albsmeier@mchp.siemens.de>

12 files changed, 294 insertions, 20 deletions

diff --git a/net/arpwatch-devel/Makefile b/net/arpwatch-devel/Makefile
index f83e389314bd..5fae6c47cf8f 100644
--- a/net/arpwatch-devel/Makefile
+++ b/net/arpwatch-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	arpwatch
 PORTVERSION=	2.1.a10
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.Awfulhak.org/arpwatch/ \
 		ftp://ftp.ee.lbl.gov/
diff --git a/net/arpwatch-devel/files/patch-ag b/net/arpwatch-devel/files/patch-ag
index e27a1bfa658b..bbd68993bc74 100644
--- a/net/arpwatch-devel/files/patch-ag
+++ b/net/arpwatch-devel/files/patch-ag
@@ -1,12 +1,39 @@
---- arpwatch.c.orig	Sat Oct 14 04:07:35 2000
-+++ arpwatch.c	Wed Nov 22 08:40:40 2000
-@@ -251,7 +251,7 @@
- 		}
- 	}
+--- arpwatch.c.orig	Thu Feb 22 22:47:29 2001
++++ arpwatch.c	Thu Feb 22 22:47:29 2001
+@@ -107,6 +107,8 @@
+ 
+ char *prog;
+ 
++char *Watcher = NULL;
++
+ int can_checkpoint;
+ int swapped;
+ int nobogons;
+@@ -170,7 +172,7 @@
+ 	interface = NULL;
+ 	rfilename = NULL;
+ 	pd = NULL;
+-	while ((op = getopt(argc, argv, "df:i:n:Nr:")) != EOF)
++	while ((op = getopt(argc, argv, "df:i:m:n:Nr:")) != EOF)
+ 		switch (op) {
  
--	openlog(prog, 0, LOG_DAEMON);
-+	openlog(prog, LOG_PID, LOG_DAEMON);
+ 		case 'd':
+@@ -202,6 +204,10 @@
+ 			rfilename = optarg;
+ 			break;
+ 
++		case 'm':
++			Watcher = optarg;
++			break;
++
+ 		default:
+ 			usage();
+ 		}
+@@ -751,6 +757,6 @@
  
- 	if (chdir(arpdir) < 0) {
- 		syslog(LOG_ERR, "chdir(%s): %m", arpdir);
-
+ 	(void)fprintf(stderr, "Version %s\n", version);
+ 	(void)fprintf(stderr, "usage: %s [-dN] [-f datafile] [-i interface]"
+-	    " [-n net[/width]] [-r file]\n", prog);
++	    " [-m email] [-n net[/width]] [-r file]\n", prog);
+ 	exit(1);
+ }
diff --git a/net/arpwatch-devel/files/patch-ah b/net/arpwatch-devel/files/patch-ah
new file mode 100644
index 000000000000..0dd2433a689f
--- /dev/null
+++ b/net/arpwatch-devel/files/patch-ah
@@ -0,0 +1,20 @@
+--- report.c.orig	Sun Oct  1 00:41:10 2000
++++ report.c	Thu Feb 22 22:47:29 2001
+@@ -70,6 +70,8 @@
+ 
+ #define PLURAL(n) ((n) == 1 || (n) == -1 ? "" : "s")
+ 
++extern char *Watcher;
++
+ static int cdepth;	/* number of outstanding children */
+ 
+ static char *fmtdate(time_t);
+@@ -240,7 +242,7 @@
+ 	register FILE *f;
+ 	char tempfile[64], cpu[64], os[64];
+ 	char *fmt = "%20s: %s\n";
+-	char *watcher = WATCHER;
++	char *watcher = Watcher ? Watcher : WATCHER;
+ 	char *watchee = WATCHEE;
+ 	char *sendmail = PATH_SENDMAIL;
+ 	char *unknown = "<unknown>";
diff --git a/net/arpwatch-devel/files/patch-ai b/net/arpwatch-devel/files/patch-ai
new file mode 100644
index 000000000000..ef251223d844
--- /dev/null
+++ b/net/arpwatch-devel/files/patch-ai
@@ -0,0 +1,39 @@
+--- arpsnmp.c.orig	Mon Jan 18 01:47:40 1999
++++ arpsnmp.c	Thu Feb 22 22:47:29 2001
+@@ -68,6 +68,8 @@
+ 
+ char *prog;
+ 
++char *Watcher;
++
+ extern int optind;
+ extern int opterr;
+ extern char *optarg;
+@@ -90,7 +92,7 @@
+ 	}
+ 
+ 	opterr = 0;
+-	while ((op = getopt(argc, argv, "df:")) != EOF)
++	while ((op = getopt(argc, argv, "df:m:")) != EOF)
+ 		switch (op) {
+ 
+ 		case 'd':
+@@ -105,6 +107,10 @@
+ 			arpfile = optarg;
+ 			break;
+ 
++		case 'm':
++			Watcher = optarg;
++			break;
++
+ 		default:
+ 			usage();
+ 		}
+@@ -184,6 +190,6 @@
+ 
+ 	(void)fprintf(stderr, "Version %s\n", version);
+ 	(void)fprintf(stderr,
+-	    "usage: %s [-d] [-f datafile] file [...]\n", prog);
++	    "usage: %s [-d] [-f datafile] [-m email] file [...]\n", prog);
+ 	exit(1);
+ }
diff --git a/net/arpwatch-devel/files/patch-aj b/net/arpwatch-devel/files/patch-aj
new file mode 100644
index 000000000000..85e34bf47345
--- /dev/null
+++ b/net/arpwatch-devel/files/patch-aj
@@ -0,0 +1,25 @@
+--- arpwatch.8.orig	Sun Oct  8 21:31:28 2000
++++ arpwatch.8	Thu Feb 22 22:47:29 2001
+@@ -38,6 +38,9 @@
+ .br
+ .ti +8
+ [
++.B -m
++.I email
++] [
+ .B -n
+ .IR net [/ width
+ ]] [
+@@ -69,6 +72,12 @@
+ The
+ .B -i
+ flag is used to override the default interface.
++.LP
++The
++.B -m
++flag specifies the address that will receive the emails.
++The default is
++.IR root .
+ .LP
+ The
+ .B -n
diff --git a/net/arpwatch-devel/files/patch-ak b/net/arpwatch-devel/files/patch-ak
new file mode 100644
index 000000000000..50b504b27435
--- /dev/null
+++ b/net/arpwatch-devel/files/patch-ak
@@ -0,0 +1,25 @@
+--- arpsnmp.8.orig	Sun Sep 17 21:34:48 2000
++++ arpsnmp.8	Thu Feb 22 22:47:29 2001
+@@ -30,6 +30,9 @@
+ ] [
+ .B -f
+ .I datafile
++] [
++.B -m
++.I email
+ ]
+ .I file
+ [
+@@ -54,6 +57,12 @@
+ flag is used to set the ethernet/ip address database filename.
+ The default is
+ .IR arp.dat .
++.LP
++The
++.B -m
++flag specifies the address that will receive the emails.
++The default is
++.IR root .
+ .LP
+ Note that an empty
+ .I arp.dat
diff --git a/net/arpwatch/Makefile b/net/arpwatch/Makefile
index f83e389314bd..5fae6c47cf8f 100644
--- a/net/arpwatch/Makefile
+++ b/net/arpwatch/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	arpwatch
 PORTVERSION=	2.1.a10
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.Awfulhak.org/arpwatch/ \
 		ftp://ftp.ee.lbl.gov/
diff --git a/net/arpwatch/files/patch-ag b/net/arpwatch/files/patch-ag
index e27a1bfa658b..bbd68993bc74 100644
--- a/net/arpwatch/files/patch-ag
+++ b/net/arpwatch/files/patch-ag
@@ -1,12 +1,39 @@
---- arpwatch.c.orig	Sat Oct 14 04:07:35 2000
-+++ arpwatch.c	Wed Nov 22 08:40:40 2000
-@@ -251,7 +251,7 @@
- 		}
- 	}
+--- arpwatch.c.orig	Thu Feb 22 22:47:29 2001
++++ arpwatch.c	Thu Feb 22 22:47:29 2001
+@@ -107,6 +107,8 @@
+ 
+ char *prog;
+ 
++char *Watcher = NULL;
++
+ int can_checkpoint;
+ int swapped;
+ int nobogons;
+@@ -170,7 +172,7 @@
+ 	interface = NULL;
+ 	rfilename = NULL;
+ 	pd = NULL;
+-	while ((op = getopt(argc, argv, "df:i:n:Nr:")) != EOF)
++	while ((op = getopt(argc, argv, "df:i:m:n:Nr:")) != EOF)
+ 		switch (op) {
  
--	openlog(prog, 0, LOG_DAEMON);
-+	openlog(prog, LOG_PID, LOG_DAEMON);
+ 		case 'd':
+@@ -202,6 +204,10 @@
+ 			rfilename = optarg;
+ 			break;
+ 
++		case 'm':
++			Watcher = optarg;
++			break;
++
+ 		default:
+ 			usage();
+ 		}
+@@ -751,6 +757,6 @@
  
- 	if (chdir(arpdir) < 0) {
- 		syslog(LOG_ERR, "chdir(%s): %m", arpdir);
-
+ 	(void)fprintf(stderr, "Version %s\n", version);
+ 	(void)fprintf(stderr, "usage: %s [-dN] [-f datafile] [-i interface]"
+-	    " [-n net[/width]] [-r file]\n", prog);
++	    " [-m email] [-n net[/width]] [-r file]\n", prog);
+ 	exit(1);
+ }
diff --git a/net/arpwatch/files/patch-ah b/net/arpwatch/files/patch-ah
new file mode 100644
index 000000000000..0dd2433a689f
--- /dev/null
+++ b/net/arpwatch/files/patch-ah
@@ -0,0 +1,20 @@
+--- report.c.orig	Sun Oct  1 00:41:10 2000
++++ report.c	Thu Feb 22 22:47:29 2001
+@@ -70,6 +70,8 @@
+ 
+ #define PLURAL(n) ((n) == 1 || (n) == -1 ? "" : "s")
+ 
++extern char *Watcher;
++
+ static int cdepth;	/* number of outstanding children */
+ 
+ static char *fmtdate(time_t);
+@@ -240,7 +242,7 @@
+ 	register FILE *f;
+ 	char tempfile[64], cpu[64], os[64];
+ 	char *fmt = "%20s: %s\n";
+-	char *watcher = WATCHER;
++	char *watcher = Watcher ? Watcher : WATCHER;
+ 	char *watchee = WATCHEE;
+ 	char *sendmail = PATH_SENDMAIL;
+ 	char *unknown = "<unknown>";
diff --git a/net/arpwatch/files/patch-ai b/net/arpwatch/files/patch-ai
new file mode 100644
index 000000000000..ef251223d844
--- /dev/null
+++ b/net/arpwatch/files/patch-ai
@@ -0,0 +1,39 @@
+--- arpsnmp.c.orig	Mon Jan 18 01:47:40 1999
++++ arpsnmp.c	Thu Feb 22 22:47:29 2001
+@@ -68,6 +68,8 @@
+ 
+ char *prog;
+ 
++char *Watcher;
++
+ extern int optind;
+ extern int opterr;
+ extern char *optarg;
+@@ -90,7 +92,7 @@
+ 	}
+ 
+ 	opterr = 0;
+-	while ((op = getopt(argc, argv, "df:")) != EOF)
++	while ((op = getopt(argc, argv, "df:m:")) != EOF)
+ 		switch (op) {
+ 
+ 		case 'd':
+@@ -105,6 +107,10 @@
+ 			arpfile = optarg;
+ 			break;
+ 
++		case 'm':
++			Watcher = optarg;
++			break;
++
+ 		default:
+ 			usage();
+ 		}
+@@ -184,6 +190,6 @@
+ 
+ 	(void)fprintf(stderr, "Version %s\n", version);
+ 	(void)fprintf(stderr,
+-	    "usage: %s [-d] [-f datafile] file [...]\n", prog);
++	    "usage: %s [-d] [-f datafile] [-m email] file [...]\n", prog);
+ 	exit(1);
+ }
diff --git a/net/arpwatch/files/patch-aj b/net/arpwatch/files/patch-aj
new file mode 100644
index 000000000000..85e34bf47345
--- /dev/null
+++ b/net/arpwatch/files/patch-aj
@@ -0,0 +1,25 @@
+--- arpwatch.8.orig	Sun Oct  8 21:31:28 2000
++++ arpwatch.8	Thu Feb 22 22:47:29 2001
+@@ -38,6 +38,9 @@
+ .br
+ .ti +8
+ [
++.B -m
++.I email
++] [
+ .B -n
+ .IR net [/ width
+ ]] [
+@@ -69,6 +72,12 @@
+ The
+ .B -i
+ flag is used to override the default interface.
++.LP
++The
++.B -m
++flag specifies the address that will receive the emails.
++The default is
++.IR root .
+ .LP
+ The
+ .B -n
diff --git a/net/arpwatch/files/patch-ak b/net/arpwatch/files/patch-ak
new file mode 100644
index 000000000000..50b504b27435
--- /dev/null
+++ b/net/arpwatch/files/patch-ak
@@ -0,0 +1,25 @@
+--- arpsnmp.8.orig	Sun Sep 17 21:34:48 2000
++++ arpsnmp.8	Thu Feb 22 22:47:29 2001
+@@ -30,6 +30,9 @@
+ ] [
+ .B -f
+ .I datafile
++] [
++.B -m
++.I email
+ ]
+ .I file
+ [
+@@ -54,6 +57,12 @@
+ flag is used to set the ethernet/ip address database filename.
+ The default is
+ .IR arp.dat .
++.LP
++The
++.B -m
++flag specifies the address that will receive the emails.
++The default is
++.IR root .
+ .LP
+ Note that an empty
+ .I arp.dat