Make this work under NetBSD; I had only tested it on Linux.

3 files changed, 14 insertions, 61 deletions

diff --git a/devel/idutils/distinfo b/devel/idutils/distinfo
index 357c9746230..a8f986d7d76 100644
--- a/devel/idutils/distinfo
+++ b/devel/idutils/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/08/05 19:53:26 wiz Exp $
+$NetBSD: distinfo,v 1.2 2006/08/06 22:23:56 christos Exp $
 
 SHA1 (idutils-4.1.tar.gz) = 3ce5524b2962fc785d44a3ee73d32ebf975d70d1
 RMD160 (idutils-4.1.tar.gz) = 7ddadd6a97e2a096916f9ac20ccffff14cc2a330
@@ -7,10 +7,6 @@ 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
+SHA1 (patch-ak) = f39c0bbb446ac328c4dd8258e58012ee7beee276
diff --git a/devel/idutils/patches/patch-ah b/devel/idutils/patches/patch-ah
deleted file mode 100644
index 65deb7061ab..00000000000
--- a/devel/idutils/patches/patch-ah
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD: patch-ah,v 1.1.1.1 2006/08/05 19:53:26 wiz Exp $
-
---- 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\"
- 
- LDADD = ../libidu/libidu.a ../lib/libgnu.a $(LIBINTL) ../lib/libgnu.a 
-+DEPLIBS = ../libidu/libidu.a ../lib/libgnu.a
- all: all-am
- 
- .SUFFIXES:
diff --git a/devel/idutils/patches/patch-ak b/devel/idutils/patches/patch-ak
index cadafddf708..28740ad949e 100644
--- a/devel/idutils/patches/patch-ak
+++ b/devel/idutils/patches/patch-ak
@@ -1,7 +1,7 @@
-$NetBSD: patch-ak,v 1.1.1.1 2006/08/05 19:53:26 wiz Exp $
+$NetBSD: patch-ak,v 1.2 2006/08/06 22:23:56 christos Exp $
 
 --- src/mkid.c.orig	2006-02-16 01:40:30.000000000 -0500
-+++ src/mkid.c	2006-08-03 15:57:10.096617302 -0400
++++ src/mkid.c	2006-08-06 18:20:32.000000000 -0400
 @@ -28,7 +28,6 @@
  #include <pathmax.h>
  #include <string.h>
@@ -19,30 +19,33 @@ $NetBSD: patch-ak,v 1.1.1.1 2006/08/05 19:53:26 wiz Exp $
  struct summary
  {
    struct token **sum_tokens;
-@@ -372,11 +369,18 @@
+@@ -372,11 +369,21 @@
      {
        if (errno == ENOENT)
  	{
 -	  char const *dirname = dir_name ((char*)filename);
 -	  if (access (dirname, 06) < 0)
-+	  char *dir_name = strrchr (filename, '/');
++	  char *dir_copy, *dir_name = strrchr (filename, '/');
 +	  if (dir_name)
 +	    {
 +	      while (*--dir_name == '/')
 +		continue;
 +	      dir_name++;
++	      dir_copy = strdup(filename);
++	      dir_copy[dir_name - filename] = '\0';
 +	    }
-+	  dir_name = dir_name ? strndup (filename, dir_name - filename) : strdup(".");
-+	  if (access (dir_name, 06) < 0)
++	  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);
-+		   base_name (filename), dir_name);
-+	  free(dir_name);
++		   base_name (filename), dir_copy);
++	  free(dir_copy);
  	}
        else
  	error (1, errno, _("can't modify `%s'"), filename);
-@@ -450,7 +454,7 @@
+@@ -450,7 +457,7 @@
    source_FILE = fopen (flink->fl_name, "r");
    if (source_FILE)
      {