* Relax dependency to argv[0].

* Add support for pkg_alternatives.
* Add rdtool.mk to use instead of buildlink3.mk.

6 files changed, 38 insertions, 14 deletions

diff --git a/textproc/ruby-rdtool/ALTERNATIVES b/textproc/ruby-rdtool/ALTERNATIVES
new file mode 100644
index 00000000000..9c501e0cc3a
--- /dev/null
+++ b/textproc/ruby-rdtool/ALTERNATIVES
@@ -0,0 +1,2 @@
+bin/rd2  @PREFIX@/bin/rd2@RUBY_SUFFIX@
+bin/rdswap.rb @PREFIX@/bin/rdswap.rb@RUBY_SUFFIX@
diff --git a/textproc/ruby-rdtool/Makefile b/textproc/ruby-rdtool/Makefile
index 3199f03dc9a..c9feb5664e9 100644
--- a/textproc/ruby-rdtool/Makefile
+++ b/textproc/ruby-rdtool/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2015/05/17 12:57:18 sevan Exp $
+# $NetBSD: Makefile,v 1.38 2015/06/04 13:53:32 taca Exp $
 
 DISTNAME=	rdtool-0.6.38
+PKGREVISION=	1
 CATEGORIES=	textproc ruby
 
 MAINTAINER=	taca@NetBSD.org
@@ -8,10 +9,6 @@ HOMEPAGE=	https://github.com/uwabami/rdtool
 COMMENT=	RD (Ruby Document) converter to HTML/man/etc
 LICENSE=	gnu-gpl-v2 OR ruby-license
 
-# Since rd2 commands depends its name and it can't rename, we cannot
-# install multiple ruby??-rd2 package (unless supported by pkgview.
-CONFLICTS+=	ruby[1-9][0-9]-rdtool-[0-9]*
-
 CONF_FILES+=	${GEM_LIBDIR}/lib/rd/dot.rd2rc ${PKG_SYSCONFDIR}/dot.rd2rc
 
 SUBST_CLASSES+=		path
@@ -20,6 +17,7 @@ SUBST_FILES.path=	bin/rd2
 SUBST_SED.path=		-e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|"
 SUBST_MESSAGE.path=	Fixing PKG_SYSCONFDIR paths.
 
+RUBYGEM_OPTIONS+=	--format-executable
 RUBY_VERSION_SUPPORTED= 18 193 200 21 22
 
 .include "../../lang/ruby/gem.mk"
diff --git a/textproc/ruby-rdtool/PLIST b/textproc/ruby-rdtool/PLIST
index 37a83df9503..68d9fa7fc6e 100644
--- a/textproc/ruby-rdtool/PLIST
+++ b/textproc/ruby-rdtool/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.11 2012/06/02 01:13:40 taca Exp $
-bin/rd2
-bin/rdswap.rb
+@comment $NetBSD: PLIST,v 1.12 2015/06/04 13:53:32 taca Exp $
+bin/rd2${RUBY_SUFFIX}
+bin/rdswap.rb${RUBY_SUFFIX}
 ${GEM_HOME}/cache/${GEM_NAME}.gem
 ${GEM_LIBDIR}/COPYING.txt
 ${GEM_LIBDIR}/Gemfile
diff --git a/textproc/ruby-rdtool/distinfo b/textproc/ruby-rdtool/distinfo
index b73ef3c4490..7c184a02611 100644
--- a/textproc/ruby-rdtool/distinfo
+++ b/textproc/ruby-rdtool/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.20 2012/12/17 14:36:12 taca Exp $
+$NetBSD: distinfo,v 1.21 2015/06/04 13:53:32 taca Exp $
 
 SHA1 (rdtool-0.6.38.gem) = 10a9a241f8360ac937611b6597ed0aaca3e65c07
 RMD160 (rdtool-0.6.38.gem) = 5b4efcaefb504f1c82a052c69d7d7434358aa818
 Size (rdtool-0.6.38.gem) = 115712 bytes
-SHA1 (patch-ae) = 13e2a54d6abec57d20f4d0e9a6d440e40f352787
+SHA1 (patch-ae) = c2c6247a5705733f4a4e41b81f7fac61d897f089
diff --git a/textproc/ruby-rdtool/patches/patch-ae b/textproc/ruby-rdtool/patches/patch-ae
index aaa744c90bf..69948d30e46 100644
--- a/textproc/ruby-rdtool/patches/patch-ae
+++ b/textproc/ruby-rdtool/patches/patch-ae
@@ -1,8 +1,11 @@
-$NetBSD: patch-ae,v 1.1 2005/11/03 05:21:18 taca Exp $
+$NetBSD: patch-ae,v 1.2 2015/06/04 13:53:32 taca Exp $
 
---- bin/rd2.orig	2005-10-26 20:20:49.000000000 +0900
+* Try load from PKG_SYSCONFDIR/dot.rd2rc.
+* Depend on $0 strictly.
+
+--- bin/rd2.orig	2015-06-04 13:21:12.000000000 +0000
 +++ bin/rd2
-@@ -66,6 +66,7 @@ output_file = nil
+@@ -67,6 +67,7 @@ output_file = nil
  output_index = nil
  out_code = nil
  from_rdo = nil
@@ -10,7 +13,7 @@ $NetBSD: patch-ae,v 1.1 2005/11/03 05:21:18 taca Exp $
  
  # user option
  $DEFAULT_FORMAT_LIB = "rd/rd2html-lib"
-@@ -76,10 +77,10 @@ begin
+@@ -77,10 +78,10 @@ begin
      load "~/.rd2rc"
      #  STDERR << "#{$0}: loading ~/.rd2rc\n"
    else
@@ -23,3 +26,14 @@ $NetBSD: patch-ae,v 1.1 2005/11/03 05:21:18 taca Exp $
    load "rd/dot.rd2rc"
  end
  
+@@ -161,8 +162,8 @@ ARGV.options do |q|
+ end # OptionParser.new
+ 
+ # require format lib implicitly
+-if /rd2.+/ =~ File.basename($0, ".*").downcase
+-  visitor_lib = "rd/" + $& + "-lib.rb"
++if /rd2[0-9]*([a-z-]*).*/ =~ File.basename($0, ".*").downcase
++  visitor_lib = "rd/rd2" + $1 + "-lib.rb"
+   require visitor_lib
+   require $RD2_Sub_OptionParser  if $RD2_Sub_OptionParser
+   # make visitor
diff --git a/textproc/ruby-rdtool/rdtool.mk b/textproc/ruby-rdtool/rdtool.mk
new file mode 100644
index 00000000000..b7d0561a61b
--- /dev/null
+++ b/textproc/ruby-rdtool/rdtool.mk
@@ -0,0 +1,10 @@
+# $NetBSD: rdtool.mk,v 1.1 2015/06/04 13:53:32 taca Exp $
+
+.if !defined(RUBY_RDTOOL_MK)
+
+RUBY_RDTOOL_MK	:=
+
+RUBY_RD=	${PREFIX}/bin/rd2${RUBY_SUFFIX}
+BUILD_DENEDS+=	${RUBY_PKGPREFIX}-rdtool>=0.6.14:../../textproc/ruby-rdtool
+
+.endif # RUBY_RDTOOL_MK