Date: Wed, 23 Feb 2005 23:00:19 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/77967: Update port: games/highmoon to 1.2 Message-ID: <20050223230019.7e68950a.tkato432@yahoo.com> Resent-Message-ID: <200502231410.j1NEALPh014287@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 77967 >Category: ports >Synopsis: Update port: games/highmoon to 1.2 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Feb 23 14:10:20 GMT 2005 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 4.11-RELEASE i386 >Organization: >Environment: >Description: - Update to version 1.2 Remove file: files/patch-Makefile files/patch-galaxy.cpp files/patch-graphics.hpp files/patch-sound.cpp >How-To-Repeat: >Fix: diff -urN /usr/ports/games/highmoon/Makefile games/highmoon/Makefile --- /usr/ports/games/highmoon/Makefile Sun Jan 23 12:33:19 2005 +++ games/highmoon/Makefile Mon Feb 21 21:21:01 2005 @@ -6,30 +6,41 @@ # PORTNAME= highmoon -PORTVERSION= 1.0.2 +PORTVERSION= 1.2 CATEGORIES= games MASTER_SITES= http://highmoon.gerdsmeier.net/ MAINTAINER= ports@FreeBSD.org COMMENT= Duel in the universe +WRKSRC= ${WRKDIR}/${PORTNAME} + +USE_SDL= image sdl +USE_GCC= 3.4 USE_REINPLACE= yes -USE_SDL= sdl mixer +USE_GMAKE= yes +MAKE_ARGS= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" LIBS="${LDFLAGS}" -WRKSRC= ${WRKDIR}/${PORTNAME} +CXXFLAGS+= `${SDL_CONFIG} --cflags` +LDFLAGS= `${SDL_CONFIG} --libs` -lSDL_image -pre-patch: - @${REINPLACE_CMD} -E 's,"(snd|gfx)/,"${DATADIR}/\1/,' \ - ${WRKSRC}/galaxy.cpp ${WRKSRC}/graphics.cpp ${WRKSRC}/sound.cpp - @${REINPLACE_CMD} -e 's,[[:cntrl:]]*$$,,' ${WRKSRC}/Makefile - @${REINPLACE_CMD} -e 's,^#include <SDL/,#include <,' \ - ${WRKSRC}/constants.hpp ${WRKSRC}/graphics.hpp \ - ${WRKSRC}/main.cpp ${WRKSRC}/main.cpp ${WRKSRC}/sound.hpp +post-patch: + @${FIND} ${WRKSRC}/src -type f | ${XARGS} ${REINPLACE_CMD} -e \ + 's|SDL/SDL|SDL|g ; \ + s|^#define __ENV|//#define __ENV|g ; \ + s|"gfx/|"${DATADIR}/gfx/|g ; \ + s|"snd/|"${DATADIR}/snd/|g ; \ + s|-round(|-rint(|g' do-install: ${INSTALL_PROGRAM} ${WRKSRC}/ufo ${PREFIX}/bin/${PORTNAME} - @${MKDIR} ${DATADIR}/snd ${DATADIR}/gfx - ${INSTALL_DATA} ${WRKSRC}/snd/* ${DATADIR}/snd + @${MKDIR} ${DATADIR}/gfx ${INSTALL_DATA} ${WRKSRC}/gfx/* ${DATADIR}/gfx + @${MKDIR} ${DATADIR}/snd + ${INSTALL_DATA} ${WRKSRC}/snd/* ${DATADIR}/snd +.if !defined(NOPORTDOCS) + @${MKDIR} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} +.endif .include <bsd.port.mk> diff -urN /usr/ports/games/highmoon/distinfo games/highmoon/distinfo --- /usr/ports/games/highmoon/distinfo Thu Jan 20 18:09:41 2005 +++ games/highmoon/distinfo Mon Feb 21 20:16:34 2005 @@ -1,2 +1,2 @@ -MD5 (highmoon-1.0.2.tar.gz) = c4e240e65db4041b4f038d633bbdcfd7 -SIZE (highmoon-1.0.2.tar.gz) = 396553 +MD5 (highmoon-1.2.tar.gz) = 099ff8f5a3b0516bf5b4e4e87c6ce8ca +SIZE (highmoon-1.2.tar.gz) = 407679 diff -urN /usr/ports/games/highmoon/files/patch-Makefile games/highmoon/files/patch-Makefile --- /usr/ports/games/highmoon/files/patch-Makefile Thu Jan 20 18:09:41 2005 +++ games/highmoon/files/patch-Makefile Thu Jan 1 09:00:00 1970 @@ -1,27 +0,0 @@ ---- Makefile.orig Thu Jan 20 15:00:24 2005 -+++ Makefile Thu Jan 20 14:51:52 2005 -@@ -1,17 +1,19 @@ - # Makefile for ufo - --CFLAGS = -g -O3 -Wall `sdl-config --cflags` --CXXFLAGS = $(CFLAGS) --LIBS = `sdl-config --libs` -lSDL_gfx -+CXXFLAGS += `sdl11-config --cflags` -+LIBS = `sdl11-config --libs` - MAINNAME = ufo --CC=g++ -+CXX ?= g++ - - OBJS = main.o vector2d.o language.o sound.o graphics.o galaxy.o - -+.cpp.o: -+ $(CXX) $(CXXFLAGS) -c $< -o $*.o -+ - all: ufo - - ufo: $(OBJS) -- $(CC) $(CFLAGS) $(LDFLAGS) -o $(MAINNAME) $(OBJS) $(LIBS) -+ $(CXX) $(LDFLAGS) -o $(MAINNAME) $(OBJS) $(LIBS) - - clean: - rm -f *.o diff -urN /usr/ports/games/highmoon/files/patch-galaxy.cpp games/highmoon/files/patch-galaxy.cpp --- /usr/ports/games/highmoon/files/patch-galaxy.cpp Fri Jan 28 03:22:37 2005 +++ games/highmoon/files/patch-galaxy.cpp Thu Jan 1 09:00:00 1970 @@ -1,14 +0,0 @@ - -$FreeBSD: ports/games/highmoon/files/patch-galaxy.cpp,v 1.1 2005/01/27 18:22:37 krion Exp $ - ---- galaxy.cpp.orig -+++ galaxy.cpp -@@ -24,7 +24,7 @@ - ******************************************************************************************/ - - #include <cmath> -- -+#include <time.h> - #include "galaxy.hpp" - #include "sound.hpp" - diff -urN /usr/ports/games/highmoon/files/patch-graphics.hpp games/highmoon/files/patch-graphics.hpp --- /usr/ports/games/highmoon/files/patch-graphics.hpp Fri Jan 28 03:22:37 2005 +++ games/highmoon/files/patch-graphics.hpp Thu Jan 1 09:00:00 1970 @@ -1,15 +0,0 @@ - -$FreeBSD: ports/games/highmoon/files/patch-graphics.hpp,v 1.1 2005/01/27 18:22:37 krion Exp $ - ---- graphics.hpp.orig -+++ graphics.hpp -@@ -30,7 +30,8 @@ - #define __GRAPHICS_HPP__ - - #include <SDL.h> -- -+#include <sstream> -+#include <string> - #include "constants.hpp" - - /****************************************************************************************** diff -urN /usr/ports/games/highmoon/files/patch-sound.cpp games/highmoon/files/patch-sound.cpp --- /usr/ports/games/highmoon/files/patch-sound.cpp Fri Jan 28 03:22:37 2005 +++ games/highmoon/files/patch-sound.cpp Thu Jan 1 09:00:00 1970 @@ -1,14 +0,0 @@ - -$FreeBSD: ports/games/highmoon/files/patch-sound.cpp,v 1.1 2005/01/27 18:22:37 krion Exp $ - ---- sound.cpp.orig -+++ sound.cpp -@@ -24,7 +24,7 @@ - ******************************************************************************************/ - - #include <iostream> -- -+#include <stdlib.h> - #include "sound.hpp" - - Soundset::Sample Soundset::sounds[ NUMBEROFCHANNELS ]; diff -urN /usr/ports/games/highmoon/pkg-plist games/highmoon/pkg-plist --- /usr/ports/games/highmoon/pkg-plist Thu Jan 20 18:09:41 2005 +++ games/highmoon/pkg-plist Mon Feb 21 21:20:32 2005 @@ -1,25 +1,44 @@ bin/highmoon -%%DATADIR%%/gfx/c_shooting.bmp -%%DATADIR%%/gfx/c_thinking.bmp -%%DATADIR%%/gfx/cpktblue.bmp -%%DATADIR%%/gfx/cpktred.bmp -%%DATADIR%%/gfx/earth.bmp -%%DATADIR%%/gfx/explosionanim.bmp -%%DATADIR%%/gfx/font.bmp -%%DATADIR%%/gfx/hole.bmp -%%DATADIR%%/gfx/jupiter.bmp -%%DATADIR%%/gfx/mars.bmp -%%DATADIR%%/gfx/moon.bmp -%%DATADIR%%/gfx/shoot.bmp -%%DATADIR%%/gfx/shootback.bmp -%%DATADIR%%/gfx/ufoblue.bmp -%%DATADIR%%/gfx/ufored.bmp -@dirrm %%DATADIR%%/gfx +%%PORTDOCS%%%%DOCSDIR%%/README +%%DATADIR%%/gfx/c_shooting.gif +%%DATADIR%%/gfx/c_thinking.gif +%%DATADIR%%/gfx/cpktblue.gif +%%DATADIR%%/gfx/cpktred.gif +%%DATADIR%%/gfx/earth.gif +%%DATADIR%%/gfx/explosionanim.gif +%%DATADIR%%/gfx/extra.gif +%%DATADIR%%/gfx/extra0.gif +%%DATADIR%%/gfx/extra1.gif +%%DATADIR%%/gfx/extra2.gif +%%DATADIR%%/gfx/extra3.gif +%%DATADIR%%/gfx/font.gif +%%DATADIR%%/gfx/heavy.gif +%%DATADIR%%/gfx/heavyback.gif +%%DATADIR%%/gfx/heavybackk.gif +%%DATADIR%%/gfx/highmoon.png +%%DATADIR%%/gfx/hole.gif +%%DATADIR%%/gfx/jupiter.gif +%%DATADIR%%/gfx/mars.gif +%%DATADIR%%/gfx/moon.gif +%%DATADIR%%/gfx/moon_mask.gif +%%DATADIR%%/gfx/saturn.gif +%%DATADIR%%/gfx/shoot.gif +%%DATADIR%%/gfx/shootback.gif +%%DATADIR%%/gfx/shootbackk.gif +%%DATADIR%%/gfx/stone.gif +%%DATADIR%%/gfx/stone_mask.gif +%%DATADIR%%/gfx/ufoblue.gif +%%DATADIR%%/gfx/ufored.gif +%%DATADIR%%/gfx/venus.gif %%DATADIR%%/snd/applause.wav -%%DATADIR%%/snd/beam.wav +%%DATADIR%%/snd/click.wav +%%DATADIR%%/snd/curve.wav %%DATADIR%%/snd/explosion.wav %%DATADIR%%/snd/kling.wav %%DATADIR%%/snd/laser.wav %%DATADIR%%/snd/pluck.wav +%%DATADIR%%/snd/strom.wav @dirrm %%DATADIR%%/snd +@dirrm %%DATADIR%%/gfx @dirrm %%DATADIR%% +%%PORTDOCS%%@dirrm %%DOCSDIR%% >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050223230019.7e68950a.tkato432>