[pkgsrc/trunk]: pkgsrc/audio/spiralsynth Fallback to O_FSYNC on DragonFly, if...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ac5739213c99
branches:  trunk
changeset: 505604:ac5739213c99
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Jan 05 15:33:00 2006 +0000

description:
Fallback to O_FSYNC on DragonFly, if O_SYNC doesn't exist.
Use PTHREAD_* instead of -lpthread for linkage.

diffstat:

 audio/spiralsynth/distinfo         |   6 +++---
 audio/spiralsynth/patches/patch-aa |   4 ++--
 audio/spiralsynth/patches/patch-an |  19 +++++++++++++++----
 3 files changed, 20 insertions(+), 9 deletions(-)

diffs (75 lines):

diff -r 6f909a69db7b -r ac5739213c99 audio/spiralsynth/distinfo
--- a/audio/spiralsynth/distinfo        Thu Jan 05 15:22:34 2006 +0000
+++ b/audio/spiralsynth/distinfo        Thu Jan 05 15:33:00 2006 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.10 2005/04/24 14:41:28 ben Exp $
+$NetBSD: distinfo,v 1.11 2006/01/05 15:33:00 joerg Exp $
 
 SHA1 (SpiralSynth-2.0.0.tar.gz) = ea42c5b7710237139f5281cf0c4ca155c184c4cd
 RMD160 (SpiralSynth-2.0.0.tar.gz) = c05f38a9ae8b8b87f520c11854631e6dfa00c034
 Size (SpiralSynth-2.0.0.tar.gz) = 66263 bytes
-SHA1 (patch-aa) = 4555f5a2d61980d1a19c7fdddaf3671ef86ea9ef
+SHA1 (patch-aa) = 01e4f4348761ca5c3e7e7c9dce0e13fa0b2b986f
 SHA1 (patch-ab) = 49ea69a000b68c3c6ec07fefa9f1e2a415abb0f0
 SHA1 (patch-ad) = 235afa6618c5ec5aef2ca3448388f11757918832
 SHA1 (patch-ae) = b0c36c839504ecef6c781609ebd9fef266249645
@@ -15,5 +15,5 @@
 SHA1 (patch-ak) = 67643c5abea0498f8ea046c5abd52f2d328a5538
 SHA1 (patch-al) = 7436bce933cbddcd4f869ab2cbbe27762d4273e5
 SHA1 (patch-am) = 4899c78015028a6e8047e5527362646e40a10708
-SHA1 (patch-an) = d93e9a613ca52ac0ed21b38d58902783666ac5b1
+SHA1 (patch-an) = 2bafb1a9a959816af43a858fdb4a9df5586a91e9
 SHA1 (patch-ao) = 138f58bd7fae0226690747efcb8daf472e3a5337
diff -r 6f909a69db7b -r ac5739213c99 audio/spiralsynth/patches/patch-aa
--- a/audio/spiralsynth/patches/patch-aa        Thu Jan 05 15:22:34 2006 +0000
+++ b/audio/spiralsynth/patches/patch-aa        Thu Jan 05 15:33:00 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.5 2004/11/25 17:24:27 ben Exp $
+$NetBSD: patch-aa,v 1.6 2006/01/05 15:33:00 joerg Exp $
 
 --- Makefile.in.orig   Thu Jun 13 14:56:01 2002
 +++ Makefile.in
@@ -16,7 +16,7 @@
 +LINK  =       g++ ${LDFLAGS}
  LFLAGS        =       
 -LIBS  =   -L/usr/X11R6/lib -lfltk -lGL -lXext -lX11 -lm -lpthread
-+LIBS  =   -lfltk -lGL -lXext -lX11 -lm -lpthread ${LIBOSSAUDIO}
++LIBS  =   -lfltk -lGL -lXext -lX11 -lm ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} ${LIBOSSAUDIO}
  MOC   =       moc
  UIC   =       
  
diff -r 6f909a69db7b -r ac5739213c99 audio/spiralsynth/patches/patch-an
--- a/audio/spiralsynth/patches/patch-an        Thu Jan 05 15:22:34 2006 +0000
+++ b/audio/spiralsynth/patches/patch-an        Thu Jan 05 15:33:00 2006 +0000
@@ -1,8 +1,19 @@
-$NetBSD: patch-an,v 1.2 2005/04/24 14:41:28 ben Exp $
+$NetBSD: patch-an,v 1.3 2006/01/05 15:33:00 joerg Exp $
 
---- SpiralSound/Midi.C.orig    2002-06-11 15:08:56.000000000 -0700
+--- SpiralSound/Midi.C.orig    2002-06-11 22:08:56.000000000 +0000
 +++ SpiralSound/Midi.C
-@@ -76,12 +76,12 @@ MidiDevice::~MidiDevice() 
+@@ -27,6 +27,10 @@
+ #include <FL/Fl.h>
+ #endif
+ 
++#if defined(__DragonFly__) && !defined(O_SYNC)
++#define O_SYNC O_FSYNC
++#endif
++
+ static const int MIDI_SCANBUFSIZE=256;
+ static const int MIDI_KEYOFFSET=0;
+ 
+@@ -76,12 +80,12 @@ MidiDevice::~MidiDevice() 
  void MidiDevice::Close()
  {
        pthread_mutex_lock(m_Mutex);
@@ -17,7 +28,7 @@
        cerr<<"Closed midi device"<<endl;
  }
  
-@@ -90,24 +90,19 @@ void MidiDevice::Open()
+@@ -90,24 +94,19 @@ void MidiDevice::Open()
  {
        //if (!SpiralInfo::WANTMIDI) return;