Upgrade, 2.6.1 -> 2.6.2.

Submitted by:	Noritaka Ishizumi <graphite@pepsi1.bekkoame.or.jp>

5 files changed, 79 insertions, 39 deletions

diff --git a/news/suck/Makefile b/news/suck/Makefile
index 679588c223d4..6f67c1289a86 100644
--- a/news/suck/Makefile
+++ b/news/suck/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	suck
-# Version required:	2.6.1
+# Version required:	2.6.2
 # Date created:		30 Mar 1996
 # Whom:			graphite@taurus.bekkoame.or.jp
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1996/03/31 23:19:18 asami Exp $
 #
 
-DISTNAME=	suck-2.6.1
+DISTNAME=	suck-2.6.2
 CATEGORIES+=	news
-MASTER_SITES=	ftp://sunsite.unc.edu/pub/Linux/system/Mail/news/ \
-		ftp://tsx-11.mit.edu/pub/linux/sources/sbin/
+MASTER_SITES=	ftp://tsx-11.mit.edu/pub/linux/sources/sbin/ \
+		ftp://ftp.iis.u-tokyo.ac.jp/pub2/Linux/sources/sbin/
 
 MAINTAINER=	graphite@taurus.bekkoame.or.jp
 
diff --git a/news/suck/distinfo b/news/suck/distinfo
index 23849c01ec0a..8a52aab14a3b 100644
--- a/news/suck/distinfo
+++ b/news/suck/distinfo
@@ -1 +1 @@
-MD5 (suck-2.6.1.tar.gz) = c4d1c70fdcc04de4cff2316ec0f010a3
+MD5 (suck-2.6.2.tar.gz) = e85997fff0da233a80764095770fa214
diff --git a/news/suck/files/patch-aa b/news/suck/files/patch-aa
index 37552780789e..a5a6fb727b45 100644
--- a/news/suck/files/patch-aa
+++ b/news/suck/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.orig	Mon Mar 11 15:11:45 1996
-+++ Makefile	Sat Mar 30 01:02:42 1996
+--- Makefile.orig	Sat Mar 30 06:01:40 1996
++++ Makefile	Fri Apr  5 22:50:49 1996
 @@ -5,15 +5,15 @@
  CC=gcc
  
@@ -22,16 +22,27 @@
  MAN_MODE=644			# mode for the man pages
  
  #XXGDB=1			# uncomment this to get it ready for use by xxgdb or gdb
-@@ -55,7 +55,7 @@
+@@ -27,8 +27,8 @@
+ #USE_INNDBZ=1	# if your DBZ routines are part of libinn.a, also check INN_ stuff
+ 
+ # If the INNDBZ stuff is not in the following locations, change this
+-INN_DBINC=-I/usr/src/inn/include
+-INN_LIBDIR=-L/usr/src/inn/lib
++INN_DBINC=-I${PORTSDIR}/news/inn/work/include
++INN_LIBDIR=-L${PORTSDIR}/news/inn/work/lib
+ INN_DBLIBS=-linn
+ 
+ #---------------DON'T TOUCH BELOW HERE--------------------------------------
+@@ -85,7 +85,7 @@
  LINK = $(CC)
- LIBS = -lm $(DBLIB)
- OPTS = $(CFLAGS) $(GCC_FLAGS) $(DVERSION) $(DBOPTION)
+ LIBS = -lm $(DBLIB) $(GPROFLIB)
+ OPTS = $(CFLAGS) $(GCC_FLAGS) $(DVERSION) $(DBOPTION) $(DBINC)
 -INSTALL = install
 +INSTALL = install -c
  
  MAN = ./man
  SAMPLE = ./sample
-@@ -92,13 +92,13 @@
+@@ -122,13 +122,13 @@
  
  installbin: $(TARGETS)
  	mkdir -p $(INSTALLDIR)	
@@ -47,8 +58,8 @@
  	- $(INSTALL) -o $(MAN_OWNER) -g $(MAN_GROUP) -m $(MAN_MODE) $(LPOST_MANPGS) $(MANDIR)
  	
  clean:
---- config.h.orig	Wed Mar  6 14:46:13 1996
-+++ config.h	Sat Mar 30 01:06:55 1996
+--- config.h.orig	Sat Mar 30 11:57:59 1996
++++ config.h	Fri Apr  5 22:56:24 1996
 @@ -12,6 +12,10 @@
  /* #define DEBUG2 */
  /* #define DEBUG3 */
