From owner-svn-ports-head@freebsd.org Thu Apr 11 20:07:36 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E34161568F45; Thu, 11 Apr 2019 20:07:35 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8122674709; Thu, 11 Apr 2019 20:07:35 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5B7AAF12A; Thu, 11 Apr 2019 20:07:35 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3BK7Zxi096755; Thu, 11 Apr 2019 20:07:35 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3BK7YBc096749; Thu, 11 Apr 2019 20:07:34 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201904112007.x3BK7YBc096749@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Thu, 11 Apr 2019 20:07:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r498678 - in head/games/trigger-rally: . files X-SVN-Group: ports-head X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in head/games/trigger-rally: . files X-SVN-Commit-Revision: 498678 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 8122674709 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.94 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.95)[-0.945,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Apr 2019 20:07:36 -0000 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 (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@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 cfghidingplaces { - "/usr/share/games/trigger-rally/" -+ "/usr/local/share/games/trigger-rally/" ++ "%%PREFIX%%/share/games/trigger-rally/" }; for (const std::string &cfgpath: cfghidingplaces)