Update to 1.2.4

Switch to updated version from: https://trackballs.github.io/
(see also: http://trackballs.sourceforge.net)

Reported by:	Manuel Stoeckl <mstoeckl@u.rochester.edu>

11 files changed, 120 insertions, 148 deletions

diff --git a/games/trackballs/Makefile b/games/trackballs/Makefile
index 5fa974ffe9ee..e669c99b8063 100644
--- a/games/trackballs/Makefile
+++ b/games/trackballs/Makefile
@@ -2,13 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	trackballs
-PORTVERSION=	1.1.4
-PORTREVISION=	22
+PORTVERSION=	1.2.4
 CATEGORIES=	games
-MASTER_SITES=	SF \
-		SF/${PORTNAME}/music/1.4/:music
-DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
-		${PORTNAME}-music-1.4.tar.bz2:music
 
 MAINTAINER=	martymac@FreeBSD.org
 COMMENT=	SDL-based Marble Madness clone
@@ -16,34 +11,23 @@ COMMENT=	SDL-based Marble Madness clone
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libguile.so:lang/guile
-RUN_DEPENDS=	bash:shells/bash
+LIB_DEPENDS=	libguile-2.0.so:lang/guile2 \
+		libgc.so:devel/boehm-gc
 
-USE_GL=		gl
-USE_SDL=	image mixer sdl ttf
-USES=		gmake gettext desktop-file-utils
-GNU_CONFIGURE=	yes
-INSTALLS_ICONS=	yes
-MAKE_ARGS=	mkinstalldirs="${MKDIR}"
+USES=		cmake desktop-file-utils gettext-runtime pkgconfig
 
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -lintl
-
-OPTIONS_DEFINE=	MUSIC NLS
-OPTIONS_DEFAULT=	MUSIC
-OPTIONS_SUB=	yes
-MUSIC_DESC=	Install additional music
-NLS_USES=	gettext
-NLS_CONFIGURE_ENABLE=	nls
+USE_GITHUB=	yes
+GH_TAGNAME=	v${PORTVERSION}
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|install -D|$$(INSTALL)|' \
-		${WRKSRC}/share/Makefile.in
+USE_GL=		gl
+USE_SDL=	image2 mixer2 sdl2 ttf2
 
-post-install-MUSIC-on:
-	${INSTALL_DATA} ${WRKDIR}/trackballs-music/*.ogg ${STAGEDIR}${DATADIR}/music/
+INSTALLS_ICONS=	yes
 
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/share/icons/${PORTNAME}-48x48.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
+OPTIONS_DEFINE=	NLS
+OPTIONS_SUB=	yes
+NLS_USES=	gettext-tools
+NLS_CMAKE_ON=	-DDISABLE_NLS:BOOL=OFF
+NLS_CMAKE_OFF=	-DDISABLE_NLS:BOOL=ON
 
 .include <bsd.port.mk>
diff --git a/games/trackballs/distinfo b/games/trackballs/distinfo
index 67395cff10a9..8a67c23a4ba5 100644
--- a/games/trackballs/distinfo
+++ b/games/trackballs/distinfo
@@ -1,4 +1,3 @@
-SHA256 (trackballs-1.1.4.tar.gz) = 459dbaec27354fb4afff3d1aa491bc21b4fc2c0769eae86a47aaeb545cb434a6
-SIZE (trackballs-1.1.4.tar.gz) = 7229541
-SHA256 (trackballs-music-1.4.tar.bz2) = bf9b793b6fab81e59fb9a373944a5724af279b0faebb2461bb98beb5aa466058
-SIZE (trackballs-music-1.4.tar.bz2) = 18825033
+TIMESTAMP = 1509737106
+SHA256 (trackballs-trackballs-1.2.4-v1.2.4_GH0.tar.gz) = a65e02ca3247b7b42eb4420e73aea5d29ff8b64d59b9c61e93761eee32a6fc18
+SIZE (trackballs-trackballs-1.2.4-v1.2.4_GH0.tar.gz) = 32577303
diff --git a/games/trackballs/files/patch-CMakeLists.txt b/games/trackballs/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..404b04ccd4b4
--- /dev/null
+++ b/games/trackballs/files/patch-CMakeLists.txt
@@ -0,0 +1,35 @@
+Link to intl and add option to disable NLS support
+
+--- CMakeLists.txt.orig	2017-10-28 17:32:57.000000000 +0200
++++ CMakeLists.txt	2017-11-10 09:58:26.005609000 +0100
+@@ -9,6 +9,7 @@
+ find_package(ZLIB REQUIRED)
+ # libgc is a dependency of Guile that still needs to be provided
+ find_package(GC REQUIRED)
++find_library(INTL intl)
+ 
+ # Optionally set data dir and locale dir
+ set(TRACKBALLS_LOCALE_DIR "" CACHE FILEPATH "Folder to install locale files to. Empty means default.")
+@@ -60,7 +61,7 @@
+ # Construct executable file
+ file(GLOB sources ${PROJECT_SOURCE_DIR}/src/*.cc)
+ add_executable(trackballs ${sources} guile.cc.x)
+-target_link_libraries(trackballs ${GUILE_LIBRARIES} ${OPENGL_LIBRARIES} ${SDL2_LIBRARY} ${SDL2_IMAGE_LIBRARY} ${SDL2_MIXER_LIBRARY} ${SDL2_TTF_LIBRARY} ${ZLIB_LIBRARIES} ${GC_LIBRARIES} m)
++target_link_libraries(trackballs ${GUILE_LIBRARIES} ${OPENGL_LIBRARIES} ${SDL2_LIBRARY} ${SDL2_IMAGE_LIBRARY} ${SDL2_MIXER_LIBRARY} ${SDL2_TTF_LIBRARY} ${ZLIB_LIBRARIES} ${GC_LIBRARIES} ${INTL} m)
+ install(TARGETS trackballs DESTINATION bin)
+ 
+ # Data files
+@@ -103,6 +104,8 @@
+         DESTINATION ${TRACKBALLS_SHARE}/../applications)
+ 
+ # Translations!
++option(DISABLE_NLS "Disable native language support (NLS)" OFF)
++if(NOT DISABLE_NLS)
+ find_package(Gettext)
+ file(GLOB po_files po/*.po)
+ foreach(po_file ${po_files})
+@@ -110,3 +113,4 @@
+   GETTEXT_PROCESS_PO_FILES( ${lang} ALL PO_FILES ${po_file} )
+   install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${lang}.gmo DESTINATION ${TRACKBALLS_LOCALE}/${lang}/LC_MESSAGES/ RENAME trackballs.mo)
+ endforeach()
++endif()
diff --git a/games/trackballs/files/patch-share-icons-Makefile.in b/games/trackballs/files/patch-share-icons-Makefile.in
deleted file mode 100644
index d4c55483ab5a..000000000000
--- a/games/trackballs/files/patch-share-icons-Makefile.in
+++ /dev/null
@@ -1,29 +0,0 @@
---- share/icons/Makefile.in.orig	2013-11-20 07:09:14.000000000 +0100
-+++ share/icons/Makefile.in	2013-11-20 07:11:37.000000000 +0100
-@@ -374,17 +374,17 @@
- 	echo "Exec=$(bindir)/trackballs" >> trackballs.desktop
- 
- install-iconsDATA:
--	$(mkinstalldirs) $(iconsdir)/32x32/apps
--	$(INSTALL_DATA) $(srcdir)/trackballs-32x32.png $(iconsdir)/32x32/apps/trackballs.png
--	$(mkinstalldirs) $(iconsdir)/48x48/apps
--	$(INSTALL_DATA) $(srcdir)/trackballs-48x48.png $(iconsdir)/48x48/apps/trackballs.png
--	$(mkinstalldirs) $(iconsdir)/64x64/apps
--	$(INSTALL_DATA) $(srcdir)/trackballs-64x64.png $(iconsdir)/64x64/apps/trackballs.png
-+	$(mkinstalldirs) $(DESTDIR)$(iconsdir)/32x32/apps
-+	$(INSTALL_DATA) $(srcdir)/trackballs-32x32.png $(DESTDIR)$(iconsdir)/32x32/apps/trackballs.png
-+	$(mkinstalldirs) $(DESTDIR)$(iconsdir)/48x48/apps
-+	$(INSTALL_DATA) $(srcdir)/trackballs-48x48.png $(DESTDIR)$(iconsdir)/48x48/apps/trackballs.png
-+	$(mkinstalldirs) $(DESTDIR)$(iconsdir)/64x64/apps
-+	$(INSTALL_DATA) $(srcdir)/trackballs-64x64.png $(DESTDIR)$(iconsdir)/64x64/apps/trackballs.png
- 
- uninstall-iconsDATA:
--	-rm -f $(iconsdir)/32x32/apps/trackballs.png
--	-rm -f $(iconsdir)/48x48/apps/trackballs.png
--	-rm -f $(iconsdir)/64x64/apps/trackballs.png
-+	-rm -f $(DESTDIR)$(iconsdir)/32x32/apps/trackballs.png
-+	-rm -f $(DESTDIR)$(iconsdir)/48x48/apps/trackballs.png
-+	-rm -f $(DESTDIR)$(iconsdir)/64x64/apps/trackballs.png
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/games/trackballs/files/patch-share_Makefile.in b/games/trackballs/files/patch-share_Makefile.in
deleted file mode 100644
index 9fa2d70ba9b7..000000000000
--- a/games/trackballs/files/patch-share_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- share/Makefile.in.orig	2015-12-18 16:12:01 UTC
-+++ share/Makefile.in
-@@ -567,7 +567,7 @@ uninstall-man: uninstall-man6
- 
- 
- install-pkgdataDATA:
--	-install -D -m664 -g games highScores		$(DESTDIR)@with_highscores@
-+	-install -D highScores		$(DESTDIR)@with_highscores@
- 	-chgrp -R games			$(DESTDIR)$(pkgdatadir)/levels
- 	chmod -R g+r			$(DESTDIR)$(pkgdatadir)/levels
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/games/trackballs/files/patch-src-map.cc b/games/trackballs/files/patch-src-map.cc
new file mode 100644
index 000000000000..7fcb2d5d2a44
--- /dev/null
+++ b/games/trackballs/files/patch-src-map.cc
@@ -0,0 +1,13 @@
+Work around "call to 'abs' is ambiguous" error in src/map.cc:936
+
+--- src/map.cc.orig	2017-11-08 15:08:21.784137000 +0100
++++ src/map.cc	2017-11-08 15:24:09.192718000 +0100
+@@ -24,6 +24,8 @@
+ #include "editMode.h"
+ #include "game.h"
+ 
++#include <cstdlib>
++
+ #include <SDL2/SDL_endian.h>
+ #include <SDL2/SDL_image.h>
+ #include <zlib.h>
diff --git a/games/trackballs/files/patch-src-pipe.cc b/games/trackballs/files/patch-src-pipe.cc
deleted file mode 100644
index 377616124977..000000000000
--- a/games/trackballs/files/patch-src-pipe.cc
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/pipe.cc.orig	Wed Feb 23 00:10:31 2005
-+++ src/pipe.cc	Fri Jun  3 02:54:26 2005
-@@ -96,8 +96,8 @@
- }
- void Pipe::computeBoundingBox() {
-   for(int i=0;i<3;i++) {
--	boundingBox[0][i]=fmin(from[i]-radius,to[i]-radius)-position[i];
--	boundingBox[1][i]=fmax(from[i]+radius,to[i]+radius)-position[i];
-+	boundingBox[0][i]=((from[i]-radius)>(to[i]-radius)?(to[i]-radius):(from[i]-radius))-position[i];
-+	boundingBox[1][i]=((from[i]+radius)>(to[i]+radius)?(from[i]+radius):(to[i]+radius))-position[i];
-   }
- }
- void Pipe::onRemove() {Animated::onRemove(); pipes->erase(this);}
diff --git a/games/trackballs/files/patch-src_glHelp.cc b/games/trackballs/files/patch-src_glHelp.cc
deleted file mode 100644
index 16ced301272b..000000000000
--- a/games/trackballs/files/patch-src_glHelp.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/glHelp.cc.orig	2007-04-07 13:15:09 UTC
-+++ src/glHelp.cc
-@@ -129,7 +129,6 @@ void drawSurface(SDL_Surface *surface,in
-   // why is this removed? should it not be done???
-   glDeleteTextures(1,&texture);  
- }
--inline Real abs(Real v) {return v>0.0?v:-v;}
- double mousePointerPhase=0.0;
- 
- void tickMouse(Real td) {
diff --git a/games/trackballs/files/patch-src_menuMode.cc b/games/trackballs/files/patch-src_menuMode.cc
deleted file mode 100644
index 80354fa6f77b..000000000000
--- a/games/trackballs/files/patch-src_menuMode.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/menuMode.cc.orig	2007-04-07 13:16:26 UTC
-+++ src/menuMode.cc
-@@ -163,7 +163,6 @@ void MenuMode::doSelection() {
-   case MENU_EDITOR: GameMode::activate(EditMode::editMode); break;
-   }
- }
--inline Real abs(Real v) {return v>0.0?v:-v;}
- 
- void MenuMode::idle(Real td) {
-   int w,h,i,x,y;
diff --git a/games/trackballs/pkg-descr b/games/trackballs/pkg-descr
index 80ee6d4e8b29..cda47bdc8ed1 100644
--- a/games/trackballs/pkg-descr
+++ b/games/trackballs/pkg-descr
@@ -4,4 +4,4 @@ vicious hammers, pools of acid and other obstacles the player collects points.
 When the ball reaches the destination it continues at the next, more difficult
 level - unless the time runs out.
 
-WWW: http://trackballs.sourceforge.net/
+WWW: https://trackballs.github.io/
diff --git a/games/trackballs/pkg-plist b/games/trackballs/pkg-plist
index b4cbdbbcec63..b79d4e294496 100644
--- a/games/trackballs/pkg-plist
+++ b/games/trackballs/pkg-plist
@@ -1,49 +1,39 @@
 bin/trackballs
 man/man6/trackballs.6.gz
 share/applications/trackballs.desktop
+share/icons/hicolor/128x128/apps/trackballs.png
 share/icons/hicolor/32x32/apps/trackballs.png
 share/icons/hicolor/48x48/apps/trackballs.png
+share/icons/hicolor/512x512/apps/trackballs.png
 share/icons/hicolor/64x64/apps/trackballs.png
-share/pixmaps/trackballs.png
+share/icons/hicolor/scalable/apps/trackballs.svg
 %%NLS%%share/locale/de/LC_MESSAGES/trackballs.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/trackballs.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/trackballs.mo
 %%NLS%%share/locale/it/LC_MESSAGES/trackballs.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/trackballs.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/trackballs.mo
-%%DATADIR%%/api.html
-%%DATADIR%%/customizing.html
-%%DATADIR%%/examples.html
+%%DATADIR%%/docs/api.html
+%%DATADIR%%/docs/customizing.html
+%%DATADIR%%/docs/default.css
+%%DATADIR%%/docs/examples.html
+%%DATADIR%%/docs/index.html
+%%DATADIR%%/docs/mapeditor.html
+%%DATADIR%%/docs/scriptingLanguage.html
+%%DATADIR%%/fonts/FreeSerifBoldItalic.ttf
 %%DATADIR%%/fonts/menuFont.ttf
-@(,games,664) %%DATADIR%%/highScores
+%%DATADIR%%/highScores
 %%DATADIR%%/images/acid.png
-%%DATADIR%%/images/difficulty0.png
-%%DATADIR%%/images/difficulty0High.png
-%%DATADIR%%/images/difficulty1.png
-%%DATADIR%%/images/difficulty1High.png
-%%DATADIR%%/images/difficulty2.png
-%%DATADIR%%/images/difficulty2High.png
+%%DATADIR%%/images/blank.png
 %%DATADIR%%/images/displayHighscoreBackground.jpg
 %%DATADIR%%/images/dizzy.png
-%%DATADIR%%/images/enterHighscoreBackground.jpg
-%%DATADIR%%/images/font.png
-%%DATADIR%%/images/font.rgb
-%%DATADIR%%/images/font2.png
-%%DATADIR%%/images/font3.png
 %%DATADIR%%/images/glitter.png
 %%DATADIR%%/images/header.png
-%%DATADIR%%/images/help0_1024.png
-%%DATADIR%%/images/help0_640.png
-%%DATADIR%%/images/help1_1024.png
-%%DATADIR%%/images/help1_640.png
 %%DATADIR%%/images/helpBackground.jpg
 %%DATADIR%%/images/ice.png
-%%DATADIR%%/images/left_panel.png
-%%DATADIR%%/images/levelsetup.png
 %%DATADIR%%/images/life.png
 %%DATADIR%%/images/mousePointer.png
 %%DATADIR%%/images/nolife.png
-%%DATADIR%%/images/playersetup.png
 %%DATADIR%%/images/sand.png
 %%DATADIR%%/images/setupBackground.jpg
 %%DATADIR%%/images/slide-01.jpg
@@ -62,10 +52,9 @@ share/pixmaps/trackballs.png
 %%DATADIR%%/images/texture3.png
 %%DATADIR%%/images/texture4.png
 %%DATADIR%%/images/track.png
-%%DATADIR%%/images/trackballs32x32.png
-%%DATADIR%%/images/trackballs48x48.png
+%%DATADIR%%/images/trackballs-32x32.png
+%%DATADIR%%/images/water.png
 %%DATADIR%%/images/wings.png
-%%DATADIR%%/index.html
 %%DATADIR%%/levels/Shop1.map
 %%DATADIR%%/levels/Shop1.scm
 %%DATADIR%%/levels/Shop2.map
@@ -172,8 +161,8 @@ share/pixmaps/trackballs.png
 %%DATADIR%%/levels/frg9.scm
 %%DATADIR%%/levels/frgb.map
 %%DATADIR%%/levels/frgb.scm
-%%DATADIR%%/levels/hxtst.map
-%%DATADIR%%/levels/hxtst.scm
+%%DATADIR%%/levels/help.map
+%%DATADIR%%/levels/help.scm
 %%DATADIR%%/levels/jump.jpg
 %%DATADIR%%/levels/jump.set
 %%DATADIR%%/levels/jump1.map
@@ -230,18 +219,31 @@ share/pixmaps/trackballs.png
 %%DATADIR%%/levels/motion1.map
 %%DATADIR%%/levels/motion1.scm
 %%DATADIR%%/levels/motion1.set
-%%DATADIR%%/levels/test1.map
-%%DATADIR%%/levels/tmp.map
-%%DATADIR%%/levels/tmp.scm
-%%DATADIR%%/mapeditor.html
-%%DATADIR%%/scriptingLanguage.html
-%%MUSIC%%%%DATADIR%%/music/eurovision.ogg
-%%MUSIC%%%%DATADIR%%/music/tb_plinkeplanke.ogg
-%%MUSIC%%%%DATADIR%%/music/tb_sorrow.ogg
-%%MUSIC%%%%DATADIR%%/music/crazy.ogg
-%%MUSIC%%%%DATADIR%%/music/tb_hrluebke.ogg
-%%MUSIC%%%%DATADIR%%/music/c64revival.ogg
-%%MUSIC%%%%DATADIR%%/music/tb_schizophrenia.ogg
+%%DATADIR%%/levels/sl.jpg
+%%DATADIR%%/levels/sl.set
+%%DATADIR%%/levels/sl1.map
+%%DATADIR%%/levels/sl1.scm
+%%DATADIR%%/levels/sl2.map
+%%DATADIR%%/levels/sl2.scm
+%%DATADIR%%/levels/sl3.map
+%%DATADIR%%/levels/sl3.scm
+%%DATADIR%%/levels/sl4.map
+%%DATADIR%%/levels/sl4.scm
+%%DATADIR%%/levels/sl5.map
+%%DATADIR%%/levels/sl5.scm
+%%DATADIR%%/levels/sl6.map
+%%DATADIR%%/levels/sl6.scm
+%%DATADIR%%/music/README
+%%DATADIR%%/music/c64revival.ogg
+%%DATADIR%%/music/crazy.ogg
+%%DATADIR%%/music/eurovision.ogg
+%%DATADIR%%/music/fml.html
+%%DATADIR%%/music/tb_design.ogg
+%%DATADIR%%/music/tb_genesis.ogg
+%%DATADIR%%/music/tb_hrluebke.ogg
+%%DATADIR%%/music/tb_plinkeplanke.ogg
+%%DATADIR%%/music/tb_schizophrenia.ogg
+%%DATADIR%%/music/tb_sorrow.ogg
 %%DATADIR%%/sfx/badpill.wav
 %%DATADIR%%/sfx/ball_sinks.wav
 %%DATADIR%%/sfx/ball_sinks2.wav
@@ -267,3 +269,15 @@ share/pixmaps/trackballs.png
 %%DATADIR%%/sfx/switch.wav
 %%DATADIR%%/sfx/time_warning.wav
 %%DATADIR%%/sfx/timeout.wav
+%%DATADIR%%/shaders/basic.frag
+%%DATADIR%%/shaders/basic.vert
+%%DATADIR%%/shaders/line.frag
+%%DATADIR%%/shaders/line.vert
+%%DATADIR%%/shaders/object.frag
+%%DATADIR%%/shaders/object.vert
+%%DATADIR%%/shaders/reflection.frag
+%%DATADIR%%/shaders/reflection.vert
+%%DATADIR%%/shaders/ui.frag
+%%DATADIR%%/shaders/ui.vert
+%%DATADIR%%/shaders/water.frag
+%%DATADIR%%/shaders/water.vert