* Fix build on Darwin 11.0.1.

* Patches regen.

26 files changed, 141 insertions, 109 deletions

diff --git a/devel/scmcvs/distinfo b/devel/scmcvs/distinfo
index 5e6715720ec..2cb369c4627 100644
--- a/devel/scmcvs/distinfo
+++ b/devel/scmcvs/distinfo
@@ -1,29 +1,31 @@
-$NetBSD: distinfo,v 1.5 2011/02/12 01:58:54 obache Exp $
+$NetBSD: distinfo,v 1.6 2011/09/22 15:16:26 ryoon Exp $
 
 SHA1 (cvs-1.11.23.tar.bz2) = a51c531eebaff2dfdcc0fb6d94c8c6e509e06d7d
 RMD160 (cvs-1.11.23.tar.bz2) = ff8c5c6777f1c12ee9134a3cf59e00c2ebaad279
 Size (cvs-1.11.23.tar.bz2) = 2942652 bytes
-SHA1 (patch-aa) = 6053ea05fff9ec2221f5698be0fa29705db9d2fe
-SHA1 (patch-ab) = 0d2b78b2e9414c871c6c4b8b1e7077231bc31037
-SHA1 (patch-ac) = 5aad5757f671c49fe6f151fb1b3db778399cfbe2
-SHA1 (patch-ad) = da297e6f5f1a8ad4cf0c47f7b57f6bbb860ea64c
-SHA1 (patch-ae) = cb20f5a7cbdc2504c4d847618ef2e3c1d2e8e82a
-SHA1 (patch-af) = fe22f70e0d281822fb74e8b3c43715ca7f987e79
-SHA1 (patch-ag) = 5dd358a7dbf5db402d3e56faf49e8748afdd05f2
-SHA1 (patch-ah) = 47b9f55979ed65844efe22fb614b105ae247408d
-SHA1 (patch-ai) = d51b3f1429e73156cbfb7e0480a34ac6ce7a208d
-SHA1 (patch-ak) = 8be3a5014e9dce3ae5381bcdaaa4530349e6f58c
-SHA1 (patch-al) = 1c28186b8a223fa8332427ca554733e04d60b4c1
-SHA1 (patch-am) = 76285476206efe60bdcaf3623ec3cec1cb13cb68
-SHA1 (patch-an) = 3a72df42abde4749d1a15e54481845ba8337f863
-SHA1 (patch-ao) = 035bdc8d83d88577e62602f2fb669f1d0c94f49b
-SHA1 (patch-ap) = ca220110350d6b71338a8bdd079dec5be163883f
-SHA1 (patch-aq) = a1fe8e522d05a8fdf3ac6dcb03892b6e6b9d8040
-SHA1 (patch-ar) = 71bde28be8013aa1990d773b183b5f4e32cf71fa
-SHA1 (patch-at) = 712f5b9b2f8154d5fe5be6fd7c289d60feb56a10
-SHA1 (patch-au) = cc74afc89f98659524cabc8cb4e0a3debba0f11b
-SHA1 (patch-av) = 84da8f0a398ddf36412becb2aebd7008e3f80c44
-SHA1 (patch-ay) = 6ba3315df137028fc5b2bebfef79aa3d540994c4
-SHA1 (patch-az) = a4b14163d50c43f130715d4d8540bb4316e4290a
-SHA1 (patch-ba) = 25f9a2f7e35db0d2bfefae5ebf7be43d21a8a9ee
+SHA1 (patch-aa) = 948f78730d1e7755371838e7915d2706def3b539
+SHA1 (patch-ab) = 2864d35dfcdea456537d296a8efb4ade006913cf
+SHA1 (patch-ac) = 6a93eec69346691e7a442407a906aac30c7c3341
+SHA1 (patch-ad) = 984dc49845ee6d43dead1c54ae1f8371844fa6eb
+SHA1 (patch-ae) = 0e763fe3f62714f094a35482f5e99477adf83784
+SHA1 (patch-af) = 1ea3769fc5c93ad2c8126aea5c68b98c5174e36b
+SHA1 (patch-ag) = 7821cee0571c9fb5a35b92bfdb7f65a86f8ce87d
+SHA1 (patch-ah) = 6153bc9bd46ef7632afb2665e2c21a21baa50556
+SHA1 (patch-ai) = d34d353860bffe774fcae87f8f93b4e125d78ccd
+SHA1 (patch-ak) = 471c3a057263e94e372811b1f9d05a7ab8174842
+SHA1 (patch-al) = 36429c9a80bee21cc797ceb49e1a15caae925c3c
+SHA1 (patch-am) = 35df79307083caf3c77fcc58144cd4b34ee18db0
+SHA1 (patch-an) = 2e927f99e27d09e3e9ab8aacce93e251862e436e
+SHA1 (patch-ao) = 70f8db86bafeb1102c634e11046c1823ac78eefd
+SHA1 (patch-ap) = 2b8892118b768f677071194494d6bb0a0e8925d0
+SHA1 (patch-aq) = add508a6cf8dd6aea8137f74da13576996c4f49d
+SHA1 (patch-ar) = 7d71ba10285ccaa58b0a2c55a21bd8716fa58ad5
+SHA1 (patch-at) = 1f77fd66babb386d6cbddc6cb34074f7ac7f07bb
+SHA1 (patch-au) = 137b12b879522ce64ecd506a8fbe8d344ef72d52
+SHA1 (patch-av) = f638f5bf5489c35c493885af5f7dfd7708660199
+SHA1 (patch-ay) = ec49abaa286e6be440a0efd910cf26c86835fe20
+SHA1 (patch-az) = 8000247fb946b4ac07261b1dedae4581a29476d7
+SHA1 (patch-ba) = 7153e12e5da86effd4285e147f9f534011982e07
+SHA1 (patch-lib_getline.c) = 2b21ebe8a9601723a12dfc18f124ed333c93b90b
+SHA1 (patch-lib_getline.h) = b1d41a81f63b5dea6dd5754de1dd898ae0d85fcc
 SHA1 (patch-lib_xsize.h) = d16bd33322fb7e3750f425d5ea58fbc3413b910b
