diff options
| author | jlam <jlam> | 2006-07-20 13:54:44 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2006-07-20 13:54:44 +0000 |
| commit | 984a4b70782b7de99c30dbfcf45b346c0bf9b9d8 (patch) | |
| tree | 34eb3b45e8ef31348b6d6eeb6efdff553569c08c | |
| parent | a11725e881384587bac24acc318f6ff8a5e91efe (diff) | |
| download | pkgsrc-984a4b70782b7de99c30dbfcf45b346c0bf9b9d8.tar.gz | |
Change last instance of _REPLACE.* to REPLACE.*. Remove special
_REPLACE.* handling from replace-interpreter.mk.
| -rw-r--r-- | lang/ruby/replace.mk | 8 | ||||
| -rw-r--r-- | mk/configure/replace-interpreter.mk | 12 |
2 files changed, 5 insertions, 15 deletions
diff --git a/lang/ruby/replace.mk b/lang/ruby/replace.mk index 289098ecdfe..500b277bd5c 100644 --- a/lang/ruby/replace.mk +++ b/lang/ruby/replace.mk @@ -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 @@ REPLACE_FILE_PAT?= *.rb .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 --git a/mk/configure/replace-interpreter.mk b/mk/configure/replace-interpreter.mk index a07771727e0..7b277018d9b 100644 --- a/mk/configure/replace-interpreter.mk +++ b/mk/configure/replace-interpreter.mk @@ -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.sys-sh.new= ${SH} 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} |