Update to 6.7.2.

PR:		ports/85833
Submitted by:	Nick Fishman <kwlogical@bellsouth.net>
Approved by:	jooji@nickelkid.com (maintainer, timeout 6 weeks)

6 files changed, 97 insertions, 104 deletions

diff --git a/news/nn/Makefile b/news/nn/Makefile
index 5871dc14bbe9..2c25769dc4a5 100644
--- a/news/nn/Makefile
+++ b/news/nn/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	nn
-PORTVERSION=	6.6.5
+PORTVERSION=	6.7.2
 CATEGORIES=	news
-MASTER_SITES=	ftp://ftp.nndev.org/pub/nn-6.6/%SUBDIR%/
+MASTER_SITES=	ftp://ftp.nndev.org/pub/nn-6.7/%SUBDIR%/
 MASTER_SITE_SUBDIR=	. old
 EXTRACT_SUFX=	.tar.Z
 
diff --git a/news/nn/distinfo b/news/nn/distinfo
index 97b308819da4..bdaac75dd9e2 100644
--- a/news/nn/distinfo
+++ b/news/nn/distinfo
@@ -1,2 +1,2 @@
-MD5 (nn-6.6.5.tar.Z) = 90761c1325a82a729f668e8a2c364845
-SIZE (nn-6.6.5.tar.Z) = 826135
+MD5 (nn-6.7.2.tar.Z) = 32f6dc07079bed6a2e49046949d8ff56
+SIZE (nn-6.7.2.tar.Z) = 688423
diff --git a/news/nn/files/patch-ab b/news/nn/files/patch-ab
index 100f27e2172c..549b58734934 100644
--- a/news/nn/files/patch-ab
+++ b/news/nn/files/patch-ab
@@ -1,10 +1,10 @@
---- chset.c.orig	Tue Jan 25 09:33:52 2000
-+++ chset.c	Wed Apr 28 17:47:59 2004
-@@ -18,6 +18,7 @@
-     "iso-8859-8",	8,
-     "iso-8859-9",	8,
-     "iso-8859-15",	8,
-+    "koi8-r",		8,
-     "unknown",		0,
-     NULL,		0,
+--- chset.c.orig	Wed Mar 30 13:34:27 2005
++++ chset.c	Sat Sep  3 13:53:19 2005
+@@ -22,6 +22,7 @@
+     "iso-8859-8", 8,
+     "iso-8859-9", 8,
+     "iso-8859-15", 8,
++    "koi8-r", 8,
+     "unknown", 0,
+     NULL, 0,
  };
diff --git a/news/nn/files/patch-ae b/news/nn/files/patch-ae
index 3765a00fed68..b73281174ba0 100644
--- a/news/nn/files/patch-ae
+++ b/news/nn/files/patch-ae
@@ -1,6 +1,6 @@
---- 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 @@
+--- config.h.unparsed.orig	Sat Sep  3 13:59:25 2005
++++ config.h.unparsed	Sat Sep  3 14:02:25 2005
+@@ -45,10 +45,10 @@
  #define DO_NOV_DIGEST
  
  /* Optional */
@@ -12,8 +12,8 @@
 +#define NOV_FILENAME		".overview"
  
  
- /*********************** NETWORK DEPENDENT DEFINITIONS **********************
-@@ -100,7 +100,9 @@
+ /********************************** NNTP *********************************
+@@ -68,7 +68,9 @@
   *	LIB_DIRECTORY defined below.
   */
  
@@ -23,8 +23,8 @@
 +#define DOMAIN_FILE	NNTP_DOMAIN
  
  /*
-  *	Define NNTP_PATH_HOSTNAME to force a specific hostname into the
-@@ -126,7 +128,7 @@
+  *  Define your local domain name.  If you leave this undefined, nn will
+@@ -84,7 +86,7 @@
   *  DOMAIN as defined above).  If you don't want this, comment it out.
   */
  
