6 files changed, 58 insertions, 6 deletions

diff --git a/net-mgmt/arpwatch-devel/Makefile b/net-mgmt/arpwatch-devel/Makefile
index 44dbbc004ba8..20ed2db0c165 100644
--- a/net-mgmt/arpwatch-devel/Makefile
+++ b/net-mgmt/arpwatch-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	arpwatch
 PORTVERSION=	2.1.a11
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.Awfulhak.org/arpwatch/ \
 		ftp://ftp.ee.lbl.gov/
diff --git a/net-mgmt/arpwatch-devel/files/arpwatch.sh b/net-mgmt/arpwatch-devel/files/arpwatch.sh
index 1f4ad205b3fe..072546207aab 100644
--- a/net-mgmt/arpwatch-devel/files/arpwatch.sh
+++ b/net-mgmt/arpwatch-devel/files/arpwatch.sh
@@ -1,5 +1,12 @@
 #!/bin/sh
 
+if [ -r /etc/defaults/rc.conf ]; then
+	. /etc/defaults/rc.conf
+	source_rc_confs
+elif [ -r /etc/rc.conf ]; then
+	. /etc/rc.conf
+fi
+
 prog=$(realpath $0) || exit 1
 dir=${prog%/*}
 PREFIX=${dir%/etc/rc.d}
@@ -12,9 +19,26 @@ fi
 
 case $1 in
 start)
-	if [ -x "$PREFIX"/sbin/arpwatch -a -d "$PREFIX"/arpwatch ]; then
-		"$PREFIX"/sbin/arpwatch && echo -n ' arpwatch'
+	if [ ! -e "$PREFIX"/arpwatch/arp.dat ]; then
+		if [ -e "$PREFIX"/arpwatch/arp.dat- ]; then
+			cp "$PREFIX"/arpwatch/arp.dat- "$PREFIX"/arpwatch/arp.dat	
+		else
+			touch "$PREFIX"/arpwarch/arp.dat
+		fi
 	fi
+
+	case ${arpwatch_interfaces} in
+	'')
+		if [ -x "$PREFIX"/sbin/arpwatch -a -d "$PREFIX"/arpwatch ]; then
+			"$PREFIX"/sbin/arpwatch && echo -n ' arpwatch'
+		fi
+		;;
+	*)
+		for interface in ${arpwatch_interfaces}; do
+			"$PREFIX"/sbin/arpwatch -i "${interface}" && echo -n " arpwatch(${interface})"
+		done
+		;;
+	esac
 	;;
 stop)
 	killall arpwatch && echo -n ' arpwatch'
diff --git a/net-mgmt/arpwatch-devel/pkg-plist b/net-mgmt/arpwatch-devel/pkg-plist
index 2d3d476f15f1..d186c231e5fc 100644
--- a/net-mgmt/arpwatch-devel/pkg-plist
+++ b/net-mgmt/arpwatch-devel/pkg-plist
@@ -1,10 +1,11 @@
 sbin/arpwatch
 sbin/arpsnmp
-@unexec test -f %D/arpwatch/arp.dat && test -s %D/arpwatch/arp.dat || rm -f %D/arpwatch/arp.dat
 arpwatch/arp2ethers
 arpwatch/ethercodes.dat
 arpwatch/d.awk
 arpwatch/e.awk
 arpwatch/p.awk
 etc/rc.d/arpwatch.sh
+@unexec test -f %D/arpwatch/arp.dat && test -s %D/arpwatch/arp.dat || rm -f %D/arpwatch/arp.dat
+@exec test -f %D/arpwatch/arp.dat || touch %D/arpwatch/arp.dat
 @dirrm arpwatch
diff --git a/net-mgmt/arpwatch/Makefile b/net-mgmt/arpwatch/Makefile
index 44dbbc004ba8..20ed2db0c165 100644
--- a/net-mgmt/arpwatch/Makefile
+++ b/net-mgmt/arpwatch/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	arpwatch
 PORTVERSION=	2.1.a11
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.Awfulhak.org/arpwatch/ \
 		ftp://ftp.ee.lbl.gov/
diff --git a/net-mgmt/arpwatch/files/arpwatch.sh b/net-mgmt/arpwatch/files/arpwatch.sh
index 1f4ad205b3fe..072546207aab 100644
--- a/net-mgmt/arpwatch/files/arpwatch.sh
+++ b/net-mgmt/arpwatch/files/arpwatch.sh
@@ -1,5 +1,12 @@
 #!/bin/sh
 
+if [ -r /etc/defaults/rc.conf ]; then
+	. /etc/defaults/rc.conf
+	source_rc_confs
+elif [ -r /etc/rc.conf ]; then
+	. /etc/rc.conf
+fi
+
 prog=$(realpath $0) || exit 1
 dir=${prog%/*}
 PREFIX=${dir%/etc/rc.d}
@@ -12,9 +19,26 @@ fi
 
 case $1 in
 start)
-	if [ -x "$PREFIX"/sbin/arpwatch -a -d "$PREFIX"/arpwatch ]; then
-		"$PREFIX"/sbin/arpwatch && echo -n ' arpwatch'
+	if [ ! -e "$PREFIX"/arpwatch/arp.dat ]; then
+		if [ -e "$PREFIX"/arpwatch/arp.dat- ]; then
+			cp "$PREFIX"/arpwatch/arp.dat- "$PREFIX"/arpwatch/arp.dat	
+		else
+			touch "$PREFIX"/arpwarch/arp.dat
+		fi
 	fi
+
+	case ${arpwatch_interfaces} in
+	'')
+		if [ -x "$PREFIX"/sbin/arpwatch -a -d "$PREFIX"/arpwatch ]; then
+			"$PREFIX"/sbin/arpwatch && echo -n ' arpwatch'
+		fi
+		;;
+	*)
+		for interface in ${arpwatch_interfaces}; do
+			"$PREFIX"/sbin/arpwatch -i "${interface}" && echo -n " arpwatch(${interface})"
+		done
+		;;
+	esac
 	;;
 stop)
 	killall arpwatch && echo -n ' arpwatch'
diff --git a/net-mgmt/arpwatch/pkg-plist b/net-mgmt/arpwatch/pkg-plist
index 2d3d476f15f1..d186c231e5fc 100644
--- a/net-mgmt/arpwatch/pkg-plist
+++ b/net-mgmt/arpwatch/pkg-plist
@@ -1,10 +1,11 @@
 sbin/arpwatch
 sbin/arpsnmp
-@unexec test -f %D/arpwatch/arp.dat && test -s %D/arpwatch/arp.dat || rm -f %D/arpwatch/arp.dat
 arpwatch/arp2ethers
 arpwatch/ethercodes.dat
 arpwatch/d.awk
 arpwatch/e.awk
 arpwatch/p.awk
 etc/rc.d/arpwatch.sh
+@unexec test -f %D/arpwatch/arp.dat && test -s %D/arpwatch/arp.dat || rm -f %D/arpwatch/arp.dat
+@exec test -f %D/arpwatch/arp.dat || touch %D/arpwatch/arp.dat
 @dirrm arpwatch