Sun Feb 9 17:23:54 2014 UTC ()
Fix build on SunOS: link network libs and needed an include for sys/mkdev.h


(wiedi)
diff -r1.4 -r1.5 pkgsrc/filesystems/u9fs/Makefile
diff -r1.4 -r1.5 pkgsrc/filesystems/u9fs/distinfo
diff -r1.3 -r1.4 pkgsrc/filesystems/u9fs/patches/patch-aa
diff -r1.2 -r1.3 pkgsrc/filesystems/u9fs/patches/patch-ab
cvs diff -r1.4 -r1.5 pkgsrc/filesystems/u9fs/Makefile (expand / switch to unified diff)

--- pkgsrc/filesystems/u9fs/Makefile 2012/10/03 16:08:33 1.4
+++ pkgsrc/filesystems/u9fs/Makefile 2014/02/09 17:23:54 1.5
@@ -1,16 +1,18 @@ @@ -1,16 +1,18 @@
1# $NetBSD: Makefile,v 1.4 2012/10/03 16:08:33 asau Exp $ 1# $NetBSD: Makefile,v 1.5 2014/02/09 17:23:54 wiedi Exp $
2# 2#
3 3
4DISTNAME= u9fs-2.0.3 4DISTNAME= u9fs-2.0.3
5CATEGORIES= filesystems 5CATEGORIES= filesystems
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=v9fs/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=v9fs/}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://plan9.bell-labs.com/ 9HOMEPAGE= http://plan9.bell-labs.com/
10COMMENT= Unix file server using the 9P protocol 10COMMENT= Unix file server using the 9P protocol
11 11
12WRKSRC= ${WRKDIR}/u9fs 12WRKSRC= ${WRKDIR}/u9fs
13 13
14MAKE_FILE= makefile 14MAKE_FILE= makefile
15 15
 16LDFLAGS.SunOS+= -lsocket -lnsl
 17
16.include "../../mk/bsd.pkg.mk" 18.include "../../mk/bsd.pkg.mk"
cvs diff -r1.4 -r1.5 pkgsrc/filesystems/u9fs/distinfo (expand / switch to unified diff)

--- pkgsrc/filesystems/u9fs/distinfo 2011/01/06 05:03:30 1.4
+++ pkgsrc/filesystems/u9fs/distinfo 2014/02/09 17:23:54 1.5
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.4 2011/01/06 05:03:30 agc Exp $ 1$NetBSD: distinfo,v 1.5 2014/02/09 17:23:54 wiedi Exp $
2 2
3SHA1 (u9fs-2.0.3.tar.gz) = 98b6d1b26a516761ee392d2c3ed15528af84601b 3SHA1 (u9fs-2.0.3.tar.gz) = 98b6d1b26a516761ee392d2c3ed15528af84601b
4RMD160 (u9fs-2.0.3.tar.gz) = 460879d27c4d282a3b4822c194b2abf458851b4d 4RMD160 (u9fs-2.0.3.tar.gz) = 460879d27c4d282a3b4822c194b2abf458851b4d
5Size (u9fs-2.0.3.tar.gz) = 42325 bytes 5Size (u9fs-2.0.3.tar.gz) = 42325 bytes
6SHA1 (patch-aa) = 2a8f531d85187737b779fe6e339def22ae3c76e5 6SHA1 (patch-aa) = 790924f9761fc90cb8db2b4ca0385eca864dfc73
7SHA1 (patch-ab) = c5fe5cdc5fccca3085f6c6542496623d43928bfe 7SHA1 (patch-ab) = 34a5460b9a3d527e65e31940f66a83d295ac3ef1
8SHA1 (patch-ac) = 7251853f1dc6cecaaf67c617e5dfb74ecae12b19 8SHA1 (patch-ac) = 7251853f1dc6cecaaf67c617e5dfb74ecae12b19
9SHA1 (patch-ad) = d7a26f4db9eb543ee47dc621b7a79be11d4f42cd 9SHA1 (patch-ad) = d7a26f4db9eb543ee47dc621b7a79be11d4f42cd
10SHA1 (patch-ae) = 8fd3ddbe26275361878c5820f46092005f36f887 10SHA1 (patch-ae) = 8fd3ddbe26275361878c5820f46092005f36f887
cvs diff -r1.3 -r1.4 pkgsrc/filesystems/u9fs/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/filesystems/u9fs/patches/patch-aa 2009/07/08 16:44:49 1.3
+++ pkgsrc/filesystems/u9fs/patches/patch-aa 2014/02/09 17:23:54 1.4
@@ -1,18 +1,27 @@ @@ -1,18 +1,27 @@
1$NetBSD: patch-aa,v 1.3 2009/07/08 16:44:49 joerg Exp $ 1$NetBSD: patch-aa,v 1.4 2014/02/09 17:23:54 wiedi Exp $
2 2
3--- makefile 2007/04/23 21:54:35 1.1 3--- makefile.orig 2005-06-06 19:26:52.000000000 +0000
4+++ makefile 2007/04/23 21:55:35 4+++ makefile
5@@ -49,16 +49,19 @@ 5@@ -17,7 +17,7 @@
 6 #CC=cc
 7 CFLAGS=-g -I.
 8 LD=cc
 9-LDFLAGS=
 10+#LDFLAGS=
 11 LDTAIL=
 12
 13 OFILES=\
 14@@ -49,16 +49,19 @@ HFILES=\
