Prevent paths to the build work directories being included in the package.

Solves PR pkg/30512.
Bump PKGREVISION.

3 files changed, 120 insertions, 8 deletions

diff --git a/news/trn/Makefile b/news/trn/Makefile
index 187142f5334..3db989626f4 100644
--- a/news/trn/Makefile
+++ b/news/trn/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2004/04/14 21:59:24 kim Exp $
+# $NetBSD: Makefile,v 1.19 2005/06/20 01:57:36 kristerw Exp $
 
 DISTNAME=		trn-4.0-test76
 PKGNAME=		trn-4.76
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		news
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=trn/} \
 			ftp://trn.sourceforge.net/pub/trn/
@@ -34,6 +34,22 @@ USE_PERL5=		# defined
 HAS_CONFIGURE=		# defined
 CONFIGURE_SCRIPT=	./Configure
 CONFIGURE_ENV=		PREFIX=${PREFIX}
+USE_TOOLS+=		awk basename cat cp echo egrep expr grep mkdir mv
+USE_TOOLS+=		rm sed tail tr
+CONFIGURE_ENV+=		TOOLS_AWK="${TOOLS_AWK}"
+CONFIGURE_ENV+=		TOOLS_BASENAME="${TOOLS_BASENAME}"
+CONFIGURE_ENV+=		TOOLS_CAT="${TOOLS_CAT}"
+CONFIGURE_ENV+=		TOOLS_CP="${TOOLS_CP}"
+CONFIGURE_ENV+=		TOOLS_ECHO="${TOOLS_ECHO}"
+CONFIGURE_ENV+=		TOOLS_EGREP="${TOOLS_EGREP}"
+CONFIGURE_ENV+=		TOOLS_EXPR="${TOOLS_EXPR}"
+CONFIGURE_ENV+=		TOOLS_GREP="${TOOLS_GREP}"
+CONFIGURE_ENV+=		TOOLS_MKDIR="${TOOLS_MKDIR}"
+CONFIGURE_ENV+=		TOOLS_MV="${TOOLS_MV}"
+CONFIGURE_ENV+=		TOOLS_RM="${TOOLS_RM}"
+CONFIGURE_ENV+=		TOOLS_SED="${TOOLS_SED}"
+CONFIGURE_ENV+=		TOOLS_TAIL="${TOOLS_TAIL}"
+CONFIGURE_ENV+=		TOOLS_TR="${TOOLS_TR}"
 CONFIGURE_ARGS=		-d -e -D bin=${PREFIX}/bin \
 			-D binexp=${PREFIX}/bin \
 			-D phost=${PKG_SYSCONFDIR}'/domainname' \
diff --git a/news/trn/distinfo b/news/trn/distinfo
index 0130624adcb..4a184a80a31 100644
--- a/news/trn/distinfo
+++ b/news/trn/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2005/02/24 12:19:56 agc Exp $
+$NetBSD: distinfo,v 1.5 2005/06/20 01:57:36 kristerw Exp $
 
 SHA1 (trn-4.0-test76.tar.gz) = 4741d506d4c2d62a8dbaa5d4fd62cce656abcf3b
 RMD160 (trn-4.0-test76.tar.gz) = f60478f8808b9c0d46a22ac924821cf2edd1fe87
 Size (trn-4.0-test76.tar.gz) = 565528 bytes
-SHA1 (patch-ac) = 178f9146921719bccad9716cdce2d8a2b30c5e79
+SHA1 (patch-ac) = a99a3ada955cec5e86882fbf568d8ffee2859616
 SHA1 (patch-ad) = 78c18d634cb0861754e1d555a0e514299136ecbc
diff --git a/news/trn/patches/patch-ac b/news/trn/patches/patch-ac
index 81a770c1d02..8a63b85b279 100644
--- a/news/trn/patches/patch-ac
+++ b/news/trn/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.2 2000/03/18 19:51:33 wiz Exp $
+$NetBSD: patch-ac,v 1.3 2005/06/20 01:57:36 kristerw Exp $
 
