Date: Sun, 30 Mar 2014 16:17:03 +0000 (UTC) From: Dirk Meyer <dinoex@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r349645 - in head/games/xboing: . files Message-ID: <201403301617.s2UGH3R7057916@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dinoex Date: Sun Mar 30 16:17:03 2014 New Revision: 349645 URL: http://svnweb.freebsd.org/changeset/ports/349645 QAT: https://qat.redports.org/buildarchive/r349645/ Log: - make -usedefcmap and sound default now desktops do not need to pass this arguments Obtained from: OpenBSD Added: head/games/xboing/files/patch-init.c (contents, props changed) head/games/xboing/files/patch-xboing.man (contents, props changed) Modified: head/games/xboing/Makefile head/games/xboing/files/patch-debian Modified: head/games/xboing/Makefile ============================================================================== --- head/games/xboing/Makefile Sun Mar 30 16:11:58 2014 (r349644) +++ head/games/xboing/Makefile Sun Mar 30 16:17:03 2014 (r349645) @@ -3,7 +3,7 @@ PORTNAME= xboing PORTVERSION= 2.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_XCONTRIB} MASTER_SITE_SUBDIR= games Modified: head/games/xboing/files/patch-debian ============================================================================== --- head/games/xboing/files/patch-debian Sun Mar 30 16:11:58 2014 (r349644) +++ head/games/xboing/files/patch-debian Sun Mar 30 16:17:03 2014 (r349645) @@ -120,17 +120,6 @@ else strcpy(filename, HIGH_SCORE_FILE); ---- init.c -+++ init.c -@@ -438,7 +438,7 @@ - WarningMessage("Your X Window system display variable is not set."); - else - { -- sprintf(string, "Cannot connect to display called <%s>.", displayName); -+ snprintf(string, sizeof(string) - 1, "Cannot connect to display called <%s>.", displayName); - WarningMessage(string); - } - } --- misc.c +++ misc.c @@ -427,7 +431,7 @@ Added: head/games/xboing/files/patch-init.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/xboing/files/patch-init.c Sun Mar 30 16:17:03 2014 (r349645) @@ -0,0 +1,82 @@ +--- init.c.orig 1996-11-22 02:28:46.000000000 +0100 ++++ init.c 2014-03-30 18:05:40.000000000 +0200 +@@ -438,7 +438,7 @@ + WarningMessage("Your X Window system display variable is not set."); + else + { +- sprintf(string, "Cannot connect to display called <%s>.", displayName); ++ snprintf(string, sizeof(string), "Cannot connect to display called <%s>.", displayName); + WarningMessage(string); + } + } +@@ -471,10 +471,10 @@ + "Usage: XBoing [-version] [-usage] [-help] [-sync] ", + "[-display <displayName>]\n"); + fprintf(stdout, "%s%s\n%s%s\n%s\n", +- " [-speed <1-9>] [-scores] [-keys] [-sound] [-setup]", ++ " [-speed <1-9>] [-scores] [-keys] [-no-sound] [-setup]", + " [-nosfx]", + " [-grab] [-maxvol <1-100>] [-startlevel <1-MAX>]", +- " [-usedefcmap]", ++ " [-no-usedefcmap]", + " [-nickname <name>] [-noicon]"); + + /* Exit now */ +@@ -548,10 +548,11 @@ + " -scores - Print out the current highscores.\n", + " -keys - Use keys instead of mouse control.\n", + " -sound - Turn audio ON for game.\n", ++ " -no-sound - Turn audio OFF for game.\n", + " -setup - Print setup information.\n", + " -nosfx - Do not use some special effects.\n", + " -grab - Turn ON pointer grab.\n", +- " -usedefcmap - Use the default colourmap.\n", ++ " -no-usedefcmap - Don't use the default colourmap.\n", + " -nickname <name> - Use nickname instead of real name.\n", + " -noicon - Do not create a custom icon.\n", + " -display <display> - Set the display for the game.\n"); +@@ -599,13 +600,13 @@ + syncOn = False; + debug = False; + grabPointer = False; +- useDefaultColourmap = False; ++ useDefaultColourmap = True; + + /* This will force the use of the users real name */ + SetNickName(""); + +- /* The audio is off by default */ +- noSound = True; ++ /* The audio is on by default */ ++ noSound = False; + noicon = False; + + /* So the audio code will use system default */ +@@ -687,6 +688,13 @@ + /* Print out the version information and quit */ + PrintVersion(); + ++ } else if (!compareArgument(argv[i], "-no-sound", 8)) ++ { ++ /* Enable the sound in the game */ ++ noSound = True; ++ ++ DEBUG("Sound turned off.") ++ + } else if (!compareArgument(argv[i], "-sound", 5)) + { + /* Enable the sound in the game */ +@@ -751,6 +759,13 @@ + + DEBUG("Using default colourmap please.") + ++ } else if (!compareArgument(argv[i], "-no-usedefcmap", 13)) ++ { ++ /* Try to use the default colourmap */ ++ useDefaultColourmap = False; ++ ++ DEBUG("Not using default colourmap.") ++ + } else if (!compareArgument(argv[i], "-speed", 5)) + { + /* Set the speed for the game */ Added: head/games/xboing/files/patch-xboing.man ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/xboing/files/patch-xboing.man Sun Mar 30 16:17:03 2014 (r349645) @@ -0,0 +1,29 @@ +--- xboing.man.orig 1996-11-22 02:28:46.000000000 +0100 ++++ xboing.man 2014-03-30 18:01:26.000000000 +0200 +@@ -45,7 +45,7 @@ + xboing \- An X Window System based blockout clone. V2.4 + .SH SYNOPSIS + .B xboing +-[-version] [-usage] [-help] [-sync] [-display <displayName>] [-speed <1-10>] [-scores] [-keys] [-sound] [-setup] [-nosfx] [-grab] [-maxvol <1-100>] [-startlevel <1-MAXLEVELS>] [-usedefcmap] [-nickname <name>] [-noicon] ++[-version] [-usage] [-help] [-sync] [-display <displayName>] [-speed <1-10>] [-scores] [-keys] [-no-sound] [-setup] [-nosfx] [-grab] [-maxvol <1-100>] [-startlevel <1-MAXLEVELS>] [-no-usedefcmap] [-nickname <name>] [-noicon] + .IP + -speed <n> - The game speed, 1 - 9. 9=Fast + .br +@@ -67,6 +67,8 @@ + .br + -sound - Turn audio ON for game + .br ++-no-sound - Turn audio OFF for game ++.br + -setup - Print setup information + .br + -nosfx - Turn off special effects +@@ -75,6 +77,8 @@ + .br + -usedefcmap - Use the default colourmap + .br ++-no-usedefcmap - Do not use the default colourmap ++.br + -nickname <name> - Use nickname instead of real one + .br + -noicon - Do not create a custom icon
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403301617.s2UGH3R7057916>