Upgrade to version 2.12 and do some minor clean ups.

PR:		ports/5192 ports/5283
Submitted by:	dirk@net2.dinoex.sub.org

4 files changed, 46 insertions, 104 deletions

diff --git a/news/ifmail/Makefile b/news/ifmail/Makefile
index e4d23cc62cad..1dfb14775be1 100644
--- a/news/ifmail/Makefile
+++ b/news/ifmail/Makefile
@@ -1,18 +1,19 @@
 # New ports collection makefile for:    ifmail
-# Version required:     2.10
+# Version required:     2.12
 # Date created:         19 Feb 1997
 # Whom:                 dirk.meyer@dinoex.sub.org
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1997/11/16 04:57:24 fenner Exp $
 #
 
-DISTNAME=       ifmail-2.10
+DISTNAME=       ifmail-2.12
 CATEGORIES=	news
-MASTER_SITES=	ftp://tsx-11.mit.edu/pub/linux/sources/usr.bin/ \
-		${MASTER_SITE_SUNSITE} \
+MASTER_SITES=	${MASTER_SITE_SUNSITE} \
+		ftp://tsx-11.mit.edu/pub/linux/sources/usr.bin/ \
 		ftp://ftp.demos.su/unix/linux/source/fido/ \
-		ftp://net2.dinoex.sub.org/pub/approved/
-MASTER_SITE_SUBDIR=	system/Mail/transport/
+		ftp://ftp.average.org/ifmail/ \
+		ftp://ftp.dinoex.sub.de/pub/approved/
+MASTER_SITE_SUBDIR=	fido/mail/
 
 MAINTAINER=     dirk.meyer@dinoex.sub.org
 
diff --git a/news/ifmail/distinfo b/news/ifmail/distinfo
index 5adaaa3f12c5..efcac21ad299 100644
--- a/news/ifmail/distinfo
+++ b/news/ifmail/distinfo
@@ -1 +1 @@
-MD5 (ifmail-2.10.tar.gz) = 599fa7a22c96c8e6daa073e8ee142183
+MD5 (ifmail-2.12.tar.gz) = 0259f9139236506b41e103ddb9b88c79
diff --git a/news/ifmail/files/patch-CONFIG b/news/ifmail/files/patch-CONFIG
index 1f1a32037056..841e04ba588d 100644
--- a/news/ifmail/files/patch-CONFIG
+++ b/news/ifmail/files/patch-CONFIG
@@ -1,5 +1,5 @@
-*** CONFIG.orig	Sat Apr 26 01:44:17 1997
---- CONFIG	Sat Nov 15 20:28:40 1997
+*** CONFIG	Sat Sep 13 15:41:44 1997
+--- CONFIG.neu	Fri Dec  5 11:01:29 1997
 ***************
 *** 8,21 ****
   # Debug messages turned on by -x key are written here.
@@ -61,55 +61,59 @@
   # News spool directory (to check space only)
   #NEWSSPOOL   = "/usr/spool/news"
 ***************
-*** 138,155 ****
-  # (see below).
+*** 152,171 ****
+  # system, usually "-DINT32=long -DINT16=short"
   
-  # Linux:
+  # Linux/x86:  (add -DHAS_BSD_SIGNALS if you have glibc2 aka libc6.x)
 ! OPTS        = -DHAS_STATFS -DSTATFS_IN_VFS_H -DHAS_SETSID -DHAS_NDBM_H \
 ! 		-DDONT_HAVE_TM_GMTOFF -DHAS_TERMIOS_H -DASCII_LOCKFILES \
 ! 		-DHAS_FSYNC -DHAS_IOCTL_H -DHAS_REGEX_H -DHAS_TCP \
 ! 		-DFORCEINTL -DHAS_SYSLOG -DNEED_UUCPFROM -DNEED_BSY \
-! 		-DREGEX_NEED_CARET -DSLAVE_SENDS_NAK_TOO -DNEED_FORK
-! 
-! # 386BSD:
+! 		-DSLAVE_SENDS_NAK_TOO -DNEED_FORK \
+! 		-DINT32=long -DINT16=short
+  
+  # 386BSD:
 ! #OPTS        = -DHAS_STATFS -DSTATFS_IN_MOUNT_H -DHAS_SETSID -DHAS_NDBM_H \
 ! #		-DHAS_TERMIOS_H -DASCII_LOCKFILES -DHAS_FSYNC -DHAS_IOCTL_H \
 ! #		-DHAS_REGEX_H -DHAS_TCP -DHAS_SYSLOG -DNEED_UUCPFROM \
 ! #		-DNEED_BSY -DNEED_FORK -DNEGATIVE_SEEK_BUG \
