Update 4.2.7p289 --> 4.2.7p295

Remove patches (suggested by Harlan Stenn <stenn@ntp.org>).

6 files changed, 3 insertions, 48 deletions

diff --git a/net/ntp-devel/Makefile b/net/ntp-devel/Makefile
index 838a801d5d34..7a826cf55712 100644
--- a/net/ntp-devel/Makefile
+++ b/net/ntp-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ntp
-PORTVERSION=	4.2.7p289
+PORTVERSION=	4.2.7p295
 PORTREVISION=	1
 CATEGORIES=	net ipv6
 MASTER_SITES=	ftp://ftp.udel.edu/pub/ntp/ntp4/ntp-dev/ \
diff --git a/net/ntp-devel/distinfo b/net/ntp-devel/distinfo
index ef51aa4d79d6..f89d85450952 100644
--- a/net/ntp-devel/distinfo
+++ b/net/ntp-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ntp-dev-4.2.7p289.tar.gz) = b190e799c46e531d601d444f8ab2c289913407b57d7d7fbad4319c9689e857e3
-SIZE (ntp-dev-4.2.7p289.tar.gz) = 5892537
+SHA256 (ntp-dev-4.2.7p295.tar.gz) = f392bbd2b3c58020fd6383056078791118bddd3c363c9aec49c5c37924b43516
+SIZE (ntp-dev-4.2.7p295.tar.gz) = 5899035
diff --git a/net/ntp-devel/files/patch-libntp-refnumtoa.c b/net/ntp-devel/files/patch-libntp-refnumtoa.c
deleted file mode 100644
index 6b68cea5451c..000000000000
--- a/net/ntp-devel/files/patch-libntp-refnumtoa.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- libntp/refnumtoa.c.orig	2001-10-09 00:05:38.000000000 -0700
-+++ libntp/refnumtoa.c	2008-07-24 22:45:30.917697416 -0700
-@@ -2,6 +2,9 @@
-  * refnumtoa - return asciized refclock addresses stored in local array space
-  */
- #include <stdio.h>
-+#ifdef __FreeBSD_cc_version
-+#include <netinet/in.h>
-+#endif
- 
- #include "ntp_fp.h"
- #include "lib_strbuf.h"
diff --git a/net/ntp-devel/files/patch-ntpd-ntp_io.c b/net/ntp-devel/files/patch-ntpd-ntp_io.c
deleted file mode 100644
index cdf1eada580f..000000000000
--- a/net/ntp-devel/files/patch-ntpd-ntp_io.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- ntpd/ntp_io.c.orig	2010-06-03 20:24:51.000000000 -0700
-+++ ntpd/ntp_io.c	2010-06-03 20:27:36.000000000 -0700
-@@ -1414,12 +1414,18 @@
- 	sockaddr_u *psau
- 	)
- {
-+	unsigned char zerobuf[8];
-+
- 	if (IS_IPV4(psau) && !NSRCADR(psau))
- 		return 1;
- 
- #ifdef INCLUDE_IPV6_SUPPORT
- 	if (IS_IPV6(psau) && S_ADDR6_EQ(psau, &in6addr_any))
- 		return 1;
-+	bzero(zerobuf, sizeof(zerobuf));
-+	// If the host portion is all 0, then assume it's a router's anycast address.
-+	if (IS_IPV6(psau) && memcmp((char*)(&((struct sockaddr_in6*)psau)->sin6_addr) + 8, zerobuf, 8) == 0)
-+		return 1;
- #endif
- 
- 	return 0;
diff --git a/net/ntp-devel/files/patch-sntp-configure b/net/ntp-devel/files/patch-sntp-configure
deleted file mode 100644
index 88079c0ee752..000000000000
--- a/net/ntp-devel/files/patch-sntp-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- sntp/configure.orig	2011-10-20 13:52:03.855932784 -0700
-+++ sntp/configure	2011-10-20 16:09:10.154292211 -0700
-@@ -24094,7 +24094,7 @@
- 	    { $as_echo "$as_me:${as_lineno-$LINENO}: Using the installed libevent" >&5
- $as_echo "$as_me: Using the installed libevent" >&6;}
- 	    CPPFLAGS_LIBEVENT=`$PKG_CONFIG --cflags-only-I libevent`
--	    LDADD_LIBEVENT=`$PKG_CONFIG --libs libevent | sed 's:-levent::'`
-+	    LDADD_LIBEVENT=`$PKG_CONFIG --libs libevent`
- 	    case "$LIBISC_PTHREADS_NOTHREADS" in
- 	     pthreads)
- 		LDADD_LIBEVENT="$LDADD_LIBEVENT -levent_pthreads"
diff --git a/net/ntp-devel/pkg-plist b/net/ntp-devel/pkg-plist
index 25d0df72b7cc..f9b8ffa41638 100644
--- a/net/ntp-devel/pkg-plist
+++ b/net/ntp-devel/pkg-plist
@@ -34,7 +34,6 @@ sbin/sntp
 %%PORTDOCS%%%%DOCSDIR%%/drivers/driver16.html
 %%PORTDOCS%%%%DOCSDIR%%/drivers/driver18.html
 %%PORTDOCS%%%%DOCSDIR%%/drivers/driver19.html
-%%PORTDOCS%%%%DOCSDIR%%/drivers/driver2.html
 %%PORTDOCS%%%%DOCSDIR%%/drivers/driver20.html
 %%PORTDOCS%%%%DOCSDIR%%/drivers/driver22.html
 %%PORTDOCS%%%%DOCSDIR%%/drivers/driver26.html