1 files changed, 70 insertions, 106 deletions

diff --git a/news/nn/files/patch-ab b/news/nn/files/patch-ab
index 548453924bff..a4840c70c99e 100644
--- a/news/nn/files/patch-ab
+++ b/news/nn/files/patch-ab
@@ -1,66 +1,55 @@
-*** config.h.orig	Sun Jun 18 16:39:25 1995
---- config.h	Sun Jun 18 16:41:44 1995
+*** config.h	Mon Jul 20 10:27:15 1998
+--- config.h.new	Mon Jul 20 10:55:32 1998
 ***************
-*** 32,38 ****
-  #define NOV
+*** 51,60 ****
+  #define DO_NOV_DIGEST	/* */
   
   /* Optional */
-! #define NOV_DIRECTORY "/usr/spool/news"
-  
-  /*********************** NETWORK DEPENDENT DEFINITIONS **********************
-   *
---- 32,38 ----
-  #define NOV
+! /* #define NOV_DIRECTORY	"/usr/spool/news"	/* */
   
   /* Optional */
-! #define NOV_DIRECTORY "/var/news/over.view"
+! /* #define NOV_FILENAME		".overview"		/* */
+  
   
   /*********************** NETWORK DEPENDENT DEFINITIONS **********************
-   *
-***************
-*** 69,75 ****
-   *	Consult the file NNTP for further information on the use of NNTP.
-   */
+--- 51,60 ----
+  #define DO_NOV_DIGEST	/* */
   
-! #undef NNTP
+  /* Optional */
+! #define NOV_DIRECTORY	"/var/news/over.view"	/* */
   
-  /*
-   *	Define NNTP_SERVER to the name of a file containing the name of the
---- 69,75 ----
-   *	Consult the file NNTP for further information on the use of NNTP.
-   */
+  /* Optional */
+! #define NOV_FILENAME		".overview"		/* */
   
-! #define NNTP
   
-  /*
-   *	Define NNTP_SERVER to the name of a file containing the name of the
+  /*********************** NETWORK DEPENDENT DEFINITIONS **********************
 ***************
-*** 84,90 ****
+*** 107,113 ****
    *	NOTE: If you plan to use the included inews, it MUST be a full pathname
    */
   
-! #define NNTP_SERVER	"/usr/lib/nntp_server"
+! #define NNTP_SERVER	"/usr/lib/nntp_server"	/* */
   
   /*
    *	Define NNTP_POST if you want nn to reject attempts to post via
---- 84,90 ----
+--- 107,113 ----
    *	NOTE: If you plan to use the included inews, it MUST be a full pathname
    */
   
-! #define NNTP_SERVER     "/usr/local/etc/nntpserver"
+! #define NNTP_SERVER	"/usr/local/etc/nntp_server"	/* */
   
   /*
    *	Define NNTP_POST if you want nn to reject attempts to post via
 ***************
-*** 126,132 ****
+*** 149,155 ****
    *	conf/s-template.h as a starting point for writing you own.
    */
   
-! #include "s-sys5-4.h"
+! #include "s-hpux9-0.h"
   
   /*
    *	Define DEFAULT_PAGER as the initial value of the 'pager' variable.
---- 126,132 ----
+--- 149,155 ----
    *	conf/s-template.h as a starting point for writing you own.
    */
   
@@ -69,26 +58,24 @@
   /*
    *	Define DEFAULT_PAGER as the initial value of the 'pager' variable.
 ***************
-*** 141,148 ****
-   *	nn's :print command pipes text into this command.
+*** 210,216 ****
+   *	conf/m-template.h as a starting point for writing you own.
    */
   
-! #define DEFAULT_PRINTER		"lp -s"			/* System V */
-! /* #define DEFAULT_PRINTER	"lpr -p -JNEWS"	*/ 	/* bsd */
+! #include "m-hp9000.h"
   
-  /*
-   * 	Define RESIZING to make nn understand dynamic window-resizing.
---- 141,148 ----
-   *	nn's :print command pipes text into this command.
+  
+  /***************************** OWNERSHIP ***************************
+--- 210,216 ----
+   *	conf/m-template.h as a starting point for writing you own.
    */
   
-! /* #define DEFAULT_PRINTER         "lp -s"                 /* System V */
-! #define DEFAULT_PRINTER      "lpr -p -JNEWS"       /* bsd */
+! #include "m-i80386.h"
   
-  /*
-   * 	Define RESIZING to make nn understand dynamic window-resizing.
+  
+  /***************************** OWNERSHIP ***************************
 ***************
-*** 239,245 ****
+*** 263,269 ****
   
   #define BIN_DIRECTORY	"/usr/local/bin"
   #define LIB_DIRECTORY	"/usr/local/lib/nn"
@@ -96,7 +83,7 @@
   
   /**************************** DATABASE LOCATION **************************
    *
---- 239,245 ----
+--- 263,269 ----
   
   #define BIN_DIRECTORY	"/usr/local/bin"
   #define LIB_DIRECTORY	"/usr/local/lib/nn"
@@ -105,110 +92,106 @@
   /**************************** DATABASE LOCATION **************************
    *
 ***************
-*** 270,276 ****
+*** 294,300 ****
    *	     (The file system must support long file names!!)
    */
   
-! #define DB_DIRECTORY	"/usr/spool/nn"
+! /* #define DB_DIRECTORY	"/usr/spool/nn"	/* */
   
   
   /*************************** NEWS TRANSPORT **************************
---- 270,276 ----
+--- 294,300 ----
    *	     (The file system must support long file names!!)
    */
   
-! #define DB_DIRECTORY    "/var/spool/nn"
+! #define DB_DIRECTORY	"/var/spool/nn"	/* */
   
   
   /*************************** NEWS TRANSPORT **************************
 ***************
-*** 292,301 ****
+*** 316,323 ****
    *				  Default: NEWS_LIB_DIR/{rm,del}group
    */
   