-! #		-DREGEX_NEED_CARET -DHAS_SYS_ERRLIST
+! #		-DHAS_SYS_ERRLIST -DHAS_BSD_SIGNALS \
+! #		-DINT32=long -DINT16=short
   
   # SVR4:
   #OPTS        = -DHAS_STATVFS -DDONT_HAVE_TM_GMTOFF -DHAS_SETSID -DHAS_NDBM_H \
---- 138,155 ----
-  # (see below).
+--- 152,171 ----
+  # system, usually "-DINT32=long -DINT16=short"
   
-  # Linux:
+  # Linux/x86:  (add -DHAS_BSD_SIGNALS if you have glibc2 aka libc6.x)
 ! #OPTS        = -DHAS_STATFS -DSTATFS_IN_VFS_H -DHAS_SETSID -DHAS_NDBM_H \
 ! #		-DDONT_HAVE_TM_GMTOFF -DHAS_TERMIOS_H -DASCII_LOCKFILES \
 ! #		-DHAS_FSYNC -DHAS_IOCTL_H -DHAS_REGEX_H -DHAS_TCP \
 ! #		-DFORCEINTL -DHAS_SYSLOG -DNEED_UUCPFROM -DNEED_BSY \
-! #		-DREGEX_NEED_CARET -DSLAVE_SENDS_NAK_TOO -DNEED_FORK
-! 
-! # 386BSD,FreeBSD:
+! #		-DSLAVE_SENDS_NAK_TOO -DNEED_FORK \
+! #		-DINT32=long -DINT16=short
+  
+  # 386BSD:
 ! OPTS        = -DHAS_STATFS -DSTATFS_IN_MOUNT_H -DHAS_SETSID -DHAS_NDBM_H \
 ! 		-DHAS_TERMIOS_H -DASCII_LOCKFILES -DHAS_FSYNC -DHAS_IOCTL_H \
 ! 		-DHAS_REGEX_H -DHAS_TCP -DHAS_SYSLOG -DNEED_UUCPFROM \
 ! 		-DNEED_BSY -DNEED_FORK -DNEGATIVE_SEEK_BUG \
-! 		-DREGEX_NEED_CARET -DHAS_SYS_ERRLIST
+! 		-DHAS_SYS_ERRLIST -DHAS_BSD_SIGNALS \
+! 		-DINT32=long -DINT16=short
   
   # SVR4:
   #OPTS        = -DHAS_STATVFS -DDONT_HAVE_TM_GMTOFF -DHAS_SETSID -DHAS_NDBM_H \
 ***************
-*** 193,199 ****
-  #		-DREGEX_NEED_CARET -DDONT_HAVE_GETOPT
+*** 217,223 ****
+  #		-DNEED_BSY -DSLAVE_SENDS_NAK_TOO -DINT32=int -DINT16=short
   
   # for make install, where to put binaries and what owner to set
 ! BINDIR = /usr/lib/ifmail
   OWNER = ifmail
   GROUP = uucp
   MODE = 0711
---- 193,199 ----
-  #		-DREGEX_NEED_CARET -DDONT_HAVE_GETOPT
+--- 217,223 ----
+  #		-DNEED_BSY -DSLAVE_SENDS_NAK_TOO -DINT32=int -DINT16=short
   
   # for make install, where to put binaries and what owner to set
 ! BINDIR = ${PREFIX}/libexec/ifmail
@@ -117,7 +121,7 @@
   GROUP = uucp
   MODE = 0711
 ***************
-*** 213,219 ****
+*** 237,243 ****
   TAR = tar
   
   #CFLAGS = -g -Wall
@@ -125,7 +129,7 @@
   CFLAGS = -O2 -Wall
   # SVR4:
   #CFLAGS = -O -Xa
---- 213,219 ----
+--- 237,243 ----
   TAR = tar
   
   #CFLAGS = -g -Wall
@@ -134,7 +138,7 @@
   # SVR4:
   #CFLAGS = -O -Xa
 ***************
-*** 227,237 ****
+*** 254,264 ****
   # If you need TERM also add e.g. "/usr/src/term112/client.a"
   
   # Linux
@@ -146,7 +150,7 @@
   # SVR4
   #LIBS = -ldbm -lform -lnsl -lsocket -lc -L/usr/ucblib -lucb
   # SCO
---- 227,239 ----
+--- 254,266 ----
   # If you need TERM also add e.g. "/usr/src/term112/client.a"
   
   # Linux
@@ -161,7 +165,7 @@
   #LIBS = -ldbm -lform -lnsl -lsocket -lc -L/usr/ucblib -lucb
   # SCO
 ***************
-*** 248,254 ****
+*** 275,281 ****
   # What programs are absent at your system?
   #NEEDED = strcasestr.o strncasecmp.o strcasecmp.o rename.o mkdir.o usleep.o \
   #		regexpr.o
