*** Makefile	Mon Aug 19 17:28:12 1996
--- Makefile.new	Mon Jul 20 11:20:01 1998
***************
*** 19,33 ****
  # Use /lib/cpp or /usr/ccs/lib/cpp for CPP on Solaris or SVR4 machines.
  
  CC =		cc
! #CPP =		$(CC) -E
! CPP =		/lib/cpp
! #CFLAGS =	-O2 # -g # -I/usr/local/lib/malloc-debug -DMALLOC_FUNC_CHECK
! CFLAGS =	-O
  #-Wall -Wcomment \
  #-Wtraditional -Wshadow \
  #-Wpointer-arith -Wcast-qual -Wcast-align -Wconversion \
  #-Waggregate-return -Wmissing-prototypes -Wnested-externs
! #LDFLAGS =	-s # -lmalloc # /usr/local/lib/malloc-debug/libmalloc.a
  MAKE =		make
  
  
--- 19,33 ----
  # Use /lib/cpp or /usr/ccs/lib/cpp for CPP on Solaris or SVR4 machines.
  
  CC =		cc
! CPP =		$(CC) -E
! #CPP =		/lib/cpp
! CFLAGS =	-O2 # -g # -I/usr/local/lib/malloc-debug -DMALLOC_FUNC_CHECK
! #CFLAGS =	-O
  #-Wall -Wcomment \
  #-Wtraditional -Wshadow \
  #-Wpointer-arith -Wcast-qual -Wcast-align -Wconversion \
  #-Waggregate-return -Wmissing-prototypes -Wnested-externs
! LDFLAGS =	-s # -lmalloc # /usr/local/lib/malloc-debug/libmalloc.a
  MAKE =		make
  
  
***************
*** 97,99 ****
--- 97,101 ----
  man/nn.1.D: man/nn.1
  	sh SPLITNN1
  
+ install:
+ 	./inst n
*** nntp.c	Tue Jul 14 07:21:36 1998
--- nntp.c.new	Mon Jul 20 11:16:11 1998
***************
*** 88,96 ****
--- 88,98 ----
  
  import int sys_nerr;
  #ifndef __NetBSD__
+ #ifndef __FreeBSD__
  #ifndef __linux__
  import char *sys_errlist[];
  #endif	/* __linux__ */
+ #endif  /* __FreeBSD__ */
  #endif	/* __NetBSD__ */
  extern void nn_exitmsg();
  extern void sys_error();
*** chset.c.orig	Fri Mar 12 08:35:13 1993
--- chset.c	Sat Apr 15 04:57:48 1995
***************
*** 18,23 ****
--- 18,24 ----
      "iso-8859-7",	8,
      "iso-8859-8",	8,
      "iso-8859-9",	8,
+     "koi8-r",           8,
      "unknown",		0,
      NULL,		0,
  };
*** inst.sh	Mon Sep 13 21:42:25 1993
--- inst.sh.new	Sat Apr 15 04:57:51 1995
***************
*** 1,8 ****
  
  # (Large) prefix inserted above by Make
  
! # BSD systems keep chown in /etc
! PATH="$PATH:/etc"
  
  case "$1" in
  mkdir)
--- 1,8 ----
  
  # (Large) prefix inserted above by Make
  
! # BSD systems keep chown in /usr/sbin
! PATH="$PATH:/usr/sbin"
  
  case "$1" in
  mkdir)
***************
*** 55,61 ****
  	;;
  esac
  
! set -u
  
  (
  if $NNTP
--- 55,61 ----
  	;;
  esac
  
! #set -u
  
  (
  if $NNTP
*** sort.c.orig	Wed Sep  1 01:06:25 1993
--- sort.c	Sat Apr 15 04:57:54 1995
***************
*** 43,48 ****
--- 43,71 ----
   *	before MATCH_?? (t, a, b) is used.
   */
  
+ #ifdef HAVE_WORKING_COLLATE
+ 
+ #ifdef HAVE_8BIT_CTYPE
+ #define MATCH_DROP(table, c) !isprint(c)
+ #else
+ #define MATCH_DROP(table, c) ( c & 0200 || !isprint(c) )
+ #endif
+ #define MATCH_EQ(table, a, b) ( a == b || table(a, b) == 0 )
+ #define MATCH_LS_EQ(table, a, b) ( a == b || table(a, b) <= 0 )
+ #define MATCH_LS(table, a, b) ( table(a, b) < 0 )
+ #define MATCH_CMP(table, a, b) table(a, b)
+ 
+ static int match_subject(a, b)
+ char a, b;
+ {
+ 	static char aa[2], bb[2];
+ 
+ 	aa[0] = a; bb[0] = b;
+ 	return strcoll(aa, bb);
+ }
+ 
+ #else
+ 
  #define	MATCH_DROP(table, c) ( c & 0200 || table[c] == 0 )
  #define MATCH_EQ(table, a, b) ( a == b || table[a] == table[b] )
  #define MATCH_LS_EQ(table, a, b) ( a <= b || table[a] <= table[b] )
***************
*** 77,82 ****
--- 100,106 ----
      26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 00, 00
  };
  
+ #endif /* HAVE_WORKING_COLLATE */
  
  static int
  order_subj_date(ah1, ah2)
