summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskrll <skrll>2001-04-19 06:46:59 +0000
committerskrll <skrll>2001-04-19 06:46:59 +0000
commit49335401bc2bce2d2ec6174b0a3f3afc28054ddf (patch)
tree412e875b6a91625b6711d73c6bc4969845088854
parentbd592e9d5679192602b3c3c58a08fe4771b07011 (diff)
downloadpkgsrc-49335401bc2bce2d2ec6174b0a3f3afc28054ddf.tar.gz
Oops. Make kscd actually compile. Some tidyup.
Pointed out by Kent Polk <kent@goathill.org> in private email.
-rw-r--r--audio/kdemultimedia2/distinfo6
-rw-r--r--audio/kdemultimedia2/patches/patch-ap19
-rw-r--r--audio/kdemultimedia2/patches/patch-aq11
3 files changed, 25 insertions, 11 deletions
diff --git a/audio/kdemultimedia2/distinfo b/audio/kdemultimedia2/distinfo
index c21c70fe029..b3f9bcf0b57 100644
--- a/audio/kdemultimedia2/distinfo
+++ b/audio/kdemultimedia2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2001/04/18 09:05:59 skrll Exp $
+$NetBSD: distinfo,v 1.4 2001/04/19 06:46:59 skrll Exp $
SHA1 (kdemultimedia-2.1.tar.bz2) = e21c9ceac48d1469839a97aa9193895cd120a9ff
Size (kdemultimedia-2.1.tar.bz2) = 4509946 bytes
@@ -17,5 +17,5 @@ SHA1 (patch-al) = 394d82451e0a320bfa7ea610305b24b53cb0218d
SHA1 (patch-am) = 4c747c33548057543ecd28cc8aea05f5093af6ce
SHA1 (patch-an) = b6a16911a05d713062b3366ae43e685e6084f259
SHA1 (patch-ao) = 7c909e0d4029087534ab3085c5522ac6929a3502
-SHA1 (patch-ap) = 5343622175b97c0cf129b9524e10297cb0ba4296
-SHA1 (patch-aq) = 8821eeb981948a3054cce0a0777b4d205001b99d
+SHA1 (patch-ap) = e7733176a118c06208337a738a6388711a8d6ec4
+SHA1 (patch-aq) = 009175357133fda60421aefd2d7211777a9ea001
diff --git a/audio/kdemultimedia2/patches/patch-ap b/audio/kdemultimedia2/patches/patch-ap
index 5f82fb7cb6d..5eb800b66b6 100644
--- a/audio/kdemultimedia2/patches/patch-ap
+++ b/audio/kdemultimedia2/patches/patch-ap
@@ -1,8 +1,8 @@
-$NetBSD: patch-ap,v 1.1 2001/04/17 16:03:20 skrll Exp $
+$NetBSD: patch-ap,v 1.2 2001/04/19 06:47:00 skrll Exp $
--- kscd/libwm/include/wm_config.h.orig Mon Jan 22 12:14:45 2001
+++ kscd/libwm/include/wm_config.h
-@@ -128,9 +128,26 @@
+@@ -128,11 +128,31 @@
*** ****** ** ** ****** ****** ** ****** ** * **********
*** ****** ** ** ** ** **** *** ***********
******************************************************************/
@@ -10,9 +10,9 @@ $NetBSD: patch-ap,v 1.1 2001/04/17 16:03:20 skrll Exp $
+#if defined(__FreeBSD__) || defined(__FreeBSD)
#define DEFAULT_CD_DEVICE "/dev/rmatcd0c"
+
+
-+
-+#endif /* freebsd */
+ #endif /* freebsd */
+
+/******************************************************************
+ * NetBSD
@@ -23,10 +23,15 @@ $NetBSD: patch-ap,v 1.1 2001/04/17 16:03:20 skrll Exp $
+ *** ** ** ******** **** ** ****** ** * ****************
+ *** *** ** **** **** **** *** *****************
+ ******************************************************************/
-+*******************************/
+#if defined(__NetBSD__) || defined(__NetBSD)
+
++#if defined(__i386__)
+#define DEFAULT_CD_DEVICE "/dev/rcd0d"
++#else
++#define DEFAULT_CD_DEVICE "/dev/rcd0c"
++#endif
++
++#endif /* netbsd */
- #endif /* freebsd */
-
+ /******************************************************************
+ * HP-UX
diff --git a/audio/kdemultimedia2/patches/patch-aq b/audio/kdemultimedia2/patches/patch-aq
index d5752d39fd7..07a96dbcc7b 100644
--- a/audio/kdemultimedia2/patches/patch-aq
+++ b/audio/kdemultimedia2/patches/patch-aq
@@ -1,4 +1,4 @@
-$NetBSD: patch-aq,v 1.1 2001/04/17 16:03:20 skrll Exp $
+$NetBSD: patch-aq,v 1.2 2001/04/19 06:47:00 skrll Exp $
--- kscd/config.h.std.orig Wed Aug 23 06:31:58 2000
+++ kscd/config.h.std
@@ -41,3 +41,12 @@ $NetBSD: patch-aq,v 1.1 2001/04/17 16:03:20 skrll Exp $
/* Please have a look at void KSCD::playClicked() in kscd.cpp. You will find
there the following code:
+@@ -154,8 +160,6 @@
+ Try either one there ( THAT IS IN kscd.cpp NOT HERE ), and tell me which version
+ works for you. -- thanks !
+ */
+-
+-#endif
+
+
+ /*************************************************************************