2 files changed, 26 insertions, 20 deletions

diff --git a/irc/irc/Makefile b/irc/irc/Makefile
index bff2df3ecabb..34b261eabe60 100644
--- a/irc/irc/Makefile
+++ b/irc/irc/Makefile
@@ -3,7 +3,7 @@
 # Date created:		23 August 1994
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.6 1995/05/17 15:06:24 asami Exp $
+# $Id: Makefile,v 1.7 1995/05/18 09:14:06 asami Exp $
 #
 
 DISTNAME=	irc2.8.21
@@ -13,6 +13,9 @@ MASTER_SITES=	ftp://cs-ftp.bu.edu/irc/servers/
 
 MAINTAINER=	torstenb@FreeBSD.ORG
 
+# the NOTE command is disabled by default
+# ENABLE_NOTE=yes
+
 # Restrictive copyright in irc2.8.21/ircd/res.c
 NO_PACKAGE=	yes
 
diff --git a/irc/irc/files/patch-ab b/irc/irc/files/patch-ab
index 86207a63232d..0e09c2424dd7 100644
--- a/irc/irc/files/patch-ab
+++ b/irc/irc/files/patch-ab
@@ -1,5 +1,5 @@
 *** include/config.h.orig	Wed Jun 15 15:58:12 1994
---- include/config.h	Sun Jun 25 15:40:25 1995
+--- include/config.h	Tue Jun 27 01:18:33 1995
 ***************
 *** 61,67 ****
    * If your host supports varargs and has vsprintf(), vprintf() and vscanf()
@@ -18,42 +18,45 @@
    *       be used in a chain of 3 or more funtions which all have a variable
    *       number of params.  If anyone has a solution to this, please notify
 ***************
-*** 84,105 ****
+*** 84,96 ****
   #define	HAVECURSES		/* If you have curses, and want to use it.  */
   #undef	HAVETERMCAP		/* If you have termcap, and want to use it. */
   
-- #ifdef notdef
+! #ifdef notdef
   /* Define NPATH if you want to run NOTE system. Be sure that this file is
    * either not present or non empty (result of previous size). If it is empty,
    * then remove it before starting the server.
    * The file is for request save/backup.
    */
 ! #define NPATH "/usr/lib/irc/.ircdnote"
-! #endif
+  #endif
   
   /*
-   * Full pathnames and defaults of irc system's support files. Please note that
-   * these are only the recommened names and paths. Change as needed.
-   * You must define these to something, even if you don't really want them.
-   */
-! #define	DPATH	"/scratch/avalon/ircd"	/* dir where all ircd stuff is */
-! #define	SPATH	"/scratch/avalon/ircd/bin/ircd"
-  #define	CPATH	"ircd.conf"	/* server configuration file */
-  #define	MPATH	"ircd.motd"	/* server MOTD file */
-  #define	LPATH	"/tmp/ircd.log" /* Where the debug file lives, if DEBUGMODE */
---- 84,103 ----
+--- 84,96 ----
   #define	HAVECURSES		/* If you have curses, and want to use it.  */
   #undef	HAVETERMCAP		/* If you have termcap, and want to use it. */
   
+! #ifdef ENABLE_NOTE
   /* Define NPATH if you want to run NOTE system. Be sure that this file is
    * either not present or non empty (result of previous size). If it is empty,
    * then remove it before starting the server.
    * The file is for request save/backup.
    */
 ! #define NPATH "!!PREFIX!!/lib/ircd/.ircdnote"
+  #endif
   
   /*
-   * Full pathnames and defaults of irc system's support files. Please note that
+***************
+*** 98,105 ****
+   * these are only the recommened names and paths. Change as needed.
+   * You must define these to something, even if you don't really want them.
+   */
+! #define	DPATH	"/scratch/avalon/ircd"	/* dir where all ircd stuff is */
+! #define	SPATH	"/scratch/avalon/ircd/bin/ircd"
+  #define	CPATH	"ircd.conf"	/* server configuration file */
+  #define	MPATH	"ircd.motd"	/* server MOTD file */
+  #define	LPATH	"/tmp/ircd.log" /* Where the debug file lives, if DEBUGMODE */
+--- 98,105 ----
    * these are only the recommened names and paths. Change as needed.
    * You must define these to something, even if you don't really want them.
    */
@@ -72,7 +75,7 @@
   
   /* CHROOTDIR
    *
---- 110,117 ----
+--- 112,119 ----
    * FNAME_USERLOG just logs user connections, FNAME_OPERLOG logs every
    * successful use of /oper.  These are either full paths or files within DPATH.
    */
@@ -90,7 +93,7 @@
   
   /* OPER_KILL
    *
---- 148,154 ----
+--- 150,156 ----
    * mode "i" (i == invisible). Invisibility means people dont showup in
    * WHO or NAMES unless they are on the same channel as you.
    */
@@ -107,7 +110,7 @@
   
   /* R_LINES:  The conf file now allows the existence of R lines, or
    * restrict lines.  These allow more freedom in the ability to restrict
---- 209,215 ----
+--- 211,217 ----
    * to a leaf which just has 1 server (typically the uplink). Define this
    * correctly for performance reasons.
    */
@@ -124,7 +127,7 @@
   
   /*
    * If you wish to have the server send 'vital' messages about server
---- 250,256 ----
+--- 252,258 ----
    * The server will then call m4 each time it reads the ircd.conf file,
    * reading m4 output as the server's ircd.conf file.
    */