Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 30 Jan 2018 21:38:18 +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: r460439 - head/games/openra
Message-ID:  <201801302138.w0ULcI4U024795@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Tue Jan 30 21:38:18 2018
New Revision: 460439
URL: https://svnweb.freebsd.org/changeset/ports/460439

Log:
  games/openra: de-duplicate dllmap in *.config files
  
  SharpFont.dll.config already has os="freebsd" line but not os="dragonfly".
  Due to symlinks this can lead to
  
  <?xml version="1.0" encoding="utf-8" ?>
  <configuration>
  	<dllmap dll="freetype6" os="linux" target="libfreetype.so.6" />
  	<dllmap dll="freetype6" os="freebsd" target="libfreetype.so.6" />
  	<dllmap dll="freetype6" os="freebsd" target="libfreetype.so.6" />
  	<dllmap dll="freetype6" os="freebsd" target="libfreetype.so.6" />
  	<dllmap dll="freetype6" os="freebsd" target="libfreetype.so.6" />
  	<dllmap dll="freetype6" os="osx" target="/Library/Frameworks/Mono.framework/Libraries/libfreetype.6.dylib" />
  	<dllmap dll="freetype6" os="freebsd" target="libfreetype.so.6" />
  </configuration>

Modified:
  head/games/openra/Makefile   (contents, props changed)

Modified: head/games/openra/Makefile
==============================================================================
--- head/games/openra/Makefile	Tue Jan 30 21:15:23 2018	(r460438)
+++ head/games/openra/Makefile	Tue Jan 30 21:38:18 2018	(r460439)
@@ -70,7 +70,7 @@ post-patch:
 	${REINPLACE_CMD} -e '/[[:<:]]get[[:blank:]]/d' \
 			${WRKSRC}/thirdparty/fetch-thirdparty-deps.sh
 	${FIND} -L ${WRKSRC}/thirdparty -name '*.config*' -exec ${REINPLACE_CMD} \
-		-i '.bak.os' -e '/linux/{ p; s//${OPSYS:tl}/; }' {} +
+		-i '.bak.os' -e '/${OPSYS:tl}/d; /linux/{ p; s//${OPSYS:tl}/; }' {} +
 	${SED} 's/@LIBLUA51@/liblua-${LUA_VER}.so/' \
 		${WRKSRC}/thirdparty/Eluant.dll.config.in \
 		>${WRKSRC}/Eluant.dll.config



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