@@ -58,10 +69,28 @@
 +#define _HAVE_PARAM_H
 +
  /*  TIMER Option */
- /* To see the approximate BPS while downloading msgs, uncomment this */
+ /* To see the approximate BPS while downloading articles, uncomment this */
  /* If you don't like it, or want a tiny speed increase, comment this out */
-@@ -61,7 +65,7 @@
- #define CHECK_HISTORY
+@@ -19,7 +23,7 @@
+ 
+ /* If you don't EVER plan to use the KILLFILE stuff, comment this out for a slight speed increase */
+ /* If you want to, or plan to, use the KILLFILE stuff, uncomment this */
+-/* #define KILLFILE */
++#define KILLFILE /**/
+ 
+ /* If you want the kill/keep file routine to keep articles that are both flagged as */
+ /* delete and keep (either by matching both a delete group and a keep group, or by not matching */
+@@ -44,7 +48,7 @@
+ /* as number of seconds before timeout 				   */
+ /* else, comment it out.  If you comment it out, if link goes down */
+ /* we'll just sit, twiddling our bits, until whenever.             */
+-#define TIMEOUT 30
++#define TIMEOUT 90
+ 
+ /* signal which will interrupt us DON'T USE SIGKILL OR SIGSTOP */
+ /* if you don't want to be able to abort, and a miniscule speed */
+@@ -66,7 +70,7 @@
+ #define CHECK_HISTORY_EXP
  
  /* don't comment this out */
 -#define HISTORY_FILE "/usr/lib/news/history"
@@ -69,7 +98,7 @@
  
  /* If your system doesn't like the lock file stuff in suck.c  */
  /* comment this out */
-@@ -101,10 +105,10 @@
+@@ -106,7 +110,7 @@
  #define RPOST_MAXARGS 128
  
  /* RNEWS program called by lpost */
diff --git a/news/suck/files/patch-ab b/news/suck/files/patch-ab
index ddbafd3efa84..b5795b733e2a 100644
--- a/news/suck/files/patch-ab
+++ b/news/suck/files/patch-ab
@@ -1,5 +1,5 @@
---- suck.c.orig	Wed Mar  6 14:58:34 1996
-+++ suck.c	Sat Mar 30 01:10:57 1996
+--- suck.c.orig	Sat Mar 30 11:27:51 1996
++++ suck.c	Fri Apr  5 23:01:42 1996
 @@ -11,6 +11,10 @@
  #include "suck.h"
  #include "suckutils.h"
@@ -11,7 +11,7 @@
  #ifdef KILLFILE
  #include "killfile.h"
  #endif
-@@ -501,7 +505,9 @@
+@@ -511,7 +515,9 @@
  			}
  #endif				
  		}
@@ -22,7 +22,7 @@
  	}
  #ifdef KILLFILE
  	free_killfile(killp);
