svn commit: r498678 - in head/games/trigger-rally: . files

[Steve Wills]

Author: swills
Date: Thu Apr 11 20:07:34 2019
New Revision: 498678
URL: https://svnweb.freebsd.org/changeset/ports/498678

Log:
  games/trigger-rally: update to 0.6.6.1
  
  PR:		236817
  Submitted by:	Alfonso S. Siciliano <alfix86 at gmail.com> (maintainer)

Modified:
  head/games/trigger-rally/Makefile   (contents, props changed)
  head/games/trigger-rally/distinfo   (contents, props changed)
  head/games/trigger-rally/files/patch-GNUmakefile   (contents, props changed)
  head/games/trigger-rally/files/patch-Trigger_main.cpp   (contents, props changed)

Modified: head/games/trigger-rally/Makefile
==============================================================================
--- head/games/trigger-rally/Makefile	Thu Apr 11 19:39:28 2019	(r498677)
+++ head/games/trigger-rally/Makefile	Thu Apr 11 20:07:34 2019	(r498678)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	trigger-rally
-PORTVERSION=	0.6.5
-PORTREVISION=	3
+PORTVERSION=	0.6.6.1
 CATEGORIES=	games
 MASTER_SITES=	SF/trigger-rally/trigger-${PORTVERSION}
 
@@ -11,18 +10,22 @@ MAINTAINER=	alfix86 at gmail.com
 COMMENT=	Rally car racing game
 
 LICENSE=	GPLv2
+LICENSE_FILE=	${WORKINGSRC}/doc/COPYING.txt
 
 LIB_DEPENDS=	libphysfs.so:devel/physfs
 LIB_DEPENDS+=	libalut.so:audio/freealut
+LIB_DEPENDS+=	libtinyxml2.so:textproc/tinyxml2
 
-WRKSRC_SUBDIR=	src
-USES=		compiler:c++11-lang gmake openal:al,alut
-USE_SDL=	sdl2 image2
-USE_GL=		glu gl glew
+USES=		compiler:c++11-lang gmake openal:al,alut sdl gl gnome
+
+USE_SDL=	image2
+USE_GL=		glu glew
 MAKEFILE=	GNUmakefile
 ALL_TARGET=	build
 LLD_UNSAFE=	yes
+INSTALLS_ICONS=	yes
 
+WRKSRC_SUBDIR=	src
 WORKINGSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
 DATADIR=	${PREFIX}/share/games/trigger-rally
 
@@ -32,6 +35,9 @@ DESKTOP_ENTRIES="Trigger" "" "trigger" \
 PORTDOCS=	README-stereo.txt README.txt DATA_AUTHORS.txt
 
 OPTIONS_DEFINE=	DOCS
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/Trigger/main.cpp
 
 do-install:
 	${INSTALL_PROGRAM} ${WORKINGSRC}/bin/trigger-rally ${STAGEDIR}${PREFIX}/bin

Modified: head/games/trigger-rally/distinfo
==============================================================================
--- head/games/trigger-rally/distinfo	Thu Apr 11 19:39:28 2019	(r498677)
+++ head/games/trigger-rally/distinfo	Thu Apr 11 20:07:34 2019	(r498678)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1488474378
-SHA256 (trigger-rally-0.6.5.tar.gz) = f2db8784d8c0dd51c7a2812a9d294db05bb2e9df992038b3a232060dba26ba24
-SIZE (trigger-rally-0.6.5.tar.gz) = 82290843
+TIMESTAMP = 1553629546
+SHA256 (trigger-rally-0.6.6.1.tar.gz) = 7f086e13d142b8bb07e808ab9111e5553309c1413532f56c754ce3cfa060cb04
+SIZE (trigger-rally-0.6.6.1.tar.gz) = 120707584

