From owner-svn-ports-all@freebsd.org Tue Feb 6 16:23:49 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6C4E6EE5FAB; Tue, 6 Feb 2018 16:23:49 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 19164721CD; Tue, 6 Feb 2018 16:23:49 +0000 (UTC) (envelope-from asomers@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 13FA71A4F1; Tue, 6 Feb 2018 16:23:49 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w16GNmrU062213; Tue, 6 Feb 2018 16:23:48 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w16GNmVs062209; Tue, 6 Feb 2018 16:23:48 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201802061623.w16GNmVs062209@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Tue, 6 Feb 2018 16:23:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r461074 - in head/devel: p4 p4api X-SVN-Group: ports-head X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: in head/devel: p4 p4api X-SVN-Commit-Revision: 461074 X-SVN-Commit-Repository: ports 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.25 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: Tue, 06 Feb 2018 16:23:49 -0000 Author: asomers (src committer) Date: Tue Feb 6 16:23:48 2018 New Revision: 461074 URL: https://svnweb.freebsd.org/changeset/ports/461074 Log: devel/p4 devel/p4api: cache distfiles in LOCAL Perforce unhelpfully rebuilds their distfiles every few hours, changing the archived files' timestamps in the process. This obviously changes their checksums. Work around the issue by caching local copies of the distfiles and using those for the checksums. Also, set a sane DIST_SUBDIR since the distfiles are ambiguously named. Also, take over maintainership from gordon. Reported by: gordon, antoine Reviewed by: mat Approved by: mat (ports) Sponsored by: Spectra Logic Corp Differential Revision: https://reviews.freebsd.org/D14211 Modified: head/devel/p4/Makefile head/devel/p4/distinfo head/devel/p4api/Makefile head/devel/p4api/distinfo Modified: head/devel/p4/Makefile ============================================================================== --- head/devel/p4/Makefile Tue Feb 6 16:19:06 2018 (r461073) +++ head/devel/p4/Makefile Tue Feb 6 16:23:48 2018 (r461074) @@ -5,12 +5,17 @@ PORTNAME= p4 PORTVERSION= ${YEAR}.${MAJOR}.${MINOR} PORTREVISION= 1 CATEGORIES= devel -MASTER_SITES= https://swarm.workshop.perforce.com/projects/perforce_software-p4/archives/:zip +# Perforce stupidly rerolls their distfiles on a regular basis, updating the +# files' timestamps when they do, which changes the zip file's checksum. Work +# around that by cacheing the distfile in LOCAL and using that version to make +# distinfo +MASTER_SITES= LOCAL/asomers/perforce/p4 \ + https://swarm.workshop.perforce.com/projects/perforce_software-p4/archives/ DISTNAME= ${YEAR}-${MAJOR} -DISTFILES= ${ZIP_FILES}:zip -EXTRACT_ONLY= ${ZIP_FILES} +DIST_SUBDIR= perforce/p4 +DISTFILES= ${ZIP_FILES} -MAINTAINER= gordon@FreeBSD.org +MAINTAINER= asomers@FreeBSD.org COMMENT= Perforce client LICENSE= BSD2CLAUSE Modified: head/devel/p4/distinfo ============================================================================== --- head/devel/p4/distinfo Tue Feb 6 16:19:06 2018 (r461073) +++ head/devel/p4/distinfo Tue Feb 6 16:23:48 2018 (r461074) @@ -1,3 +1,3 @@ -TIMESTAMP = 1517531476 -SHA256 (2016-1.zip) = 75ee76a2eb1b6a866b61c2e6bd473aa57ff796d8e5e2f2497d219bf5628a4fc7 -SIZE (2016-1.zip) = 2249015 +TIMESTAMP = 1517864594 +SHA256 (perforce/p4/2016-1.zip) = af465c970b5892674089a917ffa3d38f9b878e1ceb32eb73c2e05bd462d5ba63 +SIZE (perforce/p4/2016-1.zip) = 2249015 Modified: head/devel/p4api/Makefile ============================================================================== --- head/devel/p4api/Makefile Tue Feb 6 16:19:06 2018 (r461073) +++ head/devel/p4api/Makefile Tue Feb 6 16:23:48 2018 (r461074) @@ -4,13 +4,19 @@ PORTNAME= p4api PORTVERSION= ${YEAR}.${MAJOR}.${MINOR} PORTREVISION= 1 CATEGORIES= devel -MASTER_SITES= https://swarm.workshop.perforce.com/projects/perforce_software-p4/archives/:zip \ - ftp://ftp.perforce.com/perforce/${P4VERSION}/doc/manuals/p4api/:pdf +# Perforce stupidly rerolls their distfiles on a regular basis, updating the +# files' timestamps when they do, which changes the zip file's checksum. Work +# around that by cacheing the distfile in LOCAL and using that version to make +# distinfo +MASTER_SITES= LOCAL/asomers/perforce/p4:zip \ + ftp://ftp.perforce.com/perforce/${P4VERSION}/doc/manuals/p4api/:pdf \ + https://swarm.workshop.perforce.com/projects/perforce_software-p4/archives/:zip +DIST_SUBDIR= perforce/p4 DISTNAME= ${YEAR}-${MAJOR} DISTFILES= ${ZIP_FILES}:zip p4api.pdf:pdf EXTRACT_ONLY= ${ZIP_FILES} -MAINTAINER= gordon@FreeBSD.org +MAINTAINER= asomers@FreeBSD.org COMMENT= Perforce API (static libraries and header files) LICENSE= BSD2CLAUSE @@ -46,7 +52,7 @@ do-install: do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${DISTDIR}/p4api.pdf ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/p4api.pdf ${STAGEDIR}${DOCSDIR} do-install-EXAMPLES-on: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} Modified: head/devel/p4api/distinfo ============================================================================== --- head/devel/p4api/distinfo Tue Feb 6 16:19:06 2018 (r461073) +++ head/devel/p4api/distinfo Tue Feb 6 16:23:48 2018 (r461074) @@ -1,5 +1,5 @@ -TIMESTAMP = 1517528733 -SHA256 (2016-1.zip) = 75ee76a2eb1b6a866b61c2e6bd473aa57ff796d8e5e2f2497d219bf5628a4fc7 -SIZE (2016-1.zip) = 2249015 -SHA256 (p4api.pdf) = df5e388c2753925d8411d98a14d7b634ef2543d4a0a04a340513e89d887ab57b -SIZE (p4api.pdf) = 1908708 +TIMESTAMP = 1517863861 +SHA256 (perforce/p4/2016-1.zip) = af465c970b5892674089a917ffa3d38f9b878e1ceb32eb73c2e05bd462d5ba63 +SIZE (perforce/p4/2016-1.zip) = 2249015 +SHA256 (perforce/p4/p4api.pdf) = df5e388c2753925d8411d98a14d7b634ef2543d4a0a04a340513e89d887ab57b +SIZE (perforce/p4/p4api.pdf) = 1908708