Date: Sun, 29 Aug 2010 01:05:13 +0400 From: Anonymous <swell.k@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/150074: [patch] games/hex-a-hop: update to 1.1.0 Message-ID: <86k4na1m9i.fsf@gmail.com> Resent-Message-ID: <201008282110.o7SLA2S3019151@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 150074 >Category: ports >Synopsis: [patch] games/hex-a-hop: update to 1.1.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat Aug 28 21:10:02 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Anonymous >Release: FreeBSD 9.0-CURRENT amd64 >Organization: >Environment: What was tested: only build, the game is not dvorak-friendly for me to play ;( >Description: >How-To-Repeat: >Fix: --- a.diff begins here --- Index: games/hex-a-hop/Makefile =================================================================== RCS file: /a/.cvsup/ports/games/hex-a-hop/Makefile,v retrieving revision 1.9 diff -u -p -r1.9 Makefile --- games/hex-a-hop/Makefile 19 Aug 2009 15:03:32 -0000 1.9 +++ games/hex-a-hop/Makefile 28 Aug 2010 19:58:45 -0000 @@ -6,29 +6,49 @@ # PORTNAME= hex-a-hop -PORTVERSION= 1.0.0 -PORTREVISION= 4 +PORTVERSION= 1.1.0 CATEGORIES= games -MASTER_SITES= http://ftp.bishopston.net/freebsd/distfiles/ \ - ftp://ftp.bishopston.net/freebsd/distfiles/ \ - http://critical.ch/distfiles/ +MASTER_SITES= SF/${PORTNAME:S/-//g}/${PORTNAME}/${PORTVERSION} MAINTAINER= jamie@bishopston.net COMMENT= A puzzle game based on hexagonal tiles USE_SDL= sdl -MAKEFILE= Makefile.FreeBSD -ALL_TARGET= ${PORTNAME} +GNU_CONFIGURE= yes +CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" + +CPPFLAGS+= -I${LOCALBASE}/include +CFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib + +OPTIONS= PANGO "Use sdl_pango instead of sdl_ttf" off \ + SOUND "Compile sound support" on -MAKE_ARGS+= SYSTEM_INSTALL_DIR="${DATADIR}/" DESKTOP_ENTRIES="Hex-a-Hop" "A puzzle game based on hexagonal tiles" \ - "${DATADIR}/graphics/icon.bmp" \ + "${DATADIR}/icon.bmp" \ "hex-a-hop" "Application;LogicGame;Game;" false -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/hex-a-hop ${PREFIX}/bin - ${MKDIR} ${DATADIR}/graphics - ${INSTALL_DATA} ${WRKSRC}/graphics/* ${DATADIR}/graphics/ - ${INSTALL_DATA} ${WRKSRC}/levels.dat ${DATADIR}/ +.include <bsd.port.pre.mk> + +.if !defined(WITHOUT_NLS) +USE_GETTEXT= yes +CONFIGURE_ENV+= ac_cv_header_libintl_h=yes +LDFLAGS+= -lintl +.else +CONFIGURE_ENV+= ac_cv_header_libintl_h=no +.endif + +.if !defined(WITHOUT_PANGO) +USE_SDL+= pango +CONFIGURE_ARGS+=--disable-sdlttf +.else +USE_SDL+= ttf +.endif + +.if !defined(WITHOUT_SOUND) +USE_SDL+= mixer +.else +CONFIGURE_ARGS+=--disable-sound +.endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> Index: games/hex-a-hop/distinfo =================================================================== RCS file: /a/.cvsup/ports/games/hex-a-hop/distinfo,v retrieving revision 1.1 diff -u -p -r1.1 distinfo --- games/hex-a-hop/distinfo 20 Mar 2006 19:50:18 -0000 1.1 +++ games/hex-a-hop/distinfo 28 Aug 2010 18:46:18 -0000 @@ -1,3 +1,3 @@ -MD5 (hex-a-hop-1.0.0.tar.gz) = 0f8623f061eee8508d8ca78d86ed15e2 -SHA256 (hex-a-hop-1.0.0.tar.gz) = 200b2b88133f532419398224d29d72ca394168fbc7646b7ce50985867ac275a7 -SIZE (hex-a-hop-1.0.0.tar.gz) = 883536 +MD5 (hex-a-hop-1.1.0.tar.gz) = cc8d065c2cc0fce9e08852b8c465175e +SHA256 (hex-a-hop-1.1.0.tar.gz) = 80bf19d936a8430cab5bc468ee6827c38052e026c609eb7ece16317e7932a0d6 +SIZE (hex-a-hop-1.1.0.tar.gz) = 9249269 Index: games/hex-a-hop/pkg-descr =================================================================== RCS file: /a/.cvsup/ports/games/hex-a-hop/pkg-descr,v retrieving revision 1.1 diff -u -p -r1.1 pkg-descr --- games/hex-a-hop/pkg-descr 20 Mar 2006 19:50:18 -0000 1.1 +++ games/hex-a-hop/pkg-descr 28 Aug 2010 21:03:59 -0000 @@ -5,5 +5,4 @@ The objective is simply to destroy all t 100 levels. As you progress through the game, more types of tiles are introduced which make things more difficult and interesting (hopefully). -Author: Tom Beaumont <tombeaumont@yahoo.com> -WWW: http://www.aceinternet.co.uk/~mokona/ +WWW: http://hexahop.sourceforge.net/ Index: games/hex-a-hop/pkg-plist =================================================================== RCS file: /a/.cvsup/ports/games/hex-a-hop/pkg-plist,v retrieving revision 1.2 diff -u -p -r1.2 pkg-plist --- games/hex-a-hop/pkg-plist 30 Sep 2008 09:20:15 -0000 1.2 +++ games/hex-a-hop/pkg-plist 28 Aug 2010 19:19:11 -0000 @@ -1,13 +1,34 @@ bin/hex-a-hop -%%DATADIR%%/graphics/emi.dat -%%DATADIR%%/graphics/font.dat -%%DATADIR%%/graphics/gradient.dat -%%DATADIR%%/graphics/icon.bmp -%%DATADIR%%/graphics/map.dat -%%DATADIR%%/graphics/map_top.dat -%%DATADIR%%/graphics/tiles.dat -%%DATADIR%%/graphics/tiles_reflect.dat -%%DATADIR%%/graphics/title.dat +%%DATADIR%%/emi.dat +%%DATADIR%%/font.dat +%%DATADIR%%/font.ttf +%%DATADIR%%/gradient.dat +%%DATADIR%%/icon.bmp %%DATADIR%%/levels.dat -@dirrm %%DATADIR%%/graphics +%%DATADIR%%/map.dat +%%DATADIR%%/map_top.dat +%%DATADIR%%/music-ending-nonfree.ogg +%%DATADIR%%/music-game-nonfree-1.ogg +%%DATADIR%%/music-game-nonfree.ogg +%%DATADIR%%/sound-builder-nonfree.ogg +%%DATADIR%%/sound-collapse-nonfree.ogg +%%DATADIR%%/sound-crack.ogg +%%DATADIR%%/sound-death.ogg +%%DATADIR%%/sound-explode-big.ogg +%%DATADIR%%/sound-explode-small.ogg +%%DATADIR%%/sound-floater-enter.ogg +%%DATADIR%%/sound-found-antiice-nonfree.ogg +%%DATADIR%%/sound-found-jump-nonfree.ogg +%%DATADIR%%/sound-ice.ogg +%%DATADIR%%/sound-laser.ogg +%%DATADIR%%/sound-lift-down-nonfree.ogg +%%DATADIR%%/sound-lift-up-nonfree.ogg +%%DATADIR%%/sound-spinner-nonfree.ogg +%%DATADIR%%/sound-trampoline.ogg +%%DATADIR%%/sound-used-antiice.ogg +%%DATADIR%%/sound-used-jump.ogg +%%DATADIR%%/sound-win.ogg +%%DATADIR%%/tiles.dat +%%DATADIR%%/tiles_reflect.dat +%%DATADIR%%/title.dat @dirrm %%DATADIR%% Index: games/hex-a-hop/files/patch-Makefile.FreeBSD =================================================================== RCS file: games/hex-a-hop/files/patch-Makefile.FreeBSD diff -N games/hex-a-hop/files/patch-Makefile.FreeBSD --- games/hex-a-hop/files/patch-Makefile.FreeBSD 20 Sep 2006 11:21:08 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,19 +0,0 @@ ---- Makefile.FreeBSD.orig Tue Sep 12 17:28:37 2006 -+++ Makefile.FreeBSD Tue Sep 12 17:28:53 2006 -@@ -11,13 +11,13 @@ - .endif - - hex-a-hop: gfx.o hex_puzzzle.o -- $(CXX) $(CXXFLAGS) gfx.o hex_puzzzle.o `sdl11-config --libs` -lm -o hex-a-hop -+ $(CXX) $(CXXFLAGS) gfx.o hex_puzzzle.o `sdl-config --libs` -lm -o hex-a-hop - - gfx.o: gfx.cpp state.h -- $(CC) $(CXXFLAGS) `sdl11-config --cflags` -c -o $@ $< -+ $(CC) $(CXXFLAGS) `sdl-config --cflags` -c -o $@ $< - - hex_puzzzle.o: hex_puzzzle.cpp *.h -- $(CC) $(CXXFLAGS) `sdl11-config --cflags` -c -o $@ $< -+ $(CC) $(CXXFLAGS) `sdl-config --cflags` -c -o $@ $< - - clean : - rm -f gfx.o hex_puzzzle.o hex-a-hop Index: games/hex-a-hop/files/patch-hex_puzzzle.cpp =================================================================== RCS file: games/hex-a-hop/files/patch-hex_puzzzle.cpp diff -N games/hex-a-hop/files/patch-hex_puzzzle.cpp --- games/hex-a-hop/files/patch-hex_puzzzle.cpp 30 Sep 2008 09:20:15 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- hex_puzzzle.cpp.orig 2006-02-21 07:12:34.000000000 +0300 -+++ hex_puzzzle.cpp 2008-09-14 21:34:14.296378652 +0400 -@@ -2313,7 +2313,7 @@ - - SDL_Surface* Load(const char * bmp, bool colourKey=true) - { -- typedef unsigned long uint32; -+ typedef unsigned int uint32; - uint32* tmp = 0; - - SDL_Surface * g = 0; Index: games/hex-a-hop/files/patch-menus.h =================================================================== RCS file: games/hex-a-hop/files/patch-menus.h diff -N games/hex-a-hop/files/patch-menus.h --- games/hex-a-hop/files/patch-menus.h 30 Sep 2008 09:20:15 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- menus.h.orig 2006-02-21 06:10:35.000000000 +0300 -+++ menus.h 2008-09-14 21:34:41.711083734 +0400 -@@ -1073,7 +1073,7 @@ - if (under) - under->Render(); - -- RenderFade(time, dir, (int)this); -+ RenderFade(time, dir, reinterpret_cast<intptr_t>(this)); - } - void Update(double timedelta) - { Index: games/hex-a-hop/files/patch-src-i18n.h =================================================================== RCS file: games/hex-a-hop/files/patch-src-i18n.h diff -N games/hex-a-hop/files/patch-src-i18n.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ games/hex-a-hop/files/patch-src-i18n.h 28 Aug 2010 19:38:38 -0000 @@ -0,0 +1,10 @@ +--- src/i18n.h~ ++++ src/i18n.h +@@ -20,6 +20,7 @@ + + #ifdef USE_GETTEXT + ++#include <iconv.h> + #include <libintl.h> + #define _(String) gettext (String) + Index: games/hex-a-hop/files/patch-src-system-relative.c =================================================================== RCS file: games/hex-a-hop/files/patch-src-system-relative.c diff -N games/hex-a-hop/files/patch-src-system-relative.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ games/hex-a-hop/files/patch-src-system-relative.c 28 Aug 2010 19:45:09 -0000 @@ -0,0 +1,20 @@ +--- src/system-relative.c~ ++++ src/system-relative.c +@@ -163,6 +163,8 @@ lisys_relative_exename () + } + + return strdup (name); ++#elif __FreeBSD__ ++ return getprogname(); + #else + #warning "Not supported." + return NULL; +@@ -177,7 +179,7 @@ lisys_relative_exename () + char* + lisys_relative_exedir () + { +-#if defined WIN32 || defined linux ++#if defined WIN32 || defined linux || defined __FreeBSD__ + char* tmp; + char* ptr; + Index: games/hex-a-hop/files/patch-state.h =================================================================== RCS file: games/hex-a-hop/files/patch-state.h diff -N games/hex-a-hop/files/patch-state.h --- games/hex-a-hop/files/patch-state.h 20 Sep 2006 11:21:08 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- state.h.orig Tue Sep 12 17:30:34 2006 -+++ state.h Tue Sep 12 17:30:40 2006 -@@ -22,7 +22,7 @@ - - // LINUX: SDL/ - #ifdef __FreeBSD__ --#include <SDL11/SDL.h> -+#include <SDL/SDL.h> - #else - #include <SDL/SDL.h> - #endif --- a.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?86k4na1m9i.fsf>