diff options
| author | bouyer <bouyer@pkgsrc.org> | 2001-06-11 17:57:59 +0000 |
|---|---|---|
| committer | bouyer <bouyer@pkgsrc.org> | 2001-06-11 17:57:59 +0000 |
| commit | 13de9c340a6c26b29f5e4c7bad38e1c5fcf5f1e8 (patch) | |
| tree | 03741488e69b0360daafbe8d5924ae78111738ac /sysutils | |
| parent | 8faf519896194c97087d914f1aaf2e33cc56c761 (diff) | |
| download | pkgsrc-13de9c340a6c26b29f5e4c7bad38e1c5fcf5f1e8.tar.gz | |
Thomas is rigth, we can't use /dev/rcd?d on all platform.
#ifdef __i386
use /dev/rcd%dd
#else
use /dev/rcd%dc
#endif
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/koncd/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/koncd/patches/patch-aa | 19 |
2 files changed, 16 insertions, 7 deletions
diff --git a/sysutils/koncd/distinfo b/sysutils/koncd/distinfo index 2eb2b5ede99..c39d591d629 100644 --- a/sysutils/koncd/distinfo +++ b/sysutils/koncd/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.2 2001/06/11 17:41:14 bouyer Exp $ +$NetBSD: distinfo,v 1.3 2001/06/11 17:57:59 bouyer Exp $ SHA1 (koncd-0.7.1.tar.gz) = db387b3cd83c3a50d96175ef2a5b5ed98eec05b2 Size (koncd-0.7.1.tar.gz) = 1286825 bytes -SHA1 (patch-aa) = 33a683dce04a420c0d7551b0a36d12a0165307aa +SHA1 (patch-aa) = ee91923a4e1a0dd5770f71541cd1a02b8a4883d3 diff --git a/sysutils/koncd/patches/patch-aa b/sysutils/koncd/patches/patch-aa index 17e0b5037a5..b288897c855 100644 --- a/sysutils/koncd/patches/patch-aa +++ b/sysutils/koncd/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.1 2001/06/11 17:40:48 bouyer Exp $ +$NetBSD: patch-aa,v 1.2 2001/06/11 17:58:00 bouyer Exp $ ---- koncd/cddata.cpp.orig Mon Jun 11 19:01:08 2001 -+++ koncd/cddata.cpp Mon Jun 11 19:02:38 2001 -@@ -17,14 +17,18 @@ +--- koncd/cddata.cpp.orig Sun Mar 11 12:35:36 2001 ++++ koncd/cddata.cpp Mon Jun 11 19:50:12 2001 +@@ -17,14 +17,22 @@ struct DEVICES *CurDev; CDdata::CDdata( QObject * , const char * ) { @@ -20,14 +20,18 @@ $NetBSD: patch-aa,v 1.1 2001/06/11 17:40:48 bouyer Exp $ - proc.start( KProcess::Block, KProcess::AllOutput ); + for (i = 0; i < 8; i++) { + proc.clearArguments(); ++#ifdef __i386__ + snprintf(prog2, sizeof( prog2 ) - 1, "/dev/rcd%dd",i); ++#else ++ snprintf(prog2, sizeof( prog2 ) - 1, "/dev/rcd%dc",i); ++#endif + proc << prog << prog2 << "identify"; + proc.start( KProcess::Block, KProcess::AllOutput ); + } sprintf( dummystr,"dev=unknown" ); struct DEVICES *d; -@@ -105,40 +109,34 @@ +@@ -105,40 +113,39 @@ return; } bzero( buf, sizeof( buf ) ); @@ -54,8 +58,13 @@ $NetBSD: patch-aa,v 1.1 2001/06/11 17:40:48 bouyer Exp $ - (CurBus < 32) ? CurBus:0, (dev -> dev < 32) ? dev -> dev:0 ); - for( ; *b && *b != '\''; b++ ); // point to ' + dev -> dev = buf[8] - 0x30; ++#ifdef __i386__ + sprintf( dev -> devstr, "dev=/dev/rcd%dd", + (dev -> dev < 32) ? dev -> dev:0 ); ++#else ++ sprintf( dev -> devstr, "dev=/dev/rcd%dc", ++ (dev -> dev < 32) ? dev -> dev:0 ); ++#endif if( *b ) b++; // point to next character - for( i = 0; *b && *b != '\'' && i < sizeof(dev->vendor)-1; b++, i++ ) + for( i = 0; *b && *b != ',' && i < sizeof(dev->vendor)-1; b++, i++ ) |