diff --git a/games/triplane/Makefile b/games/triplane/Makefile index ed7c00523f03..173bb534a734 100644 --- a/games/triplane/Makefile +++ b/games/triplane/Makefile @@ -1,27 +1,27 @@ PORTNAME= triplane PORTVERSION= 1.08.r20130224 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= http://contribs.martymac.org/FreeBSD-ports/distfiles/ \ SF/${PORTNAME} DISTNAME= ${PORTNAME}-classic-${PORTVERSION} MAINTAINER= martymac@FreeBSD.org COMMENT= Port of the original Triplane Turmoil game WWW= https://triplane.sourceforge.net/ LICENSE= GPLv3 USES= gmake sdl USE_SDL= sdl mixer WRKSRC= ${WRKDIR}/${DISTNAME} CFLAGS+= -DTRIPLANE_DATA=\\\"${DATADIR}\\\" MAKE_ENV= DATADIR="${DATADIR}" # ALL_TARGET="depend all" would not work in -jX case due to races pre-build: ${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${BUILD_WRKSRC} ${MAKE_ARGS} depend .include diff --git a/games/triplane/files/patch-Makefile b/games/triplane/files/patch-Makefile index 861540754d2a..47b7d085b9a0 100644 --- a/games/triplane/files/patch-Makefile +++ b/games/triplane/files/patch-Makefile @@ -1,39 +1,39 @@ --- Makefile.orig 2013-03-25 15:44:22.000000000 +0100 +++ Makefile 2013-04-04 06:21:32.000000000 +0200 @@ -2,14 +2,14 @@ DESTDIR ?= CXX ?= g++ -OPTIFLAG = -O2 -g +#OPTIFLAG = -O2 -g SDL_CONFIG ?= sdl-config VERSION = 1.0.8 -CFLAGS := -Wall -Isrc $(OPTIFLAG) $(CFLAGS_NOSDL) `$(SDL_CONFIG) --cflags` -DHAVE_SDL_MIXER "-DTRIPLANE_DATA=\"$(PREFIX)/share/games/triplane\"" "-DTRIPLANE_VERSION=\"$(VERSION)\"" +CFLAGS += -Wall -Isrc $(OPTIFLAG) $(CFLAGS_NOSDL) `$(SDL_CONFIG) --cflags` -DHAVE_SDL_MIXER "-DTRIPLANE_VERSION=\"$(VERSION)\"" LDFLAGS = LIBS := `$(SDL_CONFIG) --libs` -lSDL_mixer -lm -INSTALL_DATA ?= install -m 644 -INSTALL_PROGRAM ?= install +BSD_INSTALL_DATA ?= install -m 644 +BSD_INSTALL_PROGRAM ?= install COMMON_OBJS = src/gfx/bitmap.o src/gfx/font.o \ src/gfx/gfx.o src/util/wutil.o src/util/random.o \ @@ -76,12 +76,11 @@ $(CXX) -o tools/dksbuild -g src/tools/dksbuild/dksbuild.cc install: - mkdir -p $(DESTDIR)$(PREFIX)/games - $(INSTALL_PROGRAM) triplane $(DESTDIR)$(PREFIX)/games/triplane - mkdir -p $(DESTDIR)$(PREFIX)/share/games/triplane - $(INSTALL_DATA) fokker.dks $(DESTDIR)$(PREFIX)/share/games/triplane/fokker.dks - mkdir -p $(DESTDIR)$(PREFIX)/share/man/man6 - $(INSTALL_DATA) doc/triplane.6 $(DESTDIR)$(PREFIX)/share/man/man6/triplane.6 + $(BSD_INSTALL_PROGRAM) triplane $(DESTDIR)$(PREFIX)/bin/triplane + mkdir -p mkdir -p $(DESTDIR)$(DATADIR) + $(BSD_INSTALL_DATA) fokker.dks $(DESTDIR)$(DATADIR)/fokker.dks -+ mkdir -p $(DESTDIR)$(MANPREFIX)/man/man6 -+ $(BSD_INSTALL_MAN) doc/triplane.6 $(DESTDIR)$(MANPREFIX)/man/man6/triplane.6 ++ mkdir -p $(DESTDIR)$(PREFIX)/share/man/man6 ++ $(BSD_INSTALL_MAN) doc/triplane.6 $(DESTDIR)$(PREFIX)/share/man/man6/triplane.6 test: if [ ! -d triplane-testsuite ]; then echo Please darcs get http://iki.fi/lindi/darcs/triplane-testsuite; false; fi SDL_VIDEODRIVER=dummy bash tools/run-all-tests tools/run-one-test ./triplane triplane-testsuite diff --git a/games/triplane/pkg-plist b/games/triplane/pkg-plist index 9a2b1f9703d8..197cc855393a 100644 --- a/games/triplane/pkg-plist +++ b/games/triplane/pkg-plist @@ -1,3 +1,3 @@ bin/triplane -man/man6/triplane.6.gz +share/man/man6/triplane.6.gz %%DATADIR%%/fokker.dks