s/MAXNAMLEN/NAME_MAX/ and fix pthread test in configure.

3 files changed, 46 insertions, 1 deletions

diff --git a/audio/mt-daapd/distinfo b/audio/mt-daapd/distinfo
index 371cd8f9ca6..04e3fce3ee5 100644
--- a/audio/mt-daapd/distinfo
+++ b/audio/mt-daapd/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/10/20 20:28:28 adrianp Exp $
+$NetBSD: distinfo,v 1.2 2006/12/06 16:41:26 joerg Exp $
 
 SHA1 (mt-daapd-0.2.4.tar.gz) = b8c242e5fd5d2d97010d5e09b9f02ccf9def13ab
 RMD160 (mt-daapd-0.2.4.tar.gz) = babb3f98a254aa4a014b5e7adb96276fafc84fac
 Size (mt-daapd-0.2.4.tar.gz) = 405168 bytes
 SHA1 (patch-aa) = e177bb33c19badb1da8638af61a3c3bfddf2a2ad
+SHA1 (patch-ab) = be78b7f5089d3283e0cb9ee3c64a4a53360899d7
+SHA1 (patch-ac) = 820fe55a2cefb7471133ea2e9bc7bb5ddc84cbf0
diff --git a/audio/mt-daapd/patches/patch-ab b/audio/mt-daapd/patches/patch-ab
new file mode 100644
index 00000000000..15264da6234
--- /dev/null
+++ b/audio/mt-daapd/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2006/12/06 16:41:26 joerg Exp $
+
+--- src/mp3-scanner.c.orig	2006-12-06 16:35:37.000000000 +0000
++++ src/mp3-scanner.c
+@@ -378,7 +378,7 @@ int scan_init(char *path) {
+  */
+ int scan_path(char *path) {
+     DIR *current_dir;
+-    char de[sizeof(struct dirent) + MAXNAMLEN + 1]; /* overcommit for solaris */
++    char de[sizeof(struct dirent) + NAME_MAX + 1]; /* overcommit for solaris */
+     struct dirent *pde;
+     int err;
+     char mp3_path[PATH_MAX];
diff --git a/audio/mt-daapd/patches/patch-ac b/audio/mt-daapd/patches/patch-ac
new file mode 100644
index 00000000000..1712055aec0
--- /dev/null
+++ b/audio/mt-daapd/patches/patch-ac
@@ -0,0 +1,30 @@
+$NetBSD: patch-ac,v 1.1 2006/12/06 16:41:26 joerg Exp $
+
+--- configure.orig	2006-12-06 16:37:22.000000000 +0000
++++ configure
+@@ -3236,13 +3236,13 @@ if test $ac_cv_lib_c_r_pthread_creat = y
+   LDFLAGS="${LDFLAGS} -lc_r"
+ else
+ 
+-  echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
+-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
++  echo "$as_me:$LINENO: checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
++echo $ECHO_N "checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6
+ if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lpthread  $LIBS"
++LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -3301,7 +3301,7 @@ fi
+ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
+ echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6
+ if test $ac_cv_lib_pthread_pthread_create = yes; then
+-  LDFLAGS="${LDFLAGS} -lpthread"
++  LDFLAGS="${LDFLAGS} ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
+ fi
+ 
+ fi