Import of pkgsrc-2016Q3

converters/ruby-uconv/Makefile

@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.20 2012/10/03 00:20:17 asau Exp $
+# $NetBSD: Makefile,v 1.21 2015/12/12 17:56:55 taca Exp $
 
-DISTNAME=	uconv-0.4.12
-PKGREVISION=	6
+DISTNAME=	uconv-0.6.1
 CATEGORIES=	converters japanese ruby
 MASTER_SITES=	http://www.yoshidam.net/
 
@@ -10,8 +9,6 @@ HOMEPAGE=	http://www.yoshidam.net/Ruby.html#uconv
 COMMENT=	Unicode conversion library with Japanese codesets support
 LICENSE=	gnu-gpl-v2 OR ruby-license
 
-# Depends on Ruby's internal and use 1.9's encoding support.
-RUBY_VERSION_SUPPORTED= 18
 USE_RUBY_EXTCONF=	yes
 WRKSRC=			${WRKDIR}/uconv
 

converters/ruby-uconv/PLIST

@@ -1,4 +1,9 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 17:39:11 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2015/12/12 17:56:55 taca Exp $
+${RUBY_VENDORLIB}/uconv/cp51932.rb
+${RUBY_VENDORLIB}/uconv/euc-jis-2004.rb
+${RUBY_VENDORLIB}/uconv/eucjp-open.rb
+${RUBY_VENDORLIB}/uconv/eucjp-unicode.rb
+${RUBY_VENDORLIB}/uconv/shift_jis-2004.rb
 ${RUBY_VENDORARCHLIB}/uconv.${RUBY_DLEXT}
 ${RUBY_DOC}/uconv/README
 ${RUBY_DOC}/uconv/README.ja

converters/ruby-uconv/distinfo

@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.4 2006/01/03 14:25:49 taca Exp $
+$NetBSD: distinfo,v 1.6 2015/12/12 17:56:55 taca Exp $
 
-SHA1 (uconv-0.4.12.tar.gz) = ccedb7effdead0ebb4eda2fb512ae18f075da6d5
-RMD160 (uconv-0.4.12.tar.gz) = 581a97313021acf83a66ff69d025520bfc73a3f4
-Size (uconv-0.4.12.tar.gz) = 546671 bytes
+SHA1 (uconv-0.6.1.tar.gz) = 0aa28b222d6175e827602775f43ff270274cfc4d
+RMD160 (uconv-0.6.1.tar.gz) = c068f5441567c9d72004cbc819c1db0a37103223
+SHA512 (uconv-0.6.1.tar.gz) = 6f964e42886f498bd6c4111e522143d8d958b8c6e401d26f784fdf1441684f1fde7cfdc35a08d3707a42e305d5508d9ff3fbc1b735298f8af2aae3923cbda68d
+Size (uconv-0.6.1.tar.gz) = 740417 bytes
+SHA1 (patch-uconv.c) = 65d6c18ac45c33a413d7ae6c17ee77a429492b58

converters/ruby-uconv/patches/patch-uconv.c

@@ -0,0 +1,42 @@
+$NetBSD: patch-uconv.c,v 1.1 2015/12/12 17:56:55 taca Exp $
+
+* Use correct type to cast.
+
+--- uconv.c.orig	2012-08-09 06:17:41.000000000 +0000
++++ uconv.c
+@@ -744,7 +744,7 @@ call_euc_handler(const unsigned char* se
+ static VALUE
+ unknown_euc_handler(const unsigned char* seq)
+ {
+-  return rb_rescue((VALUE (*)(void*))call_euc_handler, (int)seq,
++  return rb_rescue((VALUE (*)(void*))call_euc_handler, (VALUE)seq,
+ 		   exception_handler, Qnil);
+ }
+ 
+@@ -800,7 +800,7 @@ call_e2u_hook(const unsigned char* seq)
+ static VALUE
+ e2u_hook(const unsigned char* seq)
+ {
+-  return rb_rescue((VALUE (*)(void*))call_e2u_hook, (int)seq,
++  return rb_rescue((VALUE (*)(void*))call_e2u_hook, (VALUE)seq,
+ 		   exception_handler, Qnil);
+ }
+ 
+@@ -955,7 +955,7 @@ call_sjis_handler(const unsigned char* s
+ static VALUE
+ unknown_sjis_handler(const unsigned char* seq)
+ {
+-  return rb_rescue((VALUE (*)(void*))call_sjis_handler, (int)seq,
++  return rb_rescue((VALUE (*)(void*))call_sjis_handler, (VALUE)seq,
+ 		   exception_handler, Qnil);
+ }
+ 
+@@ -1011,7 +1011,7 @@ call_s2u_hook(const unsigned char* seq)
+ static VALUE
+ s2u_hook(const unsigned char* seq)
+ {
+-  return rb_rescue((VALUE (*)(void*))call_s2u_hook, (int)seq,
++  return rb_rescue((VALUE (*)(void*))call_s2u_hook, (VALUE)seq,
+ 		   exception_handler, Qnil);
+ }
+