@@ -33,16 +33,16 @@
  
  
  /***************** OPERATING SYSTEM DEPENDENT DEFINITIONS *******************
-@@ -137,7 +139,7 @@
+@@ -95,7 +97,7 @@
   *	conf/s-template.h as a starting point for writing you own.
   */
  
 -#include "s-sunos5.h"
 +#include "s-freebsd.h"
  
- 
- /********************** MACHINE DEPENDENT DEFINITIONS **********************
-@@ -148,7 +150,7 @@
+ /*
+  *	Define DEFAULT_PAGER as the initial value of the 'pager' variable.
+@@ -122,7 +124,7 @@
   *	conf/m-template.h as a starting point for writing you own.
   */
  
@@ -50,8 +50,8 @@
 +#include "m-i80386.h"
  
  
- /**************************** LOCALIZATION ****************************
-@@ -181,9 +183,9 @@
+ /***************************** OWNERSHIP ***************************
+@@ -173,9 +175,9 @@
   *			   (= LIB_DIRECTORY/Log if undefined).
   */
  
@@ -62,29 +62,18 @@
 +#define LIB_DIRECTORY	"SUB_PREFIX/lib/nn"
 +#define TMP_DIRECTORY	"/var/tmp"
  
- /*************************** NEWS TRANSPORT **************************
+ /*************************** MAIL INTERFACE *************************
   *
-@@ -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 NEWS_DIRECTORY		"/var/news"
-+#define NEWS_LIB_DIRECTORY	"SUB_PREFIX/news/lib"
- 
- 
- /**************************** DATABASE LOCATION **************************
-@@ -257,7 +259,7 @@
+@@ -189,7 +191,7 @@
   */
  
  /* #define REC_MAIL	"/usr/lib/news/recmail"	*/	/* non-sendmail */
 -#define REC_MAIL	"/usr/lib/sendmail -t"		/* sendmail */
 +#define REC_MAIL	"/usr/sbin/sendmail -t"		/* sendmail */
  
- 
  /*
-@@ -317,13 +319,13 @@
+  *	nn needs to know the name of your host.
+@@ -237,13 +239,13 @@
   *	DAEMON_MAN	- nnmaster
   */
  
@@ -101,3 +90,13 @@
  #define DAEMON_MAN_SECTION	"8"
  
  
+@@ -425,7 +427,7 @@
+  *				  Default: NEWS_LIB_DIR/{rm,del}group
+  */
+ 
+-/* #define NEWS_DIRECTORY	"/usr/spool/news"	*/
+-/* #define NEWS_LIB_DIRECTORY	"/usr/lib/news"		*/
++#define NEWS_DIRECTORY	"/var/news"
++#define NEWS_LIB_DIRECTORY	"SUB_PREFIX/news/lib"
+ 
+ /************************ CONFIGURATION COMPLETED ************************/
diff --git a/news/nn/files/patch-an b/news/nn/files/patch-an
index e2de96cb87b7..07865ed6364f 100644
--- a/news/nn/files/patch-an
+++ b/news/nn/files/patch-an
@@ -1,22 +1,14 @@
---- nntp.c.orig	Sat Jan 25 00:10:39 2003
-+++ nntp.c	Wed Apr 28 17:47:59 2004
-@@ -39,6 +39,7 @@
- #include <errno.h>
- #include <pwd.h>
- #include <ctype.h>
-+#include <sys/param.h>
- 
- #ifdef NOV
- #include "hash.h"
-@@ -63,6 +64,7 @@
- static int	connect_server(void);
- static void debug_msg __APROTO((char *prefix, char *str));
- static void find_server __APROTO((void));
-+char *find_domain __APROTO((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));
-@@ -212,6 +214,50 @@
+--- nntp.c.orig	Tue Apr 19 18:06:51 2005
++++ nntp.c	Sat Sep  3 14:34:49 2005
+@@ -76,6 +76,7 @@
+ static int      connect_server(void);
+ static void     debug_msg(char *prefix, char *str);
+ static void     find_server(void);
++static char    *find_domain(const char *domainFile);
+ static int      get_server_line(char *string, int size);
+ static int      get_server(char *string, int size);
+ static int      get_socket(void);
+@@ -233,6 +234,50 @@
      sys_error("Failed to find name of NNTP server!");
  }
  
