Some fixes :-

 - add -DPOSIX to pico build so that it doesn't use the sgtty cruft.
 - clean freebsd-specific files too.
 - correctly specify wait() as taking an int, rather than configuring it
   for "union wait *" and adding patches to cast them to int's.
 - use POSIX counterparts for pine proper (signals, non-blocking, termios)
 - correct path to /usr/bin/passwd (not /bin/passwd)
 - revert 3-char identifier to "BSF" not "BSI" (originally, BSN = NetBSD,
   BSF=FreeBSD, BSI=BSDI)
 - use more usual paths for news files.  both cnews and inn* default to
   /var/news (usually), and the inn ports default to
   /usr/local/news/lib/active (cnews uses /usr/local/lib/news/active)
   None of our ports use /usr/spool/news or /usr/lib/news/active.

Partly Submitted by: Chris Timmons <skynyrd@opus.cts.cwu.edu>  (PR#1458)

3 files changed, 24 insertions, 9 deletions

diff --git a/mail/pine4/files/patch-ac b/mail/pine4/files/patch-ac
index 43691ed43edc..c51a4d300e21 100644
--- a/mail/pine4/files/patch-ac
+++ b/mail/pine4/files/patch-ac
@@ -253,7 +253,7 @@
 + #define SigType void     /* value returned by sig handlers is void */
 + /* #define SigType int      /* value returned by sig handlers is int */
 + 
-+ /* #define POSIX_SIGNALS    /* use POSIX signal semantics (ttyin.c) */
++ #define POSIX_SIGNALS    /* use POSIX signal semantics (ttyin.c) */
 + /* #define SYSV_SIGNALS    /* use System-V signal semantics (ttyin.c) */
 + 
 + 
@@ -272,8 +272,8 @@
 + 
 + 
 + /*-------------- fcntl flag to set non-blocking IO ---------------------*/
-+ /*#define	NON_BLOCKING_IO	O_NONBLOCK		/* POSIX style */
-+ #define	NON_BLOCKING_IO	FNDELAY		/* good ol' bsd style  */
++ #define	NON_BLOCKING_IO	O_NONBLOCK		/* POSIX style */
++ /* #define	NON_BLOCKING_IO	FNDELAY		/* good ol' bsd style  */
 + 
 + 
 + 
@@ -288,15 +288,15 @@
 +  */
 + 
 + /*--------- Good 'ol BSD -----------------------------------------------*/
-+ #include <sgtty.h>      /* BSD-based systems */
++ /* #include <sgtty.h>      /* BSD-based systems */
 + 
 + /*--------- System V terminal driver -----------------------------------*/
 + /* #define HAVE_TERMIO     /* this is for pure System V */
 + /* #include <termio.h>     /* Sys V */
 + 
 + /*--------- POSIX terminal driver --------------------------------------*/
-+ /* #define HAVE_TERMIOS    /* this is an alternative */
-+ /* #include <termios.h>    /* POSIX */
++ #define HAVE_TERMIOS    /* this is an alternative */
++ #include <termios.h>    /* POSIX */
 + 
 + 
 + 
@@ -311,7 +311,7 @@
 + 
 + 
 + /*-- What argument does wait(2) take? Define this if it is a union -----*/
-+ #define HAVE_WAIT_UNION  /* the arg to wait is a union wait * */
++ /* #define HAVE_WAIT_UNION  /* the arg to wait is a union wait * */
 + 
 + 
 + 
@@ -340,7 +340,7 @@
 + 
 + 
 + /*--------- Program employed by users to change their password ---------*/
-+ #define	PASSWD_PROG	"/bin/passwd"
++ #define	PASSWD_PROG	"/usr/bin/passwd"
 + 
 + 
 + /*-------------- A couple constants used to size arrays ----------------*/
diff --git a/mail/pine4/files/patch-af b/mail/pine4/files/patch-af
index 4fd5a6603d6a..96f632bd2e77 100644
--- a/mail/pine4/files/patch-af
+++ b/mail/pine4/files/patch-af
@@ -31,7 +31,7 @@
 + bsf:	# FreeBSD
 + 	$(MAKE) mtest OS=bsi EXTRADRIVERS="$(EXTRADRIVERS)" \
 + 		STDPROTO=bezerkproto MAILSPOOL=/var/mail \
-+ 		ACTIVEFILE=/usr/lib/news/active NEWSSPOOL=/usr/spool/news \
++ 		ACTIVEFILE=/usr/local/news/lib/active NEWSSPOOL=/var/news \
 + 		RSHPATH=/usr/bin/rsh CFLAGS="-O -pipe -DNFSKLUDGE $(EXTRACFLAGS)" \
 + 		LDFLAGS="-lcrypt"
 + 
diff --git a/mail/pine4/files/patch-an b/mail/pine4/files/patch-an
new file mode 100644
index 000000000000..77cf2a7b4d30
--- /dev/null
+++ b/mail/pine4/files/patch-an
@@ -0,0 +1,15 @@
+--- build.old	Fri Aug  9 15:37:20 1996
++++ build	Fri Aug  9 15:53:55 1996
+@@ -195,10 +195,10 @@
+ 	make clean
+         echo "Cleaning Pine"
+         cd $PHOME/pine
+-        make -f makefile.ult clean
++        make -f makefile.bsf clean
+         echo "Cleaning pico"
+         cd $PHOME/pico
+-        make $makeargs -f makefile.ult clean
++        make $makeargs -f makefile.bsf clean
+         echo "Done"
+         cd $PHOME
+         ;;