From owner-svn-ports-all@FreeBSD.ORG Fri Apr 3 10:39:45 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 718F7B18; Fri, 3 Apr 2015 10:39:45 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 5C5E2403; Fri, 3 Apr 2015 10:39:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t33AdiSu076516; Fri, 3 Apr 2015 10:39:44 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t33AdgXt076510; Fri, 3 Apr 2015 10:39:42 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201504031039.t33AdgXt076510@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Fri, 3 Apr 2015 10:39:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r383104 - in head/net: . ntp ntp-devel ntp-rc 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.18-1 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: Fri, 03 Apr 2015 10:39:45 -0000 Author: cy Date: Fri Apr 3 10:39:41 2015 New Revision: 383104 URL: https://svnweb.freebsd.org/changeset/ports/383104 Log: Copy net/ntp to net/ntp-rc to track release candidates. Register conflicts between ports. Added: head/net/ntp-rc/ - copied from r382966, head/net/ntp/ Modified: head/net/Makefile head/net/ntp-devel/Makefile head/net/ntp-rc/Makefile head/net/ntp-rc/distinfo head/net/ntp-rc/pkg-plist head/net/ntp/Makefile Modified: head/net/Makefile ============================================================================== --- head/net/Makefile Fri Apr 3 09:22:42 2015 (r383103) +++ head/net/Makefile Fri Apr 3 10:39:41 2015 (r383104) @@ -434,6 +434,7 @@ SUBDIR += ntopng SUBDIR += ntp SUBDIR += ntp-devel + SUBDIR += ntp-rc SUBDIR += ntraceroute SUBDIR += nusoap SUBDIR += nxproxy Modified: head/net/ntp-devel/Makefile ============================================================================== --- head/net/ntp-devel/Makefile Fri Apr 3 09:22:42 2015 (r383103) +++ head/net/ntp-devel/Makefile Fri Apr 3 10:39:41 2015 (r383104) @@ -12,6 +12,8 @@ DISTNAME= ${PORTNAME}-dev-${PORTVERSION: MAINTAINER= cy@FreeBSD.org COMMENT= The Network Time Protocol Distribution +CONFLICTS ntp-[0-9].* ntp-rc-* + GNU_CONFIGURE= yes OPTIONS_SUB= yes USES= pathfix shebangfix libtool Modified: head/net/ntp-rc/Makefile ============================================================================== --- head/net/ntp/Makefile Wed Apr 1 22:36:10 2015 (r382966) +++ head/net/ntp-rc/Makefile Fri Apr 3 10:39:41 2015 (r383104) @@ -2,16 +2,19 @@ # $FreeBSD$ PORTNAME= ntp -PORTVERSION= 4.2.8p1 +PORTVERSION= 4.2.8p2.r2 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/ \ ftp://ftp.netlab.is.tsukuba.ac.jp/pub/network/ntp/ntp4/ +PKGNAMESUFFIX= -rc DISTNAME= ${PORTNAME}-${PORTVERSION:S/P/p/:S/.r/-RC/} MAINTAINER= cy@FreeBSD.org COMMENT= The Network Time Protocol Distribution +CONFLICTS ntp-[0-9].* ntp-devel-* + GNU_CONFIGURE= yes OPTIONS_SUB= yes USES= pathfix shebangfix libtool Modified: head/net/ntp-rc/distinfo ============================================================================== --- head/net/ntp/distinfo Wed Apr 1 22:36:10 2015 (r382966) +++ head/net/ntp-rc/distinfo Fri Apr 3 10:39:41 2015 (r383104) @@ -1,2 +1,2 @@ -SHA256 (ntp-4.2.8p1.tar.gz) = 948274b88f1ed002d867ced6aaefdfd0999668b11285ac2b3a67ff2629d59d88 -SIZE (ntp-4.2.8p1.tar.gz) = 6791852 +SHA256 (ntp-4.2.8p2-RC2.tar.gz) = e2130ed5837f47304b9c0487a16504271c90cab1b8f35a2f8565e960eb6f0000 +SIZE (ntp-4.2.8p2-RC2.tar.gz) = 6835889 Modified: head/net/ntp-rc/pkg-plist ============================================================================== --- head/net/ntp/pkg-plist Wed Apr 1 22:36:10 2015 (r382966) +++ head/net/ntp-rc/pkg-plist Fri Apr 3 10:39:41 2015 (r383104) @@ -8,6 +8,7 @@ man/man8/ntpq.8.gz %%PERL_UTILS%%man/man8/ntptrace.8.gz %%NTPSNMPD%%man/man8/ntpsnmpd.8.gz man/man8/sntp.8.gz +man/man8/update-leap.8.gz %%SSL%%sbin/ntp-keygen %%PERL_UTILS%%sbin/ntp-wait sbin/ntpd @@ -18,6 +19,7 @@ sbin/ntpq sbin/ntptime %%PERL_UTILS%%sbin/ntptrace sbin/sntp +sbin/update-leap %%PERL_UTILS%%share/ntp/lib/NTP/Util.pm %%PORTDOCS%%%%DOCSDIR%%/access.html %%PORTDOCS%%%%DOCSDIR%%/accopt.html @@ -484,6 +486,7 @@ sbin/sntp %%PORTDOCS%%%%DOCSDIR%%/sntp.html %%PORTDOCS%%%%DOCSDIR%%/stats.html %%PORTDOCS%%%%DOCSDIR%%/tickadj.html +%%PORTDOCS%%%%DOCSDIR%%/update-leap.html %%PORTDOCS%%%%DOCSDIR%%/warp.html %%PORTDOCS%%%%DOCSDIR%%/xleave.html %%PORTDOCS%%share/doc/sntp/sntp.html Modified: head/net/ntp/Makefile ============================================================================== --- head/net/ntp/Makefile Fri Apr 3 09:22:42 2015 (r383103) +++ head/net/ntp/Makefile Fri Apr 3 10:39:41 2015 (r383104) @@ -12,6 +12,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/P/ MAINTAINER= cy@FreeBSD.org COMMENT= The Network Time Protocol Distribution +CONFLICTS ntp-rc-* ntp-devel-* + GNU_CONFIGURE= yes OPTIONS_SUB= yes USES= pathfix shebangfix libtool