@@ -34,64 +26,64 @@
 + *	Side effects:	None.
 + */
 +
-+char *
-+find_domain(char *domainFile)
++static char *
++find_domain(const char *domainFile)
 +{
-+	register FILE	*fp;
-+	register char	*cp;
-+	static char	buf[MAXHOSTNAMELEN];
-+	char		*index();
-+
-+	if (domainFile == NULL)
-+		return (NULL);
++    register FILE  *fp;
++    register char  *cp;
++    static char     buf[MAXHOSTNAMELEN];
++    char           *index();
 +
-+	fp = fopen(domainFile, "r");
-+	if (fp == NULL)
-+		return (NULL);
++    if (domainFile == NULL)
++	return (NULL);
 +
-+	while (fgets(buf, sizeof (buf), fp) != NULL) {
-+		if (*buf == '\n' || *buf == '#')
-+			continue;
-+		cp = index(buf, '\n');
-+		if (cp)
-+			*cp = '\0';
-+		(void) fclose(fp);
-+		return (buf);
-+	}
++    fp = fopen(domainFile, "r");
++    if (fp == NULL)
++	return (NULL);
 +
++    while (fgets(buf, sizeof (buf), fp) != NULL) {
++	if (*buf == '\n' || *buf == '#')
++	    continue;
++	cp = index(buf, '\n');
++	if (cp)
++	    *cp = '\0';
 +	(void) fclose(fp);
-+	return (NULL);
++	return (buf);
++    }
++
++    (void) fclose(fp);
++    return (NULL);
 +}
 +
 +
  /*
   * get_server_line: get a line from the server.
   *
-@@ -1415,15 +1461,24 @@
- gen_frompath()
+@@ -1492,15 +1537,24 @@
+ gen_frompath(void)
  {
- 	struct	passwd *passwd;
-+	char	*domain;
-+	char	*fromFormat = "From: <%s@%s>\r\n";
+     struct passwd  *passwd;
++    char           *domain;
++    const char     *fromFormat = "From: <%s@%s>\r\n";
  
- 	passwd = getpwuid(getuid());
+     passwd = getpwuid(getuid());
  
- 	fprintf(nntp_out, "From: ");
- 	fprintf(nntp_out, "%s ", full_name());
+     fprintf(nntp_out, "From: ");
+     fprintf(nntp_out, "%s ", full_name());
  
--	fprintf(nntp_out, "<%s@%s>\r\n",
--		passwd->pw_name,
--		domain);
-+	domain = find_domain(DOMAIN_FILE);
-+	if (domain == NULL) {
-+		fprintf(nntp_out, fromFormat,
-+			passwd->pw_name,
-+			host_name);
-+	} else {
-+		fprintf(nntp_out, fromFormat,
-+			passwd->pw_name,
-+			domain);
-+	}
+-    fprintf(nntp_out, "<%s@%s>\r\n",
+-	    passwd->pw_name,
+-	    domain);
++    domain = find_domain(DOMAIN_FILE);
++    if (domain == NULL) {
++	fprintf(nntp_out, fromFormat,
++		passwd->pw_name,
++		host_name);
++    } else {
++	fprintf(nntp_out, fromFormat,
++		passwd->pw_name,
++		domain);
++    }
  
  #ifdef HIDDENNET
- 	/* Only the login name - nntp server will add uucp name */
+     /* Only the login name - nntp server will add uucp name */
diff --git a/news/nn/pkg-descr b/news/nn/pkg-descr
index 8d9dd6539c7f..5bc59572efe4 100644
--- a/news/nn/pkg-descr
+++ b/news/nn/pkg-descr
@@ -1,4 +1,6 @@
 No News is good news. This version of nn has NOV support.
 
+WWW: http://www.nndev.org/
+
 - Jasper O'Malley
   jooji@nickelkid.com