pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/devel/rubigen rubigen: fix self-conflict



details:   https://anonhg.NetBSD.org/pkgsrc/rev/b6341f5e8e4e
branches:  trunk
changeset: 453032:b6341f5e8e4e
user:      nia <nia%pkgsrc.org@localhost>
date:      Fri May 21 16:47:03 2021 +0000

description:
rubigen: fix self-conflict

diffstat:

 devel/rubigen/ALTERNATIVES |   3 +++
 devel/rubigen/Makefile     |  12 ++++++++----
 devel/rubigen/PLIST        |   8 ++++----
 3 files changed, 15 insertions(+), 8 deletions(-)

diffs (51 lines):

diff -r 4a33b6d8a396 -r b6341f5e8e4e devel/rubigen/ALTERNATIVES
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/rubigen/ALTERNATIVES        Fri May 21 16:47:03 2021 +0000
@@ -0,0 +1,3 @@
+bin/install_rubigen_scripts @PREFIX@/bin/install_rubigen_scripts@RUBY_SUFFIX@
+bin/rubigen @PREFIX@/bin/rubigen@RUBY_SUFFIX@
+bin/ruby_app @PREFIX@/bin/ruby_app@RUBY_SUFFIX@
diff -r 4a33b6d8a396 -r b6341f5e8e4e devel/rubigen/Makefile
--- a/devel/rubigen/Makefile    Fri May 21 16:44:00 2021 +0000
+++ b/devel/rubigen/Makefile    Fri May 21 16:47:03 2021 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2020/03/20 15:08:56 taca Exp $
+# $NetBSD: Makefile,v 1.14 2021/05/21 16:47:03 nia Exp $
 
 DISTNAME=      rubigen-1.5.5
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    devel
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -11,9 +11,13 @@
 
 DEPENDS+=      ${RUBY_ACTIVESUPPORT_DEPENDS}
 
-CONFLICTS+=    ruby[1-9][0-9]-rubigen-* rubigen-*
+RUBY_RAILS_ACCEPTED=   # defined
 
-RUBY_RAILS_ACCEPTED=   # defined
+post-install:
+       cd ${DESTDIR}${PREFIX}/bin && \
+           ${MV} install_rubigen_scripts install_rubigen_scripts${RUBY_SUFFIX}
+       cd ${DESTDIR}${PREFIX}/bin && ${MV} rubigen rubigen${RUBY_SUFFIX}
+       cd ${DESTDIR}${PREFIX}/bin && ${MV} ruby_app ruby_app${RUBY_SUFFIX}
 
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 4a33b6d8a396 -r b6341f5e8e4e devel/rubigen/PLIST
--- a/devel/rubigen/PLIST       Fri May 21 16:44:00 2021 +0000
+++ b/devel/rubigen/PLIST       Fri May 21 16:47:03 2021 +0000
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.5 2010/03/08 12:51:45 fhajny Exp $
-bin/install_rubigen_scripts
-bin/rubigen
-bin/ruby_app
+@comment $NetBSD: PLIST,v 1.6 2021/05/21 16:47:03 nia Exp $
+bin/install_rubigen_scripts${RUBY_SUFFIX}
+bin/rubigen${RUBY_SUFFIX}
+bin/ruby_app${RUBY_SUFFIX}
 ${GEM_HOME}/cache/rubigen-${PKGVERSION}.gem
 ${GEM_LIBDIR}/.autotest
 ${GEM_LIBDIR}/History.txt



Home | Main Index | Thread Index | Old Index