From owner-svn-ports-all@freebsd.org Sat Mar 25 07:50:55 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 38D89D1D9E8; Sat, 25 Mar 2017 07:50:55 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0C80A1003; Sat, 25 Mar 2017 07:50:54 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2P7osKY062985; Sat, 25 Mar 2017 07:50:54 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2P7osYk062983; Sat, 25 Mar 2017 07:50:54 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201703250750.v2P7osYk062983@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Sat, 25 Mar 2017 07:50:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r436887 - head/net/ntp X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Mar 2017 07:50:55 -0000 Author: cy Date: Sat Mar 25 07:50:53 2017 New Revision: 436887 URL: https://svnweb.freebsd.org/changeset/ports/436887 Log: r436859 removed a bunch of refclock drivers that were enabled by default. (New patch from ian@.) While here ian@ and I discussed the www/libwww libmd5 dependency. It turns out that if the sntp configure script finds libmd5, it uses it. This is now an option to include the dependency. While working on the libmd5 dependency it was discovered that the sntp build requires SSL only if it finds libmd5. This is now an IMPLIES. Thanks to ian@ for the additional patch and for discovering the libmd5 check, pointing me in the right direction to solve the without SSL breakage. PR: 218078 Submitted by: ian@ (default driver options) Discussed with: ian@ (libmd5 dependency) Modified: head/net/ntp/Makefile head/net/ntp/Makefile.inc Modified: head/net/ntp/Makefile ============================================================================== --- head/net/ntp/Makefile Sat Mar 25 04:52:02 2017 (r436886) +++ head/net/ntp/Makefile Sat Mar 25 07:50:53 2017 (r436887) @@ -3,7 +3,7 @@ PORTNAME= ntp PORTVERSION= 4.2.8p10 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net ipv6 MASTER_SITES= http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ \ http://archive.ntp.org/ntp4/ntp-4.2/ \ @@ -13,8 +13,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/P/ MAINTAINER= cy@FreeBSD.org COMMENT= The Network Time Protocol Distribution -LIB_DEPENDS= libevent.so:devel/libevent \ - libmd5.so:www/libwww +LIB_DEPENDS= libevent.so:devel/libevent CONFLICTS= ntp-devel-* @@ -56,13 +55,15 @@ SSL_CONFIGURE_ON= --with-openssl-incdir= --with-openssl-libdir=${OPENSSLLIB} SSL_CONFIGURE_OFF= --without-crypto SSL_USES= ssl -SSL_BROKEN_OFF= Includes OpenSSL when deselected DEBUG_CONFIGURE_ON= --enable-debug THREADS_CONFIGURE_ENABLE= thread-support THREADS_CONFIGURE_WITH= threads +MD5_LIB_DEPENDS= libmd5.so:www/libwww +MD5_IMPLIES= SSL + .for D in ${NTP_DRIVERS} ${D}_CONFIGURE_ENABLE= ${D} .endfor Modified: head/net/ntp/Makefile.inc ============================================================================== --- head/net/ntp/Makefile.inc Sat Mar 25 04:52:02 2017 (r436886) +++ head/net/ntp/Makefile.inc Sat Mar 25 07:50:53 2017 (r436887) @@ -5,62 +5,15 @@ OPTIONS_DEFINE= NTPSNMPD \ IPV6 \ DEBUG \ NTP_SIGND \ - BANCOMM \ - GPSVME \ - ACTS \ - ARBITER \ - ARCRON_MSF \ - AS2201 \ - ATOM \ - CHRONOLOG \ - CHU \ - AUDIO_CHU \ - DATUM \ - DUMBCLOCK \ - FG \ - HEATH \ - HOPFSERIAL \ - HOPFPCI \ - HPGPS \ - IRIG \ - JJY \ - JUPITER \ - LEITCH \ - LOCAL_CLOCK \ - MX4200 \ - NEOCLOCK4X \ - NMEA \ - ONCORE \ - PALISADE \ - PCF \ PERL_UTILS \ - PST \ - RIPENCC \ - SHM \ - SPECTRACOM \ - TRUETIME \ - ULINK \ - WWV \ - ZYFER \ - COMPUTIME \ - DCF7000 \ - HOPF6021 \ - MEINBERG \ - RAWDCF \ - RCC8000 \ - SCHMID \ - SEL240X \ - TRIMTAIP \ - TRIMTSIP \ - WHARTON \ - VARITEXT \ DOCS \ - EXAMPLES + EXAMPLES \ + MD5 \ + ${NTP_DRIVERS} OPTIONS_DEFAULT= SSL \ - ATOM \ PERL_UTILS \ - NMEA + ${NTP_DRIVERS_DEFAULT} NTPSNMPD_DESC= Build and install ntpsnmpd NTP_SIGND_DESC= Enable signed NTP @@ -113,6 +66,7 @@ TRIMTAIP_DESC= Enable Trimble GPS receiv TRIMTSIP_DESC= Enable Trimble GPS receiver/TSIP protocol WHARTON_DESC= Enable WHARTON 400A Series clock VARITEXT_DESC= Enable VARITEXT clock +MD5_DESC= Add libwww md5 dependency for sntp (implies SSL) # Not supported by FreeBSD: TPRO Enable KSI/Odetics TPRO/S GPS receiver/IRIG # XXX Broken under FreeBSD: TT560 Enable TrueTime 560 IRIG-B decoder @@ -166,3 +120,36 @@ NTP_DRIVERS= \ TRIMTSIP \ WHARTON \ VARITEXT + +NTP_DRIVERS_DEFAULT= \ + ACTS \ + ARBITER \ + ARCRON_MSF \ + AS2201 \ + ATOM \ + CHRONOLOG \ + CHU \ + DATUM \ + DUMBCLOCK \ + FG \ + HEATH \ + HOPFPCI \ + HOPFSERIAL \ + HPGPS \ + IRIG \ + JJY \ + JUPITER \ + LEITCH \ + LOCAL_CLOCK \ + NEOCLOCK4X \ + NMEA \ + ONCORE \ + PALISADE \ + PCF \ + PST \ + SHM \ + SPECTRACOM \ + TRUETIME \ + ULINK \ + WWV \ + ZYFER