Update to 4.2:

Version 4.2 - August 5, 2006, by Claudio Fontana

* Bugfix release

6 files changed, 52 insertions, 49 deletions

diff --git a/devel/idutils/Makefile b/devel/idutils/Makefile
index 9306e83e9ab..0b25a11f8e0 100644
--- a/devel/idutils/Makefile
+++ b/devel/idutils/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/08/05 19:53:26 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2006/08/06 23:10:30 wiz Exp $
 
-DISTNAME=	idutils-4.1
-#PKGREVISION=	0
+DISTNAME=	idutils-4.2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=idutils/}
 
@@ -16,7 +15,7 @@ USE_TOOLS+=		msgfmt
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ENV+=		ac_cv_path_EMACS=no
-INFO_FILES=		# PLIST
+INFO_FILES=		YES
 MAKE_ENV+=		BSD_SETENV=${SETENV:Q}
 
 # Don't byte-compile the .el file.
diff --git a/devel/idutils/distinfo b/devel/idutils/distinfo
index a8f986d7d76..5d09049832c 100644
--- a/devel/idutils/distinfo
+++ b/devel/idutils/distinfo
@@ -1,12 +1,13 @@
-$NetBSD: distinfo,v 1.2 2006/08/06 22:23:56 christos Exp $
+$NetBSD: distinfo,v 1.3 2006/08/06 23:10:30 wiz Exp $
 
-SHA1 (idutils-4.1.tar.gz) = 3ce5524b2962fc785d44a3ee73d32ebf975d70d1
-RMD160 (idutils-4.1.tar.gz) = 7ddadd6a97e2a096916f9ac20ccffff14cc2a330
-Size (idutils-4.1.tar.gz) = 696756 bytes
+SHA1 (idutils-4.2.tar.gz) = 306f6e296768d494d771777647c04c8ceed66c1f
+RMD160 (idutils-4.2.tar.gz) = cddc6ac3d26f8a836a4d8c5d7111b4439095abe8
+Size (idutils-4.2.tar.gz) = 706193 bytes
 SHA1 (patch-aa) = f957a2af9470e41c1b423b9c753456e68a46405c
 SHA1 (patch-ab) = 96a1ec3d8c49da9538342450df41c7cd17c0d21c
 SHA1 (patch-ac) = 714cc320a02235c7d49b0ea37be60cff36f6a07b
 SHA1 (patch-ad) = 05f6be0337f599736627d5bf372529e36ca22246
-SHA1 (patch-ai) = ebf6092918830c95308a4a1b9145314c5fecbd58
-SHA1 (patch-aj) = 6435ee17529ab3782b340f51c7e43390aaae662d
-SHA1 (patch-ak) = f39c0bbb446ac328c4dd8258e58012ee7beee276
+SHA1 (patch-ae) = b0a11f8172bede23e4f22f5ace819117f8f6a26d
+SHA1 (patch-ai) = ee67a03e074820db342ffa6ec26c1440641b702e
+SHA1 (patch-aj) = e5dc6feb7895e868a742d66e9eb05c0f74c81c3e
+SHA1 (patch-ak) = 91a781f4908b34ab172268e74ae77e93fd0e2ab4
diff --git a/devel/idutils/patches/patch-ae b/devel/idutils/patches/patch-ae
new file mode 100644
index 00000000000..6252fbbeda3
--- /dev/null
+++ b/devel/idutils/patches/patch-ae
@@ -0,0 +1,21 @@
+$NetBSD: patch-ae,v 1.1 2006/08/06 23:10:30 wiz Exp $
+
+--- src/fnid.c.orig	2006-04-29 15:52:12.000000000 +0000
++++ src/fnid.c
+@@ -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 @@ main (int argc, char **argv)
+     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];
+ 
+     for ( ; argc; argc--, argv++)
+       {
diff --git a/devel/idutils/patches/patch-ai b/devel/idutils/patches/patch-ai
index 6b8082e7b1f..64dde653e91 100644
--- a/devel/idutils/patches/patch-ai
+++ b/devel/idutils/patches/patch-ai
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.1.1.1 2006/08/05 19:53:26 wiz Exp $
+$NetBSD: patch-ai,v 1.2 2006/08/06 23:10:30 wiz Exp $
 
 --- src/fid.c.orig	2006-03-05 05:24:21.000000000 -0500
 +++ src/fid.c	2006-08-03 12:49:29.089070087 -0400
@@ -19,22 +19,3 @@ $NetBSD: patch-ai,v 1.1.1.1 2006/08/05 19:53:26 wiz Exp $
    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];
