From 2e5a414e58eaf8d3966395dec726384b3f26e2b9 Mon Sep 17 00:00:00 2001 From: pvalchev Date: Tue, 21 Jan 2003 09:39:42 +0000 Subject: [PATCH] Update to cosmosmash-1.3 now with sound; ok maintainer Sean Escriva --- games/cosmosmash/Makefile | 8 +++-- games/cosmosmash/distinfo | 6 ++-- games/cosmosmash/patches/patch-configure | 29 +++++++------------ .../patches/patch-src_CosmoSmashEngine_cpp | 12 -------- games/cosmosmash/pkg/PLIST | 10 +++++-- 5 files changed, 27 insertions(+), 38 deletions(-) delete mode 100644 games/cosmosmash/patches/patch-src_CosmoSmashEngine_cpp diff --git a/games/cosmosmash/Makefile b/games/cosmosmash/Makefile index 93de4c94881..1d9959f9755 100644 --- a/games/cosmosmash/Makefile +++ b/games/cosmosmash/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.2 2002/12/22 01:04:22 naddy Exp $ +# $OpenBSD: Makefile,v 1.3 2003/01/21 09:39:42 pvalchev Exp $ COMMENT= "astrosmash clone for X" -DISTNAME= cosmosmash-1.1 +DISTNAME= cosmosmash-1.3 CATEGORIES= games HOMEPAGE= http://www3.sympatico.ca/sarrazip/dev/cosmosmash.html @@ -16,9 +16,11 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= http://www3.sympatico.ca/sarrazip/dev/ -LIB_DEPENDS= gengameng.4.0::devel/gengameng +LIB_DEPENDS= gengameng.4.1::devel/gengameng \ + SDL_mixer::devel/sdl-mixer USE_X11= Yes CONFIGURE_STYLE= gnu +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" .include diff --git a/games/cosmosmash/distinfo b/games/cosmosmash/distinfo index 3b95e8dd1e1..be4a1941675 100644 --- a/games/cosmosmash/distinfo +++ b/games/cosmosmash/distinfo @@ -1,3 +1,3 @@ -MD5 (cosmosmash-1.1.tar.gz) = 7c258ed755400a3d77e39faf2ccc8c76 -RMD160 (cosmosmash-1.1.tar.gz) = dc771c462146006c2beb81ac2641080df6dfef8d -SHA1 (cosmosmash-1.1.tar.gz) = 240d149938f8f4bb792ac3ffb6a506b29789037c +MD5 (cosmosmash-1.3.tar.gz) = 6d37511dc64710d02ee92097702917b3 +RMD160 (cosmosmash-1.3.tar.gz) = 2b2c6130d3f7a155a9d8cb89dca155e841668393 +SHA1 (cosmosmash-1.3.tar.gz) = f0588ee592c4a656802fe9c8ed12d1dfa87d3daf diff --git a/games/cosmosmash/patches/patch-configure b/games/cosmosmash/patches/patch-configure index bb8b72af517..a8bcaaabe94 100644 --- a/games/cosmosmash/patches/patch-configure +++ b/games/cosmosmash/patches/patch-configure @@ -1,21 +1,14 @@ -$OpenBSD: patch-configure,v 1.1 2002/12/22 01:04:22 naddy Exp $ ---- configure.orig Sun Dec 22 01:57:44 2002 -+++ configure Sun Dec 22 01:58:05 2002 -@@ -795,8 +795,6 @@ fi +$OpenBSD: patch-configure,v 1.2 2003/01/21 09:39:42 pvalchev Exp $ +--- configure.orig Sat Jan 18 15:23:32 2003 ++++ configure Sat Jan 18 15:24:52 2003 +@@ -1707,10 +1707,6 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(inst + # Checks for programs. - -- CXXFLAGS="-g -Wall" # default compilation options +-if test "_$CXXFLAGS" = _; then +- CXXFLAGS="-g" +-fi - - # Check whether --with-cxx or --without-cxx was given. - if test "${with_cxx+set}" = set; then - withval="$with_cxx" -@@ -972,8 +970,6 @@ ac_compile='${CXX-g++} -c $CXXFLAGS $CPP - ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' - cross_compiling=$ac_cv_prog_cxx_cross - -- --CXXFLAGS="-g -Wall" - - # Checks for libraries. - + ac_ext=cc + ac_cpp='$CXXCPP $CPPFLAGS' + ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' diff --git a/games/cosmosmash/patches/patch-src_CosmoSmashEngine_cpp b/games/cosmosmash/patches/patch-src_CosmoSmashEngine_cpp deleted file mode 100644 index c310617ff83..00000000000 --- a/games/cosmosmash/patches/patch-src_CosmoSmashEngine_cpp +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-src_CosmoSmashEngine_cpp,v 1.1 2002/09/28 16:40:25 naddy Exp $ ---- src/CosmoSmashEngine.cpp.orig Sat Sep 28 18:40:42 2002 -+++ src/CosmoSmashEngine.cpp Sat Sep 28 18:41:03 2002 -@@ -1048,7 +1048,7 @@ CosmoSmashEngine::animateAutomaticCharac - { - Couple diff = playerSprite->getPos() - pulsar->getPos(); - // NOTE: use projection instead of trig; see animateSaucers() -- double angle = atan2(diff.y, diff.x); -+ double angle = atan2(double(diff.y), double(diff.x)); - Couple newSpeed(int(PULSAR_SPEED * cos(angle)), - int(PULSAR_SPEED * sin(angle))); - if (newSpeed.isZero()) diff --git a/games/cosmosmash/pkg/PLIST b/games/cosmosmash/pkg/PLIST index be0ea722e8a..0411e6ab422 100644 --- a/games/cosmosmash/pkg/PLIST +++ b/games/cosmosmash/pkg/PLIST @@ -1,4 +1,10 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2002/02/28 05:28:12 pvalchev Exp $ +@comment $OpenBSD: PLIST,v 1.2 2003/01/21 09:39:42 pvalchev Exp $ bin/cosmosmash man/man6/cosmosmash.6 -share/pixmaps/cosmosmash.png +share/sounds/cosmosmash/hyperspace.wav +share/sounds/cosmosmash/player-hit.wav +share/sounds/cosmosmash/pulsar-beep.wav +share/sounds/cosmosmash/rock-hit-0.wav +share/sounds/cosmosmash/rock-hit-1.wav +share/sounds/cosmosmash/saucer-shooting.wav +@dirrm share/sounds/cosmosmash