Index: head/net-mgmt/arpwatch/Makefile
===================================================================
--- head/net-mgmt/arpwatch/Makefile	(revision 520289)
+++ head/net-mgmt/arpwatch/Makefile	(revision 520290)
@@ -1,62 +1,62 @@
 # Created by: Brian Somers <brian@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	arpwatch
 PORTVERSION=	3.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt
 MASTER_SITES=	https://ee.lbl.gov/downloads/arpwatch/ \
 		LOCAL/leres/arpwatch
 
 MAINTAINER=	leres@FreeBSD.org
 COMMENT=	Monitor arp & rarp requests
 
 LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	${LOCALBASE}/include/pcap.h:net/libpcap
 RUN_DEPENDS=	${LOCALBASE}/include/pcap.h:net/libpcap
 
 USES=		python:run
 
 GNU_CONFIGURE=	yes
 
 SUB_FILES=      pkg-message
 
 OPTIONS_DEFINE=	DEBUG ETHERCODES ZEROPAD
 OPTIONS_DEFAULT=ETHERCODES ZEROPAD
 OPTIONS_SUB=	yes
 
 ETHERCODES_DESC=install ethercodes.dat
 ZEROPAD_DESC=	zero pad displayed ethernet addresses by default
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=        --disable-optimization
 .endif
 
 .if ${PORT_OPTIONS:MZEROPAD}
 CONFIGURE_ARGS+=        --enable-zeropad
 .endif
 
 .ifdef ARPDIR
 MAKE_ARGS=	ARPDIR=${ARPDIR}
 .endif
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/arpwatch
 .for F in d.awk duplicates.awk euppertolower.awk e.awk p.awk
 	${INSTALL_DATA} ${WRKSRC}/${F} ${STAGEDIR}${PREFIX}/arpwatch
 .endfor
 	${INSTALL_SCRIPT} ${WRKSRC}/arp2ethers ${STAGEDIR}${PREFIX}/arpwatch
 	${INSTALL_SCRIPT} ${WRKSRC}/massagevendor.py \
 	    ${STAGEDIR}${PREFIX}/arpwatch/massagevendor
 .if ${PORT_OPTIONS:METHERCODES}
 	${INSTALL_DATA} ${WRKSRC}/ethercodes.dat ${STAGEDIR}${PREFIX}/arpwatch
 .endif
 
 post-configure:
 	${REINPLACE_CMD} -e "/^LIBS *=/s,-lpcap,${LOCALBASE}/lib/libpcap.so.1," \
 		${WRKSRC}/Makefile
 
 .include <bsd.port.mk>
Index: head/net-mgmt/arpwatch/files/arpwatch.in
===================================================================
--- head/net-mgmt/arpwatch/files/arpwatch.in	(revision 520289)
+++ head/net-mgmt/arpwatch/files/arpwatch.in	(nonexistent)
@@ -1,80 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: arpwatch
-# REQUIRE: NETWORKING
-
-# Add the following lines to /etc/rc.conf to enable arpwatch:
-#
-#arpwatch_enable="YES"
-#
-arpwatch_enable=${arpwatch_enable:-"NO"}
-arpwatch_dir=${arpwatch_dir:-"%%PREFIX%%/arpwatch/"}
-
-. /etc/rc.subr
-
-name=arpwatch
-rcvar=arpwatch_enable
-required_dirs=${arpwatch_dir}
-
-load_rc_config ${name}
-
-command="%%PREFIX%%/sbin/${name}"
-start_precmd=${name}_precmd
-
-arpwatch_precmd() {
-    case ${arpwatch_interfaces} in
-        '')
-	    echo prcmd
-	    if [ ! -e "${arpwatch_dir}/arp.dat" ]; then
-		if [ -e "${arpwatch_dir}/arp.dat-" ]; then
-		    cp "${arpwatch_dir}/arp.dat-" "${arpwatch_dir}/arp.dat"
-		else
-		    touch "${arpwatch_dir}/arp.dat"
-		fi
-	    fi
-	;;
-
-	*)
-	    for interface in ${arpwatch_interfaces}; do
-	        if [ ! -e "${arpwatch_dir}/arp.${interface}.dat" ]; then
-		    if [ -e "${arpwatch_dir}/arp.${interface}.dat-" ]; then
-		        cp "${arpwatch_dir}/arp.${interface}.dat-" "${arpwatch_dir}/arp.${interface}.dat"
-		    else
-		        touch "${arpwatch_dir}/arp.${interface}.dat"
-		    fi
-		fi
-	    done
-	;;
-    esac
-}
-
-arpwatch_stop() {
-    killall arpwatch
-}
-
-case ${arpwatch_interfaces} in
-    '')  
-	 echo 'meuh'
-         run_rc_command "$1"
-    ;;
-
-    *)
-	 case "$1" in
-	  *start)
- 	     for interface in ${arpwatch_interfaces}; do
-		 rc_interface=`echo ${interface} | sed 's/\./_/g'`
-		 eval options=\$arpwatch_${rc_interface}_options
-		 command_args="-i ${interface} ${options} -f ${arpwatch_dir}/arp.${interface}.dat"
-		 pidfile="/var/run/arpwatch-${interface}.pid"
-		 run_rc_command "$1"
-	     done
-	     ;;
-	  *)
-             run_rc_command "$1"
-	     ;;
-	 esac
-    ;;
-esac

Property changes on: head/net-mgmt/arpwatch/files/arpwatch.in
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/net-mgmt/arpwatch/files/patch-arpwatch.sh.in
===================================================================
--- head/net-mgmt/arpwatch/files/patch-arpwatch.sh.in	(nonexistent)
+++ head/net-mgmt/arpwatch/files/patch-arpwatch.sh.in	(revision 520290)
@@ -0,0 +1,12 @@
+--- arpwatch.sh.in.orig	2014-07-25 18:42:17 UTC
++++ arpwatch.sh.in
+@@ -47,7 +47,8 @@ arpwatch_precmd()
+ 	if [ $cmd == start ]; then
+ 		prep_datfile ${fn}
+ 	fi
+-	eval options=\$arpwatch_${interface}_options
++	ltr ${interface} . _ _interface
++	eval options=\$arpwatch_${_interface}_options
+ 	command_args="-i ${interface} -f ${fn} -P ${pidfile} ${options}"
+ }
+ 

Property changes on: head/net-mgmt/arpwatch/files/patch-arpwatch.sh.in
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property