head 1.4; access; symbols pkgsrc-2013Q2:1.4.0.2 pkgsrc-2013Q2-base:1.4 pkgsrc-2012Q4:1.3.0.10 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.8 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.6 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.4 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.3.0.2 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.2.0.76 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.74 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.72 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.70 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.68 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.66 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.64 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.62 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.60 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.58 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.56 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.54 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.52 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.50 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.48 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.46 pkgsrc-2008Q1:1.2.0.44 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.42 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.40 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.38 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.36 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.34 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.32 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.30 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.28 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.26 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.24 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.22 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.20 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.18 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.16 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.14 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.12 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.2.0.10 pkgsrc-2003Q4-base:1.2 netbsd-1-6-1:1.2.0.6 netbsd-1-6-1-base:1.2 netbsd-1-6:1.2.0.8 netbsd-1-6-RELEASE-base:1.2 pkgviews:1.2.0.4 pkgviews-base:1.2 buildlink2:1.2.0.2 buildlink2-base:1.2 netbsd-1-5-PATCH003:1.2 netbsd-1-5-PATCH001:1.2 netbsd-1-5-RELEASE:1.2 netbsd-1-4-PATCH003:1.2 netbsd-1-4-PATCH002:1.2 comdex-fall-1999:1.2 netbsd-1-4-PATCH001:1.2 netbsd-1-4-RELEASE:1.2 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.4 date 2013.01.21.05.19.46; author dholland; state dead; branches; next 1.3; 1.3 date 2011.12.20.16.18.16; author dholland; state Exp; branches; next 1.2; 1.2 date 98.10.14.08.19.51; author frueauf; state Exp; branches; next 1.1; 1.1 date 98.10.13.00.37.33; author garbled; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 98.10.13.00.37.33; author garbled; state Exp; branches; next ; desc @@ 1.4 log @Roll the existing patches into a distfile patch. In the course of doing so: Fix the fix previously in patch-ah (for platforms where char is unsigned by default) to not generate spurious EOF indications. Improve the fixes previously in patch-a[bcdef] to put the game's state file in $HOME/.craft instead of the current directory. Use a consistent method to set $PREFIX instead of a mixture of compiler flags, patching, and SUBST. Use pkg-config to find libX11, and clean up some pkglint. @ text @$NetBSD: patch-af,v 1.3 2011/12/20 16:18:16 dholland Exp $ - const correctness demanded by newer gcc - look in $HOME for settings file --- paramreader.hc.orig 2011-12-20 16:08:24.000000000 +0000 +++ paramreader.hc @@@@ -32,7 +32,7 @@@@ void check_params (int num_params) /* CLASS paramreader (functions) */ /*----------------------------------------------------------------------*/ -void paramreader::read_sym (char sym [], bool &is_eof) +void paramreader::read_sym (const char sym [], bool &is_eof) {is_eof = false; get_sym; perhaps_skip_comment; @@@@ -88,7 +88,7 @@@@ void paramreader::read_sym (char sym [], } -paramreader::paramreader (char param_file_name []) +paramreader::paramreader (const char param_file_name []) {bool is_eof = false; num_params = 0; @@@@ -101,8 +101,11 @@@@ paramreader::paramreader (char param_fil . open_param_file {char file_name [128]; - strcpy (file_name, param_file_name); + strcpy (file_name, getenv("HOME")); + strcat (file_name, "/"); + strcat (file_name, param_file_name); strcat (file_name, ".params"); + f [0] = fopen (file_name, "r"); num_includes = 1; }. @@@@ -129,7 +132,7 @@@@ void paramreader::dump () printf (">%s< = >%s<\n", name [i], value [i]); } -int paramreader::param_no (char p_name []) +int paramreader::param_no (const char p_name []) {for (int no = 0; no < num_params; no++) if (strcmp (name [no], p_name) == 0) return no; @@@@ -138,15 +141,15 @@@@ int paramreader::param_no (char p_name [ return (0); } -char * paramreader::s_param (char name []) +char * paramreader::s_param (const char name []) {return value [param_no (name)]; } -double paramreader::d_param (char name []) +double paramreader::d_param (const char name []) {return atof (value [param_no (name)]); } -int paramreader::i_param (char name []) +int paramreader::i_param (const char name []) {return atoi (value [param_no (name)]); } @@@@ -158,7 +161,7 @@@@ int paramreader::max_i_name () return max; } -void paramreader::set (char p_name [], char p_value []) +void paramreader::set (const char p_name [], const char p_value []) {int pno = param_no (p_name); strcpy (value [pno], p_value); @ 1.3 log @Assorted fixes and cleanup. - if we're going to supply the build makefile, it shouldn't require gmake. - don't install executable html or gif files - add patch comments - const correctness for string constants, as demanded by gcc 4.5 - avoid needing -lcompat - fix a y2038 issue PKGREVISION -> 2 @ text @d1 1 a1 1 $NetBSD: patch-af,v 1.2 1998/10/14 08:19:51 frueauf Exp $ @ 1.2 log @Add missing rcs id. @ text @d1 1 a1 1 $NetBSD$ d3 24 a26 3 --- paramreader.hc.orig Thu Sep 24 12:00:23 1998 +++ paramreader.hc Thu Sep 24 12:00:59 1998 @@@@ -101,8 +101,11 @@@@ d39 37 @ 1.1 log @Initial revision @ text @d1 2 @ 1.1.1.1 log @Initial import of craft-3.5 a Warcraft-like game for X11 @ text @@