Thu Mar 1 19:44:42 2012 UTC ()
Fix build on SunOS.


(hans)
diff -r1.4 -r1.5 pkgsrc/graphics/camediaplay/distinfo
diff -r1.1 -r1.2 pkgsrc/graphics/camediaplay/patches/patch-aa
cvs diff -r1.4 -r1.5 pkgsrc/graphics/camediaplay/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/camediaplay/distinfo 2005/12/18 23:32:49 1.4
+++ pkgsrc/graphics/camediaplay/distinfo 2012/03/01 19:44:42 1.5
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.4 2005/12/18 23:32:49 joerg Exp $ 1$NetBSD: distinfo,v 1.5 2012/03/01 19:44:42 hans Exp $
2 2
3SHA1 (camediaplay-20010211.tar.gz) = d6809c9d0e1be692a9a1e468ee759cc9ceb5b276 3SHA1 (camediaplay-20010211.tar.gz) = d6809c9d0e1be692a9a1e468ee759cc9ceb5b276
4RMD160 (camediaplay-20010211.tar.gz) = 17fcd6f1c23b43169ed8de0c726c951cea0fcd80 4RMD160 (camediaplay-20010211.tar.gz) = 17fcd6f1c23b43169ed8de0c726c951cea0fcd80
5Size (camediaplay-20010211.tar.gz) = 48193 bytes 5Size (camediaplay-20010211.tar.gz) = 48193 bytes
6SHA1 (patch-aa) = 094b164286609808635c1bf81e8e551adad670e2 6SHA1 (patch-aa) = a722870475d6c3fe43e2f8adb529e665e654cad5
cvs diff -r1.1 -r1.2 pkgsrc/graphics/camediaplay/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/graphics/camediaplay/patches/patch-aa 2005/12/18 23:32:49 1.1
+++ pkgsrc/graphics/camediaplay/patches/patch-aa 2012/03/01 19:44:42 1.2
@@ -1,38 +1,44 @@ @@ -1,38 +1,44 @@
1$NetBSD: patch-aa,v 1.1 2005/12/18 23:32:49 joerg Exp $ 1$NetBSD: patch-aa,v 1.2 2012/03/01 19:44:42 hans Exp $
2 2
3--- ../src/uucplock.c.orig 2005-12-18 23:25:20.000000000 +0000 3--- ../src/uucplock.c.orig 2005-12-18 23:25:20.000000000 +0000
4+++ ../src/uucplock.c 4+++ ../src/uucplock.c
5@@ -40,6 +40,7 @@ static char sccsid[] = "@(#)uucplock.c 5 5@@ -38,8 +38,12 @@ static char sccsid[] = "@(#)uucplock.c 5
 6 #include "config.h"
 7
6 #include <sys/file.h> 8 #include <sys/file.h>
7 #include <sys/dir.h> 9-#include <sys/dir.h>
 10+#include <dirent.h>
8 #include <errno.h> 11 #include <errno.h>
9+#include <limits.h> 12+#include <limits.h>
 13+#include <sys/types.h>
 14+#include <sys/stat.h>
 15+#include <fcntl.h>
10  16
11 #include "pathnames.h" 17 #include "pathnames.h"
12  18
13@@ -52,9 +53,12 @@ static char sccsid[] = "@(#)uucplock.c 5 19@@ -52,9 +56,12 @@ static char sccsid[] = "@(#)uucplock.c 5
14 uu_lock(ttyname) 20 uu_lock(ttyname)
15 char *ttyname; 21 char *ttyname;
16 { 22 {
17- extern int errno; 23- extern int errno;
18 int fd, pid; 24 int fd, pid;
19+#ifdef NAME_MAX 25+#ifdef NAME_MAX
20+ char tbuf[sizeof(_PATH_LOCKDIRNAME) + NAME_MAX]; 26+ char tbuf[sizeof(_PATH_LOCKDIRNAME) + NAME_MAX];
21+#else 27+#else
22 char tbuf[sizeof(_PATH_LOCKDIRNAME) + MAXNAMLEN]; 28 char tbuf[sizeof(_PATH_LOCKDIRNAME) + MAXNAMLEN];
23+#endif 29+#endif
24 off_t lseek(); 30 off_t lseek();
25  31
26 (void)snprintf(tbuf, sizeof(tbuf), _PATH_LOCKDIRNAME, ttyname); 32 (void)snprintf(tbuf, sizeof(tbuf), _PATH_LOCKDIRNAME, ttyname);
27@@ -104,7 +108,11 @@ uu_lock(ttyname) 33@@ -104,7 +111,11 @@ uu_lock(ttyname)
28 uu_unlock(ttyname) 34 uu_unlock(ttyname)
29 char *ttyname; 35 char *ttyname;
30 { 36 {
31+#ifdef NAME_MAX 37+#ifdef NAME_MAX
32+ char tbuf[sizeof(_PATH_LOCKDIRNAME) + NAME_MAX]; 38+ char tbuf[sizeof(_PATH_LOCKDIRNAME) + NAME_MAX];
33+#else 39+#else
34 char tbuf[sizeof(_PATH_LOCKDIRNAME) + MAXNAMLEN]; 40 char tbuf[sizeof(_PATH_LOCKDIRNAME) + MAXNAMLEN];
35+#endif 41+#endif
36  42
37 (void)snprintf(tbuf, sizeof(tbuf), _PATH_LOCKDIRNAME, ttyname); 43 (void)snprintf(tbuf, sizeof(tbuf), _PATH_LOCKDIRNAME, ttyname);
38 return(unlink(tbuf)); 44 return(unlink(tbuf));