Upgrade to 2.1a6

8 files changed, 50 insertions, 36 deletions

diff --git a/net-mgmt/arpwatch-devel/Makefile b/net-mgmt/arpwatch-devel/Makefile
index 370f9a4c9062..c1f97ba715e3 100644
--- a/net-mgmt/arpwatch-devel/Makefile
+++ b/net-mgmt/arpwatch-devel/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	arpwatch
-PORTVERSION=	2.1.a4
+PORTVERSION=	2.1.a6
 CATEGORIES=	net
 MASTER_SITES=	http://www.Awfulhak.org/arpwatch/ \
 		ftp://ftp.ee.lbl.gov/ \
 		ftp://ftp.cso.uiuc.edu/pub/security/coast/unix/arpwatch/
-DISTNAME=	arpwatch-2.1a4
-EXTRACT_SUFX=	.tar.Z
+DISTNAME=	arpwatch-2.1a6
 
 MAINTAINER=	brian@Awfulhak.org
 
diff --git a/net-mgmt/arpwatch-devel/distinfo b/net-mgmt/arpwatch-devel/distinfo
index a926dde8c25c..800463b2e05d 100644
--- a/net-mgmt/arpwatch-devel/distinfo
+++ b/net-mgmt/arpwatch-devel/distinfo
@@ -1 +1 @@
-MD5 (arpwatch-2.1a4.tar.Z) = 7f5ed680480e6b0b1bbf27a5634b0bd4
+MD5 (arpwatch-2.1a6.tar.gz) = fe729b12e8e54133cf24695e4a382952
diff --git a/net-mgmt/arpwatch-devel/files/patch-ae b/net-mgmt/arpwatch-devel/files/patch-ae
index 64ebc59f69e2..c02ef28aded2 100644
--- a/net-mgmt/arpwatch-devel/files/patch-ae
+++ b/net-mgmt/arpwatch-devel/files/patch-ae
@@ -1,6 +1,6 @@
---- configure.orig	Wed Jul 29 08:16:52 1998
-+++ configure	Fri Jun  9 10:12:32 2000
-@@ -646,7 +646,7 @@
+--- configure.orig	Thu Jun 15 01:37:53 2000
++++ configure	Tue Sep  5 02:57:33 2000
+@@ -649,7 +649,7 @@
    :
  fi
  
@@ -9,16 +9,7 @@
      V_INCLS=""
      if test "${srcdir}" != "." ; then
  	    V_INCLS="-I\$\(srcdir\)"
-@@ -887,7 +887,7 @@
- 
- 		    echo "$ac_t""$ac_cv_lbl_gcc_vers" 1>&6
- 		    if test $ac_cv_lbl_gcc_vers -gt 1 ; then
--			    V_CCOPT="-O2"
-+#			    V_CCOPT="-O2"
- 		    fi
- 	    fi
-     else
-@@ -1154,7 +1154,7 @@
+@@ -1207,7 +1207,7 @@
  fi
  
  
@@ -26,4 +17,13 @@
 +for ac_func in dn_skipname mkstemp
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
- echo "configure:1161: checking for $ac_func" >&5
+ echo "configure:1214: checking for $ac_func" >&5
+@@ -2599,7 +2599,7 @@
+ 		    fi
+ 		    V_CCOPT="$V_CCOPT -Wall"
+ 		    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
+ 	    fi
+     else
diff --git a/net-mgmt/arpwatch-devel/files/patch-af b/net-mgmt/arpwatch-devel/files/patch-af
new file mode 100644
index 000000000000..0beb9378c27a
--- /dev/null
+++ b/net-mgmt/arpwatch-devel/files/patch-af
@@ -0,0 +1,8 @@
+--- ethercodes.dat.orig	Tue Mar 21 02:37:05 2000
++++ ethercodes.dat	Thu Sep 14 11:18:09 2000
+@@ -897,3 +897,5 @@
+ c0:0:0	Western Digital (may be reversed 00 00 C0?)
+ e2:c:f	Kingston Technologies
+ ec:10:0	Enance Source Co., Ltd.	PC clones(?)
++0:bd:11	VMWare Inc
++0:bd:fb	VMWare Inc
diff --git a/net-mgmt/arpwatch/Makefile b/net-mgmt/arpwatch/Makefile
index 370f9a4c9062..c1f97ba715e3 100644
--- a/net-mgmt/arpwatch/Makefile
+++ b/net-mgmt/arpwatch/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	arpwatch
-PORTVERSION=	2.1.a4
+PORTVERSION=	2.1.a6
 CATEGORIES=	net
 MASTER_SITES=	http://www.Awfulhak.org/arpwatch/ \
 		ftp://ftp.ee.lbl.gov/ \
 		ftp://ftp.cso.uiuc.edu/pub/security/coast/unix/arpwatch/
