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).

7 files changed, 7 insertions, 107 deletions

diff --git a/net/coda/Makefile b/net/coda/Makefile
index e89149865f5..a379cd9366c 100644
--- a/net/coda/Makefile
+++ b/net/coda/Makefile
@@ -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 @@ COMMENT=	Coda distributed fileystem
 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.
diff --git a/net/coda/distinfo b/net/coda/distinfo
index 301ba8ab4c9..c68a8459a52 100644
--- a/net/coda/distinfo
+++ b/net/coda/distinfo
@@ -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
diff --git a/net/coda/patches/patch-ac b/net/coda/patches/patch-ac
index 03ec0a8fe02..2a030ce6f3b 100644
--- a/net/coda/patches/patch-ac
+++ b/net/coda/patches/patch-ac
@@ -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);
@@ -50,7 +22,6 @@ magic value of 256 is taken from coda_vfsops in coda_vfsops.c.
  	if (error < 0)
  	    error = mount("cfs", venusRoot, 0, kernDevice);
 +#endif
-+#endif
 +
  #if defined(__FreeBSD__) && !defined(__FreeBSD_version)
  #define MOUNT_CFS 19
diff --git a/net/coda/patches/patch-coda-src_kerndep_pioctl.h b/net/coda/patches/patch-coda-src_kerndep_pioctl.h
deleted file mode 100644
index d05f25a202c..00000000000
--- a/net/coda/patches/patch-coda-src_kerndep_pioctl.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-coda-src_kerndep_pioctl.h,v 1.1 2012/07/15 17:39:17 marino Exp $
-
---- coda-src/kerndep/pioctl.h.orig	2012-07-15 01:56:33.000000000 +0000
-+++ coda-src/kerndep/pioctl.h
-@@ -81,7 +81,7 @@ int pioctl(const char *path, unsigned lo
- /* unpacking macros */
- #ifndef _IOC_NR
- 
--#if defined(__NetBSD__) || defined(__FreeBSD__)
-+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
- #define _IOC_TYPEMASK	0xff
- #define _IOC_TYPESHIFT	8
- #define _IOC_NRMASK	0xff
diff --git a/net/coda/patches/patch-coda-src_resolution_rename.cc b/net/coda/patches/patch-coda-src_resolution_rename.cc
deleted file mode 100644
index 32b96fc4e1a..00000000000
--- a/net/coda/patches/patch-coda-src_resolution_rename.cc
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-coda-src_resolution_rename.cc,v 1.2 2012/07/22 03:20:03 dholland Exp $
-
-Make sure MAXNAMLEN is defined by filling in from NAME_MAX, which is
-standard. (It isn't clear why this expects MAXNAMLEN to be defined
-without including sys/param.h, or on what platforms it built
-succesfully that way. It maybe should be using CODA_MAXNAMLEN instead;
-I can't tell for sure.)
-
---- coda-src/resolution/rename.cc.orig	2006-09-19 17:35:48.000000000 +0000
-+++ coda-src/resolution/rename.cc
-@@ -21,6 +21,7 @@ extern "C" {
- #endif
- 
- #include <stdio.h>
-+#include <limits.h>
- #include <rpc2/rpc2.h>
- #ifndef __CYGWIN32__
- #include <dirent.h>
-@@ -51,6 +52,10 @@ extern "C" {
- #include "rsle.h"
- #include "resstats.h"
- 
-+#ifndef MAXNAMLEN
-+#define MAXNAMLEN NAME_MAX
-+#endif
-+
- static void AddToIncList(dlist *, dlist *, Volume *, ViceFid *, int =0);
- static int CheckResolveRenameSemantics(rsle *, Volume *, ViceFid *, dlist *, vle **, vle **, vle **, 
- 					vle **,olist *, dlist *, dlist *, int *);
diff --git a/net/coda/patches/patch-coda-src_venus_venusrecov.cc b/net/coda/patches/patch-coda-src_venus_venusrecov.cc
deleted file mode 100644
index 1995807d6a6..00000000000
--- a/net/coda/patches/patch-coda-src_venus_venusrecov.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-coda-src_venus_venusrecov.cc,v 1.1 2012/07/15 17:39:17 marino Exp $
-
---- coda-src/venus/venusrecov.cc.orig	2008-10-06 16:52:18.000000000 +0000
-+++ coda-src/venus/venusrecov.cc
-@@ -99,6 +99,7 @@ unsigned long MAXTS = UNSET_MAXTS;
- 
- #if defined(NetBSD1_3) || defined(__NetBSD_Version__) || defined(__OpenBSD__) \
-  || defined(__linux__) || defined(__CYGWIN32__) || defined(__FreeBSD_version)  \
-+ || defined(__DragonFly__) \
-  || (defined(__APPLE__) && defined(__MACH__))
- static const char *VM_RVMADDR = (char *)0x50000000;
- 
diff --git a/net/coda/patches/patch-config.h.in b/net/coda/patches/patch-config.h.in
deleted file mode 100644
index e67d009917e..00000000000
--- a/net/coda/patches/patch-config.h.in
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-config.h.in,v 1.1 2012/07/15 17:39:17 marino Exp $
-
---- config.h.in.orig	2012-07-15 02:11:57.000000000 +0000
-+++ config.h.in
-@@ -1,5 +1,9 @@
- /* config.h.in.  Generated from configure.ac by autoheader.  */
- 
-+#ifdef __DragonFly__
-+#define MAXNAMLEN 255
-+#endif
-+
- /* offsetof works with offsetof(type,member) */
- #undef CODA_OFFSETOF_OFFSETOF
-