Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 21 Mar 2017 20:42:29 +0000 (UTC)
From:      Dirk Meyer <dinoex@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r436651 - head/graphics/gnash
Message-ID:  <201703212042.v2LKgTvP011592@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dinoex
Date: Tue Mar 21 20:42:29 2017
New Revision: 436651
URL: https://svnweb.freebsd.org/changeset/ports/436651

Log:
  - fix conflict with mesa-demos

Modified:
  head/graphics/gnash/Makefile
  head/graphics/gnash/pkg-plist

Modified: head/graphics/gnash/Makefile
==============================================================================
--- head/graphics/gnash/Makefile	Tue Mar 21 20:40:18 2017	(r436650)
+++ head/graphics/gnash/Makefile	Tue Mar 21 20:42:29 2017	(r436651)
@@ -3,7 +3,7 @@
 
 PORTNAME=	gnash
 PORTVERSION=	0.8.10
-PORTREVISION=	24
+PORTREVISION=	25
 CATEGORIES=	graphics
 MASTER_SITES=	http://git.savannah.gnu.org/cgit/gnash.git/snapshot/
 DISTNAME=	gnash-2b3bdede0305c4fc3ad21a0a4197330606c9b880
@@ -227,6 +227,8 @@ post-patch:
 		${WRKSRC}/libmedia/ffmpeg/VideoDecoderFfmpegVaapi.cpp
 
 post-install:
+	# eglinfo conflicts with mesa-demos
+	${MV} ${STAGEDIR}/${PREFIX}/bin/eglinfo ${STAGEDIR}/${PREFIX}/bin/eglinfo-gnash
 .for conf in ${CONFIG_FILES}
 	${MV} ${STAGEDIR}/${SYSCONFIGDIR}/${conf} ${STAGEDIR}${SYSCONFIGDIR}/${conf}.dist
 .endfor

Modified: head/graphics/gnash/pkg-plist
==============================================================================
--- head/graphics/gnash/pkg-plist	Tue Mar 21 20:40:18 2017	(r436650)
+++ head/graphics/gnash/pkg-plist	Tue Mar 21 20:42:29 2017	(r436651)
@@ -1,4 +1,4 @@
-bin/eglinfo
+bin/eglinfo-gnash
 bin/gnash
 %%GTK2%%bin/gnash-gtk-launcher
 %%GTK2%%bin/gtk-gnash



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