$NetBSD: patch-ap,v 1.2 2008/01/04 06:48:06 martti Exp $

--- src/main.c.orig	2006-05-16 06:12:35.000000000 +0300
+++ src/main.c	2008-01-02 14:45:05.000000000 +0200
@@ -46,6 +46,7 @@
 int quiet = 0;
 int trace = 0;
 int noexec = 0;
+int nolock = 0;
 int logoff = 0;
 
 /*
@@ -60,6 +61,7 @@
 int top_level_admin = 0;
 
 mode_t cvsumask = UMASK_DFLT;
+char *RCS_citag = NULL;
 
 char *CurDir;
 
@@ -249,6 +251,7 @@
     "    -r           Make checked-out files read-only.\n",
     "    -w           Make checked-out files read-write (default).\n",
     "    -n           Do not execute anything that will change the disk.\n",
+    "    -u           Don't create locks (implies -l).\n",
     "    -t           Show trace of program execution -- try with -n.\n",
     "    -v           CVS version and copyright.\n",
     "    -T tmpdir    Use 'tmpdir' for temporary files.\n",
@@ -407,7 +410,7 @@
     int help = 0;		/* Has the user asked for help?  This
 				   lets us support the `cvs -H cmd'
 				   convention to give help for cmd. */
-    static const char short_options[] = "+Qqrwtnvb:T:e:d:Hfz:s:xa";
+    static const char short_options[] = "+Qqrwtunvb:T:e:d:Hfz:s:xa";
     static struct option long_options[] =
     {
         {"help", 0, NULL, 'H'},
@@ -531,6 +534,11 @@
 		break;
 	    case 'n':
 		noexec = 1;
+		nolock = 1;
+		logoff = 1;
+		break;
+	    case 'u':
+		nolock = 1;
 		logoff = 1;
 		break;
 	    case 'v':