From owner-svn-ports-head@freebsd.org Mon Jan 15 10:01:20 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C0880E6EB69; Mon, 15 Jan 2018 10:01:20 +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 9B26C6A71C; Mon, 15 Jan 2018 10:01:20 +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 DAA0C776E; Mon, 15 Jan 2018 10:01:19 +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 w0FA1JgW072448; Mon, 15 Jan 2018 10:01:19 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0FA1J7s072446; Mon, 15 Jan 2018 10:01:19 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201801151001.w0FA1J7s072446@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Mon, 15 Jan 2018 10:01:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r459026 - in head/textproc/teckit: . files X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: in head/textproc/teckit: . files X-SVN-Commit-Revision: 459026 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Jan 2018 10:01:20 -0000 Author: danfe Date: Mon Jan 15 10:01:19 2018 New Revision: 459026 URL: https://svnweb.freebsd.org/changeset/ports/459026 Log: Unbreak with pre-C++11 compilers, e.g. with gcc 4.2.1 which is still the default compiler on some tier-2 architectures like powerpc and sparc64, by using identical types from C's rather than C++'s header file. While here, convert to USES+=localbase. PR: 225171 Reported by: jhibbits Added: head/textproc/teckit/files/patch-SFconv_UtfCodec.h (contents, props changed) Modified: head/textproc/teckit/Makefile Modified: head/textproc/teckit/Makefile ============================================================================== --- head/textproc/teckit/Makefile Mon Jan 15 09:20:15 2018 (r459025) +++ head/textproc/teckit/Makefile Mon Jan 15 10:01:19 2018 (r459026) @@ -14,21 +14,23 @@ LICENSE_FILE= ${WRKSRC}/license/LICENSING.txt LIB_DEPENDS= libexpat.so:textproc/expat2 -USES= autoreconf libtool pkgconfig +USES= autoreconf libtool localbase pkgconfig USE_GITHUB= yes GH_ACCOUNT= silnrsi GNU_CONFIGURE= yes USE_LDCONFIG= yes -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip DOCS= AUTHORS README NEWS docs/*.pdf license/LICENSING.txt OPTIONS_DEFINE= DOCS +post-patch: + @${REINPLACE_CMD} -e '/sfconv_CXXFLAGS = -std=c++11/d' \ + ${WRKSRC}/bin/Makefile.am + post-install-DOCS-on: - ${MKDIR} ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${DOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include Added: head/textproc/teckit/files/patch-SFconv_UtfCodec.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/teckit/files/patch-SFconv_UtfCodec.h Mon Jan 15 10:01:19 2018 (r459026) @@ -0,0 +1,15 @@ +--- SFconv/UtfCodec.h.orig 2017-06-23 19:39:26 UTC ++++ SFconv/UtfCodec.h +@@ -28,11 +28,7 @@ of the License or (at your option) any l + + #include + #include +-#include +- +-using std::int8_t; +-using std::uint8_t; +-using std::ptrdiff_t; ++#include + + typedef uint32_t uchar_t; +