From owner-svn-ports-head@freebsd.org Wed Jul 8 22:04:30 2015 Return-Path: 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 EF3FD99649C; Wed, 8 Jul 2015 22:04:30 +0000 (UTC) (envelope-from pgollucci@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 DE5851E07; Wed, 8 Jul 2015 22:04:30 +0000 (UTC) (envelope-from pgollucci@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t68M4Uv0076778; Wed, 8 Jul 2015 22:04:30 GMT (envelope-from pgollucci@FreeBSD.org) Received: (from pgollucci@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t68M4STV076769; Wed, 8 Jul 2015 22:04:28 GMT (envelope-from pgollucci@FreeBSD.org) Message-Id: <201507082204.t68M4STV076769@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pgollucci set sender to pgollucci@FreeBSD.org using -f From: "Philip M. Gollucci" Date: Wed, 8 Jul 2015 22:04:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r391605 - head/devel/p4 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.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Jul 2015 22:04:31 -0000 Author: pgollucci Date: Wed Jul 8 22:04:27 2015 New Revision: 391605 URL: https://svnweb.freebsd.org/changeset/ports/391605 Log: Revert r391601 "- devel/p4: Unbreak" I have to fix all the p4* ports too. Teach me to fix something. Pointyhat to: myself Added: head/devel/p4/Makefile.inc (contents, props changed) head/devel/p4/distinfo.freebsd100x86 (contents, props changed) head/devel/p4/distinfo.freebsd100x86_64 (contents, props changed) head/devel/p4/distinfo.freebsd70x86 (contents, props changed) head/devel/p4/distinfo.freebsd70x86_64 (contents, props changed) Deleted: head/devel/p4/distinfo.amd64 head/devel/p4/distinfo.i386 Modified: head/devel/p4/Makefile Modified: head/devel/p4/Makefile ============================================================================== --- head/devel/p4/Makefile Wed Jul 8 22:02:25 2015 (r391604) +++ head/devel/p4/Makefile Wed Jul 8 22:04:27 2015 (r391605) @@ -4,7 +4,8 @@ PORTNAME= p4 PORTVERSION= 2014.2.1045032 CATEGORIES= devel -MASTER_SITES= ftp://ftp.perforce.com/perforce/${P4VERSION}/bin.freebsd100${ARCH:S,i386,x86,:S,amd64,x86_64,}/ +MASTER_SITES= ftp://ftp.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ \ + http://filehost.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ DISTNAME= p4 EXTRACT_SUFX= EXTRACT_ONLY= # none @@ -12,14 +13,13 @@ EXTRACT_ONLY= # none MAINTAINER= gordon@FreeBSD.org COMMENT= Perforce client -BROKEN_FreeBSD_8= no distfiles -BROKEN_FreeBSD_9= no distfiles -BROKEN_FreeBSD_11= no distfiles +BROKEN= checksum mismatch ONLY_FOR_ARCHS= amd64 i386 P4VERSION= r${PORTVERSION:S/^20//:C/\.[0-9]+$//} -DISTINFO_FILE= ${MASTERDIR}/distinfo.${ARCH} +DIST_SUBDIR= perforce/${PORTVERSION}/bin.${PLATFORM} +DISTINFO_FILE= ${MASTERDIR}/distinfo.${PLATFORM} RESTRICTED= Restricted distribution @@ -28,7 +28,11 @@ NO_WRKSUBDIR= yes PLIST_FILES= bin/p4 +.include + +.include "Makefile.inc" + do-install: ${INSTALL_PROGRAM} ${DISTDIR}/${DIST_SUBDIR}/p4 ${STAGEDIR}${PREFIX}/bin -.include +.include Added: head/devel/p4/Makefile.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/p4/Makefile.inc Wed Jul 8 22:04:27 2015 (r391605) @@ -0,0 +1,24 @@ +# Figure out what to install +.if ${OPSYS} == FreeBSD + +.if ${ARCH} == amd64 +. if ${OSVERSION} >= 1000100 +PLATFORM= freebsd100x86_64 +. else +PLATFORM= freebsd70x86_64 +. endif + +.elif ${ARCH} == i386 +. if ${OSVERSION} >= 1000100 +PLATFORM= freebsd100x86 +. else +PLATFORM= freebsd70x86 +. endif + +.else +IGNORE= unsupported OS release, sorry +.endif + +.else +IGNORE= ${OPSYS} is unsupported, sorry +.endif Added: head/devel/p4/distinfo.freebsd100x86 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/p4/distinfo.freebsd100x86 Wed Jul 8 22:04:27 2015 (r391605) @@ -0,0 +1,2 @@ +SHA256 (perforce/2014.2.1045032/bin.freebsd100x86/p4) = 1261bacd887cb09bcf79004a427784e3428ebef8ef7f8cd527e8f446feb3efb4 +SIZE (perforce/2014.2.1045032/bin.freebsd100x86/p4) = 2474416 Added: head/devel/p4/distinfo.freebsd100x86_64 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/p4/distinfo.freebsd100x86_64 Wed Jul 8 22:04:27 2015 (r391605) @@ -0,0 +1,2 @@ +SHA256 (perforce/2014.2.1045032/bin.freebsd100x86_64/p4) = 676c424b485e90817e63592fc5f14ea151b489128078053989f2e85080d485c2 +SIZE (perforce/2014.2.1045032/bin.freebsd100x86_64/p4) = 2732720 Added: head/devel/p4/distinfo.freebsd70x86 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/p4/distinfo.freebsd70x86 Wed Jul 8 22:04:27 2015 (r391605) @@ -0,0 +1,2 @@ +SHA256 (perforce/2014.2.1045032/bin.freebsd70x86/p4) = 0c48532af152ba9ef187fd3a098ec0be0c5f8b9312becea4a27fe63ddec427ac +SIZE (perforce/2014.2.1045032/bin.freebsd70x86/p4) = 2555504 Added: head/devel/p4/distinfo.freebsd70x86_64 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/p4/distinfo.freebsd70x86_64 Wed Jul 8 22:04:27 2015 (r391605) @@ -0,0 +1,2 @@ +SHA256 (perforce/2014.2.1045032/bin.freebsd70x86_64/p4) = 3fbf5e0203bf4c2bc9b6107c8111c28e9d2f88372f6330fcff32057addf6c069 +SIZE (perforce/2014.2.1045032/bin.freebsd70x86_64/p4) = 2716456