Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 3 Dec 2020 08:53:06 +0000 (UTC)
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r556892 - in head: . games games/slade
Message-ID:  <202012030853.0B38r6Yt005316@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: danfe
Date: Thu Dec  3 08:53:06 2020
New Revision: 556892
URL: https://svnweb.freebsd.org/changeset/ports/556892

Log:
  - Resurrect SLADE and update to version 3.1.12
  - C++14 is now required to build the project
  - Register explicit dependencies on cURL and FreeType
  - Do not try to force GTK 2.0, no support in wxWidgets

Added:
  head/games/slade/
     - copied from r511179, head/games/slade/
Modified:
  head/MOVED
  head/games/Makefile
  head/games/slade/Makefile
  head/games/slade/distinfo

Modified: head/MOVED
==============================================================================
--- head/MOVED	Thu Dec  3 08:47:30 2020	(r556891)
+++ head/MOVED	Thu Dec  3 08:53:06 2020	(r556892)
@@ -12870,7 +12870,6 @@ editors/dexed||2019-09-05|Has expired: Depends on expi
 editors/p5-Padre||2019-09-05|Has expired: Depends on expiring x11-toolkits/p5-Wx
 emulators/qemu2||2019-09-05|Has expired: Latest 3.X branch is in ports tree
 games/asc||2019-09-05|Has expired: Broken for more than 6 months
-games/slade||2019-09-05|Has expired: Broken for more than 6 months
 graphics/gimp-wavelet-decompose-plugin||2019-09-05|Has expired: Broken for more than 6 months
 irc/irssi-otr||2019-09-05|Has expired: Broken for more than 6 months
 mail/p5-Mail-ClamAV||2019-09-05|Has expired: Broken for more than 6 months

Modified: head/games/Makefile
==============================================================================
--- head/games/Makefile	Thu Dec  3 08:47:30 2020	(r556891)
+++ head/games/Makefile	Thu Dec  3 08:53:06 2020	(r556892)
@@ -883,6 +883,7 @@
     SUBDIR += sjeng
     SUBDIR += ski
     SUBDIR += sl
+    SUBDIR += slade
     SUBDIR += slashem-tty
     SUBDIR += slump
     SUBDIR += sokoban

Modified: head/games/slade/Makefile
==============================================================================
--- head/games/slade/Makefile	Thu Sep  5 11:27:14 2019	(r511179)
+++ head/games/slade/Makefile	Thu Dec  3 08:53:06 2020	(r556892)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	slade
-PORTVERSION=	3.1.4
-PORTREVISION=	2
+PORTVERSION=	3.1.12
 CATEGORIES=	games
 
 MAINTAINER=	danfe@FreeBSD.org
@@ -11,30 +10,27 @@ COMMENT=	Modern editor for Doom-engine based games and
 
 LICENSE=	GPLv2
 
-BROKEN=		fails to build
-DEPRECATED=	Broken for more than 6 months
-EXPIRATION_DATE=	2019-09-04
-
 BUILD_DEPENDS=	zip:archivers/zip
-LIB_DEPENDS=	libsfml-system.so:devel/sfml \
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libfreeimage.so:graphics/freeimage \
+		libfreetype.so:print/freetype2 \
 		libftgl.so:graphics/ftgl \
-		libfreeimage.so:graphics/freeimage
+		libsfml-system.so:devel/sfml
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	sirjuddington
 GH_PROJECT=	${PORTNAME:tu}
 
-USES=		cmake compiler:c++11-lib gl pkgconfig
+USES=		cmake compiler:c++14-lang gl pkgconfig
 USE_WX=		3.0+
-USE_GL=		glew
-USE_CXXSTD=	c++11
+USE_GL=		gl glew glu
 
 CMAKE_ARGS=	-DwxWidgets_CONFIG_EXECUTABLE:FILEPATH="${WX_CONFIG}" \
-		-DWX_GTK3:BOOL=OFF -DNO_WEBVIEW:BOOL=ON
+		-DNO_WEBVIEW:BOOL=ON
 
 PLIST_FILES=	bin/slade share/slade3/slade.pk3 \
-		share/appdata/net.mancubus.SLADE.appdata.xml \
 		share/applications/net.mancubus.SLADE.desktop \
+		share/metainfo/net.mancubus.SLADE.metainfo.xml \
 		share/icons/net.mancubus.SLADE.png
 
 OPTIONS_DEFINE=	FLUIDSYNTH
@@ -52,5 +48,7 @@ post-patch:
 		${WRKSRC}/src/External/zreaders/portable_endian.h
 	@${REINPLACE_CMD} -e 's,wxVSCROLL,static_cast<long>(&),' \
 		${WRKSRC}/src/MapEditor/UI/Dialogs/ActionSpecialDialog.cpp
+	@${REINPLACE_CMD} -e 's,(new_print,&.ToStdString(),' \
+		${WRKSRC}/src/Scripting/Lua.cpp
 
 .include <bsd.port.mk>

Modified: head/games/slade/distinfo
==============================================================================
--- head/games/slade/distinfo	Thu Sep  5 11:27:14 2019	(r511179)
+++ head/games/slade/distinfo	Thu Dec  3 08:53:06 2020	(r556892)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1545809128
-SHA256 (sirjuddington-SLADE-3.1.4_GH0.tar.gz) = ee3acaaf27292c90a46eea509c3a56564e1339b3080a9648dc6edf5b731be57e
-SIZE (sirjuddington-SLADE-3.1.4_GH0.tar.gz) = 5888350
+TIMESTAMP = 1590449690
+SHA256 (sirjuddington-SLADE-3.1.12_GH0.tar.gz) = 44645ff43c6d0b44e7f85ac25f15ca50749843f9ed230736d0a39c46af9f7c31
+SIZE (sirjuddington-SLADE-3.1.12_GH0.tar.gz) = 5883591



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