Sun Feb 9 05:21:19 2014 UTC ()
* 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.


(taca)
diff -r1.2 -r1.3 pkgsrc/devel/ruby-rake/INSTALL
diff -r1.7 -r1.8 pkgsrc/devel/ruby-rake/Makefile
cvs diff -r1.2 -r1.3 pkgsrc/devel/ruby-rake/Attic/INSTALL (expand / switch to unified diff)

--- pkgsrc/devel/ruby-rake/Attic/INSTALL 2013/06/16 15:23:39 1.2
+++ pkgsrc/devel/ruby-rake/Attic/INSTALL 2014/02/09 05:21:19 1.3
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: INSTALL,v 1.2 2013/06/16 15:23:39 taca Exp $ 1# $NetBSD: INSTALL,v 1.3 2014/02/09 05:21:19 taca Exp $
2 2
3GEMSPEC="@PREFIX@/@GEM_HOME@/specifications/@GEM_NAME@.gemspec" 3GEMSPEC="@PREFIX@/@GEM_HOME@/specifications/@GEM_NAME@.gemspec"
4RAKE_HACK="@RAKE_HACK@" 4RAKE_HACK="@RAKE_HACK@"
5RAKE_BIN="@PREFIX@/bin/rake@RUBY_VER@" 5RAKE_BIN="@PREFIX@/bin/rake@RUBY_VER@"
6RAKE_BIN_HACK="@PREFIX@/bin/@RAKEBIN@" 6RAKE_BIN_HACK="@PREFIX@/bin/@RAKEBIN@"
7 7
8case ${STAGE} in 8case ${STAGE} in
9POST-INSTALL) 9POST-INSTALL)
10 if [ "${RAKE_HACK}" -a -f ${GEMSPEC} ]; then 10 if [ "${RAKE_HACK}" -a -f ${GEMSPEC} ]; then
11 ${MV} ${GEMSPEC} ${GEMSPEC}.orig 11 ${MV} ${GEMSPEC} ${GEMSPEC}.orig
12 ${MV} ${GEMSPEC}${RAKE_HACK} ${GEMSPEC} 12 ${MV} ${GEMSPEC}${RAKE_HACK} ${GEMSPEC}
13 fi 13 fi
14 if [ "${RAKE_BIN}" != "${RAKE_BIN_HACK}" ]; then 14 if [ "${RAKE_BIN}" != "${RAKE_BIN_HACK}" ]; then
15 ${CP} ${RAKE_BIN} ${RAKE_BIN_HACK}.save 15 ${CP} -p ${RAKE_BIN} ${RAKE_BIN_HACK}.save
16 ${CP} ${RAKE_BIN_HACK} ${RAKE_BIN} 16 ${CP} -p ${RAKE_BIN_HACK} ${RAKE_BIN}
17 fi 17 fi
18 ;; 18 ;;
19esac 19esac
cvs diff -r1.7 -r1.8 pkgsrc/devel/ruby-rake/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/ruby-rake/Attic/Makefile 2013/06/16 15:23:39 1.7
+++ pkgsrc/devel/ruby-rake/Attic/Makefile 2014/02/09 05:21:19 1.8
@@ -1,45 +1,48 @@ @@ -1,45 +1,48 @@
1# $NetBSD: Makefile,v 1.7 2013/06/16 15:23:39 taca Exp $ 1# $NetBSD: Makefile,v 1.8 2014/02/09 05:21:19 taca Exp $
2 2
3DISTNAME= rake-10.0.4 3DISTNAME= rake-${VERS}
 4PKGREVISION= 1
4CATEGORIES= devel 5CATEGORIES= devel
5 6
6MAINTAINER= taca@NetBSD.org 7MAINTAINER= taca@NetBSD.org
7HOMEPAGE= http://rubyforge.org/projects/rake/ 8HOMEPAGE= http://rubyforge.org/projects/rake/
8COMMENT= Ruby Make 9COMMENT= Ruby Make
9LICENSE= mit 10LICENSE= mit
10 11
11CONFLICTS+= rake-[0-9]* 12CONFLICTS+= rake-[0-9]*
12 13
13USE_TOOLS+= gzip 14USE_TOOLS+= gzip
14FIX_PERM= doc/release_notes/rake-0.7.3.rdoc 15FIX_PERM= doc/release_notes/rake-0.7.3.rdoc
 16VERS= 10.0.4
