svn commit: r453926 - in head/games/trackballs: . files

Ganael LAPLANCHE martymac at FreeBSD.org
Fri Nov 10 19:24:46 UTC 2017 

Author: martymac
Date: Fri Nov 10 19:24:44 2017
New Revision: 453926
URL: https://svnweb.freebsd.org/changeset/ports/453926

Log:
  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 at u.rochester.edu>

Added:
  head/games/trackballs/files/patch-CMakeLists.txt   (contents, props changed)
  head/games/trackballs/files/patch-src-map.cc   (contents, props changed)
Deleted:
  head/games/trackballs/files/patch-share-icons-Makefile.in
  head/games/trackballs/files/patch-share_Makefile.in
  head/games/trackballs/files/patch-src-pipe.cc
  head/games/trackballs/files/patch-src_glHelp.cc
  head/games/trackballs/files/patch-src_menuMode.cc
Modified:
  head/games/trackballs/Makefile
  head/games/trackballs/distinfo
  head/games/trackballs/pkg-descr
  head/games/trackballs/pkg-plist

Modified: head/games/trackballs/Makefile
==============================================================================
--- head/games/trackballs/Makefile	Fri Nov 10 19:16:29 2017	(r453925)
+++ head/games/trackballs/Makefile	Fri Nov 10 19:24:44 2017	(r453926)
@@ -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 at 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
+USE_GITHUB=	yes
+GH_TAGNAME=	v${PORTVERSION}
 
-OPTIONS_DEFINE=	MUSIC NLS
-OPTIONS_DEFAULT=	MUSIC
-OPTIONS_SUB=	yes
-MUSIC_DESC=	Install additional music
-NLS_USES=	gettext
-NLS_CONFIGURE_ENABLE=	nls
+USE_GL=		gl
+USE_SDL=	image2 mixer2 sdl2 ttf2
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|install -D|$$(INSTALL)|' \
-		${WRKSRC}/share/Makefile.in
+INSTALLS_ICONS=	yes
 
-post-install-MUSIC-on:
-	${INSTALL_DATA} ${WRKDIR}/trackballs-music/*.ogg ${STAGEDIR}${DATADIR}/music/
-
-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>

Modified: head/games/trackballs/distinfo
==============================================================================
--- head/games/trackballs/distinfo	Fri Nov 10 19:16:29 2017	(r453925)
+++ head/games/trackballs/distinfo	Fri Nov 10 19:24:44 2017	(r453926)
@@ -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

Added: head/games/trackballs/files/patch-CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/trackballs/files/patch-CMakeLists.txt	Fri Nov 10 19:24:44 2017	(r453926)
@@ -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()

Added: head/games/trackballs/files/patch-src-map.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/trackballs/files/patch-src-map.cc	Fri Nov 10 19:24:44 2017	(r453926)
@@ -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>

Modified: head/games/trackballs/pkg-descr
==============================================================================
--- head/games/trackballs/pkg-descr	Fri Nov 10 19:16:29 2017	(r453925)
+++ head/games/trackballs/pkg-descr	Fri Nov 10 19:24:44 2017	(r453926)
@@ -4,4 +4,4 @@ vicious hammers, pools of acid and other obstacles the
 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/

Modified: head/games/trackballs/pkg-plist
==============================================================================
--- head/games/trackballs/pkg-plist	Fri Nov 10 19:16:29 2017	(r453925)
+++ head/games/trackballs/pkg-plist	Fri Nov 10 19:24:44 2017	(r453926)
@@ -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

More information about the svn-ports-all mailing list