[pkgsrc/trunk]: pkgsrc Change last instance of _REPLACE.* to REPLACE.*. Remo...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cb576a8dff03
branches:  trunk
changeset: 516394:cb576a8dff03
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Thu Jul 20 13:54:44 2006 +0000

description:
Change last instance of _REPLACE.* to REPLACE.*.  Remove special
_REPLACE.* handling from replace-interpreter.mk.

diffstat:

 lang/ruby/replace.mk                |   8 ++++----
 mk/configure/replace-interpreter.mk |  12 +-----------
 2 files changed, 5 insertions(+), 15 deletions(-)

diffs (48 lines):

diff -r a26fb5196419 -r cb576a8dff03 lang/ruby/replace.mk
--- a/lang/ruby/replace.mk      Thu Jul 20 13:48:14 2006 +0000
+++ b/lang/ruby/replace.mk      Thu Jul 20 13:54:44 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.5 2006/06/25 09:31:43 rillig Exp $
+# $NetBSD: replace.mk,v 1.6 2006/07/20 13:54:44 jlam Exp $
 #
 
 .if !defined(_RUBY_REPLACE_MK)
@@ -15,9 +15,9 @@
 .if defined(REPLACE_RUBY)
 REPLACE_INTERPRETER+=  ${RUBY_NAME}
 
-_REPLACE.${RUBY_NAME}.old=     .*ruby
-_REPLACE.${RUBY_NAME}.new=     ${RUBY}
-_REPLACE_FILES.${RUBY_NAME}=   ${REPLACE_RUBY}
+REPLACE.${RUBY_NAME}.old=      .*ruby
+REPLACE.${RUBY_NAME}.new=      ${RUBY}
+REPLACE_FILES.${RUBY_NAME}=    ${REPLACE_RUBY}
 
 .endif # defined(REPLACE_RUBY)
 
diff -r a26fb5196419 -r cb576a8dff03 mk/configure/replace-interpreter.mk
--- a/mk/configure/replace-interpreter.mk       Thu Jul 20 13:48:14 2006 +0000
+++ b/mk/configure/replace-interpreter.mk       Thu Jul 20 13:54:44 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: replace-interpreter.mk,v 1.2 2006/07/15 09:52:00 rillig Exp $
+# $NetBSD: replace-interpreter.mk,v 1.3 2006/07/20 13:54:44 jlam Exp $
 
 # This file provides common templates for replacing #! interpreters
 # in script files.
@@ -71,16 +71,6 @@
 REPLACE_FILES.sys-sh=  ${REPLACE_SH}
 .endif
 
-# XXX After 2006Q2, all instances of _REPLACE.* and _REPLACE_FILES.* should
-# XXX have been replaced with REPLACE.* and REPLACE_FILES.*. This code is
-# XXX then no longer needed.
-# XXX
-.for _lang_ in ${REPLACE_INTERPRETER}
-REPLACE.${_lang_}.old?=                ${_REPLACE.${_lang_}.old}
-REPLACE.${_lang_}.new?=                ${_REPLACE.${_lang_}.new}
-REPLACE_FILES.${_lang_}?=      ${_REPLACE_FILES.${_lang_}}
-.endfor
-
 .PHONY: replace-interpreter
 replace-interpreter:
 .for _lang_ in ${REPLACE_INTERPRETER}