Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 10 Mar 2026 16:05:37 +0000
From:      Vladimir Druzenko <vvd@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org
Subject:   git: b712dc884242 - 2026Q1 - archivers/pbzip2: Fix build on 14.4
Message-ID:  <69b04151.3e6e7.747282aa@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch 2026Q1 has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=b712dc8842424a5bb46690f219f05d4f10016b41

commit b712dc8842424a5bb46690f219f05d4f10016b41
Author:     Vladimir Druzenko <vvd@FreeBSD.org>
AuthorDate: 2026-03-10 15:46:17 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2026-03-10 16:05:25 +0000

    archivers/pbzip2: Fix build on 14.4
    
    In "stable/14" bmake was updated to version 20250707 after 1403507 and
    before 1403508.
    
    Check 3129c2094ecb0db5bf55c481c1a1f133ea01df76 for more info.
    
    PR:             290004
    Reported by:    Sebastian Oswald <sko@rostwald.de>
    Approved by:    blanket (fix build)
    
    (cherry picked from commit 799dc9154c2478b41e3a2e19ca6416699f4d6a7b)
---
 archivers/pbzip2/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/archivers/pbzip2/Makefile b/archivers/pbzip2/Makefile
index 8c8b1f716db0..4c63e487822f 100644
--- a/archivers/pbzip2/Makefile
+++ b/archivers/pbzip2/Makefile
@@ -19,7 +19,8 @@ PLIST_FILES=	bin/pbzip2 bin/pbunzip2 \
 post-patch:
 	@${REINPLACE_CMD} -e 's,PRI[iu]MAX, & ,g' ${WRKSRC}/pbzip2.cpp \
 		${WRKSRC}/BZ2StreamScanner.cpp
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1500053
+.if ${OPSYS} == FreeBSD && (${OSVERSION} < 1403508 || \
+	${OSVERSION} >= 1500000 && ${OSVERSION} < 1500053)
 # Spell target sources to be understood by both BSD and GNU make(1)
 	@${REINPLACE_CMD} -e '/-O2/s,^,#, ; s,$$^,$$>&,' \
 		${WRKSRC}/Makefile


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69b04151.3e6e7.747282aa>