---- Configure.orig	Mon Sep 21 00:50:59 1998
-+++ Configure	Sun Jan 16 06:50:36 2000
-@@ -2411,7 +2411,7 @@
+--- Configure.orig	2001-02-22 20:17:39.000000000 +0100
++++ Configure	2005-06-20 03:49:52.000000000 +0200
+@@ -2540,7 +2540,7 @@
      esac
      ;;
  *)  case "$d_inews" in
@@ -11,3 +11,99 @@ $NetBSD: patch-ac,v 1.2 2000/03/18 19:51:33 wiz Exp $
      "$define")
  	set dflt installinews bin
  	eval $prefixit
+@@ -6223,14 +6223,14 @@
+ acttimes='$acttimes'
+ aphostcmd='$aphostcmd'
+ archobjs='$archobjs'
+-awk='$awk'
+-basename='$basename'
++awk='$TOOLS_AWK'
++basename='$TOOLS_BASENAME'
+ bash='$bash'
+ bin='$bin'
+ binexp='$binexp'
+ byacc='$byacc'
+ c='$c'
+-cat='$cat'
++cat='$TOOLS_CAT'
+ cc='$cc'
+ ccflags='$ccflags'
+ cf_by='$cf_by'
+@@ -6240,7 +6240,7 @@
+ comm='$comm'
+ contains='$contains'
+ contdist='$contdist'
+-cp='$cp'
++cp='$TOOLS_CP'
+ cpp='$cpp'
+ cppflags='$cppflags'
+ cpplast='$cpplast'
+@@ -6307,19 +6307,19 @@
+ defeditor='$defeditor'
+ diff='$diff'
+ direntrytype='$direntrytype'
+-echo='$echo'
++echo='$TOOLS_ECHO'
+ ed='$ed'
+-egrep='$egrep'
++egrep='$TOOLS_EGREP'
+ eunicefix='$eunicefix'
+ exe_ext='$exe_ext'
+-expr='$expr'
++expr='$TOOLS_EXPR'
+ extrainews='$extrainews'
+ filexp='$filexp'
+ find='$find'
+ firstmakefile='$firstmakefile'
+ gccversion='$gccversion'
+ glibpth='$glibpth'
+-grep='$grep'
++grep='$TOOLS_GREP'
+ groupdesc='$groupdesc'
+ hint='$hint'
+ hostbits='$hostbits'
+@@ -6376,10 +6376,10 @@
+ mimecap='$mimecap'
+ mips='$mips'
+ mips_type='$mips_type'
+-mkdir='$mkdir'
++mkdir='$TOOLS_MKDIR'
+ more='$more'
+ multistatedist='$multistatedist'
+-mv='$mv'
++mv='$TOOLS_MV'
+ myactive='$myactive'
+ myuname='$myuname'
+ n='$n'
+@@ -6417,11 +6417,11 @@
+ prefshell='$prefshell'
+ privlib='$privlib'
+ privlibexp='$privlibexp'
+-rm='$rm'
++rm='$TOOLS_RM'
+ rmail='$rmail'
+ rootid='$rootid'
+ runnm='$runnm'
+-sed='$sed'
++sed='$TOOLS_SED'
+ sendmail='$sendmail'
+ servername='$servername'
+ sharpbang='$sharpbang'
+@@ -6442,7 +6442,7 @@
+ strn='$strn'
+ subscriptions='$subscriptions'
+ sysman='$sysman'
+-tail='$tail'
++tail='$TOOLS_TAIL'
+ tee='$tee'
+ termlib='$termlib'
+ test='$test'
+@@ -6450,7 +6450,7 @@
+ tk='$tk'
+ tkinc='$tkinc'
+ tklibs='$tklibs'
+-tr='$tr'
++tr='$TOOLS_TR'
+ trn_init='$trn_init'
+ trn_select='$trn_select'
+ trnl='$trnl'