diff options
author | obache <obache@pkgsrc.org> | 2011-03-23 14:09:31 +0000 |
---|---|---|
committer | obache <obache@pkgsrc.org> | 2011-03-23 14:09:31 +0000 |
commit | 79ef2572eba3202392410625628511fb94a92759 (patch) | |
tree | 6d155dfc0aa854cc77ba815adcfd493cbe209708 /time/emiclock | |
parent | 82e0bb6c4883a14c22b6d10d13c495f0ce7c75a9 (diff) | |
download | pkgsrc-79ef2572eba3202392410625628511fb94a92759.tar.gz |
* Fixes installation issue on FreeBSD and /DragonFly other than i386.
* Enable sound support for DragonFly.
Diffstat (limited to 'time/emiclock')
-rw-r--r-- | time/emiclock/distinfo | 8 | ||||
-rw-r--r-- | time/emiclock/patches/patch-aa | 25 | ||||
-rw-r--r-- | time/emiclock/patches/patch-ad | 19 | ||||
-rw-r--r-- | time/emiclock/patches/patch-ae | 13 |
4 files changed, 46 insertions, 19 deletions
diff --git a/time/emiclock/distinfo b/time/emiclock/distinfo index 176821d9380..f13bffd6791 100644 --- a/time/emiclock/distinfo +++ b/time/emiclock/distinfo @@ -1,13 +1,13 @@ -$NetBSD: distinfo,v 1.8 2010/06/04 13:52:21 tsutsui Exp $ +$NetBSD: distinfo,v 1.9 2011/03/23 14:09:31 obache Exp $ SHA1 (emiclock-2.0.2.tar.gz) = e1c042d600faf59ecdb11f1199f1793282db90c1 RMD160 (emiclock-2.0.2.tar.gz) = 25a753aaefbd9b8b57c16fbfe13678a002ab8179 Size (emiclock-2.0.2.tar.gz) = 308682 bytes -SHA1 (patch-aa) = 082873291d05709ecc392a3e6295078065aa1d30 +SHA1 (patch-aa) = a5eea083c1a05bacd2605ac8e0ecbef9310a8cfd SHA1 (patch-ab) = 8c83e056bd03b0f493f91afd33ce572ed673511b SHA1 (patch-ac) = 4b020ac03c958d1ca44968c17b7d657edda77690 -SHA1 (patch-ad) = 47a12bfb61ed37f5ad9625f161e5e2a6c1d3e47f -SHA1 (patch-ae) = 75250a553700eeacd5fcc6f71ed4477541cab6c0 +SHA1 (patch-ad) = e3f57f3b7d68efa401ae471e786476e68b2bd282 +SHA1 (patch-ae) = ecbc4f169c0fd249ba1cc0c3031922c02f7a6bb2 SHA1 (patch-af) = f5b6c40f42136ee8953bf259a78fa0d8be048503 SHA1 (patch-ag) = 43c750de300cbda8cb89917894bbc73b18974c5d SHA1 (patch-ah) = 227494794d7c28620d11800fa6087ab765dd5562 diff --git a/time/emiclock/patches/patch-aa b/time/emiclock/patches/patch-aa index af715b8beba..effb0e97719 100644 --- a/time/emiclock/patches/patch-aa +++ b/time/emiclock/patches/patch-aa @@ -1,8 +1,25 @@ -$NetBSD: patch-aa,v 1.1.1.1 2000/12/17 23:32:17 wiz Exp $ +$NetBSD: patch-aa,v 1.2 2011/03/23 14:09:31 obache Exp $ ---- include/sound.h.orig Sat Jan 11 12:12:55 1997 -+++ include/sound.h Sun May 23 10:48:03 1999 -@@ -237,6 +237,42 @@ +--- include/sound.h.orig 1999-09-02 14:34:10.000000000 +0000 ++++ include/sound.h +@@ -215,7 +215,7 @@ struct SoundCacheBufferTag { + * FreeBSD + */ + +-#if defined(__FreeBSD__) && defined(USE_SOUND) ++#if (defined(__FreeBSD__) || defined(__DragonFly__)) && defined(USE_SOUND) + + /* FreeBSD with SoundBlaster Pro */ + +@@ -233,10 +233,50 @@ struct SoundCacheBufferTag { + }; + + #define SoundCacheBuffer struct SoundCacheBufferTag ++#ifdef __DragonFly__ ++#define AUDIO_DEVICE "/dev/dsp" ++#else + #define AUDIO_DEVICE "/dev/audio" ++#endif #endif /* FreeBSD */ diff --git a/time/emiclock/patches/patch-ad b/time/emiclock/patches/patch-ad index 6dace7b5759..38385e3d7b1 100644 --- a/time/emiclock/patches/patch-ad +++ b/time/emiclock/patches/patch-ad @@ -1,19 +1,24 @@ -$NetBSD: patch-ad,v 1.5 2009/07/07 20:25:27 joerg Exp $ +$NetBSD: patch-ad,v 1.6 2011/03/23 14:09:31 obache Exp $ ---- Imakefile.orig 1999-09-02 16:33:47.000000000 +0200 +--- Imakefile.orig 1999-09-02 14:33:47.000000000 +0000 +++ Imakefile -@@ -106,6 +106,11 @@ XCOMM - #define StartupSound myu.au - #endif /* i386BsdArchitecture && (i386FreeBsd || FreeBSDArchitecture) */ +@@ -102,9 +102,14 @@ XCOMM + #endif /* LinuxArchitecture */ + /* FreeBSD */ +-#if defined(i386BsdArchitecture) && (defined(i386FreeBsd) || defined(FreeBSDArchitecture)) ++#if defined(i386BsdArchitecture) && defined(i386FreeBsd) || defined(FreeBSDArchitecture) + #define StartupSound myu.au +-#endif /* i386BsdArchitecture && (i386FreeBsd || FreeBSDArchitecture) */ ++#endif /* i386BsdArchitecture && i386FreeBsd || FreeBSDArchitecture */ ++ +/* NetBSD */ +#if defined(NetBSDArchitecture) +#define StartupSound myu.au +#endif /* NetBSDArchitecture */ -+ + #else /* USE_NETAUDIO */ - /* netaudio (NCDaudio) */ @@ -143,7 +148,7 @@ XCOMM LOCAL_LIBRARIES = XawClientLibs # ifdef USE_XAW3D diff --git a/time/emiclock/patches/patch-ae b/time/emiclock/patches/patch-ae index 14fb9a075ac..8c9250c66ad 100644 --- a/time/emiclock/patches/patch-ae +++ b/time/emiclock/patches/patch-ae @@ -1,8 +1,13 @@ -$NetBSD: patch-ae,v 1.1.1.1 2000/12/17 23:32:18 wiz Exp $ +$NetBSD: patch-ae,v 1.2 2011/03/23 14:09:31 obache Exp $ ---- sound.c.orig Sat Jan 11 11:35:52 1997 -+++ sound.c Sun May 23 10:24:16 1999 -@@ -108,6 +108,11 @@ +--- sound.c.orig 1999-09-02 14:33:49.000000000 +0000 ++++ sound.c +@@ -104,10 +104,15 @@ static Boolean isHalfHourChimeCached = + #endif /* linux */ + + /* FreeBSD */ +-#ifdef __FreeBSD__ ++#if defined(__FreeBSD__) || defined(__DragonFly__) #include "sys/FreeBSD/audio.c" #endif /* FreeBSD */ |