pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc Full DESTDIR support.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/873e9be6bde4
branches:  trunk
changeset: 537178:873e9be6bde4
user:      ghen <ghen%pkgsrc.org@localhost>
date:      Fri Jan 04 15:42:34 2008 +0000

description:
Full DESTDIR support.

diffstat:

 lang/ruby18-base/Makefile |  36 +++++++++++++++++++-----------------
 www/rails/Makefile        |  16 +++++++++-------
 2 files changed, 28 insertions(+), 24 deletions(-)

diffs (111 lines):

diff -r 0864e2132481 -r 873e9be6bde4 lang/ruby18-base/Makefile
--- a/lang/ruby18-base/Makefile Fri Jan 04 15:26:17 2008 +0000
+++ b/lang/ruby18-base/Makefile Fri Jan 04 15:42:34 2008 +0000
@@ -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 @@
                ${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 @@
                -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 -r 0864e2132481 -r 873e9be6bde4 www/rails/Makefile
--- a/www/rails/Makefile        Fri Jan 04 15:26:17 2008 +0000
+++ b/www/rails/Makefile        Fri Jan 04 15:42:34 2008 +0000
@@ -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 @@
 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 @@
        ${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"



Home | Main Index | Thread Index | Old Index