From owner-svn-ports-all@freebsd.org  Tue Dec  8 01:53:36 2020
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 28BCF4BE536;
 Tue,  8 Dec 2020 01:53:36 +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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4Cqjrc0gvmz4f41;
 Tue,  8 Dec 2020 01:53:36 +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 0A49E3B9C;
 Tue,  8 Dec 2020 01:53:36 +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 0B81rZIP060416;
 Tue, 8 Dec 2020 01:53:35 GMT (envelope-from danfe@FreeBSD.org)
Received: (from danfe@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0B81rZJ1060415;
 Tue, 8 Dec 2020 01:53:35 GMT (envelope-from danfe@FreeBSD.org)
Message-Id: <202012080153.0B81rZJ1060415@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: danfe set sender to
 danfe@FreeBSD.org using -f
From: Alexey Dokuchaev <danfe@FreeBSD.org>
Date: Tue, 8 Dec 2020 01:53:35 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r557260 - head/games/slade/files
X-SVN-Group: ports-head
X-SVN-Commit-Author: danfe
X-SVN-Commit-Paths: head/games/slade/files
X-SVN-Commit-Revision: 557260
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 08 Dec 2020 01:53:36 -0000

Author: danfe
Date: Tue Dec  8 01:53:35 2020
New Revision: 557260
URL: https://svnweb.freebsd.org/changeset/ports/557260

Log:
  Amend the logic to handle both GTK v2 and v3 backends.
  
  Reported by:	pkg-fallout

Modified:
  head/games/slade/files/patch-src_CMakeLists.txt

Modified: head/games/slade/files/patch-src_CMakeLists.txt
==============================================================================
--- head/games/slade/files/patch-src_CMakeLists.txt	Tue Dec  8 01:47:17 2020	(r557259)
+++ head/games/slade/files/patch-src_CMakeLists.txt	Tue Dec  8 01:53:35 2020	(r557260)
@@ -20,9 +20,9 @@
 -SET(WX_LIBS std aui gl stc richtext propgrid media)
 +# Work around find_package(wxWidgets...) inability to detect absence of some
 +# optional components (e.g., media)
-+find_library(WX_MEDIA wx_gtk2u_media-3.0)
++find_library(WX_MEDIA wx_gtk${GTK_VERSION}u_media-3.0)
 +if (NOT WX_MEDIA)
-+	message(STATUS "wx_gtk2u_media-3.0 not found, building without MP3 playback support.")
++	message(STATUS "wx_gtk${GTK_VERSION}u_media-3.0 not found, building without MP3 playback support.")
 +else (WX_MEDIA)
 +	SET(WX_LIBS ${WX_LIBS} media)
 +endif ()