Attachment 241039 Details for Bug 270387 – Perforce generated unified diff

[patch] Perforce generated unified diff

p4port.diff (text/plain), 3.89 KB, created by antonfb on 2023-03-21 16:26:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: antonfb

Created: 2023-03-21 16:26:18 UTC

Size: 3.89 KB

patch

obsolete

>--- //depot/ports/devel/p4/Makefile	2023-03-19 18:53:30.000000000 -0700
>+++ /usr/ports/devel/p4/Makefile	2023-03-19 18:53:30.000000000 -0700
>@@ -1,32 +1,29 @@
> PORTNAME=	p4
> PORTVERSION=	${YEAR}.${MAJOR}.${MINOR}
>-PORTREVISION=	3
> CATEGORIES=	devel
> # Perforce changes their distfiles when they patch, which changes the
> # zip file's checksum. This does not play well with FreeBSD's conventions.
>-# This version of the port 2016.1 is no longer available from Perforce's
>-# site. The new maintainer is backup hosting until the new port of 2022.2
>-# is ready.
>-MASTER_SITES=	LOCAL/asomers/perforce/p4 \
>-		https://hesiod.org/distfiles/
>-DISTNAME=	${YEAR}-${MAJOR}
>-DISTFILES=	${ZIP_FILES}
>-DIST_SUBDIR=	perforce/p4
>+# maintainer is backup hosting
>+MASTER_SITES=	https://ftp.perforce.com/perforce/${P4VERSION}/bin.tools/ \
>+		https://hesiod.org/distfiles/perforce-${MINOR}/
>+DISTNAME=	p4source
>+# Putting this in a subdir with a name based on the version is working
>+# around the lack of version number on the downloaded file.
>+DIST_SUBDIR=	perforce-${MINOR}
> 
> MAINTAINER=	antonfb@hesiod.org
>-COMMENT=	Perforce client
>-WWW=		https://www.perforce.com/
>+COMMENT=	Perforce command line client
>+WWW=		https://www.perforce.com/products/helix-core
> 
> LICENSE=	BSD2CLAUSE
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-BROKEN_mips64=	fails to install: /wrkdirs/usr/ports/devel/p4/work/2016-1/p4-bin/p4: No such file or directory
>-BROKEN_FreeBSD_12_powerpc64=	fails to build: /bin/sh: clang++: not found
>-
> BUILD_DEPENDS=	${JAM}:devel/jam
> 
> # p4 links libssl and libcrypto statically, so specify :build
>-USES=		ssl:build
>+USES=		ssl:build tar:tgz
>+
>+WRKSRC=		${WRKDIR}/${DISTNAME}-${PORTVERSION}
> 
> PLIST_FILES=	bin/p4
> 
>@@ -34,8 +31,6 @@
> 
> .include "Makefile.inc"
> 
>-# Sadly, Jam always returns 1 even on success.  Ignore its return value and
>-# detect build errors during the install phase.
> do-build:
> 	cd ${WRKSRC} && ${SETENV} C++="${CXX}" C++FLAGS="${CXXFLAGS}" \
> 		CCFLAGS="${CFLAGS}" \
>@@ -44,7 +39,7 @@
> 		OSVER=${OSVER} \
> 		SSL="yes" \
> 		SSLPREFIX=${OPENSSLLIB} \
>-		${JAM} -dx -j${MAKE_JOBS_NUMBER} || true
>+		${JAM} -dx -sUSE_EXTENSIONS=0 -j${MAKE_JOBS_NUMBER} p4
> 
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/p4-bin/p4 ${STAGEDIR}${PREFIX}/bin
>--- //depot/ports/devel/p4/Makefile.inc	2023-03-19 18:52:32.000000000 -0700
>+++ /usr/ports/devel/p4/Makefile.inc	2023-03-19 18:52:32.000000000 -0700
>@@ -1,8 +1,7 @@
>-ZIP_FILES=	${DISTNAME}.zip
> P4VERSION?=	r${PORTVERSION:S/^20//:C/\.[0-9]+$//}
>-YEAR=		2016
>-MAJOR=		1
>-MINOR=		1492381
>+YEAR=		2022
>+MAJOR=		2
>+MINOR=		2407422
> 
> JAM?=		${LOCALBASE}/bin/jam
> OSVER?=		${OSREL:S/.//}
>--- //depot/ports/devel/p4/distinfo	2023-03-19 18:52:32.000000000 -0700
>+++ /usr/ports/devel/p4/distinfo	2023-03-19 18:52:32.000000000 -0700
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1517864594
>-SHA256 (perforce/p4/2016-1.zip) = af465c970b5892674089a917ffa3d38f9b878e1ceb32eb73c2e05bd462d5ba63
>-SIZE (perforce/p4/2016-1.zip) = 2249015
>+TIMESTAMP = 1679252513
>+SHA256 (perforce-2407422/p4source.tgz) = 4355375def3f3d2256d4a92ac1b9960173e7aa97404346c0c74caf23a0905e1b
>+SIZE (perforce-2407422/p4source.tgz) = 6325949
>--- //depot/ports/devel/p4/pkg-descr	2023-03-19 18:52:32.000000000 -0700
>+++ /usr/ports/devel/p4/pkg-descr	2023-03-19 18:52:32.000000000 -0700
>@@ -1,2 +1,12 @@
>-Perforce is a commercial revision control system that can be used
>-gratis for developing free software. (see the WWW page for details).
>+Perforce is a commercial revision control system. This is the command
>+line client which works with servers remotely or locally.
>+The clients and the api for Perforce is freely available.
>+
>+This build does not support the "Extensions" feature.
>+
>+The server is no longer available for FreeBSD but the Linux version
>+should work. There is a limited free use level and non-profit
>+organizations might qualify for free licencing.
>+
>+See "p4 -V" for more licensing and version information.
>+See https://ftp.perforce.com/perforce/r22.2/doc/user/ for release notes.

Actions: View | Diff

Attachments on bug 270387: 241039