pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc Use more Ruby specific name: s/REPLACE_FILE_PAT/REPLAC...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/3cdbeb61dcad
branches:  trunk
changeset: 536437:3cdbeb61dcad
user:      taca <taca%pkgsrc.org@localhost>
date:      Thu Dec 13 14:46:58 2007 +0000

description:
Use more Ruby specific name: s/REPLACE_FILE_PAT/REPLACE_RUBY_PAT/.

diffstat:

 lang/ruby/replace.mk   |  16 ++++++++--------
 misc/rubygems/Makefile |   4 ++--
 www/rails/Makefile     |   4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diffs (82 lines):

diff -r c7fc5c596236 -r 3cdbeb61dcad lang/ruby/replace.mk
--- a/lang/ruby/replace.mk      Thu Dec 13 12:37:26 2007 +0000
+++ b/lang/ruby/replace.mk      Thu Dec 13 14:46:58 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.7 2007/05/01 23:03:29 minskim Exp $
+# $NetBSD: replace.mk,v 1.8 2007/12/13 14:46:58 taca Exp $
 #
 
 .if !defined(_RUBY_REPLACE_MK)
@@ -10,8 +10,6 @@
 #
 # REPLACE_RUBY         replace shebang line of specified files.
 #
-REPLACE_FILE_PAT?=     *.rb
-
 .if defined(REPLACE_RUBY)
 REPLACE_INTERPRETER+=  ${RUBY_NAME}
 
@@ -23,20 +21,22 @@
 
 # REPLACE_RUBY_DIRS    replace shebang line of files under specified
 #                      directories.
-# REPLACE_FILE_PAT     specify pattern to match target files under
+# REPLACE_RUBY_PAT     specify pattern to match target files under
 #                      REPLACE_RUBY_DIRS directories.
 #
+REPLACE_RUBY_PAT?=     *.rb
+
 .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}"
+.for f in ${REPLACE_RUBY_PAT}
+_REPLACE_RUBY_PAT+= -o -name "${f}"
 .endfor
-_REPLACE_FILE_FIND_ARGS=\( ${_REPLACE_FILE_PAT:S/-o//1} \)
+_REPLACE_RUBY_FIND_ARGS=\( ${_REPLACE_RUBY_PAT:S/-o//1} \)
 
 replace-ruby-dirs:
        ${_PKG_SILENT}${_PKG_DEBUG}${FIND} ${REPLACE_RUBY_DIRS} \
-           -type f ${_REPLACE_FILE_FIND_ARGS} -print | \
+           -type f ${_REPLACE_RUBY_FIND_ARGS} -print | \
            while read f; do \
                ${SED}  -e '1s| *[a-z0-9_/\.-][a-z0-9_/\.-]*/env *||g' \
                        -e '1s| *[a-z0-9_/\.-]*ruby|${RUBY}|' $$f > $$f.tmp; \
diff -r c7fc5c596236 -r 3cdbeb61dcad misc/rubygems/Makefile
--- a/misc/rubygems/Makefile    Thu Dec 13 12:37:26 2007 +0000
+++ b/misc/rubygems/Makefile    Thu Dec 13 14:46:58 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2007/12/02 22:32:51 minskim Exp $
+# $NetBSD: Makefile,v 1.12 2007/12/13 14:46:58 taca Exp $
 
 DISTNAME=      rubygems-0.9.5
 CATEGORIES=    misc ruby
@@ -15,7 +15,7 @@
 USE_RUBY_SETUP=        yes
 
 REPLACE_RUBY_DIRS=     ${WRKSRC}/bin
-REPLACE_FILE_PAT=      [a-z]*
+REPLACE_RUBY_PAT=      [a-z]*
 
 PLIST_SRC=      ${PKGDIR}/PLIST.common
 PLIST_SRC+=     ${WRKDIR}/PLIST_DYNAMIC
diff -r c7fc5c596236 -r 3cdbeb61dcad www/rails/Makefile
--- a/www/rails/Makefile        Thu Dec 13 12:37:26 2007 +0000
+++ b/www/rails/Makefile        Thu Dec 13 14:46:58 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2007/12/10 05:24:01 minskim Exp $
+# $NetBSD: Makefile,v 1.8 2007/12/13 14:46:58 taca Exp $
 
 DISTNAME=      rails-1.2.6
 CATEGORIES=    www
@@ -20,7 +20,7 @@
 
 REPLACE_RUBY_DIRS=     ${WRKSRC}/bin ${WRKSRC}/dispatches      \
                        ${WRKSRC}/lib/commands/ncgi
-REPLACE_FILE_PAT=      *
+REPLACE_RUBY_PAT=      *
 
 SUBST_CLASSES+=                paths
 SUBST_MESSAGE.paths=   Fixing hardcoded paths.



Home | Main Index | Thread Index | Old Index