Update 4.2.7p5 --> 4.2.7p76

5 files changed, 56 insertions, 10 deletions

diff --git a/net/ntp-devel/Makefile b/net/ntp-devel/Makefile
index 3ea7b012d24b..9bc4c6bb15d1 100644
--- a/net/ntp-devel/Makefile
+++ b/net/ntp-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ntp
-PORTVERSION=	4.2.7p5
-PORTREVISION=	1
+PORTVERSION=	4.2.7p76
 CATEGORIES=	net ipv6
 MASTER_SITES=	ftp://ftp.udel.edu/pub/ntp/ntp4/ntp-dev/ \
 		http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-dev/ \
@@ -56,7 +55,7 @@ pre-everything::
 # NTP autodects net-snmp and if found builds and installs a binary that
 # uses it. If detected, modify dependencies and package list.
 BUILD_DEPENDS=	${LOCALBASE}/bin/net-snmp-config:${PORTSDIR}/net-mgmt/net-snmp
-LIB_DEPENDS=	netsnmp.16:${PORTSDIR}/net-mgmt/net-snmp
+LIB_DEPENDS=	netsnmp.20:${PORTSDIR}/net-mgmt/net-snmp
 PLIST_SUB+=	NETSNMP=""
 .else
 PLIST_SUB+=	NETSNMP="@comment "
diff --git a/net/ntp-devel/distinfo b/net/ntp-devel/distinfo
index c77e1bbbe39d..566e7d69280c 100644
--- a/net/ntp-devel/distinfo
+++ b/net/ntp-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (ntp-dev-4.2.7p5.tar.gz) = f3c10cc99274fd96273ad08a6b6202c8
-SHA256 (ntp-dev-4.2.7p5.tar.gz) = 0221dd2f02695872bbb3968b24148925626e44bbceab5f30c20b2508b03a63bf
-SIZE (ntp-dev-4.2.7p5.tar.gz) = 4332670
+MD5 (ntp-dev-4.2.7p76.tar.gz) = 5d08c8585e16e3674ee379d5c529e3eb
+SHA256 (ntp-dev-4.2.7p76.tar.gz) = fa79acb1937b9298b95c9435e4641d7dc8501190524cff1aa8fc75cf3b46dbbc
+SIZE (ntp-dev-4.2.7p76.tar.gz) = 4566619
diff --git a/net/ntp-devel/files/patch-Makefile.am b/net/ntp-devel/files/patch-Makefile.am
new file mode 100644
index 000000000000..f54122ecdb0e
--- /dev/null
+++ b/net/ntp-devel/files/patch-Makefile.am
@@ -0,0 +1,13 @@
+--- Makefile.am.orig	2010-10-30 03:01:30.000000000 -0700
++++ Makefile.am	2010-11-02 21:51:10.137966705 -0700
+@@ -28,10 +28,6 @@
+ 	util		\
+ 	$(NULL)
+ 
+-SUBDIRS+=		\
+-	tests		\
+-	$(NULL)
+-
+ DIST_SUBDIRS=		\
+ 	scripts		\
+ 	include		\
diff --git a/net/ntp-devel/files/patch-configure.ac b/net/ntp-devel/files/patch-configure.ac
new file mode 100644
index 000000000000..fa0a69b335e5
--- /dev/null
+++ b/net/ntp-devel/files/patch-configure.ac
@@ -0,0 +1,12 @@
+--- configure.ac.orig	2010-11-01 21:38:51.000000000 -0700
++++ configure.ac	2010-11-02 21:45:55.011452697 -0700
+@@ -4908,9 +4908,6 @@
+ fi
+ AM_CONDITIONAL([GTEST_AVAILABLE], [test x${GTEST_CONFIG} != x])
+ 
+-AC_CONFIG_FILES(tests/Makefile)
+-AC_CONFIG_FILES(tests/libntp/Makefile)
+-
+ AC_CONFIG_SUBDIRS(sntp)
+ 
+ AC_OUTPUT
diff --git a/net/ntp-devel/pkg-plist b/net/ntp-devel/pkg-plist
index e5ca2f1bc992..0aac2ee70654 100644
--- a/net/ntp-devel/pkg-plist
+++ b/net/ntp-devel/pkg-plist
@@ -9,20 +9,26 @@ bin/ntptrace
 bin/sntp
 bin/tickadj
 %%NETSNMP%%bin/ntpsnmpd
