Fri Aug 3 10:32:55 2012 UTC ()
net/coda: Back out DragonFly patches

Coda requires a kernel module to run and DragonFly had such a kernel at
one point.  However the kernel was removed six years ago and there is no
desire to restore it.  One of the main reasons against doing so is the
lack of IPv6 support in Coda.

The userland patches for coda are therefore unnecessary and coda has been
reverted to its previous state save for marking NOT-FOR-DRAGONFLY.

PKGREVISION was mispelled in the makefile, so fixing that typo bumps the
revision to nb2 (caught by pkglint).


(marino)
diff -r1.13 -r1.14 pkgsrc/net/coda/Makefile
diff -r1.9 -r1.10 pkgsrc/net/coda/distinfo
diff -r1.5 -r1.6 pkgsrc/net/coda/patches/patch-ac
diff -r1.1 -r0 pkgsrc/net/coda/patches/patch-coda-src_kerndep_pioctl.h
diff -r1.1 -r0 pkgsrc/net/coda/patches/patch-coda-src_venus_venusrecov.cc
diff -r1.1 -r0 pkgsrc/net/coda/patches/patch-config.h.in
diff -r1.2 -r0 pkgsrc/net/coda/patches/patch-coda-src_resolution_rename.cc
cvs diff -r1.13 -r1.14 pkgsrc/net/coda/Makefile (expand / switch to unified diff)

--- pkgsrc/net/coda/Makefile 2012/07/22 03:20:03 1.13
+++ pkgsrc/net/coda/Makefile 2012/08/03 10:32:54 1.14
@@ -1,28 +1,29 @@ @@ -1,28 +1,29 @@
1# $NetBSD: Makefile,v 1.13 2012/07/22 03:20:03 dholland Exp $ 1# $NetBSD: Makefile,v 1.14 2012/08/03 10:32:54 marino Exp $
2# 2#
3 3
4DISTNAME= coda-6.9.5 4DISTNAME= coda-6.9.5
5PKGEREVISION= 3 5PKGREVISION= 3
6CATEGORIES= net 6CATEGORIES= net
7MASTER_SITES= http://www.coda.cs.cmu.edu/pub/coda/src/ 7MASTER_SITES= http://www.coda.cs.cmu.edu/pub/coda/src/
8 8
9MAINTAINER= gdt@NetBSD.org 9MAINTAINER= gdt@NetBSD.org
10HOMEPAGE= http://www.coda.cs.cmu.edu/ 10HOMEPAGE= http://www.coda.cs.cmu.edu/
11COMMENT= Coda distributed fileystem 11COMMENT= Coda distributed fileystem
12 12
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
15PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
 16NOT_FOR_PLATFORM+= DragonFly-*-*
16 17
17# See http://coda.wikidev.net/Quick_Client_Action for hints on how 18# See http://coda.wikidev.net/Quick_Client_Action for hints on how
18# to configure venus. 19# to configure venus.
19 20
20USE_TOOLS+= gmake pkg-config perl perl:run 21USE_TOOLS+= gmake pkg-config perl perl:run
21GNU_CONFIGURE= yes 22GNU_CONFIGURE= yes
22USE_LANGUAGES= c c++ 23USE_LANGUAGES= c c++
23REPLACE_PERL= coda-src/scripts/tape.pl coda-src/scripts/volmunge 24REPLACE_PERL= coda-src/scripts/tape.pl coda-src/scripts/volmunge
24 25
25.include "../../devel/lwp/buildlink3.mk" 26.include "../../devel/lwp/buildlink3.mk"
26.include "../../devel/rpc2/buildlink3.mk" 27.include "../../devel/rpc2/buildlink3.mk"
27.include "../../devel/rvm/buildlink3.mk" 28.include "../../devel/rvm/buildlink3.mk"
28.include "../../devel/readline/buildlink3.mk" 29.include "../../devel/readline/buildlink3.mk"
cvs diff -r1.9 -r1.10 pkgsrc/net/coda/distinfo (expand / switch to unified diff)

