Date: Tue, 4 Jun 2013 22:33:38 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r319935 - in head/games/formido: . files Message-ID: <201306042233.r54MXcZg004670@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Tue Jun 4 22:33:37 2013 New Revision: 319935 URL: http://svnweb.freebsd.org/changeset/ports/319935 Log: - Update to 1.0.1 - Update MASTER_SITES - Add LICENSE - Rework Makefile Deleted: head/games/formido/files/patch-include--init.h head/games/formido/files/patch-src--config.cpp head/games/formido/pkg-install head/games/formido/pkg-plist Modified: head/games/formido/Makefile head/games/formido/distinfo head/games/formido/files/patch-Makefile head/games/formido/pkg-descr Modified: head/games/formido/Makefile ============================================================================== --- head/games/formido/Makefile Tue Jun 4 22:32:07 2013 (r319934) +++ head/games/formido/Makefile Tue Jun 4 22:33:37 2013 (r319935) @@ -2,61 +2,42 @@ # $FreeBSD$ PORTNAME= formido -PORTVERSION= 1.0 -PORTREVISION= 9 +PORTVERSION= 1.0.1 CATEGORIES= games -MASTER_SITES= http://koti.mbnet.fi/lsoft/formido/ \ +MASTER_SITES= http://www.mhgames.org/files/formido/ \ http://mirror.amdmi3.ru/distfiles/ MAINTAINER= amdmi3@FreeBSD.org COMMENT= 2D kill-em all with 3D rendered graphics -USE_BZIP2= yes -USE_GMAKE= yes +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/GPL_license.txt + USE_SDL= sdl mixer image +USE_GMAKE= yes +MAKE_ARGS= CC="${CXX}" DATDIR="${DATADIR}" DEFCONFIGDIR="${DATADIR}" +MAKE_JOBS_SAFE= yes -HISCOREDIR= /var/games/formido +PLIST_FILES= bin/${PORTNAME} -CC= ${CXX} -MAKE_ENV= DATDIR="${DATADIR}" HISCOREDIR="${HISCOREDIR}" \ - LINKFLAGS="${CXXFLAGS}" DEFAULT_CONFIG_FILE="${DATADIR}/formido.cfg" - -OPTIONS_DEFINE= MUSIC -OPTIONS_DEFAULT=MUSIC -MUSIC_DESC= Install music (6MB) +PORTDATA= * +PORTDOCS= * .include <bsd.port.options.mk> -.if ${PORT_OPTIONS:MMUSIC} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${PORTNAME}-music${EXTRACT_SUFX} -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} -PLIST_SUB+= MUSIC="" -.else -PLIST_SUB+= MUSIC="@comment " -.endif - -post-patch: - @${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}|g' ${WRKSRC}/Makefile - @${REINPLACE_CMD} -e 's|formido.cfg|.formido.cfg|g' ${WRKSRC}/src/*.cpp +pre-build: + @${MKDIR} ${WRKSRC}/obj do-install: ${INSTALL_PROGRAM} ${WRKSRC}/formido ${PREFIX}/bin ${MKDIR} ${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/data/* ${DATADIR} +.if !defined(NOPORTDATA) + cd ${WRKSRC}/data && ${COPYTREE_SHARE} '*' ${DATADIR}/ ${INSTALL_DATA} ${WRKSRC}/formido.cfg ${DATADIR} -.if ${PORT_OPTIONS:MMUSIC} - cd ${DATADIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${PORTNAME}-music${EXTRACT_SUFX} ${EXTRACT_AFTER_ARGS} - ${CHOWN} root:wheel ${DATADIR}/*.ogg - ${CHMOD} 644 ${DATADIR}/*.ogg .endif - ${CHGRP} games ${PREFIX}/bin/formido - ${CHMOD} g+s ${PREFIX}/bin/formido - -.if !exists(${HISCOREDIR}) -post-install: - ${MKDIR} ${HISCOREDIR} - ${CHGRP} games ${HISCOREDIR} - ${CHMOD} g+w ${HISCOREDIR} +.if ${PORT_OPTIONS:MDOCS} + ${MKDIR} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/ .endif .include <bsd.port.mk> Modified: head/games/formido/distinfo ============================================================================== --- head/games/formido/distinfo Tue Jun 4 22:32:07 2013 (r319934) +++ head/games/formido/distinfo Tue Jun 4 22:33:37 2013 (r319935) @@ -1,4 +1,2 @@ -SHA256 (formido-1.0.tar.bz2) = fe1b8d5878dae1193d6cbd6dc4c99347699d35c2c4f9f9ba51a28c864de51541 -SIZE (formido-1.0.tar.bz2) = 2965419 -SHA256 (formido-music.tar.bz2) = 3e9d076139f80e257ba2586c474e18361db5197a555956ebf4dc3053b2a2ce6e -SIZE (formido-music.tar.bz2) = 6159005 +SHA256 (formido-1.0.1.tar.gz) = 7fbf28dac12596d39927308b83b2e084e9f3fde865dc27e24c5aa96f57d07ae0 +SIZE (formido-1.0.1.tar.gz) = 9357006 Modified: head/games/formido/files/patch-Makefile ============================================================================== --- head/games/formido/files/patch-Makefile Tue Jun 4 22:32:07 2013 (r319934) +++ head/games/formido/files/patch-Makefile Tue Jun 4 22:33:37 2013 (r319935) @@ -1,31 +1,14 @@ ---- Makefile.orig Fri Nov 7 21:58:35 2003 -+++ Makefile Sat Nov 19 19:58:06 2005 -@@ -7,23 +7,23 @@ - #(just don't include the ending slash) - - #Data directory (default: ./data) --DATDIR = ./data -+DATDIR ?= ./data - - #High score directory (default: ./data) --HISCOREDIR = ./data -+HISCOREDIR ?= ./data - - #Config file directory (default: .) - CONFIGDIR = . - --CC=g++ -+CC?=g++ - FLAGS=`sdl-config --cflags` -Wall -I./include --LINKFLAGS=-O2 -ffast-math -fomit-frame-pointer -+LINKFLAGS?=-O2 -ffast-math -fomit-frame-pointer - LIBS=`sdl-config --libs` -lm -lSDL_mixer -lSDL_image +--- Makefile.orig 2006-05-25 19:04:22.000000000 +0400 ++++ Makefile 2013-06-04 19:53:49.202113477 +0400 +@@ -18,9 +18,9 @@ + DEFCONFIGDIR = . + + CC=g++ +-FLAGS=`sdl-config --cflags` -Wall -I./include ++FLAGS=${CXXFLAGS} `${SDL_CONFIG} --cflags` -Wall -I./include + LINKFLAGS=-O2 -ffast-math -fomit-frame-pointer +-LIBS=`sdl-config --libs` -lm -lSDL_mixer -lSDL_image ++LIBS=`${SDL_CONFIG} --libs` -lm -lSDL_mixer -lSDL_image CPPFILES=blend.cpp credits.cpp explo.cpp hof.cpp menu.cpp player.cpp \ bomb.cpp critter.cpp font.cpp init.cpp mymath.cpp powerup.cpp \ config.cpp effect.cpp game.cpp main.cpp particle.cpp timer.cpp - --DEFINES=-DDATA_DIR=\"${DATDIR}\" -DHISCORE_DIR=\"${HISCOREDIR}\" -DCONFIG_DIR=\"${CONFIGDIR}\" -+DEFINES=-DDATA_DIR=\"${DATDIR}\" -DHISCORE_DIR=\"${HISCOREDIR}\" -DDEFAULT_CONFIG_FILE=\"${DEFAULT_CONFIG_FILE}\" - - SOURCES=$(addprefix src/, $(CPPFILES)) - OBJECTS=$(addprefix obj/, $(CPPFILES:.cpp=.o)) Modified: head/games/formido/pkg-descr ============================================================================== --- head/games/formido/pkg-descr Tue Jun 4 22:32:07 2013 (r319934) +++ head/games/formido/pkg-descr Tue Jun 4 22:33:37 2013 (r319935) @@ -7,4 +7,4 @@ aid you in your honorable quest. Keep in are rather tough and generally do nasty things when in close range of any player-characters. -WWW: http://www.mhgames.org/oldies/formido/ +WWW: http://www.mhgames.org/oldies/formido/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306042233.r54MXcZg004670>