From owner-svn-ports-all@FreeBSD.ORG Wed Apr 17 07:11:48 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id D1985793; Wed, 17 Apr 2013 07:11:48 +0000 (UTC) (envelope-from martymac@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id B3C6FFC3; Wed, 17 Apr 2013 07:11:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3H7BmsZ093749; Wed, 17 Apr 2013 07:11:48 GMT (envelope-from martymac@svn.freebsd.org) Received: (from martymac@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3H7BmAq093746; Wed, 17 Apr 2013 07:11:48 GMT (envelope-from martymac@svn.freebsd.org) Message-Id: <201304170711.r3H7BmAq093746@svn.freebsd.org> From: Ganael LAPLANCHE Date: Wed, 17 Apr 2013 07:11:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r315938 - in head/games/triplane: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Apr 2013 07:11:48 -0000 Author: martymac Date: Wed Apr 17 07:11:47 2013 New Revision: 315938 URL: http://svnweb.freebsd.org/changeset/ports/315938 Log: - Update to 1.08.r20130224 - Use new header format in Makefile Feature safe: yes Modified: head/games/triplane/Makefile (contents, props changed) head/games/triplane/distinfo (contents, props changed) head/games/triplane/files/patch-Makefile (contents, props changed) Modified: head/games/triplane/Makefile ============================================================================== --- head/games/triplane/Makefile Wed Apr 17 07:08:08 2013 (r315937) +++ head/games/triplane/Makefile Wed Apr 17 07:11:47 2013 (r315938) @@ -1,13 +1,8 @@ -# New ports collection makefile for: triplane -# Date created: 01 Jan 2011 -# Whom: Ganael Laplanche -# +# Created by: Ganael Laplanche # $FreeBSD$ -# PORTNAME= triplane -PORTVERSION= 1.04.r20110114 -PORTREVISION= 1 +PORTVERSION= 1.08.r20130224 CATEGORIES= games MASTER_SITES= http://contribs.martymac.org/FreeBSD-ports/distfiles/ \ SF/${PORTNAME} @@ -27,4 +22,6 @@ MAKE_ENV= DATADIR="${DATADIR}" ALL_TARGET= depend all +MAN6= triplane.6 + .include Modified: head/games/triplane/distinfo ============================================================================== --- head/games/triplane/distinfo Wed Apr 17 07:08:08 2013 (r315937) +++ head/games/triplane/distinfo Wed Apr 17 07:11:47 2013 (r315938) @@ -1,2 +1,2 @@ -SHA256 (triplane-classic-1.04.r20110114.tar.gz) = 3d72b528dddaa9c4ef147df3b26db00ff38a9ef561c3b826fc56f46d529f5aa2 -SIZE (triplane-classic-1.04.r20110114.tar.gz) = 3471686 +SHA256 (triplane-classic-1.08.r20130224.tar.gz) = 4b95fc760bf64030c2655f5e98156950de302ab59dcb4cf6864b5e1bfd7c926d +SIZE (triplane-classic-1.08.r20130224.tar.gz) = 3584784 Modified: head/games/triplane/files/patch-Makefile ============================================================================== --- head/games/triplane/files/patch-Makefile Wed Apr 17 07:08:08 2013 (r315937) +++ head/games/triplane/files/patch-Makefile Wed Apr 17 07:11:47 2013 (r315938) @@ -1,36 +1,39 @@ ---- Makefile.orig 2011-01-14 15:46:08.000000000 +0000 -+++ Makefile 2011-01-14 15:49:40.248413763 +0000 -@@ -1,11 +1,11 @@ --PREFIX = /usr/local --DESTDIR = "" -- --CXX = g++ +--- 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 --CFLAGS := -Wall -Isrc $(OPTIFLAG) $(CFLAGS_NOSDL) `sdl-config --cflags` -DHAVE_SDL_MIXER "-DTRIPLANE_DATA=\"$(PREFIX)/share/games/triplane-classic\"" --LDFLAGS = --LIBS := `sdl-config --libs` -lSDL_mixer -lm -+PREFIX ?= /usr/local -+DESTDIR ?= "" -+SDL_CONFIG ?= sdl-config -+ -+CXX ?= g++ +#OPTIFLAG = -O2 -g -+CFLAGS += -Wall -Isrc $(OPTIFLAG) $(CFLAGS_NOSDL) `$(SDL_CONFIG) --cflags` -DHAVE_SDL_MIXER -+LIBS := `$(SDL_CONFIG) --libs` -lSDL_mixer -lm + 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 \ -@@ -72,10 +72,9 @@ +@@ -76,12 +76,11 @@ $(CXX) -o tools/dksbuild -g src/tools/dksbuild/dksbuild.cc install: - mkdir -p $(DESTDIR)$(PREFIX)/games -- install triplane-classic $(DESTDIR)$(PREFIX)/games/triplane-classic -- mkdir -p $(DESTDIR)$(PREFIX)/share/games/triplane-classic -- install -m 644 fokker.dks $(DESTDIR)$(PREFIX)/share/games/triplane-classic/fokker.dks -+ $(BSD_INSTALL_PROGRAM) triplane-classic $(DESTDIR)$(PREFIX)/bin/triplane -+ mkdir -p $(DESTDIR)$(DATADIR) +- $(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 test: if [ ! -d triplane-testsuite ]; then echo Please darcs get http://iki.fi/lindi/darcs/triplane-testsuite; false; fi - bash tools/run-all-tests tools/run-one-test ./triplane-classic triplane-testsuite + SDL_VIDEODRIVER=dummy bash tools/run-all-tests tools/run-one-test ./triplane triplane-testsuite