* Use lang/ruby/gem.mk instead of misc/rubygems/rubygem.mk.

* Remove RUBY_HAS_ARCHLIB.
* Change PKG_DESTDIR_SUPPORT to user-destdir.
* Update patch to support both ruby18 and ruby19.

No functional change.

3 files changed, 61 insertions, 6 deletions

diff --git a/sysutils/ruby-quota/Makefile b/sysutils/ruby-quota/Makefile
index 290da6de357..b40b56f2d25 100644
--- a/sysutils/ruby-quota/Makefile
+++ b/sysutils/ruby-quota/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2010/04/22 15:01:07 taca Exp $
+# $NetBSD: Makefile,v 1.20 2010/09/10 07:58:44 taca Exp $
 #
 
 DISTNAME=	ruby-quota-0.5.1
@@ -12,11 +12,10 @@ HOMEPAGE=	http://sourceforge.net/projects/ruby-quota/
 COMMENT=	Quota interface for Ruby
 LICENSE=	modified-bsd
 
-RUBY_HAS_ARCHLIB=	yes
 USE_RUBY_EXTCONF=	yes
 INSTALL_TARGET=		site-install
 INSTALLATION_DIRS=	${RUBY_VENDORLIB} ${RUBY_DOC}/quota
-PKG_DESTDIR_SUPPORT=	destdir
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 DOCS=		ChangeLog README
 
diff --git a/sysutils/ruby-quota/distinfo b/sysutils/ruby-quota/distinfo
index 7fde90286a9..435d8b210b7 100644
--- a/sysutils/ruby-quota/distinfo
+++ b/sysutils/ruby-quota/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.13 2010/04/22 15:01:07 taca Exp $
+$NetBSD: distinfo,v 1.14 2010/09/10 07:58:44 taca Exp $
 
 SHA1 (ruby-quota-0.5.1.tar.gz) = 9edf6054c465af80d7a3534b8fed89fbafc01ec1
 RMD160 (ruby-quota-0.5.1.tar.gz) = 85189827a256d0cfeaa0e755db37b85c625c18df
 Size (ruby-quota-0.5.1.tar.gz) = 5110 bytes
 SHA1 (patch-aa) = 651521b6e9945320623f9c8abff27b705bb476b6
-SHA1 (patch-ab) = bde356be41b8619ad9743b8e0434a977cc3bbe15
+SHA1 (patch-ab) = fa97c6cf71cc8b7144ee8f76ba9f00e28d0855fb
diff --git a/sysutils/ruby-quota/patches/patch-ab b/sysutils/ruby-quota/patches/patch-ab
index 2b445210b6f..e7ff1c51f79 100644
--- a/sysutils/ruby-quota/patches/patch-ab
+++ b/sysutils/ruby-quota/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.8 2010/04/22 15:01:07 taca Exp $
+$NetBSD: patch-ab,v 1.9 2010/09/10 07:58:45 taca Exp $
 
 --- quota.c.orig	2002-03-30 14:59:12.000000000 +0000
 +++ quota.c
@@ -143,6 +143,62 @@ $NetBSD: patch-ab,v 1.8 2010/04/22 15:01:07 taca Exp $
  #elif defined(USE_BSD_QUOTA)
    dqb = rb_struct_new(rb_sDiskQuota,
  		      UINT2NUM(c_dqb->dqb_bhardlimit),
+@@ -314,7 +354,7 @@ rb_diskquota_new(struct dqblk *c_dqb)
+ static VALUE
+ rb_quota_getquota(VALUE self, VALUE dev, VALUE uid)
+ {
+-  char *c_dev = STR2CSTR(dev);
++  char *c_dev = StringValuePtr(dev);
+   struct dqblk c_dqb;
+   VALUE dqb = Qnil;
+ 
+@@ -330,7 +370,7 @@ rb_quota_getquota(VALUE self, VALUE dev,
+ VALUE
+ rb_quota_quotaoff(VALUE self, VALUE dev)
+ {
+-  char *c_dev = STR2CSTR(dev);
++  char *c_dev = StringValuePtr(dev);
+ 
+   if( rb_quotactl(Q_QUOTAOFF,c_dev,Qnil,NULL) == -1 ){
+     rb_sys_fail("quotactl");
+@@ -342,8 +382,8 @@ rb_quota_quotaoff(VALUE self, VALUE dev)
+ VALUE
+ rb_quota_quotaon(VALUE self, VALUE dev, VALUE quotas)
+ {
+-  char *c_dev = STR2CSTR(dev);
+-  char *c_quotas = STR2CSTR(quotas);
++  char *c_dev = StringValuePtr(dev);
++  char *c_quotas = StringValuePtr(quotas);
+ 
+   if( rb_quotactl(Q_QUOTAON,c_dev,Qnil,(caddr_t)c_quotas) == -1 ){
+     rb_sys_fail("quotactl");
+@@ -355,7 +395,7 @@ rb_quota_quotaon(VALUE self, VALUE dev, 
+ VALUE
+ rb_quota_setquota(VALUE self, VALUE dev, VALUE uid, VALUE dqb)
+ {
+-  char *c_dev = STR2CSTR(dev);
++  char *c_dev = StringValuePtr(dev);
+   struct dqblk c_dqb;
+ 
+   rb_diskquota_get(dqb, &c_dqb);
+@@ -371,7 +411,7 @@ VALUE
+ rb_quota_setqlim(VALUE self, VALUE dev, VALUE uid, VALUE dqb)
+ {
+ #ifdef Q_SETQLIM
+-  char *c_dev = STR2CSTR(dev);
++  char *c_dev = StringValuePtr(dev);
+   struct dqblk c_dqb;
+ 
+   rb_diskquota_get(dqb, &c_dqb);
+@@ -398,7 +438,7 @@ rb_quota_sync(VALUE self, VALUE dev)
+     c_dev = NULL;
+   }
+   else{
+-    c_dev = STR2CSTR(dev);
++    c_dev = StringValuePtr(dev);
+   };
+ 
+   if( rb_quotactl(Q_SYNC,c_dev,Qnil,NULL) == -1 ){ /* uid and addr are ignored */
 @@ -442,7 +482,7 @@ Init_quota()
  				   "curinodes",
  				   "btimelimit",