head 1.3; access; symbols pkgsrc-2013Q2:1.3.0.2 pkgsrc-2013Q2-base:1.3 pkgsrc-2012Q4:1.2.0.10 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.8 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.6 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.2.0.4 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.2 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.1.0.76 pkgsrc-2011Q3-base:1.1 pkgsrc-2011Q2:1.1.0.74 pkgsrc-2011Q2-base:1.1 pkgsrc-2011Q1:1.1.0.72 pkgsrc-2011Q1-base:1.1 pkgsrc-2010Q4:1.1.0.70 pkgsrc-2010Q4-base:1.1 pkgsrc-2010Q3:1.1.0.68 pkgsrc-2010Q3-base:1.1 pkgsrc-2010Q2:1.1.0.66 pkgsrc-2010Q2-base:1.1 pkgsrc-2010Q1:1.1.0.64 pkgsrc-2010Q1-base:1.1 pkgsrc-2009Q4:1.1.0.62 pkgsrc-2009Q4-base:1.1 pkgsrc-2009Q3:1.1.0.60 pkgsrc-2009Q3-base:1.1 pkgsrc-2009Q2:1.1.0.58 pkgsrc-2009Q2-base:1.1 pkgsrc-2009Q1:1.1.0.56 pkgsrc-2009Q1-base:1.1 pkgsrc-2008Q4:1.1.0.54 pkgsrc-2008Q4-base:1.1 pkgsrc-2008Q3:1.1.0.52 pkgsrc-2008Q3-base:1.1 cube-native-xorg:1.1.0.50 cube-native-xorg-base:1.1 pkgsrc-2008Q2:1.1.0.48 pkgsrc-2008Q2-base:1.1 cwrapper:1.1.0.46 pkgsrc-2008Q1:1.1.0.44 pkgsrc-2008Q1-base:1.1 pkgsrc-2007Q4:1.1.0.42 pkgsrc-2007Q4-base:1.1 pkgsrc-2007Q3:1.1.0.40 pkgsrc-2007Q3-base:1.1 pkgsrc-2007Q2:1.1.0.38 pkgsrc-2007Q2-base:1.1 pkgsrc-2007Q1:1.1.0.36 pkgsrc-2007Q1-base:1.1 pkgsrc-2006Q4:1.1.0.34 pkgsrc-2006Q4-base:1.1 pkgsrc-2006Q3:1.1.0.32 pkgsrc-2006Q3-base:1.1 pkgsrc-2006Q2:1.1.0.30 pkgsrc-2006Q2-base:1.1 pkgsrc-2006Q1:1.1.0.28 pkgsrc-2006Q1-base:1.1 pkgsrc-2005Q4:1.1.0.26 pkgsrc-2005Q4-base:1.1 pkgsrc-2005Q3:1.1.0.24 pkgsrc-2005Q3-base:1.1 pkgsrc-2005Q2:1.1.0.22 pkgsrc-2005Q2-base:1.1 pkgsrc-2005Q1:1.1.0.20 pkgsrc-2005Q1-base:1.1 pkgsrc-2004Q4:1.1.0.18 pkgsrc-2004Q4-base:1.1 pkgsrc-2004Q3:1.1.0.16 pkgsrc-2004Q3-base:1.1 pkgsrc-2004Q2:1.1.0.14 pkgsrc-2004Q2-base:1.1 pkgsrc-2004Q1:1.1.0.12 pkgsrc-2004Q1-base:1.1 pkgsrc-2003Q4:1.1.0.10 pkgsrc-2003Q4-base:1.1 netbsd-1-6-1:1.1.0.6 netbsd-1-6-1-base:1.1 netbsd-1-6:1.1.0.8 netbsd-1-6-RELEASE-base:1.1 pkgviews:1.1.0.4 pkgviews-base:1.1 buildlink2:1.1.0.2 buildlink2-base:1.1 netbsd-1-5-PATCH003:1.1 netbsd-1-5-PATCH001:1.1 netbsd-1-5-RELEASE:1.1 netbsd-1-4-PATCH003:1.1 netbsd-1-4-PATCH002:1.1 comdex-fall-1999:1.1; locks; strict; comment @# @; 1.3 date 2013.01.21.05.19.46; author dholland; state dead; branches; next 1.2; 1.2 date 2011.12.20.16.18.16; author dholland; state Exp; branches; next 1.1; 1.1 date 99.08.11.21.54.22; author tron; state Exp; branches; next ; desc @@ 1.3 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-ah,v 1.2 2011/12/20 16:18:16 dholland Exp $ - handle platforms where char is unsigned (XXX looks suspicious to me) - const correctness demanded by recent gcc --- xfile.hc.orig 2011-12-20 15:13:53.000000000 +0000 +++ xfile.hc @@@@ -12,10 +12,10 @@@@ /*----------------------------------------------------------------------*/ struct conv - {char b0; - char b1; - char b2; - char b3; + {signed char b0; + signed char b1; + signed char b2; + signed char b3; }; union conv_data @@@@ -29,7 +29,7 @@@@ union conv_data /* General functions */ /*----------------------------------------------------------------------*/ -bool f_exists (char file_name []) +bool f_exists (const char file_name []) {FILE *f; bool is_error; @@@@ -60,7 +60,7 @@@@ double d_get (FILE *f, bool &is_eof) } -void f_open (FILE *&f, char name [], char mode []) +void f_open (FILE *&f, const char name [], const char mode []) {f = fopen (name, mode); check_error; @@@@ -74,7 +74,7 @@@@ void f_open (FILE *&f, char name [], cha } -void f_open_with_extend (FILE *&f, char name [], char mode [], int max_no) +void f_open_with_extend (FILE *&f, const char name [], const char mode [], int max_no) {int version; char v_name [128]; @@@@ -113,7 +113,7 @@@@ char *f_getline (FILE *f, char record [] return r; } -time_t f_date (char file_name []) +time_t f_date (const char file_name []) { } /* @@@@ -124,7 +124,7 @@@@ time_t f_date (char file_name []) } */ -char *f_name (char full_path []) +char *f_name (const char full_path []) {static char r [1024]; int i; @@@@ -136,7 +136,7 @@@@ char *f_name (char full_path []) return r; } -char *f_path (char full_path []) +char *f_path (const char full_path []) {static char r [1024]; int p = 0; @@@@ -150,7 +150,7 @@@@ char *f_path (char full_path []) return r; } -char *f_tail (char full_path []) +char *f_tail (const char full_path []) {static char r [1024]; if (f_is_dir (full_path)) @@@@ -168,30 +168,30 @@@@ char *f_tail (char full_path []) } -char *f_home_dir (char full_name []) +char *f_home_dir (const char full_name []) {static char result [512]; sprintf (result, "/home/%s", &full_name [1]); return result; } -bool f_is_pattern (char f_name []) +bool f_is_pattern (const char f_name []) {return (strstr (f_name, "*") != NULL); } -bool f_is_dir (char file_name []) +bool f_is_dir (const char file_name []) {return (file_name [strlen (file_name)-1] == '/' || file_name [strlen (file_name)-1] == '.'); } -bool f_is_home_dir (char full_name []) +bool f_is_home_dir (const char full_name []) {return full_name [0] == '~'; } -bool sel_get_name (char name [], +bool sel_get_name (const char name [], char f_name [], - char f_pattern [], - char mode []) + const char f_pattern [], + const char mode []) {char pat [256]; file_selector *fsel; @@@@ -260,7 +260,7 @@@@ bool sel_get_name (char name [], } -char *complete (char name [], char tail []) +char *complete (const char name [], const char tail []) {static char r [256]; strcpy (r, name); @ 1.2 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-ah,v 1.1 1999/08/11 21:54:22 tron Exp $ @ 1.1 log @Fix problems caused by author's assumption that 'char' is signed. Patches supplied by Reinoud Zandijk in PR pkg/8143. @ text @d1 1 a1 1 $NetBSD$ d3 5 a7 2 --- xfile.hc.orig Thu Mar 20 09:29:16 1997 +++ xfile.hc Wed Aug 4 14:42:46 1999 d23 110 @