CVS commit: pkgsrc/misc/ruby-bundler1

["Takahiro Kambe" <taca%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   taca
Date:           Wed Sep 18 14:27:45 UTC 2019

Modified Files:
        pkgsrc/misc/ruby-bundler1: ALTERNATIVES Makefile PLIST

Log Message:
misc/ruby-bundler1: fix runtime problem

Fix runtime problem with changing better command names.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/misc/ruby-bundler1/ALTERNATIVES \
    pkgsrc/misc/ruby-bundler1/Makefile pkgsrc/misc/ruby-bundler1/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/misc/ruby-bundler1/ALTERNATIVES
diff -u pkgsrc/misc/ruby-bundler1/ALTERNATIVES:1.1 pkgsrc/misc/ruby-bundler1/ALTERNATIVES:1.2
--- pkgsrc/misc/ruby-bundler1/ALTERNATIVES:1.1  Tue Mar  5 07:46:47 2019
+++ pkgsrc/misc/ruby-bundler1/ALTERNATIVES      Wed Sep 18 14:27:45 2019
@@ -1,2 +1,2 @@
-bin/bundle @PREFIX@/bin/bundle1@RUBY_SUFFIX@
-bin/bundler @PREFIX@/bin/bundler1@RUBY_SUFFIX@
+bin/bundle @PREFIX@/bin/bundle1-@RUBY_SUFFIX@
+bin/bundler @PREFIX@/bin/bundler1-@RUBY_SUFFIX@
Index: pkgsrc/misc/ruby-bundler1/Makefile
diff -u pkgsrc/misc/ruby-bundler1/Makefile:1.1 pkgsrc/misc/ruby-bundler1/Makefile:1.2
--- pkgsrc/misc/ruby-bundler1/Makefile:1.1      Tue Mar  5 07:46:47 2019
+++ pkgsrc/misc/ruby-bundler1/Makefile  Wed Sep 18 14:27:45 2019
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2019/03/05 07:46:47 taca Exp $
+# $NetBSD: Makefile,v 1.2 2019/09/18 14:27:45 taca Exp $
 
 DISTNAME=      bundler-1.17.3
 PKGNAME=       ${RUBY_PKGPREFIX}-${DISTNAME:S/bundler/bundler1/}
+PKGREVISION=   1
 CATEGORIES=    misc
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -12,14 +13,11 @@ LICENSE=    mit
 RUBYGEM_OPTIONS+=      --format-executable
 COMMANDS=              bundle bundler
 
-.for f in ${COMMANDS}
-OVERRIDE_GEMSPEC+=     :executables ${f}=${f}1 :files exe/${f}=exe/${f}1
-.endfor
-
-pre-configure:
+post-install:
+       cd ${DESTDIR}${PREFIX}/bin && \
        for f in ${COMMANDS}; do \
-               ${TEST} -f ${WRKSRC}/exe/$${f}1 || \
-               ${MV} ${WRKSRC}/exe/$${f} ${WRKSRC}/exe/$${f}1; \
+               ${TEST} -f $${f}1-${RUBY_SUFFIX} || \
+                       ${MV} $${f}${RUBY_SUFFIX} $${f}1-${RUBY_SUFFIX}; \
        done
 
 .include "../../lang/ruby/gem.mk"
Index: pkgsrc/misc/ruby-bundler1/PLIST
diff -u pkgsrc/misc/ruby-bundler1/PLIST:1.1 pkgsrc/misc/ruby-bundler1/PLIST:1.2
--- pkgsrc/misc/ruby-bundler1/PLIST:1.1 Tue Mar  5 07:46:47 2019
+++ pkgsrc/misc/ruby-bundler1/PLIST     Wed Sep 18 14:27:45 2019
@@ -1,14 +1,14 @@
-@comment $NetBSD: PLIST,v 1.1 2019/03/05 07:46:47 taca Exp $
-bin/bundle1${RUBY_SUFFIX}
-bin/bundler1${RUBY_SUFFIX}
+@comment $NetBSD: PLIST,v 1.2 2019/09/18 14:27:45 taca Exp $
+bin/bundle1-${RUBY_SUFFIX}
+bin/bundler1-${RUBY_SUFFIX}
 ${GEM_HOME}/cache/${GEM_NAME}.gem
 ${GEM_LIBDIR}/CHANGELOG.md
 ${GEM_LIBDIR}/LICENSE.md
 ${GEM_LIBDIR}/README.md
 ${GEM_LIBDIR}/bundler.gemspec
-${GEM_LIBDIR}/exe/bundle1
+${GEM_LIBDIR}/exe/bundle
 ${GEM_LIBDIR}/exe/bundle_ruby
-${GEM_LIBDIR}/exe/bundler1
+${GEM_LIBDIR}/exe/bundler
 ${GEM_LIBDIR}/lib/bundler.rb
 ${GEM_LIBDIR}/lib/bundler/build_metadata.rb
 ${GEM_LIBDIR}/lib/bundler/capistrano.rb