+%%PORTDOCS%%%%DOCSDIR%%/access.html
 %%PORTDOCS%%%%DOCSDIR%%/accopt.html
 %%PORTDOCS%%%%DOCSDIR%%/assoc.html
 %%PORTDOCS%%%%DOCSDIR%%/audio.html
+%%PORTDOCS%%%%DOCSDIR%%/authentic.html
 %%PORTDOCS%%%%DOCSDIR%%/authopt.html
+%%PORTDOCS%%%%DOCSDIR%%/autokey.html
 %%PORTDOCS%%%%DOCSDIR%%/bugs.html
 %%PORTDOCS%%%%DOCSDIR%%/build.html
+%%PORTDOCS%%%%DOCSDIR%%/clock.html
 %%PORTDOCS%%%%DOCSDIR%%/clockopt.html
+%%PORTDOCS%%%%DOCSDIR%%/cluster.html
 %%PORTDOCS%%%%DOCSDIR%%/comdex.html
 %%PORTDOCS%%%%DOCSDIR%%/config.html
 %%PORTDOCS%%%%DOCSDIR%%/confopt.html
 %%PORTDOCS%%%%DOCSDIR%%/copyright.html
 %%PORTDOCS%%%%DOCSDIR%%/debug.html
 %%PORTDOCS%%%%DOCSDIR%%/decode.html
-%%PORTDOCS%%%%DOCSDIR%%/description_files/description.jpg
+%%PORTDOCS%%%%DOCSDIR%%/discipline.html
+%%PORTDOCS%%%%DOCSDIR%%/discover.html
 %%PORTDOCS%%%%DOCSDIR%%/drivers/driver1.html
 %%PORTDOCS%%%%DOCSDIR%%/drivers/driver10.html
 %%PORTDOCS%%%%DOCSDIR%%/drivers/driver11.html
@@ -66,7 +72,7 @@ bin/tickadj
 %%PORTDOCS%%%%DOCSDIR%%/drivers/scripts/style.css
 %%PORTDOCS%%%%DOCSDIR%%/drivers/tf582_4.html
 %%PORTDOCS%%%%DOCSDIR%%/extern.html
-%%PORTDOCS%%%%DOCSDIR%%/gadget.html
+%%PORTDOCS%%%%DOCSDIR%%/filter.html
 %%PORTDOCS%%%%DOCSDIR%%/hints.html
 %%PORTDOCS%%%%DOCSDIR%%/hints/a-ux
 %%PORTDOCS%%%%DOCSDIR%%/hints/aix
@@ -97,13 +103,14 @@ bin/tickadj
 %%PORTDOCS%%%%DOCSDIR%%/hints/vxworks.html
 %%PORTDOCS%%%%DOCSDIR%%/hints/winnt.html
 %%PORTDOCS%%%%DOCSDIR%%/howto.html
+%%PORTDOCS%%%%DOCSDIR%%/huffpuff.html
 %%PORTDOCS%%%%DOCSDIR%%/icons/home.gif
 %%PORTDOCS%%%%DOCSDIR%%/icons/mail2.gif
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/kern.html
 %%PORTDOCS%%%%DOCSDIR%%/kernpps.html
 %%PORTDOCS%%%%DOCSDIR%%/keygen.html
-%%PORTDOCS%%%%DOCSDIR%%/manyopt.html
+%%PORTDOCS%%%%DOCSDIR%%/leap.html
 %%PORTDOCS%%%%DOCSDIR%%/miscopt.html
 %%PORTDOCS%%%%DOCSDIR%%/monopt.html
 %%PORTDOCS%%%%DOCSDIR%%/msyslog.html
@@ -116,6 +123,7 @@ bin/tickadj
 %%PORTDOCS%%%%DOCSDIR%%/ntpq.html
 %%PORTDOCS%%%%DOCSDIR%%/ntptime.html
 %%PORTDOCS%%%%DOCSDIR%%/ntptrace.html
+%%PORTDOCS%%%%DOCSDIR%%/orphan.html
 %%PORTDOCS%%%%DOCSDIR%%/parsedata.html
 %%PORTDOCS%%%%DOCSDIR%%/parsenew.html
 %%PORTDOCS%%%%DOCSDIR%%/pic/9400n.jpg
@@ -140,16 +148,26 @@ bin/tickadj
 %%PORTDOCS%%%%DOCSDIR%%/pic/bustardfly.gif
 %%PORTDOCS%%%%DOCSDIR%%/pic/c51.jpg
 %%PORTDOCS%%%%DOCSDIR%%/pic/description.jpg
