From owner-svn-ports-branches@freebsd.org Sun Jul 19 04:31:22 2015 Return-Path: Delivered-To: svn-ports-branches@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 917239A5F7C; Sun, 19 Jul 2015 04:31:22 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org (repo.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 759791A74; Sun, 19 Jul 2015 04:31:22 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6J4VMRv056732; Sun, 19 Jul 2015 04:31:22 GMT (envelope-from gordon@FreeBSD.org) Received: (from gordon@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6J4VKqE056726; Sun, 19 Jul 2015 04:31:20 GMT (envelope-from gordon@FreeBSD.org) Message-Id: <201507190431.t6J4VKqE056726@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gordon set sender to gordon@FreeBSD.org using -f From: Gordon Tetlow Date: Sun, 19 Jul 2015 04:31:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r392483 - branches/2015Q3/devel/p4 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Jul 2015 04:31:22 -0000 Author: gordon Date: Sun Jul 19 04:31:19 2015 New Revision: 392483 URL: https://svnweb.freebsd.org/changeset/ports/392483 Log: MFH: r392478 Update to devel/p4 2015.1/1126382 to fix broken port. Migrate common variable for the devel/p4* ports into the Makefile.inc. PR: 201216 Differential Revision: https://reviews.freebsd.org/D3088 Approved by: mat (mentor) Approved by: ports-secteam (feld) Modified: branches/2015Q3/devel/p4/Makefile branches/2015Q3/devel/p4/Makefile.inc branches/2015Q3/devel/p4/distinfo.freebsd100x86 branches/2015Q3/devel/p4/distinfo.freebsd100x86_64 branches/2015Q3/devel/p4/distinfo.freebsd70x86 branches/2015Q3/devel/p4/distinfo.freebsd70x86_64 Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/devel/p4/Makefile ============================================================================== --- branches/2015Q3/devel/p4/Makefile Sun Jul 19 02:23:01 2015 (r392482) +++ branches/2015Q3/devel/p4/Makefile Sun Jul 19 04:31:19 2015 (r392483) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= p4 -PORTVERSION= 2014.2.1045032 +PORTVERSION= 2015.1.1126382 CATEGORIES= devel MASTER_SITES= ftp://ftp.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ \ http://filehost.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ @@ -13,14 +13,6 @@ EXTRACT_ONLY= # none MAINTAINER= gordon@FreeBSD.org COMMENT= Perforce client -BROKEN= checksum mismatch - -ONLY_FOR_ARCHS= amd64 i386 - -P4VERSION= r${PORTVERSION:S/^20//:C/\.[0-9]+$//} -DIST_SUBDIR= perforce/${PORTVERSION}/bin.${PLATFORM} -DISTINFO_FILE= ${MASTERDIR}/distinfo.${PLATFORM} - RESTRICTED= Restricted distribution NO_BUILD= yes Modified: branches/2015Q3/devel/p4/Makefile.inc ============================================================================== --- branches/2015Q3/devel/p4/Makefile.inc Sun Jul 19 02:23:01 2015 (r392482) +++ branches/2015Q3/devel/p4/Makefile.inc Sun Jul 19 04:31:19 2015 (r392483) @@ -1,6 +1,8 @@ # Figure out what to install .if ${OPSYS} == FreeBSD +ONLY_FOR_ARCHS?= amd64 i386 + .if ${ARCH} == amd64 . if ${OSVERSION} >= 1000100 PLATFORM= freebsd100x86_64 @@ -22,3 +24,7 @@ IGNORE= unsupported OS release, sorry .else IGNORE= ${OPSYS} is unsupported, sorry .endif + +P4VERSION?= r${PORTVERSION:S/^20//:C/\.[0-9]+$//} +DIST_SUBDIR?= perforce/${PORTVERSION}/bin.${PLATFORM} +DISTINFO_FILE?= ${MASTERDIR}/distinfo.${PLATFORM} Modified: branches/2015Q3/devel/p4/distinfo.freebsd100x86 ============================================================================== --- branches/2015Q3/devel/p4/distinfo.freebsd100x86 Sun Jul 19 02:23:01 2015 (r392482) +++ branches/2015Q3/devel/p4/distinfo.freebsd100x86 Sun Jul 19 04:31:19 2015 (r392483) @@ -1,2 +1,2 @@ -SHA256 (perforce/2014.2.1045032/bin.freebsd100x86/p4) = 1261bacd887cb09bcf79004a427784e3428ebef8ef7f8cd527e8f446feb3efb4 -SIZE (perforce/2014.2.1045032/bin.freebsd100x86/p4) = 2474416 +SHA256 (perforce/2015.1.1126382/bin.freebsd100x86/p4) = 4ac2ca86a68a355a0920e28a7ed41db4b8a6d7f2e0390069625665cf009cfad9 +SIZE (perforce/2015.1.1126382/bin.freebsd100x86/p4) = 2562660 Modified: branches/2015Q3/devel/p4/distinfo.freebsd100x86_64 ============================================================================== --- branches/2015Q3/devel/p4/distinfo.freebsd100x86_64 Sun Jul 19 02:23:01 2015 (r392482) +++ branches/2015Q3/devel/p4/distinfo.freebsd100x86_64 Sun Jul 19 04:31:19 2015 (r392483) @@ -1,2 +1,2 @@ -SHA256 (perforce/2014.2.1045032/bin.freebsd100x86_64/p4) = 676c424b485e90817e63592fc5f14ea151b489128078053989f2e85080d485c2 -SIZE (perforce/2014.2.1045032/bin.freebsd100x86_64/p4) = 2732720 +SHA256 (perforce/2015.1.1126382/bin.freebsd100x86_64/p4) = 77a102169d95b2f3f18039be0787a7373c71551358322a7ae35674f4991804c6 +SIZE (perforce/2015.1.1126382/bin.freebsd100x86_64/p4) = 2815472 Modified: branches/2015Q3/devel/p4/distinfo.freebsd70x86 ============================================================================== --- branches/2015Q3/devel/p4/distinfo.freebsd70x86 Sun Jul 19 02:23:01 2015 (r392482) +++ branches/2015Q3/devel/p4/distinfo.freebsd70x86 Sun Jul 19 04:31:19 2015 (r392483) @@ -1,2 +1,2 @@ -SHA256 (perforce/2014.2.1045032/bin.freebsd70x86/p4) = 0c48532af152ba9ef187fd3a098ec0be0c5f8b9312becea4a27fe63ddec427ac -SIZE (perforce/2014.2.1045032/bin.freebsd70x86/p4) = 2555504 +SHA256 (perforce/2015.1.1126382/bin.freebsd70x86/p4) = e0e5d3bd20246c03e7b3b9244701546b2e5dc9fa109bdc17dbf155b058ee95bc +SIZE (perforce/2015.1.1126382/bin.freebsd70x86/p4) = 2634304 Modified: branches/2015Q3/devel/p4/distinfo.freebsd70x86_64 ============================================================================== --- branches/2015Q3/devel/p4/distinfo.freebsd70x86_64 Sun Jul 19 02:23:01 2015 (r392482) +++ branches/2015Q3/devel/p4/distinfo.freebsd70x86_64 Sun Jul 19 04:31:19 2015 (r392483) @@ -1,2 +1,2 @@ -SHA256 (perforce/2014.2.1045032/bin.freebsd70x86_64/p4) = 3fbf5e0203bf4c2bc9b6107c8111c28e9d2f88372f6330fcff32057addf6c069 -SIZE (perforce/2014.2.1045032/bin.freebsd70x86_64/p4) = 2716456 +SHA256 (perforce/2015.1.1126382/bin.freebsd70x86_64/p4) = 648e9ebdd28fa5dfe5ffaa6d344385f49cc3e31641f10ba89a099d4aa199488e +SIZE (perforce/2015.1.1126382/bin.freebsd70x86_64/p4) = 2795160