- 
-     for ( ; argc; argc--, argv++)
-       {
diff --git a/devel/idutils/patches/patch-aj b/devel/idutils/patches/patch-aj
index 4e1f7d8045e..18a06320e71 100644
--- a/devel/idutils/patches/patch-aj
+++ b/devel/idutils/patches/patch-aj
@@ -1,7 +1,7 @@
-$NetBSD: patch-aj,v 1.1.1.1 2006/08/05 19:53:26 wiz Exp $
+$NetBSD: patch-aj,v 1.2 2006/08/06 23:10:30 wiz Exp $
 
---- src/lid.c.orig	2006-03-05 05:23:56.000000000 -0500
-+++ src/lid.c	2006-08-04 14:50:44.415180548 -0400
+--- src/lid.c.orig	2006-07-22 02:43:25.000000000 +0000
++++ src/lid.c
 @@ -31,7 +31,6 @@
  #include <dirname.h>
  #include <unistd.h>
@@ -10,7 +10,7 @@ $NetBSD: patch-aj,v 1.1.1.1 2006/08/05 19:53:26 wiz Exp $
  #include <regex.h>
  #include <xalloc.h>
  #include <pathmax.h>
-@@ -538,10 +537,11 @@
+@@ -538,10 +537,11 @@ report_filenames (char const *name, stru
  void
  report_grep (char const *name, struct file_link **flinkv)
  {
@@ -24,7 +24,7 @@ $NetBSD: patch-aj,v 1.1.1.1 2006/08/05 19:53:26 wiz Exp $
  
    if (key_style == ks_pattern)
      {
-@@ -575,6 +575,15 @@
+@@ -575,6 +575,15 @@ report_grep (char const *name, struct fi
  
        while (fgets (line + 1, sizeof (line) - 1, source_FILE))
  	{
@@ -40,15 +40,15 @@ $NetBSD: patch-aj,v 1.1.1.1 2006/08/05 19:53:26 wiz Exp $
  	  line_number++;
  	  if (pattern)
  	    {
-@@ -589,6 +598,7 @@
+@@ -589,6 +598,7 @@ report_grep (char const *name, struct fi
  	}
        fclose (source_FILE);
      }
 +  free(line);
  }
  
- void
-@@ -765,7 +775,7 @@
+ static char **
+@@ -800,7 +810,7 @@ search_flinkv (struct file_link **flinkv
  {
    char pattern[BUFSIZ];
    unsigned int count;
@@ -57,7 +57,7 @@ $NetBSD: patch-aj,v 1.1.1.1 2006/08/05 19:53:26 wiz Exp $
    char *eol;
  
    if (fgets (pattern, sizeof (pattern), stdin) == 0)
-@@ -1333,7 +1343,7 @@
+@@ -1368,7 +1378,7 @@ word_match (char const *name_0, char con
  	  continue;
  	}
        /* march down both strings as long as we match */
diff --git a/devel/idutils/patches/patch-ak b/devel/idutils/patches/patch-ak
index 28740ad949e..8167f566e4d 100644
--- a/devel/idutils/patches/patch-ak
+++ b/devel/idutils/patches/patch-ak
@@ -1,7 +1,7 @@
-$NetBSD: patch-ak,v 1.2 2006/08/06 22:23:56 christos Exp $
+$NetBSD: patch-ak,v 1.3 2006/08/06 23:10:30 wiz Exp $
 
---- src/mkid.c.orig	2006-02-16 01:40:30.000000000 -0500
-+++ src/mkid.c	2006-08-06 18:20:32.000000000 -0400
+--- src/mkid.c.orig	2006-07-22 03:38:03.000000000 +0000
++++ src/mkid.c
 @@ -28,7 +28,6 @@
  #include <pathmax.h>
  #include <string.h>
@@ -19,12 +19,15 @@ $NetBSD: patch-ak,v 1.2 2006/08/06 22:23:56 christos Exp $
  struct summary
  {
    struct token **sum_tokens;
-@@ -372,11 +369,21 @@
+@@ -381,11 +378,21 @@ assert_writeable (char const *filename)
      {
        if (errno == ENOENT)
  	{
--	  char const *dirname = dir_name ((char*)filename);
+-	  char *dirname = dir_name (filename);
 -	  if (access (dirname, 06) < 0)
+-	    error (1, errno, _("can't create `%s' in `%s'"),
+-		   base_name (filename), dirname);
+-	  free(dirname);
 +	  char *dir_copy, *dir_name = strrchr (filename, '/');
 +	  if (dir_name)
 +	    {
@@ -37,15 +40,13 @@ $NetBSD: patch-ak,v 1.2 2006/08/06 22:23:56 christos Exp $
 +	  else
 +	    dir_copy = strdup(".");
 +	  if (access (dir_copy, 06) < 0)
- 	    error (1, errno, _("can't create `%s' in `%s'"),
--		   base_name (filename), dirname);
--	  free(dirname);
++  	    error (1, errno, _("can't create `%s' in `%s'"),
 +		   base_name (filename), dir_copy);
 +	  free(dir_copy);
  	}
        else
  	error (1, errno, _("can't modify `%s'"), filename);
-@@ -450,7 +457,7 @@
+@@ -459,7 +466,7 @@ scan_member_file (struct member_file con
    source_FILE = fopen (flink->fl_name, "r");
    if (source_FILE)
      {