-@@ -768,7 +774,11 @@
+@@ -783,7 +789,11 @@
  					}
  					if(retval == RETVAL_OK) {
  						/* first put #! rnews size */
@@ -35,7 +35,7 @@
  						/* use fread/fwrite in case lines are longer than MAXLINLEN */
  						while((i = fread(buf, 1, MAXLINLEN, fpin)) > 0) {
 --- suckutils.c.orig	Wed Mar  6 14:48:18 1996
-+++ suckutils.c	Sat Mar 30 01:12:01 1996
++++ suckutils.c	Fri Apr  5 23:01:42 1996
 @@ -13,6 +13,10 @@
  #include "both.h"
  #include "suckutils.h"
@@ -98,7 +98,7 @@
  		}
  		else {
 --- both.c.orig	Wed Mar  6 14:48:28 1996
-+++ both.c	Sat Mar 30 01:18:19 1996
++++ both.c	Fri Apr  5 23:01:42 1996
 @@ -12,6 +12,10 @@
  #include "config.h"
  #include "both.h"
diff --git a/news/suck/files/patch-ac b/news/suck/files/patch-ac
index 9e9f03667d97..8d1f6b14d131 100644
--- a/news/suck/files/patch-ac
+++ b/news/suck/files/patch-ac
@@ -1,40 +1,51 @@
---- sample/get.news.innxmit.orig	Thu Feb 15 15:05:38 1996
-+++ sample/get.news.innxmit	Thu Mar 28 21:03:59 1996
-@@ -7,13 +7,13 @@
+--- sample/get.news.innxmit.orig	Sat Mar 30 11:43:37 1996
++++ sample/get.news.innxmit	Fri Apr  5 23:24:47 1996
+@@ -7,13 +7,17 @@
  REMOTE_HOST=news.pixi.com
  LOCAL_HOST=localhost
  
 -SPOOLDIR=/usr/spool/news		# base directory for articles to be rposted
 -NEWSDIR=/usr/lib/news			# base directory for news binaries 
 -BINDIR=/home/boby/doNews		# base directory for suck rpost and scripts
-+SPOOLDIR=/var/spool/news		# base directory for articles to be rposted
++if [ -d /var/spool/news ] && [ ! -d /var/news ]; then
++	SPOOLDIR=/var/spool/news	# base directory for articles to be rposted
++else
++	SPOOLDIR=/var/news
++fi
 +NEWSDIR=/usr/local/news			# base directory for news binaries 
 +BINDIR=/usr/local/bin			# base directory for suck rpost and scripts
  
 -TMPDIR=${BINDIR}			# location for suck.* files
 -DATADIR=${BINDIR}			# location of sucknewsrc and killfile
--MSGDIR=${BINDIR}/Msgs			# where to put MultiFile messages when getting them
-+TMPDIR=/usr/local/etc			# location for suck.* files
+-MSGDIR=${BINDIR}/Msgs			# where to put MultiFile articles when getting them
++TMPDIR=/var/tmp			# location for suck.* files
 +DATADIR=/usr/local/etc			# location of sucknewsrc and killfile
-+MSGDIR=${TMPDIR}/Msgs			# where to put MultiFile messages when getting them
++MSGDIR=${TMPDIR}/Msgs			# where to put MultiFile articles when getting them
  
  BATCHFILE=${TMPDIR}/batch		# Name of batchfile to build for rnews or innxmit
  SITE=pixi				# name of site
---- sample/get.news.rnews.orig	Thu Feb 15 15:06:17 1996
-+++ sample/get.news.rnews	Thu Mar 28 21:03:47 1996
-@@ -10,11 +10,11 @@
+--- sample/get.news.rnews.orig	Sat Mar 30 11:44:28 1996
++++ sample/get.news.rnews	Fri Apr  5 23:32:48 1996
+@@ -8,13 +8,17 @@
+ REMOTE_HOST=news.pixi.com
+ LOCAL_HOST=localhost
  
- SPOOLDIR=/usr/spool/news		# base directory for articles to be rposted
+-SPOOLDIR=/usr/spool/news		# base directory for articles to be rposted
++if [ -d /var/spool/news ] && [ ! -d /var/news ]; then
++	SPOOLDIR=/var/spool/news	# base directory for articles to be rposted
++else
++	SPOOLDIR=/var/news
++fi
  NEWSDIR=/usr/lib/news			# base directory for news binaries 
 -BINDIR=/home/boby/doNews		# base directory for suck rpost and scripts
-+BINDIR=/usr/local/bin			# base directory for suck rpost and scripts
++BINDIR=/usr/local/bin		# base directory for suck rpost and scripts
  
 -TMPDIR=${BINDIR}			# location for suck.* files
 -DATADIR=${BINDIR}			# location of sucknewsrc and killfile
--MSGDIR=${BINDIR}/Msgs			# where to put MultiFile messages when getting them
-+TMPDIR=/usr/local/etc			# location for suck.* files
+-MSGDIR=${BINDIR}/Msgs			# where to put MultiFile articles when getting them
++TMPDIR=/var/tmp			# location for suck.* files
 +DATADIR=/usr/local/etc			# location of sucknewsrc and killfile
-+MSGDIR=${TMPDIR}/Msgs			# where to put MultiFile messages when getting them
++MSGDIR=${TMPDIR}/Msgs			# where to put MultiFile articles when getting them
  
  BATCHFILE=${TMPDIR}/batch		# Name of batchfile to build for rnews or innxmit
  OUTGOING=${SPOOLDIR}/out.going/pixi	# location of the list of articles to upload