diff --git a/devel/scmcvs/patches/patch-aa b/devel/scmcvs/patches/patch-aa
index 62404d03439..864bdb770b7 100644
--- a/devel/scmcvs/patches/patch-aa
+++ b/devel/scmcvs/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2009/04/25 11:41:59 sno Exp $
+$NetBSD: patch-aa,v 1.4 2011/09/22 15:16:26 ryoon Exp $
 
 --- Makefile.in.orig	2008-05-07 20:12:33.000000000 +0000
-+++ Makefile.in	2009-04-16 06:16:25.000000000 +0000
-@@ -61,7 +61,7 @@
++++ Makefile.in
+@@ -61,7 +61,7 @@ am__CONFIG_DISTCLEAN_FILES = config.stat
   configure.lineno config.status.lineno
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = config.h
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.3 2009/04/25 11:41:59 sno Exp $
  SOURCES =
  DIST_SOURCES =
  RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-@@ -193,7 +193,7 @@
+@@ -193,7 +193,7 @@ with_default_ssh = @with_default_ssh@
  
  # Unix source subdirs, where we'll want to run lint and etags:
  # This is a legacy variable from b4 Automake
diff --git a/devel/scmcvs/patches/patch-ab b/devel/scmcvs/patches/patch-ab
index 8f817a86407..11ffb8c14ba 100644
--- a/devel/scmcvs/patches/patch-ab
+++ b/devel/scmcvs/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2009/04/25 11:41:59 sno Exp $
+$NetBSD: patch-ab,v 1.4 2011/09/22 15:16:26 ryoon Exp $
 
 --- doc/cvs.texinfo.orig	2008-05-07 01:15:46.000000000 +0000
-+++ doc/cvs.texinfo	2009-04-16 06:39:23.000000000 +0000
-@@ -12803,6 +12803,11 @@
++++ doc/cvs.texinfo
+@@ -12803,6 +12803,11 @@ additional information and can store the
  a file, or mail it to appropriate persons, or maybe
  post it to a local newsgroup, or@dots{}  Your
  imagination is the limit!
diff --git a/devel/scmcvs/patches/patch-ac b/devel/scmcvs/patches/patch-ac
index 5303df4f21f..1a8bc9f536c 100644
--- a/devel/scmcvs/patches/patch-ac
+++ b/devel/scmcvs/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.3 2009/04/25 11:41:59 sno Exp $
+$NetBSD: patch-ac,v 1.4 2011/09/22 15:16:26 ryoon Exp $
 
 --- src/Makefile.in.orig	2008-05-07 20:12:32.000000000 +0000
