Wed Jan 11 19:55:56 2012 UTC ()
Fix build on SunOS.


(hans)
diff -r1.11 -r1.12 pkgsrc/audio/mt-daapd/Makefile
diff -r1.5 -r1.6 pkgsrc/audio/mt-daapd/distinfo
diff -r1.1 -r1.2 pkgsrc/audio/mt-daapd/patches/patch-ab
cvs diff -r1.11 -r1.12 pkgsrc/audio/mt-daapd/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/mt-daapd/Makefile 2011/08/23 13:06:46 1.11
+++ pkgsrc/audio/mt-daapd/Makefile 2012/01/11 19:55:55 1.12
@@ -1,33 +1,35 @@ @@ -1,33 +1,35 @@
1# $NetBSD: Makefile,v 1.11 2011/08/23 13:06:46 obache Exp $ 1# $NetBSD: Makefile,v 1.12 2012/01/11 19:55:55 hans Exp $
2 2
3DISTNAME= mt-daapd-0.2.4.2 3DISTNAME= mt-daapd-0.2.4.2
4PKGREVISION= 2 4PKGREVISION= 2
5CATEGORIES= audio 5CATEGORIES= audio
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mt-daapd/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mt-daapd/}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.mt-daapd.org/ 9HOMEPAGE= http://www.mt-daapd.org/
10COMMENT= Server for DAAP (iTunes) 10COMMENT= Server for DAAP (iTunes)
11 11
12PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
13 13
14USE_LANGUAGES= c 14USE_LANGUAGES= c
15USE_TOOLS+= gmake 15USE_TOOLS+= gmake
16 16
17GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
18 18
19.include "../../mk/bsd.prefs.mk" 19.include "../../mk/bsd.prefs.mk"
20 20
 21CPPFLAGS.SunOS+= -std=c99 -Du_int32_t=uint32_t
 22
21RCD_SCRIPTS= mtdaapd 23RCD_SCRIPTS= mtdaapd
22EGDIR= ${PREFIX}/share/examples/${PKGBASE} 24EGDIR= ${PREFIX}/share/examples/${PKGBASE}
23MTDAAPD_USER?= mtdaapd 25MTDAAPD_USER?= mtdaapd
24MTDAAPD_GROUP?= mtdaapd 26MTDAAPD_GROUP?= mtdaapd
25PKG_USERS= ${MTDAAPD_USER}:${MTDAAPD_GROUP} 27PKG_USERS= ${MTDAAPD_USER}:${MTDAAPD_GROUP}
26PKG_GROUPS= ${MTDAAPD_GROUP} 28PKG_GROUPS= ${MTDAAPD_GROUP}
27BUILD_DEFS+= VARBASE 29BUILD_DEFS+= VARBASE
28 30
29PKG_USERS_VARS+= MTDAAPD_USER 31PKG_USERS_VARS+= MTDAAPD_USER
30PKG_GROUPS_VARS+= MTDAAPD_GROUP 32PKG_GROUPS_VARS+= MTDAAPD_GROUP
31 33
32CONF_FILES_PERMS= ${EGDIR}/mt-daapd.conf ${PKG_SYSCONFDIR}/mt-daapd.conf \ 34CONF_FILES_PERMS= ${EGDIR}/mt-daapd.conf ${PKG_SYSCONFDIR}/mt-daapd.conf \
33 ${MTDAAPD_USER} ${MTDAAPD_GROUP} 0660 35 ${MTDAAPD_USER} ${MTDAAPD_GROUP} 0660
cvs diff -r1.5 -r1.6 pkgsrc/audio/mt-daapd/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/mt-daapd/distinfo 2008/11/23 22:57:05 1.5
+++ pkgsrc/audio/mt-daapd/distinfo 2012/01/11 19:55:55 1.6
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.5 2008/11/23 22:57:05 tron Exp $ 1$NetBSD: distinfo,v 1.6 2012/01/11 19:55:55 hans Exp $
2 2
3SHA1 (mt-daapd-0.2.4.2.tar.gz) = 5f1c04100b1d18a9cf6f03f879b5c3e9a7bd172f 3SHA1 (mt-daapd-0.2.4.2.tar.gz) = 5f1c04100b1d18a9cf6f03f879b5c3e9a7bd172f
4RMD160 (mt-daapd-0.2.4.2.tar.gz) = 918b76ffe3af7b0413be1cbbafdd11274f5d3e9d 4RMD160 (mt-daapd-0.2.4.2.tar.gz) = 918b76ffe3af7b0413be1cbbafdd11274f5d3e9d
5Size (mt-daapd-0.2.4.2.tar.gz) = 436513 bytes 5Size (mt-daapd-0.2.4.2.tar.gz) = 436513 bytes
6SHA1 (patch-aa) = e177bb33c19badb1da8638af61a3c3bfddf2a2ad 6SHA1 (patch-aa) = e177bb33c19badb1da8638af61a3c3bfddf2a2ad
7SHA1 (patch-ab) = be78b7f5089d3283e0cb9ee3c64a4a53360899d7 7SHA1 (patch-ab) = 33eb0e43fbef31ede52660af24350ca0ac52e434
8SHA1 (patch-ac) = 363a0a2ec43b7fcc8fbff75ce13885cf9969e0a4 8SHA1 (patch-ac) = 363a0a2ec43b7fcc8fbff75ce13885cf9969e0a4
9SHA1 (patch-ad) = ec48904eaf6cb77448f04cfe5022411b8bda9ae1 9SHA1 (patch-ad) = ec48904eaf6cb77448f04cfe5022411b8bda9ae1
cvs diff -r1.1 -r1.2 pkgsrc/audio/mt-daapd/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/audio/mt-daapd/patches/patch-ab 2006/12/06 16:41:26 1.1
+++ pkgsrc/audio/mt-daapd/patches/patch-ab 2012/01/11 19:55:56 1.2
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-ab,v 1.1 2006/12/06 16:41:26 joerg Exp $ 1$NetBSD: patch-ab,v 1.2 2012/01/11 19:55:56 hans Exp $
2 2
3--- src/mp3-scanner.c.orig 2006-12-06 16:35:37.000000000 +0000 3--- src/mp3-scanner.c.orig 2006-12-06 16:35:37.000000000 +0000
4+++ src/mp3-scanner.c 4+++ src/mp3-scanner.c
5@@ -378,7 +378,7 @@ int scan_init(char *path) { 5@@ -378,7 +378,7 @@ int scan_init(char *path) {
6 */ 6 */
7 int scan_path(char *path) { 7 int scan_path(char *path) {
8 DIR *current_dir; 8 DIR *current_dir;
9- char de[sizeof(struct dirent) + MAXNAMLEN + 1]; /* overcommit for solaris */ 9- char de[sizeof(struct dirent) + MAXNAMLEN + 1]; /* overcommit for solaris */
10+ char de[sizeof(struct dirent) + NAME_MAX + 1]; /* overcommit for solaris */ 10+ char de[sizeof(struct dirent) + FILENAME_MAX + 1]; /* overcommit for solaris */
11 struct dirent *pde; 11 struct dirent *pde;
12 int err; 12 int err;
13 char mp3_path[PATH_MAX]; 13 char mp3_path[PATH_MAX];