diff --git a/devel/p4/Makefile b/devel/p4/Makefile index 8fdeb92b44ff..b2206757d753 100644 --- a/devel/p4/Makefile +++ b/devel/p4/Makefile @@ -1,47 +1,47 @@ PORTNAME= p4 PORTVERSION= ${YEAR}.${MAJOR}.${MINOR} 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. # maintainer is backup hosting MASTER_SITES= https://ftp.perforce.com/perforce/${P4VERSION}/bin.tools/p4source${EXTRACT_SUFX}?dummy=/ \ https://hesiod.org/distfiles/perforce/ DISTNAME= p4source-${MINOR} MAINTAINER= antonfb@hesiod.org COMMENT= Perforce command line client WWW= https://www.perforce.com/products/helix-core -LICENSE= BSD2CLAUSE +LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${JAM}:devel/jam # p4 links libssl and libcrypto statically, so specify :build USES= ssl:build tar:tgz WRKSRC= ${WRKDIR}/p4source-${PORTVERSION} PLIST_FILES= bin/p4 .include .include "Makefile.inc" do-build: cd ${WRKSRC} && ${SETENV} C++="${CXX}" C++FLAGS="${CXXFLAGS}" \ CCFLAGS="${CFLAGS}" \ HDRS="${OPENSSLINC}" \ LINKFLAGS="${LDFLAGS}" \ OSVER=${OSVER} \ SSL="yes" \ SSLVER="1.1.1" \ SSLPREFIX=${OPENSSLLIB} \ USE_EXTENSIONS=0 \ USE_OPTIMIZED_ZLIB=0 \ ${JAM} -dx -j${MAKE_JOBS_NUMBER} p4 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/p4-bin/p4 ${STAGEDIR}${PREFIX}/bin .include diff --git a/devel/p4/Makefile.inc b/devel/p4/Makefile.inc index f568ff87966a..ea958bcdff3b 100644 --- a/devel/p4/Makefile.inc +++ b/devel/p4/Makefile.inc @@ -1,7 +1,7 @@ P4VERSION?= r${PORTVERSION:S/^20//:C/\.[0-9]+$//} -YEAR= 2025 -MAJOR= 2 -MINOR= 2907753 +YEAR= 2026 +MAJOR= 1 +MINOR= 3062361 JAM?= ${LOCALBASE}/bin/jam OSVER?= ${OSREL:S/.//} diff --git a/devel/p4/distinfo b/devel/p4/distinfo index b74a5ae1ea79..2386e6cf6e4c 100644 --- a/devel/p4/distinfo +++ b/devel/p4/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1773520963 -SHA256 (p4source-2907753.tgz) = c5c15a57612791ce833ae0e181d6234e85a8b175321e3b819d38f66e0c981803 -SIZE (p4source-2907753.tgz) = 7009506 +TIMESTAMP = 1789250852 +SHA256 (p4source-3062361.tgz) = 3998b8261e419ab10fe6dd00352ebb8e242adcaa38bf0d84f76a0c7b848727b2 +SIZE (p4source-3062361.tgz) = 7055834 diff --git a/devel/p4/pkg-descr b/devel/p4/pkg-descr index 4b7f39318e24..80a8877ccffd 100644 --- a/devel/p4/pkg-descr +++ b/devel/p4/pkg-descr @@ -1,12 +1,12 @@ 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/r25.2/doc/user/ for release notes. +See https://ftp.perforce.com/perforce/r26.1/doc/user/ for release notes. diff --git a/devel/p4api/Makefile b/devel/p4api/Makefile index 35b959bd81d2..3d84bfee50bb 100644 --- a/devel/p4api/Makefile +++ b/devel/p4api/Makefile @@ -1,57 +1,57 @@ PORTNAME= p4api PORTVERSION= ${YEAR}.${MAJOR}.${MINOR} CATEGORIES= devel # 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/ DISTNAME= p4source-${MINOR} MAINTAINER= antonfb@hesiod.org COMMENT= Perforce API (static libraries and header files) WWW= https://www.perforce.com/products/helix-core -LICENSE= BSD2CLAUSE +LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${JAM}:devel/jam USES= tar:tgz PATCHDIR= ${.CURDIR}/../p4/files DISTINFO_FILE= ${.CURDIR}/../p4/distinfo OPTIONS_DEFINE= EXAMPLES WRKSRC= ${WRKDIR}/p4source-${PORTVERSION} .include .include "../p4/Makefile.inc" do-build: cd ${WRKSRC} && ${SETENV} C++="${CXX}" C++FLAGS="${CXXFLAGS}" \ CCFLAGS="${CFLAGS}" \ LINKFLAGS="${LDFLAGS}" \ OSVER=${OSVER} \ API=1 \ SSL="yes" \ SSLVER="1.1.1" \ SSLLIB=-lssl \ CRYPTOLIB=-lcrypto \ TYPE=pic \ USE_EXTENSIONS=0 \ USE_OPTIMIZED_ZLIB=0 \ ${JAM} -dx -j${MAKE_JOBS_NUMBER} p4api p4api.tar do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/include/perforce cd ${WRKSRC}/p4-bin/bin.pic/p4api-*/include/p4 && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include/perforce ${MKDIR} ${STAGEDIR}${PREFIX}/lib/perforce cd ${WRKSRC}/p4-bin/bin.pic/p4api-*/lib && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/perforce do-install-EXAMPLES-on: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} cd ${WRKSRC}/p4-bin/bin.pic/p4api-*/sample && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} .include