update to 1.8.5 changes: bugfixes and code cleanupdiff -r1.20 -r1.21 pkgsrc/games/plib/Makefile
(drochner)
@@ -1,17 +1,17 @@ | @@ -1,17 +1,17 @@ | |||
1 | # $NetBSD: Makefile,v 1.20 2007/07/12 19:48:40 drochner Exp $ | 1 | # $NetBSD: Makefile,v 1.21 2008/03/14 14:38:46 drochner Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | DISTNAME= plib-1.8.4 | 4 | DISTNAME= plib-1.8.5 | |
5 | CATEGORIES= games x11 | 5 | CATEGORIES= games x11 | |
6 | MASTER_SITES= http://plib.sourceforge.net/dist/ | 6 | MASTER_SITES= http://plib.sourceforge.net/dist/ | |
7 | 7 | |||
8 | MAINTAINER= rh@NetBSD.org | 8 | MAINTAINER= rh@NetBSD.org | |
9 | HOMEPAGE= http://plib.sourceforge.net/ | 9 | HOMEPAGE= http://plib.sourceforge.net/ | |
10 | COMMENT= Libraries for writing portable games/realtime interactive apps | 10 | COMMENT= Libraries for writing portable games/realtime interactive apps | |
11 | 11 | |||
12 | GNU_CONFIGURE= YES | 12 | GNU_CONFIGURE= YES | |
13 | USE_LANGUAGES= c c++ | 13 | USE_LANGUAGES= c c++ | |
14 | CPPFLAGS+= -Dunix=1 | 14 | CPPFLAGS+= -Dunix=1 | |
15 | 15 | |||
16 | .include "../../graphics/Mesa/buildlink3.mk" | 16 | .include "../../graphics/Mesa/buildlink3.mk" | |
17 | .include "../../mk/oss.buildlink3.mk" | 17 | .include "../../mk/oss.buildlink3.mk" |
@@ -1,10 +1,9 @@ | @@ -1,10 +1,9 @@ | |||
1 | $NetBSD: distinfo,v 1.9 2007/09/16 09:25:03 joerg Exp $ | 1 | $NetBSD: distinfo,v 1.10 2008/03/14 14:38:46 drochner Exp $ | |
2 | 2 | |||
3 | SHA1 (plib-1.8.4.tar.gz) = 16d3faab36fdde85c5bf620046b56c65dfad6769 | 3 | SHA1 (plib-1.8.5.tar.gz) = c2cf7e3e1e58f7b63dae4bb21e4fa82c3e4d4cfc | |
4 | RMD160 (plib-1.8.4.tar.gz) = a0b6f2fdd4035cb2a6b83616726563d779efb87f | 4 | RMD160 (plib-1.8.5.tar.gz) = 55019bf3758ec2542804d8e3994f4bed5a188e60 | |
5 | Size (plib-1.8.4.tar.gz) = 793758 bytes | 5 | Size (plib-1.8.5.tar.gz) = 779133 bytes | |
6 | SHA1 (patch-aa) = 87f53811b33d3dbf7ea4cd12fcc0dd594847eeb2 | 6 | SHA1 (patch-aa) = 35cd38d57f15144d659a19458a2b1c00983fb4b2 | |
7 | SHA1 (patch-ab) = 3976dcf78e8ba44d55d08e67ddf3fa7f23def91e | 7 | SHA1 (patch-ab) = 3976dcf78e8ba44d55d08e67ddf3fa7f23def91e | |
8 | SHA1 (patch-ad) = 1ec59b079a662bfc9b5ea5fa03686292ac05659f | 8 | SHA1 (patch-ad) = 1ec59b079a662bfc9b5ea5fa03686292ac05659f | |
9 | SHA1 (patch-ae) = ae69e86642c53ef32619d6411809f80ab973b208 | 9 | SHA1 (patch-ae) = ae69e86642c53ef32619d6411809f80ab973b208 | |
10 | SHA1 (patch-af) = 2eac06fa7462711c018c2b5876b218ef56b46dbb |
@@ -1,24 +1,22 @@ | @@ -1,24 +1,22 @@ | |||
1 | $NetBSD: patch-aa,v 1.6 2007/09/16 09:25:03 joerg Exp $ | 1 | $NetBSD: patch-aa,v 1.7 2008/03/14 14:38:46 drochner Exp $ | |
2 | 2 | |||
3 | --- src/sl/slPortability.h.orig 2007-09-16 08:50:46.000000000 +0000 | 3 | --- src/sl/slPortability.h.orig 2008-03-11 03:06:24.000000000 +0100 | |
4 | +++ src/sl/slPortability.h | 4 | +++ src/sl/slPortability.h | |
5 | @@ -59,8 +59,8 @@ | 5 | @@ -59,7 +59,7 @@ | |
6 | # if defined(UL_LINUX) | 6 | # if defined(UL_LINUX) | |
7 | # include <linux/soundcard.h> | 7 | # include <linux/soundcard.h> | |
8 | # include <sys/ioctl.h> | 8 | # include <sys/ioctl.h> | |
9 | -# elif defined(__FreeBSD__) | 9 | -# elif defined(__FreeBSD__) | |
10 | -# include <machine/soundcard.h> | |||
11 | +# elif defined(__FreeBSD__) || defined(__DragonFly__) | 10 | +# elif defined(__FreeBSD__) || defined(__DragonFly__) | |
12 | +# include <sys/soundcard.h> | 11 | # include <sys/soundcard.h> | |
13 | # else | 12 | # else | |
14 | /* | 13 | /* | |
15 | Tom thinks this file may be <sys/soundcard.h> under some | |||
16 | @@ -75,7 +75,7 @@ | 14 | @@ -75,7 +75,7 @@ | |
17 | #endif | 15 | #endif | |
18 | 16 | |||
19 | #ifdef UL_BSD | 17 | #ifdef UL_BSD | |
20 | -#ifndef __FreeBSD__ | 18 | -#ifndef __FreeBSD__ | |
21 | +#if !defined(__FreeBSD__) && !defined(__DragonFly__) | 19 | +#if !defined(__FreeBSD__) && !defined(__DragonFly__) | |
22 | # include <sys/audioio.h> | 20 | # include <sys/audioio.h> | |
23 | #endif | 21 | #endif | |
24 | #endif | 22 | #endif |