welcome to idutils-4.1

19 files changed, 277 insertions, 715 deletions

diff --git a/devel/id-utils/Makefile b/devel/id-utils/Makefile
index 4dce90ed444..55b0680cebc 100644
--- a/devel/id-utils/Makefile
+++ b/devel/id-utils/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.46 2006/04/13 18:23:31 jlam Exp $
+# $NetBSD: Makefile,v 1.47 2006/08/04 19:23:39 christos Exp $
 
-DISTNAME=	id-utils-3.2
-PKGREVISION=	9
+DISTNAME=	idutils-4.1
+#PKGREVISION=	0
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNU:=id-utils/}
+MASTER_SITES=	${MASTER_SITE_GNU:=idutils/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/idutils/idutils.html
@@ -28,6 +28,6 @@ REQD_DIRS=		${LISPDIR}
 .include "../../devel/gettext-lib/buildlink3.mk"
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/lisp/id-utils.el ${LISPDIR}
+	${INSTALL_DATA} ${WRKSRC}/lisp/idutils.el ${LISPDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/id-utils/PLIST b/devel/id-utils/PLIST
index 723b95a3cc8..e1a2ed6c8b6 100644
--- a/devel/id-utils/PLIST
+++ b/devel/id-utils/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2006/04/17 07:07:16 jlam Exp $
+@comment $NetBSD: PLIST,v 1.8 2006/08/04 19:23:39 christos Exp $
 bin/aid
 bin/defid
 bin/eid
@@ -8,8 +8,10 @@ bin/gid
 bin/lid
 bin/mkid
 bin/xtokid
-info/id-utils.info
-share/emacs/site-lisp/id-utils.el
+info/idutils.info
+share/emacs/site-lisp/idutils.el
 share/id-lang.map
-share/locale/de/LC_MESSAGES/id-utils.mo
-share/locale/fr/LC_MESSAGES/id-utils.mo
+share/locale/de/LC_MESSAGES/idutils.mo
+share/locale/fr/LC_MESSAGES/idutils.mo
+share/locale/nl/LC_MESSAGES/idutils.mo
+share/locale/pl/LC_MESSAGES/idutils.mo
diff --git a/devel/id-utils/distinfo b/devel/id-utils/distinfo
index 01186796392..5c3d10b93c0 100644
--- a/devel/id-utils/distinfo
+++ b/devel/id-utils/distinfo
@@ -1,21 +1,16 @@
-$NetBSD: distinfo,v 1.15 2006/06/09 22:30:57 dbj Exp $
+$NetBSD: distinfo,v 1.16 2006/08/04 19:23:39 christos Exp $
 
-SHA1 (id-utils-3.2.tar.gz) = 14d96a2170745883d077fa8c436e4380f28951a5
-RMD160 (id-utils-3.2.tar.gz) = 4dada22d46cf791cf9ed61c69bbcafb0b9b1f99d
-Size (id-utils-3.2.tar.gz) = 388012 bytes
-SHA1 (patch-aa) = 69cdce8f83d043ffabbec7639423e35a46a97175
-SHA1 (patch-ab) = aee2109a3cce77022cf4611542130fadc3842063
-SHA1 (patch-ac) = 67667057c39e7c5df048f22d2291649280c4299a
-SHA1 (patch-ad) = cd13aea19f0ac5dcdc8695ce40b409ecb15b1ec0
-SHA1 (patch-ah) = 962276de4a6582e88e3eea8a6c2f8246c958bea0
-SHA1 (patch-ai) = be9f59a6a2e84338d6df945ba5d10285d3205560
-SHA1 (patch-aj) = 7f2b3f1eaadfc3a71169d16010375eaf0ce96b46
-SHA1 (patch-ak) = c9f017d6ba122ae1dabf10e97dea640e2b10ef76
-SHA1 (patch-al) = fcc31539fd3731797544670fb804904980a6c7ce
-SHA1 (patch-am) = 137ffa727d505975b775c0a877f1ac9af9cf58a7
-SHA1 (patch-an) = 6e300f1c175085fe4190e31a0f3673714b51585b
-SHA1 (patch-ao) = 3fa01e9d9482695a1727a34eb8e3caf4f3572325
-SHA1 (patch-ap) = 8bff727bc838b77ca6bcd859fc38803d0d8ca00c
-SHA1 (patch-ar) = b6249d63e76d77f1ddc29b74c8c896c42ed313f5
-SHA1 (patch-as) = 6c5044fb3b781c7764783109368501f4f13393dd
-SHA1 (patch-at) = f8e7c43b6fa912cc4e902596e160fe453b9d2932
+SHA1 (idutils-4.1.tar.gz) = 3ce5524b2962fc785d44a3ee73d32ebf975d70d1
+RMD160 (idutils-4.1.tar.gz) = 7ddadd6a97e2a096916f9ac20ccffff14cc2a330
+Size (idutils-4.1.tar.gz) = 696756 bytes
+SHA1 (patch-aa) = f957a2af9470e41c1b423b9c753456e68a46405c
+SHA1 (patch-ab) = 96a1ec3d8c49da9538342450df41c7cd17c0d21c
+SHA1 (patch-ac) = 714cc320a02235c7d49b0ea37be60cff36f6a07b
+SHA1 (patch-ad) = 05f6be0337f599736627d5bf372529e36ca22246
+SHA1 (patch-ae) = cdf05fd02278065908bdc16b599b881f6b1112ea
+SHA1 (patch-af) = 223ae437d90f98499b8095254fcca1d2651c11a1
+SHA1 (patch-ag) = d1e3dfcaa905041b12f458b3fc186ebf2fa633a1
+SHA1 (patch-ah) = d60a3738ed5b9b9db01c557b2c6e4922b913a2e7
+SHA1 (patch-ai) = ebf6092918830c95308a4a1b9145314c5fecbd58
+SHA1 (patch-aj) = 6435ee17529ab3782b340f51c7e43390aaae662d
+SHA1 (patch-ak) = c5f56cabfe54bd653874c58d55b1c198526707fb
diff --git a/devel/id-utils/patches/patch-aa b/devel/id-utils/patches/patch-aa
index 821ff70772f..2c54ff63f29 100644
--- a/devel/id-utils/patches/patch-aa
+++ b/devel/id-utils/patches/patch-aa
@@ -1,16 +1,21 @@
-$NetBSD: patch-aa,v 1.2 1999/08/01 14:37:27 mrg Exp $
+$NetBSD: patch-aa,v 1.3 2006/08/04 19:23:39 christos Exp $
 
---- src/lid.c.orig	Sun Aug  1 02:08:35 1999
-+++ src/lid.c	Sun Aug  1 02:09:38 1999
-@@ -563,7 +563,10 @@
-       maybe_relative_file_name (file_name, *flinkv++, cw_dlink);
-       gid_FILE = fopen (file_name, "r");
-       if (gid_FILE == 0)
--	error (0, errno, "can't open `%s'", file_name);
-+        {
-+	  error (0, errno, "can't open `%s'", file_name);
-+	  continue;
-+        }
+--- libidu/fnprint.c.orig	2005-12-27 00:21:33.000000000 -0500
++++ libidu/fnprint.c	2006-08-03 12:58:44.026747335 -0400
+@@ -19,7 +19,6 @@
+ #include <config.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <alloca.h>
+ #include <unistd.h>
+ #include <string.h>
+ #include <pathmax.h>
+@@ -82,7 +81,7 @@
+   struct file_link const *arg;
+   struct file_link const *dlink;
+   int brace_is_open = 0;
+-  char *file_name = alloca (sizeof(char) * PATH_MAX);
++  char file_name[sizeof(char) * PATH_MAX];
  
-       line_number = 0;
-       while (fgets (&line[1], sizeof (line), gid_FILE))
+   while (*flinkv)
+     {
diff --git a/devel/id-utils/patches/patch-ab b/devel/id-utils/patches/patch-ab
index 3b9637bc41e..03fa9bc3401 100644
--- a/devel/id-utils/patches/patch-ab
+++ b/devel/id-utils/patches/patch-ab
@@ -1,99 +1,13 @@
-$NetBSD: patch-ab,v 1.2 2002/02/27 09:07:43 joda Exp $
+$NetBSD: patch-ab,v 1.3 2006/08/04 19:23:39 christos Exp $
 
---- libidu/walker.c.orig	Wed Jul 17 22:43:41 1996
-+++ libidu/walker.c	Wed Feb 27 09:57:28 2002
-@@ -33,7 +33,6 @@
- #include "dynvec.h"
- #include "scanners.h"
- #include "pathmax.h"
--#include "xalloca.h"
+--- libidu/idfile.h.orig	2005-11-01 04:18:33.000000000 -0500
++++ libidu/idfile.h	2006-08-03 13:00:35.159831999 -0400
+@@ -147,7 +147,7 @@
  
- int walk_dir __P((struct file_link *dir_link));
- struct member_file *get_member_file __P((struct file_link *flink));
-@@ -98,7 +97,7 @@
-   dirp = opendir (".");
-   if (dirp == 0)
-     {
--      char *file_name = ALLOCA (char, PATH_MAX);
-+      char file_name[PATH_MAX];
-       absolute_file_name (file_name, dir_link);
-       error (0, errno, _("can't read directory `%s' (`.' from `%s')"), file_name, xgetcwd ());
-       return 0;
-@@ -116,6 +115,8 @@
- 	continue;
+ #define token_string(buf) (buf)
+ extern unsigned int token_flags (char const *buf);
+-extern unsigned short token_count (char const *buf);
++extern unsigned int token_count (char const *buf);
+ extern unsigned char const *token_hits_addr (char const *buf);
  
-       flink = get_link_from_dirent (dirent, dir_link);
-+      if (flink == 0)
-+	break;
-       if (!(flink->fl_flags & FL_PRUNE))
- 	walk_flink (flink, sub_dirs_vec);
-     }
-@@ -165,7 +166,7 @@
-   if ((old_flags & FL_TYPE_MASK)
-       && (old_flags & FL_TYPE_MASK) != (new_flags & FL_TYPE_MASK))
-     {
--      char *file_name = ALLOCA (char, PATH_MAX);
-+      char file_name[PATH_MAX];
-       absolute_file_name (file_name, flink);
-       error (0, 0, _("notice: `%s' was a %s, but is now a %s!"), file_name,
- 	     (FL_IS_FILE (old_flags) ? _("file") : _("directory")),
-@@ -284,8 +285,8 @@
-       int alias_ancestry = symlink_ancestry (alias_link);
-       if (member->mf_lang_args != alias_member->mf_lang_args)
- 	{
--	  char *file_name = ALLOCA (char, PATH_MAX);
--	  char *alias_file_name = ALLOCA (char, PATH_MAX);
-+	  char file_name[PATH_MAX];
-+	  char alias_file_name[PATH_MAX];
- 	  absolute_file_name (file_name, flink);
- 	  absolute_file_name (alias_file_name, alias_link);
- 	  error (0, 0, _("warning: `%s' and `%s' are the same file, but yield different scans!"),
-@@ -380,7 +381,7 @@
- #if 0
-       if (member->mf_lang_args != args)
- 	{
--	  char *file_name = ALLOCA (char, PATH_MAX);
-+	  char file_name[PATH_MAX];
- 	  absolute_file_name (file_name, flink);
- 	  error (0, 0, _("notice: scan parameters changed for `%s'"), file_name);
- 	  member->mf_old_index = -1;
-@@ -418,7 +419,7 @@
-     {
-       if (strchr (args->la_pattern, SLASH_CHAR))
- 	{
--	  char *file_name = ALLOCA (char, PATH_MAX);
-+	  char file_name[PATH_MAX];
- 	  absolute_file_name (file_name, flink);
- 	  if (fnmatch (args->la_pattern, file_name, MAYBE_FNM_CASEFOLD | FNM_FILE_NAME) == 0)
- 	    return (args->la_language ? args : 0);
-@@ -622,7 +623,7 @@
- int
- chdir_to_link (struct file_link *dir_link)
- {
--  char *to_dir_name = ALLOCA (char, PATH_MAX);
-+  char to_dir_name[PATH_MAX];
- 
-   if (current_dir_link == dir_link)
-     return 1;
-@@ -637,7 +638,7 @@
- 	error (0, errno, _("can't chdir to `%s'"), to_dir_name);
-       else
- 	{
--	  char *from_dir_name = ALLOCA (char, PATH_MAX);
-+	  char from_dir_name[PATH_MAX];
- 	  absolute_file_name (from_dir_name, current_dir_link);
- 	  error (0, errno, _("can't chdir to `%s' from `%s'"), to_dir_name, from_dir_name);
- 	}
-@@ -811,8 +812,10 @@
- char *
- maybe_relative_file_name (char *buf_0, struct file_link const *to_link, struct file_link const *from_link)
- {
--  struct file_link const **to_link_vec_0 = ALLOCA (struct file_link const *, PATH_MAX/2);
--  struct file_link const **from_link_vec_0 = ALLOCA (struct file_link const *, PATH_MAX/2);
-+  struct file_link const *to_link_vec_1[PATH_MAX/2];
-+  struct file_link const *from_link_vec_1[PATH_MAX/2];
-+  struct file_link const **to_link_vec_0 = to_link_vec_1;
-+  struct file_link const **from_link_vec_0 = from_link_vec_1;
-   struct file_link const **to_link_vec = to_link_vec_0;
-   struct file_link const **from_link_vec = from_link_vec_0;
-   struct file_link const **from_link_end;
+ #define MAYBE_RETURN_PREFIX_MATCH(arg, str, val) do { \
diff --git a/devel/id-utils/patches/patch-ac b/devel/id-utils/patches/patch-ac
index 74be993e5ad..aa75481511e 100644
--- a/devel/id-utils/patches/patch-ac
+++ b/devel/id-utils/patches/patch-ac
@@ -1,241 +1,19 @@
-$NetBSD: patch-ac,v 1.4 2003/01/08 02:36:00 thorpej Exp $
+$NetBSD: patch-ac,v 1.5 2006/08/04 19:23:39 christos Exp $
 
---- libidu/scanners.c.orig	Tue Jan  7 18:24:27 2003
-+++ libidu/scanners.c	Tue Jan  7 18:24:29 2003
-@@ -44,6 +44,19 @@
- extern void usage __P((void));
- extern char *program_name;
+--- libidu/idread.c.orig	2005-12-27 00:23:18.000000000 -0500
++++ libidu/idread.c	2006-08-03 12:27:38.779542243 -0400
+@@ -211,12 +211,12 @@
+ #define TOK_COUNT_ADDR(buf) ((unsigned char const *)(TOK_FLAGS_ADDR (buf) + 1))
+ #define TOK_HITS_ADDR(buf) ((unsigned char const *)(TOK_COUNT_ADDR (buf) + 2))
  
-+static char *id_0;
-+static size_t id_0_len;
-+#define APPEND_CHAR(C)  do {				\
-+    if(id_0 == NULL || id == id_0 + id_0_len) {		\
-+	size_t __pos = id_0 ? id - id_0 : 0;		\
-+	id_0 = xrealloc(id_0, id_0_len + BUFSIZ);	\
-+	id_0_len += BUFSIZ;				\
-+	id = id_0 + __pos;				\
-+    }							\
-+    *id++ = (C);					\
-+    } while(0);
-+
-+
- /****************************************************************************/
- 
- struct lang_args **parse_language_map_file __P((char const *file_name, struct lang_args **next_ptr));
-@@ -65,8 +78,14 @@
- struct language languages_0[] =
- {
-   { "C", parse_args_c, get_token_c, help_me_c },
-+  { "C++", parse_args_c, get_token_c, help_me_c },
-+  { "cpp", parse_args_c, get_token_c, help_me_c },
-+  { "cc", parse_args_c, get_token_c, help_me_c },
-   { "asm", parse_args_asm, get_token_asm, help_me_asm },
-+  { "S", parse_args_asm, get_token_asm, help_me_asm },
-+  { "s", parse_args_asm, get_token_asm, help_me_asm },
-   { "text", parse_args_text, get_token_text, help_me_text },
-+  { "make", parse_args_text, get_token_text, help_me_text },
- };
- struct language const *languages_N = &languages_0[cardinalityof (languages_0)];
- 
-@@ -482,7 +501,6 @@
- #define ARGS ((struct args_c const *) args)
-   static int new_line = 1;
-   unsigned short const *rct = &ARGS->ctype[1];
--  char id_0[BUFSIZ];
-   char *id = id_0;
-   int c;
- 
-@@ -501,10 +519,10 @@
-       if (!ISID1ST (c))
- 	goto next;
-       id = id_0;
--      *id++ = c;
-+      APPEND_CHAR(c);
-       while (ISIDREST (c = getc (in_FILE)))
--	*id++ = c;
--      *id = '\0';
-+	APPEND_CHAR(c);
-+      APPEND_CHAR('\0');
-       if (strequ (id_0, "include"))
- 	{
- 	  while (c == ' ' || c == '\t')
-@@ -520,7 +538,7 @@
- 	      c = getc (in_FILE);
- 	      while (c != '\n' && c != EOF && c != '"')
- 		{
--		  *id++ = c;
-+		  APPEND_CHAR(c);
- 		  c = getc (in_FILE);
- 		}
- 	      *flags = TOK_STRING;
-@@ -530,16 +548,16 @@
- 	      c = getc (in_FILE);
- 	      while (c != '\n' && c != EOF && c != '>')
- 		{
--		  *id++ = c;
-+		  APPEND_CHAR(c);
- 		  c = getc (in_FILE);
- 		}
- 	      *flags = TOK_STRING;
- 	    }
- 	  else if (ISID1ST (c))
- 	    {
--	      *id++ = c;
-+	      APPEND_CHAR(c);
- 	      while (ISIDREST (c = getc (in_FILE)))
--		*id++ = c;
-+		APPEND_CHAR(c);
- 	      *flags = TOK_NAME;
- 	    }
- 	  else
-@@ -574,14 +592,14 @@
-     {
-     case '"':
-       id = id_0;
--      *id++ = c = getc (in_FILE);
-+      APPEND_CHAR(c = getc (in_FILE));
-       for (;;)
- 	{
- 	  while (ISQ2BORING (c))
--	    *id++ = c = getc (in_FILE);
-+	    APPEND_CHAR(c = getc (in_FILE));
- 	  if (c == '\\')
- 	    {
--	      *id++ = c = getc (in_FILE);
-+	      APPEND_CHAR(c = getc (in_FILE));
- 	      continue;
- 	    }
- 	  else if (c != '"')
-@@ -662,18 +680,18 @@
- 	  return 0;
- 	}
-       id = id_0;
--      *id++ = c;
-+      APPEND_CHAR(c);
-       if (ISID1ST (c))
- 	{
- 	  *flags = TOK_NAME;
- 	  while (ISIDREST (c = getc (in_FILE)))
--	    *id++ = c;
-+	    APPEND_CHAR(c);
- 	}
-       else if (ISDIGIT (c))
- 	{
- 	  *flags = TOK_NUMBER;
- 	  while (ISNUMBER (c = getc (in_FILE)))
--	    *id++ = c;
-+	    APPEND_CHAR(c);
- 	}
-       else
- 	{
-@@ -868,7 +886,6 @@
- #define ARGS ((struct args_asm const *) args)
-   static int new_line = 1;
-   unsigned char const *rct = &ARGS->ctype[1];
--  char id_0[BUFSIZ];
-   char *id = id_0;
-   int c;
- 
-@@ -886,18 +903,25 @@
-       if (!ISID1ST (c))
- 	goto next;
-       id = id_0;
--      *id++ = c;
-+      APPEND_CHAR(c);
-       while (ISIDREST (c = getc (in_FILE)))
--	*id++ = c;
--      *id = '\0';
-+	APPEND_CHAR(c);
-+      APPEND_CHAR('\0');
-       if (strequ (id_0, "include"))
- 	{
--	  while (c != '"' && c != '<')
-+	  while (c == ' ' || c == '\t')
- 	    c = getc (in_FILE);
-+	  if (c == '\n' || ISEOF(c))
-+	    {
-+	      new_line = 1;
-+	      goto top;
-+	    }
-+	  if (c != '"' && c != '<')
-+	    goto next;
- 	  id = id_0;
--	  *id++ = c = getc (in_FILE);
-+	  APPEND_CHAR(c = getc (in_FILE));
- 	  while ((c = getc (in_FILE)) != '"' && c != '>')
--	    *id++ = c;
-+	    APPEND_CHAR(c);
- 	  *flags = TOK_STRING;
- 	  obstack_grow0 (&tokens_obstack, id_0, id - id_0);
- 	  return (struct token *) obstack_finish (&tokens_obstack);
-@@ -906,7 +930,7 @@
- 	  || strequ (id_0, "define")
- 	  || strequ (id_0, "undef"))
- 	goto next;
--      while (c != '\n')
-+      while ((c != '\n') && !ISEOF(c))
- 	c = getc (in_FILE);
-       new_line = 1;
-       goto top;
-@@ -967,18 +991,18 @@
-       obstack_grow0 (&tokens_obstack, "_", 1);
-       return (struct token *) obstack_finish (&tokens_obstack);
-     }
--  *id++ = c;
-+  APPEND_CHAR(c);
-   if (ISID1ST (c))
-     {
-       *flags = TOK_NAME;
-       while (ISIDREST (c = getc (in_FILE)))
--	*id++ = c;
-+	APPEND_CHAR(c);
-     }
-   else if (ISNUMBER (c))
-     {
-       *flags = TOK_NUMBER;
-       while (ISNUMBER (c = getc (in_FILE)))
--	*id++ = c;
-+	APPEND_CHAR(c);
-     }
-   else
-     {
-@@ -989,7 +1013,7 @@
-       goto next;
-     }
- 
--  *id = '\0';
-+  APPEND_CHAR('\0');
-   for (id = id_0; *id; id++)
-     if (ISIGNORE (*id))
-       goto next;
-@@ -1153,7 +1177,6 @@
- get_token_text (FILE *in_FILE, void const *args, int *flags)
+-unsigned short
++unsigned int
+ token_count (char const *buf)
  {
- #define ARGS ((struct args_text const *) args)
--  static char id_0[BUFSIZ];
-   unsigned char const *rct = &ARGS->ctype[1];
-   int c;
-   char *id = id_0;
-@@ -1170,19 +1193,19 @@
-       return 0;
-     }
-   id = id_0;
--  *id++ = c;
-+  APPEND_CHAR(c);
-   if (ISID1ST (c))
-     {
-       *flags = TOK_NAME;
-       while (ISIDREST (c = getc (in_FILE)))
- 	if (!ISIDSQUEEZE (c))
--	  *id++ = c;
-+	  APPEND_CHAR(c);
-     }
-   else if (ISNUMBER (c))
-     {
-       *flags = TOK_NUMBER;
-       while (ISNUMBER (c = getc (in_FILE)))
--	*id++ = c;
-+	APPEND_CHAR(c);
-     }
-   else
-     {
+   unsigned char const *flags = (unsigned char const *)&buf[strlen (buf) + 1];
+   unsigned char const *addr = flags + 1;
+-  unsigned short count = *addr;
++  unsigned int count = *addr;
+   if (*flags & TOK_SHORT_COUNT)
+     count += (*++addr << 8);
+   return count;
diff --git a/devel/id-utils/patches/patch-ad b/devel/id-utils/patches/patch-ad
index 7266a4fef5f..36c4e2aa122 100644
--- a/devel/id-utils/patches/patch-ad
+++ b/devel/id-utils/patches/patch-ad
@@ -1,13 +1,22 @@
-$NetBSD: patch-ad,v 1.1 2000/08/22 13:45:41 joda Exp $
+$NetBSD: patch-ad,v 1.2 2006/08/04 19:23:39 christos Exp $
 
---- src/fnid.c.orig	2000/08/22 13:05:33
-+++ src/fnid.c	2000/08/22 13:23:12
-@@ -174,7 +174,7 @@
+--- libidu/scanners.c.orig	2006-02-15 01:29:03.000000000 -0500
++++ libidu/scanners.c	2006-08-03 15:57:57.169635912 -0400
+@@ -77,11 +77,16 @@
+ {
+   { "C", parse_args_c, get_token_c, help_me_c },
+   { "C++", parse_args_c, get_token_c, help_me_cpp },
++  { "cpp", parse_args_c, get_token_c, help_me_cpp },
++  { "cc", parse_args_c, get_token_c, help_me_cpp },
+   { "Java", parse_args_c, get_token_c, help_me_java },
+   { "asm", parse_args_asm, get_token_asm, help_me_asm },
++  { "S", parse_args_asm, get_token_asm, help_me_asm },
++  { "s", parse_args_asm, get_token_asm, help_me_asm },
+   { "text", parse_args_text, get_token_text, help_me_text },
+   { "perl", parse_args_perl, get_token_perl, help_me_perl },
+-  { "lisp", parse_args_lisp, get_token_lisp, help_me_lisp }
++  { "lisp", parse_args_lisp, get_token_lisp, help_me_lisp },
++  { "make", parse_args_text, get_token_text, help_me_text },
+ };
+ struct language const *languages_N = &languages_0[cardinalityof (languages_0)];
  
-     for ( ; members < members_N; members++)
-       {
--	char *file_name = ALLOCA (char, PATH_MAX);
-+	char file_name[PATH_MAX];
- 	maybe_relative_file_name (file_name, *members, cw_dlink);
- 	for (patv = patv_0; patv < patv_N; patv++)
- 	  {
diff --git a/devel/id-utils/patches/patch-ah b/devel/id-utils/patches/patch-ah
index f900613d92f..b50c7022ffd 100644
--- a/devel/id-utils/patches/patch-ah
+++ b/devel/id-utils/patches/patch-ah
@@ -1,21 +1,46 @@
-$NetBSD: patch-ah,v 1.2 2001/11/03 09:59:36 seb Exp $
+$NetBSD: patch-ah,v 1.3 2006/08/04 19:23:39 christos Exp $
 
---- src/Makefile.am.orig	Sun Jun  9 02:22:34 1996
-+++ src/Makefile.am
-@@ -1,5 +1,8 @@
- ## Process this file with automake to create Makefile.in
+--- src/Makefile.in.orig	2006-03-11 19:34:50.000000000 -0500
++++ src/Makefile.in	2006-08-03 12:58:23.622869604 -0400
+@@ -92,28 +92,28 @@
+ PROGRAMS = $(bin_PROGRAMS)
+ fid_SOURCES = fid.c
+ fid_OBJECTS = fid.$(OBJEXT)
+-fid_LDADD = $(LDADD)
++fid_LDADD = $(DEPLIBS)
+ am__DEPENDENCIES_1 =
+ fid_DEPENDENCIES = ../libidu/libidu.a ../lib/libgnu.a \
+ 	$(am__DEPENDENCIES_1) ../lib/libgnu.a
+ fnid_SOURCES = fnid.c
+ fnid_OBJECTS = fnid.$(OBJEXT)
+-fnid_LDADD = $(LDADD)
++fnid_LDADD = $(DEPLIBS)
+ fnid_DEPENDENCIES = ../libidu/libidu.a ../lib/libgnu.a \
+ 	$(am__DEPENDENCIES_1) ../lib/libgnu.a
+ lid_SOURCES = lid.c
+ lid_OBJECTS = lid.$(OBJEXT)
+-lid_LDADD = $(LDADD)
++lid_LDADD = $(DEPLIBS)
+ lid_DEPENDENCIES = ../libidu/libidu.a ../lib/libgnu.a \
+ 	$(am__DEPENDENCIES_1) ../lib/libgnu.a
+ mkid_SOURCES = mkid.c
+ mkid_OBJECTS = mkid.$(OBJEXT)
+-mkid_LDADD = $(LDADD)
++mkid_LDADD = $(DEPLIBS)
+ mkid_DEPENDENCIES = ../libidu/libidu.a ../lib/libgnu.a \
+ 	$(am__DEPENDENCIES_1) ../lib/libgnu.a
+ xtokid_SOURCES = xtokid.c
+ xtokid_OBJECTS = xtokid.$(OBJEXT)
+-xtokid_LDADD = $(LDADD)
++xtokid_LDADD = $(DEPLIBS)
+ xtokid_DEPENDENCIES = ../libidu/libidu.a ../lib/libgnu.a \
+ 	$(am__DEPENDENCIES_1) ../lib/libgnu.a
+ dist_binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+@@ -263,6 +263,7 @@
+               -DLANGUAGE_MAP_FILE=\"$(datadir)/id-lang.map\"
  
-+# Makefile.in's patch is produced after regen from Makefile.am with
-+# `automake-1.1b --include-deps,' then it is hand-trimmed
-+
- AUTOMAKE_OPTIONS = ansi2knr
+ LDADD = ../libidu/libidu.a ../lib/libgnu.a $(LIBINTL) ../lib/libgnu.a 
++DEPLIBS = ../libidu/libidu.a ../lib/libgnu.a
+ all: all-am
  
- bin_PROGRAMS = mkid lid fid fnid xtokid
-@@ -16,5 +19,6 @@
- 	   -I.. -I$(top_srcdir) 
- DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
- LDADD = @INTLLIBS@ ../libidu/libidu.a ../lib/libsys.a
-+DEPLIBS = ../libidu/libidu.a ../lib/libsys.a
- 
--$(PROGRAMS): $(LDADD)
-+$(PROGRAMS): $(DEPLIBS)
+ .SUFFIXES:
diff --git a/devel/id-utils/patches/patch-ai b/devel/id-utils/patches/patch-ai
index add49bd9234..e1f817b228e 100644
--- a/devel/id-utils/patches/patch-ai
+++ b/devel/id-utils/patches/patch-ai
@@ -1,39 +1,40 @@
-$NetBSD: patch-ai,v 1.1 2001/09/19 08:57:07 joda Exp $
+$NetBSD: patch-ai,v 1.2 2006/08/04 19:23:39 christos Exp $
 
---- src/lid.c~	Wed Sep 19 10:03:44 2001
-+++ src/lid.c	Wed Sep 19 10:38:49 2001
-@@ -34,7 +34,6 @@
- #include "xstring.h"
- #include "error.h"
- #include "pathmax.h"
--#include "xalloca.h"
- #if HAVE_LIMITS_H
- # include <limits.h>
- #endif
-@@ -557,7 +556,7 @@
-   line[0] = ' ';		/* sentry */
-   while (*flinkv)
-     {
--      char *file_name = ALLOCA (char, PATH_MAX);
-+      char file_name[PATH_MAX];
-       FILE *gid_FILE;
+--- src/fid.c.orig	2006-03-05 05:24:21.000000000 -0500
++++ src/fid.c	2006-08-03 12:49:29.089070087 -0400
+@@ -23,7 +23,6 @@
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include <errno.h>
+-#include <alloca.h>
+ #include <error.h>
+ #include <pathmax.h>
+ #include <xalloc.h>
+@@ -211,7 +210,7 @@
+   struct file_link **members;
+   struct file_link **end = &members_0[idh.idh_files];
+   struct file_link *fn_flink = 0;
+-  char *file_name_buf = alloca (PATH_MAX);
++  char file_name_buf[PATH_MAX];
+   int has_slash = (strchr (file_name, '/') != 0);
+   int file_name_length = strlen (file_name);
+   int idx = -1;
+--- src/fnid.c.orig	2006-03-05 05:24:29.000000000 -0500
++++ src/fnid.c	2006-08-03 12:45:08.051454285 -0400
+@@ -24,7 +24,6 @@
+ #include <errno.h>
+ #include <stdlib.h>
+ #include <errno.h>
+-#include <alloca.h>
+ #include <xalloc.h>
+ #include <pathmax.h>
+ #include <error.h>
+@@ -167,7 +166,7 @@
+     char **patv_0 = xmalloc (sizeof(char *) * (argc * 2));
+     char **patv_N;
+     char **patv = patv_0;
+-    char *file_name = alloca (PATH_MAX);
++    char file_name[PATH_MAX];
  
-       maybe_relative_file_name (file_name, *flinkv++, cw_dlink);
-@@ -569,7 +568,7 @@
-         }
- 
-       line_number = 0;
--      while (fgets (&line[1], sizeof (line), gid_FILE))
-+      while (fgets (&line[1], sizeof (line) - 1, gid_FILE))
- 	{
- 	  line_number++;
- 	  if (pattern)
-@@ -768,7 +767,7 @@
- 
-   for (count = 0; *flinkv; count++, flinkv++)
-     {
--      char *file_name = ALLOCA (char, PATH_MAX);
-+      char file_name[PATH_MAX];
-       maybe_relative_file_name (file_name, *flinkv, cw_dlink);
-       if (strcasestr (file_name, pattern))
- 	return count;
+     for ( ; argc; argc--, argv++)
+       {
diff --git a/devel/id-utils/patches/patch-aj b/devel/id-utils/patches/patch-aj
index 8047e36f6e3..91c62691607 100644
--- a/devel/id-utils/patches/patch-aj
+++ b/devel/id-utils/patches/patch-aj
@@ -1,21 +1,68 @@
-$NetBSD: patch-aj,v 1.1 2001/09/19 08:57:07 joda Exp $
+$NetBSD: patch-aj,v 1.2 2006/08/04 19:23:39 christos Exp $
 
---- src/fid.c~	Wed Aug  7 05:22:14 1996
-+++ src/fid.c	Wed Sep 19 10:20:47 2001
-@@ -26,7 +26,6 @@
- #include "error.h"
- #include "pathmax.h"
- #include "xmalloc.h"
--#include "xalloca.h"
+--- src/lid.c.orig	2006-03-05 05:23:56.000000000 -0500
++++ src/lid.c	2006-08-04 14:50:44.415180548 -0400
+@@ -31,7 +31,6 @@
+ #include <dirname.h>
+ #include <unistd.h>
+ #include <termios.h>
+-#include <alloca.h>
+ #include <regex.h>
+ #include <xalloc.h>
+ #include <pathmax.h>
+@@ -538,10 +537,11 @@
+ void
+ report_grep (char const *name, struct file_link **flinkv)
+ {
+-  char line[1<<020];
++  char *line = xmalloc(BUFSIZ);
++  size_t line_len = BUFSIZ;
+   char const *pattern = 0;
+   regex_t compiled;
+-  char *file_name = alloca (PATH_MAX);
++  char file_name[PATH_MAX];
  
- int get_file_index __P((char *file_name));
- int is_hit __P((unsigned char const *hits, int file_number));
-@@ -203,7 +202,7 @@
-   struct file_link **members;
-   struct file_link **end = &members_0[idh.idh_files];
-   struct file_link *fn_flink = 0;
--  char *file_name_buf = ALLOCA (char, PATH_MAX);
-+  char file_name_buf[PATH_MAX];
-   int has_slash = (strchr (file_name, '/') != 0);
-   int file_name_length = strlen (file_name);
-   int idx = -1;
+   if (key_style == ks_pattern)
+     {
+@@ -575,6 +575,15 @@
+ 
+       while (fgets (line + 1, sizeof (line) - 1, source_FILE))
+ 	{
++	  size_t len;
++	  while ((len = strlen(line)) == line_len - 1 &&
++		 line[line_len - 2] != '\n')
++	    {
++	      line = xrealloc(line, line_len + BUFSIZ);
++	      line_len += BUFSIZ;
++	      if (fgets(line + len, BUFSIZ, source_FILE) == NULL)
++		break;
++	    }
+ 	  line_number++;
+ 	  if (pattern)
+ 	    {
+@@ -589,6 +598,7 @@
+ 	}
+       fclose (source_FILE);
+     }
++  free(line);
+ }
+ 
+ void
+@@ -765,7 +775,7 @@
+ {
+   char pattern[BUFSIZ];
+   unsigned int count;
+-  char *file_name = alloca (PATH_MAX);
++  char file_name[PATH_MAX];
+   char *eol;
+ 
+   if (fgets (pattern, sizeof (pattern), stdin) == 0)
+@@ -1333,7 +1343,7 @@
+ 	  continue;
+ 	}
+       /* march down both strings as long as we match */
+-      while (*++name == *++line)
++      while (*name != '\0' && *++name == *++line)
+ 	;
+       /* is this the end of `name', is there a word delimiter ?? */
+       if (*name == '\0' && !IS_ALNUM (*line))
diff --git a/devel/id-utils/patches/patch-ak b/devel/id-utils/patches/patch-ak
index e4b211313f9..1a5e2724839 100644
--- a/devel/id-utils/patches/patch-ak
+++ b/devel/id-utils/patches/patch-ak
@@ -1,52 +1,53 @@
-$NetBSD: patch-ak,v 1.2 2002/06/21 12:26:32 lukem Exp $
+$NetBSD: patch-ak,v 1.3 2006/08/04 19:23:39 christos Exp $
 
---- src/mkid.c.orig	Tue Jul  9 14:19:09 1996
-+++ src/mkid.c
-@@ -33,7 +33,6 @@
- #include "hash.h"
+--- src/mkid.c.orig	2006-02-16 01:40:30.000000000 -0500
++++ src/mkid.c	2006-08-03 15:57:10.096617302 -0400
+@@ -28,7 +28,6 @@
+ #include <pathmax.h>
+ #include <string.h>
+ #include <dirname.h>
+-#include <alloca.h>
+ #include <limits.h>
+ #include <inttostr.h>
+ #include <xalloc.h>
+@@ -40,8 +39,6 @@
  #include "scanners.h"
- #include "error.h"
--#include "xalloca.h"
- #if HAVE_LIMITS_H
- # include <limits.h>
- #endif
-@@ -304,12 +303,18 @@
+ #include "iduglobal.h"
+ 
+-char* dirname(char* path);
+-
+ struct summary
+ {
+   struct token **sum_tokens;
+@@ -372,11 +369,18 @@
      {
        if (errno == ENOENT)
  	{
--	  char const *dir_name = dirname (file_name);
--	  if (!dir_name || !*dir_name)
--	    dir_name = ".";
-+	  char *dir_name = strrchr (file_name, '/');
+-	  char const *dirname = dir_name ((char*)filename);
+-	  if (access (dirname, 06) < 0)
++	  char *dir_name = strrchr (filename, '/');
 +	  if (dir_name)
 +	    {
 +	      while (*--dir_name == '/')
-+		;
++		continue;
 +	      dir_name++;
 +	    }
-+	  dir_name = dir_name ? strndup (file_name, dir_name - file_name) : strdup(".");
- 	  if (access (dir_name, 06) < 0)
++	  dir_name = dir_name ? strndup (filename, dir_name - filename) : strdup(".");
++	  if (access (dir_name, 06) < 0)
  	    error (1, errno, _("can't create `%s' in `%s'"),
- 		   basename (file_name), dir_name);
-+	  free (dir_name);
+-		   base_name (filename), dirname);
+-	  free(dirname);
++		   base_name (filename), dir_name);
++	  free(dir_name);
  	}
        else
- 	error (1, errno, _("can't modify `%s'"), file_name);
-@@ -363,7 +368,7 @@
+ 	error (1, errno, _("can't modify `%s'"), filename);
+@@ -450,7 +454,7 @@
+   source_FILE = fopen (flink->fl_name, "r");
+   if (source_FILE)
+     {
+-      char *file_name = alloca (PATH_MAX);
++      char file_name[PATH_MAX];
+       if (statistics_flag)
  	{
  	  if (fstat (fileno (source_FILE), &st) < 0)
- 	    {
--	      char *file_name = ALLOCA (char, PATH_MAX);
-+	      char file_name[PATH_MAX];
- 	      maybe_relative_file_name (file_name, flink, cw_dlink);
- 	      error (0, errno, _("can't stat `%s'"), file_name);
- 	    }
-@@ -372,7 +377,7 @@
- 	}
-       if (verbose_flag)
- 	{
--	  char *file_name = ALLOCA (char, PATH_MAX);
-+	  char file_name[PATH_MAX];
- 	  maybe_relative_file_name (file_name, flink, cw_dlink);
- 	  printf ("%d: %s: %s", member->mf_index, lang->lg_name, file_name);
- 	  fflush (stdout);
diff --git a/devel/id-utils/patches/patch-al b/devel/id-utils/patches/patch-al
deleted file mode 100644
index 555e6e2c7e2..00000000000
--- a/devel/id-utils/patches/patch-al
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-al,v 1.2 2006/06/09 22:30:58 dbj Exp $
-
---- src/Makefile.in.orig	1996-08-06 23:27:21.000000000 -0400
-+++ src/Makefile.in	2006-06-09 17:24:46.000000000 -0400
-@@ -4,6 +4,9 @@
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy, distribute and modify it.
- 
-+# Makefile.in's patch is produced after regen from Makefile.am with
-+# `automake-1.1b --include-deps,' then it is hand-trimmed
-+
- 
- SHELL = /bin/sh
- 
-@@ -54,6 +57,7 @@
- 	   -I.. -I$(top_srcdir) 
- DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
- LDADD = @INTLLIBS@ ../libidu/libidu.a ../lib/libsys.a
-+DEPLIBS = ../libidu/libidu.a ../lib/libsys.a
- mkinstalldirs = $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
- PROGRAMS = $(bin_PROGRAMS)
-@@ -109,6 +113,9 @@
- SOURCES = mkid.c lid.c fid.c fnid.c xtokid.c
- OBJECTS = mkid$o lid$o fid$o fnid$o xtokid$o
- 
-+.SUFFIXES:
-+.SUFFIXES: .c .o ._c ._o
-+
- default: all
- 
- 
-@@ -337,9 +344,7 @@
- maintainer-clean
- 
- 
--$(PROGRAMS): $(LDADD)
--.SUFFIXES:
--.SUFFIXES: .c .o ._c ._o
-+$(PROGRAMS): $(DEPLIBS)
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/devel/id-utils/patches/patch-am b/devel/id-utils/patches/patch-am
deleted file mode 100644
index bd5275544d2..00000000000
--- a/devel/id-utils/patches/patch-am
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-am,v 1.1 2002/02/27 09:07:44 joda Exp $
-
---- libidu/fnprint.c~	Tue Jul  9 06:19:08 1996
-+++ libidu/fnprint.c	Wed Feb 27 09:56:56 2002
-@@ -19,7 +19,6 @@
- #include <config.h>
- #include <stdio.h>
- #include "xstdlib.h"
--#include "xalloca.h"
- #include "xunistd.h"
- #include "idfile.h"
- #include "xstring.h"
-@@ -94,7 +93,7 @@
- 	      dlink = arg->fl_parent;
- 	      if (dlink && dlink != cw_dlink)
- 		{
--		  char *file_name = ALLOCA (char, PATH_MAX);
-+		  char file_name[PATH_MAX];
- 		  maybe_relative_file_name (file_name, dlink, cw_dlink);
- 		  fputs (file_name, stdout);
- 		  putchar ('/');
-@@ -109,7 +108,7 @@
- 	    printf (",%s}%s", root_name (arg->fl_name), suff_name (arg->fl_name));
- 	  else
- 	    {
--	      char *file_name = ALLOCA (char, PATH_MAX);
-+	      char file_name[PATH_MAX];
- 	      maybe_relative_file_name (file_name, arg, cw_dlink);
- 	      fputs (file_name, stdout);
- 	    }
diff --git a/devel/id-utils/patches/patch-an b/devel/id-utils/patches/patch-an
deleted file mode 100644
index f72c8b8cc82..00000000000
--- a/devel/id-utils/patches/patch-an
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-an,v 1.1 2002/03/01 01:38:48 jmc Exp $
-
---- libidu/scanners.h.orig	Fri Mar  1 01:21:16 2002
-+++ libidu/scanners.h	Fri Mar  1 01:21:30 2002
-@@ -21,11 +21,11 @@
- 
- #include "xobstack.h"
- 
--#define MAX_LEVELS 5		/* log_8 of the max # of files: log_8 (32768) == 5 */
-+#define MAX_LEVELS 16		/* log_8 of the max # of files: log_8 (2^32) == 16 */
- 
- struct token
- {
--  unsigned short tok_count;
-+  unsigned int tok_count;
-   unsigned char tok_flags;
-   unsigned char tok_hits[MAX_LEVELS];
-   char tok_name[1];
diff --git a/devel/id-utils/patches/patch-ao b/devel/id-utils/patches/patch-ao
deleted file mode 100644
index 849e4e5943a..00000000000
--- a/devel/id-utils/patches/patch-ao
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2002/03/01 01:38:48 jmc Exp $
-
---- libidu/idfile.h.orig	Fri Mar  1 01:21:24 2002
-+++ libidu/idfile.h	Fri Mar  1 01:21:27 2002
-@@ -121,7 +121,7 @@
- {
-   struct file_link *mf_link;
-   struct lang_args const *mf_lang_args;
--  short mf_index;		/* order in ID file */
-+  int mf_index;		/* order in ID file */
- };
- 
- #if HAVE_LINK
-@@ -147,7 +147,7 @@
- 
- #define token_string(buf) (buf)
- extern unsigned int token_flags __P((char const *buf));
--extern unsigned short token_count __P((char const *buf));
-+extern unsigned int token_count __P((char const *buf));
- extern unsigned char const *token_hits_addr __P((char const *buf));
- 
- #define MAYBE_RETURN_PREFIX_MATCH(arg, str, val) do { \
diff --git a/devel/id-utils/patches/patch-ap b/devel/id-utils/patches/patch-ap
deleted file mode 100644
index d8e3e6f0860..00000000000
--- a/devel/id-utils/patches/patch-ap
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2002/03/01 01:38:48 jmc Exp $
-
---- libidu/idread.c.orig	Fri Mar  1 01:22:36 2002
-+++ libidu/idread.c	Fri Mar  1 01:22:52 2002
-@@ -207,12 +207,12 @@
- #define TOK_COUNT_ADDR(buf) ((unsigned char const *)(TOK_FLAGS_ADDR (buf) + 1))
- #define TOK_HITS_ADDR(buf) ((unsigned char const *)(TOK_COUNT_ADDR (buf) + 2))
- 
--unsigned short
-+unsigned int
- token_count (char const *buf)
- {
-   unsigned char const *flags = (unsigned char const *)&buf[strlen (buf) + 1];
-   unsigned char const *addr = flags + 1;
--  unsigned short count = *addr;
-+  unsigned int count = *addr;
-   if (*flags & TOK_SHORT_COUNT)
-     count += (*++addr << 8);
-   return count;
diff --git a/devel/id-utils/patches/patch-ar b/devel/id-utils/patches/patch-ar
deleted file mode 100644
index 868074e41e5..00000000000
--- a/devel/id-utils/patches/patch-ar
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-ar,v 1.1 2002/04/03 16:27:03 joda Exp $
-
---- src/lid.c~	Wed Apr  3 15:02:41 2002
-+++ src/lid.c	Wed Apr  3 16:01:38 2002
-@@ -532,7 +532,8 @@
- void
- report_grep (char const *name, struct file_link **flinkv)
- {
--  char line[BUFSIZ];
-+  char *line = xmalloc(BUFSIZ);
-+  size_t line_len = BUFSIZ;
-   char const *pattern = 0;
-   regex_t compiled;
-   int line_number;
-@@ -568,8 +569,14 @@
-         }
- 
-       line_number = 0;
--      while (fgets (&line[1], sizeof (line) - 1, gid_FILE))
-+      while (fgets (line + 1, line_len - 1, gid_FILE))
- 	{
-+	  while(strlen(line) == line_len - 1 && line[line_len - 2] != '\n') {
-+	    line = xrealloc(line, line_len + BUFSIZ);
-+	    line_len += BUFSIZ;
-+	    if(fgets(line + strlen(line), BUFSIZ, gid_FILE) == NULL)
-+	      break;
-+	  }
- 	  line_number++;
- 	  if (pattern)
- 	    {
-@@ -585,6 +592,7 @@
- 	}
-       fclose (gid_FILE);
-     }
-+  free(line);
- }
- 
- void
-@@ -1314,7 +1322,7 @@
- 	  continue;
- 	}
-       /* march down both strings as long as we match */
--      while (*++name == *++line)
-+      while (*name != '\0' && *++name == *++line)
- 	;
-       /* is this the end of `name', is there a word delimiter ?? */
-       if (*name == '\0' && !IS_ALNUM (*line))
diff --git a/devel/id-utils/patches/patch-as b/devel/id-utils/patches/patch-as
deleted file mode 100644
index f52768fa22a..00000000000
--- a/devel/id-utils/patches/patch-as
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-as,v 1.1 2005/10/31 01:52:36 dbj Exp $
-
---- libidu/idfile.c.orig	Tue Jul  9 00:19:08 1996
-+++ libidu/idfile.c	Wed Jun  8 17:44:53 2005
-@@ -85,7 +85,7 @@
-       if (stat (file_name_buffer, &statb) != 0)
- 	return NULL;
-     }
--  while (!((statb.st_ino == rootb.st_ino) ||
-+  while (!((statb.st_ino == rootb.st_ino) &&
- 	   (statb.st_dev == rootb.st_dev)));
-   return NULL;
- }
diff --git a/devel/id-utils/patches/patch-at b/devel/id-utils/patches/patch-at
deleted file mode 100644
index 8aa043ff142..00000000000
--- a/devel/id-utils/patches/patch-at
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-at,v 1.1 2006/06/09 22:30:58 dbj Exp $
-
---- libidu/Makefile.in.orig	2006-06-09 17:31:40.000000000 -0400
-+++ libidu/Makefile.in	2006-06-09 17:32:30.000000000 -0400
-@@ -100,6 +100,9 @@
- SOURCES = $(idu_SOURCES)
- OBJECTS = $(idu_OBJECTS)
- 
-+.SUFFIXES:
-+.SUFFIXES: .c .o ._c ._o
-+
- default: all
- 
- 
-@@ -313,8 +316,6 @@
- 
- ansi2knr.c: $(top_srcdir)/src/ansi2knr.c
- 	ln $(top_srcdir)/src/ansi2knr.c .
--.SUFFIXES:
--.SUFFIXES: .c .o ._c ._o
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.