-+++ src/Makefile.in	2009-04-16 06:42:20.000000000 +0000
-@@ -82,7 +82,7 @@
++++ src/Makefile.in
+@@ -82,7 +82,7 @@ am_cvs_OBJECTS = add.$(OBJEXT) admin.$(O
  	version.$(OBJEXT) vers_ts.$(OBJEXT) watch.$(OBJEXT) \
  	wrapper.$(OBJEXT) zlib.$(OBJEXT)
  cvs_OBJECTS = $(am_cvs_OBJECTS)
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.3 2009/04/25 11:41:59 sno Exp $
  binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
  SCRIPTS = $(bin_SCRIPTS)
  DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-@@ -206,7 +206,7 @@
+@@ -206,7 +206,7 @@ with_default_ssh = @with_default_ssh@
  # some namespace hackery going on that maybe shouldn't be.  Long term fix is to
  # try and remove naming ocnflicts and fix Automake to allow particular includes
  # to be attached only to particular object files.  Short term fix is either or.
@@ -20,7 +20,7 @@ $NetBSD: patch-ac,v 1.3 2009/04/25 11:41:59 sno Exp $
  bin_SCRIPTS = cvsbug
  
  # The cvs executable
-@@ -285,7 +285,7 @@
+@@ -285,7 +285,7 @@ cvs_SOURCES = \
  cvs_LDADD = \
  	../diff/libdiff.a \
  	../lib/libcvs.a \
diff --git a/devel/scmcvs/patches/patch-ad b/devel/scmcvs/patches/patch-ad
index c04743cd314..0300b0cd8cf 100644
--- a/devel/scmcvs/patches/patch-ad
+++ b/devel/scmcvs/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.1 2007/05/27 09:49:51 schmonz Exp $
+$NetBSD: patch-ad,v 1.2 2011/09/22 15:16:26 ryoon Exp $
 
---- lib/sighandle.c.orig	2004-02-03 15:37:50.000000000 +0100
+--- lib/sighandle.c.orig	2005-04-04 20:46:06.000000000 +0000
 +++ lib/sighandle.c
 @@ -155,8 +155,10 @@ int			sig;
  	this = SIG_handlers[sig];
diff --git a/devel/scmcvs/patches/patch-ae b/devel/scmcvs/patches/patch-ae
index ad55d7ac6fc..acdbb4f1a2f 100644
--- a/devel/scmcvs/patches/patch-ae
+++ b/devel/scmcvs/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.2 2008/01/04 06:48:06 martti Exp $
+$NetBSD: patch-ae,v 1.3 2011/09/22 15:16:26 ryoon Exp $
 
---- src/rcs.c.orig	2006-06-08 16:55:04.000000000 +0300
-+++ src/rcs.c	2008-01-02 14:43:41.000000000 +0200
-@@ -3533,7 +3533,7 @@
+--- src/rcs.c.orig	2008-05-07 15:57:34.000000000 +0000
++++ src/rcs.c
+@@ -3511,7 +3511,7 @@ struct rcs_keyword
      size_t len;
  };
  #define KEYWORD_INIT(s) (s), sizeof (s) - 1
@@ -11,7 +11,7 @@ $NetBSD: patch-ae,v 1.2 2008/01/04 06:48:06 martti Exp $
  {
      { KEYWORD_INIT ("Author") },
      { KEYWORD_INIT ("Date") },
-@@ -3546,6 +3546,7 @@
+@@ -3524,6 +3524,7 @@ static const struct rcs_keyword keywords
      { KEYWORD_INIT ("Revision") },
      { KEYWORD_INIT ("Source") },
      { KEYWORD_INIT ("State") },
@@ -19,7 +19,7 @@ $NetBSD: patch-ae,v 1.2 2008/01/04 06:48:06 martti Exp $
      { NULL, 0 }
  };
  enum keyword
-@@ -3560,7 +3561,8 @@
+@@ -3538,7 +3539,8 @@ enum keyword
      KEYWORD_RCSFILE,
      KEYWORD_REVISION,
      KEYWORD_SOURCE,
@@ -29,7 +29,7 @@ $NetBSD: patch-ae,v 1.2 2008/01/04 06:48:06 martti Exp $
  };
  
  /* Convert an RCS date string into a readable string.  This is like
-@@ -3697,6 +3699,11 @@
+@@ -3675,6 +3677,11 @@ expand_keywords (rcs, ver, name, log, lo
  	return;
      }
  
@@ -41,7 +41,7 @@ $NetBSD: patch-ae,v 1.2 2008/01/04 06:48:06 martti Exp $
      /* If we are using -kkvl, dig out the locker information if any.  */
      locker = NULL;
      if (expand == KFLAG_KVL)
