Allow this to build on NetBSD when gtar is installed by only looking for

tar. Do not pass P to tar when testing for removal of leading /'s.
This is a fix for PR#20928.

XXX On Solaris this package will be broken. It probably needs to
XXX depend on gtar in this case.

3 files changed, 35 insertions, 12 deletions

diff --git a/security/amavis/distinfo b/security/amavis/distinfo
index 8e2e0cda393..2d16148faad 100644
--- a/security/amavis/distinfo
+++ b/security/amavis/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.5 2001/10/22 06:41:29 martti Exp $
+$NetBSD: distinfo,v 1.6 2003/04/11 22:06:22 cjep Exp $
 
 SHA1 (amavis-0.2.1.tar.gz) = c47f60525a289274b88f7eaa47db1a9e888092ef
 Size (amavis-0.2.1.tar.gz) = 236011 bytes
-SHA1 (patch-ab) = dd2aa50136d3b89ce12c149c56b6f8c7e659d0d4
+SHA1 (patch-aa) = 4f4e903890c6008e47c0a7e93c9d6f5c7a4a0e74
+SHA1 (patch-ab) = 7c75dff5025f3c31c9e84d837c17a223ae1a1a00
diff --git a/security/amavis/patches/patch-aa b/security/amavis/patches/patch-aa
new file mode 100644
index 00000000000..e0014704aec
--- /dev/null
+++ b/security/amavis/patches/patch-aa
@@ -0,0 +1,22 @@
+$NetBSD: patch-aa,v 1.4 2003/04/11 22:06:24 cjep Exp $
+
+--- configure.orig	2000-10-31 16:21:04.000000000 +0000
++++ configure
+@@ -1744,7 +1744,7 @@ fi
+ test -n "$unzip" && break
+ done
+ 
+-for ac_prog in gtar tar
++for ac_prog in tar gtar
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+@@ -3876,7 +3876,7 @@ echo $ac_n "checking if tar removes lead
+ echo "configure:3877: checking if tar removes leading / from archive" >&5
+  testfile="tarcheck$$"
+  touch /tmp/$testfile
+- $tar cPf /tmp/$testfile.tar /tmp/$testfile > /dev/null 2>&1
++ $tar cf /tmp/$testfile.tar /tmp/$testfile > /dev/null 2>&1
+  rm -f /tmp/${testfile}
+  $tar xf  /tmp/$testfile.tar > /dev/null 2>&1
+  if test -d "./tmp"; then
diff --git a/security/amavis/patches/patch-ab b/security/amavis/patches/patch-ab
index d3a7cb6d95b..65a97b0b456 100644
--- a/security/amavis/patches/patch-ab
+++ b/security/amavis/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.5 2001/10/22 06:41:30 martti Exp $
+$NetBSD: patch-ab,v 1.6 2003/04/11 22:06:24 cjep Exp $
 
---- src/scanmails/scanmails.in.orig	Tue Oct 31 17:47:28 2000
+--- src/scanmails/scanmails.in.orig	2000-10-31 16:47:28.000000000 +0000
 +++ src/scanmails/scanmails.in
-@@ -360,7 +360,7 @@
+@@ -360,7 +360,7 @@ else
  	sendmail_flags="${sendmail_flags} -C${origconf}"
     else
  	SENDER="$2"
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.5 2001/10/22 06:41:30 martti Exp $
     fi
  fi
  
-@@ -455,6 +455,8 @@
+@@ -455,6 +455,8 @@ if [ "x$x_header" = "xyes" ] && [ "x${fo
      cat | ${formail} -f -A "${X_Header_String}" >${tmpdir}/receivedmail
  else
      cat >${tmpdir}/receivedmail
@@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.5 2001/10/22 06:41:30 martti Exp $
  fi
  
  mkdir ${tmpdir}/unpacked
-@@ -1287,7 +1289,7 @@
+@@ -1287,7 +1289,7 @@ Subject: VIRUS IN YOUR MAIL TO ${receive
  
                     V I R U S  A L E R T
  
@@ -29,7 +29,7 @@ $NetBSD: patch-ab,v 1.5 2001/10/22 06:41:30 martti Exp $
             We stopped delivery of this email!
  
      Now it is on you to check your system for viruses           
-@@ -1313,7 +1315,7 @@
+@@ -1313,7 +1315,7 @@ if [ "x${notifyreceiver}" = "xyes" ] ; t
  
  ############### send a mail to the addressee ########################
  
@@ -38,12 +38,12 @@ $NetBSD: patch-ab,v 1.5 2001/10/22 06:41:30 martti Exp $
  From: ${mailfrom}
  To: ${receiver}
  Subject: VIRUS IN A MAIL FOR YOU FROM ${sender}
-@@ -1327,6 +1329,8 @@
-   Delivery of the email was stopped!
+@@ -1328,6 +1330,8 @@ Subject: VIRUS IN A MAIL FOR YOU FROM ${
    
    Please contact your system administrator for details
-+
-+  The header of the stopped message was:
  
++  The header of the stopped message was:
++
  EOF
  fi
+