From owner-svn-ports-all@freebsd.org  Fri Feb  2 08:33:24 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 D3812EC8A4B;
 Fri,  2 Feb 2018 08:33:24 +0000 (UTC)
 (envelope-from danfe@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 85A5D809F9;
 Fri,  2 Feb 2018 08:33:24 +0000 (UTC)
 (envelope-from danfe@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 80A40195FC;
 Fri,  2 Feb 2018 08:33:24 +0000 (UTC)
 (envelope-from danfe@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w128XOdO022185;
 Fri, 2 Feb 2018 08:33:24 GMT (envelope-from danfe@FreeBSD.org)
Received: (from danfe@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w128XOS6022184;
 Fri, 2 Feb 2018 08:33:24 GMT (envelope-from danfe@FreeBSD.org)
Message-Id: <201802020833.w128XOS6022184@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: danfe set sender to
 danfe@FreeBSD.org using -f
From: Alexey Dokuchaev <danfe@FreeBSD.org>
Date: Fri, 2 Feb 2018 08:33:24 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r460675 - head/archivers/pbzip2
X-SVN-Group: ports-head
X-SVN-Commit-Author: danfe
X-SVN-Commit-Paths: head/archivers/pbzip2
X-SVN-Commit-Revision: 460675
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: Fri, 02 Feb 2018 08:33:25 -0000

Author: danfe
Date: Fri Feb  2 08:33:24 2018
New Revision: 460675
URL: https://svnweb.freebsd.org/changeset/ports/460675

Log:
  Unbreak the build against Clang 6.0.0 and respect CXXFLAGS.
  
  PR:	225555

Modified:
  head/archivers/pbzip2/Makefile

Modified: head/archivers/pbzip2/Makefile
==============================================================================
--- head/archivers/pbzip2/Makefile	Fri Feb  2 07:13:35 2018	(r460674)
+++ head/archivers/pbzip2/Makefile	Fri Feb  2 08:33:24 2018	(r460675)
@@ -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/