diff options
| -rw-r--r-- | lang/ruby18-base/Makefile | 36 | ||||
| -rw-r--r-- | www/rails/Makefile | 16 |
2 files changed, 28 insertions, 24 deletions
diff --git a/lang/ruby18-base/Makefile b/lang/ruby18-base/Makefile index f24aff94878..f2266d52ca9 100644 --- a/lang/ruby18-base/Makefile +++ b/lang/ruby18-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2007/11/05 01:09:23 grant Exp $ +# $NetBSD: Makefile,v 1.40 2008/01/04 15:42:34 ghen Exp $ # DISTNAME= ${RUBY_DISTNAME} @@ -18,6 +18,8 @@ CONFLICTS= ${RUBY_PKGPREFIX}-dbm-[0-9]* \ ${RUBY_PKGPREFIX}-openssl-[0-9]* \ ${RUBY_PKGPREFIX}-tcltk-[0-9]* +PKG_DESTDIR_SUPPORT= user-destdir + USE_LANGUAGES= c USE_TOOLS+= yacc GNU_CONFIGURE= yes @@ -109,36 +111,36 @@ pre-install: -exec ${RM} -f {} \; post-install: - ${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/irb - ${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/pty - ${INSTALL_DATA} ${FILESDIR}/CHANGES.pkgsrc ${RUBY_DOCDIR} + ${INSTALL_DATA_DIR} ${DESTDIR}${RUBY_DOCDIR}/irb + ${INSTALL_DATA_DIR} ${DESTDIR}${RUBY_DOCDIR}/pty + ${INSTALL_DATA} ${FILESDIR}/CHANGES.pkgsrc ${DESTDIR}${RUBY_DOCDIR} .for f in ${DOCS} - ${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${f:C/^doc\///} + ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${RUBY_DOCDIR}/${f:C/^doc\///} .endfor - ${INSTALL_SCRIPT} ${WRKSRC}/ext/dl/h2rb ${PREFIX}/bin/h2rb${RUBY_VER} + ${INSTALL_SCRIPT} ${WRKSRC}/ext/dl/h2rb ${DESTDIR}${PREFIX}/bin/h2rb${RUBY_VER} .for f in ${EXT_DOCS} - ${INSTALL_DATA} ${WRKSRC}/ext/${f} ${RUBY_DOCDIR} + ${INSTALL_DATA} ${WRKSRC}/ext/${f} ${DESTDIR}${RUBY_DOCDIR} .endfor - ${CP} -r ${WRKSRC}/ext/pty/README.* ${RUBY_DOCDIR}/pty - ${INSTALL_DATA_DIR} ${RUBY_EXAMPLESDIR}/pty - ${CP} -r ${WRKSRC}/sample/* ${RUBY_EXAMPLESDIR} - ${INSTALL_DATA_DIR} ${RUBY_EXAMPLESDIR}/bigdecimal + ${CP} -r ${WRKSRC}/ext/pty/README.* ${DESTDIR}${RUBY_DOCDIR}/pty + ${INSTALL_DATA_DIR} ${DESTDIR}${RUBY_EXAMPLESDIR}/pty + ${CP} -r ${WRKSRC}/sample/* ${DESTDIR}${RUBY_EXAMPLESDIR} + ${INSTALL_DATA_DIR} ${DESTDIR}${RUBY_EXAMPLESDIR}/bigdecimal .for f in ${BIGDECIMAL_EXAMPLES} ${INSTALL_DATA} ${RUBY_WRKSRC}/ext/bigdecimal/sample/${f} \ - ${RUBY_EXAMPLESDIR}/bigdecimal + ${DESTDIR}${RUBY_EXAMPLESDIR}/bigdecimal .endfor - ${INSTALL_DATA_DIR} ${RUBY_EXAMPLESDIR}/dl + ${INSTALL_DATA_DIR} ${DESTDIR}${RUBY_EXAMPLESDIR}/dl .for f in ${DL_EXAMPLES} ${INSTALL_DATA} ${RUBY_WRKSRC}/ext/dl/sample/${f} \ - ${RUBY_EXAMPLESDIR}/dl + ${DESTDIR}${RUBY_EXAMPLESDIR}/dl .endfor - ${INSTALL_DATA_DIR} ${RUBY_EXAMPLESDIR}/openssl + ${INSTALL_DATA_DIR} ${DESTDIR}${RUBY_EXAMPLESDIR}/openssl .for f in ${OPENSSL_EXAMPLES} ${INSTALL_DATA} ${RUBY_WRKSRC}/sample/openssl/${f} \ - ${RUBY_EXAMPLESDIR}/openssl + ${DESTDIR}${RUBY_EXAMPLESDIR}/openssl .endfor .for f in ${PTY_EXAMPLES} - ${INSTALL_DATA} ${WRKSRC}/ext/pty/${f} ${RUBY_EXAMPLESDIR}/pty + ${INSTALL_DATA} ${WRKSRC}/ext/pty/${f} ${DESTDIR}${RUBY_EXAMPLESDIR}/pty .endfor ${RUBY_GENERATE_PLIST} diff --git a/www/rails/Makefile b/www/rails/Makefile index 25dfffddf0a..7d4e3807704 100644 --- a/www/rails/Makefile +++ b/www/rails/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2007/12/13 14:46:58 taca Exp $ +# $NetBSD: Makefile,v 1.9 2008/01/04 15:42:53 ghen Exp $ DISTNAME= rails-1.2.6 CATEGORIES= www @@ -9,6 +9,8 @@ MAINTAINER= minskim@NetBSD.org HOMEPAGE= http://www.rubyonrails.org/ COMMENT= Framework for developing database-backed web applications +PKG_DESTDIR_SUPPORT= user-destdir + DEPENDS+= ${RUBY_PKGPREFIX}-activesupport>=1.4.4:../../devel/ruby-activesupport DEPENDS+= ${RUBY_PKGPREFIX}-activerecord>=1.15.5:../../databases/ruby-activerecord DEPENDS+= ${RUBY_PKGPREFIX}-actionpack>=1.13.5:../../www/ruby-actionpack @@ -36,15 +38,15 @@ post-configure: ${FIND} ${WRKSRC} -name \*.orig -exec ${RM} -f {} \; do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/bin/rails ${PREFIX}/bin - ${INSTALL_DATA_DIR} ${RUBY_SITELIBDIR}/rails - cd ${WRKSRC}/lib && ${PAX} -rwppm * ${RUBY_SITELIBDIR}/ - ${INSTALL_DATA_DIR} ${PREFIX}/share/rails + ${INSTALL_SCRIPT} ${WRKSRC}/bin/rails ${DESTDIR}${PREFIX}/bin + ${INSTALL_DATA_DIR} ${DESTDIR}${RUBY_SITELIBDIR}/rails + cd ${WRKSRC}/lib && ${PAX} -rwppm * ${DESTDIR}${RUBY_SITELIBDIR}/ + ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/rails .for f in CHANGELOG MIT-LICENSE README - ${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/rails + ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/share/rails .endfor cd ${WRKSRC} && ${PAX} -rwppm bin builtin configs dispatches doc \ environments fresh_rakefile helpers html \ - ${PREFIX}/share/rails/ + ${DESTDIR}${PREFIX}/share/rails/ .include "../../mk/bsd.pkg.mk" |