Modified: head/games/trigger-rally/files/patch-GNUmakefile
==============================================================================
--- head/games/trigger-rally/files/patch-GNUmakefile	Thu Apr 11 19:39:28 2019	(r498677)
+++ head/games/trigger-rally/files/patch-GNUmakefile	Thu Apr 11 20:07:34 2019	(r498678)
@@ -1,6 +1,6 @@
---- GNUmakefile.orig	2016-11-05 17:27:10 UTC
+--- GNUmakefile.orig	2019-02-26 22:35:48 UTC
 +++ GNUmakefile
-@@ -21,7 +21,7 @@ SRCFILES        := $(shell find $(PROJDI
+@@ -21,13 +21,13 @@ SRCFILES        := $(sort $(shell find $(PROJDIRS) -ty
  OBJFILES        := $(patsubst %.cpp, %.o, $(SRCFILES))
  DEPFILES        := $(patsubst %.cpp, %.d, $(SRCFILES))
  WARNINGS        ?= -Wall -Wextra -pedantic
@@ -9,18 +9,11 @@
  DMACROS         := -DNDEBUG -DUNIX -DPACKAGE_VERSION=\"$(DISTVER)\"
  INCDIRS         := -I'./include'
  CXXFLAGS        += -std=c++11 $(WARNINGS) $(OPTIMS)
-@@ -125,7 +125,7 @@ $(TR_EXEFILE): $(OBJFILES)
- 		printf "\t%s\n" $$file; \
- 		done;
- 	@printf "\t-> %s\n" $@
--	@$(CXX) -o $@ $(OBJFILES) $(LDFLAGS)
-+	@$(CXX) `sdl2-config --libs`  -o $@ $(OBJFILES) $(LDFLAGS)
- 	@printf "strip\t%s\n" $@
- 	@strip $@
+-CPPFLAGS        += $(DMACROS) $(INCDIRS)
++CPPFLAGS        += $(DMACROS) $(INCDIRS) `sdl2-config --cflags`
+ EXTRA_LIBS      := -lSDL2main -lGL -lGLU -lGLEW -lSDL2 -lSDL2_image -lphysfs -lopenal -lalut -lpthread -ltinyxml2
+-LDFLAGS         += $(EXTRA_LIBS)
++LDFLAGS         += `sdl2-config --libs` $(EXTRA_LIBS)
+ INSTALL_PROGRAM := install --mode=0755
+ INSTALL_DATA    := install --mode=0644
  
-@@ -155,4 +155,4 @@ clean:
- #
- %.o: %.cpp GNUmakefile
- 	@printf "%s\t%s -> %s\n" $(CXX) $< $@
--	@$(CXX) $(CXXFLAGS) $(CPPFLAGS) -MMD -MP -c $< -o $@
-+	@$(CXX) `sdl2-config --cflags` $(CXXFLAGS) $(CPPFLAGS) -MMD -MP -c $< -o $@

Modified: head/games/trigger-rally/files/patch-Trigger_main.cpp
==============================================================================
--- head/games/trigger-rally/files/patch-Trigger_main.cpp	Thu Apr 11 19:39:28 2019	(r498677)
+++ head/games/trigger-rally/files/patch-Trigger_main.cpp	Thu Apr 11 20:07:34 2019	(r498678)
@@ -1,11 +1,11 @@
---- Trigger/main.cpp.orig	2017-03-02 19:21:27 UTC
+--- Trigger/main.cpp.orig	2019-03-26 21:41:24 UTC
 +++ Trigger/main.cpp
-@@ -469,7 +469,7 @@ void MainApp::loadConfig()
+@@ -471,7 +471,7 @@ void MainApp::loadConfig()
    if (!PHYSFS_exists(cfgfilename.c_str())) {
  #ifdef UNIX
      const std::vector<std::string> cfghidingplaces {
 -        "/usr/share/games/trigger-rally/"
-+        "/usr/local/share/games/trigger-rally/"
++        "%%PREFIX%%/share/games/trigger-rally/"
      };
  
      for (const std::string &cfgpath: cfghidingplaces)