svn commit: r357377 - in head/games/xlogical: . files
John Marino
marino at FreeBSD.org
Tue Jun 10 20:49:55 UTC 2014
Author: marino
Date: Tue Jun 10 20:49:51 2014
New Revision: 357377
URL: http://svnweb.freebsd.org/changeset/ports/357377
QAT: https://qat.redports.org/buildarchive/r357377/
Log:
games/xlogical: stage support and unbreak on F10+
This port needed a lot more help than the PR indicated:
* Full stage support
* DESTDIR had to be patched in, there was only a placeholder
* It didn't build on clang because there was no header for rand function
* Almost very patch had DOS carriage returns (stripped)
* Needed USES+=dos2unix so patches apply (caused revbump)
* NOPORTDOCS needed to be replaced by PORT_OPTIONS - DOCS
* post-extract target was muted, as is the norm
* Previous install patches reworked to fit STAGE support better
The PR updated:
* Use of autotools
* conversion of USE_GMAKE and USE_BZIP2 was done previously
* GPLv2 license was added
PR: 188798
Submitted by: maintainer (Aaron Baugher)
Rest by: marino
Added:
head/games/xlogical/files/patch-images_Makefile.am (contents, props changed)
head/games/xlogical/files/patch-music_Makefile.am (contents, props changed)
head/games/xlogical/files/patch-sound_Makefile.am (contents, props changed)
head/games/xlogical/files/patch-tile__spinner.cpp (contents, props changed)
Deleted:
head/games/xlogical/files/patch-install-images
Modified:
head/games/xlogical/Makefile
head/games/xlogical/files/patch-Makefile.am
head/games/xlogical/files/patch-gpl.h
head/games/xlogical/files/patch-graph_images.cpp
head/games/xlogical/files/patch-levelmap.cpp
head/games/xlogical/files/patch-mapedit.cpp
head/games/xlogical/files/patch-menuentry.cpp
head/games/xlogical/files/patch-music_files.cpp
head/games/xlogical/files/patch-sound_files.cpp
Modified: head/games/xlogical/Makefile
==============================================================================
--- head/games/xlogical/Makefile Tue Jun 10 20:49:24 2014 (r357376)
+++ head/games/xlogical/Makefile Tue Jun 10 20:49:51 2014 (r357377)
@@ -3,7 +3,7 @@
PORTNAME= xlogical
PORTVERSION= 1.0p8
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= games
MASTER_SITES= http://changeling.ixionstudios.com/xlogical/downloads/ \
http://freebsd.portsreview.info/downloads/
@@ -12,19 +12,26 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/p/
MAINTAINER= aaron at baugher.biz
COMMENT= Remake of the classic puzzle game Logical
-USES= gmake tar:bzip2
+LICENSE= GPLv2
+
+USES= gmake tar:bzip2 dos2unix
+USE_AUTOTOOLS= aclocal automake autoconf
+AUTOMAKE_ARGS= --add-missing
USE_SDL= sdl image mixer
GNU_CONFIGURE= yes
-NO_STAGE= yes
+OPTIONS_DEFINE= DOCS
+
+.include <bsd.port.options.mk>
+
post-extract:
- ${CHMOD} 755 ${WRKSRC}/missing
- ${RM} ${WRKSRC}/LICENSE
+ @${CHMOD} 755 ${WRKSRC}/missing
+ @${RM} ${WRKSRC}/LICENSE
post-install:
-.ifndef NOPORTDOCS
- ${MKDIR} ${DOCSDIR}
- ${CP} ${WRKSRC}/[A-Z][A-Z]* ${DOCSDIR}
+.if ${PORT_OPTIONS:MDOCS}
+ ${MKDIR} ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/[A-Z][A-Z]* ${STAGEDIR}${DOCSDIR}
.endif
.include <bsd.port.mk>
Modified: head/games/xlogical/files/patch-Makefile.am
==============================================================================
--- head/games/xlogical/files/patch-Makefile.am Tue Jun 10 20:49:24 2014 (r357376)
+++ head/games/xlogical/files/patch-Makefile.am Tue Jun 10 20:49:51 2014 (r357377)
@@ -1,10 +1,29 @@
---- Makefile.am.orig 2007-11-05 20:42:20.000000000 +0100
-+++ Makefile.am 2007-11-05 20:42:57.000000000 +0100
-@@ -7,6 +7,7 @@
+--- Makefile.am.orig 2014-06-10 17:24:39.000000000 +0000
++++ Makefile.am
+@@ -7,18 +7,15 @@ SCOREFILE = xlogical.scores
FILEOWNER = bin
FILEGROUP = games
install-exec-am: $(bin_PROGRAMS)
-+ cp ${bin_PROGRAMS} ${bindir}/xlogical
- -chown $(FILEOWNER):$(FILEGROUP) $(bindir)/xlogical
- chmod 2755 $(bindir)/xlogical
+- -chown $(FILEOWNER):$(FILEGROUP) $(bindir)/xlogical
+- chmod 2755 $(bindir)/xlogical
++ $(BSD_INSTALL_PROGRAM) $(bin_PROGRAMS) $(DESTDIR)$(bindir)/xlogical
install-data-am: $(DATAFILES) $(SCOREFILE)
+- $(SHELL) ./mkinstalldirs $(datadir)/xlogical
+- cp $(DATAFILES) $(datadir)/xlogical
+- chmod 640 $(datadir)/xlogical/xlogical.levels
+- chmod 644 $(datadir)/xlogical/xlogical.properties
+- -chown -R $(FILEOWNER):$(FILEGROUP) $(datadir)/xlogical
+- $(SHELL) ./mkinstalldirs $(localstatedir)/xlogical
+- cp $(SCOREFILE) $(localstatedir)/xlogical
+- -chown $(FILEOWNER):$(FILEGROUP) $(localstatedir)/xlogical/xlogical.scores
+- chmod 660 $(localstatedir)/xlogical/xlogical.scores
++ $(SHELL) ./mkinstalldirs $(DESTDIR)$(datadir)/xlogical
++ $(BSD_INSTALL_DATA) $(DATAFILES) $(DESTDIR)$(datadir)/xlogical
++ chmod 640 $(DESTDIR)$(datadir)/xlogical/xlogical.levels
++ chmod 644 $(DESTDIR)$(datadir)/xlogical/xlogical.properties
++ $(SHELL) ./mkinstalldirs $(DESTDIR)$(localstatedir)/xlogical
++ $(BSD_INSTALL_DATA) $(SCOREFILE) $(DESTDIR)$(localstatedir)/xlogical
++ chmod 660 $(DESTDIR)$(localstatedir)/xlogical/xlogical.scores
+ uninstall:
+ rm -f $(datadir)/xlogical/xlogical.levels
+ rm -f $(datadir)/xlogical/xlogical.properties
Modified: head/games/xlogical/files/patch-gpl.h
==============================================================================
--- head/games/xlogical/files/patch-gpl.h Tue Jun 10 20:49:24 2014 (r357376)
+++ head/games/xlogical/files/patch-gpl.h Tue Jun 10 20:49:51 2014 (r357377)
@@ -1,11 +1,11 @@
--- gpl.h.orig 2007-11-05 23:45:33.000000000 +0100
+++ gpl.h 2007-11-05 23:45:40.000000000 +0100
@@ -20,7 +20,7 @@
- //
- ////////////////////////////////////////////////////////////////////////
-
--char *gpl[] = {
-+const char *gpl[] = {
- "GNU GENERAL PUBLIC LICENSE",
- "TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION",
- " ",
+ //
+ ////////////////////////////////////////////////////////////////////////
+
+-char *gpl[] = {
++const char *gpl[] = {
+ "GNU GENERAL PUBLIC LICENSE",
+ "TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION",
+ " ",
Modified: head/games/xlogical/files/patch-graph_images.cpp
==============================================================================
--- head/games/xlogical/files/patch-graph_images.cpp Tue Jun 10 20:49:24 2014 (r357376)
+++ head/games/xlogical/files/patch-graph_images.cpp Tue Jun 10 20:49:51 2014 (r357377)
@@ -1,11 +1,11 @@
--- graph_images.cpp.orig 2007-11-06 00:02:06.000000000 +0100
+++ graph_images.cpp 2007-11-06 00:02:21.000000000 +0100
@@ -22,7 +22,7 @@
-
- #include "defs.h"
-
--char *imageFiles[] = {
-+const char *imageFiles[] = {
- DATA_DIR PATHSEP "images" PATHSEP "arrow_d.bmp",
- DATA_DIR PATHSEP "images" PATHSEP "arrow_l.bmp",
- DATA_DIR PATHSEP "images" PATHSEP "arrow_r.bmp",
+
+ #include "defs.h"
+
+-char *imageFiles[] = {
++const char *imageFiles[] = {
+ DATA_DIR PATHSEP "images" PATHSEP "arrow_d.bmp",
+ DATA_DIR PATHSEP "images" PATHSEP "arrow_l.bmp",
+ DATA_DIR PATHSEP "images" PATHSEP "arrow_r.bmp",
Added: head/games/xlogical/files/patch-images_Makefile.am
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/games/xlogical/files/patch-images_Makefile.am Tue Jun 10 20:49:51 2014 (r357377)
@@ -0,0 +1,17 @@
+--- images/Makefile.am.orig 2014-06-10 19:57:22.000000000 +0000
++++ images/Makefile.am
+@@ -3,10 +3,10 @@
+ SHELL=@SHELL@
+
+ install-data-am:
+- $(SHELL) ./../mkinstalldirs $(datadir)/xlogical
+- $(SHELL) ./../mkinstalldirs $(datadir)/xlogical/images
+- cp *.{bmp,jpg} $(datadir)/xlogical/images
+- chmod 644 $(datadir)/xlogical/images/*.{bmp,jpg}
++ $(SHELL) ./../mkinstalldirs $(DESTDIR)$(datadir)/xlogical
++ $(SHELL) ./../mkinstalldirs $(DESTDIR)$(datadir)/xlogical/images
++ $(BSD_INSTALL_DATA) *.bmp *.jpg $(DESTDIR)$(datadir)/xlogical/images
++ chmod 644 $(DESTDIR)$(datadir)/xlogical/images/*
+ uninstall:
+ rm -f $(datadir)/xlogical/images/*.{bmp,jpg}
+ rmdir $(datadir)/xlogical/images
Modified: head/games/xlogical/files/patch-levelmap.cpp
==============================================================================
--- head/games/xlogical/files/patch-levelmap.cpp Tue Jun 10 20:49:24 2014 (r357376)
+++ head/games/xlogical/files/patch-levelmap.cpp Tue Jun 10 20:49:51 2014 (r357377)
@@ -1,20 +1,20 @@
--- levelmap.cpp.orig 2007-11-06 00:03:04.000000000 +0100
+++ levelmap.cpp 2007-11-06 00:07:30.000000000 +0100
@@ -199,7 +199,7 @@
- };
-
- // Possible text tokens in the map text
--char *tokenStrings[] = {
-+const char *tokenStrings[] = {
- "notoken",
- "{",
- "}",
+ };
+
+ // Possible text tokens in the map text
+-char *tokenStrings[] = {
++const char *tokenStrings[] = {
+ "notoken",
+ "{",
+ "}",
@@ -1225,7 +1225,7 @@
- #endif
- for( int i = 0; i < NUM_EXTERNAL_TOKENS; i ++ )
- {
-- tokenMap[tokenStrings[i]] = i;
-+ tokenMap[(char *)tokenStrings[i]] = i;
- }
- }
-
+ #endif
+ for( int i = 0; i < NUM_EXTERNAL_TOKENS; i ++ )
+ {
+- tokenMap[tokenStrings[i]] = i;
++ tokenMap[(char *)tokenStrings[i]] = i;
+ }
+ }
+
Modified: head/games/xlogical/files/patch-mapedit.cpp
==============================================================================
--- head/games/xlogical/files/patch-mapedit.cpp Tue Jun 10 20:49:24 2014 (r357376)
+++ head/games/xlogical/files/patch-mapedit.cpp Tue Jun 10 20:49:51 2014 (r357377)
@@ -1,88 +1,88 @@
--- mapedit.cpp.orig 2007-11-06 00:24:09.000000000 +0100
+++ mapedit.cpp 2007-11-06 00:24:48.000000000 +0100
@@ -405,22 +405,22 @@
- }
- if( ! (flags & SEEN_START) )
- {
-- errScroll.render_string( "Start Tile Needed", 300, 0 );
-+ errScroll.render_string((char *) "Start Tile Needed", 300, 0 );
- }
-
- if( ! (flags & SEEN_SPINNER) )
- {
-- errScroll.render_string( "Spinner Needed", 300, 10 );
-+ errScroll.render_string((char *) "Spinner Needed", 300, 10 );
- }
-
- if( (leftCount % 2) || (upCount % 2) )
- {
-- errScroll.render_string( "Unmatched Teleporters", 300, 20 );
-+ errScroll.render_string((char *) "Unmatched Teleporters", 300, 20 );
- }
-
- if( (leftCount > 2) || (upCount > 2) )
- {
-- errScroll.render_string( "Too Many Teleporters", 450, 0 );
-+ errScroll.render_string((char *) "Too Many Teleporters", 450, 0 );
- }
-
- sprintf( cstr, "MAP NAME: %s", CURMAP->mapName );
+ }
+ if( ! (flags & SEEN_START) )
+ {
+- errScroll.render_string( "Start Tile Needed", 300, 0 );
++ errScroll.render_string((char *) "Start Tile Needed", 300, 0 );
+ }
+
+ if( ! (flags & SEEN_SPINNER) )
+ {
+- errScroll.render_string( "Spinner Needed", 300, 10 );
++ errScroll.render_string((char *) "Spinner Needed", 300, 10 );
+ }
+
+ if( (leftCount % 2) || (upCount % 2) )
+ {
+- errScroll.render_string( "Unmatched Teleporters", 300, 20 );
++ errScroll.render_string((char *) "Unmatched Teleporters", 300, 20 );
+ }
+
+ if( (leftCount > 2) || (upCount > 2) )
+ {
+- errScroll.render_string( "Too Many Teleporters", 450, 0 );
++ errScroll.render_string((char *) "Too Many Teleporters", 450, 0 );
+ }
+
+ sprintf( cstr, "MAP NAME: %s", CURMAP->mapName );
@@ -481,13 +481,13 @@
- {
-
- graphDriver->graph_hi_font( )->
-- render_string("UP",
-+ render_string((char *) "UP",
- NUM_COLS*TILESIZE + MENU_SEP + 60,
- TOP_MAP_OFFSET + SPACER + 15 );
- } else {
- // Draw the label
- graphDriver->graph_lo_font( )->
-- render_string("UP",
-+ render_string((char *) "UP",
- NUM_COLS*TILESIZE + MENU_SEP + 60,
- TOP_MAP_OFFSET + SPACER + 15 );
- }
+ {
+
+ graphDriver->graph_hi_font( )->
+- render_string("UP",
++ render_string((char *) "UP",
+ NUM_COLS*TILESIZE + MENU_SEP + 60,
+ TOP_MAP_OFFSET + SPACER + 15 );
+ } else {
+ // Draw the label
+ graphDriver->graph_lo_font( )->
+- render_string("UP",
++ render_string((char *) "UP",
+ NUM_COLS*TILESIZE + MENU_SEP + 60,
+ TOP_MAP_OFFSET + SPACER + 15 );
+ }
@@ -497,13 +497,13 @@
- {
- // Draw the label
- graphDriver->graph_hi_font( )->
-- render_string("DOWN",
-+ render_string((char *) "DOWN",
- NUM_COLS*TILESIZE+MENU_SEP + 27,
- MENU_NUM_ROWS*TILESIZE + MENU_Y_OFFSET + SPACER + 13);
- } else {
- // Draw the label
- graphDriver->graph_lo_font( )->
-- render_string("DOWN",
-+ render_string((char *) "DOWN",
- NUM_COLS*TILESIZE+MENU_SEP + 27,
- MENU_NUM_ROWS*TILESIZE + MENU_Y_OFFSET + SPACER + 13);
- }
+ {
+ // Draw the label
+ graphDriver->graph_hi_font( )->
+- render_string("DOWN",
++ render_string((char *) "DOWN",
+ NUM_COLS*TILESIZE+MENU_SEP + 27,
+ MENU_NUM_ROWS*TILESIZE + MENU_Y_OFFSET + SPACER + 13);
+ } else {
+ // Draw the label
+ graphDriver->graph_lo_font( )->
+- render_string("DOWN",
++ render_string((char *) "DOWN",
+ NUM_COLS*TILESIZE+MENU_SEP + 27,
+ MENU_NUM_ROWS*TILESIZE + MENU_Y_OFFSET + SPACER + 13);
+ }
@@ -682,7 +682,7 @@
- 5 );
-
- graphDriver->graph_hi_font( )->
-- render_string("MAP",
-+ render_string((char *) "MAP",
- NUM_COLS*TILESIZE + MENU_SEP + 43,
- 0 );
-
+ 5 );
+
+ graphDriver->graph_hi_font( )->
+- render_string("MAP",
++ render_string((char *) "MAP",
+ NUM_COLS*TILESIZE + MENU_SEP + 43,
+ 0 );
+
@@ -698,7 +698,7 @@
- graphDriver->graph_draw( BMP_BALL_C2,
- NUM_COLS*TILESIZE - 150,
- NUM_ROWS * TILESIZE + 39 );
-- errScroll.render_string( "Quit WITHOUT Saving",
-+ errScroll.render_string((char *) "Quit WITHOUT Saving",
- NUM_COLS*TILESIZE - 150 + 20,
- NUM_ROWS * TILESIZE + 44 );
-
+ graphDriver->graph_draw( BMP_BALL_C2,
+ NUM_COLS*TILESIZE - 150,
+ NUM_ROWS * TILESIZE + 39 );
+- errScroll.render_string( "Quit WITHOUT Saving",
++ errScroll.render_string((char *) "Quit WITHOUT Saving",
+ NUM_COLS*TILESIZE - 150 + 20,
+ NUM_ROWS * TILESIZE + 44 );
+
@@ -706,7 +706,7 @@
- graphDriver->graph_draw( BMP_BALL_C2,
- NUM_COLS*TILESIZE + 60,
- NUM_ROWS * TILESIZE + 39);
-- errScroll.render_string( "Quit And Save",
-+ errScroll.render_string((char *) "Quit And Save",
- NUM_COLS*TILESIZE + 80,
- NUM_ROWS * TILESIZE + 44 );
- }
+ graphDriver->graph_draw( BMP_BALL_C2,
+ NUM_COLS*TILESIZE + 60,
+ NUM_ROWS * TILESIZE + 39);
+- errScroll.render_string( "Quit And Save",
++ errScroll.render_string((char *) "Quit And Save",
+ NUM_COLS*TILESIZE + 80,
+ NUM_ROWS * TILESIZE + 44 );
+ }
Modified: head/games/xlogical/files/patch-menuentry.cpp
==============================================================================
--- head/games/xlogical/files/patch-menuentry.cpp Tue Jun 10 20:49:24 2014 (r357376)
+++ head/games/xlogical/files/patch-menuentry.cpp Tue Jun 10 20:49:51 2014 (r357377)
@@ -1,28 +1,28 @@
--- menuentry.cpp.orig 2007-11-06 00:04:44.000000000 +0100
+++ menuentry.cpp 2007-11-06 00:06:49.000000000 +0100
@@ -104,14 +104,14 @@
- if (fOnOff)
- {
- font->render_string(
-- "*",
-+ (char *)"*",
- fX + graphDriver->graph_hi_font( )->stringLen( const_cast<char *>(fText.c_str() ) ),
- fY );
- } else {
- graphDriver->graph_clear_rect(
- fX + graphDriver->graph_hi_font()->stringLen( const_cast<char *>(fText.c_str() ) ),
- fY,
-- graphDriver->graph_hi_font()->stringLen( "*" ),
-+ graphDriver->graph_hi_font()->stringLen((char *) "*" ),
- graphDriver->graph_hi_font()->get_height() );
- }
-
+ if (fOnOff)
+ {
+ font->render_string(
+- "*",
++ (char *)"*",
+ fX + graphDriver->graph_hi_font( )->stringLen( const_cast<char *>(fText.c_str() ) ),
+ fY );
+ } else {
+ graphDriver->graph_clear_rect(
+ fX + graphDriver->graph_hi_font()->stringLen( const_cast<char *>(fText.c_str() ) ),
+ fY,
+- graphDriver->graph_hi_font()->stringLen( "*" ),
++ graphDriver->graph_hi_font()->stringLen((char *) "*" ),
+ graphDriver->graph_hi_font()->get_height() );
+ }
+
@@ -131,7 +131,7 @@
- graphDriver->graph_clear_rect(
- fX + graphDriver->graph_hi_font()->stringLen( const_cast<char *>(fText.c_str() ) ),
- fY,
-- graphDriver->graph_hi_font()->stringLen( "*" ),
-+ graphDriver->graph_hi_font()->stringLen((char *) "*" ),
- graphDriver->graph_hi_font()->get_height() );
-
- switch( aKeyval )
+ graphDriver->graph_clear_rect(
+ fX + graphDriver->graph_hi_font()->stringLen( const_cast<char *>(fText.c_str() ) ),
+ fY,
+- graphDriver->graph_hi_font()->stringLen( "*" ),
++ graphDriver->graph_hi_font()->stringLen((char *) "*" ),
+ graphDriver->graph_hi_font()->get_height() );
+
+ switch( aKeyval )
Added: head/games/xlogical/files/patch-music_Makefile.am
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/games/xlogical/files/patch-music_Makefile.am Tue Jun 10 20:49:51 2014 (r357377)
@@ -0,0 +1,17 @@
+--- music/Makefile.am.orig 2014-06-10 17:24:39.000000000 +0000
++++ music/Makefile.am
+@@ -3,10 +3,10 @@
+ SHELL=@SHELL@
+
+ install-data-am:
+- $(SHELL) ./../mkinstalldirs $(datadir)/xlogical
+- $(SHELL) ./../mkinstalldirs $(datadir)/xlogical/music
+- cp *.mod $(datadir)/xlogical/music
+- chmod 644 $(datadir)/xlogical/music/*.mod
++ $(SHELL) ./../mkinstalldirs $(DESTDIR)$(datadir)/xlogical
++ $(SHELL) ./../mkinstalldirs $(DESTDIR)$(datadir)/xlogical/music
++ $(BSD_INSTALL_DATA) *.mod $(DESTDIR)$(datadir)/xlogical/music
++ chmod 644 $(DESTDIR)$(datadir)/xlogical/music/*.mod
+ uninstall:
+ rm -f $(datadir)/xlogical/music/*.mod
+ rmdir $(datadir)/xlogical/music
Modified: head/games/xlogical/files/patch-music_files.cpp
==============================================================================
--- head/games/xlogical/files/patch-music_files.cpp Tue Jun 10 20:49:24 2014 (r357376)
+++ head/games/xlogical/files/patch-music_files.cpp Tue Jun 10 20:49:51 2014 (r357377)
@@ -1,11 +1,11 @@
--- music_files.cpp.orig 2007-11-06 00:07:45.000000000 +0100
+++ music_files.cpp 2007-11-06 00:08:06.000000000 +0100
@@ -22,7 +22,7 @@
-
- #include "defs.h"
-
--char *musicFiles[] = {
-+const char *musicFiles[] = {
- DATA_DIR PATHSEP "music" PATHSEP "intro.mod",
- DATA_DIR PATHSEP "music" PATHSEP "pregame.mod",
- DATA_DIR PATHSEP "music" PATHSEP "ingame.mod",
+
+ #include "defs.h"
+
+-char *musicFiles[] = {
++const char *musicFiles[] = {
+ DATA_DIR PATHSEP "music" PATHSEP "intro.mod",
+ DATA_DIR PATHSEP "music" PATHSEP "pregame.mod",
+ DATA_DIR PATHSEP "music" PATHSEP "ingame.mod",
Added: head/games/xlogical/files/patch-sound_Makefile.am
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/games/xlogical/files/patch-sound_Makefile.am Tue Jun 10 20:49:51 2014 (r357377)
@@ -0,0 +1,17 @@
+--- sound/Makefile.am.orig 2014-06-10 17:24:39.000000000 +0000
++++ sound/Makefile.am
+@@ -3,10 +3,10 @@
+ SHELL=@SHELL@
+
+ install-data-am:
+- $(SHELL) ./../mkinstalldirs $(datadir)/xlogical
+- $(SHELL) ./../mkinstalldirs $(datadir)/xlogical/sound
+- cp *.wav $(datadir)/xlogical/sound
+- chmod 644 $(datadir)/xlogical/sound/*.wav
++ $(SHELL) ./../mkinstalldirs $(DESTDIR)$(datadir)/xlogical
++ $(SHELL) ./../mkinstalldirs $(DESTDIR)$(datadir)/xlogical/sound
++ $(BSD_INSTALL_DATA) *.wav $(DESTDIR)$(datadir)/xlogical/sound
++ chmod 644 $(DESTDIR)$(datadir)/xlogical/sound/*.wav
+ uninstall:
+ rm -f $(datadir)/xlogical/sound/*.wav
+ rmdir $(datadir)/xlogical/sound
Modified: head/games/xlogical/files/patch-sound_files.cpp
==============================================================================
--- head/games/xlogical/files/patch-sound_files.cpp Tue Jun 10 20:49:24 2014 (r357376)
+++ head/games/xlogical/files/patch-sound_files.cpp Tue Jun 10 20:49:51 2014 (r357377)
@@ -1,11 +1,11 @@
--- sound_files.cpp.orig 2007-11-06 00:08:33.000000000 +0100
+++ sound_files.cpp 2007-11-06 00:08:45.000000000 +0100
@@ -22,7 +22,7 @@
-
- #include "defs.h"
-
--char *soundFiles[] = {
-+const char *soundFiles[] = {
- DATA_DIR PATHSEP "sound" PATHSEP "block_ball.wav",
- DATA_DIR PATHSEP "sound" PATHSEP "bonus_life.wav",
- DATA_DIR PATHSEP "sound" PATHSEP "catch_ball.wav",
+
+ #include "defs.h"
+
+-char *soundFiles[] = {
++const char *soundFiles[] = {
+ DATA_DIR PATHSEP "sound" PATHSEP "block_ball.wav",
+ DATA_DIR PATHSEP "sound" PATHSEP "bonus_life.wav",
+ DATA_DIR PATHSEP "sound" PATHSEP "catch_ball.wav",
Added: head/games/xlogical/files/patch-tile__spinner.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/games/xlogical/files/patch-tile__spinner.cpp Tue Jun 10 20:49:51 2014 (r357377)
@@ -0,0 +1,28 @@
+--- tile_spinner.cpp.orig 2014-06-10 17:24:39.000000000 +0000
++++ tile_spinner.cpp
+@@ -21,6 +21,7 @@
+ ////////////////////////////////////////////////////////////////////////
+
+
++#include <cstdlib>
+
+
+ // Application Includes
+@@ -46,7 +47,7 @@ Ctile_spinner::Ctile_spinner( void )
+ finished = 0;
+ finishing_hopper = -1;
+ flashOn = 0;
+- flashWait = rand( ) % 5;
++ flashWait = std::rand( ) % 5;
+
+ // Reset the hopper
+ hopper[0] = NULL;
+@@ -477,7 +478,7 @@ Ctile_spinner::check_complete( void )
+ if( CURMAP->randOrder == 1 )
+ {
+ // Randomize a new color
+- CURMAP->order[2] = (color_t)(rand( )%4 + 1);
++ CURMAP->order[2] = (color_t)(std::rand( )%4 + 1);
+ } else {
+ // Set the next one to null
+ CURMAP->order[2] = NO_COLOR;
More information about the svn-ports-head
mailing list