diff --git a/databases/gnats/patches/patch-gnats_Makefile.in b/databases/gnats/patches/patch-gnats_Makefile.in
index f41db0afe17..fce6de56ea0 100644
--- a/databases/gnats/patches/patch-gnats_Makefile.in
+++ b/databases/gnats/patches/patch-gnats_Makefile.in
@@ -1,16 +1,16 @@
-$OpenBSD: patch-gnats_Makefile.in,v 1.2 2002/05/09 16:16:02 millert Exp $
---- gnats/Makefile.in.orig	Tue May  8 11:23:36 2001
-+++ gnats/Makefile.in	Wed May  8 22:08:48 2002
-@@ -256,7 +256,7 @@ all-gnats: all-tools file-pr gnatsd queu
+$OpenBSD: patch-gnats_Makefile.in,v 1.3 2007/12/28 17:11:25 espie Exp $
+--- gnats/Makefile.in.orig	Tue May  8 19:23:36 2001
++++ gnats/Makefile.in	Fri Dec 28 18:09:38 2007
+@@ -256,7 +256,7 @@ all-gnats: all-tools file-pr gnatsd queue-pr mail-quer
  
  all-tools: libgnats.a query-pr nquery-pr pr-addr npr-addr pr-age pr-edit \
  	npr-edit pr-mail sub-type gnats-edit-pr edit-pr nedit-pr getclose \
 -        gnats.elc config-send-pr tools-man-pages
-+        config-send-pr tools-man-pages
++        config-send-pr
  
  libgnats.a: $(LIBOBJS)
  	-rm -f tmplibgnats.a libgnats.a
-@@ -489,14 +489,12 @@ install-tools-arch-dep: install-tools-bi
+@@ -489,14 +489,12 @@ install-tools-arch-dep: install-tools-bin install-tool
  # Create $(datadir)/gnats so that mkcat can find it
  install-tools-arch-indep: all-tools
  	$(SHELL) $(srcdir)/../mkinstalldirs $(datadir)/gnats
@@ -42,7 +42,7 @@ $OpenBSD: patch-gnats_Makefile.in,v 1.2 2002/05/09 16:16:02 millert Exp $
  	fi
  
  EXTRA_INSTALL =
-@@ -533,7 +532,7 @@ install-gnats-arch-indep: all-gnats inst
+@@ -533,7 +532,7 @@ install-gnats-arch-indep: all-gnats install-tools-arch
  	$(SHELL) $(srcdir)/../mkinstalldirs $(GNATS_ROOT)/gnats-adm/locks
  	$(SHELL) $(srcdir)/../mkinstalldirs $(GNATS_ROOT)/gnats-queue
  	$(SHELL) $(srcdir)/../mkinstalldirs $(GNATS_ROOT)/pending
@@ -51,7 +51,7 @@ $OpenBSD: patch-gnats_Makefile.in,v 1.2 2002/05/09 16:16:02 millert Exp $
  	  echo "chown $(GNATS_USER) $(GNATS_ROOT) $(GNATS_ROOT)/gnats-adm $(GNATS_ROOT)/pending"; \
  	  echo "chown $(GNATS_USER) $(GNATS_ROOT)/gnats-adm/locks $(GNATS_ROOT)/gnats-queue" ; \
  	  chown $(GNATS_USER) $(GNATS_ROOT) $(GNATS_ROOT)/gnats-adm $(GNATS_ROOT)/pending ; \
-@@ -545,33 +544,34 @@ install-gnats-arch-indep: all-gnats inst
+@@ -545,33 +544,34 @@ install-gnats-arch-indep: all-gnats install-tools-arch
  	   echo "Not putting categories file in gnats-adm, it's already there." ; \
  	   true ; \
  	else \
@@ -91,7 +91,7 @@ $OpenBSD: patch-gnats_Makefile.in,v 1.2 2002/05/09 16:16:02 millert Exp $
  	  echo "chmod 600 $(GNATS_ROOT)/gnats-adm/gnatsd.access" ; \
  	  chmod 600 $(GNATS_ROOT)/gnats-adm/gnatsd.access ; \
  	fi
-@@ -579,35 +579,35 @@ install-gnats-arch-indep: all-gnats inst
+@@ -579,35 +579,35 @@ install-gnats-arch-indep: all-gnats install-tools-arch
  	   echo "Not putting gnatsd.conf file in gnats-adm, it's already there." ; \
  	   true ; \
  	else \
