- Update to 1.2

4 files changed, 33 insertions, 51 deletions

diff --git a/games/supertuxkart/Makefile b/games/supertuxkart/Makefile
index 39097a72f940..cbc4a43bbd03 100644
--- a/games/supertuxkart/Makefile
+++ b/games/supertuxkart/Makefile
@@ -2,11 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	supertuxkart
-PORTVERSION=	1.1
-PORTREVISION=	1
+PORTVERSION=	1.2
 CATEGORIES=	games
 MASTER_SITES=	SF/supertuxkart/SuperTuxKart/${PORTVERSION}
-DISTNAME=	${PORTNAME}-${PORTVERSION}-src
+DISTNAME=	SuperTuxKart-${PORTVERSION}-src
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Free 3D kart racing game
@@ -14,25 +13,16 @@ COMMENT=	Free 3D kart racing game
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libvorbisfile.so:audio/libvorbis \
-		libogg.so:audio/libogg \
-		libcurl.so:ftp/curl \
-		libpng.so:graphics/png \
-		libfreetype.so:print/freetype2 \
-		libharfbuzz.so:print/harfbuzz \
-		libfribidi.so:converters/fribidi \
-		libraqm.so:print/libraqm \
-		libsqlite3.so:databases/sqlite3
+LIB_DEPENDS=	libsqlite3.so:databases/sqlite3 \
+		libcurl.so:ftp/curl
 
-BROKEN_i386=	does not build (error: this directive must appear between .cfi_startproc and .cfi_endproc directives)
+BROKEN_FreeBSD_12_i386=	does not build (error: this directive must appear between .cfi_startproc and .cfi_endproc directives)
 
-USES=		alias cmake compiler:c++11-lib gettext gl \
-		jpeg openal:al pkgconfig sdl tar:xz xorg
-USE_GL=		gl glu glew
-USE_SDL=	sdl
-USE_XORG=	x11 xrandr
-CMAKE_OFF=	USE_WIIUSE BUILD_RECORDER \
-		USE_SYSTEM_ENET USE_SYSTEM_SQUISH
+USES=		alias cmake compiler:c++11-lib pkgconfig tar:xz
+CMAKE_OFF=	USE_WIIUSE \
+		BUILD_RECORDER \
+		USE_SYSTEM_ENET \
+		USE_SYSTEM_SQUISH
 CMAKE_ON=	USE_SYSTEM_GLEW
 
 PORTDATA=	*
@@ -40,28 +30,32 @@ PORTDATA=	*
 CXXFLAGS+=	-DNO_IRR_COMPILE_WITH_JOYSTICK_EVENTS_ \
 		-D__FREE_BSD_
 
-OPTIONS_DEFINE=	NETTLE WAYLAND
-OPTIONS_DEFAULT=WAYLAND
+OPTIONS_DEFINE=	NETTLE SERVER_ONLY
+OPTIONS_DEFAULT=NETTLE
 
 NETTLE_DESC=		Use Nettle instead of OpenSSL for cryptography
 NETTLE_LIB_DEPENDS=	libnettle.so:security/nettle
 NETTLE_USES_OFF=	ssl
 NETTLE_CMAKE_BOOL_OFF=	USE_CRYPTO_OPENSSL
 
-WAYLAND_CMAKE_BOOL=	ENABLE_WAYLAND_DEVICE
-WAYLAND_LIB_DEPENDS=	libwayland-egl.so:graphics/wayland \
-			libxkbcommon.so:x11/libxkbcommon
-WAYLAND_USE=		GL=egl
+SERVER_ONLY_DESC=	Build server only
+SERVER_ONLY_CMAKE_BOOL=	SERVER_ONLY
+SERVER_ONLY_LIB_DEPENDS_OFF= \
+			libvorbisfile.so:audio/libvorbis \
+			libogg.so:audio/libogg \
+			libpng.so:graphics/png \
+			libfreetype.so:print/freetype2 \
+			libharfbuzz.so:print/harfbuzz
+SERVER_ONLY_USES_OFF=	gettext gl jpeg openal:al sdl xorg
+SERVER_ONLY_USE_OFF=	GL=gl,glu,glew SDL=sdl2 XORG=x11,xrandr
 
 # make sure that bundled libraries are not used
 post-extract:
-.for bundled in glew jpeglib libpng libraqm wiiuse zlib
+.for bundled in glew wiiuse
 	@${RM} -rf ${WRKSRC}/lib/${bundled}
 .endfor
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/X11R6/include|${LOCALBASE}/include|' \
-		${WRKSRC}/lib/irrlicht/CMakeLists.txt
 	@${REINPLACE_CMD} -e 's|Icon=.*|Icon=${PREFIX}/share/icons/hicolor/128x128/apps/supertuxkart.png|' \
 		${WRKSRC}/data/${PORTNAME}.desktop
 
diff --git a/games/supertuxkart/distinfo b/games/supertuxkart/distinfo
index 0c22bedccc0c..61c3ad95cff5 100644
--- a/games/supertuxkart/distinfo
+++ b/games/supertuxkart/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1578346664
-SHA256 (supertuxkart-1.1-src.tar.xz) = e9b02b0b11ab68aacaec38306903feffe59a501224805cd3645cebf10e880ae8
-SIZE (supertuxkart-1.1-src.tar.xz) = 616739152
+TIMESTAMP = 1598745498
+SHA256 (SuperTuxKart-1.2-src.tar.xz) = 052edf0afdbeb99583fe8676fb0ab80ecb6103fb88b7540f858d1b5fa1297d37
+SIZE (SuperTuxKart-1.2-src.tar.xz) = 614569164
diff --git a/games/supertuxkart/files/patch-cmake-FindFribidi.cmake b/games/supertuxkart/files/patch-cmake-FindFribidi.cmake
deleted file mode 100644
index 46b2cbaf9122..000000000000
--- a/games/supertuxkart/files/patch-cmake-FindFribidi.cmake
+++ /dev/null
@@ -1,19 +0,0 @@
---- cmake/FindFribidi.cmake.orig	2013-03-13 08:03:26.000000000 +0400
-+++ cmake/FindFribidi.cmake	2013-11-28 09:33:04.134268507 +0400
-@@ -18,7 +18,15 @@
-     set(FRIBIDI_FOUND 1)
- elseif(UNIX)
-     include(FindPkgConfig)
--    pkg_check_modules(FRIBIDI fribidi)
-+    pkg_check_modules(PC_FRIBIDI fribidi)
-+    find_path(FRIBIDI_INCLUDE_DIR NAMES fribidi/fribidi.h HINTS ${PC_FRIBIDI_INCLUDE_DIRS})
-+    find_library(FRIBIDI_LIBRARY NAMES fribidi HINTS ${PC_FRIBIDI_LIBRARY_DIRS})
-+
-+    include(FindPackageHandleStandardArgs)
-+    find_package_handle_standard_args(Fribidi DEFAULT_MSG FRIBIDI_INCLUDE_DIR FRIBIDI_LIBRARY)
-+
-+    set(FRIBIDI_INCLUDE_DIRS ${FRIBIDI_INCLUDE_DIR})
-+    set(FRIBIDI_LIBRARIES ${FRIBIDI_LIBRARY})
- else()
-     set(FRIBIDI_FOUND 0)
- endif()
diff --git a/games/supertuxkart/pkg-plist b/games/supertuxkart/pkg-plist
index a737d4c4fd2b..a2dec3edfa4c 100644
--- a/games/supertuxkart/pkg-plist
+++ b/games/supertuxkart/pkg-plist
@@ -1,6 +1,13 @@
 bin/supertuxkart
 share/applications/supertuxkart.desktop
+share/icons/hicolor/1024x1024/apps/supertuxkart.png
 share/icons/hicolor/128x128/apps/supertuxkart.png
+share/icons/hicolor/16x16/apps/supertuxkart.png
+share/icons/hicolor/256x256/apps/supertuxkart.png
+share/icons/hicolor/32x32/apps/supertuxkart.png
 share/icons/hicolor/48x48/apps/supertuxkart.png
+share/icons/hicolor/512x512/apps/supertuxkart.png
+share/icons/hicolor/64x64/apps/supertuxkart.png
 share/metainfo/supertuxkart.appdata.xml
 share/pixmaps/supertuxkart.png
+@dir %%DATADIR%%/data/editor/maps