Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 4 Mar 2019 04:59:07 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r494547 - head/devel/libcutl
Message-ID:  <201903040459.x244x7tW023431@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Mon Mar  4 04:59:06 2019
New Revision: 494547
URL: https://svnweb.freebsd.org/changeset/ports/494547

Log:
  devel/libcutl: unbreak with libc++ 8
  
  In file included from exception.cxx:5:
  In file included from /usr/include/c++/v1/typeinfo:61:
  In file included from /usr/include/c++/v1/exception:81:
  In file included from /usr/include/c++/v1/cstddef:38:
  ../version:1:1: error: expected unqualified-id
  1.10.0
  ^
  
  PR:		236192
  Approved by:	portmgr blanket

Modified:
  head/devel/libcutl/Makefile   (contents, props changed)
  head/devel/libcutl/pkg-plist   (contents, props changed)

Modified: head/devel/libcutl/Makefile
==============================================================================
--- head/devel/libcutl/Makefile	Mon Mar  4 04:35:13 2019	(r494546)
+++ head/devel/libcutl/Makefile	Mon Mar  4 04:59:06 2019	(r494547)
@@ -35,4 +35,10 @@ CONFIGURE_ARGS=	--disable-static \
 
 OPTIONS_DEFINE=	DOCS
 
+post-patch:
+# Avoid conflict with C++20 <version> by adding .txt suffix
+	@${MV} ${WRKSRC}/version ${WRKSRC}/version.txt
+	@${REINPLACE_CMD} -i .c++20 '/doc_DATA/s/version/&.txt/' \
+		${WRKSRC}/Makefile.in
+
 .include <bsd.port.mk>

Modified: head/devel/libcutl/pkg-plist
==============================================================================
--- head/devel/libcutl/pkg-plist	Mon Mar  4 04:35:13 2019	(r494546)
+++ head/devel/libcutl/pkg-plist	Mon Mar  4 04:59:06 2019	(r494547)
@@ -61,4 +61,4 @@ libdata/pkgconfig/libcutl.pc
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/version
+%%PORTDOCS%%%%DOCSDIR%%/version.txt



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903040459.x244x7tW023431>