-@@ -3788,6 +3795,7 @@
+@@ -3766,6 +3773,7 @@ expand_keywords (rcs, ver, name, log, lo
  
  	    case KEYWORD_HEADER:
  	    case KEYWORD_ID:
@@ -49,7 +49,7 @@ $NetBSD: patch-ae,v 1.2 2008/01/04 06:48:06 martti Exp $
  		{
  		    const char *path;
  		    int free_path;
-@@ -4466,7 +4474,7 @@
+@@ -4445,7 +4453,7 @@ RCS_checkout (rcs, workfile, rev, nameta
  	if (info != NULL)
  	{
  	    /* If the size of `devtype' changes, fix the sscanf call also */
diff --git a/devel/scmcvs/patches/patch-af b/devel/scmcvs/patches/patch-af
index cc91e3f3590..3c133bb3775 100644
--- a/devel/scmcvs/patches/patch-af
+++ b/devel/scmcvs/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.1 2007/05/27 09:49:51 schmonz Exp $
+$NetBSD: patch-af,v 1.2 2011/09/22 15:16:26 ryoon Exp $
 
---- src/update.c.orig	2005-09-24 19:58:16.000000000 +0200
+--- src/update.c.orig	2008-05-07 15:57:34.000000000 +0000
 +++ src/update.c
 @@ -1341,11 +1341,18 @@ VERS: ", 0);
  		    xchmod (finfo->file, 1);
diff --git a/devel/scmcvs/patches/patch-ag b/devel/scmcvs/patches/patch-ag
index cd22df01485..fbb52d74604 100644
--- a/devel/scmcvs/patches/patch-ag
+++ b/devel/scmcvs/patches/patch-ag
@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.1 2007/05/27 09:49:52 schmonz Exp $
+$NetBSD: patch-ag,v 1.2 2011/09/22 15:16:26 ryoon Exp $
 
---- lib/xtime.h.orig	2005-03-04 20:05:09.000000000 +0100
+--- lib/xtime.h.orig	2005-04-04 20:46:06.000000000 +0000
 +++ lib/xtime.h
 @@ -14,6 +14,9 @@
  #ifndef XTIME_HEADER_INCLUDED
diff --git a/devel/scmcvs/patches/patch-ah b/devel/scmcvs/patches/patch-ah
index 25df12f6917..be45f34c81e 100644
--- a/devel/scmcvs/patches/patch-ah
+++ b/devel/scmcvs/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.1 2007/05/27 09:49:52 schmonz Exp $
+$NetBSD: patch-ah,v 1.2 2011/09/22 15:16:26 ryoon Exp $
 
---- src/mkmodules.c.orig	2005-01-31 23:14:17.000000000 +0100
+--- src/mkmodules.c.orig	2008-05-07 15:57:34.000000000 +0000
 +++ src/mkmodules.c
-@@ -313,6 +313,9 @@ static const char *const config_contents
+@@ -324,6 +324,9 @@ static const char *const config_contents
      "# repositories.  Set it to `never' (the previous CVS behavior) to prevent\n",
      "# verifymsg scripts from changing the log message.\n",
      "#RereadLogAfterVerify=always\n",
diff --git a/devel/scmcvs/patches/patch-ai b/devel/scmcvs/patches/patch-ai
index 1b55db28172..80f58033542 100644
--- a/devel/scmcvs/patches/patch-ai
+++ b/devel/scmcvs/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.1 2007/05/27 09:49:52 schmonz Exp $
+$NetBSD: patch-ai,v 1.2 2011/09/22 15:16:26 ryoon Exp $
 
---- src/parseinfo.c.orig	2005-03-16 23:01:21.000000000 +0100
+--- src/parseinfo.c.orig	2008-05-07 15:57:34.000000000 +0000
 +++ src/parseinfo.c
-@@ -357,6 +357,14 @@ parse_config (cvsroot)
+@@ -360,6 +360,14 @@ parse_config (cvsroot)
  		goto error_return;
  	    }
  	}
diff --git a/devel/scmcvs/patches/patch-ak b/devel/scmcvs/patches/patch-ak
index fa18ba627ad..e2e3fe2a991 100644
--- a/devel/scmcvs/patches/patch-ak
+++ b/devel/scmcvs/patches/patch-ak
@@ -1,6 +1,6 @@
-$NetBSD: patch-ak,v 1.1 2007/05/27 09:49:52 schmonz Exp $
+$NetBSD: patch-ak,v 1.2 2011/09/22 15:16:26 ryoon Exp $
 
---- src/checkout.c.orig	2005-09-24 19:56:35.000000000 +0200
+--- src/checkout.c.orig	2005-09-26 23:13:24.000000000 +0000
 +++ src/checkout.c
 @@ -194,7 +194,7 @@ checkout (argc, argv)
  	    case 'p':
diff --git a/devel/scmcvs/patches/patch-al b/devel/scmcvs/patches/patch-al
index ead51272412..c94464c75b0 100644
--- a/devel/scmcvs/patches/patch-al
+++ b/devel/scmcvs/patches/patch-al
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.4 2009/04/25 11:41:59 sno Exp $
+$NetBSD: patch-al,v 1.5 2011/09/22 15:16:26 ryoon Exp $
 
 --- src/client.c.orig	2008-05-07 15:57:34.000000000 +0000
-+++ src/client.c	2009-04-16 06:12:44.000000000 +0000
-@@ -4510,6 +4510,16 @@
++++ src/client.c
+@@ -4510,6 +4510,16 @@ start_server ()
  		error (1, 0,
  		       "This server does not support the global -n option.");
  	}
diff --git a/devel/scmcvs/patches/patch-am b/devel/scmcvs/patches/patch-am
index a73ca338980..fbb00c83943 100644
--- a/devel/scmcvs/patches/patch-am
+++ b/devel/scmcvs/patches/patch-am
@@ -1,6 +1,6 @@
-$NetBSD: patch-am,v 1.1 2007/05/27 09:49:53 schmonz Exp $
+$NetBSD: patch-am,v 1.2 2011/09/22 15:16:26 ryoon Exp $
 
---- src/cvs.h.orig	2005-09-22 16:07:05.000000000 +0200
+--- src/cvs.h.orig	2006-08-25 15:48:55.000000000 +0000
 +++ src/cvs.h
 @@ -382,6 +382,7 @@ extern int really_quiet, quiet;
  extern int use_editor;
diff --git a/devel/scmcvs/patches/patch-an b/devel/scmcvs/patches/patch-an
index 1f0bf2604fa..08b3ba7188d 100644
--- a/devel/scmcvs/patches/patch-an
+++ b/devel/scmcvs/patches/patch-an
@@ -1,6 +1,6 @@
-$NetBSD: patch-an,v 1.1 2007/05/27 09:49:53 schmonz Exp $
+$NetBSD: patch-an,v 1.2 2011/09/22 15:16:26 ryoon Exp $
 
---- src/history.c.orig	2005-08-02 22:46:57.000000000 +0200
+--- src/history.c.orig	2008-05-07 15:57:34.000000000 +0000
 +++ src/history.c
 @@ -760,7 +760,7 @@ history_write (type, update_dir, revs, n
      if (trace)
diff --git a/devel/scmcvs/patches/patch-ao b/devel/scmcvs/patches/patch-ao
index 5c1b88e6237..c73a9d08779 100644
--- a/devel/scmcvs/patches/patch-ao
+++ b/devel/scmcvs/patches/patch-ao
@@ -1,8 +1,8 @@
-$NetBSD: patch-ao,v 1.1 2007/05/27 09:49:53 schmonz Exp $
+$NetBSD: patch-ao,v 1.2 2011/09/22 15:16:26 ryoon Exp $
 
---- src/lock.c.orig	2005-05-03 17:34:53.000000000 +0200
+--- src/lock.c.orig	2008-05-07 15:57:34.000000000 +0000
 +++ src/lock.c
-@@ -420,7 +420,7 @@ Reader_Lock (xrepository)
+@@ -423,7 +423,7 @@ Reader_Lock (xrepository)
  	(void) fprintf (stderr, "%s-> Reader_Lock(%s)\n", CLIENT_SERVER_STR,
                          xrepository);
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ao,v 1.1 2007/05/27 09:49:53 schmonz Exp $
  	return 0;
  
      /* we only do one directory at a time for read locks! */
-@@ -494,7 +494,7 @@ Writer_Lock (list)
+@@ -498,7 +498,7 @@ Writer_Lock (list)
  {
      char *wait_repos;
  
diff --git a/devel/scmcvs/patches/patch-ap b/devel/scmcvs/patches/patch-ap
index 080c613e268..b3de7f3612b 100644
--- a/devel/scmcvs/patches/patch-ap
+++ b/devel/scmcvs/patches/patch-ap
@@ -1,8 +1,8 @@
-$NetBSD: patch-ap,v 1.2 2008/01/04 06:48:06 martti Exp $
+$NetBSD: patch-ap,v 1.3 2011/09/22 15:16:26 ryoon 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 @@
+--- src/main.c.orig	2008-01-28 14:55:45.000000000 +0000
++++ src/main.c
+@@ -46,6 +46,7 @@ int really_quiet = 0;
  int quiet = 0;
  int trace = 0;
  int noexec = 0;
@@ -10,7 +10,7 @@ $NetBSD: patch-ap,v 1.2 2008/01/04 06:48:06 martti Exp $
  int logoff = 0;
  
  /*
-@@ -60,6 +61,7 @@
+@@ -60,6 +61,7 @@ int gzip_level;
  int top_level_admin = 0;
  
  mode_t cvsumask = UMASK_DFLT;
@@ -18,7 +18,7 @@ $NetBSD: patch-ap,v 1.2 2008/01/04 06:48:06 martti Exp $
  
  char *CurDir;
  
-@@ -249,6 +251,7 @@
+@@ -249,6 +251,7 @@ static const char *const opt_usage[] =
      "    -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",
@@ -26,7 +26,7 @@ $NetBSD: patch-ap,v 1.2 2008/01/04 06:48:06 martti Exp $
      "    -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 @@
+@@ -407,7 +410,7 @@ main (argc, argv)
      int help = 0;		/* Has the user asked for help?  This
  				   lets us support the `cvs -H cmd'
  				   convention to give help for cmd. */
@@ -35,7 +35,7 @@ $NetBSD: patch-ap,v 1.2 2008/01/04 06:48:06 martti Exp $
      static struct option long_options[] =
      {
          {"help", 0, NULL, 'H'},
-@@ -531,6 +534,11 @@
+@@ -531,6 +534,11 @@ main (argc, argv)
  		break;
  	    case 'n':
  		noexec = 1;
diff --git a/devel/scmcvs/patches/patch-aq b/devel/scmcvs/patches/patch-aq
index e66a6f85aa0..2ab5fe2da06 100644
--- a/devel/scmcvs/patches/patch-aq
+++ b/devel/scmcvs/patches/patch-aq
@@ -1,6 +1,6 @@
-$NetBSD: patch-aq,v 1.1 2007/05/27 09:49:53 schmonz Exp $
+$NetBSD: patch-aq,v 1.2 2011/09/22 15:16:26 ryoon Exp $
 
---- src/recurse.c.orig	2005-09-04 02:26:43.000000000 +0200
+--- src/recurse.c.orig	2008-01-28 14:55:45.000000000 +0000
 +++ src/recurse.c
 @@ -551,7 +551,7 @@ do_recursion (frame)
      if (frame->flags == R_SKIP_ALL)
diff --git a/devel/scmcvs/patches/patch-ar b/devel/scmcvs/patches/patch-ar
index 879dc0f5aa5..c0a8f42cb11 100644
--- a/devel/scmcvs/patches/patch-ar
+++ b/devel/scmcvs/patches/patch-ar
@@ -1,8 +1,8 @@
-$NetBSD: patch-ar,v 1.2 2008/01/04 06:48:07 martti Exp $
+$NetBSD: patch-ar,v 1.3 2011/09/22 15:16:26 ryoon Exp $
 
---- src/server.c.orig	2006-06-08 17:34:20.000000000 +0300
-+++ src/server.c	2008-01-02 14:45:35.000000000 +0200
-@@ -782,6 +782,7 @@
+--- src/server.c.orig	2008-05-07 15:57:34.000000000 +0000
++++ src/server.c
+@@ -801,6 +801,7 @@ E Protocol error: Root says \"%s\" but p
         nothing.  But for rsh, we need to do it now.  */
      parse_config (current_parsed_root->directory);
  
@@ -10,7 +10,7 @@ $NetBSD: patch-ar,v 1.2 2008/01/04 06:48:07 martti Exp $
      path = xmalloc (strlen (current_parsed_root->directory)
  		   + sizeof (CVSROOTADM)
  		   + 2);
-@@ -799,6 +800,7 @@
+@@ -818,6 +819,7 @@ E Protocol error: Root says \"%s\" but p
  	pending_error = save_errno;
      }
      free (path);
@@ -18,7 +18,7 @@ $NetBSD: patch-ar,v 1.2 2008/01/04 06:48:07 martti Exp $
  
  #ifdef HAVE_PUTENV
      env = xmalloc (strlen (CVSROOT_ENV) + strlen (current_parsed_root->directory) + 2);
-@@ -2284,8 +2286,12 @@
+@@ -2308,8 +2310,12 @@ serve_global_option (arg)
  	    break;
  	case 'n':
  	    noexec = 1;
@@ -31,7 +31,7 @@ $NetBSD: patch-ar,v 1.2 2008/01/04 06:48:07 martti Exp $
  	case 'q':
  	    quiet = 1;
  	    break;
-@@ -5369,6 +5375,7 @@
+@@ -5368,6 +5374,7 @@ switch_to_user (cvs_username, username)
      const char *username;
  {
      struct passwd *pw;
@@ -39,7 +39,7 @@ $NetBSD: patch-ar,v 1.2 2008/01/04 06:48:07 martti Exp $
  
      pw = getpwnam (username);
      if (pw == NULL)
-@@ -5447,7 +5454,15 @@
+@@ -5446,7 +5453,15 @@ error 0 %s: no such system user\n", user
  	}
      }
  
diff --git a/devel/scmcvs/patches/patch-at b/devel/scmcvs/patches/patch-at
index e3fed10dddc..08901be5a6c 100644
--- a/devel/scmcvs/patches/patch-at
+++ b/devel/scmcvs/patches/patch-at
@@ -1,8 +1,8 @@
-$NetBSD: patch-at,v 1.2 2008/01/04 06:48:07 martti Exp $
+$NetBSD: patch-at,v 1.3 2011/09/22 15:16:26 ryoon Exp $
 
---- src/logmsg.c.orig	2006-05-16 03:16:31.000000000 +0300
-+++ src/logmsg.c	2008-01-02 14:46:02.000000000 +0200
-@@ -227,6 +227,8 @@
+--- src/logmsg.c.orig	2008-05-07 15:57:34.000000000 +0000
++++ src/logmsg.c
+@@ -228,6 +228,8 @@ do_editor (dir, messagep, repository, ch
  	    (*messagep)[strlen (*messagep) - 1] != '\n')
  	    (void) fprintf (fp, "\n");
      }
@@ -11,7 +11,7 @@ $NetBSD: patch-at,v 1.2 2008/01/04 06:48:07 martti Exp $
  
      if (repository != NULL)
  	/* tack templates on if necessary */
-@@ -298,7 +300,7 @@
+@@ -300,7 +302,7 @@ do_editor (dir, messagep, repository, ch
      run_setup (editinfo_editor ? editinfo_editor : Editor);
      run_arg (fname);
      if ((retcode = run_exec (RUN_TTY, RUN_TTY, RUN_TTY,
@@ -20,7 +20,7 @@ $NetBSD: patch-at,v 1.2 2008/01/04 06:48:07 martti Exp $
  	error (editinfo_editor ? 1 : 0, retcode == -1 ? errno : 0,
  	       editinfo_editor ? "Logfile verification failed" :
  	       "warning: editor session failed");
-@@ -680,6 +682,15 @@
+@@ -683,6 +685,15 @@ title_proc (p, closure)
  				  strlen (str_list) + strlen (p->key) + 5);
  		    (void) strcat (str_list, p->key);
  		    break;
diff --git a/devel/scmcvs/patches/patch-au b/devel/scmcvs/patches/patch-au
index 4caa1d9ea61..449d88b5cd2 100644
--- a/devel/scmcvs/patches/patch-au
+++ b/devel/scmcvs/patches/patch-au
@@ -1,8 +1,8 @@
-$NetBSD: patch-au,v 1.2 2008/01/04 06:48:07 martti Exp $
+$NetBSD: patch-au,v 1.3 2011/09/22 15:16:26 ryoon Exp $
 
---- src/commit.c.orig	2006-06-08 16:55:03.000000000 +0300
-+++ src/commit.c	2008-01-02 14:46:24.000000000 +0200
-@@ -1026,7 +1026,9 @@
+--- src/commit.c.orig	2006-06-28 13:39:32.000000000 +0000
++++ src/commit.c
+@@ -1026,7 +1026,9 @@ warning: file `%s' seems to still contai
  		  xmalloc (sizeof (struct logfile_info)));
  	    li->type = status;
  	    li->tag = xstrdup (vers->tag);
@@ -13,7 +13,7 @@ $NetBSD: patch-au,v 1.2 2008/01/04 06:48:07 martti Exp $
  	    li->rev_new = NULL;
  	    p->data = li;
  	    (void) addnode (ulist, p);
-@@ -1178,7 +1180,7 @@
+@@ -1178,7 +1180,7 @@ precommit_proc (repository, filter)
      run_setup (filter);
      run_arg (repository);
      (void) walklist (saved_ulist, precommit_list_proc, NULL);
diff --git a/devel/scmcvs/patches/patch-av b/devel/scmcvs/patches/patch-av
index 552f4466c81..db749ae69ec 100644
--- a/devel/scmcvs/patches/patch-av
+++ b/devel/scmcvs/patches/patch-av
@@ -1,6 +1,6 @@
-$NetBSD: patch-av,v 1.1 2007/05/27 09:49:54 schmonz Exp $
+$NetBSD: patch-av,v 1.2 2011/09/22 15:16:26 ryoon Exp $
 
---- configure.in.orig	2005-09-28 05:29:46.000000000 +0200
+--- configure.in.orig	2008-05-07 20:10:34.000000000 +0000
 +++ configure.in
 @@ -377,7 +377,7 @@ if test -n "$krb_h"; then
             [LDFLAGS=$hold_ldflags
diff --git a/devel/scmcvs/patches/patch-ay b/devel/scmcvs/patches/patch-ay
index fb8638afbcf..bc2f1381260 100644
--- a/devel/scmcvs/patches/patch-ay
+++ b/devel/scmcvs/patches/patch-ay
@@ -1,6 +1,6 @@
-$NetBSD: patch-ay,v 1.1 2007/05/27 09:49:54 schmonz Exp $
+$NetBSD: patch-ay,v 1.2 2011/09/22 15:16:26 ryoon Exp $
 
---- src/run.c.orig	2005-06-07 00:23:30.000000000 +0200
+--- src/run.c.orig	2008-05-07 15:57:34.000000000 +0000
 +++ src/run.c
 @@ -208,6 +208,13 @@ run_exec (stin, stout, sterr, flags)
  #endif
diff --git a/devel/scmcvs/patches/patch-az b/devel/scmcvs/patches/patch-az
index ff22f785841..a52207a559f 100644
--- a/devel/scmcvs/patches/patch-az
+++ b/devel/scmcvs/patches/patch-az
@@ -1,8 +1,8 @@
-$NetBSD: patch-az,v 1.2 2008/01/04 06:48:07 martti Exp $
+$NetBSD: patch-az,v 1.3 2011/09/22 15:16:26 ryoon Exp $
 
---- src/modules.c.orig	2006-06-08 16:55:04.000000000 +0300
-+++ src/modules.c	2008-01-02 14:46:53.000000000 +0200
-@@ -746,7 +746,8 @@
+--- src/modules.c.orig	2008-01-28 14:55:45.000000000 +0000
++++ src/modules.c
+@@ -746,7 +746,8 @@ module `%s' is a request for a file in a
  		    cvs_output ("'\n", 0);
  		    cvs_flushout ();
  		}
diff --git a/devel/scmcvs/patches/patch-ba b/devel/scmcvs/patches/patch-ba
index 8ef4615e372..7ca6380a99c 100644
--- a/devel/scmcvs/patches/patch-ba
+++ b/devel/scmcvs/patches/patch-ba
@@ -1,6 +1,6 @@
-$NetBSD: patch-ba,v 1.1 2007/05/27 09:49:54 schmonz Exp $
+$NetBSD: patch-ba,v 1.2 2011/09/22 15:16:26 ryoon Exp $
 
---- src/cvsbug.in.orig	2005-08-26 22:30:56.000000000 +0100
+--- src/cvsbug.in.orig	2005-04-04 20:46:07.000000000 +0000
 +++ src/cvsbug.in
 @@ -109,14 +109,14 @@ elif [ -f /bin/domainname ]; then
      /usr/bin/ypcat passwd 2>/dev/null | cat - /etc/passwd | grep "^$LOGNAME:" |
diff --git a/devel/scmcvs/patches/patch-lib_getline.c b/devel/scmcvs/patches/patch-lib_getline.c
new file mode 100644
index 00000000000..3615138c9ff
--- /dev/null
+++ b/devel/scmcvs/patches/patch-lib_getline.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib_getline.c,v 1.1 2011/09/22 15:16:26 ryoon Exp $
+
+* Avoid getline conflict
+
+--- lib/getline.c.orig	2005-04-04 20:46:05.000000000 +0000
++++ lib/getline.c
+@@ -155,7 +155,7 @@ getstr (lineptr, n, stream, terminator, 
+ }
+ 
+ int
+-getline (lineptr, n, stream)
++getline_cvs (lineptr, n, stream)
+      char **lineptr;
+      size_t *n;
+      FILE *stream;
diff --git a/devel/scmcvs/patches/patch-lib_getline.h b/devel/scmcvs/patches/patch-lib_getline.h
new file mode 100644
index 00000000000..5e37b70d513
--- /dev/null
+++ b/devel/scmcvs/patches/patch-lib_getline.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib_getline.h,v 1.1 2011/09/22 15:16:26 ryoon Exp $
+
+* Avoid getline conflict
+
+--- lib/getline.h.orig	2005-04-04 20:46:05.000000000 +0000
++++ lib/getline.h
+@@ -12,7 +12,7 @@
+ #define GETLINE_NO_LIMIT -1
+ 
+ int
+-  getline __PROTO ((char **_lineptr, size_t *_n, FILE *_stream));
++  getline_cvs __PROTO ((char **_lineptr, size_t *_n, FILE *_stream));
+ int
+   getline_safe __PROTO ((char **_lineptr, size_t *_n, FILE *_stream,
+                          int limit));