From nobody Thu Mar 23 21:35:13 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PjJXd68WHz40Lq8; Thu, 23 Mar 2023 21:35:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PjJXd43RMz4H3P; Thu, 23 Mar 2023 21:35:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679607313; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CGJfZGl6tjLv2zbWzmWNjoQNM4gd6z3bgSkDJjaMRLA=; b=TmEqTRbLwviIEia3mi0IlrmBnSbuDGwgDa6mLVZdlodoIA4qc+MmXGSHm8+YPoZ3wVVEYb qt6xDGIwlgNsjjGYGFIULkLNtpxgZEsqpiUgm6MHAN8O5TwL7usrwSU75MCpzG9RPXT22y ce6b1hP1cOWYFvkgeWNd7sa0Mz4YHVG+47cui7Id8Q0zUkPKRHS2e4fvncY4WNVKCkmwek XQVY42PbRe3yzsbTHYQMdpf8FDeecwD5OHb+3fJkwpZeJpqi4wvEi7k4ZoKg6/tktIm4Sj DSFutF6169dkQY5xRqI1hW8QKTloA3gs6F9fasgwnEhuMWJHKYUlCI3qEKzrpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679607313; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CGJfZGl6tjLv2zbWzmWNjoQNM4gd6z3bgSkDJjaMRLA=; b=fstHdB7LpM8oy9YpVcdzzGsynZ02YVaU4vBvJ0UpXjP6YDpzMsAla7ETsoh3+iqvFzF5qy SUGxyvkjwd9Cb90t6IpeU2B8vSnQZSgo7Qfe9GE/2hD4RXm2Mb3W91K8TVBp9hYXdLW0+S V9D7ru+Ml8lZ4yI0tyxZQNYsc8dy824Y/ukq6k1yJ9EQDvoK8kJp7LpfdMxVLvHRM1b7lb +GnG0f6K5PdEOUBci+et4ihdFV7rMk+Hk8LCiOaJjdFRjcUnJLAt4Kijz1h4/tHYnFi51m Zb2GyeOIltH12HyEz0hH5JoJqWX97oz8UJwtxAsDm0ca8/hunAhzpIZJwNzcYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679607313; a=rsa-sha256; cv=none; b=pWkqF/YZoOP3kvGCN2RpP8r3jAPgbVXf1ICRHvEzoXODq8IUxF3CF30QHYvVRbu3oBEt4P KTT0SHzB4aA/i+E4yRHiSp2xWVMPlbr+Wv1Ow33pOGQRMEqscBHpnE1c4iPpDf8raAkp0U eaZ4KnsUeMVI4gzN262t0YmO1Y8Cxi9uY6vXr1uohtgjlGcCNH3a6AjLZybsq6z1cLMS0V lUZKJhhrB9p+q+giE+QaPOeZl8kAy/9KTs4xFKKNT1DAmbTFT1Pt+W16Xu6FcY7IsiYHgh 1CoeC0yhgfJYUMdj2HwtKKyuuzFGwHvqZyv7noO57hknxUwO536fJXdEz8TsNA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PjJXd38l4zs6j; Thu, 23 Mar 2023 21:35:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32NLZDo1086109; Thu, 23 Mar 2023 21:35:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32NLZDMU086108; Thu, 23 Mar 2023 21:35:13 GMT (envelope-from git) Date: Thu, 23 Mar 2023 21:35:13 GMT Message-Id: <202303232135.32NLZDMU086108@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Craig Leres Subject: git: 3ef98eb228bb - main - devel/p4: Update to r22.2.2407422 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: leres X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3ef98eb228bbf3b4003df96fbe287a634afeb3b6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by leres: URL: https://cgit.FreeBSD.org/ports/commit/?id=3ef98eb228bbf3b4003df96fbe287a634afeb3b6 commit 3ef98eb228bbf3b4003df96fbe287a634afeb3b6 Author: Craig Leres AuthorDate: 2023-03-23 21:34:55 +0000 Commit: Craig Leres CommitDate: 2023-03-23 21:34:55 +0000 devel/p4: Update to r22.2.2407422 Remove BROKEN lines (this version is 7 years newer). Documentation is only in html form online now. PR: 270420 Approved by: antonfb@hesiod.org (maintainer) --- devel/p4api/Makefile | 36 +++++++++++++----------------------- devel/p4api/distinfo | 8 +++----- devel/p4api/pkg-descr | 2 ++ devel/p4api/pkg-plist | 25 +++++++++++++++++++++++-- 4 files changed, 41 insertions(+), 30 deletions(-) diff --git a/devel/p4api/Makefile b/devel/p4api/Makefile index 74f930313769..3cb2963f3d19 100644 --- a/devel/p4api/Makefile +++ b/devel/p4api/Makefile @@ -2,47 +2,41 @@ PORTNAME= p4api PORTVERSION= ${YEAR}.${MAJOR}.${MINOR} PORTREVISION= 1 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. -# Also, this port is for 2016.1 which no longer is available from Perforce's -# sites. The new maintainer will backup host until the new 2022.2 port is ready. -MASTER_SITES= LOCAL/asomers/perforce/p4:zip \ - https://hesiod.org/distfiles/ -DIST_SUBDIR= perforce/p4 -DISTNAME= ${YEAR}-${MAJOR} -DISTFILES= ${ZIP_FILES}:zip p4api.pdf:pdf -EXTRACT_ONLY= ${ZIP_FILES} +# Perforce does not version their distfiles when they patch. +# This does not play well with FreeBSD's conventions. +MASTER_SITES= https://ftp.perforce.com/perforce/${P4VERSION}/bin.tools/p4source${EXTRACT_SUFX}?dummy=/ \ + https://hesiod.org/distfiles/perforce-${MINOR}/p4source${EXTRACT_SUFX}?dummy=/ +DISTNAME= p4source-${MINOR} MAINTAINER= antonfb@hesiod.org COMMENT= Perforce API (static libraries and header files) -WWW= http://www.perforce.com/perforce/loadsupp.html +WWW= https://www.perforce.com/products/helix-core LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_FreeBSD_12_powerpc64= fails to build: /bin/sh: clang++: not found - BUILD_DEPENDS= ${JAM}:devel/jam -OPTIONS_DEFINE= DOCS EXAMPLES +USES= tar:tgz -USES= zip +OPTIONS_DEFINE= EXAMPLES -WRKSRC= ${WRKDIR}/${DISTNAME} +WRKSRC= ${WRKDIR}/p4source-${PORTVERSION} .include .include "../p4/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}" \ LINKFLAGS="${LDFLAGS}" \ OSVER=${OSVER} \ API=1 \ + SSL="yes" \ + SSLLIB=-lssl \ + CRYPTOLIB=-lcrypto \ TYPE=pic \ - ${JAM} -dx -j${MAKE_JOBS_NUMBER} || true + ${JAM} -dx -sUSE_EXTENSIONS=0 -j${MAKE_JOBS_NUMBER} p4api p4api.tar do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/include/perforce @@ -50,10 +44,6 @@ do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/lib/perforce cd ${WRKSRC}/p4-bin/bin.pic/p4api-*/lib && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/perforce -do-install-DOCS-on: - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/p4api.pdf ${STAGEDIR}${DOCSDIR} - do-install-EXAMPLES-on: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} cd ${WRKSRC}/p4-bin/bin.pic/p4api-*/sample && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} diff --git a/devel/p4api/distinfo b/devel/p4api/distinfo index fe1e178cf1aa..895f00dbc4d1 100644 --- a/devel/p4api/distinfo +++ b/devel/p4api/distinfo @@ -1,5 +1,3 @@ -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 +TIMESTAMP = 1679584778 +SHA256 (p4source-2407422.tgz) = 4355375def3f3d2256d4a92ac1b9960173e7aa97404346c0c74caf23a0905e1b +SIZE (p4source-2407422.tgz) = 6325949 diff --git a/devel/p4api/pkg-descr b/devel/p4api/pkg-descr index d99330ba9011..260a310cce92 100644 --- a/devel/p4api/pkg-descr +++ b/devel/p4api/pkg-descr @@ -1,3 +1,5 @@ The Perforce Client API is a simple beast which packages up the command invocation, sends it to the server, and then acts on instructions from the server to carry out the actual command. + +For documentation: https://www.perforce.com/manuals/p4api/Content/P4API/Home-p4api.html diff --git a/devel/p4api/pkg-plist b/devel/p4api/pkg-plist index 04e0d26a6777..fc849b828c2e 100644 --- a/devel/p4api/pkg-plist +++ b/devel/p4api/pkg-plist @@ -1,3 +1,4 @@ +include/perforce/base64.h include/perforce/charcvt.h include/perforce/charman.h include/perforce/charset.h @@ -5,11 +6,16 @@ include/perforce/clientapi.h include/perforce/clientmerge.h include/perforce/clientprog.h include/perforce/clientresolvea.h +include/perforce/clientscript.h include/perforce/clientuser.h include/perforce/datetime.h include/perforce/debug.h include/perforce/diff.h include/perforce/diffmerge.h +include/perforce/dmextension.h +include/perforce/dmextension_c.h +include/perforce/dmextensiondata.h +include/perforce/dmextensiondata_c.h include/perforce/echoctl.h include/perforce/enviro.h include/perforce/error.h @@ -24,15 +30,23 @@ include/perforce/ignore.h include/perforce/keepalive.h include/perforce/macfile.h include/perforce/macutil.h +include/perforce/malloc_override.h include/perforce/mangle.h include/perforce/mapapi.h include/perforce/md5.h include/perforce/msgclient.h include/perforce/msgdb.h include/perforce/msgdm.h +include/perforce/msgdm2.h +include/perforce/msggraph.h +include/perforce/msghelp.h +include/perforce/msglbr.h include/perforce/msgos.h include/perforce/msgrpc.h +include/perforce/msgscript.h include/perforce/msgserver.h +include/perforce/msgserver2.h +include/perforce/msgspec.h include/perforce/msgsupp.h include/perforce/netbuffer.h include/perforce/netconnect.h @@ -40,10 +54,14 @@ include/perforce/netportparser.h include/perforce/ntmangle.h include/perforce/ntservice.h include/perforce/options.h +include/perforce/p4libs.h include/perforce/p4tags.h include/perforce/pathsys.h include/perforce/runcmd.h +include/perforce/sanitizers.h include/perforce/serverhelperapi.h +include/perforce/sha1.h +include/perforce/sha256.h include/perforce/signaler.h include/perforce/spec.h include/perforce/stdhdrs.h @@ -59,10 +77,13 @@ include/perforce/validate.h include/perforce/vararray.h include/perforce/web822.h lib/perforce/libclient.a -lib/perforce/libp4sslstub.a +lib/perforce/libp4api.a +lib/perforce/libp4script.a +lib/perforce/libp4script_c.a +lib/perforce/libp4script_curl.a +lib/perforce/libp4script_sqlite.a lib/perforce/librpc.a lib/perforce/libsupp.a -%%PORTDOCS%%%%DOCSDIR%%/p4api.pdf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Jamfile %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Jamrules %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Version