Date: Wed, 17 Oct 2007 09:09:42 +1000 (YAKST) From: Alexander Logvinov <ports@logvinov.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Alexander Logvinov <ports@logvinov.com> Subject: ports/117259: [maintainer update] www/rubygem-mongrel_cluster: fix loading on system startup Message-ID: <200710162309.l9GN9g4W082870@blg.akavia.ru> Resent-Message-ID: <200710162310.l9GNA2AI026960@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 117259
>Category: ports
>Synopsis: [maintainer update] www/rubygem-mongrel_cluster: fix loading on system startup
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Tue Oct 16 23:10:02 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator: Alexander Logvinov
>Release: FreeBSD 6.2-RELEASE-p8 i386
>Organization:
>Environment:
>Description:
Fix loading on system startup
>How-To-Repeat:
>Fix:
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/www/rubygem-mongrel_cluster/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- Makefile 7 Aug 2007 00:42:25 -0000 1.10
+++ Makefile 16 Oct 2007 22:56:08 -0000
@@ -6,7 +6,7 @@
PORTNAME= mongrel_cluster
PORTVERSION= 1.0.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www rubygems
MASTER_SITES= ${MASTER_SITE_RUBYFORGE}
MASTER_SITE_SUBDIR= mongrel
@@ -18,6 +18,8 @@
RUN_DEPENDS= ${BUILD_DEPENDS}
USE_RC_SUBR= mongrel_cluster
+USE_RUBY= yes
+REINPLACE_ARGS= -i ""
# This target is only meant to be used by the port maintainer.
x-generate-plist:
@@ -35,6 +37,11 @@
post-install:
${RMDIR} ${PREFIX}/${GEM_DOC_DIR}
+ @${REINPLACE_CMD} -e 's|/usr/bin/env ruby|${RUBY}|' ${PREFIX}/bin/mongrel_cluster_ctl
+ @${REINPLACE_CMD} -e 's|mongrel_rails|${PREFIX}/bin/mongrel_rails|g' \
+ ${PREFIX}/${GEM_LIB_DIR}/bin/mongrel_cluster_ctl
+ @${REINPLACE_CMD} -e 's|\"mongrel_rails\"|\"${PREFIX}/bin/mongrel_rails\"|g' \
+ ${PREFIX}/${GEM_LIB_DIR}/lib/${PORTNAME}/init.rb
.include <bsd.port.pre.mk>
.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
Index: files/mongrel_cluster.in
===================================================================
RCS file: /home/pcvs/ports/www/rubygem-mongrel_cluster/files/mongrel_cluster.in,v
retrieving revision 1.3
diff -u -r1.3 mongrel_cluster.in
--- files/mongrel_cluster.in 7 Aug 2007 00:42:26 -0000 1.3
+++ files/mongrel_cluster.in 16 Oct 2007 22:56:08 -0000
@@ -38,7 +38,7 @@
warn "${mongrel_cluster_conf_dir} is not a directory."
return 1
fi
- ${command} $1 ${mongrel_cluster_flags} ${command_args} 2>&1 | grep -v "procfs" | grep -v "up-to-date"
+ ${command} $1 ${mongrel_cluster_flags} ${command_args} 2>&1 | grep -v "procfs"
}
-
+
run_rc_command "$1"
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200710162309.l9GN9g4W082870>