Date: Tue, 29 Aug 2006 21:10:24 GMT From: "Aaron Gifford" <astounding@gmail.com> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/102651: [patch] New command-line option for jabberd port start-up (for /usr/ports/net-im/jabberd) Message-ID: <200608292110.k7TLAOGj011730@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/102651; it has been noted by GNATS.
From: "Aaron Gifford" <astounding@gmail.com>
To: bug-followup@FreeBSD.org
Cc:
Subject: Re: ports/102651: [patch] New command-line option for jabberd port start-up (for /usr/ports/net-im/jabberd)
Date: Tue, 29 Aug 2006 15:09:25 -0600
Oh, one tiny change. The line in the patch that was:
+$config = $config_dir.'/'.$config if ($config !~ /^\.?\//);
Should instead read:
+$config = $config_dir.'/'.$config if ($config !~ /^\//);
That gets rid of the spurious \.? that I don't know why I included in
the first place.
As for submitting the patch upstream, whom would I contact to do that?
Hopefully gmail won't screw up the updated patch included in this
message too badly.
Aaron out.
--- /usr/local/bin/jabberd.orig Tue Aug 29 01:19:01 2006
+++ /usr/local/bin/jabberd Tue Aug 29 15:02:41 2006
@@ -28,8 +28,7 @@
my $Bin = "/usr/local/bin";
my $VERSION = "2.0s11";
my $config_dir = "/usr/local/etc/jabberd";
-my $config = $config_dir."/jabberd.cfg";
-$config = "internal" unless (-e $config);
+my $config = "jabberd.cfg";
my $debug = 0;
my $daemon = 0;
my $select = IO::Select->new();
@@ -43,13 +42,20 @@
# Process the command line arguments
#-----------------------------------------------------------------------------
my %opts;
-getopts("c:Dhb",\%opts);
+getopts("c:d:Dhb",\%opts);
&usage if exists($opts{h});
if (exists($opts{c}))
{
$config = $opts{c} if (defined($opts{c}) && ($opts{c} ne ""));
&usage() if (!defined($opts{c}) || ($opts{c} eq ""));
}
+if (exists($opts{d}))
+{
+ $config_dir = $opts{d} if (defined($opts{d}) && ($opts{d} ne ""));
+ &usage() if (!defined($opts{d}) || ($opts{d} eq ""));
+}
+$config = $config_dir.'/'.$config if ($config !~ /^\//);
+$config = "internal" unless (-e $config);
$debug = 1 if exists($opts{D});
$daemon = 1 if exists($opts{b});
@@ -123,6 +129,7 @@
&debug("jabberd","stdout","debug on\n");
&debug("jabberd","stdout","version($VERSION)\n");
&debug("jabberd","stdout","config_dir($config_dir)\n");
+ &debug("jabberd","stdout","config($config)\n");
}
#-----------------------------------------------------------------------------
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200608292110.k7TLAOGj011730>