Migrate ruby-quota to use new framework for Ruby packages.

Add patches for support statvfs(2) support, too.

5 files changed, 36 insertions, 9 deletions

diff --git a/sysutils/ruby-quota/DESCR b/sysutils/ruby-quota/DESCR
index e8c40e2e978..caa7b8f798f 100644
--- a/sysutils/ruby-quota/DESCR
+++ b/sysutils/ruby-quota/DESCR
@@ -1,3 +1 @@
-Ruby/Quota
-
-This module provides functions which manipulate disk quotas.
+Ruby/Quota; a module provides functions which manipulate disk quotas.
diff --git a/sysutils/ruby-quota/Makefile b/sysutils/ruby-quota/Makefile
index 190597bd52c..6d8850654d5 100644
--- a/sysutils/ruby-quota/Makefile
+++ b/sysutils/ruby-quota/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2004/03/17 14:38:02 taca Exp $
+# $NetBSD: Makefile,v 1.7 2004/11/28 04:21:42 taca Exp $
 #
 
 DISTNAME=	ruby-quota-0.5.1
+PKGNAME=	${RUBY_PKGPREFIX}-quota-0.5.1
 CATEGORIES=	sysutils ruby
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ruby-quota/}
 
@@ -9,9 +10,8 @@ MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	http://sourceforge.net/projects/ruby-quota/
 COMMENT=	Quota interface for Ruby
 
-DIST_SUBDIR=	ruby
-USE_RUBY_EXTCONF= yes
-INSTALL_TARGET=	site-install
+USE_RUBY_EXTCONF=	yes
+INSTALL_TARGET=		site-install
 
 DOCS=		ChangeLog README
 DOCSDIR=	${RUBY_DOCDIR}/quota
@@ -22,5 +22,5 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/$f ${DOCSDIR}/$f
 .endfor
 
-.include "../../lang/ruby-base/Makefile.common"
+.include "../../lang/ruby/modules.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/ruby-quota/distinfo b/sysutils/ruby-quota/distinfo
index 7a457f3bd02..e6a10353a7f 100644
--- a/sysutils/ruby-quota/distinfo
+++ b/sysutils/ruby-quota/distinfo
@@ -1,4 +1,6 @@
-$NetBSD: distinfo,v 1.3 2004/03/17 14:38:02 taca Exp $
+$NetBSD: distinfo,v 1.4 2004/11/28 04:21:42 taca Exp $
 
 SHA1 (ruby/ruby-quota-0.5.1.tar.gz) = 9edf6054c465af80d7a3534b8fed89fbafc01ec1
 Size (ruby/ruby-quota-0.5.1.tar.gz) = 5110 bytes
+SHA1 (patch-aa) = 354277b1f3e174d7de742d965c0b788ec04350a8
+SHA1 (patch-ab) = bf9f79380f708dcd9b838fbcead39ec83f2d3e9d
diff --git a/sysutils/ruby-quota/patches/patch-aa b/sysutils/ruby-quota/patches/patch-aa
new file mode 100644
index 00000000000..42e2f2f5b5f
--- /dev/null
+++ b/sysutils/ruby-quota/patches/patch-aa
@@ -0,0 +1,11 @@
+$NetBSD: patch-aa,v 1.1 2004/11/28 04:21:42 taca Exp $
+
+--- extconf.rb.orig	2002-03-21 03:09:14.000000000 +0900
++++ extconf.rb
+@@ -16,5 +16,6 @@ have_header("sys/fs/ufs_quota.h")  # for
+ 
+ have_header("ufs/ufs/quota.h")     # for *bsd
+ have_header("sys/ucred.h")         # required by FreeBSD and NetBSD
++have_header("sys/statvfs.h")       # required by NetBSD
+ 
+ create_makefile("quota")
diff --git a/sysutils/ruby-quota/patches/patch-ab b/sysutils/ruby-quota/patches/patch-ab
new file mode 100644
index 00000000000..ca3bd6a778c
--- /dev/null
+++ b/sysutils/ruby-quota/patches/patch-ab
@@ -0,0 +1,16 @@
+$NetBSD: patch-ab,v 1.1 2004/11/28 04:21:42 taca Exp $
+
+--- quota.c.orig	2002-03-30 23:59:12.000000000 +0900
++++ quota.c
+@@ -159,7 +159,11 @@ rb_quotactl(int cmd, char *dev, VALUE vu
+   char *path;
+   int is_gid;
+   uid_t uid;
++#if defined(HAVE_SYS_STATVFS_H)
++  struct statvfs *buff;
++#else
+   struct statfs *buff;
++#endif
+   int i, count, ret;
+   
+   buff = 0;