openclonk: Update to 8.0

[Charlotte Koch <cfkoch%edgebsd.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Charlotte Koch <cfkoch%edgebsd.org@localhost>
Pushed By:	cfkoch
Date:		Wed Feb 14 02:30:45 2018 -0800
Changeset:	4250b1e752c048885102f0cd6b932e4106ee6b7a

Modified Files:
	openclonk/Makefile
	openclonk/PLIST
	openclonk/distinfo
Removed Files:
	openclonk/patches/patch-CMakeLists.txt
	openclonk/patches/patch-src_graphics_StdPNG.cpp

Log Message:
openclonk: Update to 8.0

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=4250b1e752c048885102f0cd6b932e4106ee6b7a

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 openclonk/Makefile                              | 19 ++++++++++++-------
 openclonk/PLIST                                 | 12 +++++++++++-
 openclonk/distinfo                              |  9 ++++-----
 openclonk/patches/patch-CMakeLists.txt          | 12 ------------
 openclonk/patches/patch-src_graphics_StdPNG.cpp | 15 ---------------
 5 files changed, 27 insertions(+), 40 deletions(-)

diffs:
diff --git a/openclonk/Makefile b/openclonk/Makefile
index 0a50d37939..41367dbcde 100644
--- a/openclonk/Makefile
+++ b/openclonk/Makefile
@@ -2,7 +2,7 @@
 
 PKGNAME=	openclonk-${VERSION}
 DISTNAME=	openclonk-${PKGVERSION_NOREV}-src
-VERSION=	7.0
+VERSION=	8.0
 CATEGORIES=	games
 MASTER_SITES=	http://www.openclonk.org/builds/release/${VERSION}/
 EXTRACT_SUFX=	.tar.bz2
@@ -12,21 +12,26 @@ HOMEPAGE=	http://www.openclonk.org/
 COMMENT=	Open source successor of the Clonk gaming series
 LICENSE=	isc
 
+WRKSRC=		${WRKDIR}/openclonk-release-${PKGVERSION_NOREV}-src
+EXTRACT_USING=	gtar
 USE_CMAKE=	yes
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	pkg-config
 GCC_REQD+=	4.9
 
+.include "../../audio/SDL2_mixer/buildlink3.mk"
+.include "../../audio/freealut/buildlink3.mk"
+.include "../../audio/libvorbis/buildlink3.mk"
+.include "../../audio/openal-soft/buildlink3.mk"
+.include "../../devel/SDL2/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/glew/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../x11/gtk3/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../audio/libvorbis/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
 .include "../../multimedia/libogg/buildlink3.mk"
-.include "../../audio/SDL_mixer/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
 .include "../../x11/gtksourceview3/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/openclonk/PLIST b/openclonk/PLIST
index 86b3b2743c..c71fce737e 100644
--- a/openclonk/PLIST
+++ b/openclonk/PLIST
@@ -1,6 +1,7 @@
 @comment $NetBSD$
 bin/c4group
 games/openclonk
+share/appdata/openclonk.appdata.xml
 share/applications/openclonk.desktop
 share/games/openclonk/Arena.ocf
 share/games/openclonk/Decoration.ocd
@@ -8,7 +9,16 @@ share/games/openclonk/Defense.ocf
 share/games/openclonk/Graphics.ocg
 share/games/openclonk/Material.ocg
 share/games/openclonk/Missions.ocf
-share/games/openclonk/Music.ocg
+share/games/openclonk/Music.ocg/@CrushedIceCocktail.ogg
+share/games/openclonk/Music.ocg/Cavern.ogg
+share/games/openclonk/Music.ocg/IslandDreams.ogg
+share/games/openclonk/Music.ocg/LucidDream.ogg
+share/games/openclonk/Music.ocg/Motorway.ogg
+share/games/openclonk/Music.ocg/Offshore.ogg
+share/games/openclonk/Music.ocg/TheSkylands.ogg
+share/games/openclonk/Music.ocg/UrbanBolero.ogg
+share/games/openclonk/Music.ocg/Version.txt
+share/games/openclonk/Music.ocg/authors.txt
 share/games/openclonk/Objects.ocd
 share/games/openclonk/Parkour.ocf
 share/games/openclonk/Sound.ocg
diff --git a/openclonk/distinfo b/openclonk/distinfo
index 6246b8ad01..9fb3dd7462 100644
--- a/openclonk/distinfo
+++ b/openclonk/distinfo
@@ -1,7 +1,6 @@
 $NetBSD$
 
-SHA1 (openclonk-7.0-src.tar.bz2) = cd29fc094e605481ce3523fa6762bfa44ee02979
-RMD160 (openclonk-7.0-src.tar.bz2) = 9a5437b92ac75217898af028bc2857f99506b528
-Size (openclonk-7.0-src.tar.bz2) = 102143348 bytes
-SHA1 (patch-CMakeLists.txt) = 857d956eff7f5b2efae4c0f6561252a5dd581641
-SHA1 (patch-src_graphics_StdPNG.cpp) = 552c9526546dd4677c63d0d0f69f2194cd8d583a
+SHA1 (openclonk-8.0-src.tar.bz2) = 48eab625e24e20649766390f325e3724ba33366c
+RMD160 (openclonk-8.0-src.tar.bz2) = 0d42c0f8216685399a7b60a8d91a36f8143a1e7a
+SHA512 (openclonk-8.0-src.tar.bz2) = 0aa094f5e07a9f831f8be30b348bf5cbb48d49067dc01a502062c5a1773b2237e251d3fac33e0fb81a2e55da4dd6de6b92d9696eb8003ad4a711380c44818b04
+Size (openclonk-8.0-src.tar.bz2) = 121422616 bytes
diff --git a/openclonk/patches/patch-CMakeLists.txt b/openclonk/patches/patch-CMakeLists.txt
deleted file mode 100644
index 71bbef2688..0000000000
--- a/openclonk/patches/patch-CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD$
---- CMakeLists.txt.orig	2016-01-17 18:36:02.000000000 -0800
-+++ CMakeLists.txt	2016-01-17 18:36:34.000000000 -0800
-@@ -1170,7 +1170,7 @@
- 
- if(GTK3_FOUND AND GTK3_gtksourceview_FOUND)
- 	add_executable(mape ${MAPE_BASE_SOURCES} ${MAPE_SOURCES})
--	set_property(TARGET mape APPEND PROPERTY COMPILE_FLAGS ${GTK3_COMPILE_DEFINITIONS})
-+  target_compile_options(mape PRIVATE ${GTK_COMPILE_DEFINITIONS})
- 	target_include_directories(mape PRIVATE ${GTK3_INCLUDE_DIRS} ${GTK3_gtksourceview_INCLUDE_DIRS})
- 	target_link_libraries(mape
- 		${GTK3_LIBRARIES}
diff --git a/openclonk/patches/patch-src_graphics_StdPNG.cpp b/openclonk/patches/patch-src_graphics_StdPNG.cpp
deleted file mode 100644
index ce4958fb32..0000000000
--- a/openclonk/patches/patch-src_graphics_StdPNG.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
---- src/graphics/StdPNG.cpp.orig	2016-01-17 18:37:04.000000000 -0800
-+++ src/graphics/StdPNG.cpp	2016-01-17 18:37:14.000000000 -0800
-@@ -368,10 +368,8 @@
- 		first = false;
- #ifdef HAVE_WINTHREAD
- 		Sleep(100);
--#elif defined (__APPLE__)
-+#else
- 		sched_yield();
--#elif defined(HAVE_PTHREAD)
--		pthread_yield();
- #endif
- 	}
- }