6 fcall.h\ 15 fcall.h\
7 plan9.h 16 plan9.h
8  17
9-u9fs: $(OFILES) 18-u9fs: $(OFILES)
10+u9fs all: $(OFILES) 19+u9fs all: $(OFILES)
11 $(LD) $(LDFLAGS) -o u9fs $(OFILES) $(LDTAIL) 20 $(LD) $(LDFLAGS) -o u9fs $(OFILES) $(LDTAIL)
12  21
13-%.o: %.c $(HFILES) 22-%.o: %.c $(HFILES)
14+.c.o: 23+.c.o:
15 $(CC) $(CFLAGS) -c $*.c 24 $(CC) $(CFLAGS) -c $*.c
16  25
17 clean: 26 clean:
18 rm -f *.o u9fs 27 rm -f *.o u9fs
cvs diff -r1.2 -r1.3 pkgsrc/filesystems/u9fs/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/filesystems/u9fs/patches/patch-ab 2011/01/06 05:03:31 1.2
+++ pkgsrc/filesystems/u9fs/patches/patch-ab 2014/02/09 17:23:54 1.3
@@ -1,33 +1,36 @@ @@ -1,33 +1,36 @@
1$NetBSD: patch-ab,v 1.2 2011/01/06 05:03:31 agc Exp $ 1$NetBSD: patch-ab,v 1.3 2014/02/09 17:23:54 wiedi Exp $
2 2
3--- u9fs.c 2007/04/23 22:01:05 1.1 3--- u9fs.c.orig 2005-06-06 19:26:52.000000000 +0000
4+++ u9fs.c 2007/04/23 22:29:28 4+++ u9fs.c
5@@ -28,7 +28,14 @@ 5@@ -28,7 +28,17 @@
6 #define DEFAULTLOG "/tmp/u9fs.log" 6 #define DEFAULTLOG "/tmp/u9fs.log"
7 #endif 7 #endif
8  8
9+#if __linux__ 9+#if __linux__
10 #include <linux/kdev_t.h> 10 #include <linux/kdev_t.h>
11+#elif defined(__NetBSD__) || defined(__APPLE__) || defined(__DragonFly__) || defined(__FreeBSD__)  11+#elif defined(__NetBSD__) || defined(__APPLE__) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__sun)
 12+#if defined(__sun)
 13+# include <sys/mkdev.h>
 14+#endif
12+#include <sys/types.h> 15+#include <sys/types.h>
13+#define MAJOR(m) major(m) 16+#define MAJOR(m) major(m)
14+#define MINOR(m) minor(m) 17+#define MINOR(m) minor(m)
15+#define MKDEV(maj,min) makedev(maj, min) 18+#define MKDEV(maj,min) makedev(maj, min)
16+#endif 19+#endif
17  20
18 char *logfile = DEFAULTLOG; 21 char *logfile = DEFAULTLOG;
19 char *rootpath = "/"; 22 char *rootpath = "/";
20@@ -752,11 +759,11 @@ 23@@ -752,11 +762,11 @@ stat2dir(char *path, struct stat *st, Di
21 } 24 }
22 d->extension = estrdup(link); 25 d->extension = estrdup(link);
23 } else if (d->mode&DMDEVICE) { 26 } else if (d->mode&DMDEVICE) {
24- int major = MAJOR(st->st_rdev); 27- int major = MAJOR(st->st_rdev);
25- int minor = MINOR(st->st_rdev); 28- int minor = MINOR(st->st_rdev);
26+ int majordev = MAJOR(st->st_rdev); 29+ int majordev = MAJOR(st->st_rdev);
27+ int minordev = MINOR(st->st_rdev); 30+ int minordev = MINOR(st->st_rdev);
28  31
29 if(S_ISCHR(st->st_mode)) { 32 if(S_ISCHR(st->st_mode)) {
30- sprintf(link, "c %u %u", major, minor); 33- sprintf(link, "c %u %u", major, minor);
31+ sprintf(link, "c %u %u", majordev, minordev); 34+ sprintf(link, "c %u %u", majordev, minordev);
32 } else { 35 } else {
33 sprintf(link, "b %u %u", MAJOR(st->st_rdev), MINOR(st->st_rdev)); 36 sprintf(link, "b %u %u", MAJOR(st->st_rdev), MINOR(st->st_rdev));