upgrade to 6.6.2

PR:		32698
Submitted by:	maintainer

13 files changed, 123 insertions, 276 deletions

diff --git a/news/nn/Makefile b/news/nn/Makefile
index 97bb05076b15..03ae8d712c5e 100644
--- a/news/nn/Makefile
+++ b/news/nn/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	nn
-PORTVERSION=	6.5.6
+PORTVERSION=	6.6.2
 CATEGORIES=	news
-MASTER_SITES=	ftp://ftp.visi.com/users/mtpins/nn/
+MASTER_SITES=	ftp://ftp.nndev.org/pub/nn-6.6/
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	jooji@nickelkid.com
diff --git a/news/nn/distinfo b/news/nn/distinfo
index 84f84b34ce59..3aecf3bfea38 100644
--- a/news/nn/distinfo
+++ b/news/nn/distinfo
@@ -1 +1 @@
-MD5 (nn-6.5.6.tar.Z) = bddfb9b412edee10853b9d855c56d2b1
+MD5 (nn-6.6.2.tar.Z) = 527cb8fb6410170bd53d09c2767329ac
diff --git a/news/nn/files/patch-ac b/news/nn/files/patch-ac
index ecb7fd3c76e7..16e02be4e247 100644
--- a/news/nn/files/patch-ac
+++ b/news/nn/files/patch-ac
@@ -1,5 +1,5 @@
---- inst.sh.orig	Thu Jan 27 02:36:07 2000
-+++ inst.sh	Thu Jan 27 02:29:51 2000
+--- inst.sh.orig	Thu Dec  6 19:52:24 2001
++++ inst.sh	Thu Dec  6 19:53:23 2001
 @@ -1,8 +1,8 @@
  
  # (Large) prefix inserted above by Make
@@ -11,16 +11,7 @@
  
  case "$1" in
  mkdir)
-@@ -55,7 +55,7 @@
- 	;;
- esac
- 
--set -u
-+#set -u
- 
- (
- if $NNTP
-@@ -89,8 +89,8 @@
+@@ -83,8 +83,8 @@
  if [ -s ErrorCheck ]
  then
  	cat ErrorCheck
@@ -31,24 +22,3 @@
  fi
  rm -f ErrorCheck
  
-@@ -188,7 +188,7 @@
- 	OPT=master
- 	;;
- n)
--	OPT="bin aux help online man"
-+	OPT="bin aux help online man inews"
- 	;;
- 2|c)
- 	OPT=bin
-@@ -357,6 +357,11 @@
- 		fi
- 	done
- 	;;
-+
-+inews)
-+	cd inews/ && make install || exit 1
-+	;;
-+
- 
- online)
- 	./inst mkdir $HELP 755 || exit 1
diff --git a/news/nn/files/patch-ae b/news/nn/files/patch-ae
index a089b0cbeeea..3765a00fed68 100644
--- a/news/nn/files/patch-ae
+++ b/news/nn/files/patch-ae
@@ -1,6 +1,6 @@
---- config.h.unparsed.orig	Wed Jan 26 23:16:25 2000
-+++ config.h.unparsed	Thu Jan 27 01:23:30 2000
-@@ -51,10 +51,10 @@
+--- config.h.unparsed.orig	Fri Dec  7 06:33:23 2001
++++ config.h.unparsed	Fri Dec  7 06:37:30 2001
+@@ -46,10 +46,10 @@
  #define DO_NOV_DIGEST
  
  /* Optional */
@@ -13,35 +13,45 @@
  
  
  /*********************** NETWORK DEPENDENT DEFINITIONS **********************
-@@ -107,7 +107,8 @@
-  *	NOTE: If you plan to use the included inews, it MUST be a full pathname
+@@ -100,7 +100,9 @@
+  *	LIB_DIRECTORY defined below.
   */
  
 -#define NNTP_SERVER	"/usr/local/lib/nntp_server"
 +#define NNTP_SERVER	"SUB_PREFIX/etc/nntp_server"
 +#define NNTP_DOMAIN	"SUB_PREFIX/etc/nntp_domain"
