pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/www/termtter * Add support for pkg_alternatives.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/3e58d9642962
branches:  trunk
changeset: 648339:3e58d9642962
user:      taca <taca%pkgsrc.org@localhost>
date:      Fri Mar 13 17:43:43 2015 +0000

description:
* Add support for pkg_alternatives.
* Drop ruby18 part and clean up.

Bump PKGREVISION.

diffstat:

 www/termtter/ALTERNATIVES |   2 ++
 www/termtter/Makefile     |  13 ++++++-------
 www/termtter/PLIST        |   6 +++---
 3 files changed, 11 insertions(+), 10 deletions(-)

diffs (56 lines):

diff -r 90a13f47267e -r 3e58d9642962 www/termtter/ALTERNATIVES
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/termtter/ALTERNATIVES Fri Mar 13 17:43:43 2015 +0000
@@ -0,0 +1,2 @@
+bin/termtter @PREFIX@/bin/termtter${RUBY_SUFFIX}
+bin/termtter_frame @PREFIX@/bin/termtter_frame${RUBY_SUFFIX}
diff -r 90a13f47267e -r 3e58d9642962 www/termtter/Makefile
--- a/www/termtter/Makefile     Fri Mar 13 17:42:58 2015 +0000
+++ b/www/termtter/Makefile     Fri Mar 13 17:43:43 2015 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2014/09/17 10:41:22 obache Exp $
+# $NetBSD: Makefile,v 1.13 2015/03/13 17:43:43 taca Exp $
 
 DISTNAME=      termtter-2.2.1
+PKGREVISION=   1
 CATEGORIES=    www
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -8,6 +9,7 @@
 COMMENT=       Terminal based Twitter client
 LICENSE=       mit
 
+DEPENDS+=      ${RUBY_PKGPREFIX}-fiddle-[0-9]*:../../devel/ruby-fiddle
 DEPENDS+=      ${RUBY_PKGPREFIX}-highline>=1.5.0:../../devel/ruby-highline
 DEPENDS+=      ${RUBY_PKGPREFIX}-readline-[0-9]*:../../devel/ruby-readline
 DEPENDS+=      ${RUBY_PKGPREFIX}-termcolor>=1.0.0:../../devel/ruby-termcolor
@@ -17,13 +19,10 @@
 OVERRIDE_GEMSPEC+=     highline>=1.5.0
 OVERRIDE_GEMSPEC+=     termcolor>=1.0.0
 
-CONFLICTS+=    ruby[1-9][0-9]-termtter-[0-9]* termtter-[0-9]*
-RUBY_JSON_REQD=        1.1.3
-RUBY_JSON_TYPE=        pure
+RUBYGEM_OPTIONS+=      --format-executable
+RUBY_JSON_REQD=                1.1.3
+RUBY_JSON_TYPE=                pure
 
 .include "../../lang/ruby/json.mk"
 .include "../../lang/ruby/gem.mk"
-.if ${RUBY_VER} != "18"
-DEPENDS+=      ${RUBY_PKGPREFIX}-fiddle-[0-9]*:../../devel/ruby-fiddle
-.endif
 .include "../../mk/bsd.pkg.mk"
diff -r 90a13f47267e -r 3e58d9642962 www/termtter/PLIST
--- a/www/termtter/PLIST        Fri Mar 13 17:42:58 2015 +0000
+++ b/www/termtter/PLIST        Fri Mar 13 17:43:43 2015 +0000
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.6 2014/09/17 10:41:22 obache Exp $
-bin/termtter
-bin/termtter_frame
+@comment $NetBSD: PLIST,v 1.7 2015/03/13 17:43:43 taca Exp $
+bin/termtter${RUBY_SUFFIX}
+bin/termtter_frame${RUBY_SUFFIX}
 ${GEM_HOME}/cache/${GEM_NAME}.gem
 ${GEM_LIBDIR}/ChangeLog
 ${GEM_LIBDIR}/Gemfile



Home | Main Index | Thread Index | Old Index