diff options
-rw-r--r-- | lang/ruby/Makefile | 8 | ||||
-rw-r--r-- | security/ruby16-openssl/Makefile | 4 | ||||
-rw-r--r-- | sysutils/ruby-quota/Makefile | 4 | ||||
-rw-r--r-- | textproc/ruby-nqxml/Makefile | 11 | ||||
-rw-r--r-- | www/instiki/Makefile | 6 | ||||
-rw-r--r-- | www/ruby-borges/Makefile | 4 | ||||
-rw-r--r-- | www/ruby16-borges/Makefile | 4 | ||||
-rw-r--r-- | x11/ruby-tk/Makefile | 4 | ||||
-rw-r--r-- | x11/ruby16-tk/Makefile | 4 |
9 files changed, 25 insertions, 24 deletions
diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile index 23a8a2103f3..7db3b928561 100644 --- a/lang/ruby/Makefile +++ b/lang/ruby/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2005/02/21 15:35:53 taca Exp $ +# $NetBSD: Makefile,v 1.32 2005/03/06 13:05:38 taca Exp $ # FreeBSD: ports/lang/ruby/Makefile,v 1.40 2001/01/18 19:53:38 knu Exp DISTNAME= ruby-${RUBY_VERSION} @@ -29,9 +29,9 @@ RUBY_COMMANDS+= erb h2rb rdoc ri testrb do-install: ${CP} ${PKGDIR}/PLIST ${PLIST_SRC} .if ${RUBY_NAME} != "ruby" -.for file in ${RUBY_COMMANDS} - ${LN} -sf ${file}${RUBY_VER} ${LOCALBASE}/bin/${file} - ${ECHO} bin/${file} >> ${PLIST_SRC} +.for f in ${RUBY_COMMANDS} + ${LN} -sf ${f}${RUBY_VER} ${LOCALBASE}/bin/${f} + ${ECHO} bin/${f} >> ${PLIST_SRC} .endfor ${LN} -sf ${RUBY_NAME}.1 ${PREFIX}/man/man1/ruby.1 ${ECHO} man/man1/ruby.1 >> ${PLIST_SRC} diff --git a/security/ruby16-openssl/Makefile b/security/ruby16-openssl/Makefile index 6e393fb0f92..bd0e3c4fcd7 100644 --- a/security/ruby16-openssl/Makefile +++ b/security/ruby16-openssl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/01/28 14:19:35 taca Exp $ +# $NetBSD: Makefile,v 1.4 2005/03/06 13:08:36 taca Exp $ DISTNAME= ossl-0.1.4a PKGNAME= ${RUBY_PKGPREFIX}-openssl-0.1.4a @@ -25,7 +25,7 @@ DOCS= ChangeLog README post-install: ${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/openssl .for f in ${DOCS} - ${INSTALL_DATA} ${WRKSRC}/$f ${RUBY_DOCDIR}/openssl + ${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/openssl .endfor .include "../../lang/ruby/modules.mk" diff --git a/sysutils/ruby-quota/Makefile b/sysutils/ruby-quota/Makefile index a6b87780a9f..64b67b418c5 100644 --- a/sysutils/ruby-quota/Makefile +++ b/sysutils/ruby-quota/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/01/28 14:08:02 taca Exp $ +# $NetBSD: Makefile,v 1.10 2005/03/06 13:09:10 taca Exp $ # DISTNAME= ruby-quota-0.5.1 @@ -21,7 +21,7 @@ DOCSDIR= ${RUBY_DOCDIR}/quota post-install: ${INSTALL_DATA_DIR} ${DOCSDIR} .for f in ${DOCS} - ${INSTALL_DATA} ${WRKSRC}/$f ${DOCSDIR}/$f + ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/${f} .endfor .include "../../lang/ruby/modules.mk" diff --git a/textproc/ruby-nqxml/Makefile b/textproc/ruby-nqxml/Makefile index 09b084c2cb4..991b6ef48d4 100644 --- a/textproc/ruby-nqxml/Makefile +++ b/textproc/ruby-nqxml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2004/11/28 04:36:05 taca Exp $ +# $NetBSD: Makefile,v 1.4 2005/03/06 13:09:55 taca Exp $ # DISTNAME= nqxml-1.1.3p1 @@ -31,18 +31,19 @@ do-install: post-install: ${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/nqxml .for f in ${DOC} - ${INSTALL_DATA} ${WRKSRC}/$f ${RUBY_DOCDIR}/nqxml + ${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/nqxml .endfor ${INSTALL_DATA_DIR} ${RUBY_EXAMPLESDIR}/nqxml/contrib .for f in ${EXAMPLES} - ${INSTALL_DATA} ${WRKSRC}/examples/$f ${RUBY_EXAMPLESDIR}/nqxml + ${INSTALL_DATA} ${WRKSRC}/examples/${f} ${RUBY_EXAMPLESDIR}/nqxml .endfor .for f in ${CONTRIB_LIB} - ${INSTALL_DATA} ${WRKSRC}/contrib/$f ${RUBY_EXAMPLESDIR}/nqxml/contrib + ${INSTALL_DATA} ${WRKSRC}/contrib/${f} \ + ${RUBY_EXAMPLESDIR}/nqxml/contrib .endfor ${INSTALL_DATA_DIR} ${RUBY_EXAMPLESDIR}/nqxml/tests .for f in ${TESTS} - ${INSTALL_DATA} ${WRKSRC}/tests/$f ${RUBY_EXAMPLESDIR}/nqxml/tests + ${INSTALL_DATA} ${WRKSRC}/tests/${f} ${RUBY_EXAMPLESDIR}/nqxml/tests .endfor .include "../../lang/ruby/modules.mk" diff --git a/www/instiki/Makefile b/www/instiki/Makefile index c8cfc7e8142..0d21c955ac6 100644 --- a/www/instiki/Makefile +++ b/www/instiki/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/02/21 15:41:30 taca Exp $ +# $NetBSD: Makefile,v 1.6 2005/03/06 13:12:20 taca Exp $ DISTNAME= instiki-0.9.2 PKGREVISION= 2 @@ -36,8 +36,8 @@ post-patch: do-install: ${INSTALL_DATA_DIR} ${INSTIKI_DIR} .for d in app libraries - cd ${WRKSRC} && ${CP} -R $d ${INSTIKI_DIR} - ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${INSTIKI_DIR}/$d + cd ${WRKSRC} && ${CP} -R ${d} ${INSTIKI_DIR} + ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${INSTIKI_DIR}/${d} .endfor ${FIND} ${INSTIKI_DIR} -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE} ${FIND} ${INSTIKI_DIR} -type f -print | ${XARGS} ${CHMOD} ${SHAREMODE} diff --git a/www/ruby-borges/Makefile b/www/ruby-borges/Makefile index 0c7c9fd8c0b..c8574825df3 100644 --- a/www/ruby-borges/Makefile +++ b/www/ruby-borges/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2004/11/28 05:37:04 taca Exp $ +# $NetBSD: Makefile,v 1.9 2005/03/06 13:10:32 taca Exp $ DISTNAME= borges-1.1.0 PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME} @@ -19,7 +19,7 @@ BORGES_SHARE_DIR= data/doc data/examples .if !empty(RUBY_SUFFIX) pre-configure: .for d in ${BORGES_SHARE_DIR} - cd ${WRKSRC}; ${MV} $d/ruby $d/${RUBY_NAME} + cd ${WRKSRC}; ${MV} ${d}/ruby ${d}/${RUBY_NAME} .endfor .endif diff --git a/www/ruby16-borges/Makefile b/www/ruby16-borges/Makefile index 9e2c7f9d580..dc7bcd229b9 100644 --- a/www/ruby16-borges/Makefile +++ b/www/ruby16-borges/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2004/11/28 06:13:22 taca Exp $ +# $NetBSD: Makefile,v 1.2 2005/03/06 13:11:09 taca Exp $ DISTNAME= borges-0.2.0 PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME} @@ -22,7 +22,7 @@ BORGES_SHARE_DIR= data/doc data/examples .if !empty(RUBY_SUFFIX) pre-configure: .for d in ${BORGES_SHARE_DIR} - cd ${WRKSRC}; ${MV} $d/ruby $d/${RUBY_NAME} + cd ${WRKSRC}; ${MV} ${d}/ruby ${d}/${RUBY_NAME} .endfor .endif diff --git a/x11/ruby-tk/Makefile b/x11/ruby-tk/Makefile index c51583d0eec..62f49208488 100644 --- a/x11/ruby-tk/Makefile +++ b/x11/ruby-tk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/01/26 16:03:49 taca Exp $ +# $NetBSD: Makefile,v 1.14 2005/03/06 13:13:21 taca Exp $ # FreeBSD: ports/x11-toolkits/ruby-tk/Makefile,v 1.21 2000/10/20 19:56:04 knu Exp DISTNAME= ${RUBY_DISTNAME} @@ -24,7 +24,7 @@ REPLACE_RUBY_DIRS= ${WRKSRC}/sample pre-configure: @cd ${WRKSRC}; \ - ${FIND} . \( -name '*.orig' -o -name '*.bak' \) -exec rm -f {} \; + ${FIND} . \( -name '*.orig' -o -name '*.bak' \) -exec ${RM} -f {} \; post-install: ${INSTALL_DATA_DIR} ${RUBY_EXAMPLESDIR}/tk diff --git a/x11/ruby16-tk/Makefile b/x11/ruby16-tk/Makefile index 0cb1e53a004..a0b43b9ba0e 100644 --- a/x11/ruby16-tk/Makefile +++ b/x11/ruby16-tk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/01/28 14:19:35 taca Exp $ +# $NetBSD: Makefile,v 1.4 2005/03/06 13:13:56 taca Exp $ # FreeBSD: ports/x11-toolkits/ruby-tk/Makefile,v 1.21 2000/10/20 19:56:04 knu Exp DISTNAME= ${RUBY_DISTNAME} @@ -26,7 +26,7 @@ REPLACE_RUBY= sample/tkbiff.rb sample/tkbrowse.rb \ pre-configure: @cd ${WRKSRC}; \ - ${FIND} . \( -name '*.orig' -o -name '*.bak' \) -exec rm -f {} \; + ${FIND} . \( -name '*.orig' -o -name '*.bak' \) -exec ${RM} -f {} \; post-install: ${INSTALL_DATA_DIR} ${RUBY_EXAMPLESDIR}/tk |