Add DragonFly support. Use a somewhat more portable readdir allocation.

4 files changed, 69 insertions, 13 deletions

diff --git a/audio/mp3blaster/distinfo b/audio/mp3blaster/distinfo
index bc997c11c32..168c3beb2aa 100644
--- a/audio/mp3blaster/distinfo
+++ b/audio/mp3blaster/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2005/02/23 20:39:49 agc Exp $
+$NetBSD: distinfo,v 1.8 2005/12/11 22:22:37 joerg Exp $
 
 SHA1 (mp3blaster-3.2.0.tar.gz) = edc4538ad233270dd4b17066c5d2267708f1b5e0
 RMD160 (mp3blaster-3.2.0.tar.gz) = 462c75e27c91ac7473103bd0e08882bea3d0db8d
@@ -6,10 +6,10 @@ Size (mp3blaster-3.2.0.tar.gz) = 312991 bytes
 SHA1 (patch-aa) = d869d2acb66edbf569f39fd8d35e66b4651b4f77
 SHA1 (patch-ab) = f4d2486c915e593c81653df1285d532706e4107b
 SHA1 (patch-ac) = 3ad9344d22e511682ad05ab1e2dfbc057fb6cf96
-SHA1 (patch-ad) = bf744e9d9fffe01dcbeaa1579029d94a6060fa22
+SHA1 (patch-ad) = 99a3f363c3c6fb084a6790aceeb7b5ecd45cfb9f
 SHA1 (patch-ae) = 65feb8611cea4b0f6e8de593e56972d676fb64d4
 SHA1 (patch-af) = bc48687a1e08d1884f79d5e0b5835f60435ea0a2
-SHA1 (patch-ag) = a7b796b7ff1c1c5497e0127a5f8b6dc02278d91b
+SHA1 (patch-ag) = d5d0777e36eec1cb8f79ecbfecabb5390b1625bf
 SHA1 (patch-ah) = 8dfd9c60b113a925187187100b785bb99d5f4722
 SHA1 (patch-ai) = 6a95a0ff24b09e4bc3b13cc5a09336f43a03bcbd
 SHA1 (patch-aj) = db1484dbbb10e951dd88b1b40bedafe3c6ede174
@@ -19,3 +19,4 @@ SHA1 (patch-am) = 14c4dff0bd8d02e5b9a3f3968602c76241905e26
 SHA1 (patch-an) = 7e801e08c2d5e72ff6dd4215c8d3466362fc54b1
 SHA1 (patch-ao) = d3c3fc1c5d51791282e196ee6381fd2f542f695e
 SHA1 (patch-ap) = cbad4001c1d1440150ec738797bc8e5238d019e8
+SHA1 (patch-aq) = a1dd9085c242d9050a1d9a3f70d40615f06a217d
diff --git a/audio/mp3blaster/patches/patch-ad b/audio/mp3blaster/patches/patch-ad
index 4ee8c7eda05..58565badcdc 100644
--- a/audio/mp3blaster/patches/patch-ad
+++ b/audio/mp3blaster/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.2 2003/12/03 12:31:36 cube Exp $
+$NetBSD: patch-ad,v 1.3 2005/12/11 22:22:37 joerg Exp $
 
---- configure.orig	2003-11-28 21:07:16.000000000 +0100
+--- configure.orig	2003-11-28 20:07:16.000000000 +0000
 +++ configure
 @@ -1591,7 +1591,7 @@ echo "$ac_t""$ac_cv_prog_gcc_traditional
    fi
@@ -11,7 +11,31 @@ $NetBSD: patch-ad,v 1.2 2003/12/03 12:31:36 cube Exp $
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
  echo "configure:1598: checking for $ac_func" >&5
-@@ -2542,7 +2542,7 @@ else
+@@ -1665,7 +1665,14 @@ if test "`uname -s`" = "FreeBSD" ; then
+   cat >> confdefs.h <<\EOF
+ #define AUDIO_NONBLOCKING 1
+ EOF
++fi
+ 
++if test "`uname -s`" = "DragonFly" ; then
++  echo "DragonFly detected."
++  DRAGONFLY=1
++  cat >> confdefs.h <<\EOF
++#define AUDIO_NONBLOCKING 1
++EOF
+ fi
+ 
+ #For NetBSD, look in /usr/pkg/(lib,include) first. Otherwise, the wrong
+@@ -1987,7 +1994,7 @@ fi
+ 
+ 
+ if test "$INCLUDEPTHREAD" = 1 ; then
+-	if test "$FREEBSD" = 1 -o "$OPENBSD" = 1 ; then
++	if test "$FREEBSD" = 1 -o "$OPENBSD" = 1 -o "$DRAGONFLY" = 1 ; then
+   	LDFLAGS="$LDFLAGS -pthread"
+ 	else
+   	echo $ac_n "checking for main in -lpthread""... $ac_c" 1>&6
+@@ -2542,7 +2549,7 @@ else
  fi
  done
  
