X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=eggdrop-FHS.patch;h=bf69427c0f8a303ab5a96f9d5693c6e3f63513ea;hb=be355aca71405f97837092c82808e49f60b1b279;hp=9d91acf0adf47bf58be7e6dfe0268aab50dd60b2;hpb=b73216f775c6e1d6b081d36bebe7e2ac744dfc05;p=packages%2Feggdrop.git diff --git a/eggdrop-FHS.patch b/eggdrop-FHS.patch index 9d91acf..bf69427 100644 --- a/eggdrop-FHS.patch +++ b/eggdrop-FHS.patch @@ -1,35 +1,23 @@ -diff -Nur eggdrop1.6.9/FEATURES eggdrop1.6.9-FHS/FEATURES ---- eggdrop1.6.9/FEATURES Thu Feb 28 06:13:54 2002 -+++ eggdrop1.6.9-FHS/FEATURES Thu Jun 6 23:42:33 2002 -@@ -180,7 +180,7 @@ +diff -Nur eggdrop1.6.13/INSTALL eggdrop1.6.13-FHS/INSTALL +--- eggdrop1.6.13/INSTALL Sat Sep 28 00:16:24 2002 ++++ eggdrop1.6.13-FHS/INSTALL Fri Dec 20 21:37:02 2002 +@@ -61,11 +61,11 @@ - **** Installation + If you want to install to a different directory, use: --make install DEST= -+make install DESTDIR= +- make install DEST= ++ make install DESTDIR= - ________________________________________________________________________ + For example: -diff -Nur eggdrop1.6.9/INSTALL eggdrop1.6.9-FHS/INSTALL ---- eggdrop1.6.9/INSTALL Sat Mar 9 22:14:14 2002 -+++ eggdrop1.6.9-FHS/INSTALL Thu Jun 6 23:42:33 2002 -@@ -51,11 +51,11 @@ +- make install DEST=/home/user/otherdir ++ make install DESTDIR=/home/user/otherdir - If you want to install to a different directory, use: - -- make install DEST= -+ make install DESTDIR= - - For example: - -- make install DEST=/home/user/otherdir -+ make install DESTDIR=/home/user/otherdir - - Note that you must use full path for every file to be correctly - installed. -diff -Nur eggdrop1.6.9/Makefile.in eggdrop1.6.9-FHS/Makefile.in ---- eggdrop1.6.9/Makefile.in Thu Feb 28 06:13:54 2002 -+++ eggdrop1.6.9-FHS/Makefile.in Thu Jun 6 23:42:33 2002 + Note that you must use full path for every file to be correctly + installed. +diff -Nur eggdrop1.6.13/Makefile.in eggdrop1.6.13-FHS/Makefile.in +--- eggdrop1.6.13/Makefile.in Fri Nov 22 22:53:40 2002 ++++ eggdrop1.6.13-FHS/Makefile.in Fri Dec 20 21:45:37 2002 @@ -11,7 +11,7 @@ @SET_MAKE@ @@ -128,13 +116,12 @@ diff -Nur eggdrop1.6.9/Makefile.in eggdrop1.6.9-FHS/Makefile.in fi install-data: -- @$(INSTALL_DATA) $(srcdir)/eggdrop.advanced.conf $(DEST) -- @$(INSTALL_DATA) $(srcdir)/eggdrop.complete.conf $(DEST) -- @$(INSTALL_DATA) $(srcdir)/eggdrop.simple.conf $(DEST) +- @if test ! -f $(DEST)/eggdrop.conf; then \ +- $(INSTALL_DATA) $(srcdir)/eggdrop.conf $(DEST)/; \ ++ @if test ! -f $(DESTDIR)/eggdrop.conf; then \ ++ $(INSTALL_DATA) $(srcdir)/eggdrop.conf $(DESTDIR)/; \ + fi - @if test ! -d $(DEST)/logs; then \ -+ @$(INSTALL_DATA) $(srcdir)/eggdrop.advanced.conf $(DESTDIR) -+ @$(INSTALL_DATA) $(srcdir)/eggdrop.complete.conf $(DESTDIR) -+ @$(INSTALL_DATA) $(srcdir)/eggdrop.simple.conf $(DESTDIR) + @if test ! -d $(DESTDIR)/logs; then \ echo "Creating 'logs' subdirectory."; \ - $(top_srcdir)/misc/mkinstalldirs $(DEST)/logs; \ @@ -233,58 +220,17 @@ diff -Nur eggdrop1.6.9/Makefile.in eggdrop1.6.9-FHS/Makefile.in install-scripts: @@ -438,7 +438,7 @@ @echo "You MUST ensure that you edit/verify your configuration file." - @echo "Use one of the three configuration files (eggdrop.simple.conf, eggdrop.advanced.conf and eggdrop.complete.conf) distributed with your bot." + @echo "An example configuration file, eggdrop.conf, is distributed with Eggdrop." @echo "" - @echo "Remember to change directory to $(DEST) before you proceed." + @echo "Remember to change directory to $(DESTDIR) before you proceed." @echo "" #safety hash -diff -Nur eggdrop1.6.9/README eggdrop1.6.9-FHS/README ---- eggdrop1.6.9/README Sun Mar 10 19:12:34 2002 -+++ eggdrop1.6.9-FHS/README Thu Jun 6 23:42:33 2002 -@@ -210,7 +210,7 @@ - VERSION - - If you followed the 'INSTALL' file and did a 'make install' -- (or 'make install DEST="path"') after 'make', this will be -+ (or 'make install DESTDIR="path"') after 'make', this will be - pretty easy. Just upload the new eggdrop1.6.x.tar.gz file to - your home dir on your shell, gunzip and untar it, and type - 'cd ~/eggdrop1.6.x'. Next, type './configure', 'make config' -@@ -423,8 +423,8 @@ - configure Tcl (not the bot) and then remake, and reinstall. - - (2) If it's not your machine, you make have to resort to 'make -- static' and 'make install DEST="path"' to make and install -- your bot. -+ static' and 'make install DESTDIR="path"' to make and -+ install your bot. - - (3) If you are of a more aggressive sense of mind, go beat - the stuffing out of your admin for having lame static -diff -Nur eggdrop1.6.9/aclocal.m4 eggdrop1.6.9-FHS/aclocal.m4 ---- eggdrop1.6.9/aclocal.m4 Mon Mar 11 06:05:24 2002 -+++ eggdrop1.6.9-FHS/aclocal.m4 Thu Jun 6 23:42:33 2002 -@@ -1162,11 +1162,11 @@ - dnl EGG_SUBST_DEST() - dnl - AC_DEFUN(EGG_SUBST_DEST, [dnl --if test "${DEST-x}" = "x" -+if test "${DESTDIR-x}" = "x" - then -- DEST=\${prefix} -+ DESTDIR=\${prefix} - fi --AC_SUBST(DEST)dnl -+AC_SUBST(DESTDIR)dnl - ])dnl - - -diff -Nur eggdrop1.6.9/configure eggdrop1.6.9-FHS/configure ---- eggdrop1.6.9/configure Mon Mar 11 06:05:32 2002 -+++ eggdrop1.6.9-FHS/configure Thu Jun 6 23:42:33 2002 -@@ -6532,9 +6532,9 @@ +diff -Nur eggdrop1.6.13/configure eggdrop1.6.13-FHS/configure +--- eggdrop1.6.13/configure Fri Nov 22 22:50:58 2002 ++++ eggdrop1.6.13-FHS/configure Fri Dec 20 21:47:24 2002 +@@ -6956,9 +6956,9 @@ #define EGG_VERSION $egg_version_num _ACEOF @@ -296,18 +242,18 @@ diff -Nur eggdrop1.6.9/configure eggdrop1.6.9-FHS/configure fi case "$srcdir" in -@@ -7007,7 +7007,7 @@ +@@ -7621,7 +7621,7 @@ s,@TCL_REQS@,$TCL_REQS,;t t s,@TCL_LIBS@,$TCL_LIBS,;t t s,@EGGVERSION@,$EGGVERSION,;t t -s,@DEST@,$DEST,;t t +s,@DESTDIR@,$DESTDIR,;t t s,@MOD_UPDIR@,$MOD_UPDIR,;t t - CEOF - -diff -Nur eggdrop1.6.9/doc/Makefile.in eggdrop1.6.9-FHS/doc/Makefile.in ---- eggdrop1.6.9/doc/Makefile.in Sat Mar 9 22:14:14 2002 -+++ eggdrop1.6.9-FHS/doc/Makefile.in Thu Jun 6 23:42:48 2002 + s,@LIBOBJS@,$LIBOBJS,;t t + s,@LTLIBOBJS@,$LTLIBOBJS,;t t +diff -Nur eggdrop1.6.13/doc/Makefile.in eggdrop1.6.13-FHS/doc/Makefile.in +--- eggdrop1.6.13/doc/Makefile.in Sat Mar 9 22:14:14 2002 ++++ eggdrop1.6.13-FHS/doc/Makefile.in Fri Dec 20 21:48:00 2002 @@ -35,37 +35,37 @@ @rm -f *~ @@ -359,95 +305,81 @@ diff -Nur eggdrop1.6.9/doc/Makefile.in eggdrop1.6.9-FHS/doc/Makefile.in done; \ fi -diff -Nur eggdrop1.6.9/eggdrop.advanced.conf eggdrop1.6.9-FHS/eggdrop.advanced.conf ---- eggdrop1.6.9/eggdrop.advanced.conf Sun Mar 10 19:10:27 2002 -+++ eggdrop1.6.9-FHS/eggdrop.advanced.conf Thu Jun 6 23:42:33 2002 -@@ -1,5 +1,4 @@ --#! /path/to/executable/eggdrop --# ^- This should contain a fully qualified path to your eggdrop executable. -+#!/usr/bin/eggdrop - # - # $Id$ - # -@@ -161,21 +160,21 @@ - - # Specify here where eggdrop should look for help files. - # Don't modify this setting unless you know what you're doing! --set help-path "help/" -+set help-path "/usr/share/eggdrop/help/" - - # Specify here where eggdrop should look for text files. This is - # used for certain Tcl and DCC commands. --set text-path "text/" -+set text-path "/usr/share/eggdrop/" - - # Set here a place to store temporary files. - set temp-path "/tmp" - - # The MOTD (Message Of The day) is displayed when people dcc chat or telnet - # to the bot. Look at doc/text-substitutions.doc for options. --set motd "text/motd" -+set motd "/usr/share/eggdrop/motd" - - # This banner will be displayed on telnet connections. --set telnet-banner "text/banner" -+set telnet-banner "/usr/share/eggdrop/banner" - - - ##### BOTNET/DCC/TELNET ##### -@@ -323,7 +322,7 @@ - # If you run the bot from the compilation directory, you will want to set - # this to "". If you use 'make install' (like all good kiddies do ;), this - # is a fine default. Otherwise, use your head :) --set mod-path "modules/" -+set mod-path "/usr/lib/eggdrop/modules/" - - - #### DNS MODULE #### -@@ -1206,17 +1205,17 @@ - # directory. All scripts should be put there, although you can place them where - # you like as long as you can supply a fully qualified path to them. - # --# source scripts/script.tcl -+# source /usr/share/eggdrop/scripts/script.tcl - --source scripts/alltools.tcl --source scripts/action.fix.tcl -+source /usr/share/eggdrop/scripts/alltools.tcl -+source /usr/share/eggdrop/scripts/action.fix.tcl - - # Use this script for Tcl and eggdrop downwards compatibility. - # NOTE: This can also cause problems with some newer scripts. --source scripts/compat.tcl -+source /usr/share/eggdrop/scripts/compat.tcl - - # This script provides many useful informational functions, like setting - # users' URLs, e-mail address, ICQ numbers, etc. You can modify it to add - # extra entries --source scripts/userinfo.tcl -+source /usr/share/eggdrop/scripts/userinfo.tcl - loadhelp userinfo.help -diff -Nur eggdrop1.6.9/eggdrop.complete.conf eggdrop1.6.9-FHS/eggdrop.complete.conf ---- eggdrop1.6.9/eggdrop.complete.conf Sun Mar 10 19:10:27 2002 -+++ eggdrop1.6.9-FHS/eggdrop.complete.conf Thu Jun 6 23:42:33 2002 -@@ -1,5 +1,4 @@ +diff -Nur eggdrop1.6.13/doc/html/faqs.html eggdrop1.6.13-FHS/doc/html/faqs.html +--- eggdrop1.6.13/doc/html/faqs.html Thu Jun 6 20:15:52 2002 ++++ eggdrop1.6.13-FHS/doc/html/faqs.html Sat Dec 21 08:55:14 2002 +@@ -264,7 +264,7 @@ + +
  • +

    If it's not your machine, you make have to resort to 'make +- static' and 'make install DEST="path"' to make ++ static' and 'make install DESTDIR="path"' to make + and install your bot.

    +
    • + +diff -Nur eggdrop1.6.13/doc/html/install.html eggdrop1.6.13-FHS/doc/html/install.html +--- eggdrop1.6.13/doc/html/install.html Sat Sep 28 00:16:24 2002 ++++ eggdrop1.6.13-FHS/doc/html/install.html Sat Dec 21 08:52:07 2002 +@@ -96,13 +96,13 @@ +

    If you want to install to a different directory, use:

    + +
    +-

    make install DEST=<directory>

    ++

    make install DESTDIR=<directory>

    +
    + +

    For example:

    + +
    +-

    make install DEST=/home/user/otherdir

    ++

    make install DESTDIR=/home/user/otherdir

    +
    + +

    Note that you must use full path for every file to be correctly +diff -Nur eggdrop1.6.13/doc/html/readme.html eggdrop1.6.13-FHS/doc/html/readme.html +--- eggdrop1.6.13/doc/html/readme.html Sat Sep 28 00:16:24 2002 ++++ eggdrop1.6.13-FHS/doc/html/readme.html Sat Dec 21 08:53:33 2002 +@@ -261,7 +261,7 @@ +

    +

    If you followed Compilation and + Installation of Eggdrop and did a 'make install' (or +- 'make install DEST="path"') after 'make', ++ 'make install DESTDIR="path"') after 'make', + this will be pretty easy. Just upload the new eggdrop1.6.x.tar.gz file + to your home dir on your shell, gunzip and untar it, and type 'cd + ~/eggdrop1.6.x'. Next, type './configure', 'make +diff -Nur eggdrop1.6.13/doc/html/starting.html eggdrop1.6.13-FHS/doc/html/starting.html +--- eggdrop1.6.13/doc/html/starting.html Wed Jan 2 09:06:14 2002 ++++ eggdrop1.6.13-FHS/doc/html/starting.html Sat Dec 21 08:53:21 2002 +@@ -91,7 +91,7 @@ + Eggdrop, you just have to do:

    + +
    +-

    make DEST="directory" install

    ++

    make DESTDIR="directory" install

    +
    + +

    and it will copy all the necessary files.

    +diff -Nur eggdrop1.6.13/eggdrop.conf eggdrop1.6.13-FHS/eggdrop.conf +--- eggdrop1.6.13/eggdrop.conf Mon Nov 18 06:39:34 2002 ++++ eggdrop1.6.13-FHS/eggdrop.conf Fri Dec 20 22:02:32 2002 +@@ -1,4 +1,4 @@ -#! /path/to/executable/eggdrop --# ^- This should contain a fully qualified path to your eggdrop executable. +#!/usr/bin/eggdrop + # ^- This should contain a fully qualified path to your Eggdrop executable. # # $Id$ - # -@@ -165,21 +164,21 @@ +@@ -163,22 +163,22 @@ - # Specify here where eggdrop should look for help files. - # Don't modify this setting unless you know what you're doing! + # Specify here where Eggdrop should look for help files. Don't modify this + # setting unless you know what you're doing! -set help-path "help/" +set help-path "/usr/share/eggdrop/help/" - # Specify here where eggdrop should look for text files. This is - # used for certain Tcl and DCC commands. + # Specify here where Eggdrop should look for text files. This is used for + # certain Tcl and DCC commands. -set text-path "text/" -+set text-path "/usr/share/eggdrop/" ++set text-path "/usr/share/eggdrop" # Set here a place to store temporary files. set temp-path "/tmp" @@ -457,13 +389,14 @@ diff -Nur eggdrop1.6.9/eggdrop.complete.conf eggdrop1.6.9-FHS/eggdrop.complete.c -set motd "text/motd" +set motd "/usr/share/eggdrop/motd" - # This banner will be displayed on telnet connections. + # This banner will be displayed on telnet connections. Look at + # doc/text-substitutions.doc for options. -set telnet-banner "text/banner" +set telnet-banner "/usr/share/eggdrop/banner" - # This specifies what permissions the user, channel, and notes files should be set to. - # The octal values are the same as for the chmod system command. -@@ -400,7 +399,7 @@ + # This specifies what permissions the user, channel, and notes files should + # be set to. The octal values are the same as for the chmod system command. +@@ -396,7 +396,7 @@ # If you run the bot from the compilation directory, you will want to set # this to "". If you use 'make install' (like all good kiddies do ;), this # is a fine default. Otherwise, use your head :) @@ -472,7 +405,7 @@ diff -Nur eggdrop1.6.9/eggdrop.complete.conf eggdrop1.6.9-FHS/eggdrop.complete.c #### DNS MODULE #### -@@ -1309,17 +1308,17 @@ +@@ -1312,17 +1312,17 @@ # directory. All scripts should be put there, although you can place them where # you like as long as you can supply a fully qualified path to them. # @@ -484,59 +417,20 @@ diff -Nur eggdrop1.6.9/eggdrop.complete.conf eggdrop1.6.9-FHS/eggdrop.complete.c +source /usr/share/eggdrop/scripts/alltools.tcl +source /usr/share/eggdrop/scripts/action.fix.tcl - # Use this script for Tcl and eggdrop downwards compatibility. + # Use this script for Tcl and Eggdrop downwards compatibility. # NOTE: This can also cause problems with some newer scripts. -source scripts/compat.tcl +source /usr/share/eggdrop/scripts/compat.tcl # This script provides many useful informational functions, like setting # users' URLs, e-mail address, ICQ numbers, etc. You can modify it to add - # extra entries --source scripts/userinfo.tcl -+source /usr/share/eggdrop/scripts/userinfo.tcl - loadhelp userinfo.help -diff -Nur eggdrop1.6.9/eggdrop.simple.conf eggdrop1.6.9-FHS/eggdrop.simple.conf ---- eggdrop1.6.9/eggdrop.simple.conf Sat Mar 9 22:14:14 2002 -+++ eggdrop1.6.9-FHS/eggdrop.simple.conf Thu Jun 6 23:42:33 2002 -@@ -1,5 +1,4 @@ --#! /path/to/executable/eggdrop --# ^- Set that to the directory eggdrop is in, i.e. "#! /home/lamest/egg/eggdrop" -+#!/usr/bin/eggdrop - # - # $Id$ - # -@@ -19,9 +18,9 @@ - # More options can be found in the files in doc/settings/. - - # Don't edit the following 12 lines. --set mod-path "modules/" --set help-path "help/" --set text-path "text/" -+set mod-path "/usr/lib/eggdrop/modules/" -+set help-path "/usr/share/eggdrop/help/" -+set text-path "/usr/share/eggdrop/" - loadmodule dns - loadmodule channels - loadmodule server -@@ -137,10 +136,10 @@ - # directory. All scripts should be put there, although you can place them where - # you like as long as you can supply a fully qualified path to them. - # --# source scripts/script.tcl -+# source /usr/share/eggdrop/scripts/script.tcl - --source scripts/alltools.tcl --source scripts/action.fix.tcl --source scripts/compat.tcl + # extra entries. -source scripts/userinfo.tcl -+source /usr/share/eggdrop/scripts/alltools.tcl -+source /usr/share/eggdrop/scripts/action.fix.tcl -+source /usr/share/eggdrop/scripts/compat.tcl +source /usr/share/eggdrop/scripts/userinfo.tcl loadhelp userinfo.help -diff -Nur eggdrop1.6.9/scripts/Makefile.in eggdrop1.6.9-FHS/scripts/Makefile.in ---- eggdrop1.6.9/scripts/Makefile.in Wed Nov 8 20:52:38 2000 -+++ eggdrop1.6.9-FHS/scripts/Makefile.in Thu Jun 6 23:43:44 2002 +diff -Nur eggdrop1.6.13/scripts/Makefile.in eggdrop1.6.13-FHS/scripts/Makefile.in +--- eggdrop1.6.13/scripts/Makefile.in Wed Nov 8 20:52:38 2000 ++++ eggdrop1.6.13-FHS/scripts/Makefile.in Fri Dec 20 21:48:58 2002 @@ -31,44 +31,44 @@ @rm -f *~ @@ -596,9 +490,21 @@ diff -Nur eggdrop1.6.9/scripts/Makefile.in eggdrop1.6.9-FHS/scripts/Makefile.in done; \ fi; \ fi -diff -Nur eggdrop1.6.9/src/mod/Makefile.in eggdrop1.6.9-FHS/src/mod/Makefile.in ---- eggdrop1.6.9/src/mod/Makefile.in Thu Dec 21 21:20:03 2000 -+++ eggdrop1.6.9-FHS/src/mod/Makefile.in Thu Jun 6 23:44:08 2002 +diff -Nur eggdrop1.6.13/src/eggdrop.h eggdrop1.6.13-FHS/src/eggdrop.h +--- eggdrop1.6.13/src/eggdrop.h Sat Sep 21 23:32:06 2002 ++++ eggdrop1.6.13-FHS/src/eggdrop.h Fri Dec 27 11:26:57 2002 +@@ -75,7 +75,7 @@ + + /* Language stuff */ + +-#define LANGDIR "./language" /* language file directory */ ++#define LANGDIR "/usr/share/eggdrop/language" /* language file directory */ + #define BASELANG "english" /* language which always gets loaded + before all other languages. You do + not want to change this. */ +diff -Nur eggdrop1.6.13/src/mod/Makefile.in eggdrop1.6.13-FHS/src/mod/Makefile.in +--- eggdrop1.6.13/src/mod/Makefile.in Thu Dec 21 21:20:04 2000 ++++ eggdrop1.6.13-FHS/src/mod/Makefile.in Fri Dec 20 21:49:58 2002 @@ -121,50 +121,50 @@ install-help: