diff options
author | joerg <joerg@pkgsrc.org> | 2012-12-20 22:03:01 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2012-12-20 22:03:01 +0000 |
commit | a08be176f6876e4bd37dbe74eb2706f76594b903 (patch) | |
tree | 43c4676de93832837c8915201aacb214588d90ef /games | |
parent | 08cfc7cace981f5061cdda87c024e4786d94ec9c (diff) | |
download | pkgsrc-a08be176f6876e4bd37dbe74eb2706f76594b903.tar.gz |
Fix use of nested functions. Bump revision.
Diffstat (limited to 'games')
-rw-r--r-- | games/nighthawk/Makefile | 4 | ||||
-rw-r--r-- | games/nighthawk/distinfo | 4 | ||||
-rw-r--r-- | games/nighthawk/patches/patch-ah | 69 |
3 files changed, 71 insertions, 6 deletions
diff --git a/games/nighthawk/Makefile b/games/nighthawk/Makefile index bc4521ca9db..70807544be9 100644 --- a/games/nighthawk/Makefile +++ b/games/nighthawk/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.39 2012/10/06 11:54:48 asau Exp $ +# $NetBSD: Makefile,v 1.40 2012/12/20 22:03:01 joerg Exp $ # DISTNAME= nighthawk-2.1 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= x11 games MASTER_SITES= ${MASTER_SITE_BACKUP} EXTRACT_SUFX= .tgz diff --git a/games/nighthawk/distinfo b/games/nighthawk/distinfo index 91b7b20b498..1b3b3474f5d 100644 --- a/games/nighthawk/distinfo +++ b/games/nighthawk/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.11 2011/12/05 22:44:47 joerg Exp $ +$NetBSD: distinfo,v 1.12 2012/12/20 22:03:01 joerg Exp $ SHA1 (nighthawk-2.1.tgz) = 117cd7d2c496a0d9e44b1b6d02523ad1cb0de1bf RMD160 (nighthawk-2.1.tgz) = 3973ff63c4525de65ae4dd3803d355c102968997 @@ -13,7 +13,7 @@ SHA1 (patch-ad) = 2cb1ad86cd8fbfcfbc0ece05ce3d65508a57fe68 SHA1 (patch-ae) = 1699979e5013e86dc158722faef525b46ce30076 SHA1 (patch-af) = 69b3905960d2da2a2023187e3bab258acc2461a3 SHA1 (patch-ag) = be5419e9cbd1f2af3a41f2dc37db792e299f8625 -SHA1 (patch-ah) = 5734f92db807cb44da1494bb51eab9fd18d9fec8 +SHA1 (patch-ah) = e3e250068989425b071f5aabc49ff0c1110ce2c7 SHA1 (patch-ai) = 72d47ae02b1e5f1a5f04094c03d00471370a3092 SHA1 (patch-ba) = 3bf82814d23305a686317ea36ff03698d65157ee SHA1 (patch-bb) = 3c6bc506fb7cf52d6b03da5d6c2281f5ea135e0b diff --git a/games/nighthawk/patches/patch-ah b/games/nighthawk/patches/patch-ah index 89028e21c46..6ad4d7892d7 100644 --- a/games/nighthawk/patches/patch-ah +++ b/games/nighthawk/patches/patch-ah @@ -1,6 +1,6 @@ -$NetBSD: patch-ah,v 1.1 2007/08/08 20:40:20 joerg Exp $ +$NetBSD: patch-ah,v 1.2 2012/12/20 22:03:01 joerg Exp $ ---- src_sound/funkload.c.orig 2007-08-08 20:17:33.000000000 +0000 +--- src_sound/funkload.c.orig 1998-06-22 10:29:14.000000000 +0000 +++ src_sound/funkload.c @@ -15,7 +15,7 @@ ***************************************************************************/ @@ -11,3 +11,68 @@ $NetBSD: patch-ah,v 1.1 2007/08/08 20:40:20 joerg Exp $ #include "funktracker_defs.h" #include "dsp_mixxer.h" #include "funktracker.h" +@@ -182,11 +182,7 @@ void find_pats_seqs(void) + /*************************************************************************** + * L O A D S O N G + ***************************************************************************/ +-void load_funk_module(char *filename) +-{ +- FILE *funk_fp; +- +- int dsp_load_sample(int sample_no) ++ static int dsp_load_sample(int sample_no, FILE *funk_fp) + { + register unsigned long samsize = + funk_hr_ptr->funk_sb[sample_no].length * +@@ -205,7 +201,7 @@ void load_funk_module(char *filename) + return 1; + } + +- void clean_old_fnk(void) ++ static void clean_old_fnk(void) + { + register int x,y; + +@@ -216,7 +212,7 @@ void load_funk_module(char *filename) + funk_hr_ptr->funk_sb[x].sname[y] = ' '; + } + +- void load(void) ++ static void load(FILE *funk_fp) + { + register int x; + register long file_size,pattern_block_size; +@@ -282,7 +278,7 @@ void load_funk_module(char *filename) + } + for(x = 0;x < 64;x++) + if(funk_hr_ptr->funk_sb[x].length) +- if(!dsp_load_sample(x)) ++ if(!dsp_load_sample(x, funk_fp)) + return; + if(funk_hr_ptr->funk_type[1] != '2') + { +@@ -294,17 +290,22 @@ void load_funk_module(char *filename) + } + } + ++void load_funk_module(char *filename) ++{ ++ FILE *funk_fp; ++ + ferr_val = FERR_OK; + if((funk_fp = fopen(filename,"rb")) != NULL) + { +- load(); ++ load(funk_fp); + fclose(funk_fp); + } + else + ferr_val = FERR_FOPEN; + } + +-/*************************************************************************** ++/******** ++******************************************************************* + * + ***************************************************************************/ + void dsp_init_for_play(void) |