++#define DOMAIN_FILE	NNTP_DOMAIN
  
  /*
-  *	Define NNTP_POST if you want nn to reject attempts to post via
-@@ -149,7 +150,7 @@
+  *	Define NNTP_PATH_HOSTNAME to force a specific hostname into the
+@@ -126,7 +128,7 @@
+  *  DOMAIN as defined above).  If you don't want this, comment it out.
+  */
+ 
+-#define HIDDENNET
++/* #define HIDDENNET */
+ 
+ 
+ /***************** OPERATING SYSTEM DEPENDENT DEFINITIONS *******************
+@@ -137,7 +139,7 @@
   *	conf/s-template.h as a starting point for writing you own.
   */
  
--#include "s-hpux9-0.h"
+-#include "s-sunos5.h"
 +#include "s-freebsd.h"
  
- /*
-  *	Define DEFAULT_PAGER as the initial value of the 'pager' variable.
-@@ -210,7 +211,7 @@
+ 
+ /********************** MACHINE DEPENDENT DEFINITIONS **********************
+@@ -148,7 +150,7 @@
   *	conf/m-template.h as a starting point for writing you own.
   */
  
--#include "m-hp9000.h"
+-#include "m-sparc.h"
 +#include "m-i80386.h"
  
  
- /***************************** OWNERSHIP ***************************
-@@ -261,9 +262,9 @@
+ /**************************** LOCALIZATION ****************************
+@@ -181,9 +183,9 @@
   *			   (= LIB_DIRECTORY/Log if undefined).
   */
  
@@ -52,31 +62,20 @@
 +#define LIB_DIRECTORY	"SUB_PREFIX/lib/nn"
 +#define TMP_DIRECTORY	"/var/tmp"
  
- /**************************** DATABASE LOCATION **************************
-  *
-@@ -294,7 +295,7 @@
-  *	     (The file system must support long file names!!)
-  */
- 
--/* #define DB_DIRECTORY	"/usr/spool/nn"	*/
-+#define DB_DIRECTORY	"/var/spool/nn"
- 
- 
  /*************************** NEWS TRANSPORT **************************
-@@ -316,9 +317,9 @@
+  *
+@@ -201,8 +203,8 @@
   *				  Default: NEWS_LIB_DIR/{rm,del}group
   */
  
 -/* #define NEWS_DIRECTORY	"/usr/spool/news"	*/
 -/* #define NEWS_LIB_DIRECTORY	"/usr/lib/news"		*/
--/* #define INEWS_PATH		"/usr/lib/news/inews"	*/
-+#define NEWS_DIRECTORY	"/var/news"
++#define NEWS_DIRECTORY		"/var/news"
 +#define NEWS_LIB_DIRECTORY	"SUB_PREFIX/news/lib"
-+#define INEWS_PATH		"SUB_PREFIX/bin/nn-inews"
  
  
- /*
-@@ -341,7 +342,7 @@
+ /**************************** DATABASE LOCATION **************************
+@@ -257,7 +259,7 @@
   */
  
  /* #define REC_MAIL	"/usr/lib/news/recmail"	*/	/* non-sendmail */
@@ -85,7 +84,7 @@
  
  
  /*
-@@ -403,13 +404,13 @@
+@@ -317,13 +319,13 @@
   *	DAEMON_MAN	- nnmaster
   */
  
@@ -102,21 +101,3 @@
  #define DAEMON_MAN_SECTION	"8"
  
  
-@@ -469,7 +470,7 @@
-  *	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
-@@ -481,7 +482,7 @@
-  *	via some sort of NNTP.
-  */
- 
--#define SYNCHRONOUS_POSTING	/* comment out for C-News */
-+/* #define SYNCHRONOUS_POSTING	/* comment out for C-News */
- 
- /*
-  *	PUT_TIMESTAMP_IN_SCRIPTS
diff --git a/news/nn/files/patch-ag b/news/nn/files/patch-ag
index a83bb1181b23..e70892a81922 100644
--- a/news/nn/files/patch-ag
+++ b/news/nn/files/patch-ag
@@ -1,11 +1,11 @@
---- Makefile.orig	Sat Jun  5 00:07:14 1999
-+++ Makefile	Sat Mar  4 08:43:28 2000
+--- Makefile.orig	Thu Dec  6 19:56:18 2001
++++ Makefile	Thu Dec  6 19:57:58 2001
 @@ -22,12 +22,12 @@
  CPP =		$(CC) -E
  #CPP =		/lib/cpp
  #CFLAGS =	-O2 # -g # -I/usr/local/lib/malloc-debug -DMALLOC_FUNC_CHECK
--CFLAGS =	-O
-+#CFLAGS =	-O
+-CFLAGS =	-O # -g -Wall -ansi -pedantic
++#CFLAGS =	-O # -g -Wall -ansi -pedantic
  #-Wall -Wcomment \
  #-Wtraditional -Wshadow \
  #-Wpointer-arith -Wcast-qual -Wcast-align -Wconversion \
@@ -15,16 +15,7 @@
  MAKE =		make
  
  
-@@ -36,6 +36,8 @@
- all: ymakefile
- 	$(MAKE) $(MFLAGS) -f ymakefile all
- 
-+inews: ymakefile
-+	$(MAKE) $(MFLAGS) -f ymakefile inews
- touch: ymakefile
- 	$(MAKE) -f ymakefile -t all
- 
-@@ -97,3 +99,5 @@
+@@ -97,3 +97,5 @@
  man/nn.1.D: man/nn.1
  	sh SPLITNN1
  
diff --git a/news/nn/files/patch-ah b/news/nn/files/patch-ah
deleted file mode 100644
index 8517cfcd3cc2..000000000000
--- a/news/nn/files/patch-ah
+++ /dev/null
@@ -1,29 +0,0 @@
---- nn.c.orig	Fri Jul 17 08:32:08 1998
-+++ nn.c	Fri Apr 16 01:41:04 1999
-@@ -394,7 +394,7 @@
-     fl;
-     mode = 0;
- 
--    if (gets(answer1)) {
-+    if (fgets(answer1, sizeof(answer1), stdin)) {
- 	if (strncmp(answer1, "auto", 4) == 0) {
- 	    tprintf("\nUPDATING .newsrc FILE....");
- 	    fl;
-@@ -437,7 +437,7 @@
- 	       (long)(gh->last_db_article - gh->last_article));
- 	fl;
- 
--	if (gets(answer1) == NULL || s_keyboard)
-+	if (fgets(answer1, sizeof(answer1), stdin) == NULL || s_keyboard)
- 	    *answer1 = 'q';
- 
- 	switch (*answer1) {
-@@ -446,7 +446,7 @@
- 	    tputc(NL);
- 	    tprintf("Update rest? (yn) n\b");
- 	    fl;
--	    if (gets(answer1) == NULL || *answer1 != 'y')
-+	    if (fgets(answer1, sizeof(answer1), stdin) == NULL || *answer1 != 'y')
- 		return;
- 
- 	    mode = -1;
diff --git a/news/nn/files/patch-ai b/news/nn/files/patch-ai
deleted file mode 100644
index c43820079f3b..000000000000
--- a/news/nn/files/patch-ai
+++ /dev/null
@@ -1,8 +0,0 @@
---- inews/version.c.orig	Sat Apr 29 01:34:47 1995
-+++ inews/version.c	Fri Jan 28 15:53:13 2000
-@@ -2,4 +2,4 @@
-  * Provide the version number of this release.
-  */
- 
--char	nntp_version[] = "1.5.8 (11 March 90)";
-+char	nntp_version[] = "1.5.8.MINI (MINI-INEWS)";
diff --git a/news/nn/files/patch-aj b/news/nn/files/patch-aj
index 0f222a00bdad..24e10f298d4f 100644
--- a/news/nn/files/patch-aj
+++ b/news/nn/files/patch-aj
@@ -1,27 +1,11 @@
---- xmakefile.orig	Wed Jan 26 12:30:07 2000
-+++ xmakefile	Wed Jan 26 12:47:18 2000
-@@ -103,12 +103,15 @@
- MAIL = nnmail.o reroute.o hostname.o global.o options.o
- 
- 
--all:	$(BIN_PROG) $(LIB_PROG) $(MASTER_PROG) inst
-+all:	$(BIN_PROG) $(LIB_PROG) $(MASTER_PROG) inst inews
- 
- client: $(BIN_PROG) $(LIB_PROG) inst
- 
- master: $(MASTER_PROG) inst
- 
-+inews::
-+	@cd inews && $(MAKE) all
-+
- nn:	PARALLEL $(NN) $(NOVOBJ)
- 	@echo linking nn
- 	@$(CC) -o nn $(CFLAGS) $(NN) $(NOVOBJ) $(LDFLAGS) TERMLIB NNTP_EXTRA_LIB
-@@ -195,6 +198,7 @@
- 	rm -f $(BIN_PROG) $(LIB_PROG) $(MASTER_PROG) cvt-help usercheck
- 	rm -f prefix mkprefix inst
- 	rm -f man/nn.1 man/nn.1~
-+	cd inews && $(MAKE) clean
- 
+--- xmakefile.orig	Fri Dec  7 07:06:27 2001
++++ xmakefile	Fri Dec  7 07:06:38 2001
+@@ -65,7 +65,7 @@
+ * Notice:  ymakefile is made from xmakefile by the Makefile.
  *
