Attachment #203175 for bug #236817

View | Details | Raw Unified | Return to bug 236817
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	trigger-rally
PORTVERSION=	0.6.6.1
PORTREVISION=	3
CATEGORIES=	games
MASTER_SITES=	SF/trigger-rally/trigger-${PORTVERSION}


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

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



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
	${MKDIR} ${STAGEDIR}${DATADIR}

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1488474378	1	TIMESTAMP = 1553629546
2	SHA256 (trigger-rally-0.6.5.tar.gz) = f2db8784d8c0dd51c7a2812a9d294db05bb2e9df992038b3a232060dba26ba24	2	SHA256 (trigger-rally-0.6.6.1.tar.gz) = 7f086e13d142b8bb07e808ab9111e5553309c1413532f56c754ce3cfa060cb04
3	SIZE (trigger-rally-0.6.5.tar.gz) = 82290843	3	SIZE (trigger-rally-0.6.6.1.tar.gz) = 120707584




--- GNUmakefile.orig	2019-02-26 22:35:48 UTC
+++ GNUmakefile
@@ -21,13 +21,13 @@ SRCFILES        := $(sort $(shell find $(PROJDIRS) -ty
 OBJFILES        := $(patsubst %.cpp, %.o, $(SRCFILES))
 DEPFILES        := $(patsubst %.cpp, %.d, $(SRCFILES))
 WARNINGS        ?= -Wall -Wextra -pedantic

 DMACROS         := -DNDEBUG -DUNIX -DPACKAGE_VERSION=\"$(DISTVER)\"
 INCDIRS         := -I'./include'
 CXXFLAGS        += -std=c++11 $(WARNINGS) $(OPTIMS)
-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
 	@strip $@
 
@@ -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 $@

Lines 1-11 Link Here

(-)files/patch-Trigger_main.cpp (-3 / +3 lines)
1	--- Trigger/main.cpp.orig 2017-03-02 19:21:27 UTC	1	--- Trigger/main.cpp.orig 2019-03-26 21:41:24 UTC
2	+++ Trigger/main.cpp	2	+++ Trigger/main.cpp
3	@@ -469,7 +469,7 @@ void MainApp::loadConfig()	3	@@ -471,7 +471,7 @@ void MainApp::loadConfig()
4	if (!PHYSFS_exists(cfgfilename.c_str())) {	4	if (!PHYSFS_exists(cfgfilename.c_str())) {
5	#ifdef UNIX	5	#ifdef UNIX
6	const std::vector<std::string> cfghidingplaces {	6	const std::vector<std::string> cfghidingplaces {
7	- "/usr/share/games/trigger-rally/"	7	- "/usr/share/games/trigger-rally/"
8	+ "/usr/local/share/games/trigger-rally/"	8	+ "%%PREFIX%%/share/games/trigger-rally/"
9	};	9	};
10		10
11	for (const std::string &cfgpath: cfghidingplaces)	11	for (const std::string &cfgpath: cfghidingplaces)

Return to bug 236817

Lines 2-9 Link Here

(-)Makefile (-6 / +12 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= trigger-rally	4	PORTNAME= trigger-rally
5	PORTVERSION= 0.6.5	5	PORTVERSION= 0.6.6.1
6	PORTREVISION= 3
7	CATEGORIES= games	6	CATEGORIES= games
8	MASTER_SITES= SF/trigger-rally/trigger-${PORTVERSION}	7	MASTER_SITES= SF/trigger-rally/trigger-${PORTVERSION}
9		8
Lines 11-28 Link Here
11	COMMENT= Rally car racing game	10	COMMENT= Rally car racing game
12		11
13	LICENSE= GPLv2	12	LICENSE= GPLv2
		13	LICENSE_FILE= ${WORKINGSRC}/doc/COPYING.txt
14		14
15	LIB_DEPENDS= libphysfs.so:devel/physfs	15	LIB_DEPENDS= libphysfs.so:devel/physfs
16	LIB_DEPENDS+= libalut.so:audio/freealut	16	LIB_DEPENDS+= libalut.so:audio/freealut
		17	LIB_DEPENDS+= libtinyxml2.so:textproc/tinyxml2
17		18
18	WRKSRC_SUBDIR= src	19	USES= compiler:c++11-lang gmake openal:al,alut sdl gl gnome
19	USES= compiler:c++11-lang gmake openal:al,alut	20
20	USE_SDL= sdl2 image2	21	USE_SDL= image2
21	USE_GL= glu gl glew	22	USE_GL= glu glew
22	MAKEFILE= GNUmakefile	23	MAKEFILE= GNUmakefile
23	ALL_TARGET= build	24	ALL_TARGET= build
24	LLD_UNSAFE= yes	25	LLD_UNSAFE= yes
		26	INSTALLS_ICONS= yes
25		27
		28	WRKSRC_SUBDIR= src
26	WORKINGSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}	29	WORKINGSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
27	DATADIR= ${PREFIX}/share/games/trigger-rally	30	DATADIR= ${PREFIX}/share/games/trigger-rally
28		31
Lines 33-38 Link Here
33		36
34	OPTIONS_DEFINE= DOCS	37	OPTIONS_DEFINE= DOCS
35		38
		39	post-patch:
		40	@${REINPLACE_CMD} -e 's\|%%PREFIX%%\|${PREFIX}\|g' ${WRKSRC}/Trigger/main.cpp
		41
36	do-install:	42	do-install:
37	${INSTALL_PROGRAM} ${WORKINGSRC}/bin/trigger-rally ${STAGEDIR}${PREFIX}/bin	43	${INSTALL_PROGRAM} ${WORKINGSRC}/bin/trigger-rally ${STAGEDIR}${PREFIX}/bin
38	${MKDIR} ${STAGEDIR}${DATADIR}	44	${MKDIR} ${STAGEDIR}${DATADIR}

Lines 1-6 Link Here

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