Sat Mar 1 02:31:56 2008 UTC ()
Also skip "@dirrm lib/ruby/site_ruby" for print-PLIST.


(obache)
diff -r1.18 -r1.19 pkgsrc/lang/ruby/modules.mk
cvs diff -r1.18 -r1.19 pkgsrc/lang/ruby/modules.mk (expand / switch to unified diff)

--- pkgsrc/lang/ruby/modules.mk 2008/02/08 15:10:41 1.18
+++ pkgsrc/lang/ruby/modules.mk 2008/03/01 02:31:56 1.19
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: modules.mk,v 1.18 2008/02/08 15:10:41 obache Exp $ 1# $NetBSD: modules.mk,v 1.19 2008/03/01 02:31:56 obache Exp $
2 2
3.if !defined(_RUBY_MODULE_MK) 3.if !defined(_RUBY_MODULE_MK)
4_RUBY_MODULE_MK= # defined 4_RUBY_MODULE_MK= # defined
5 5
6.include "../../lang/ruby/rubyversion.mk" 6.include "../../lang/ruby/rubyversion.mk"
7 7
8.if defined(NO_BUILD) && empty(NO_BUILD:M[Nn][Oo]) 8.if defined(NO_BUILD) && empty(NO_BUILD:M[Nn][Oo])
9DEPENDS+= ruby${RUBY_VER}-base>=${RUBY_REQD}:../../lang/ruby${RUBY_VER}-base 9DEPENDS+= ruby${RUBY_VER}-base>=${RUBY_REQD}:../../lang/ruby${RUBY_VER}-base
10.else 10.else
11.include "../../lang/ruby/buildlink3.mk" 11.include "../../lang/ruby/buildlink3.mk"
12.endif 12.endif
13 13
14CONFIGURE_ENV+= RUBY=${RUBY:Q} RDOC=${RDOC:Q} 14CONFIGURE_ENV+= RUBY=${RUBY:Q} RDOC=${RDOC:Q}
@@ -131,26 +131,27 @@ INSTALL_TARGET?= # empty @@ -131,26 +131,27 @@ INSTALL_TARGET?= # empty
131.if !target(do-install) 131.if !target(do-install)
132do-install: ruby-simple-install 132do-install: ruby-simple-install
133 133
134ruby-simple-install: 134ruby-simple-install:
135 @${ECHO_MSG} "===> Running ${RUBY_SIMPLE_INSTALL} to ${INSTALL_TARGET}" 135 @${ECHO_MSG} "===> Running ${RUBY_SIMPLE_INSTALL} to ${INSTALL_TARGET}"
136 ${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC}; \ 136 ${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC}; \
137 ${SETENV} ${MAKE_ENV} ${RUBY} ${RUBY_SIMPLE_INSTALL} ${INSTALL_TARGET} 137 ${SETENV} ${MAKE_ENV} ${RUBY} ${RUBY_SIMPLE_INSTALL} ${INSTALL_TARGET}
138.endif 138.endif
139.endif # USE_RUBY_INSTALL 139.endif # USE_RUBY_INSTALL
140 140
141.include "replace.mk" 141.include "replace.mk"
142 142
143PRINT_PLIST_AWK+= /^@dirrm lib\/ruby$$/ { next; } 143PRINT_PLIST_AWK+= /^@dirrm lib\/ruby$$/ { next; }
 144PRINT_PLIST_AWK+= /^@dirrm lib\/ruby\/site_ruby$$/ { next; }
144PRINT_PLIST_AWK+= /\.${RUBY_DLEXT}$$/ \ 145PRINT_PLIST_AWK+= /\.${RUBY_DLEXT}$$/ \
145 { gsub(/${RUBY_DLEXT}$$/, "$${RUBY_DLEXT}") } 146 { gsub(/${RUBY_DLEXT}$$/, "$${RUBY_DLEXT}") }
146PRINT_PLIST_AWK+= /^@dirrm ${RUBY_SITEARCHLIBDIR:S|${PREFIX}/||:S|/|\\/|g}$$/ \ 147PRINT_PLIST_AWK+= /^@dirrm ${RUBY_SITEARCHLIBDIR:S|${PREFIX}/||:S|/|\\/|g}$$/ \
147 { next; } 148 { next; }
148PRINT_PLIST_AWK+= /^@dirrm ${RUBY_SITELIBDIR:S|${PREFIX}/||:S|/|\\/|g}$$/ \ 149PRINT_PLIST_AWK+= /^@dirrm ${RUBY_SITELIBDIR:S|${PREFIX}/||:S|/|\\/|g}$$/ \
149 { next; } 150 { next; }
150PRINT_PLIST_AWK+= /^(@dirrm )?${RUBY_SITEARCHLIBDIR:S|${PREFIX}/||:S|/|\\/|g}/ \ 151PRINT_PLIST_AWK+= /^(@dirrm )?${RUBY_SITEARCHLIBDIR:S|${PREFIX}/||:S|/|\\/|g}/ \
151 { gsub(/${RUBY_SITEARCHLIBDIR:S|${PREFIX}/||:S|/|\\/|g}/, "$${RUBY_SITEARCHLIBDIR}"); \ 152 { gsub(/${RUBY_SITEARCHLIBDIR:S|${PREFIX}/||:S|/|\\/|g}/, "$${RUBY_SITEARCHLIBDIR}"); \
152 print; next; } 153 print; next; }
153PRINT_PLIST_AWK+= /^(@dirrm )?${RUBY_SITELIBDIR:S|${PREFIX}/||:S|/|\\/|g}/ \ 154PRINT_PLIST_AWK+= /^(@dirrm )?${RUBY_SITELIBDIR:S|${PREFIX}/||:S|/|\\/|g}/ \
154 { gsub(/${RUBY_SITELIBDIR:S|${PREFIX}/||:S|/|\\/|g}/, "$${RUBY_SITELIBDIR}"); \ 155 { gsub(/${RUBY_SITELIBDIR:S|${PREFIX}/||:S|/|\\/|g}/, "$${RUBY_SITELIBDIR}"); \
155 print; next; } 156 print; next; }
156PRINT_PLIST_AWK+= /^@dirrm ${RUBY_DOCDIR:S|${PREFIX}/||:S|/|\\/|g}$$/ \ 157PRINT_PLIST_AWK+= /^@dirrm ${RUBY_DOCDIR:S|${PREFIX}/||:S|/|\\/|g}$$/ \