- * dependencies
+ 
+-#ifndef DOMAIN
++#ifndef DOMAIN_FILE
+ CC = YOU_BLEW_IT READ_THE_INSTRUCTIONS_AGAIN
+ #else
+ CC =	 COMPILER
diff --git a/news/nn/files/patch-ak b/news/nn/files/patch-ak
deleted file mode 100644
index 5992a34934a9..000000000000
--- a/news/nn/files/patch-ak
+++ /dev/null
@@ -1,27 +0,0 @@
---- inews/conf.h.orig	Sat Apr 29 01:34:46 1995
-+++ inews/conf.h	Fri Jan 28 15:04:03 2000
-@@ -30,6 +30,7 @@
- #define	NNINEWSCONF_H
- 
- #include	"config.h"
-+#include	<sys/param.h>
- 
- #ifndef NNTP
- /* WHY DO YOU WANT TO MAKE MINI-INEWS WHEN YOU DONT USE NNTP */
-@@ -59,7 +60,7 @@
-  *  DOMAIN as defined above).  If you don't want this, comment it out.
-  */
- 
--#define	HIDDENNET
-+/* #define	HIDDENNET */
- 
- /*
-  *  There are a number of ways that inews will try to figure out the
-@@ -92,6 +93,7 @@
-  */
- 
- #define	SERVER_FILE	NNTP_SERVER
-+#define DOMAIN_FILE	NNTP_DOMAIN
- 
- /*
-  *	Reverse engineering (nn got this the other way around)....
diff --git a/news/nn/files/patch-al b/news/nn/files/patch-al
deleted file mode 100644
index 0a4e66cf1ceb..000000000000
--- a/news/nn/files/patch-al
+++ /dev/null
@@ -1,39 +0,0 @@
---- inews/inews.c.orig	Tue Jan 25 13:42:08 2000
-+++ inews/inews.c	Wed Jan 26 11:16:19 2000
-@@ -32,7 +32,7 @@
- 
- extern	FILE	*ser_wr_fp;
- 
--char	host_name[256];
-+char	host_name[MAXHOSTNAMELEN];
- 
- main(argc, argv)
- int	argc;
-@@ -248,6 +248,8 @@
- 	char	*cp;
- 	struct	passwd *passwd;
- 	char	*index(), *getenv();
-+	char	*getdomainbyfile();
-+	char	*domain;
- 
- 	passwd = getpwuid(getuid());
- 
-@@ -279,9 +281,15 @@
- 			DOMAIN);
- #endif /* HIDDENNET */
- #else
--	fprintf(ser_wr_fp, "From: %s@%s (",
--		passwd->pw_name,
--		host_name);
-+	domain = getdomainbyfile(DOMAIN_FILE);
-+	if (domain == NULL)
-+		fprintf(ser_wr_fp, "From: %s@%s (",
-+			passwd->pw_name,
-+			host_name);
-+	else
-+		fprintf(ser_wr_fp, "From: %s@%s (",
-+			passwd->pw_name,
-+			domain);
- #endif
- 
- 	for (cp = full_name; *cp != '\0'; ++cp)
diff --git a/news/nn/files/patch-am b/news/nn/files/patch-am
deleted file mode 100644
index cbaaaf307b4e..000000000000
--- a/news/nn/files/patch-am
+++ /dev/null
@@ -1,10 +0,0 @@
---- inews/clientlib.h.orig	Wed Jan 26 10:50:26 2000
-+++ inews/clientlib.h	Wed Jan 26 10:50:44 2000
-@@ -5,6 +5,7 @@
-  */
- 
- extern	char	*getserverbyfile();
-+extern	char	*getdomainbyfile();
- extern	int	server_init();
- extern	void	put_server();
- extern	int	get_server();
diff --git a/news/nn/files/patch-an b/news/nn/files/patch-an
index 61b09e682045..409d93cf7816 100644
--- a/news/nn/files/patch-an
+++ b/news/nn/files/patch-an
@@ -1,20 +1,26 @@
---- inews/clientlib.c.orig	Wed Jan 26 10:17:34 2000
-+++ inews/clientlib.c	Wed Jan 26 10:37:27 2000
-@@ -76,7 +76,7 @@
- {
- 	register FILE	*fp;
- 	register char	*cp;
--	static char	buf[256];
-+	static char	buf[MAXHOSTNAMELEN];
- 	char		*index();
- 	char		*getenv();
- 	char		*strcpy();
-@@ -107,6 +107,48 @@
- 	return (NULL);			 /* No entry */
+--- nntp.c.orig	Tue Oct  9 11:39:11 2001
++++ nntp.c	Fri Dec  7 07:10:29 2001
+@@ -37,6 +37,7 @@
+ #include <errno.h>
+ #include <pwd.h>
+ #include <ctype.h>
++#include <sys/param.h>
+ 
+ #ifdef NOV
+ #include "hash.h"
+@@ -88,6 +89,7 @@
+ static void debug_msg __APROTO((char *prefix, char *str));
+ static void io_error __APROTO((void));
+ static void find_server __APROTO((void));
++char * find_domain(char *domainFile);
+ static int get_server_line __APROTO((char *string, int size));
+ static int get_server __APROTO((char *string, int size));
+ static int get_socket __APROTO((void));
+@@ -319,6 +321,49 @@
  }
  
