make this work under linux.

- don't use gnumalloc
- use lchmod only on NetBSD

3 files changed, 14 insertions, 20 deletions

diff --git a/archivers/gtar/files/patch-sum b/archivers/gtar/files/patch-sum
index a7817d4490b..1f5ac57a235 100644
--- a/archivers/gtar/files/patch-sum
+++ b/archivers/gtar/files/patch-sum
@@ -1,6 +1,6 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 13:50:07 agc Exp $
+$NetBSD: patch-sum,v 1.2 1999/08/10 05:05:39 christos Exp $
 
-MD5 (patch-aa) = 5de69aa9de50651e87fb8de2b3de5451
-MD5 (patch-ab) = 5daf220a356db53cfb1789d6f9256548
+MD5 (patch-aa) = bcc4f474df0bec91c68b2a0a74d94ce5
+MD5 (patch-ab) = c084f2dec72afbc738780f1ef24339f1
 MD5 (patch-ac) = e4f3ddfab9b1a9dfeddbb2d7a977dcc5
 MD5 (patch-ad) = bff27b6077f59c33af7629fd071efe96
diff --git a/archivers/gtar/patches/patch-aa b/archivers/gtar/patches/patch-aa
index 001443e8550..f7f2155c610 100644
--- a/archivers/gtar/patches/patch-aa
+++ b/archivers/gtar/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 1998/08/07 10:35:49 agc Exp $
+$NetBSD: patch-aa,v 1.3 1999/08/10 05:05:40 christos Exp $
 
 --- src/Makefile.in.orig	Fri Apr 25 20:22:06 1997
 +++ src/Makefile.in	Wed Mar  4 09:49:44 1998
@@ -11,12 +11,3 @@ $NetBSD: patch-aa,v 1.2 1998/08/07 10:35:49 agc Exp $
  EXTRA_PROGRAMS = rmt
  
  noinst_HEADERS = arith.h common.h rmt.h system.h tar.h
-@@ -121,7 +121,7 @@
- 
- DEFS = @DEFS@ -I. -I$(srcdir) -I..
- CPPFLAGS = @CPPFLAGS@
--LDFLAGS = @LDFLAGS@
-+LDFLAGS = @LDFLAGS@ -lgnumalloc
- LIBS = @LIBS@
- o = @U@o
- ANSI2KNR = @ANSI2KNR@
diff --git a/archivers/gtar/patches/patch-ab b/archivers/gtar/patches/patch-ab
index f6c44dd5d27..3aacabdcc03 100644
--- a/archivers/gtar/patches/patch-ab
+++ b/archivers/gtar/patches/patch-ab
@@ -1,17 +1,20 @@
-$NetBSD: patch-ab,v 1.4 1998/08/07 10:35:49 agc Exp $
+$NetBSD: patch-ab,v 1.5 1999/08/10 05:05:40 christos Exp $
 
 --- src/extract.c.orig	Tue Apr 22 20:05:57 1997
 +++ src/extract.c	Fri Mar  6 14:33:05 1998
-@@ -103,7 +103,7 @@
+@@ -103,7 +103,11 @@
  
    if (!keep_old_files_option
        || (stat_info->st_mode & (S_ISUID | S_ISGID | S_ISVTX)))
--    if (chmod (file_name, ~current_umask & (int) stat_info->st_mode) < 0)
++#ifdef __NetBSD__
 +    if (lchmod (file_name, ~current_umask & (int) stat_info->st_mode) < 0)
++#else
+     if (chmod (file_name, ~current_umask & (int) stat_info->st_mode) < 0)
++#endif
        ERROR ((0, errno, _("%s: Cannot change mode to %0.4o"),
  	      file_name, ~current_umask & (int) stat_info->st_mode));
  }
-@@ -124,8 +124,10 @@
+@@ -124,8 +128,10 @@
  {
    struct utimbuf utimbuf;
  
@@ -22,7 +25,7 @@ $NetBSD: patch-ab,v 1.4 1998/08/07 10:35:49 agc Exp $
        /* We do the utime before the chmod because some versions of utime are
  	 broken and trash the modes of the file.  */
  
-@@ -137,6 +139,7 @@
+@@ -137,6 +143,7 @@
  
  	  /* FIXME: incremental_option should set ctime too, but how?  */
  
@@ -30,7 +33,7 @@ $NetBSD: patch-ab,v 1.4 1998/08/07 10:35:49 agc Exp $
  	  if (incremental_option)
  	    utimbuf.actime = stat_info->st_atime;
  	  else
-@@ -145,6 +148,19 @@
+@@ -145,6 +152,19 @@
  	  utimbuf.modtime = stat_info->st_mtime;
  
  	  if (utime (file_name, &utimbuf) < 0)
@@ -50,7 +53,7 @@ $NetBSD: patch-ab,v 1.4 1998/08/07 10:35:49 agc Exp $
  	    ERROR ((0, errno,
  		    _("%s: Could not change access and modification times"),
  		    file_name));
-@@ -155,7 +171,9 @@
+@@ -155,7 +175,9 @@
  	 have to set permissions prior to possibly giving files away.  */
  
        set_mode (file_name, stat_info);