From 793e2341e1135c0146f4b0c273f41068e9e4018c Mon Sep 17 00:00:00 2001 From: Ganael LAPLANCHE Date: Wed, 14 Mar 2018 11:09:00 +0000 Subject: [PATCH] Update to 1.3.0 --- games/trackballs/Makefile | 8 ++-- games/trackballs/distinfo | 6 +-- games/trackballs/files/patch-CMakeLists.txt | 44 ++++++--------------- games/trackballs/files/patch-src-map.cc | 13 ------ games/trackballs/pkg-plist | 24 +++++++---- 5 files changed, 36 insertions(+), 59 deletions(-) delete mode 100644 games/trackballs/files/patch-src-map.cc diff --git a/games/trackballs/Makefile b/games/trackballs/Makefile index 3b68299945ea..d7dd06ee7f01 100644 --- a/games/trackballs/Makefile +++ b/games/trackballs/Makefile @@ -2,9 +2,8 @@ # $FreeBSD$ PORTNAME= trackballs -PORTVERSION= 1.2.4 +PORTVERSION= 1.3.0 DISTVERSIONPREFIX= v -PORTREVISION= 2 CATEGORIES= games MAINTAINER= martymac@FreeBSD.org @@ -25,7 +24,10 @@ USE_SDL= image2 mixer2 sdl2 ttf2 INSTALLS_ICONS= yes -OPTIONS_DEFINE= NLS +CMAKE_ARGS+= -DTRACKBALLS_DOC_DIR=${DOCSDIR} \ + -DTRACKBALLS_MAN_DIR=${PREFIX}/man + +OPTIONS_DEFINE= NLS DOCS OPTIONS_SUB= yes NLS_USES= gettext-tools NLS_CMAKE_ON= -DDISABLE_NLS:BOOL=OFF diff --git a/games/trackballs/distinfo b/games/trackballs/distinfo index aa32bcacd2f2..296901352bbc 100644 --- a/games/trackballs/distinfo +++ b/games/trackballs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1510587945 -SHA256 (trackballs-trackballs-v1.2.4_GH0.tar.gz) = a65e02ca3247b7b42eb4420e73aea5d29ff8b64d59b9c61e93761eee32a6fc18 -SIZE (trackballs-trackballs-v1.2.4_GH0.tar.gz) = 32577303 +TIMESTAMP = 1520974234 +SHA256 (trackballs-trackballs-v1.3.0_GH0.tar.gz) = 69c65089bed4d3a4f3ac9b3801d11c8ea6374a5a1584b613f2b1ecc456ae1464 +SIZE (trackballs-trackballs-v1.3.0_GH0.tar.gz) = 32682087 diff --git a/games/trackballs/files/patch-CMakeLists.txt b/games/trackballs/files/patch-CMakeLists.txt index 404b04ccd4b4..330c11884b4a 100644 --- a/games/trackballs/files/patch-CMakeLists.txt +++ b/games/trackballs/files/patch-CMakeLists.txt @@ -1,35 +1,13 @@ -Link to intl and add option to disable NLS support +Fix icons path ---- 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) +--- CMakeLists.txt.orig 2018-03-13 22:03:27.136767000 +0100 ++++ CMakeLists.txt 2018-03-13 22:06:01.398703000 +0100 +@@ -113,7 +113,7 @@ + RENAME trackballs.png) endforeach() -+endif() + install(FILES ${PROJECT_SOURCE_DIR}/share/icons/trackballs.svg +- DESTINATION ${TRACKBALLS_ICON}/icons/hicolor/scalable/apps/) ++ DESTINATION ${TRACKBALLS_ICON}/scalable/apps/) + install(FILES ${PROJECT_SOURCE_DIR}/share/icons/trackballs.desktop + DESTINATION ${TRACKBALLS_APPL}) + diff --git a/games/trackballs/files/patch-src-map.cc b/games/trackballs/files/patch-src-map.cc deleted file mode 100644 index 7fcb2d5d2a44..000000000000 --- a/games/trackballs/files/patch-src-map.cc +++ /dev/null @@ -1,13 +0,0 @@ -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 -+ - #include - #include - #include diff --git a/games/trackballs/pkg-plist b/games/trackballs/pkg-plist index b79d4e294496..40b30419b255 100644 --- a/games/trackballs/pkg-plist +++ b/games/trackballs/pkg-plist @@ -13,16 +13,10 @@ share/icons/hicolor/scalable/apps/trackballs.svg %%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%%/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 %%DATADIR%%/highScores +%%DATADIR%%/icons/trackballs-128x128.png %%DATADIR%%/images/acid.png %%DATADIR%%/images/blank.png %%DATADIR%%/images/displayHighscoreBackground.jpg @@ -109,6 +103,15 @@ share/icons/hicolor/scalable/apps/trackballs.svg %%DATADIR%%/levels/con5.scm %%DATADIR%%/levels/contrib.jpg %%DATADIR%%/levels/contrib.set +%%DATADIR%%/levels/ds.jpg +%%DATADIR%%/levels/ds.set +%%DATADIR%%/levels/ds1.map +%%DATADIR%%/levels/ds1.scm +%%DATADIR%%/levels/ds2.map +%%DATADIR%%/levels/ds2.scm +%%DATADIR%%/levels/ds3.map +%%DATADIR%%/levels/ds3.scm +%%DATADIR%%/levels/ds_lib.scm %%DATADIR%%/levels/dn.jpg %%DATADIR%%/levels/dn.set %%DATADIR%%/levels/dn1.map @@ -281,3 +284,10 @@ share/icons/hicolor/scalable/apps/trackballs.svg %%DATADIR%%/shaders/ui.vert %%DATADIR%%/shaders/water.frag %%DATADIR%%/shaders/water.vert +%%PORTDOCS%%%%DOCSDIR%%/api.html +%%PORTDOCS%%%%DOCSDIR%%/customizing.html +%%PORTDOCS%%%%DOCSDIR%%/default.css +%%PORTDOCS%%%%DOCSDIR%%/examples.html +%%PORTDOCS%%%%DOCSDIR%%/index.html +%%PORTDOCS%%%%DOCSDIR%%/mapeditor.html +%%PORTDOCS%%%%DOCSDIR%%/scriptingLanguage.html