Update to 0.3, in which the patches to support *BSD have been merged.

5 files changed, 2 insertions, 107 deletions

diff --git a/sysutils/ruby-quota/Makefile b/sysutils/ruby-quota/Makefile
index edefb693ffec..15f588caee0d 100644
--- a/sysutils/ruby-quota/Makefile
+++ b/sysutils/ruby-quota/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	quota
-PORTVERSION=	0.2
+PORTVERSION=	0.3
 CATEGORIES=	sysutils ruby
 MASTER_SITES=	http://kt-www.jaist.ac.jp/~ttate/ftp/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
diff --git a/sysutils/ruby-quota/distinfo b/sysutils/ruby-quota/distinfo
index b94cec1833ca..6242383f6636 100644
--- a/sysutils/ruby-quota/distinfo
+++ b/sysutils/ruby-quota/distinfo
@@ -1 +1 @@
-MD5 (ruby/ruby-quota-0.2.tar.gz) = 065172663f9f2b29ff000a6130307716
+MD5 (ruby/ruby-quota-0.3.tar.gz) = 4b561bbef656c49dc8bbccb8039a57d7
diff --git a/sysutils/ruby-quota/files/patch-extconf.rb b/sysutils/ruby-quota/files/patch-extconf.rb
deleted file mode 100644
index 95ef65b715ff..000000000000
--- a/sysutils/ruby-quota/files/patch-extconf.rb
+++ /dev/null
@@ -1,8 +0,0 @@
---- extconf.rb.orig	Thu Sep 14 11:26:19 2000
-+++ extconf.rb	Thu Jun 21 21:50:09 2001
-@@ -9,4 +9,5 @@
- 
- have_header("linux/quota.h")       # for linux
- have_header("sys/fs/ufs_quota.h")  # for solaris
-+have_header("ufs/ufs/quota.h")     # for *bsd
- create_makefile("quota")
diff --git a/sysutils/ruby-quota/files/patch-quota.c b/sysutils/ruby-quota/files/patch-quota.c
deleted file mode 100644
index 7af46dff476b..000000000000
--- a/sysutils/ruby-quota/files/patch-quota.c
+++ /dev/null
@@ -1,85 +0,0 @@
---- quota.c.orig	Sun Dec  3 22:19:44 2000
-+++ quota.c	Thu Jun 21 22:06:42 2001
-@@ -16,6 +16,12 @@
- #include <sys/fs/ufs_quota.h>
- #endif
- 
-+#ifdef HAVE_UFS_UFS_QUOTA_H    /* for *BSD */
-+#include <sys/types.h>
-+#include <sys/fcntl.h>
-+#include <ufs/ufs/quota.h>
-+#endif
-+
- static VALUE rb_mQuota;
- static VALUE rb_sDiskQuota;
- static VALUE rb_eQuotaError, rb_eQuotaCtlError;
-@@ -31,6 +37,17 @@
-     return quotactl(QCMD(cmd,GRPQUOTA),dev,-uid,addr);
-   };
- };
-+#elif defined(HAVE_UFS_UFS_QUOTA_H)
-+static int
-+rb_quotactl(int cmd, char *dev, uid_t uid, caddr_t addr)
-+{
-+  if( uid >= 0 ){
-+    return quotactl(dev,QCMD(cmd,USRQUOTA),uid,addr);
-+  }
-+  else{
-+    return quotactl(dev,QCMD(cmd,GRPQUOTA),-uid,addr);
-+  };
-+};
- #elif defined(HAVE_SYS_FS_UFS_QUOTA_H)
- static int
- rb_quotactl(int cmd, char *dev, uid_t uid, caddr_t addr)
-@@ -83,7 +100,7 @@
-   if( rb_quotactl(Q_GETQUOTA,c_dev,c_uid,(caddr_t)(&c_dqb)) == -1 ){
-     rb_sys_fail("quotactl");
-   };
--#if defined(HAVE_LINUX_QUOTA_H)
-+#if defined(HAVE_LINUX_QUOTA_H) || defined(HAVE_UFS_UFS_QUOTA_H)
-   dqb = rb_struct_new(rb_sDiskQuota,
- 		      UINT2NUM(c_dqb.dqb_bhardlimit),
- 		      UINT2NUM(c_dqb.dqb_bsoftlimit),
-@@ -149,7 +166,7 @@
- 
- #define GetMember(mem) \
-         ((v = rb_struct_getmember(dqb,rb_intern(mem))) == Qnil) ? 0 : (NUM2UINT(v))
--#if defined(HAVE_LINUX_QUOTA_H)
-+#if defined(HAVE_LINUX_QUOTA_H) || defined(HAVE_UFS_UFS_QUOTA_H)
-   c_dqb.dqb_bhardlimit = GetMember("bhardlimit");
-   c_dqb.dqb_bsoftlimit = GetMember("bsoftlimit");
-   c_dqb.dqb_curblocks  = GetMember("curblocks");
-@@ -180,6 +197,7 @@
-   return Qnil;
- };
- 
-+#ifdef Q_SETQLIM
- VALUE
- rb_quota_setqlim(VALUE self, VALUE dev, VALUE uid, VALUE dqb)
- {
-@@ -220,6 +238,7 @@
- #endif
-   return Qnil;
- };
-+#endif
- 
- VALUE
- rb_quota_sync(VALUE self, VALUE dev)
-@@ -252,7 +271,7 @@
- 				   "bhardlimit",
- 				   "bsoftlimit",
- 				   "curblocks",
--#if defined(HAVE_LINUX_QUOTA_H)
-+#if defined(HAVE_LINUX_QUOTA_H) || defined(HAVE_UFS_UFS_QUOTA_H)
- 				   "ihardlimit",
- 				   "isoftlimit",
- 				   "curinodes",
-@@ -272,6 +291,8 @@
-   rb_define_module_function(rb_mQuota,"quotaoff",rb_quota_quotaoff,1);
-   rb_define_module_function(rb_mQuota,"getquota",rb_quota_getquota,2);
-   rb_define_module_function(rb_mQuota,"setquota",rb_quota_setquota,3);
-+#ifdef Q_SETQLIM
-   rb_define_module_function(rb_mQuota,"setqlim",rb_quota_setqlim,3);
-+#endif
-   rb_define_module_function(rb_mQuota,"sync",rb_quota_sync,1);
- };
diff --git a/sysutils/ruby-quota/files/patch-test.rb b/sysutils/ruby-quota/files/patch-test.rb
deleted file mode 100644
index c730133264b4..000000000000
--- a/sysutils/ruby-quota/files/patch-test.rb
+++ /dev/null
@@ -1,12 +0,0 @@
---- test.rb.orig	Sun Dec  3 22:36:02 2000
-+++ test.rb	Thu Jun 21 23:06:55 2001
-@@ -11,6 +11,9 @@
- when /^SunOS/
-   $DEV = "/quotas"
-   $QUOTAS = "/quotas"
-+when /BSD/
-+  $DEV = "/mnt/test"
-+  $QUOTAS = "/mnt/test/quota.user"
- end
- 
- print("user id: ")