--- pkgsrc/net/coda/distinfo 2012/07/22 03:20:03 1.9
+++ pkgsrc/net/coda/distinfo 2012/08/03 10:32:54 1.10
@@ -1,12 +1,8 @@ @@ -1,12 +1,8 @@
1$NetBSD: distinfo,v 1.9 2012/07/22 03:20:03 dholland Exp $ 1$NetBSD: distinfo,v 1.10 2012/08/03 10:32:54 marino Exp $
2 2
3SHA1 (coda-6.9.5.tar.gz) = 248af27c506f5c3be4c4e53f821c9c904580fe60 3SHA1 (coda-6.9.5.tar.gz) = 248af27c506f5c3be4c4e53f821c9c904580fe60
4RMD160 (coda-6.9.5.tar.gz) = 9ef0643aacc7d1352ef253af00d4c7e6ad9e1f78 4RMD160 (coda-6.9.5.tar.gz) = 9ef0643aacc7d1352ef253af00d4c7e6ad9e1f78
5Size (coda-6.9.5.tar.gz) = 1723098 bytes 5Size (coda-6.9.5.tar.gz) = 1723098 bytes
6SHA1 (patch-ac) = 1084fe8c5dc26500bb13fdb492d1613e1e112f6e 6SHA1 (patch-ac) = b9f9fd68c633e09717252562b06238b87df1a6b7
7SHA1 (patch-ad) = adfee7c5d7de913ee3b898a13bf7acfeac52b765 7SHA1 (patch-ad) = adfee7c5d7de913ee3b898a13bf7acfeac52b765
8SHA1 (patch-coda-src_dir_dirbody.c) = 3e3524a4a03ce359956ae00d9b24d1aa3292c752 8SHA1 (patch-coda-src_dir_dirbody.c) = 3e3524a4a03ce359956ae00d9b24d1aa3292c752
9SHA1 (patch-coda-src_kerndep_pioctl.h) = d6e477b14e76492de0a800d07d83dad06aac1aa3 
10SHA1 (patch-coda-src_resolution_rename.cc) = 63895308b981a5fceeb8142db750ba7e3c2b7142 
11SHA1 (patch-coda-src_venus_venusrecov.cc) = 25e1e10aed36569aa7c336876c98bda648e4b7e2 
12SHA1 (patch-config.h.in) = 38e4118aa34c4f415b5fd4d8b7867af2d716ea83 
cvs diff -r1.5 -r1.6 pkgsrc/net/coda/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/net/coda/patches/Attic/patch-ac 2012/07/15 17:39:17 1.5
+++ pkgsrc/net/coda/patches/Attic/patch-ac 2012/08/03 10:32:55 1.6
@@ -1,57 +1,28 @@ @@ -1,57 +1,28 @@
1$NetBSD: patch-ac,v 1.5 2012/07/15 17:39:17 marino Exp $ 1$NetBSD: patch-ac,v 1.6 2012/08/03 10:32:55 marino Exp $
2 2
3Added experimental code to support mounting on NetBSD >= 4.99.24. The 3Added experimental code to support mounting on NetBSD >= 4.99.24. The
4magic value of 256 is taken from coda_vfsops in coda_vfsops.c. 4magic value of 256 is taken from coda_vfsops in coda_vfsops.c.
5 5
6--- coda-src/venus/worker.cc.orig 2008-10-06 16:52:22.000000000 +0000 6--- coda-src/venus/worker.cc.orig 2008-10-06 16:52:22.000000000 +0000
7+++ coda-src/venus/worker.cc 7+++ coda-src/venus/worker.cc
8@@ -53,6 +53,10 @@ extern "C" { 8@@ -403,11 +403,19 @@ void VFSMount()
9 #include <sys/param.h> 
10 #endif 
11  
12+#ifdef __DragonFly__ 
13+#include <sys/param.h> 
14+#endif 
15+ 
16 #ifdef __linux__ 
17 #if !defined(__GLIBC__) || __GLIBC__ < 2 
18 #include <linux/fs.h> 
19@@ -84,6 +88,10 @@ extern "C" { 
20 #define __BSD44__ 
21 #endif 
22  
23+#if defined(__DragonFly__) 
24+#define __BSD44__ 
25+#endif 
26+ 
27 /* interfaces */ 
28 /* from vicedep */ 
29 #include <venusioctl.h> 
30@@ -403,11 +411,26 @@ void VFSMount() 
31 error = nmount(md, 6, 0); 9 error = nmount(md, 6, 0);
32 } 10 }
33 #endif 11 #endif
34-  12-
35+ 13+
36+#if defined(__DragonFly__) 
37+ if (error < 0) 
38+ error = mount("coda", venusRoot, 0, (void *)kernDevice); 
39+ if (error < 0) 
40+ error = mount("cfs", venusRoot, 0, (void *)kernDevice); 
41+#else 
42+#if defined(__NetBSD__) && defined(__NetBSD_Prereq__) && __NetBSD_Prereq__(4,99,24) 14+#if defined(__NetBSD__) && defined(__NetBSD_Prereq__) && __NetBSD_Prereq__(4,99,24)
43+ if (error < 0) 15+ if (error < 0)
44+ error = mount("coda", venusRoot, 0, (void *)kernDevice, 256); 16+ error = mount("coda", venusRoot, 0, (void *)kernDevice, 256);
45+ if (error < 0) 17+ if (error < 0)
46+ error = mount("cfs", venusRoot, 0, (void *)kernDevice, 256); 18+ error = mount("cfs", venusRoot, 0, (void *)kernDevice, 256);
47+#else 19+#else
48 if (error < 0) 20 if (error < 0)
49 error = mount("coda", venusRoot, 0, kernDevice); 21 error = mount("coda", venusRoot, 0, kernDevice);
50 if (error < 0) 22 if (error < 0)
51 error = mount("cfs", venusRoot, 0, kernDevice); 23 error = mount("cfs", venusRoot, 0, kernDevice);
52+#endif 24+#endif
53+#endif 
54+ 25+
55 #if defined(__FreeBSD__) && !defined(__FreeBSD_version) 26 #if defined(__FreeBSD__) && !defined(__FreeBSD_version)
56 #define MOUNT_CFS 19 27 #define MOUNT_CFS 19
57 if (error < 0) 28 if (error < 0)
File Deleted: pkgsrc/net/coda/patches/Attic/patch-coda-src_kerndep_pioctl.h
File Deleted: pkgsrc/net/coda/patches/Attic/patch-coda-src_venus_venusrecov.cc
File Deleted: pkgsrc/net/coda/patches/Attic/patch-config.h.in
File Deleted: pkgsrc/net/coda/patches/Attic/patch-coda-src_resolution_rename.cc