From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Sep 13 10:50:02 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2A9EF1065672 for ; Sat, 13 Sep 2008 10:50:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id F1B268FC21 for ; Sat, 13 Sep 2008 10:50:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m8DAo15H014988 for ; Sat, 13 Sep 2008 10:50:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m8DAo1nJ014987; Sat, 13 Sep 2008 10:50:01 GMT (envelope-from gnats) Resent-Date: Sat, 13 Sep 2008 10:50:01 GMT Resent-Message-Id: <200809131050.m8DAo1nJ014987@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Ulrich Spoerlein Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 18B52106564A; Sat, 13 Sep 2008 10:44:16 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: from acme.spoerlein.net (cl-43.dus-01.de.sixxs.net [IPv6:2a01:198:200:2a::2]) by mx1.freebsd.org (Postfix) with ESMTP id B09E58FC16; Sat, 13 Sep 2008 10:44:15 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: from roadrunner.spoerlein.net (e180139087.adsl.alicedsl.de [85.180.139.87]) by acme.spoerlein.net (8.14.2/8.14.2) with ESMTP id m8DAiD0m061328 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sat, 13 Sep 2008 12:44:13 +0200 (CEST) (envelope-from uspoerlein@gmail.com) Received: from roadrunner.spoerlein.net (localhost [127.0.0.1]) by roadrunner.spoerlein.net (8.14.2/8.14.2) with ESMTP id m8DAX244058964 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sat, 13 Sep 2008 12:33:02 +0200 (CEST) (envelope-from uqs@roadrunner.spoerlein.net) Received: (from uqs@localhost) by roadrunner.spoerlein.net (8.14.2/8.14.2/Submit) id m8DAX1c0058963; Sat, 13 Sep 2008 12:33:01 +0200 (CEST) (envelope-from uqs) Message-Id: <200809131033.m8DAX1c0058963@roadrunner.spoerlein.net> Date: Sat, 13 Sep 2008 12:33:01 +0200 (CEST) From: Ulrich Spoerlein To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: shaun@FreeBSD.org Subject: ports/127348: [PATCH] net-im/ejabberd: Fix rc script's status command X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Sep 2008 10:50:02 -0000 >Number: 127348 >Category: ports >Synopsis: [PATCH] net-im/ejabberd: Fix rc script's status command >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Sep 13 10:50:01 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Ulrich Spoerlein >Release: FreeBSD 7.1-PRERELEASE i386 >Organization: >Environment: >Description: - Make /usr/local/etc/rc.d/ejabberd status work - Make /usr/local/etc/rc.d/ejabberd reload work - Make /usr/local/etc/rc.d/ejabberd restart actually restart all of ejabberd processes - Remove unnecessary chdir() - pet portlint(1) Port maintainer (shaun@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: Try running /usr/local/etc/rc.d/ejabberd status, it will complain about unknown directive. >Fix: --- ejabberd-1.1.4_3.patch begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/net-im/ejabberd/Makefile,v retrieving revision 1.27 diff -u -p -u -r1.27 Makefile --- Makefile 6 Jun 2008 13:51:43 -0000 1.27 +++ Makefile 13 Sep 2008 10:29:30 -0000 @@ -7,7 +7,7 @@ PORTNAME= ejabberd PORTVERSION= 1.1.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-im MASTER_SITES= http://www.process-one.net/downloads/ejabberd/${PORTVERSION}/ \ http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/ @@ -15,12 +15,12 @@ MASTER_SITES= http://www.process-one.net MAINTAINER= shaun@FreeBSD.org COMMENT= Free and Open Source distributed fault-tolerant Jabber server -OPTIONS= ODBC "Enable ODBC support" off - BUILD_DEPENDS= erlc:${PORTSDIR}/lang/erlang RUN_DEPENDS= erl:${PORTSDIR}/lang/erlang LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 +OPTIONS= ODBC "Enable ODBC support" off + GNU_CONFIGURE= yes USE_GMAKE= yes USE_ICONV= yes Index: files/ejabberd.sh.in =================================================================== RCS file: /home/ncvs/ports/net-im/ejabberd/files/ejabberd.sh.in,v retrieving revision 1.4 diff -u -p -u -r1.4 ejabberd.sh.in --- files/ejabberd.sh.in 8 May 2006 12:37:38 -0000 1.4 +++ files/ejabberd.sh.in 13 Sep 2008 10:29:30 -0000 @@ -13,7 +13,7 @@ # # DO NOT CHANGE THESE DEFAULT VALUES HERE # -ejabberd_enable="${ejabberd_enable-NO}" +: ejabberd_enable=${ejabberd_enable="NO"} . %%RC_SUBR%% @@ -21,12 +21,10 @@ name=ejabberd rcvar=`set_rcvar` reload_cmd="ejabberd_reload" -restart_cmd="ejabberd_reload" start_cmd="ejabberd_start" status_cmd="ejabberd_status" stop_cmd="ejabberd_stop" - -cd %%PREFIX%% # Why is this needed!? +extra_commands="reload status" # Include ejabberd defaults if available [ -f %%PREFIX%%/etc/ejabberd/ejabberd.defaults ] && . %%PREFIX%%/etc/ejabberd/ejabberd.defaults --- ejabberd-1.1.4_3.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: