4 files changed, 15 insertions, 24 deletions
diff --git a/misc/ruby-daemons/Makefile b/misc/ruby-daemons/Makefile
index 08322d776dc..229628037b7 100644
--- a/misc/ruby-daemons/Makefile
+++ b/misc/ruby-daemons/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.6 2008/04/04 15:19:57 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2010/09/10 07:22:54 taca Exp $
 
-DISTNAME=	daemons-1.0.10
-PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
+DISTNAME=	daemons-1.1.0
 CATEGORIES=	misc
 
 MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://daemons.rubyforge.org/
 COMMENT=	Toolkit to convert Ruby scripts to a daemon
+LICENSE=	mit
 
-.include "../../misc/rubygems/rubygem.mk"
+.include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/ruby-daemons/PLIST b/misc/ruby-daemons/PLIST
index a501daa5eb8..e820341a492 100644
--- a/misc/ruby-daemons/PLIST
+++ b/misc/ruby-daemons/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:07:30 joerg Exp $
-${GEM_HOME}/cache/daemons-${PKGVERSION}.gem
+@comment $NetBSD: PLIST,v 1.4 2010/09/10 07:22:54 taca Exp $
+${GEM_HOME}/cache/${GEM_NAME}.gem
 ${GEM_LIBDIR}/LICENSE
 ${GEM_LIBDIR}/README
 ${GEM_LIBDIR}/Rakefile
@@ -11,6 +11,7 @@ ${GEM_LIBDIR}/examples/daemonize/daemonize.rb
 ${GEM_LIBDIR}/examples/run/ctrl_crash.rb
 ${GEM_LIBDIR}/examples/run/ctrl_exec.rb
 ${GEM_LIBDIR}/examples/run/ctrl_exit.rb
+${GEM_LIBDIR}/examples/run/ctrl_hanging.rb
 ${GEM_LIBDIR}/examples/run/ctrl_keep_pid_files.rb
 ${GEM_LIBDIR}/examples/run/ctrl_monitor.rb
 ${GEM_LIBDIR}/examples/run/ctrl_multiple.rb
@@ -26,16 +27,19 @@ ${GEM_LIBDIR}/examples/run/myserver.rb
 ${GEM_LIBDIR}/examples/run/myserver_crashing.rb
 ${GEM_LIBDIR}/examples/run/myserver_crashing.rb.output
 ${GEM_LIBDIR}/examples/run/myserver_exiting.rb
+${GEM_LIBDIR}/examples/run/myserver_hanging.rb
 ${GEM_LIBDIR}/lib/daemons.rb
 ${GEM_LIBDIR}/lib/daemons/application.rb
 ${GEM_LIBDIR}/lib/daemons/application_group.rb
+${GEM_LIBDIR}/lib/daemons/change_privilege.rb
 ${GEM_LIBDIR}/lib/daemons/cmdline.rb
 ${GEM_LIBDIR}/lib/daemons/controller.rb
 ${GEM_LIBDIR}/lib/daemons/daemonize.rb
+${GEM_LIBDIR}/lib/daemons/etc_extension.rb
 ${GEM_LIBDIR}/lib/daemons/exceptions.rb
 ${GEM_LIBDIR}/lib/daemons/monitor.rb
 ${GEM_LIBDIR}/lib/daemons/pid.rb
 ${GEM_LIBDIR}/lib/daemons/pidfile.rb
 ${GEM_LIBDIR}/lib/daemons/pidmem.rb
 ${GEM_LIBDIR}/setup.rb
-${GEM_HOME}/specifications/daemons-${PKGVERSION}.gemspec
+${GEM_HOME}/specifications/${GEM_NAME}.gemspec
diff --git a/misc/ruby-daemons/distinfo b/misc/ruby-daemons/distinfo
index 7fc560ad8e0..5f2316c186b 100644
--- a/misc/ruby-daemons/distinfo
+++ b/misc/ruby-daemons/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.7 2009/06/12 12:02:48 taca Exp $
+$NetBSD: distinfo,v 1.8 2010/09/10 07:22:54 taca Exp $
 
-SHA1 (daemons-1.0.10.gem) = 61ad4530249aab8c87c833757127cb593815b88c
-RMD160 (daemons-1.0.10.gem) = cee32913a4be62e308e1ae0f61edf869f45a0566
-Size (daemons-1.0.10.gem) = 31232 bytes
-SHA1 (patch-aa) = 4bf49460a14ee81286cb51c7b8afc090c68d4267
+SHA1 (daemons-1.1.0.gem) = 6f1a7d04bffc49c629ce4e6cd7b9f17acfb1def5
+RMD160 (daemons-1.1.0.gem) = 207f325a5dd5119f559c0909d68747aaaa28f4c4
+Size (daemons-1.1.0.gem) = 33792 bytes
diff --git a/misc/ruby-daemons/patches/patch-aa b/misc/ruby-daemons/patches/patch-aa
deleted file mode 100644
index ed9f799f4f1..00000000000
--- a/misc/ruby-daemons/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2009/06/12 12:02:48 taca Exp $
-
-Stop calling obsolete method.
-
---- Rakefile.orig	2009-06-12 16:36:06.000000000 +0900
-+++ Rakefile
-@@ -1,5 +1,4 @@
- require 'rubygems'
--Gem::manage_gems
- 
- require 'rake/gempackagetask'
- #require 'rake/testtask'