Index: Makefile
===================================================================
RCS file: /cvs/ports/net/ntp/Makefile,v
retrieving revision 1.39
diff -N -u -r1.39 Makefile
--- Makefile	11 Feb 2009 19:36:27 -0000	1.39
+++ Makefile	23 May 2009 16:32:29 -0000
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.39 2009/02/11 19:36:27 naddy Exp $
+# $OpenBSD: Makefile,v 1.41 2009/05/23 16:32:29 naddy Exp $
 
 COMMENT=	Network Time Protocol reference implementation
 
@@ -6,13 +6,11 @@
 # to confuse with the ports system's 'pN' convention, so we
 # convert it to 'pl' for local use.
 
-VERSION=	4.2.4p6
+VERSION=	4.2.4p7
 DISTNAME=	ntp-${VERSION}
-PKGNAME=	ntp-${VERSION:S/p/pl/}p0
+PKGNAME=	ntp-${VERSION:S/p/pl/}
 CATEGORIES=	net
-MASTER_SITES=   ftp://ftp.udel.edu/pub/ntp/ntp4/ntp-4.2/ \
-		http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ \
-		ftp://archive.ntp.org/ntp4/ntp-4.2/ \
+MASTER_SITES=	ftp://archive.ntp.org/ntp4/ntp-4.2/ \
 		http://archive.ntp.org/ntp4/ntp-4.2/
 
 HOMEPAGE=	http://www.ntp.org/
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/ntp/distinfo,v
retrieving revision 1.9
diff -N -u -r1.9 distinfo
--- distinfo	27 Jan 2009 10:21:38 -0000	1.9
+++ distinfo	23 May 2009 16:32:29 -0000
@@ -1,5 +1,5 @@
-MD5 (ntp-4.2.4p6.tar.gz) = GWHCwStmuQRtXfN9CkGxgQ==
-RMD160 (ntp-4.2.4p6.tar.gz) = 04U73Vk7ScQ17Bm5UGYJfvXnGsw=
-SHA1 (ntp-4.2.4p6.tar.gz) = rUsGjMA840amJ27WsxwCa2/8PZI=
-SHA256 (ntp-4.2.4p6.tar.gz) = ZHZABnx8akxWivVME5zge7+fabVL+b4nBLTJnFZlEGc=
-SIZE (ntp-4.2.4p6.tar.gz) = 3443787
+MD5 (ntp-4.2.4p7.tar.gz) = jBn/Yu1PfWT44qpZyxHzZA==
+RMD160 (ntp-4.2.4p7.tar.gz) = EdaRdsjLS5X36fRow3q4/FOiiHY=
+SHA1 (ntp-4.2.4p7.tar.gz) = hHb3Xa/+mFHMbzPRcJArzndjdJk=
+SHA256 (ntp-4.2.4p7.tar.gz) = VoGIPOXNBmbXPBuQfihGU5ZKJa1MAqMIqxG1SsqPAcM=
+SIZE (ntp-4.2.4p7.tar.gz) = 3382146
Index: patches/patch-config_h_in
===================================================================
RCS file: /cvs/ports/net/ntp/patches/patch-config_h_in,v
retrieving revision 1.4
diff -N -u -r1.4 patches/patch-config_h_in
--- patches/patch-config_h_in	26 Jan 2009 23:26:02 -0000	1.4
+++ patches/patch-config_h_in	23 May 2009 16:32:29 -0000
@@ -1,13 +1,13 @@
-$OpenBSD: patch-config_h_in,v 1.4 2009/01/26 23:26:02 naddy Exp $
---- config.h.in.orig	Sun Aug 17 02:17:36 2008
-+++ config.h.in	Wed Jan  7 23:44:05 2009
-@@ -355,6 +355,9 @@
- /* Define to 1 if you have the `getifaddrs' function. */
- #undef HAVE_GETIFADDRS
+$OpenBSD: patch-config_h_in,v 1.5 2009/05/23 16:32:29 naddy Exp $
+--- config.h.in.orig	Mon May 18 10:53:23 2009
++++ config.h.in	Sat May 23 17:03:44 2009
+@@ -352,6 +352,9 @@
+ /* Define to 1 if you have the `getdtablesize' function. */
+ #undef HAVE_GETDTABLESIZE
  
 +/* Define to 1 if you have the `geteuid' function. */
 +#undef HAVE_GETEUID
 +
- /* Define to 1 if you have the `getrusage' function. */
- #undef HAVE_GETRUSAGE
+ /* Define to 1 if you have the `getifaddrs' function. */
+ #undef HAVE_GETIFADDRS
  
Index: patches/patch-configure_ac
===================================================================
RCS file: /cvs/ports/net/ntp/patches/patch-configure_ac,v
retrieving revision 1.1
diff -N -u -r1.1 patches/patch-configure_ac
--- patches/patch-configure_ac	26 Jan 2009 23:26:02 -0000	1.1
+++ patches/patch-configure_ac	23 May 2009 16:32:29 -0000
@@ -1,7 +1,7 @@
-$OpenBSD: patch-configure_ac,v 1.1 2009/01/26 23:26:02 naddy Exp $
---- configure.ac.orig	Wed Jan  7 23:45:12 2009
-+++ configure.ac	Wed Jan  7 23:55:55 2009
-@@ -1104,7 +1104,7 @@ esac])
+$OpenBSD: patch-configure_ac,v 1.2 2009/05/23 16:32:29 naddy Exp $
+--- configure.ac.orig	Tue May 12 07:58:54 2009
++++ configure.ac	Sat May 23 17:03:43 2009
+@@ -1183,7 +1183,7 @@ esac])
  case "$host" in
   *-pc-cygwin*)
      ;;
Index: patches/patch-ntpd_ntpd_c
===================================================================
RCS file: /cvs/ports/net/ntp/patches/patch-ntpd_ntpd_c,v
retrieving revision 1.3
diff -N -u -r1.3 patches/patch-ntpd_ntpd_c
--- patches/patch-ntpd_ntpd_c	26 Jan 2009 23:26:02 -0000	1.3
+++ patches/patch-ntpd_ntpd_c	23 May 2009 16:32:29 -0000
@@ -1,7 +1,7 @@
-$OpenBSD: patch-ntpd_ntpd_c,v 1.3 2009/01/26 23:26:02 naddy Exp $
---- ntpd/ntpd.c.orig	Sun Aug 17 01:47:31 2008
-+++ ntpd/ntpd.c	Wed Jan  7 23:44:08 2009
-@@ -492,11 +492,16 @@ ntpdmain(
+$OpenBSD: patch-ntpd_ntpd_c,v 1.4 2009/05/23 16:32:29 naddy Exp $
+--- ntpd/ntpd.c.orig	Mon May 18 10:22:36 2009
++++ ntpd/ntpd.c	Sat May 23 17:02:24 2009
+@@ -484,11 +484,16 @@ ntpdmain(
  	}
  #endif
  
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/ntp/pkg/PLIST,v
retrieving revision 1.14
diff -N -u -r1.14 pkg/PLIST
--- pkg/PLIST	27 Jan 2009 10:21:38 -0000	1.14
+++ pkg/PLIST	23 May 2009 16:32:29 -0000
@@ -1,6 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.14 2009/01/27 10:21:38 naddy Exp $
-@pkgpath net/ntp,-main
+@comment $OpenBSD: PLIST,v 1.15 2009/05/23 16:32:29 naddy Exp $
 @conflict ntp-doc-*
+@pkgpath net/ntp,-main
 @man man/man1/ntp-keygen.1
 @man man/man1/ntpd.1
 @man man/man1/ntpdc.1