@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2012/07/22 03:20:03 dholland Exp $
+# $NetBSD: Makefile,v 1.14 2012/08/03 10:32:54 marino Exp $
 #
 
 DISTNAME=	coda-6.9.5
-PKGEREVISION=	3
+PKGREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	http://www.coda.cs.cmu.edu/pub/coda/src/
 
@@ -13,6 +13,7 @@
 LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
+NOT_FOR_PLATFORM+=	DragonFly-*-*
 
 # See http://coda.wikidev.net/Quick_Client_Action for hints on how
 # to configure venus.

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

@@ -1,44 +1,16 @@
-$NetBSD: patch-ac,v 1.5 2012/07/15 17:39:17 marino Exp $
+$NetBSD: patch-ac,v 1.6 2012/08/03 10:32:55 marino Exp $
 
 Added experimental code to support mounting on NetBSD >= 4.99.24. The
 magic value of 256 is taken from coda_vfsops in coda_vfsops.c.
 
 --- coda-src/venus/worker.cc.orig	2008-10-06 16:52:22.000000000 +0000
 +++ coda-src/venus/worker.cc
-@@ -53,6 +53,10 @@ extern "C" {
- #include <sys/param.h>
- #endif
- 
-+#ifdef  __DragonFly__
-+#include <sys/param.h>
-+#endif
-+
- #ifdef __linux__
- #if !defined(__GLIBC__) || __GLIBC__ < 2
- #include <linux/fs.h>
-@@ -84,6 +88,10 @@ extern "C" {
- #define __BSD44__
- #endif
- 
-+#if defined(__DragonFly__)
-+#define __BSD44__
-+#endif
-+
- /* interfaces */
- /* from vicedep */
- #include <venusioctl.h>
-@@ -403,11 +411,26 @@ void VFSMount()
+@@ -403,11 +403,19 @@ void VFSMount()
  	    error = nmount(md, 6, 0);
  	}
  #endif
 -			
 +
-+#if defined(__DragonFly__)
-+	if (error < 0)
-+	    error = mount("coda", venusRoot, 0, (void *)kernDevice);
-+	if (error < 0)
-+	    error = mount("cfs", venusRoot, 0, (void *)kernDevice);
-+#else
 +#if defined(__NetBSD__) && defined(__NetBSD_Prereq__) && __NetBSD_Prereq__(4,99,24)
 +	if (error < 0)
 +	    error = mount("coda", venusRoot, 0, (void *)kernDevice, 256);
@@ -49,7 +21,6 @@
  	    error = mount("coda", venusRoot, 0, kernDevice);
  	if (error < 0)
  	    error = mount("cfs", venusRoot, 0, kernDevice);
-+#endif
 +#endif
 +
  #if defined(__FreeBSD__) && !defined(__FreeBSD_version)