@@ -169,7 +173,7 @@
   NEEDED =
   # SVR4
   #NEEDED = regexpr.o
---- 250,256 ----
+--- 277,283 ----
   # What programs are absent at your system?
   #NEEDED = strcasestr.o strncasecmp.o strcasecmp.o rename.o mkdir.o usleep.o \
   #		regexpr.o
diff --git a/news/ifmail/pkg-descr b/news/ifmail/pkg-descr
index 3cbd049fe635..ab01728b37a5 100644
--- a/news/ifmail/pkg-descr
+++ b/news/ifmail/pkg-descr
@@ -1,73 +1,10 @@
-
-Begin3
-~Title:		ifmail - FidoNet(tm) support package for UN*X platform
-Version:	2.7
-Entered-date:	06NOV94
-Description:	FidoNet(tm) transport and gateway for UN*X platform.
-		Delivers Fidonet mail packets over telephone lines
-		and TCP/IP connections; converts Fidonet net- and
-		echomail to RFC-822/RFC-1036 compliant mail and news
-		and vice versa.  In cooperation with MTA and netnews
-		packages allows to run a FidoNet node (or point) on
-		a UN*X machine.
-Keywords:	fidonet,netmail,echomail,mail,news,gateway
-Author:		crosser@pccross.msk.su (Eugene Crosser)
-Maintained-by:	crosser@pccross.msk.su (Eugene Crosser)
-Primary-site:	tsx-11.mit.edu /pub/linux/sources/usr.bin
-		220Kb ifmail-2.7.tar.gz
-Alternate-site:	sunsite.unc.edu /pub/Linux/system/Mail/transport
-Alternate-site:	ftp.demos.su /unix/linux/source/fido
-Platform:	Linux, *BSD, SunOS, SCO, ISC, some others
-Copying-policy:	Free
-End
-
-Copyright (c) 1993, 1994 by Eugene G. Crosser
-
-This is a README file for ifmail - another Internet/FidoNet gateway and
-transport package.
-
-You may do virtually what you wish with this software, as long as the
-explicit reference to its original author is retained:
-
-Eugene G. Crosser <crosser@pccross.msk.su>, 2:5020/230@FidoNet
-
-THIS SOFTWARE IS PROVIDED AS IS AND COME WITH NO WARRANTY OF ANY KIND,
-EITHER EXPRESSED OR IMPLIED.  IN NO EVENT WILL THE COPYRIGHT HOLDER BE
-LIABLE FOR ANY DAMAGES RESULTING FROM THE USE OF THIS SOFTWARE.
-
-This is freeware.  Except for the modules taken from the other packages,
-(which may be subject to different distributing policy), you may use
-this software for any purpose, commercial or noncommercial, including
-even selling it, without paying anything.  Though, if you are willing to
-support my efforts, your contribution will be appreciated.  Contact me
-by e-mail.
-
-The package consists of two major parts: ifgate (gateway programs,
-analog of FidoNet tosser/packer), and ifcico (transport agent, analog of
-FidoNet mailer), each in its own subdirectory.  Routines common to these
-programs are in the iflib subdirectory.  In the top-level subdirectory
-are: README (this file), CONFIG (your system configuration definition)
-and top-level Makefile.  There is also a "misc" subdirectory with
-examples of configuration, some useful scripts, FAQ list etc.
-
-Each of the subdirectories (ifgate, ifcico, iflib and misc) contains its
-own README file, refer to them for more technical details.
-
-To install the package, edit the CONFIG file to match your configuration
-and run "make" and (if you are satisfied) "make install".
-
-Currently, the package should be considered BETA, use it on your own
-risk.
-
-There is a mailing list for ifmail-related discussions.  To subscribe,
-send mail to: <ifmail-request@fidogate.nuars.nwu.edu> (this is a live
-person, not a listserv program).  It is supposed that it will carry
-latest updates in addition to discussions, so you may wish to subscribe,
-to be on the bleeding edge.  Special thanks to H. Peter Anvin for
-maintaining this list.
-
-Eugene G. Crosser <crosser@pccross.msk.su>; 2:5020/230@fidonet
-Voice: +7 095 212 5274; Moscow, Russia
+FidoNet(tm) transport and gateway for UN*X platform.
+Delivers Fidonet mail packets over telephone lines
+and TCP/IP connections; converts Fidonet net- and
+echomail to RFC-822/RFC-1036 compliant mail and news
+and vice versa.  In cooperation with MTA and netnews
+packages allows to run a FidoNet node (or point) on
+a UN*X machine.
 
 - Dirk Meyer (patches & port)
 dirk.meyer@dinoex.sub.org