5 files changed, 48 insertions, 31 deletions

diff --git a/net-mgmt/arpwatch/Makefile b/net-mgmt/arpwatch/Makefile
index 29466e93de93..3625b147fde6 100644
--- a/net-mgmt/arpwatch/Makefile
+++ b/net-mgmt/arpwatch/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	arpwatch
-PORTVERSION=	2.1.a13
-PORTREVISION=	2
+PORTVERSION=	2.1.a14
 CATEGORIES=	net-mgmt
 MASTER_SITES=	ftp://ftp.ee.lbl.gov/
-DISTNAME=	arpwatch-2.1a13
+DISTNAME=	${PORTNAME}-${PORTVERSION:C/\.([^\.]*)$/\1/}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	tabthorpe@goodking.ca
 COMMENT=	Monitor arp & rarp requests
 
 CONFLICTS=	arpwatch-devel-2.*
@@ -36,8 +35,8 @@ post-install:
 	fi
 	${TOUCH} ${PREFIX}/arpwatch/arp.dat
 	${CHMOD} 644 ${PREFIX}/arpwatch/arp.dat
-	for file in ethercodes.dat d.awk e.awk p.awk; do		\
-		${INSTALL_DATA} ${WRKSRC}/$$file ${PREFIX}/arpwatch;	\
+	for files in ethercodes.dat d.awk e.awk p.awk; do		\
+		${INSTALL_DATA} ${WRKSRC}/$$files ${PREFIX}/arpwatch;	\
 	done
 	${INSTALL_SCRIPT} ${WRKSRC}/arp2ethers ${PREFIX}/arpwatch
 
diff --git a/net-mgmt/arpwatch/distinfo b/net-mgmt/arpwatch/distinfo
index 977f6b7f69bc..14336fc77982 100644
--- a/net-mgmt/arpwatch/distinfo
+++ b/net-mgmt/arpwatch/distinfo
@@ -1,3 +1,3 @@
-MD5 (arpwatch-2.1a13.tar.gz) = b9ff9739cdd2c0e9807b2d05860e4811
-SHA256 (arpwatch-2.1a13.tar.gz) = 57025d5d1c883961ad7bbe53e5f0d73fa4b55659c28ee7722dddfc9c1512ee76
-SIZE (arpwatch-2.1a13.tar.gz) = 152779
+MD5 (arpwatch-2.1a14.tar.gz) = a80f26ba58012755dbb9fd99fb3af660
+SHA256 (arpwatch-2.1a14.tar.gz) = c709b4020fc9c7e8c3f7ea913c8f1f30b7fed33455112e157b1b09f090ba700b
+SIZE (arpwatch-2.1a14.tar.gz) = 201311
diff --git a/net-mgmt/arpwatch/files/patch-ae b/net-mgmt/arpwatch/files/patch-ae
index 3fe876affcc2..17071e2fde22 100644
--- a/net-mgmt/arpwatch/files/patch-ae
+++ b/net-mgmt/arpwatch/files/patch-ae
@@ -1,18 +1,18 @@
---- configure.orig	Thu Jun 15 01:37:53 2000
-+++ configure	Tue Sep  5 02:57:33 2000
-@@ -649,7 +649,7 @@
-   :
- fi
+--- configure.orig	Wed Jun 21 16:32:38 2006
++++ configure	Fri Jul  7 09:57:50 2006
+@@ -1419,7 +1419,7 @@
+   withval="$with_gcc"
  
+ fi;
 -    V_CCOPT="-O"
 +#    V_CCOPT="-O"
      V_INCLS=""
      if test "${srcdir}" != "." ; then
  	    V_INCLS="-I\$\(srcdir\)"
-@@ -2599,7 +2599,7 @@
+@@ -5299,7 +5299,7 @@
  		    fi
  		    V_CCOPT="$V_CCOPT -Wall"
- 		    if test $ac_cv_lbl_gcc_vers -gt 1 ; then
+ 		    if test "$ac_cv_lbl_gcc_vers" -gt 1 ; then
 -			    V_CCOPT="$V_CCOPT -Wmissing-prototypes -Wstrict-prototypes"
 +#			    V_CCOPT="$V_CCOPT -Wmissing-prototypes -Wstrict-prototypes"
  		    fi
diff --git a/net-mgmt/arpwatch/files/patch-aj b/net-mgmt/arpwatch/files/patch-aj
index 85e34bf47345..357275ff5667 100644
--- a/net-mgmt/arpwatch/files/patch-aj
+++ b/net-mgmt/arpwatch/files/patch-aj
@@ -1,5 +1,5 @@
---- arpwatch.8.orig	Sun Oct  8 21:31:28 2000
-+++ arpwatch.8	Thu Feb 22 22:47:29 2001
+--- arpwatch.8.orig	Sun Oct  8 16:31:28 2000
++++ arpwatch.8	Fri Jul  7 10:03:53 2006
 @@ -38,6 +38,9 @@
  .br
  .ti +8
@@ -10,16 +10,25 @@
  .B -n
  .IR net [/ width
  ]] [
-@@ -69,6 +72,12 @@
- The
- .B -i
+@@ -71,6 +74,12 @@
  flag is used to override the default interface.
-+.LP
-+The
+ .LP
+ The
 +.B -m
 +flag specifies the address that will receive the emails.
 +The default is
 +.IR root .
- .LP
- The
++.LP
++The
  .B -n
+ flag specifies additional local networks. This can be useful to
+ avoid "bogon" warnings when there is more than one network running
+@@ -152,7 +161,7 @@
+ .na
+ .nh
+ .nf
+-/usr/operator/arpwatch - default directory
++/usr/local/arpwatch - default directory
+ arp.dat - ethernet/ip address database
+ ethercodes.dat - vendor ethernet block list
+ .ad
diff --git a/net-mgmt/arpwatch/files/patch-ak b/net-mgmt/arpwatch/files/patch-ak
index 50b504b27435..2354e66518cb 100644
--- a/net-mgmt/arpwatch/files/patch-ak
+++ b/net-mgmt/arpwatch/files/patch-ak
@@ -1,5 +1,5 @@
---- arpsnmp.8.orig	Sun Sep 17 21:34:48 2000
-+++ arpsnmp.8	Thu Feb 22 22:47:29 2001
+--- arpsnmp.8.orig	Sun Sep 17 16:34:48 2000
++++ arpsnmp.8	Fri Jul  7 10:07:53 2006
 @@ -30,6 +30,9 @@
  ] [
  .B -f
@@ -10,16 +10,25 @@
  ]
  .I file
  [
-@@ -54,6 +57,12 @@
- flag is used to set the ethernet/ip address database filename.
+@@ -55,6 +58,12 @@
  The default is
  .IR arp.dat .
-+.LP
+ .LP
 +The
 +.B -m
 +flag specifies the address that will receive the emails.
 +The default is
 +.IR root .
- .LP
++.LP
  Note that an empty
  .I arp.dat
+ file must be created before the first time you run
+@@ -69,7 +78,7 @@
+ .na
+ .nh
+ .nf
+-/usr/operator/arpwatch - default directory
++/usr/local/arpwatch - default directory
+ arp.dat - ethernet/ip address database
+ ethercodes.dat - vendor ethernet block list
+ .ad