+%%PORTDOCS%%%%DOCSDIR%%/pic/discipline.gif
 %%PORTDOCS%%%%DOCSDIR%%/pic/dogsnake.gif
 %%PORTDOCS%%%%DOCSDIR%%/pic/driver29.gif
 %%PORTDOCS%%%%DOCSDIR%%/pic/driver43_1.gif
 %%PORTDOCS%%%%DOCSDIR%%/pic/driver43_2.jpg
 %%PORTDOCS%%%%DOCSDIR%%/pic/fg6021.gif
 %%PORTDOCS%%%%DOCSDIR%%/pic/fg6039.jpg
+%%PORTDOCS%%%%DOCSDIR%%/pic/fig_3_1.gif
 %%PORTDOCS%%%%DOCSDIR%%/pic/flatheads.gif
+%%PORTDOCS%%%%DOCSDIR%%/pic/flt1.gif
+%%PORTDOCS%%%%DOCSDIR%%/pic/flt2.gif
+%%PORTDOCS%%%%DOCSDIR%%/pic/flt3.gif
+%%PORTDOCS%%%%DOCSDIR%%/pic/flt4.gif
+%%PORTDOCS%%%%DOCSDIR%%/pic/flt5.gif
+%%PORTDOCS%%%%DOCSDIR%%/pic/flt6.gif
+%%PORTDOCS%%%%DOCSDIR%%/pic/flt7.gif
 %%PORTDOCS%%%%DOCSDIR%%/pic/freq1211.gif
 %%PORTDOCS%%%%DOCSDIR%%/pic/gadget.jpg
 %%PORTDOCS%%%%DOCSDIR%%/pic/gps167.jpg
+%%PORTDOCS%%%%DOCSDIR%%/pic/group.gif
 %%PORTDOCS%%%%DOCSDIR%%/pic/hornraba.gif
 %%PORTDOCS%%%%DOCSDIR%%/pic/igclock.gif
 %%PORTDOCS%%%%DOCSDIR%%/pic/neoclock4x.gif
@@ -180,6 +198,7 @@ bin/tickadj
 %%PORTDOCS%%%%DOCSDIR%%/pic/tonea.gif
 %%PORTDOCS%%%%DOCSDIR%%/pic/tribeb.gif
 %%PORTDOCS%%%%DOCSDIR%%/pic/wingdorothy.gif
+%%PORTDOCS%%%%DOCSDIR%%/poll.html
 %%PORTDOCS%%%%DOCSDIR%%/pps.html
 %%PORTDOCS%%%%DOCSDIR%%/prefer.html
 %%PORTDOCS%%%%DOCSDIR%%/quick.html
@@ -196,16 +215,20 @@ bin/tickadj
 %%PORTDOCS%%%%DOCSDIR%%/scripts/confopt.txt
 %%PORTDOCS%%%%DOCSDIR%%/scripts/external.txt
 %%PORTDOCS%%%%DOCSDIR%%/scripts/footer.txt
+%%PORTDOCS%%%%DOCSDIR%%/scripts/hand.txt
 %%PORTDOCS%%%%DOCSDIR%%/scripts/install.txt
 %%PORTDOCS%%%%DOCSDIR%%/scripts/manual.txt
 %%PORTDOCS%%%%DOCSDIR%%/scripts/misc.txt
 %%PORTDOCS%%%%DOCSDIR%%/scripts/miscopt.txt
 %%PORTDOCS%%%%DOCSDIR%%/scripts/monopt.txt
 %%PORTDOCS%%%%DOCSDIR%%/scripts/refclock.txt
+%%PORTDOCS%%%%DOCSDIR%%/scripts/special.txt
 %%PORTDOCS%%%%DOCSDIR%%/scripts/style.css
+%%PORTDOCS%%%%DOCSDIR%%/select.html
 %%PORTDOCS%%%%DOCSDIR%%/sitemap.html
 %%PORTDOCS%%%%DOCSDIR%%/sntp.html
 %%PORTDOCS%%%%DOCSDIR%%/tickadj.html
+%%PORTDOCS%%%%DOCSDIR%%/warp.html
 %%PORTDOCS%%%%DOCSDIR%%/xleave.html
 %%EXAMPLESDIR%%/README
 %%EXAMPLESDIR%%/baldwin.conf
@@ -221,6 +244,5 @@ bin/tickadj
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/drivers/scripts
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/drivers/icons
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/drivers
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/description_files
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%EXAMPLESDIR%%