Update 4.2.5p179 --> 4.2.7p5

5 files changed, 5 insertions, 55 deletions

diff --git a/net/ntp-devel/Makefile b/net/ntp-devel/Makefile
index da0cac0a793b..4066c46265c0 100644
--- a/net/ntp-devel/Makefile
+++ b/net/ntp-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ntp
-PORTVERSION=	4.2.5p179
+PORTVERSION=	4.2.7p5
 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/ \
diff --git a/net/ntp-devel/distinfo b/net/ntp-devel/distinfo
index 6fe60eb41bfe..c77e1bbbe39d 100644
--- a/net/ntp-devel/distinfo
+++ b/net/ntp-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (ntp-dev-4.2.5p179.tar.gz) = 20c0c2a0eedcd1bf2a0e2b4d3e19a95b
-SHA256 (ntp-dev-4.2.5p179.tar.gz) = 483a8a186e3342889ed99d84ab1e0f8760596aa2bc6f130e79d51edd311ae0c4
-SIZE (ntp-dev-4.2.5p179.tar.gz) = 4215410
+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
diff --git a/net/ntp-devel/files/patch-configure b/net/ntp-devel/files/patch-configure
deleted file mode 100644
index 7a29d2d31cb4..000000000000
--- a/net/ntp-devel/files/patch-configure
+++ /dev/null
@@ -1,39 +0,0 @@
---- configure.orig	2009-04-26 04:27:13.000000000 -0700
-+++ configure	2009-04-27 14:10:37.000000000 -0700
-@@ -461,7 +461,7 @@
- ac_subdirs_all="$ac_subdirs_all arlib"
- ac_subdirs_all="$ac_subdirs_all sntp"
- ac_subdirs_all="$ac_subdirs_all gsoc_sntp"
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP YACC VPATH_HACK_TRUE VPATH_HACK_FALSE LIBOPTS_DIR INSTALL_LIBOPTS_TRUE INSTALL_LIBOPTS_FALSE NEED_LIBOPTS_TRUE NEED_LIBOPTS_FALSE LIBOPTS_LDADD LIBOPTS_CFLAGS BINSUBDIR subdirs ARLIB_DIR LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB LIBTOOL PATH_SH PATH_PERL PATH_NET_SNMP_CONFIG EDITLINE_LIBS HAVE_INLINE LIBPARSE MAKE_LIBPARSE MAKE_LIBPARSE_KERNEL MAKE_CHECK_Y2K OPENSSL OPENSSL_INC OPENSSL_LIB LCRYPTO EF_PROGS EF_LIBS MAKE_CHECK_LAYOUT TESTDCF DCFD MAKE_PARSEKMODULE PROPDELAY CHUTEST CLKTEST MAKE_ADJTIMED MAKE_NTPTIME MAKE_TICKADJ MAKE_TIMETRIM MAKE_LIBNTPSIM MAKE_NTPDSIM SNMP_LIBS SNMP_CPPFLAGS SNMP_CFLAGS MAKE_NTPSNMPD LSCF LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP YACC VPATH_HACK_TRUE VPATH_HACK_FALSE LIBOPTS_DIR INSTALL_LIBOPTS_TRUE INSTALL_LIBOPTS_FALSE NEED_LIBOPTS_TRUE NEED_LIBOPTS_FALSE LIBOPTS_LDADD LIBOPTS_CFLAGS BINSUBDIR subdirs ARLIB_DIR LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB LIBTOOL PATH_SH PATH_PERL PATH_NET_SNMP_CONFIG EDITLINE_LIBS HAVE_INLINE LIBPARSE MAKE_LIBPARSE MAKE_LIBPARSE_KERNEL MAKE_CHECK_Y2K OPENSSL OPENSSL_INC OPENSSL_LIB LCRYPTO EF_PROGS EF_LIBS MAKE_CHECK_LAYOUT TESTDCF DCFD MAKE_PARSEKMODULE PROPDELAY CHUTEST CLKTEST MAKE_ADJTIMED MAKE_NTPTIME MAKE_TICKADJ MAKE_TIMETRIM MAKE_LIBNTPSIM MAKE_NTPDSIM SNMP_LIBS SNMP_CPPFLAGS SNMP_CFLAGS MAKE_NTPSNMPD LSCF LIBOBJS LTLIBOBJS MAKE_NTPSNMPD_MAN'
- ac_subst_files=''
- 
- # Initialize some variables set by options.
-@@ -1656,6 +1656,11 @@
-       done
-     done
-     ;;
-+ i?86-*-freebsd[[123]].*)
-+    ;;
-+ i?86-*-freebsd*)
-+    ans=yes
-+    ;;
- esac
- done
- 
-@@ -45233,6 +45238,7 @@
- fi
- if test $ac_cv_header_net_snmp_net_snmp_config_h = yes; then
-   MAKE_NTPSNMPD=ntpsnmpd
-+  MAKE_NTPSNMPD_MAN=ntpsnmpd.1
- else
-   { echo "$as_me:$LINENO: WARNING: net-snmp-config present but net-snmp headers are not available!" >&5
- echo "$as_me: WARNING: net-snmp-config present but net-snmp headers are not available!" >&2;}
-@@ -47988,6 +47994,7 @@
- s,@SNMP_CPPFLAGS@,$SNMP_CPPFLAGS,;t t
- s,@SNMP_CFLAGS@,$SNMP_CFLAGS,;t t
- s,@MAKE_NTPSNMPD@,$MAKE_NTPSNMPD,;t t
-+s,@MAKE_NTPSNMPD_MAN@,$MAKE_NTPSNMPD_MAN,;t t
- s,@LSCF@,$LSCF,;t t
- s,@LIBOBJS@,$LIBOBJS,;t t
- s,@LTLIBOBJS@,$LTLIBOBJS,;t t
diff --git a/net/ntp-devel/files/patch-ntpsnmpd-Makefile.in b/net/ntp-devel/files/patch-ntpsnmpd-Makefile.in
deleted file mode 100644
index 5287d214e8eb..000000000000
--- a/net/ntp-devel/files/patch-ntpsnmpd-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- ntpsnmpd/Makefile.in.orig	2009-01-19 03:27:56.000000000 -0800
-+++ ntpsnmpd/Makefile.in	2009-01-20 15:53:14.000000000 -0800
-@@ -234,7 +234,7 @@
- BUILT_SOURCES = ntpsnmpd-opts.c ntpsnmpd-opts.h ntpsnmpd.1 ntpsnmpd-opts.texi \
- 		ntpsnmpd-opts.menu
- 
--man_MANS = ntpsnmpd.1
-+man_MANS = @MAKE_NTPSNMPD_MAN@
- run_ag = cd $(srcdir) && autogen -L ../include --writable
- std_def_list = $(top_srcdir)/include/debug-opt.def		\
- 		$(top_srcdir)/include/autogen-version.def 	\
diff --git a/net/ntp-devel/pkg-plist b/net/ntp-devel/pkg-plist
index 7a8d206cb6d2..e5ca2f1bc992 100644
--- a/net/ntp-devel/pkg-plist
+++ b/net/ntp-devel/pkg-plist
@@ -8,7 +8,7 @@ bin/ntptime
 bin/ntptrace
 bin/sntp
 bin/tickadj
-%%NETSNMP%%sbin/ntpsnmpd
+%%NETSNMP%%bin/ntpsnmpd
 %%PORTDOCS%%%%DOCSDIR%%/accopt.html
 %%PORTDOCS%%%%DOCSDIR%%/assoc.html
 %%PORTDOCS%%%%DOCSDIR%%/audio.html