-+/*
-+ * getdomainbyfile	Get the domain name for posting from a named file.
+ /*
++ * find_domain		Get the domain name for posting from a named file.
 + *			Handle blank lines and comments.
 + *
 + *	Parameters:	"file" is the name of the file to read.
@@ -27,18 +33,18 @@
 + */
 +
 +char *
-+getdomainbyfile(file)
-+char	*file;
++find_domain(domainFile)
++char	*domainFile;
 +{
 +	register FILE	*fp;
 +	register char	*cp;
 +	static char	buf[MAXHOSTNAMELEN];
 +	char		*index();
 +
-+	if (file == NULL)
++	if (domainFile == NULL)
 +		return (NULL);
 +
-+	fp = fopen(file, "r");
++	fp = fopen(domainFile, "r");
 +	if (fp == NULL)
 +		return (NULL);
 +
@@ -55,15 +61,44 @@
 +	(void) fclose(fp);
 +	return (NULL);
 +}
++
++/*
+  * get_server_line: get a line from the server.
+  *
+  *	Expects to be connected to the server.
+@@ -1726,7 +1771,7 @@
+  * Phil Lapsley <phil@ucbvax.berkeley.edu>
+  */
+ 
+-static char    host_name[256];
++static char    host_name[MAXHOSTNAMELEN];
  
  /*
-  * server_init  Get a connection to the remote news server.
-@@ -211,7 +253,7 @@
-                static struct hostent def;
-                static struct in_addr defaddr;
-                static char *alist[1];
--               static char namebuf[ 256 ];
-+               static char namebuf[MAXHOSTNAMELEN];
-                defaddr.s_addr = inet_addr( machine );
-                if( defaddr.s_addr != -1 ) {
-                        strcpy( namebuf, machine );
+  * gen_frompath -- generate From: and Path: lines, in the form
+@@ -1745,6 +1790,7 @@
+ #ifndef HIDDENNET
+ 	char	*cp;
+ #endif
++	char	*domain;
+ 
+ 	fprintf(nntp_out, "From: ");
+ 	passwd = getpwuid(getuid());
+@@ -1772,9 +1818,15 @@
+ 			DOMAIN);
+ #endif /* HIDDENNET */
+ #else
+-	fprintf(nntp_out, "<%s@%s>\r\n",
+-		passwd->pw_name,
+-		host_name);
++	domain = find_domain(DOMAIN_FILE);
++	if (domain == NULL)
++		fprintf(nntp_out, "From: <%s@%s>\r\n",
++			passwd->pw_name,
++			host_name);
++	else
++		fprintf(nntp_out, "From: <%s@%s>\r\n",
++			passwd->pw_name,
++			domain);
+ #endif
+ 
+ #ifdef HIDDENNET
diff --git a/news/nn/pkg-plist b/news/nn/pkg-plist
index dcff0687e2af..ca9486ef858e 100644
--- a/news/nn/pkg-plist
+++ b/news/nn/pkg-plist
@@ -1,16 +1,15 @@
 bin/nn
