pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/ruby Use subst framework to process REPLACE_RUBY.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/7cf6131e8a78
branches:  trunk
changeset: 502076:7cf6131e8a78
user:      taca <taca%pkgsrc.org@localhost>
date:      Wed Nov 02 07:44:33 2005 +0000

description:
Use subst framework to process REPLACE_RUBY.

diffstat:

 lang/ruby/replace.mk |  45 ++++++++++++++++-----------------------------
 1 files changed, 16 insertions(+), 29 deletions(-)

diffs (75 lines):

diff -r 8bf7b4ee029e -r 7cf6131e8a78 lang/ruby/replace.mk
--- a/lang/ruby/replace.mk      Wed Nov 02 07:44:24 2005 +0000
+++ b/lang/ruby/replace.mk      Wed Nov 02 07:44:33 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.1.1.1 2004/11/27 13:57:21 taca Exp $
+# $NetBSD: replace.mk,v 1.2 2005/11/02 07:44:33 taca Exp $
 #
 
 .ifndef _RUBY_REPLACE_MK
@@ -7,42 +7,31 @@
 # fix shebang line.
 #
 # REPLACE_RUBY         replace shebang line of specified files.
+#
+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}
+
+.endif # defined(REPLACE_RUBY)
+
 # REPLACE_RUBY_DIRS    replace shebang line of files under specified
 #                      directories.
 # REPLACE_FILE_PAT     specify pattern to match target files under
 #                      REPLACE_RUBY_DIRS directories.
 #
-REPLACE_FILE_PAT?=     *.rb
-
-.if defined(REPLACE_RUBY) || defined(REPLACE_RUBY_DIRS)
-pre-configure: replace-ruby-scripts replace-ruby-dirs
-
-.if defined(REPLACE_RUBY) && !empty(REPLACE_RUBY)
-replace-ruby-scripts:
-       ${_PKG_SILENT}${_PKG_DEBUG}for s in ${REPLACE_RUBY}; do \
-               case $${s} in \
-               /*)     f=$${s};; \
-               *)      f=${WRKSRC}/$${s};; \
-               esac; \
-               ${ECHO_MSG} "===>  Fixing the #! line of $${s}"; \
-               ${SED}  -e '1s| *[a-z0-9_/\.-][a-z0-9_/\.-]*/env *||g' \
-                       -e '1s| *[a-z0-9_/\.-]*ruby|${RUBY}|' $$f > $$f.tmp; \
-               if ${CMP} -s $$f $$f.tmp; then \
-                       ${RM} $$f.tmp; \
-               else \
-                       ${MV} $$f.tmp $$f; \
-               fi; \
-       done
-.else
-replace-ruby-scripts:
-.endif
+.if defined(REPLACE_RUBY_DIRS) && !empty(REPLACE_RUBY_DIRS)
+pre-configure: replace-ruby-dirs
 
 .for f in ${REPLACE_FILE_PAT}
 _REPLACE_FILE_PAT+= -o -name "${f}"
 .endfor
 _REPLACE_FILE_FIND_ARGS=\( ${_REPLACE_FILE_PAT:S/-o//1} \)
 
-.if defined(REPLACE_RUBY_DIRS) && !empty(REPLACE_RUBY_DIRS)
 replace-ruby-dirs:
        ${_PKG_SILENT}${_PKG_DEBUG}${FIND} ${REPLACE_RUBY_DIRS} \
            -type f ${_REPLACE_FILE_FIND_ARGS} -print | \
@@ -57,7 +46,5 @@
            done
 .else
 replace-ruby-dirs:
-.endif
-
-.endif # defined(REPLACE_RUBY) || defined(REPLACE_RUBY_DIRS)
+.endif # defined(REPLACE_RUBY_DIRS)
 .endif # _RUBY_REPLACE_MK



Home | Main Index | Thread Index | Old Index