From owner-svn-ports-head@freebsd.org  Mon Oct 10 23:37:44 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@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 A26ECC07EC3;
 Mon, 10 Oct 2016 23:37:44 +0000 (UTC)
 (envelope-from cperciva@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 5492267A;
 Mon, 10 Oct 2016 23:37:44 +0000 (UTC)
 (envelope-from cperciva@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u9ANbhjO029448;
 Mon, 10 Oct 2016 23:37:43 GMT (envelope-from cperciva@FreeBSD.org)
Received: (from cperciva@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9ANbhvQ029445;
 Mon, 10 Oct 2016 23:37:43 GMT (envelope-from cperciva@FreeBSD.org)
Message-Id: <201610102337.u9ANbhvQ029445@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cperciva set sender to
 cperciva@FreeBSD.org using -f
From: Colin Percival <cperciva@FreeBSD.org>
Date: Mon, 10 Oct 2016 23:37:43 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r423733 - in head/ports-mgmt: . port-index-uniquifier
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 Oct 2016 23:37:44 -0000

Author: cperciva
Date: Mon Oct 10 23:37:42 2016
New Revision: 423733
URL: https://svnweb.freebsd.org/changeset/ports/423733

Log:
  Add port-index-uniquifier, which is a dummy port taking its version number
  from ${OSVERSION}.  This should work around a bug in portsnap whereby the
  "Fetching N metadata files" step will fail if the identical INDEX files
  are generated for different major FreeBSD versions.

Added:
  head/ports-mgmt/port-index-uniquifier/
  head/ports-mgmt/port-index-uniquifier/Makefile   (contents, props changed)
  head/ports-mgmt/port-index-uniquifier/pkg-descr   (contents, props changed)
Modified:
  head/ports-mgmt/Makefile

Modified: head/ports-mgmt/Makefile
==============================================================================
--- head/ports-mgmt/Makefile	Mon Oct 10 23:27:44 2016	(r423732)
+++ head/ports-mgmt/Makefile	Mon Oct 10 23:37:42 2016	(r423733)
@@ -39,6 +39,7 @@
     SUBDIR += pkgcompare
     SUBDIR += pkgs_which
     SUBDIR += port-authoring-tools
+    SUBDIR += port-index-uniquifier
     SUBDIR += port-maintenance-tools
     SUBDIR += portal
     SUBDIR += portconf

Added: head/ports-mgmt/port-index-uniquifier/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/ports-mgmt/port-index-uniquifier/Makefile	Mon Oct 10 23:37:42 2016	(r423733)
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+PORTNAME=	port-index-uniquifier
+PORTVERSION=	${OSVERSION}
+CATEGORIES=	ports-mgmt
+MASTER_SITES=	# none
+DISTFILES=	# none
+EXTRACT_ONLY=	# none
+
+MAINTAINER=	cperciva@FreeBSD.org
+COMMENT=	Dummy port to ensure major versions have different INDEX files
+
+NO_WRKSUBDIR=	yes
+NO_BUILD=	yes
+NO_INSTALL=	yes
+
+.include <bsd.port.mk>

Added: head/ports-mgmt/port-index-uniquifier/pkg-descr
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/ports-mgmt/port-index-uniquifier/pkg-descr	Mon Oct 10 23:37:42 2016	(r423733)
@@ -0,0 +1,3 @@
+This is a dummy port which takes its version number from ${OSVERSION}, in
+order to work around a bug in portsnap triggered by having identical INDEX
+files on different major versions.