-bin/nnadmin
-bin/nnbatch
+bin/nnusage
+bin/nngrab
+bin/nnstats
 bin/nncheck
+bin/nnadmin
+bin/nntidy
 bin/nngoback
-bin/nngrab
 bin/nngrep
 bin/nnpost
-bin/nnstats
-bin/nntidy
-bin/nnusage
+bin/nnbatch
 bin/nnview
-bin/nn-inews
 @unexec if cmp -s %D/etc/nntp_domain %D/etc/nntp_domain.dist; then rm -f %D/etc/nntp_domain; fi
 etc/nntp_domain.dist
 @exec [ -f %B/nntp_domain ] || cp %B/%f %B/nntp_domain
@@ -18,8 +17,8 @@ etc/nntp_domain.dist
 etc/nntp_server.dist
 @exec [ -f %B/nntp_server ] || cp %B/%f %B/nntp_server
 lib/nn/aux
+lib/nn/upgrade_rc
 lib/nn/conf
-lib/nn/help/Manual
 lib/nn/help/adm.upgrade1
 lib/nn/help/adm.upgrade2
 lib/nn/help/adm.upgrade3
@@ -37,6 +36,6 @@ lib/nn/help/help.set
 lib/nn/help/help.show
 lib/nn/help/help.sort
 lib/nn/help/help.variables
-lib/nn/upgrade_rc
+lib/nn/help/Manual
 @dirrm lib/nn/help
 @dirrm lib/nn