Upgrade to 2.1a10

5 files changed, 6 insertions, 56 deletions

diff --git a/net-mgmt/arpwatch-devel/Makefile b/net-mgmt/arpwatch-devel/Makefile
index c1f97ba715e3..f83e389314bd 100644
--- a/net-mgmt/arpwatch-devel/Makefile
+++ b/net-mgmt/arpwatch-devel/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	arpwatch
-PORTVERSION=	2.1.a6
+PORTVERSION=	2.1.a10
 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.1a6
+		ftp://ftp.ee.lbl.gov/
+DISTNAME=	arpwatch-2.1a10
 
 MAINTAINER=	brian@Awfulhak.org
 
@@ -23,8 +22,8 @@ MAN8=		arpwatch.8 arpsnmp.8
 post-install:
 	if [ ! -d ${PREFIX}/arpwatch ]; then				\
 		${MKDIR} ${PREFIX}/arpwatch;				\
-		${CHMOD} 775 ${PREFIX}/arpwatch;				\
-		${CHOWN} root.operator ${PREFIX}/arpwatch;			\
+		${CHMOD} 775 ${PREFIX}/arpwatch;			\
+		${CHOWN} root.operator ${PREFIX}/arpwatch;		\
 	fi
 	${TOUCH} ${PREFIX}/arpwatch/arp.dat
 	${CHMOD} 644 ${PREFIX}/arpwatch/arp.dat
diff --git a/net-mgmt/arpwatch-devel/distinfo b/net-mgmt/arpwatch-devel/distinfo
index 800463b2e05d..9a254b37a33d 100644
--- a/net-mgmt/arpwatch-devel/distinfo
+++ b/net-mgmt/arpwatch-devel/distinfo
@@ -1 +1 @@
-MD5 (arpwatch-2.1a6.tar.gz) = fe729b12e8e54133cf24695e4a382952
+MD5 (arpwatch-2.1a10.tar.gz) = c3f82f51f0c0bfcaf72b5fb216ab6a7b
diff --git a/net-mgmt/arpwatch-devel/files/patch-aa b/net-mgmt/arpwatch-devel/files/patch-aa
deleted file mode 100644
index c3d51dd3fa46..000000000000
--- a/net-mgmt/arpwatch-devel/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- arp2ethers.orig	Tue Mar 29 11:44:52 1994
-+++ arp2ethers	Fri Aug 21 10:56:26 1998
-@@ -14,7 +14,7 @@
- #
- 
- sort +2rn arp.dat | \
--    awk -e 'NF == 4 { print }' | \
-+    awk 'NF == 4 { print }' | \
-     awk -f p.awk | \
-     egrep -v '\.[0-9][0-9]*$' | \
-     sed -e 's/	.*	/	/' | \
diff --git a/net-mgmt/arpwatch-devel/files/patch-ad b/net-mgmt/arpwatch-devel/files/patch-ad
deleted file mode 100644
index 02096d9d63bf..000000000000
--- a/net-mgmt/arpwatch-devel/files/patch-ad
+++ /dev/null
@@ -1,29 +0,0 @@
---- report.c.orig	Fri Jun  9 09:54:48 2000
-+++ report.c	Fri Jun  9 10:05:58 2000
-@@ -249,6 +249,9 @@
- 	char *unknown = "<unknown>";
- 	char buf[132];
- 	static int init = 0;
-+#ifdef HAVE_MKSTEMP
-+	int fd;
-+#endif
- 
- 	/* No report until we're initialized */
- 	if (initializing)
-@@ -286,8 +289,16 @@
- 		/* Child */
- 		closelog();
- 		(void)strcpy(tempfile, "/tmp/arpwatch.XXXXXX");
-+#ifndef HAVE_MKSTEMP
- 		(void)mktemp(tempfile);
- 		if ((f = fopen(tempfile, "w+")) == NULL) {
-+#else
-+		if ((fd = mkstemp(tempfile)) == -1) {
-+			syslog(LOG_ERR, "child mkstemp(%s): %m", tempfile);
-+			exit(1);
-+		}
-+		if ((f = fdopen(fd, "w+")) == NULL) {
-+#endif /* HAVE_MKSTEMP */
- 			syslog(LOG_ERR, "child open(%s): %m", tempfile);
- 			exit(1);
- 		}
diff --git a/net-mgmt/arpwatch-devel/files/patch-ae b/net-mgmt/arpwatch-devel/files/patch-ae
index c02ef28aded2..3fe876affcc2 100644
--- a/net-mgmt/arpwatch-devel/files/patch-ae
+++ b/net-mgmt/arpwatch-devel/files/patch-ae
@@ -9,15 +9,6 @@
      V_INCLS=""
      if test "${srcdir}" != "." ; then
  	    V_INCLS="-I\$\(srcdir\)"
-@@ -1207,7 +1207,7 @@
- fi
- 
- 
--for ac_func in dn_skipname
-+for ac_func in dn_skipname mkstemp
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
- echo "configure:1214: checking for $ac_func" >&5
 @@ -2599,7 +2599,7 @@
  		    fi
  		    V_CCOPT="$V_CCOPT -Wall"