Pass CHECK_WRKREF check: do not let the path on the perl tool wrapper script

be embedded in the installed share/vim/vim70/tools/efm_perl.pl script;
make this script interpreter be '${SETENV} perl' hence avoiding a run-time
package dependency on perl.

Approved by MAINTAINER.

3 files changed, 10 insertions, 8 deletions

diff --git a/editors/vim-share/Makefile b/editors/vim-share/Makefile
index 8a3909440f4..50eb5ab697d 100644
--- a/editors/vim-share/Makefile
+++ b/editors/vim-share/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/05/10 13:27:43 tonio Exp $
+# $NetBSD: Makefile,v 1.23 2006/10/17 11:43:14 seb Exp $
 
 PKGNAME=		vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}
 #PKGREVISION=		1
@@ -13,7 +13,7 @@ CONFIGURE_ARGS+=	--without-x
 BUILD_TARGET=		vim
 INSTALL_TARGET=		installruntime installmacros installtutor installtools
 USE_TOOLS+=		awk
-INSTALL_MAKE_FLAGS+=	${MAKE_FLAGS} TOOLS_AWK=${TOOLS_AWK:Q}
+INSTALL_MAKE_FLAGS+=	${MAKE_FLAGS} TOOLS_AWK=${TOOLS_AWK:Q} TOOLS_SETENV=${TOOLS_SETENV:Q}
 
 PLIST_SUBST+=		VIM_SUBDIR=${VIM_SUBDIR:Q}
 
diff --git a/editors/vim-share/distinfo b/editors/vim-share/distinfo
index a552114052c..d963b33fb9f 100644
--- a/editors/vim-share/distinfo
+++ b/editors/vim-share/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.54 2006/10/16 17:00:29 martti Exp $
+$NetBSD: distinfo,v 1.55 2006/10/17 11:43:14 seb Exp $
 
 SHA1 (vim/7.0.001) = 54143281b4d21a825b7bb02bdd55c4716e7b6f80
 RMD160 (vim/7.0.001) = 808e7e5947fccd64ae010e37acb81890e0adc7f0
@@ -342,5 +342,5 @@ Size (vim/vim-7.0.tar.bz2) = 6575205 bytes
 SHA1 (patch-aa) = e5fcfe9a599e35c17633d6bae8bc20d7957c1df9
 SHA1 (patch-ab) = 1ee4f14cb6c73743704d2dd2631cb3ca48f0303e
 SHA1 (patch-ac) = 69082b576cc023e316e5c1facb01ddd3e38fb104
-SHA1 (patch-ad) = 1f83cdb17f7ce367d9ae3358db7370065ab76435
+SHA1 (patch-ad) = d7ef448172d45e133e43fe1f07a1bcd74a8f0844
 SHA1 (patch-zb) = d52bdc3b77c30c804e78c2c6a4182fad8096c9f0
diff --git a/editors/vim-share/patches/patch-ad b/editors/vim-share/patches/patch-ad
index f9ccf7fecca..7c4772fad45 100644
--- a/editors/vim-share/patches/patch-ad
+++ b/editors/vim-share/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.10 2006/05/10 13:27:43 tonio Exp $
+$NetBSD: patch-ad,v 1.11 2006/10/17 11:43:14 seb Exp $
 
---- src/Makefile.orig	2006-05-07 15:25:27.000000000 +0200
+--- src/Makefile.orig	2006-10-17 07:00:03.000000000 +0000
 +++ src/Makefile
 @@ -1131,26 +1131,31 @@ MOTIF_BUNDLE	=
  ### Athena GUI
@@ -51,11 +51,13 @@ $NetBSD: patch-ad,v 1.10 2006/05/10 13:27:43 tonio Exp $
  	cd $(HELPSOURCE); \
  		files=`ls *.txt tags`; \
  		files="$$files `ls *.??x tags-?? 2>/dev/null || true`"; \
-@@ -1897,24 +1902,24 @@ installtools: $(TOOLS) $(DESTDIR)$(exec_
+@@ -1896,25 +1901,25 @@ installtools: $(TOOLS) $(DESTDIR)$(exec_
+ 	      fi
  	-chmod $(FILEMOD) $(DEST_TOOLS)/*
  # replace the path in some tools
- 	perlpath=`./which.sh perl` && sed -e "s+/usr/bin/perl+$$perlpath+" $(TOOLSSOURCE)/efm_perl.pl >$(DEST_TOOLS)/efm_perl.pl
+-	perlpath=`./which.sh perl` && sed -e "s+/usr/bin/perl+$$perlpath+" $(TOOLSSOURCE)/efm_perl.pl >$(DEST_TOOLS)/efm_perl.pl
 -	awkpath=`./which.sh nawk` && sed -e "s+/usr/bin/nawk+$$awkpath+" $(TOOLSSOURCE)/mve.awk >$(DEST_TOOLS)/mve.awk; if test -z "$$awkpath"; then \
++	perlpath='$(TOOLS_SETENV) perl' && sed -e "s+/usr/bin/perl+$$perlpath+" $(TOOLSSOURCE)/efm_perl.pl >$(DEST_TOOLS)/efm_perl.pl
 +	awkpath=$(TOOLS_AWK) && sed -e "s+/usr/bin/nawk+$$awkpath+" $(TOOLSSOURCE)/mve.awk >$(DEST_TOOLS)/mve.awk; if test -z "$$awkpath"; then \
  		awkpath=`./which.sh gawk` && sed -e "s+/usr/bin/nawk+$$awkpath+" $(TOOLSSOURCE)/mve.awk >$(DEST_TOOLS)/mve.awk; if test -z "$$awkpath"; then \
  		awkpath=`./which.sh awk` && sed -e "s+/usr/bin/nawk+$$awkpath+" $(TOOLSSOURCE)/mve.awk >$(DEST_TOOLS)/mve.awk; fi; fi