15 17
16FILES_SUBST+= GEM_NAME=${GEM_NAME} RAKE_HACK=${RAKE_HACK} RAKEBIN=${RAKEBIN} 18FILES_SUBST+= GEM_NAME=${GEM_NAME} RAKE_HACK=${RAKE_HACK} RAKEBIN=${RAKEBIN}
17PLIST_SUBST+= RAKE_HACK=${RAKE_HACK} RAKEBIN=${RAKEBIN} 19PLIST_SUBST+= RAKE_HACK=${RAKE_HACK} RAKEBIN=${RAKEBIN}
18 20
19INSTALLATION_DIRS= ${PKGMANDIR}/man1 21INSTALLATION_DIRS= ${PKGMANDIR}/man1
20 22
21.include "../../lang/ruby/rubyversion.mk" 23.include "../../lang/ruby/rubyversion.mk"
22 24
23OVERRIDE_GEMSPEC+= :executables rake=${RAKEBIN} \ 25OVERRIDE_GEMSPEC+= :executables rake=${RAKEBIN} \
24 :files bin/rake=bin/${RAKEBIN} doc/rake.1.gz=doc/rake.1 26 :files bin/rake=bin/${RAKEBIN} doc/rake.1.gz=doc/rake.1
25 27
26.if ${RUBY_VER} == 18 28.if defined(RUBY_RAKE_VERSION)
27RAKEBIN=rake${RUBY_VER} 29RAKEBIN= rake${RUBY_VER}-${PKGVERSION_NOREV}
28.else 30. if ${RUBY_RAKE_VERSION} == ${VERS}
29RAKEBIN=rake${RUBY_VER}-${PKGVERSION_NOREV} 
30RAKE_HACK= .${PKGVERSION_NOREV} 31RAKE_HACK= .${PKGVERSION_NOREV}
31RAKE_SPEC= ${GEM_HOME}/specifications/${GEM_NAME}.gemspec 32RAKE_SPEC= ${GEM_HOME}/specifications/${GEM_NAME}.gemspec
 33. endif
32.endif 34.endif
 35RAKEBIN?= rake${RUBY_VER}
33 36
34# rake.1.gz has one extra byte at EOF. 37# rake.1.gz has one extra byte at EOF.
35pre-configure: 38pre-configure:
36 cd ${WRKSRC}/doc && (gzip -dc rake.1.gz >rake.1 2>/dev/null || ${TRUE}) 39 cd ${WRKSRC}/doc && (gzip -dc rake.1.gz >rake.1 2>/dev/null || ${TRUE})
37 cd ${WRKSRC}; ${CHMOD} -x ${FIX_PERM} 40 cd ${WRKSRC}; ${CHMOD} -x ${FIX_PERM}
38 cd ${WRKSRC}/bin && ${MV} rake ${RAKEBIN} 41 cd ${WRKSRC}/bin && ${MV} rake ${RAKEBIN}
39 42
40post-install: 43post-install:
41 ${INSTALL_MAN} ${WRKSRC}/doc/rake.1 \ 44 ${INSTALL_MAN} ${WRKSRC}/doc/rake.1 \
42 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/rake.1 45 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/rake.1
43.if !empty(RAKE_HACK) 46.if !empty(RAKE_HACK)
44 ${MV} ${DESTDIR}${PREFIX}/${RAKE_SPEC} \ 47 ${MV} ${DESTDIR}${PREFIX}/${RAKE_SPEC} \
45 ${DESTDIR}${PREFIX}/${RAKE_SPEC}${RAKE_HACK} 48 ${DESTDIR}${PREFIX}/${RAKE_SPEC}${RAKE_HACK}