-DISTNAME=	arpwatch-2.1a4
-EXTRACT_SUFX=	.tar.Z
+DISTNAME=	arpwatch-2.1a6
 
 MAINTAINER=	brian@Awfulhak.org
 
diff --git a/net-mgmt/arpwatch/distinfo b/net-mgmt/arpwatch/distinfo
index a926dde8c25c..800463b2e05d 100644
--- a/net-mgmt/arpwatch/distinfo
+++ b/net-mgmt/arpwatch/distinfo
@@ -1 +1 @@
-MD5 (arpwatch-2.1a4.tar.Z) = 7f5ed680480e6b0b1bbf27a5634b0bd4
+MD5 (arpwatch-2.1a6.tar.gz) = fe729b12e8e54133cf24695e4a382952
diff --git a/net-mgmt/arpwatch/files/patch-ae b/net-mgmt/arpwatch/files/patch-ae
index 64ebc59f69e2..c02ef28aded2 100644
--- a/net-mgmt/arpwatch/files/patch-ae
+++ b/net-mgmt/arpwatch/files/patch-ae
@@ -1,6 +1,6 @@
---- configure.orig	Wed Jul 29 08:16:52 1998
-+++ configure	Fri Jun  9 10:12:32 2000
-@@ -646,7 +646,7 @@
+--- configure.orig	Thu Jun 15 01:37:53 2000
++++ configure	Tue Sep  5 02:57:33 2000
+@@ -649,7 +649,7 @@
    :
  fi
  
@@ -9,16 +9,7 @@
      V_INCLS=""
      if test "${srcdir}" != "." ; then
  	    V_INCLS="-I\$\(srcdir\)"
-@@ -887,7 +887,7 @@
- 
- 		    echo "$ac_t""$ac_cv_lbl_gcc_vers" 1>&6
- 		    if test $ac_cv_lbl_gcc_vers -gt 1 ; then
--			    V_CCOPT="-O2"
-+#			    V_CCOPT="-O2"
- 		    fi
- 	    fi
-     else
-@@ -1154,7 +1154,7 @@
+@@ -1207,7 +1207,7 @@
  fi
  
  
@@ -26,4 +17,13 @@
 +for ac_func in dn_skipname mkstemp
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
- echo "configure:1161: checking for $ac_func" >&5
+ echo "configure:1214: checking for $ac_func" >&5
+@@ -2599,7 +2599,7 @@
+ 		    fi
+ 		    V_CCOPT="$V_CCOPT -Wall"
+ 		    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
+ 	    fi
+     else
diff --git a/net-mgmt/arpwatch/files/patch-af b/net-mgmt/arpwatch/files/patch-af
new file mode 100644
index 000000000000..0beb9378c27a
--- /dev/null
+++ b/net-mgmt/arpwatch/files/patch-af
@@ -0,0 +1,8 @@
+--- ethercodes.dat.orig	Tue Mar 21 02:37:05 2000
++++ ethercodes.dat	Thu Sep 14 11:18:09 2000
+@@ -897,3 +897,5 @@
+ c0:0:0	Western Digital (may be reversed 00 00 C0?)
+ e2:c:f	Kingston Technologies
+ ec:10:0	Enance Source Co., Ltd.	PC clones(?)
++0:bd:11	VMWare Inc
++0:bd:fb	VMWare Inc