From 12f38213fd6923f6244ed2a67a633bf8230aa2f1 Mon Sep 17 00:00:00 2001 From: wiz Date: Sat, 20 Mar 2004 15:16:10 +0000 Subject: Make build on current, convert to buildlink3, and add some working MASTER_SITES. --- games/freesci/Makefile | 17 +++++++++-------- games/freesci/distinfo | 8 +++++++- games/freesci/patches/patch-aa | 13 +++++++++++++ games/freesci/patches/patch-ab | 13 +++++++++++++ games/freesci/patches/patch-ac | 13 +++++++++++++ games/freesci/patches/patch-ad | 13 +++++++++++++ games/freesci/patches/patch-ae | 13 +++++++++++++ games/freesci/patches/patch-af | 29 +++++++++++++++++++++++++++++ 8 files changed, 110 insertions(+), 9 deletions(-) create mode 100644 games/freesci/patches/patch-aa create mode 100644 games/freesci/patches/patch-ab create mode 100644 games/freesci/patches/patch-ac create mode 100644 games/freesci/patches/patch-ad create mode 100644 games/freesci/patches/patch-ae create mode 100644 games/freesci/patches/patch-af diff --git a/games/freesci/Makefile b/games/freesci/Makefile index b83d1ed0d63..b986eacbf22 100644 --- a/games/freesci/Makefile +++ b/games/freesci/Makefile @@ -1,10 +1,11 @@ -# $NetBSD: Makefile,v 1.6 2004/03/08 19:40:38 jmmv Exp $ +# $NetBSD: Makefile,v 1.7 2004/03/20 15:16:10 wiz Exp $ # DISTNAME= freesci-0.3.4a PKGREVISION= 1 CATEGORIES= games -MASTER_SITES= http://savannah.nongnu.org/download/freesci/stable.pkg/0.3.4a/ +MASTER_SITES= http://www-plan.cs.colorado.edu/reichenb/freesci/ \ + http://teksolv.de/~jameson/ MAINTAINER= dillo@NetBSD.org HOMEPAGE= http://freesci.linuxgames.com/ @@ -12,7 +13,7 @@ COMMENT= Interpreter for Sierra On-Line's SCI games DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs -USE_BUILDLINK2= yes +USE_BUILDLINK3= yes USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes @@ -21,9 +22,9 @@ post-install: ${INSTALL_DATA_DIR} ${LOCALBASE}/share/examples/freesci ${INSTALL_DATA} ${FILESDIR}/config ${LOCALBASE}/share/examples/freesci -.include "../../devel/SDL/buildlink2.mk" -.include "../../devel/readline/buildlink2.mk" -.include "../../devel/ncurses/buildlink2.mk" -#.include "../../mk/motif.buildlink2.mk" -#.include "../../mk/ossaudio.buildlink2.mk" +.include "../../devel/SDL/buildlink3.mk" +.include "../../devel/readline/buildlink3.mk" +.include "../../devel/ncurses/buildlink3.mk" +#.include "../../mk/motif.buildlink3.mk" +#.include "../../mk/ossaudio.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/freesci/distinfo b/games/freesci/distinfo index ee6ab2d5533..01f4c680d7a 100644 --- a/games/freesci/distinfo +++ b/games/freesci/distinfo @@ -1,4 +1,10 @@ -$NetBSD: distinfo,v 1.1.1.1 2003/08/16 18:27:30 dillo Exp $ +$NetBSD: distinfo,v 1.2 2004/03/20 15:16:10 wiz Exp $ SHA1 (freesci-0.3.4a.tar.gz) = 65291ac18f668b245e7652023e754e19e6ccb0e8 Size (freesci-0.3.4a.tar.gz) = 1178834 bytes +SHA1 (patch-aa) = ec90d23cb4830b4903c32118280766bfb3baf38e +SHA1 (patch-ab) = 9e5e62d8d06c69d5f96cbe32c13140a4093ddb94 +SHA1 (patch-ac) = b1d01703301dffb233e1c300a8717785b224c3e9 +SHA1 (patch-ad) = f413de3289ac2a424d5ee35de62a78a5dcef7e35 +SHA1 (patch-ae) = 137ec032ad33e647ea4ecf80955ad8916e8dd383 +SHA1 (patch-af) = a2897fcf2d3526797c3cef3ce9003b071d2125be diff --git a/games/freesci/patches/patch-aa b/games/freesci/patches/patch-aa new file mode 100644 index 00000000000..00b0b111cd1 --- /dev/null +++ b/games/freesci/patches/patch-aa @@ -0,0 +1,13 @@ +$NetBSD: patch-aa,v 1.1 2004/03/20 15:16:10 wiz Exp $ + +--- src/sound/midi_adlib.c.orig 2002-11-08 22:45:06.000000000 +0100 ++++ src/sound/midi_adlib.c +@@ -31,7 +31,7 @@ + #include + #include + +-#ifdef HAVE_SYS_SOUNDCARD_H ++#if defined(HAVE_SYS_SOUNDCARD_H) && !defined(__NetBSD__) + + #include + #include diff --git a/games/freesci/patches/patch-ab b/games/freesci/patches/patch-ab new file mode 100644 index 00000000000..b88bb9de5a4 --- /dev/null +++ b/games/freesci/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.1 2004/03/20 15:16:10 wiz Exp $ + +--- src/sound/midi_device.c.orig 2003-01-19 22:57:33.000000000 +0100 ++++ src/sound/midi_device.c +@@ -26,7 +26,7 @@ midi_device_t midi_device_null; + midi_device_t *midi_devices[] = { + &midi_device_mt32gm, + &midi_device_mt32, +-#ifdef HAVE_SYS_SOUNDCARD_H ++#if defined(HAVE_SYS_SOUNDCARD_H) && !defined(__NetBSD__) + &midi_device_adlib, + #endif + &midi_device_adlibemu, diff --git a/games/freesci/patches/patch-ac b/games/freesci/patches/patch-ac new file mode 100644 index 00000000000..fe9ce37f431 --- /dev/null +++ b/games/freesci/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.1 2004/03/20 15:16:10 wiz Exp $ + +--- src/sound/midiout.c.orig 2003-01-09 23:08:18.000000000 +0100 ++++ src/sound/midiout.c +@@ -22,7 +22,7 @@ + midiout_driver_t *midiout_driver = NULL; + + midiout_driver_t *midiout_drivers[] = { +-#ifdef HAVE_SYS_SOUNDCARD_H ++#if defined(HAVE_SYS_SOUNDCARD_H) && !defined(__NetBSD__) + &midiout_driver_ossseq, + &midiout_driver_ossopl3, + #endif /* HAVE_SYS_SOUNDCARD_H */ diff --git a/games/freesci/patches/patch-ad b/games/freesci/patches/patch-ad new file mode 100644 index 00000000000..60011c6183c --- /dev/null +++ b/games/freesci/patches/patch-ad @@ -0,0 +1,13 @@ +$NetBSD: patch-ad,v 1.1 2004/03/20 15:16:10 wiz Exp $ + +--- src/sound/midiout_ossopl3.c.orig 2002-09-16 15:19:15.000000000 +0200 ++++ src/sound/midiout_ossopl3.c +@@ -63,7 +63,7 @@ Fmplay includes the following notice: + + #include + +-#ifdef HAVE_SYS_SOUNDCARD_H ++#if defined (HAVE_SYS_SOUNDCARD_H) && !defined(__NetBSD__) + #include + #include + #include diff --git a/games/freesci/patches/patch-ae b/games/freesci/patches/patch-ae new file mode 100644 index 00000000000..1ea4aa01693 --- /dev/null +++ b/games/freesci/patches/patch-ae @@ -0,0 +1,13 @@ +$NetBSD: patch-ae,v 1.1 2004/03/20 15:16:10 wiz Exp $ + +--- src/sound/midiout_ossseq.c.orig 2002-09-16 15:19:15.000000000 +0200 ++++ src/sound/midiout_ossseq.c +@@ -19,7 +19,7 @@ + + #include + +-#ifdef HAVE_SYS_SOUNDCARD_H ++#if defined (HAVE_SYS_SOUNDCARD_H) && !defined(__NetBSD__) + #include + #include + #include diff --git a/games/freesci/patches/patch-af b/games/freesci/patches/patch-af new file mode 100644 index 00000000000..2208295c712 --- /dev/null +++ b/games/freesci/patches/patch-af @@ -0,0 +1,29 @@ +$NetBSD: patch-af,v 1.1 2004/03/20 15:16:10 wiz Exp $ + +--- src/sound/pcmout_oss.c.orig 2003-01-17 06:56:47.000000000 +0100 ++++ src/sound/pcmout_oss.c +@@ -70,7 +70,7 @@ static int pcmout_oss_open(gint16 *b, gu + return -1; + } + +- if (ioctl (oss_fd, SNDCTL_DSP_RESET)) { ++ if (ioctl (oss_fd, SNDCTL_DSP_RESET, &i)) { + fprintf(stderr, "[PCM-OSS] Failed to reset device\n"); + return -1; + } +@@ -115,13 +115,13 @@ static int pcmout_oss_open(gint16 *b, gu + } + + static int pcmout_oss_close() { +- int err; ++ int err, i; + + run = 0; + + pthread_join(thread, NULL); + +- ioctl (oss_fd, SNDCTL_DSP_SYNC); ++ ioctl (oss_fd, SNDCTL_DSP_SYNC, &i); + close (oss_fd); + + return 0; -- cgit v1.2.3