svn commit: r383104 - in head/net: . ntp ntp-devel ntp-rc

[Cy Schubert]

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 at 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 at 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 at FreeBSD.org
 COMMENT=	The Network Time Protocol Distribution
 
+CONFLICTS       ntp-rc-* ntp-devel-*
+
 GNU_CONFIGURE=	yes
 OPTIONS_SUB=	yes
 USES=		pathfix shebangfix libtool