pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/misc/kdeutils3 ark really needs gnu tar because:



details:   https://anonhg.NetBSD.org/pkgsrc/rev/f10becb2af93
branches:  trunk
changeset: 553816:f10becb2af93
user:      markd <markd%pkgsrc.org@localhost>
date:      Sat Jan 31 05:40:42 2009 +0000

description:
ark really needs gnu tar because:
   assumes "tar rvf ..." works when archive doesn't already exist.
   assumes "tar tvf ..." doesn't produce an error on a zero length file.
   assumes "tar --delete" works.
so depend on gtar always and fix setting of TarExe so that it uses it.
Bump PKGREVISION.

diffstat:

 misc/kdeutils3/Makefile |  14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diffs (34 lines):

diff -r 0a595dd35d80 -r f10becb2af93 misc/kdeutils3/Makefile
--- a/misc/kdeutils3/Makefile   Sat Jan 31 05:34:02 2009 +0000
+++ b/misc/kdeutils3/Makefile   Sat Jan 31 05:40:42 2009 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.66 2008/07/14 12:56:08 joerg Exp $
+# $NetBSD: Makefile,v 1.67 2009/01/31 05:40:42 markd Exp $
 
 DISTNAME=      kdeutils-${_KDE_VERSION}
+PKGREVISION=   1
 COMMENT=       Utilities for the KDE integrated X11 desktop
 
 PKG_DESTDIR_SUPPORT=   user-destdir
@@ -13,15 +14,16 @@
 LDFLAGS+=              ${EXPORT_SYMBOLS_LDFLAGS}
 MAKE_ENV+=             EXPORT_SYMBOLS_LDFLAGS=${EXPORT_SYMBOLS_LDFLAGS:Q}
 
-.if !empty(MACHINE_PLATFORM:MNetBSD-1.6*) || !empty(MACHINE_PLATFORM:MNetBSD-[2-9]*)
-CPPFLAGS+=             -DARK_TAR="\"/usr/bin/tar\""
-.else
 DEPENDS+=      gtar-base>=1.13.25:../../archivers/gtar-base
 
 EVAL_PREFIX+=          PREFIX.gtar=gtar
 PREFIX.gtar_DEFAULT=   ${LOCALBASE}
-CPPFLAGS+=             -DARK_TAR="\"${PREFIX.gtar}/bin/${GNU_PROGRAM_PREFIX}tar\""
-.endif
+
+SUBST_CLASSES+=                tarexe
+SUBST_STAGE.tarexe=    pre-configure
+SUBST_MESSAGE.tarexe=  Use GNU tar in ark
+SUBST_FILES.tarexe=    ark/ark.kcfg
+SUBST_SED.tarexe=      -e 's:<default>tar</default>:<default>${PREFIX.gtar}/bin/${GNU_PROGRAM_PREFIX}tar</default>:'
 
 .include "../../mk/bsd.prefs.mk"
 



Home | Main Index | Thread Index | Old Index