[pkgsrc/trunk]: pkgsrc/misc/kdeutils3 Force use of GNU tar when handing tar f...

[jmmv <jmmv%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b180ffc28811
branches:  trunk
changeset: 469756:b180ffc28811
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Sat Feb 28 16:21:26 2004 +0000

description:
Force use of GNU tar when handing tar files.  This fixes multiple problems,
like duplicate entries in the file list and file extraction.
Bump PKGREVISION to 1.

diffstat:

 misc/kdeutils3/Makefile         |   9 ++++++++-
 misc/kdeutils3/distinfo         |   3 ++-
 misc/kdeutils3/patches/patch-aa |  13 +++++++++++++
 3 files changed, 23 insertions(+), 2 deletions(-)

diffs (59 lines):

diff -r ac2476521580 -r b180ffc28811 misc/kdeutils3/Makefile
--- a/misc/kdeutils3/Makefile   Sat Feb 28 15:29:20 2004 +0000
+++ b/misc/kdeutils3/Makefile   Sat Feb 28 16:21:26 2004 +0000
@@ -1,10 +1,13 @@
-# $NetBSD: Makefile,v 1.31 2004/02/04 20:38:00 markd Exp $
+# $NetBSD: Makefile,v 1.32 2004/02/28 16:21:26 jmmv Exp $
 
 DISTNAME=      kdeutils-${_KDE_VERSION}
+PKGREVISION=   1
 COMMENT=       Utilities for the KDE integrated X11 desktop
 
 .include "../../meta-pkgs/kde3/Makefile.kde3"
 
+DEPENDS+=      gtar-base>=1.13.25:../../archivers/gtar-base
+
 USE_BUILDLINK2=                YES
 USE_PKGINSTALL=                YES
 
@@ -12,6 +15,10 @@
 LDFLAGS+=              ${EXPORT_SYMBOLS_LDFLAGS}
 MAKE_ENV+=             EXPORT_SYMBOLS_LDFLAGS="${EXPORT_SYMBOLS_LDFLAGS}"
 
+EVAL_PREFIX+=          PREFIX.gtar=gtar
+PREFIX.gtar_DEFAULT=   ${LOCALBASE}
+CPPFLAGS+=             -DARK_TAR=\"\\\"${PREFIX.gtar}/bin/${GNU_PROGRAM_PREFIX}tar\\\"\"
+
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "NetBSD" && exists(/usr/include/machine/apmvar.h)
diff -r ac2476521580 -r b180ffc28811 misc/kdeutils3/distinfo
--- a/misc/kdeutils3/distinfo   Sat Feb 28 15:29:20 2004 +0000
+++ b/misc/kdeutils3/distinfo   Sat Feb 28 16:21:26 2004 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.19 2004/02/04 20:38:00 markd Exp $
+$NetBSD: distinfo,v 1.20 2004/02/28 16:21:26 jmmv Exp $
 
 SHA1 (kdeutils-3.2.0.tar.bz2) = 86acd2ae37de5cb6e1b37f141a2d65ba3f336beb
 Size (kdeutils-3.2.0.tar.bz2) = 2517278 bytes
+SHA1 (patch-aa) = 01c0d686ea0f92fb4dbc5ac04591031dff1137de
 SHA1 (patch-an) = e13957a9fa0d23aebbe149ecaca7b9dacde5c9fb
 SHA1 (patch-ao) = dde26f89bcef1d728aca23053a9afb4e990bb3db
 SHA1 (patch-ap) = 0bfa5bfeb6551791ea6311bbf1223732d3dfa482
diff -r ac2476521580 -r b180ffc28811 misc/kdeutils3/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/kdeutils3/patches/patch-aa   Sat Feb 28 16:21:26 2004 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.5 2004/02/28 16:21:26 jmmv Exp $
+
+--- ark/arksettings.cpp.orig   2003-06-27 15:38:52.000000000 +0200
++++ ark/arksettings.cpp
+@@ -118,7 +118,7 @@ void ArkSettings::readConfiguration()
+ 
+   kc->setGroup( ARK_GROUP );
+ 
+-  tar_exe = kc->readPathEntry( TAR_KEY, "tar");
++  tar_exe = kc->readPathEntry( TAR_KEY, ARK_TAR);
+ #ifdef ARK_SETTINGS_DEBUG
+   kdDebug(1601) << "Tar command is " << tar_exe << endl;
+ #endif