@@ -132,7 +132,7 @@ $OpenBSD: patch-gnats_Makefile.in,v 1.2 2002/05/09 16:16:02 millert Exp $
                  $(GNATS_ROOT)/gnats-adm/classes ; \
  	fi
  	@echo "*** Don't forget to run $(libexecdir)/gnats/mkcat as $(GNATS_USER)."
-@@ -625,7 +625,7 @@ install-gnats-bin: all-gnats install-too
+@@ -625,7 +625,7 @@ install-gnats-bin: all-gnats install-tools-bin
  	$(INSTALL_PROGRAM) queue-pr $(libexecdir)/gnats/queue-pr
  	$(INSTALL_PROGRAM) gen-index $(libexecdir)/gnats/gen-index
  	$(INSTALL_SCRIPT) mail-query $(libexecdir)/gnats/mail-query
@@ -141,7 +141,7 @@ $OpenBSD: patch-gnats_Makefile.in,v 1.2 2002/05/09 16:16:02 millert Exp $
  	  echo "chown $(GNATS_USER) $(libexecdir)/gnats/queue-pr $(libexecdir)/gnats/file-pr $(libexecdir)/gnats/gen-index" ; \
  	  echo "chmod 4555 $(libexecdir)/gnats/queue-pr $(libexecdir)/gnats/file-pr $(libexecdir)/gnats/gen-index" ; \
  	  echo "chown $(GNATS_USER) $(libexecdir)/gnats/gnatsd" ; \
-@@ -636,6 +636,7 @@ install-gnats-bin: all-gnats install-too
+@@ -636,6 +636,7 @@ install-gnats-bin: all-gnats install-tools-bin
  	  chmod 555 $(libexecdir)/gnats/gnatsd ; \
  	else \
  	  echo "*** Warning: must make queue-pr and gen-index suid gnats." ; \
