diff options
| author | taca <taca@pkgsrc.org> | 2014-02-09 05:21:19 +0000 |
|---|---|---|
| committer | taca <taca@pkgsrc.org> | 2014-02-09 05:21:19 +0000 |
| commit | 8811fd9004a2029f748b1b632b1c878b92402190 (patch) | |
| tree | d967ce2cc137007bf38a24141488993b29a1621d /devel | |
| parent | 107329c717fe68ba518962fc08b1b1a8e98d5227 (diff) | |
| download | pkgsrc-8811fd9004a2029f748b1b632b1c878b92402190.tar.gz | |
* Preserve modified time of saveing rake command file.
* Improve handling of gemspec file when the version of bundlerd dosen't
match with ruby-rake's version. Should be fix PR pkg/48485.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/ruby-rake/INSTALL | 6 | ||||
| -rw-r--r-- | devel/ruby-rake/Makefile | 15 |
2 files changed, 12 insertions, 9 deletions
diff --git a/devel/ruby-rake/INSTALL b/devel/ruby-rake/INSTALL index c0e8a5d1bd6..548ab0a0bc5 100644 --- a/devel/ruby-rake/INSTALL +++ b/devel/ruby-rake/INSTALL @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.2 2013/06/16 15:23:39 taca Exp $ +# $NetBSD: INSTALL,v 1.3 2014/02/09 05:21:19 taca Exp $ GEMSPEC="@PREFIX@/@GEM_HOME@/specifications/@GEM_NAME@.gemspec" RAKE_HACK="@RAKE_HACK@" @@ -12,8 +12,8 @@ POST-INSTALL) ${MV} ${GEMSPEC}${RAKE_HACK} ${GEMSPEC} fi if [ "${RAKE_BIN}" != "${RAKE_BIN_HACK}" ]; then - ${CP} ${RAKE_BIN} ${RAKE_BIN_HACK}.save - ${CP} ${RAKE_BIN_HACK} ${RAKE_BIN} + ${CP} -p ${RAKE_BIN} ${RAKE_BIN_HACK}.save + ${CP} -p ${RAKE_BIN_HACK} ${RAKE_BIN} fi ;; esac diff --git a/devel/ruby-rake/Makefile b/devel/ruby-rake/Makefile index 96360f3a018..d778fffd28a 100644 --- a/devel/ruby-rake/Makefile +++ b/devel/ruby-rake/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.7 2013/06/16 15:23:39 taca Exp $ +# $NetBSD: Makefile,v 1.8 2014/02/09 05:21:19 taca Exp $ -DISTNAME= rake-10.0.4 +DISTNAME= rake-${VERS} +PKGREVISION= 1 CATEGORIES= devel MAINTAINER= taca@NetBSD.org @@ -12,6 +13,7 @@ CONFLICTS+= rake-[0-9]* USE_TOOLS+= gzip FIX_PERM= doc/release_notes/rake-0.7.3.rdoc +VERS= 10.0.4 FILES_SUBST+= GEM_NAME=${GEM_NAME} RAKE_HACK=${RAKE_HACK} RAKEBIN=${RAKEBIN} PLIST_SUBST+= RAKE_HACK=${RAKE_HACK} RAKEBIN=${RAKEBIN} @@ -23,13 +25,14 @@ INSTALLATION_DIRS= ${PKGMANDIR}/man1 OVERRIDE_GEMSPEC+= :executables rake=${RAKEBIN} \ :files bin/rake=bin/${RAKEBIN} doc/rake.1.gz=doc/rake.1 -.if ${RUBY_VER} == 18 -RAKEBIN=rake${RUBY_VER} -.else -RAKEBIN=rake${RUBY_VER}-${PKGVERSION_NOREV} +.if defined(RUBY_RAKE_VERSION) +RAKEBIN= rake${RUBY_VER}-${PKGVERSION_NOREV} +. if ${RUBY_RAKE_VERSION} == ${VERS} RAKE_HACK= .${PKGVERSION_NOREV} RAKE_SPEC= ${GEM_HOME}/specifications/${GEM_NAME}.gemspec +. endif .endif +RAKEBIN?= rake${RUBY_VER} # rake.1.gz has one extra byte at EOF. pre-configure: |