svn commit: r494585 - head/multimedia/zoneminder

Jan Beich jbeich at FreeBSD.org
Mon Mar 4 11:21:03 UTC 2019


Author: jbeich
Date: Mon Mar  4 11:21:02 2019
New Revision: 494585
URL: https://svnweb.freebsd.org/changeset/ports/494585

Log:
  multimedia/zoneminder: unbreak with libc++ 8
  
  In file included from src/zm_box.cpp:20:
  In file included from src/zm.h:27:
  In file included from src/zm_config.h:27:
  In file included from /usr/include/c++/v1/string:505:
  In file included from /usr/include/c++/v1/string_view:176:
  In file included from /usr/include/c++/v1/__string:57:
  In file included from /usr/include/c++/v1/algorithm:640:
  In file included from /usr/include/c++/v1/initializer_list:47:
  In file included from /usr/include/c++/v1/cstddef:38:
  version:1:1: error: expected unqualified-id
  1.32.3
  ^
  
  PR:		236192
  Approved by:	portmgr blanket

Modified:
  head/multimedia/zoneminder/Makefile   (contents, props changed)

Modified: head/multimedia/zoneminder/Makefile
==============================================================================
--- head/multimedia/zoneminder/Makefile	Mon Mar  4 11:07:15 2019	(r494584)
+++ head/multimedia/zoneminder/Makefile	Mon Mar  4 11:21:02 2019	(r494585)
@@ -101,6 +101,12 @@ post-extract:
 	${REINPLACE_CMD} -e 's|/dev/shm|/tmp|g' ${WRKSRC}/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
 #	${REINPLACE_CMD} -e 's|E_ALL|E_ALL^E_NOTICE|g' ${WRKSRC}/web/index.php
 
+post-patch:
+# Avoid conflict with C++20 <version> by adding .txt suffix
+	@${MV} ${WRKSRC}/version ${WRKSRC}/version.txt
+	@${REINPLACE_CMD} -i .c++20 's/"version/&.txt/' \
+		${WRKSRC}/CMakeLists.txt
+
 pre-install:
 	${MKDIR} ${STAGEDIR}${WWWDIR}/temp
 	${MKDIR} ${STAGEDIR}${WWWDIR}/api/app/tmp


More information about the svn-ports-all mailing list