@@ -20,7 +44,16 @@ $NetBSD: patch-ad,v 1.2 2003/12/03 12:31:36 cube Exp $
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-@@ -3907,13 +3907,15 @@ fi
+@@ -3862,7 +3869,7 @@ EOF
+ 
+ 
+ if test "$INCLUDEPTHREAD" = 1 ; then
+-  if test "$FREEBSD" = 1 -o "$OPENBSD" = 1 ; then
++  if test "$FREEBSD" = 1 -o "$OPENBSD" = 1 -o "$DRAGONFLY" = 1 ; then
+     LDFLAGS="$LDFLAGS -pthread"
+     cat >> confdefs.h <<\EOF
+ #define _THREAD_SAFE 1
+@@ -3907,13 +3914,15 @@ fi
  
  
  
@@ -29,16 +62,16 @@ $NetBSD: patch-ad,v 1.2 2003/12/03 12:31:36 cube Exp $
  LIBMPEGSOUND="-lmpegsound"
  LIBNMIXER="-lnmixer"
 +LIBGETOPT="-lgetopt"
++
  
  
  
 -SRCDIRS="mpegsound nmixer src doc doc/charmap"
-+
 +SRCDIRS="getopt mpegsound nmixer src doc doc/charmap"
  
  trap '' 1 2 15
  cat > confcache <<\EOF
-@@ -4016,7 +4018,7 @@ done
+@@ -4016,7 +4025,7 @@ done
  ac_given_srcdir=$srcdir
  ac_given_INSTALL="$INSTALL"
  
@@ -47,7 +80,7 @@ $NetBSD: patch-ad,v 1.2 2003/12/03 12:31:36 cube Exp $
  EOF
  cat >> $CONFIG_STATUS <<EOF
  
-@@ -4079,6 +4081,7 @@ s%@NAS_CFLAGS@%$NAS_CFLAGS%g
+@@ -4079,6 +4088,7 @@ s%@NAS_CFLAGS@%$NAS_CFLAGS%g
  s%@NCURSES_LIBS@%$NCURSES_LIBS%g
  s%@LIBMPEGSOUND@%$LIBMPEGSOUND%g
  s%@LIBNMIXER@%$LIBNMIXER%g
@@ -55,7 +88,7 @@ $NetBSD: patch-ad,v 1.2 2003/12/03 12:31:36 cube Exp $
  s%@SRCDIRS@%$SRCDIRS%g
  
  CEOF
-@@ -4121,7 +4124,7 @@ EOF
+@@ -4121,7 +4131,7 @@ EOF
  
  cat >> $CONFIG_STATUS <<EOF
  
diff --git a/audio/mp3blaster/patches/patch-ag b/audio/mp3blaster/patches/patch-ag
index 66bc60d1a91..948c56e17d5 100644
--- a/audio/mp3blaster/patches/patch-ag
+++ b/audio/mp3blaster/patches/patch-ag
@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.3 2003/12/03 12:31:37 cube Exp $
+$NetBSD: patch-ag,v 1.4 2005/12/11 22:22:37 joerg Exp $
 
---- src/main.cc.orig	2003-09-09 23:22:55.000000000 +0200
+--- src/main.cc.orig	2003-09-09 21:22:55.000000000 +0000
 +++ src/main.cc
 @@ -51,10 +51,10 @@
  #include <pth.h>
@@ -15,3 +15,12 @@ $NetBSD: patch-ag,v 1.3 2003/12/03 12:31:37 cube Exp $
  #endif
  #ifdef HAVE_ERRNO_H
  #include <errno.h>
+@@ -2917,7 +2917,7 @@ recsel_files(const char *path, char ***f
+ 	while ( (entry = readdir(dir)) )
+ 	{
+ 		DIR *dir2 = NULL;
+-		char *newpath = (char *)malloc((entry->d_reclen + 2 + strlen(path)) *
++		char *newpath = (char *)malloc((sizeof(*entry) + entry->d_namlen + 2 + strlen(path)) *
+ 			sizeof(char));
+ 
+ 		PTH_YIELD;
diff --git a/audio/mp3blaster/patches/patch-aq b/audio/mp3blaster/patches/patch-aq
new file mode 100644
index 00000000000..62815a81c1c
--- /dev/null
+++ b/audio/mp3blaster/patches/patch-aq
@@ -0,0 +1,13 @@
+$NetBSD: patch-aq,v 1.1 2005/12/11 22:22:37 joerg Exp $
+
+--- src/fileman.cc.orig	2005-12-11 22:08:19.000000000 +0000
++++ src/fileman.cc
+@@ -212,7 +212,7 @@ fileManager::readDir()
+ 		PTH_YIELD;
+ 		entries = (char **)realloc (entries, (++diritems) * sizeof(char *));
+ 	
+-		entries[diritems - 1] = (char *)malloc( ((entry->d_reclen) + 1) *
++		entries[diritems - 1] = (char *)malloc( (sizeof(*entry) + entry->d_namlen + 1) *
+ 			sizeof(char));
+ 		strcpy(entries[diritems - 1], entry->d_name);
+ 	}