diff options
| -rw-r--r-- | lang/ruby/replace.mk | 16 | ||||
| -rw-r--r-- | misc/rubygems/Makefile | 4 | ||||
| -rw-r--r-- | www/rails/Makefile | 4 |
3 files changed, 12 insertions, 12 deletions
diff --git a/lang/ruby/replace.mk b/lang/ruby/replace.mk index 118aeefea33..5a09b1e4219 100644 --- a/lang/ruby/replace.mk +++ b/lang/ruby/replace.mk @@ -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 @@ _RUBY_REPLACE_MK= # defined # # 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_FILES.${RUBY_NAME}= ${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_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 --git a/misc/rubygems/Makefile b/misc/rubygems/Makefile index 5b55c1ac937..490eaa01413 100644 --- a/misc/rubygems/Makefile +++ b/misc/rubygems/Makefile @@ -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 @@ RUBY_REQD= 1.8.3 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 --git a/www/rails/Makefile b/www/rails/Makefile index bdfd740b9cc..25dfffddf0a 100644 --- a/www/rails/Makefile +++ b/www/rails/Makefile @@ -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 @@ WRKSRC= ${WRKDIR}/rails/vendor/rails/railties 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. |