From c52ec263833ec523f651acb3e963a0b714654ffd Mon Sep 17 00:00:00 2001 From: Kirill Ponomarev Date: Fri, 25 Feb 2005 13:35:34 +0000 Subject: Update to version 1.2 PR: ports/77967 Submitted by: Ports Fury --- games/highmoon/Makefile | 35 ++++++++++++++-------- games/highmoon/distinfo | 4 +-- games/highmoon/files/patch-Makefile | 27 ----------------- games/highmoon/files/patch-galaxy.cpp | 14 --------- games/highmoon/files/patch-graphics.hpp | 15 ---------- games/highmoon/files/patch-sound.cpp | 14 --------- games/highmoon/pkg-plist | 53 ++++++++++++++++++++++----------- 7 files changed, 61 insertions(+), 101 deletions(-) delete mode 100644 games/highmoon/files/patch-Makefile delete mode 100644 games/highmoon/files/patch-galaxy.cpp delete mode 100644 games/highmoon/files/patch-graphics.hpp delete mode 100644 games/highmoon/files/patch-sound.cpp (limited to 'games') diff --git a/games/highmoon/Makefile b/games/highmoon/Makefile index e5dfcade6186..49b365085736 100644 --- a/games/highmoon/Makefile +++ b/games/highmoon/Makefile @@ -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 diff --git a/games/highmoon/distinfo b/games/highmoon/distinfo index 76226b0a1003..7c57a3d7a400 100644 --- a/games/highmoon/distinfo +++ b/games/highmoon/distinfo @@ -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 --git a/games/highmoon/files/patch-Makefile b/games/highmoon/files/patch-Makefile deleted file mode 100644 index f1ec5030668b..000000000000 --- a/games/highmoon/files/patch-Makefile +++ /dev/null @@ -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 --git a/games/highmoon/files/patch-galaxy.cpp b/games/highmoon/files/patch-galaxy.cpp deleted file mode 100644 index e9ce7295d553..000000000000 --- a/games/highmoon/files/patch-galaxy.cpp +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- galaxy.cpp.orig -+++ galaxy.cpp -@@ -24,7 +24,7 @@ - ******************************************************************************************/ - - #include -- -+#include - #include "galaxy.hpp" - #include "sound.hpp" - diff --git a/games/highmoon/files/patch-graphics.hpp b/games/highmoon/files/patch-graphics.hpp deleted file mode 100644 index dfb2caba9b73..000000000000 --- a/games/highmoon/files/patch-graphics.hpp +++ /dev/null @@ -1,15 +0,0 @@ - -$FreeBSD$ - ---- graphics.hpp.orig -+++ graphics.hpp -@@ -30,7 +30,8 @@ - #define __GRAPHICS_HPP__ - - #include -- -+#include -+#include - #include "constants.hpp" - - /****************************************************************************************** diff --git a/games/highmoon/files/patch-sound.cpp b/games/highmoon/files/patch-sound.cpp deleted file mode 100644 index 7d24d8b5fb0f..000000000000 --- a/games/highmoon/files/patch-sound.cpp +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- sound.cpp.orig -+++ sound.cpp -@@ -24,7 +24,7 @@ - ******************************************************************************************/ - - #include -- -+#include - #include "sound.hpp" - - Soundset::Sample Soundset::sounds[ NUMBEROFCHANNELS ]; diff --git a/games/highmoon/pkg-plist b/games/highmoon/pkg-plist index 59d73b7366af..5fce3a83ccb9 100644 --- a/games/highmoon/pkg-plist +++ b/games/highmoon/pkg-plist @@ -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%% -- cgit v1.2.3