pkg/42392: Missing USE_TOOLS+=ed and mk/tools/ code

[Steven Drake <sdrake%xnet.co.nz@localhost>]

>Number:         42392
>Category:       pkg
>Synopsis:       Missing USE_TOOLS+=ed and mk/tools/replace.mk code
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Tue Dec 01 03:50:00 +0000 2009
>Originator:     Steven Drake
>Release:        pkgsrc-2009Q3
>Organization:
>Environment:
System: Linux idran 2.6.30 #2 PREEMPT Sun Aug 9 18:32:44 NZST 2009 i686 
pentium4 i386 GNU/Linux
Architecture: pentium4
Machine: i686
C library: GNU C Library stable release version 2.10.1, by Roland McGrath et al.
>Description:
ed is used by print/dvipsk but there is no USE_TOOLS+=ed or support code in
mk/tools/*.mk

>How-To-Repeat:
from print/dvipsk build

/bin/sh ./texc.script ./tex.lpro texc.lpro
./texc.script: line 7: ed: command not found
*** Error code 127

>Fix:
Index: pkgsrc/mk/tools/defaults.mk
===================================================================
--- pkgsrc.orig/mk/tools/defaults.mk
+++ pkgsrc/mk/tools/defaults.mk
@@ -73,6 +73,7 @@ _TOOLS_VARNAME.diff=          DIFF
 _TOOLS_VARNAME.digest=         DIGEST
 _TOOLS_VARNAME.dirname=                DIRNAME
 _TOOLS_VARNAME.echo=           ECHO
+_TOOLS_VARNAME.ed=             ED
 _TOOLS_VARNAME.egrep=          EGREP
 _TOOLS_VARNAME.env=            SETENV
 _TOOLS_VARNAME.expr=           EXPR
Index: pkgsrc/mk/tools/replace.mk
===================================================================
--- pkgsrc.orig/mk/tools/replace.mk
+++ pkgsrc/mk/tools/replace.mk
@@ -329,6 +329,17 @@ TOOLS_PATH.csh=                    ${TOOLS_PREFIX.csh}/bi
 .  endif
 .endif
 
+.if !defined(TOOLS_IGNORE.ed) && !empty(_USE_TOOLS:Med)
+.  if !empty(PKGPATH:Meditors/ed)
+MAKEFLAGS+=                    TOOLS_IGNORE.ed=
+.  elif !empty(_TOOLS_USE_PKGSRC.ed:M[yY][eE][sS])
+TOOLS_CREATE+=                 ed
+TOOLS_DEPENDS.ed?=             ed-[0-9]*:../../editors/ed
+TOOLS_FIND_PREFIX+=            TOOLS_PREFIX.ed=ed
+TOOLS_PATH.ed=                 ${TOOLS_PREFIX.ed}/bin/ed
+.  endif
+.endif
+
 .if !defined(TOOLS_IGNORE.fetch) && !empty(_USE_TOOLS:Mfetch)
 .  if !empty(PKGPATH:Mnet/fetch)
 MAKEFLAGS+=                    TOOLS_IGNORE.fetch=
Index: pkgsrc/print/dvipsk/Makefile
===================================================================
--- pkgsrc.orig/print/dvipsk/Makefile
+++ pkgsrc/print/dvipsk/Makefile
@@ -26,6 +26,7 @@ PKG_DESTDIR_SUPPORT=  user-destdir
 GNU_CONFIGURE= yes
 INFO_FILES=    yes
 USE_LIBTOOL=   yes
+USE_TOOLS+=    ed
 WRKSRC=                ${WRKDIR}/${DISTNAME}/texk/dvipsk
 
 FIND_PREFIX:=  TETEX_PREFIX=texlive-tetex BIN_DVIPSK_PREFIX=tex-bin-dvipsk


-- 
Steven