4 files changed, 25 insertions, 15 deletions

diff --git a/www/rubygem-mongrel_cluster/Makefile b/www/rubygem-mongrel_cluster/Makefile
index 77afc2e72ba7..33f57280163c 100644
--- a/www/rubygem-mongrel_cluster/Makefile
+++ b/www/rubygem-mongrel_cluster/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	mongrel_cluster
-PORTVERSION=	0.2.1
+PORTVERSION=	1.0.2
 CATEGORIES=	www rubygems
 MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
 MASTER_SITE_SUBDIR=	mongrel
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=	mongrel
 MAINTAINER=	ports@logvinov.com
 COMMENT=	Manages multiple Mongrel processes
 
-BUILD_DEPENDS=	rubygem-mongrel>=0.3.13.4:${PORTSDIR}/www/rubygem-mongrel
+BUILD_DEPENDS=	rubygem-mongrel>=1.0.1:${PORTSDIR}/www/rubygem-mongrel
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_RC_SUBR=	mongrel_cluster
diff --git a/www/rubygem-mongrel_cluster/distinfo b/www/rubygem-mongrel_cluster/distinfo
index f3c0db38bd0d..d0a729933c1b 100644
--- a/www/rubygem-mongrel_cluster/distinfo
+++ b/www/rubygem-mongrel_cluster/distinfo
@@ -1,3 +1,3 @@
-MD5 (rubygem/mongrel_cluster-0.2.1.gem) = 4f497c3823cadf527b7dab12a05dda7b
-SHA256 (rubygem/mongrel_cluster-0.2.1.gem) = a5489c017a5f035a46341f043de43845c2f5e982b563a525cee0e11554a46db1
-SIZE (rubygem/mongrel_cluster-0.2.1.gem) = 18432
+MD5 (rubygem/mongrel_cluster-1.0.2.gem) = 2ee4af339051062dce04c4dd5938cb86
+SHA256 (rubygem/mongrel_cluster-1.0.2.gem) = 187f61e2f0d36499465d1c20f187e9507f485eb2c7e1b4ec71ce42c46dc67bf8
+SIZE (rubygem/mongrel_cluster-1.0.2.gem) = 19968
diff --git a/www/rubygem-mongrel_cluster/files/mongrel_cluster.in b/www/rubygem-mongrel_cluster/files/mongrel_cluster.in
index 53fd903c5c2f..1db87a6625d3 100644
--- a/www/rubygem-mongrel_cluster/files/mongrel_cluster.in
+++ b/www/rubygem-mongrel_cluster/files/mongrel_cluster.in
@@ -20,16 +20,25 @@ name=mongrel_cluster
 rcvar=${name}_enable
 
 command="%%PREFIX%%/bin/mongrel_cluster_ctl"
-required_dirs="%%PREFIX%%/etc/${name}"
 
 load_rc_config $name
 
 : ${mongrel_cluster_enable="NO"}
-: ${mongrel_cluster_conf_dir="%%PREFIX%%/etc/mongrel_cluster"}
+: ${mongrel_cluster_conf_dir="%%ETCDIR%%"}
 
 command_args="-c ${mongrel_cluster_conf_dir}"
-start_cmd="${command} start ${command_args}"
-stop_cmd="${command} stop ${command_args}"
-restart_cmd="${command} restart ${command_args}"
+start_cmd="mongrel_cmd start"
+stop_cmd="mongrel_cmd stop"
+restart_cmd="mongrel_cmd restart"
+status_cmd="mongrel_cmd status"
 
+mongrel_cmd()
+{
+    if [ ! -d "${mongrel_cluster_conf_dir}/." ]; then
+	warn "${mongrel_cluster_conf_dir} is not a directory."
+	return 1
+    fi
+    ${command} $1 ${mongrel_cluster_flags} ${command_args} 2>&1 | grep -v "procfs"
+}
+			    
 run_rc_command "$1"
diff --git a/www/rubygem-mongrel_cluster/pkg-plist b/www/rubygem-mongrel_cluster/pkg-plist
index 678384c1639e..3854d94f6f90 100644
--- a/www/rubygem-mongrel_cluster/pkg-plist
+++ b/www/rubygem-mongrel_cluster/pkg-plist
@@ -1,18 +1,19 @@
 bin/mongrel_cluster_ctl
 %%GEM_CACHE%%
+%%GEM_SPEC%%
 %%GEM_LIB_DIR%%/COPYING
 %%GEM_LIB_DIR%%/LICENSE
 %%GEM_LIB_DIR%%/README
 %%GEM_LIB_DIR%%/Rakefile
 %%GEM_LIB_DIR%%/bin/mongrel_cluster_ctl
-%%GEM_LIB_DIR%%/lib/mongrel_cluster/init.rb
 %%GEM_LIB_DIR%%/lib/mongrel_cluster/recipes.rb
-%%GEM_LIB_DIR%%/resources/defaults.yaml
-%%GEM_LIB_DIR%%/resources/mongrel_cluster
+%%GEM_LIB_DIR%%/lib/mongrel_cluster/init.rb~
+%%GEM_LIB_DIR%%/lib/mongrel_cluster/init.rb
 %%GEM_LIB_DIR%%/tools/rakehelp.rb
-%%GEM_SPEC%%
-@dirrm %%GEM_LIB_DIR%%/tools
+%%GEM_LIB_DIR%%/resources/mongrel_cluster
+%%GEM_LIB_DIR%%/resources/defaults.yaml
 @dirrm %%GEM_LIB_DIR%%/resources
+@dirrm %%GEM_LIB_DIR%%/tools
 @dirrm %%GEM_LIB_DIR%%/lib/mongrel_cluster
 @dirrm %%GEM_LIB_DIR%%/lib
 @dirrm %%GEM_LIB_DIR%%/bin