diff --git a/databases/gnats/patches/patch-gnats_cmds.c b/databases/gnats/patches/patch-gnats_cmds.c
index b7beb8f45f0..602a8bf683b 100644
--- a/databases/gnats/patches/patch-gnats_cmds.c
+++ b/databases/gnats/patches/patch-gnats_cmds.c
@@ -1,6 +1,6 @@
-$OpenBSD: patch-gnats_cmds.c,v 1.3 2003/08/25 23:33:56 brad Exp $
---- gnats/cmds.c.orig	Sun Feb  4 13:56:10 2001
-+++ gnats/cmds.c	Wed Jul  2 13:23:13 2003
+$OpenBSD: patch-gnats_cmds.c,v 1.4 2007/12/28 17:11:25 espie Exp $
+--- gnats/cmds.c.orig	Sun Feb  4 21:56:10 2001
++++ gnats/cmds.c	Fri Dec 28 18:00:24 2007
 @@ -115,28 +115,26 @@ get_text ()
  {
    register FILE *tf;
@@ -28,13 +28,13 @@ $OpenBSD: patch-gnats_cmds.c,v 1.3 2003/08/25 23:33:56 brad Exp $
 +  
 +  snprintf (path, PATH_MAX, "%s/gnatsXXXXXX", tmpdir);
 +  if ((fd = mkstemp (path)) < 0)
-+    {
+     {
 +      xfree(path); 
 +      return (NULL);
 +    }
 +  
 +  if ((tf = fdopen (fd, "w")) == (FILE *) NULL)
-     {
++    {
        /* give error that we can't create the temp and leave. */
 -      xfree (path);
 +      close(fd);
diff --git a/databases/gnats/patches/patch-gnats_db_conf_c b/databases/gnats/patches/patch-gnats_db_conf_c
index 8b2975dadcb..44f9cb17e4f 100644
--- a/databases/gnats/patches/patch-gnats_db_conf_c
+++ b/databases/gnats/patches/patch-gnats_db_conf_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-gnats_db_conf_c,v 1.1 2003/08/25 23:35:06 brad Exp $
---- gnats/db_conf.c.orig	Tue Sep 21 20:31:01 1999
-+++ gnats/db_conf.c	Wed Jul  2 13:23:13 2003
-@@ -47,7 +47,7 @@ Software Foundation, 59 Temple Place - S
+$OpenBSD: patch-gnats_db_conf_c,v 1.2 2007/12/28 17:11:25 espie Exp $
+--- gnats/db_conf.c.orig	Wed Sep 22 04:31:01 1999
++++ gnats/db_conf.c	Fri Dec 28 18:00:24 2007
+@@ -47,7 +47,7 @@ Software Foundation, 59 Temple Place - Suite 330, Bost
  static int get_conf_key_list_and_count  PARAMS((Conf_entry *list, char ***keys,
  					int *count));
  static int get_conf_entry_count         PARAMS(( Conf_entry *head));
diff --git a/databases/gnats/patches/patch-gnats_file-pr_c b/databases/gnats/patches/patch-gnats_file-pr_c
index 9e6cc2fdd9f..b9331ec5514 100644
--- a/databases/gnats/patches/patch-gnats_file-pr_c
+++ b/databases/gnats/patches/patch-gnats_file-pr_c
@@ -1,6 +1,6 @@
-$OpenBSD: patch-gnats_file-pr_c,v 1.1 2003/08/25 23:35:06 brad Exp $
---- gnats/file-pr.c.orig	Tue May  8 08:09:45 2001
-+++ gnats/file-pr.c	Wed Jul  2 13:23:13 2003
+$OpenBSD: patch-gnats_file-pr_c,v 1.2 2007/12/28 17:11:25 espie Exp $
+--- gnats/file-pr.c.orig	Tue May  8 16:09:45 2001
++++ gnats/file-pr.c	Fri Dec 28 18:00:24 2007
 @@ -51,7 +51,6 @@ gnats (fp)
    char *subject = NULL, *synopsis = NULL;
    char *p;
@@ -66,7 +66,7 @@ $OpenBSD: patch-gnats_file-pr_c,v 1.1 2003/08/25 23:35:06 brad Exp $
    create_report (path, 1);
    log_msg (LOG_INFO, 1, "PR written out:", path);
  
-@@ -345,9 +345,10 @@ run_atpr (submitter, expired, bug_name, 
+@@ -345,9 +345,10 @@ run_atpr (submitter, expired, bug_name, path)
    int len, i;
    static char *ats[] = { "/usr/bin/at", "/bin/at", NULL };
  
@@ -80,7 +80,7 @@ $OpenBSD: patch-gnats_file-pr_c,v 1.1 2003/08/25 23:35:06 brad Exp $
  
    len = strftime (buf, GNATS_TIME_LENGTH, "%H:%M %b %d", expired);
  
-@@ -355,8 +356,9 @@ run_atpr (submitter, expired, bug_name, 
+@@ -355,8 +356,9 @@ run_atpr (submitter, expired, bug_name, path)
      {
        if (access (ats[i], X_OK) == 0)
  	{
@@ -162,7 +162,7 @@ $OpenBSD: patch-gnats_file-pr_c,v 1.1 2003/08/25 23:35:06 brad Exp $
        xfree (try);
      }
  }
-@@ -729,13 +731,13 @@ notify_responsible (responsible, subcont
+@@ -729,13 +731,13 @@ notify_responsible (responsible, subcontact, subnotify
  
    notify[0] = '\0';
  
diff --git a/databases/gnats/patches/patch-gnats_files_c b/databases/gnats/patches/patch-gnats_files_c
index ba916af400b..24f88472efa 100644
--- a/databases/gnats/patches/patch-gnats_files_c
+++ b/databases/gnats/patches/patch-gnats_files_c
@@ -1,6 +1,6 @@
-$OpenBSD: patch-gnats_files_c,v 1.1 2003/08/25 23:35:06 brad Exp $
---- gnats/files.c.orig	Sun Feb 11 14:36:25 2001
-+++ gnats/files.c	Wed Jul  2 13:23:13 2003
+$OpenBSD: patch-gnats_files_c,v 1.2 2007/12/28 17:11:25 espie Exp $
+--- gnats/files.c.orig	Sun Feb 11 22:36:25 2001
++++ gnats/files.c	Fri Dec 28 18:00:24 2007
 @@ -41,7 +41,7 @@ find_submitter (cptr, site)
    if (site == NULL)
      return -1;
@@ -104,7 +104,7 @@ $OpenBSD: patch-gnats_files_c,v 1.1 2003/08/25 23:35:06 brad Exp $
      }
    return (strdup (line));
  }
-@@ -901,7 +903,7 @@ get_responsible_addr (full, strict, name
+@@ -901,7 +903,7 @@ get_responsible_addr (full, strict, name)
      {
        address = (char *) xmalloc (STR_MAX);
        if (full)
@@ -113,7 +113,7 @@ $OpenBSD: patch-gnats_files_c,v 1.1 2003/08/25 23:35:06 brad Exp $
        else
  	{
  	  if (r->alias[0]
-@@ -909,9 +911,9 @@ get_responsible_addr (full, strict, name
+@@ -909,9 +911,9 @@ get_responsible_addr (full, strict, name)
  		 added a space after the colon, we don't accept that as
  		 an address.  */
  	      && isalpha (r->alias[0]))
diff --git a/databases/gnats/patches/patch-gnats_getdate_c b/databases/gnats/patches/patch-gnats_getdate_c
index b01f825b892..359769cb534 100644
--- a/databases/gnats/patches/patch-gnats_getdate_c
+++ b/databases/gnats/patches/patch-gnats_getdate_c
@@ -1,6 +1,6 @@
-$OpenBSD: patch-gnats_getdate_c,v 1.1 2003/08/25 23:35:06 brad Exp $
---- gnats/getdate.c.orig	Tue Feb 20 13:45:43 2001
-+++ gnats/getdate.c	Wed Jul  2 13:23:13 2003
+$OpenBSD: patch-gnats_getdate_c,v 1.2 2007/12/28 17:11:25 espie Exp $
+--- gnats/getdate.c.orig	Tue Feb 20 21:45:43 2001
++++ gnats/getdate.c	Fri Dec 28 18:00:24 2007
 @@ -51,6 +51,7 @@
  #endif
  
@@ -9,7 +9,7 @@ $OpenBSD: patch-gnats_getdate_c,v 1.1 2003/08/25 23:35:06 brad Exp $
  #include <ctype.h>
  
  #if	defined (vms)
-@@ -1225,6 +1226,7 @@ yyerrlab:   /* here on detecting error *
+@@ -1225,6 +1226,7 @@ yyerrlab:   /* here on detecting error */
  	{
  	  int size = 0;
  	  char *msg;
@@ -17,7 +17,7 @@ $OpenBSD: patch-gnats_getdate_c,v 1.1 2003/08/25 23:35:06 brad Exp $
  	  int x, count;
  
  	  count = 0;
-@@ -1233,10 +1235,11 @@ yyerrlab:   /* here on detecting error *
+@@ -1233,10 +1235,11 @@ yyerrlab:   /* here on detecting error */
  	       x < (sizeof(yytname) / sizeof(char *)); x++)
  	    if (yycheck[x + yyn] == x)
  	      size += strlen(yytname[x]) + 15, count++;
@@ -31,7 +31,7 @@ $OpenBSD: patch-gnats_getdate_c,v 1.1 2003/08/25 23:35:06 brad Exp $
  
  	      if (count < 5)
  		{
-@@ -1245,9 +1248,10 @@ yyerrlab:   /* here on detecting error *
+@@ -1245,9 +1248,10 @@ yyerrlab:   /* here on detecting error */
  		       x < (sizeof(yytname) / sizeof(char *)); x++)
  		    if (yycheck[x + yyn] == x)
  		      {
diff --git a/databases/gnats/patches/patch-gnats_gnats_h b/databases/gnats/patches/patch-gnats_gnats_h
index 79b5187c2cf..f9ba09b9d1d 100644
--- a/databases/gnats/patches/patch-gnats_gnats_h
+++ b/databases/gnats/patches/patch-gnats_gnats_h
@@ -1,7 +1,7 @@
-$OpenBSD: patch-gnats_gnats_h,v 1.1 2003/08/25 23:35:06 brad Exp $
---- gnats/gnats.h.orig	Wed Nov 25 07:14:47 1998
-+++ gnats/gnats.h	Wed Jul  2 13:23:13 2003
-@@ -234,7 +234,7 @@ extern FILE *open_index			PARAMS((void))
+$OpenBSD: patch-gnats_gnats_h,v 1.2 2007/12/28 17:11:25 espie Exp $
+--- gnats/gnats.h.orig	Wed Nov 25 15:14:47 1998
++++ gnats/gnats.h	Fri Dec 28 18:00:24 2007
+@@ -234,7 +234,7 @@ extern FILE *open_index			PARAMS((void));
  extern time_t stat_index		PARAMS((char *));
  extern int check_index			PARAMS((void));
  extern char *find_pr_category		PARAMS((FILE *, char *));
diff --git a/databases/gnats/patches/patch-gnats_gnatsd_c b/databases/gnats/patches/patch-gnats_gnatsd_c
index a2e561a1067..8ff7f188b90 100644
--- a/databases/gnats/patches/patch-gnats_gnatsd_c
+++ b/databases/gnats/patches/patch-gnats_gnatsd_c
@@ -1,6 +1,6 @@
-$OpenBSD: patch-gnats_gnatsd_c,v 1.1 2003/08/25 23:35:06 brad Exp $
---- gnats/gnatsd.c.orig	Tue Sep 21 17:18:39 1999
-+++ gnats/gnatsd.c	Wed Jul  2 13:23:13 2003
+$OpenBSD: patch-gnats_gnatsd_c,v 1.2 2007/12/28 17:11:25 espie Exp $
+--- gnats/gnatsd.c.orig	Wed Sep 22 01:18:39 1999
++++ gnats/gnatsd.c	Fri Dec 28 18:00:24 2007
 @@ -237,7 +237,7 @@ get_name (host)
      return NULL;
    i = strlen (hp->h_name);
@@ -19,7 +19,7 @@ $OpenBSD: patch-gnats_gnatsd_c,v 1.1 2003/08/25 23:35:06 brad Exp $
    acc = fopen (filename, "r");
    if (acc == (FILE *)NULL)
      {
-@@ -397,7 +397,7 @@ get_user_access (database, filename, use
+@@ -397,7 +397,7 @@ get_user_access (database, filename, user, passwd)
  {
    FILE *acc;
    char buffer[BUFSIZ], *x;
diff --git a/databases/gnats/patches/patch-gnats_internal.c b/databases/gnats/patches/patch-gnats_internal.c
index 47f5a79ff5e..66a6ee2ee9a 100644
--- a/databases/gnats/patches/patch-gnats_internal.c
+++ b/databases/gnats/patches/patch-gnats_internal.c
@@ -1,6 +1,6 @@
-$OpenBSD: patch-gnats_internal.c,v 1.4 2003/08/25 23:33:56 brad Exp $
---- gnats/internal.c.orig	Tue Mar  2 17:18:53 1999
-+++ gnats/internal.c	Wed Jul  2 13:37:01 2003
+$OpenBSD: patch-gnats_internal.c,v 1.5 2007/12/28 17:11:25 espie Exp $
+--- gnats/internal.c.orig	Wed Mar  3 01:18:53 1999
++++ gnats/internal.c	Fri Dec 28 18:00:24 2007
 @@ -32,28 +32,25 @@ write_index (index_start)
  
    FILE *fp;
@@ -23,13 +23,12 @@ $OpenBSD: patch-gnats_internal.c,v 1.4 2003/08/25 23:33:56 brad Exp $
 -  tmpnam (name);
 -  strcpy (workfile, name);
 -#endif
--
--  fp = fopen (workfile, "w");
--  if (fp == NULL)
 +  len = strlen (gnats_root) + strlen ("/gnats-adm/indXXXXXX") + 1 /* null */;
 +  workfile = (char *) xmalloc (len);
 +  snprintf (workfile, len, "%s/gnats-adm/indXXXXXX", gnats_root);
-+
+ 
+-  fp = fopen (workfile, "w");
+-  if (fp == NULL)
 +  if ((fd = mkstemp (workfile)) < 0) {
 +	  fprintf (stderr, "%s: can't open the temporary file %s\n",
 +		   program_name, workfile);
diff --git a/databases/gnats/patches/patch-gnats_mk_auth_c b/databases/gnats/patches/patch-gnats_mk_auth_c
index b73842d4561..7ee3773b8cd 100644
--- a/databases/gnats/patches/patch-gnats_mk_auth_c
+++ b/databases/gnats/patches/patch-gnats_mk_auth_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-gnats_mk_auth_c,v 1.1 2003/08/25 23:35:06 brad Exp $
---- gnats/mk_auth.c.orig	Thu Nov  5 12:54:10 1998
-+++ gnats/mk_auth.c	Wed Jul  2 13:23:13 2003
-@@ -140,7 +140,7 @@ krb_mk_auth(options, ticket, service, in
+$OpenBSD: patch-gnats_mk_auth_c,v 1.2 2007/12/28 17:11:25 espie Exp $
+--- gnats/mk_auth.c.orig	Thu Nov  5 20:54:10 1998
++++ gnats/mk_auth.c	Fri Dec 28 18:00:24 2007
+@@ -140,7 +140,7 @@ krb_mk_auth(options, ticket, service, inst, realm, che
  #ifdef ATHENA_COMPAT
      /* this is only for compatibility with old servers */
      if (options & KOPT_DO_OLDSTYLE) {
diff --git a/databases/gnats/patches/patch-gnats_pr_c b/databases/gnats/patches/patch-gnats_pr_c
index b7ae5941244..2374ec2bdf3 100644
--- a/databases/gnats/patches/patch-gnats_pr_c
+++ b/databases/gnats/patches/patch-gnats_pr_c
@@ -1,6 +1,6 @@
-$OpenBSD: patch-gnats_pr_c,v 1.2 2003/08/25 23:33:56 brad Exp $
---- gnats/pr.c.orig	Tue Mar  2 17:18:54 1999
-+++ gnats/pr.c	Wed Jul  2 13:23:13 2003
+$OpenBSD: patch-gnats_pr_c,v 1.3 2007/12/28 17:11:25 espie Exp $
+--- gnats/pr.c.orig	Wed Mar  3 01:18:54 1999
++++ gnats/pr.c	Fri Dec 28 18:00:24 2007
 @@ -205,7 +205,7 @@ read_pr (fp, prune)
  	      u = unformatted + unformatted_len;
  	    }
@@ -36,7 +36,7 @@ $OpenBSD: patch-gnats_pr_c,v 1.2 2003/08/25 23:33:56 brad Exp $
  
    if (pr[name].datatype == Date)
      {
-@@ -367,9 +367,9 @@ get_pr_enum_field (filename, default_val
+@@ -367,9 +367,9 @@ get_pr_enum_field (filename, default_value)
    int len = 0, capacity = 80;
    int meaningful_line;
    FILE *fp;
@@ -48,7 +48,7 @@ $OpenBSD: patch-gnats_pr_c,v 1.2 2003/08/25 23:33:56 brad Exp $
    fp = fopen (path, "r");
  
    if (fp == NULL)
-@@ -531,7 +531,7 @@ get_final_enum_value (list_str, default_
+@@ -531,7 +531,7 @@ get_final_enum_value (list_str, default_value)
       char *default_value;
  {
    char *res = NULL;
diff --git a/databases/gnats/patches/patch-gnats_regex_c b/databases/gnats/patches/patch-gnats_regex_c
index 25ad082fcb3..c4ce208f253 100644
--- a/databases/gnats/patches/patch-gnats_regex_c
+++ b/databases/gnats/patches/patch-gnats_regex_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-gnats_regex_c,v 1.1 2003/08/25 23:35:06 brad Exp $
---- gnats/regex.c.orig	Thu Nov  5 12:54:10 1998
-+++ gnats/regex.c	Wed Jul  2 13:23:13 2003
-@@ -1623,11 +1623,12 @@ regex_compile (pattern, size, syntax, bu
+$OpenBSD: patch-gnats_regex_c,v 1.2 2007/12/28 17:11:25 espie Exp $
+--- gnats/regex.c.orig	Thu Nov  5 20:54:10 1998
++++ gnats/regex.c	Fri Dec 28 18:00:24 2007
+@@ -1623,11 +1623,12 @@ regex_compile (pattern, size, syntax, bufp)
              case ')':
                if (syntax & RE_NO_BK_PARENS) goto normal_backslash;
  
@@ -15,7 +15,7 @@ $OpenBSD: patch-gnats_regex_c,v 1.1 2003/08/25 23:35:06 brad Exp $
  
              handle_close:
                if (fixup_alt_jump)
-@@ -1643,11 +1644,12 @@ regex_compile (pattern, size, syntax, bu
+@@ -1643,11 +1644,12 @@ regex_compile (pattern, size, syntax, bufp)
                  }
  
                /* See similar code for backslashed left paren above.  */
@@ -29,7 +29,7 @@ $OpenBSD: patch-gnats_regex_c,v 1.1 2003/08/25 23:35:06 brad Exp $
  
                /* Since we just checked for an empty stack above, this
                   ``can't happen''.  */
-@@ -4903,15 +4905,7 @@ regerror (errcode, preg, errbuf, errbuf_
+@@ -4903,15 +4905,7 @@ regerror (errcode, preg, errbuf, errbuf_size)
    msg_size = strlen (msg) + 1; /* Includes the null.  */
    
    if (errbuf_size != 0)
diff --git a/databases/gnats/patches/patch-libiberty_Makefile_in b/databases/gnats/patches/patch-libiberty_Makefile_in
index e4f360f402e..c8702d3cc4d 100644
--- a/databases/gnats/patches/patch-libiberty_Makefile_in
+++ b/databases/gnats/patches/patch-libiberty_Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-libiberty_Makefile_in,v 1.1 2003/06/19 21:21:10 pvalchev Exp $
---- libiberty/Makefile.in.orig	Thu Jun 19 15:07:46 2003
-+++ libiberty/Makefile.in	Thu Jun 19 15:09:52 2003
-@@ -246,7 +246,7 @@ dummy.o: $(srcdir)/dummy.c $(srcdir)/fun
+$OpenBSD: patch-libiberty_Makefile_in,v 1.2 2007/12/28 17:11:25 espie Exp $
+--- libiberty/Makefile.in.orig	Thu Nov  5 20:54:14 1998
++++ libiberty/Makefile.in	Fri Dec 28 18:00:24 2007
+@@ -246,7 +246,7 @@ dummy.o: $(srcdir)/dummy.c $(srcdir)/functions.def
  	$(CC) -c $(CFLAGS) -I. -I$(INCDIR) $(HDEFINES) $(srcdir)/dummy.c 2>/dev/null
  
  errors: dummy.o $(EXTRA_OFILES)
diff --git a/databases/gnats/patches/patch-libiberty_functions_def b/databases/gnats/patches/patch-libiberty_functions_def
index d2144a8970c..e8467be6d0b 100644
--- a/databases/gnats/patches/patch-libiberty_functions_def
+++ b/databases/gnats/patches/patch-libiberty_functions_def
@@ -1,7 +1,7 @@
-$OpenBSD: patch-libiberty_functions_def,v 1.1 2003/12/30 10:07:48 espie Exp $
---- libiberty/functions.def.orig	2003-12-30 10:54:08.000000000 +0100
-+++ libiberty/functions.def	2003-12-30 11:00:37.000000000 +0100
-@@ -27,26 +27,26 @@ DEF(memcpy, PTR, (s1, s2, length), PTR s
+$OpenBSD: patch-libiberty_functions_def,v 1.2 2007/12/28 17:11:25 espie Exp $
+--- libiberty/functions.def.orig	Thu Nov  5 20:54:15 1998
++++ libiberty/functions.def	Fri Dec 28 18:00:24 2007
+@@ -27,26 +27,26 @@ DEF(memcpy, PTR, (s1, s2, length), PTR s1 AND CONST PT
  DEF(memmove, PTR, (s1, s2, length), PTR s1 AND CONST PTR s2 AND size_t length)
  DEF(memset, PTR, (s, val, length), PTR s AND int val AND size_t length )
  DEF(random, long int, (), NOTHING)
diff --git a/databases/gnats/patches/patch-send-pr_Makefile.in b/databases/gnats/patches/patch-send-pr_Makefile.in
index d011fb2fa36..8e6351dcbab 100644
--- a/databases/gnats/patches/patch-send-pr_Makefile.in
+++ b/databases/gnats/patches/patch-send-pr_Makefile.in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-send-pr_Makefile.in,v 1.2 2002/05/09 16:16:02 millert Exp $
---- send-pr/Makefile.in.orig	Tue May  8 11:22:21 2001
-+++ send-pr/Makefile.in	Wed May  8 22:08:48 2002
-@@ -174,10 +174,7 @@ install-gnats-arch-dep: install-norm-arc
+$OpenBSD: patch-send-pr_Makefile.in,v 1.3 2007/12/28 17:11:25 espie Exp $
+--- send-pr/Makefile.in.orig	Tue May  8 19:22:21 2001
++++ send-pr/Makefile.in	Fri Dec 28 18:00:24 2007
+@@ -174,10 +174,7 @@ install-gnats-arch-dep: install-norm-arch-dep
  install-norm all-gnats: install-norm-arch-indep install-norm-arch-dep
  
  install-norm-arch-indep: