From owner-svn-ports-all@freebsd.org  Mon Feb 26 05:19:33 2018
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1444DF2BB48;
 Mon, 26 Feb 2018 05:19:33 +0000 (UTC)
 (envelope-from swills@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id BA05C83494;
 Mon, 26 Feb 2018 05:19:32 +0000 (UTC)
 (envelope-from swills@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B4D4B17159;
 Mon, 26 Feb 2018 05:19:32 +0000 (UTC)
 (envelope-from swills@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1Q5JWwJ082056;
 Mon, 26 Feb 2018 05:19:32 GMT (envelope-from swills@FreeBSD.org)
Received: (from swills@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1Q5JWSG082055;
 Mon, 26 Feb 2018 05:19:32 GMT (envelope-from swills@FreeBSD.org)
Message-Id: <201802260519.w1Q5JWSG082055@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: swills set sender to
 swills@FreeBSD.org using -f
From: Steve Wills <swills@FreeBSD.org>
Date: Mon, 26 Feb 2018 05:19:32 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r462990 - branches/2018Q1/archivers/pbzip2
X-SVN-Group: ports-branches
X-SVN-Commit-Author: swills
X-SVN-Commit-Paths: branches/2018Q1/archivers/pbzip2
X-SVN-Commit-Revision: 462990
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Feb 2018 05:19:33 -0000

Author: swills
Date: Mon Feb 26 05:19:32 2018
New Revision: 462990
URL: https://svnweb.freebsd.org/changeset/ports/462990

Log:
  MFH: r460675
  
  Unbreak the build against Clang 6.0.0 and respect CXXFLAGS.
  
  PR:	225555
  
  Approved by:	ports-secteam (implicit)

Modified:
  branches/2018Q1/archivers/pbzip2/Makefile
Directory Properties:
  branches/2018Q1/   (props changed)

Modified: branches/2018Q1/archivers/pbzip2/Makefile
==============================================================================
--- branches/2018Q1/archivers/pbzip2/Makefile	Mon Feb 26 04:16:14 2018	(r462989)
+++ branches/2018Q1/archivers/pbzip2/Makefile	Mon Feb 26 05:19:32 2018	(r462990)
@@ -17,8 +17,11 @@ PLIST_FILES=	bin/pbzip2 bin/pbunzip2 \
 		man/man1/pbzip2.1.gz man/man1/pbunzip2.1.gz
 
 post-patch:
+	@${REINPLACE_CMD} -e 's,PRI[iu]MAX, & ,g' ${WRKSRC}/pbzip2.cpp \
+		${WRKSRC}/BZ2StreamScanner.cpp
 # Spell target sources to be understood by both BSD and GNU make(1)
-	@${REINPLACE_CMD} -e 's,$$^,$$>&,' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e '/-O2/s,^,#, ; s,$$^,$$>&,' \
+		${WRKSRC}/Makefile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/