-! #define NEWS_DIRECTORY		"/usr/spool/news"
-! #define NEWS_LIB_DIRECTORY	"/usr/lib/news"
+! /* #define NEWS_DIRECTORY	"/usr/spool/news"	/* */
+! /* #define NEWS_LIB_DIRECTORY	"/usr/lib/news"		/* */
+  /* #define INEWS_PATH		"/usr/lib/news/inews"	/* */
   
-! /* #define INEWS_PATH		"/usr/lib/news/inews"	*/
   
-  
-  /*
---- 292,301 ----
+--- 316,323 ----
    *				  Default: NEWS_LIB_DIR/{rm,del}group
    */
   
-! #define NEWS_DIRECTORY          "/var/news"
-! #define NEWS_LIB_DIRECTORY      "/usr/local/news/lib"
+! #define NEWS_DIRECTORY	"/var/news"	/* */
+! #define NEWS_LIB_DIRECTORY	"/usr/local/news/lib"		/* */
+  /* #define INEWS_PATH		"/usr/lib/news/inews"	/* */
   
-! /* #define INEWS_PATH           "/usr/local/news/lib/inews"   */
   
-  
-  /*
 ***************
-*** 317,323 ****
+*** 341,347 ****
    */
   
-  /* #define REC_MAIL	"/usr/lib/news/recmail"	*/	/* non-sendmail */
+  /* #define REC_MAIL	"/usr/lib/news/recmail"		/* non-sendmail */
 ! #define REC_MAIL	"/usr/lib/sendmail -t"		/* sendmail */
   
   
   /*
---- 317,323 ----
+--- 341,347 ----
    */
   
-  /* #define REC_MAIL	"/usr/lib/news/recmail"	*/	/* non-sendmail */
-! #define REC_MAIL        "/usr/sbin/sendmail -t"          /* sendmail */
+  /* #define REC_MAIL	"/usr/lib/news/recmail"		/* non-sendmail */
+! #define REC_MAIL	"/usr/sbin/sendmail -t"		/* sendmail */
   
   
   /*
 ***************
-*** 379,391 ****
+*** 403,415 ****
    *	DAEMON_MAN	- nnmaster
    */
   
-! #define USER_MAN_DIR 	"/usr/man/man1"
-  #define USER_MAN_SECTION 	"1"
+! #define USER_MAN_DIR	"/usr/man/man1"
+  #define USER_MAN_SECTION	"1"
   
-! #define SYS_MAN_DIR 	"/usr/man/man1"
-! #define SYS_MAN_SECTION 	"1m"
+! #define SYS_MAN_DIR	"/usr/man/man1"
+  #define SYS_MAN_SECTION		"1m"
   
-! #define DAEMON_MAN_DIR 	"/usr/man/man8"
-  #define DAEMON_MAN_SECTION 	"8"
+! #define DAEMON_MAN_DIR	"/usr/man/man8"
+  #define DAEMON_MAN_SECTION	"8"
   
   
---- 379,391 ----
+--- 403,415 ----
    *	DAEMON_MAN	- nnmaster
    */
   
-! #define USER_MAN_DIR    "/usr/local/man/man1"
-  #define USER_MAN_SECTION 	"1"
+! #define USER_MAN_DIR	"/usr/local/man/man1"
+  #define USER_MAN_SECTION	"1"
   
-! #define SYS_MAN_DIR     "/usr/local/man/man1"
-! #define SYS_MAN_SECTION         "1"
+! #define SYS_MAN_DIR	"/usr/local/man/man1"
+  #define SYS_MAN_SECTION		"1m"
   
-! #define DAEMON_MAN_DIR  "/usr/local/man/man8"
-  #define DAEMON_MAN_SECTION 	"8"
+! #define DAEMON_MAN_DIR	"/usr/local/man/man8"
+  #define DAEMON_MAN_SECTION	"8"
   
   
 ***************
-*** 445,451 ****
+*** 469,475 ****
    *	was accepted, whereas with INN, it only takes seconds.
    */
   
-! #define INEWS_IS_FAST		/* comment out for C-News */
+! #define INEWS_IS_FAST	/* comment out for C-News */
   
   /*
    *	Synchronous posting: If set this will cause NN to wait until a
---- 445,451 ----
+--- 469,475 ----
    *	was accepted, whereas with INN, it only takes seconds.
    */
   
-! /*#define INEWS_IS_FAST           /* comment out for C-News */
+! /*#define INEWS_IS_FAST*/	/* comment out for C-News */
   
   /*
    *	Synchronous posting: If set this will cause NN to wait until a
 ***************
-*** 457,463 ****
+*** 481,487 ****
    *	via some sort of NNTP.
    */
   
@@ -216,7 +199,7 @@
   
   /*
    *	PUT_TIMESTAMP_IN_SCRIPTS
---- 457,463 ----
+--- 481,487 ----
    *	via some sort of NNTP.
    */
   
@@ -224,22 +207,3 @@
   
   /*
    *	PUT_TIMESTAMP_IN_SCRIPTS
-*** inews/conf.h.orig	Thu Nov 25 12:29:01 1993
---- inews/conf.h	Sat Apr 15 04:57:55 1995
-***************
-*** 59,65 ****
-   *  DOMAIN as defined above).  If you don't want this, comment it out.
-   */
-  
-! #define	HIDDENNET
-  
-  /*
-   *  There are a number of ways that inews will try to figure out the
---- 59,65 ----
-   *  DOMAIN as defined above).  If you don't want this, comment it out.
-   */
-  
-! /* #define HIDDENNET */
-  
-  /*
-   *  There are a number of ways that inews will try to figure out the