Update 4.2.7p76 --> 4.2.7p77

2 files changed, 10 insertions, 15 deletions

diff --git a/net/ntp-devel/files/patch-Makefile.am b/net/ntp-devel/files/patch-Makefile.am
deleted file mode 100644
index f54122ecdb0e..000000000000
--- a/net/ntp-devel/files/patch-Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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
index fa0a69b335e5..e507dfe5abd0 100644
--- a/net/ntp-devel/files/patch-configure.ac
+++ b/net/ntp-devel/files/patch-configure.ac
@@ -1,6 +1,14 @@
 --- 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 @@
++++ configure.ac	2010-11-04 19:51:10.231549380 -0700
+@@ -4891,6 +4891,7 @@
+ AC_CONFIG_FILES(scripts/ntpver,		[chmod +x scripts/ntpver])
+ AC_CONFIG_FILES(scripts/plot_summary,	[chmod +x scripts/plot_summary])
+ AC_CONFIG_FILES(scripts/summary,	[chmod +x scripts/summary])
++AC_CONFIG_FILES(tests/Makefile)
+ AC_CONFIG_FILES(util/Makefile)
+ 
+ AC_PROG_CXX
+@@ -4908,9 +4909,6 @@
  fi
  AM_CONDITIONAL([GTEST_AVAILABLE], [test x${GTEST_CONFIG} != x])