Improve support for NetBSD

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@12438 e03df62e-2008-0410-955e-edbf42e46eb7

diff --git a/configure b/configure
index c5e87b4bc06e622f323c96b80750d1a220dcaeab..3f684df8ab2f09ffcc400aa99cedc620b385ec9b 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 ###################################################
 # InspIRCd Configuration Script
 #

diff --git a/make/calcdep.pl b/make/calcdep.pl
index 55e0630fc80da3497470661fdd98a7dfde843282..2ae03cc364c22681e3bfd9d02c42817ed4d8c22b 100755 (executable)
--- a/make/calcdep.pl
+++ b/make/calcdep.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 use strict;
 use warnings;
 use POSIX qw(getcwd);

diff --git a/make/run-cc.pl b/make/run-cc.pl
index d5c62333ced8fc8af5d42b828ccfe2e8bdbce535..4c3ccbb415e25ecd4446b0318031eec8d40964ea 100755 (executable)
--- a/make/run-cc.pl
+++ b/make/run-cc.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 #       +------------------------------------+
 #       | Inspire Internet Relay Chat Daemon |

diff --git a/make/template/inspircd b/make/template/inspircd
index 92f3f3bacff67896449d5de0395223cd92a2129c..ed841108341f3274aed1fd695c88b905101c7492 100644 (file)
--- a/make/template/inspircd
+++ b/make/template/inspircd
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 #       +------------------------------------+
 #       | Inspire Internet Relay Chat Daemon |
 #       +------------------------------------+
@@ -170,7 +170,7 @@ sub dev_debug(@)
        checkgdb();
 
        # If we are still alive here.. Try starting the IRCd..
-       exec 'gdb', "--command=$basepath/.gdbargs", '--args', "$binpath/$executable", qw(-nofork -debug), @_;
+       exec 'gdb', "--command=$basepath/.gdbargs", '--args', "$binpath/$executable", qw(--nofork --debug), @_;
        die "Failed to start GDB: $!\n";
 }
 
@@ -189,7 +189,7 @@ sub dev_screendebug(@)
        # If we are still alive here.. Try starting the IRCd..
        print "Starting InspIRCd in `screen`, type `screen -r` when the ircd crashes to view the gdb output and get a backtrace.\n";
        print "Once you're inside the screen session press ^C + d to re-detach from the session\n";
-       exec qw(screen -m -d gdb), "--comand=$basepath/.gdbargs", '-args', "$binpath/$executable", qw(-nofork -debug -nolog), @_;
+       exec qw(screen -m -d gdb), "--comand=$basepath/.gdbargs", '-args', "$binpath/$executable", qw(--nofork --debug --nolog), @_;
        die "Failed to start screen: $!\n";
 }
 
@@ -209,7 +209,7 @@ sub dev_valdebug(@)
        # If we are still alive here.. Try starting the IRCd..
        # May want to do something with these args at some point: --suppressions=.inspircd.sup --gen-suppressions=yes
        # Could be useful when we want to stop it complaining about things we're sure aren't issues.
-       exec qw(valgrind -v --tool=memcheck --leak-check=yes --db-attach=yes --num-callers=10), "$binpath/$executable", qw(-nofork -debug -nolog), @_;
+       exec qw(valgrind -v --tool=memcheck --leak-check=yes --db-attach=yes --num-callers=10), "$binpath/$executable", qw(--nofork --debug --nolog), @_;
        die "Failed to start valgrind: $!\n";
 }
 
@@ -246,7 +246,7 @@ sub dev_valdebug_unattended(@)
                exec qw(valgrind -v --tool=memcheck --leak-check=full --show-reachable=yes --num-callers=15 --track-fds=yes),
                        "--suppressions=$binpath/valgrind.sup", qw(--gen-suppressions=all),
                        qw(--leak-resolution=med --time-stamp=yes --log-fd=2 --),
-                       "$binpath/$executable", qw(-nofork -debug -nolog), @_;
+                       "$binpath/$executable", qw(--nofork --debug --nolog), @_;
                die "Can't execute valgrind: $!\n";
        }
 }
@@ -268,7 +268,7 @@ sub dev_screenvaldebug(@)
        # If we are still alive here.. Try starting the IRCd..
        print "Starting InspIRCd in `screen`, type `screen -r` when the ircd crashes to view the valgrind and gdb output and get a backtrace.\n";
        print "Once you're inside the screen session press ^C + d to re-detach from the session\n";
-       exec qw(screen -m -d valgrind -v --tool=memcheck --leak-check=yes --db-attach=yes --num-callers=10), "$binpath/$executable", qw(-nofork -debug -nolog), @_;
+       exec qw(screen -m -d valgrind -v --tool=memcheck --leak-check=yes --db-attach=yes --num-callers=10), "$binpath/$executable", qw(--nofork --debug --nolog), @_;
        die "Failed to start screen: $!\n";
 }
 

diff --git a/make/unit-cc.pl b/make/unit-cc.pl
index 489b46ff93eada94a75d5d28159dc62db0a52444..e64053b668c23773a7b387dc283c4cc406aa8645 100755 (executable)
--- a/make/unit-cc.pl
+++ b/make/unit-cc.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 use strict;
 use warnings;
 BEGIN { push @INC, $ENV{SOURCEPATH}; }

diff --git a/modulemanager b/modulemanager
index 0e978977abdc098d17f1b202c8af2e31ff450dba..8b71081236407e5f8e3e734de5ff3caadce51df4 100755 (executable)
--- a/modulemanager
+++ b/modulemanager
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 use strict;
 use warnings FATAL => qw(all);
 use LWP::Simple;

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index b95a6fecbd280cc1688bc0c67423d4b5fb55b532..58015b7189b81db65af4faab58212486322a8993 100644 (file)
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -392,7 +392,7 @@ InspIRCd::InspIRCd(int argc, char** argv) :
        };
 
        int index;
-       while ((c = getopt_long_only(argc, argv, ":f:", longopts, &index)) != -1)
+       while ((c = getopt_long(argc, argv, ":f:", longopts, &index)) != -1)
        {
                switch (c)
                {