svn commit: r363168 - in head/comms: bforce/files bluegps bluegps/files bpl+ bpl+/files conserver/files gkermit/files mgetty+sendfax/files minicom/files mlan3/files p5-Device-SerialPort/files seyon...

Adam Weinberger adamw at FreeBSD.org
Mon Jul 28 14:54:14 UTC 2014 

Author: adamw
Date: Mon Jul 28 14:54:09 2014
New Revision: 363168
URL: http://svnweb.freebsd.org/changeset/ports/363168
QAT: https://qat.redports.org/buildarchive/r363168/

Log:
  Rename comms/ patch-xy patches to reflect the files they modify.

Added:
  head/comms/bforce/files/patch-case-breaks
     - copied unchanged from r363137, head/comms/bforce/files/patch-ab
  head/comms/bforce/files/patch-configure
     - copied unchanged from r363137, head/comms/bforce/files/patch-aa
  head/comms/bluegps/files/patch-bluegps.1
     - copied unchanged from r363137, head/comms/bluegps/files/patch-aa
  head/comms/bluegps/files/patch-bluegps.c
     - copied unchanged from r363137, head/comms/bluegps/files/patch-ab
  head/comms/bpl+/files/patch-bplexec.c_1
     - copied unchanged from r363137, head/comms/bpl+/files/patch-ab
  head/comms/bpl+/files/patch-bplexec.c_2
     - copied unchanged from r363137, head/comms/bpl+/files/patch-bplexec.c
  head/comms/bpl+/files/patch-machine.h
     - copied unchanged from r363137, head/comms/bpl+/files/patch-aa
  head/comms/conserver/files/patch-etc_conserver_consent.c
     - copied unchanged from r363137, head/comms/conserver/files/patch-ad
  head/comms/conserver/files/patch-etc_conserver_console.m
     - copied unchanged from r363137, head/comms/conserver/files/patch-af
  head/comms/conserver/files/patch-etc_conserver_group.c_1
     - copied unchanged from r363137, head/comms/conserver/files/patch-ac
  head/comms/conserver/files/patch-etc_conserver_group.c_2
     - copied unchanged from r363137, head/comms/conserver/files/patch-etc_conserver_group.c
  head/comms/conserver/files/patch-etc_conserver_master.c
     - copied unchanged from r363137, head/comms/conserver/files/patch-etc-conserver-master.c
  head/comms/gkermit/files/patch-Makefile
     - copied unchanged from r363137, head/comms/gkermit/files/patch-aa
  head/comms/mgetty+sendfax/files/patch-Makefile
     - copied unchanged from r363137, head/comms/mgetty+sendfax/files/patch-ab
  head/comms/mgetty+sendfax/files/patch-doc_Makefile
     - copied unchanged from r363137, head/comms/mgetty+sendfax/files/patch-ad
  head/comms/mgetty+sendfax/files/patch-fax_faxspool.in
     - copied unchanged from r363137, head/comms/mgetty+sendfax/files/patch-aa
  head/comms/mgetty+sendfax/files/patch-voice_Makefile
     - copied unchanged from r363137, head/comms/mgetty+sendfax/files/patch-ac
  head/comms/mgetty+sendfax/files/patch-voice_libvoice_signal.c
     - copied unchanged from r363137, head/comms/mgetty+sendfax/files/patch-v
  head/comms/minicom/files/patch-src-updown.c
     - copied unchanged from r363137, head/comms/minicom/files/patch-ac
  head/comms/minicom/files/patch-src-window.c
     - copied unchanged from r363137, head/comms/minicom/files/patch-af
  head/comms/mlan3/files/patch-Makefiles
     - copied unchanged from r363137, head/comms/mlan3/files/patch-aa
  head/comms/p5-Device-SerialPort/files/patch-Makefile.PL
     - copied unchanged from r363137, head/comms/p5-Device-SerialPort/files/patch-aa
  head/comms/seyon/files/patch-FreeBSD-specific-fixes
     - copied unchanged from r363137, head/comms/seyon/files/patch-aa
  head/comms/seyon/files/patch-Imakefile
     - copied unchanged from r363137, head/comms/seyon/files/patch-ad
  head/comms/seyon/files/patch-SeDecl.h
     - copied unchanged from r363137, head/comms/seyon/files/patch-ac
  head/comms/seyon/files/patch-SePort.c
     - copied unchanged from r363137, head/comms/seyon/files/patch-ab
  head/comms/sredird/files/patch-README
     - copied unchanged from r363137, head/comms/sredird/files/patch-ab
  head/comms/sredird/files/patch-sredird.c
     - copied unchanged from r363137, head/comms/sredird/files/patch-aa
  head/comms/tkhylafax/files/patch-Makefile
     - copied unchanged from r363137, head/comms/tkhylafax/files/patch-aa
  head/comms/tkhylafax/files/patch-faxIt.t
     - copied unchanged from r363137, head/comms/tkhylafax/files/patch-ab
  head/comms/yaps/files/patch-Config
     - copied unchanged from r363137, head/comms/yaps/files/patch-aa
  head/comms/yaps/files/patch-config.h
     - copied unchanged from r363137, head/comms/yaps/files/patch-ab
  head/comms/yaps/files/patch-tty.c
     - copied unchanged from r363137, head/comms/yaps/files/patch-ad
  head/comms/yaps/files/patch-valid.c
     - copied unchanged from r363137, head/comms/yaps/files/patch-ac
  head/comms/yaps/files/patch-yaps.rc
     - copied unchanged from r363137, head/comms/yaps/files/patch-ae
  head/comms/zssh/files/patch-zssh.h
     - copied unchanged from r363137, head/comms/zssh/files/patch-aa
Deleted:
  head/comms/bforce/files/patch-aa
  head/comms/bforce/files/patch-ab
  head/comms/bluegps/files/patch-aa
  head/comms/bluegps/files/patch-ab
  head/comms/bpl+/files/patch-aa
  head/comms/bpl+/files/patch-ab
  head/comms/bpl+/files/patch-bplexec.c
  head/comms/conserver/files/patch-ac
  head/comms/conserver/files/patch-ad
  head/comms/conserver/files/patch-af
  head/comms/conserver/files/patch-etc-conserver-master.c
  head/comms/conserver/files/patch-etc_conserver_group.c
  head/comms/gkermit/files/patch-aa
  head/comms/mgetty+sendfax/files/patch-aa
  head/comms/mgetty+sendfax/files/patch-ab
  head/comms/mgetty+sendfax/files/patch-ac
  head/comms/mgetty+sendfax/files/patch-ad
  head/comms/mgetty+sendfax/files/patch-v
  head/comms/minicom/files/patch-ac
  head/comms/minicom/files/patch-af
  head/comms/mlan3/files/patch-aa
  head/comms/p5-Device-SerialPort/files/patch-aa
  head/comms/seyon/files/patch-aa
  head/comms/seyon/files/patch-ab
  head/comms/seyon/files/patch-ac
  head/comms/seyon/files/patch-ad
  head/comms/sredird/files/patch-aa
  head/comms/sredird/files/patch-ab
  head/comms/tkhylafax/files/patch-aa
  head/comms/tkhylafax/files/patch-ab
  head/comms/yaps/files/patch-aa
  head/comms/yaps/files/patch-ab
  head/comms/yaps/files/patch-ac
  head/comms/yaps/files/patch-ad
  head/comms/yaps/files/patch-ae
  head/comms/zssh/files/patch-aa
Modified:
  head/comms/bluegps/Makefile
  head/comms/bpl+/Makefile

Copied: head/comms/bforce/files/patch-case-breaks (from r363137, head/comms/bforce/files/patch-ab)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/bforce/files/patch-case-breaks	Mon Jul 28 14:54:09 2014	(r363168, copy of r363137, head/comms/bforce/files/patch-ab)
@@ -0,0 +1,88 @@
+--- bforce/prot_binkp.c.orig	Mon Mar 12 02:40:52 2001
++++ bforce/prot_binkp.c	Fri Aug 13 12:06:26 2004
+@@ -181,6 +181,7 @@
+ 
+ 		default:
+ 			/* Avoid warnings */
++			break;
+ 		}
+ 		
+ 		/*
+@@ -318,6 +319,7 @@
+ 
+ 		default:
+ 			/* Avoid warnings */
++			break;
+ 		}
+ 		
+ 		/*
+--- bforce/prot_yoohoo.c.orig	Mon Mar 12 02:40:53 2001
++++ bforce/prot_yoohoo.c	Fri Aug 13 12:09:34 2004
+@@ -514,7 +514,7 @@
+ 		case PROT_ZEDZAP: local_data->capabilities |= YOOHOO_ZEDZAP; break;
+ 		case PROT_JANUS:  local_data->capabilities |= YOOHOO_JANUS;  break;
+ 		case PROT_HYDRA:  local_data->capabilities |= YOOHOO_HYDRA;  break;
+-		default:          /* Avoid warnings */
++		default: break;          /* Avoid warnings */
+ 		}
+ 	}
+ 	
+--- bforce/prot_zmrecv.c.orig	Thu Feb  8 04:09:25 2001
++++ bforce/prot_zmrecv.c	Fri Aug 13 12:08:47 2004
+@@ -244,6 +244,7 @@
+ 			break;
+ 			
+ 		default: /* Ignore */
++			break;
+ 		} /* end of switch(rxstate) */
+ 		
+ 		
+@@ -266,7 +267,7 @@
+ 				switch(rxstate) {
+ 				case ZRX_INITACK: rxstate = ZRX_INIT;     break;
+ 				case ZRX_RPOSACK: rxstate = ZRX_SENDRPOS; break;
+-				default:
++				default: break;
+ 				}
+ 				break;
+ 				
+@@ -356,7 +357,7 @@
+ 				switch(rxstate) {
+ 				case ZRX_INITACK: rxstate = ZRX_INIT;      break;
+ 				case ZRX_RPOSACK: rxstate = ZRX_SENDRPOS;  break;
+-				default:
++				default: break;
+ 				}
+ 				break;
+ 				
+--- bforce/prot_zmsend.c.orig	Thu Feb  8 04:09:26 2001
++++ bforce/prot_zmsend.c	Fri Aug 13 12:09:13 2004
+@@ -414,7 +414,7 @@
+ 				case ZTX_CRCQACK:   txstate = ZTX_STARTDATA; break;
+ 				case ZTX_EOFACK:    txstate = ZTX_EOF;       break;
+ 				case ZTX_FINACK:    txstate = ZTX_FIN;       break;
+-				default:
++				default: break;
+ 				}
+ 				break;
+ 				
+@@ -634,7 +634,7 @@
+ 				case ZTX_FINFOACK:  txstate = ZTX_FINFO;  break;
+ 				case ZTX_EOFACK:    txstate = ZTX_EOF;    break;
+ 				case ZTX_FINACK:    txstate = ZTX_FIN;    break;
+-				default:
++				default: break;
+ 				}
+ 				break;
+ 				
+--- include/prot_zmodem.h.orig	Sun Apr 23 00:05:16 2000
++++ include/prot_zmodem.h	Fri Aug 13 12:07:18 2004
+@@ -201,7 +201,7 @@
+ extern char Z_Attn[ZATTNLEN+1];	/* Attention string rx sends to tx on err    */
+ extern int Z_Ctlesc;		/* Encode control characters                 */
+ extern int Z_Lastsent;		/* Character we sent last                    */
+-//extern int Z_Dirzap;		/* Direct ZedZap (don't escape XON/XOFF)     */
++/*extern int Z_Dirzap;*/	/* Direct ZedZap (don't escape XON/XOFF)     */
+ 
+ /* ------------------------------------------------------------------------- */
+ /* Z-Modem primitives (look p_zmmisc.c for them)                             */

Copied: head/comms/bforce/files/patch-configure (from r363137, head/comms/bforce/files/patch-aa)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/bforce/files/patch-configure	Mon Jul 28 14:54:09 2014	(r363168, copy of r363137, head/comms/bforce/files/patch-aa)
@@ -0,0 +1,25 @@
+--- configure.orig	Sun Nov 12 21:19:24 2000
++++ configure	Fri Nov 14 20:26:09 2003
+@@ -746,10 +746,10 @@
+ #
+ echo $ac_n "checking "UUCP lock files directory"""... $ac_c" 1>&6
+ echo "configure:749: checking "UUCP lock files directory"" >&5
+-if test -d /var/lock ; then
+-	lockdir=/var/lock/
+-elif test -d /var/spool/lock ; then
++if test -d /var/spool/lock ; then
+ 	lockdir=/var/spool/lock/
++elif test -d /var/lock ; then
++	lockdir=/var/lock/
+ else
+ 	lockdir=/var/lock/
+ fi
+@@ -759,7 +759,7 @@
+ 
+ echo "$ac_t"""$lockdir"" 1>&6
+ 
+-for ac_prog in 'bison -y' byacc
++for ac_prog in byacc 'bison -y'
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2

Modified: head/comms/bluegps/Makefile
==============================================================================
--- head/comms/bluegps/Makefile	Mon Jul 28 14:53:11 2014	(r363167)
+++ head/comms/bluegps/Makefile	Mon Jul 28 14:54:09 2014	(r363168)
@@ -5,11 +5,11 @@ PORTNAME=	bluegps-linux
 PORTVERSION=	2.0
 CATEGORIES=	comms
 MASTER_SITES=	http://www.harbaum.org/till/bluegps/
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	dirkx at webweaving.org
 COMMENT=	Command line tool to download datalogs from the Royaltek RBT-3000 bluetooth GPS receiver
 
+USES=		tar:tgz
 PLIST_FILES=	bin/bluegps man/man1/bluegps.1.gz
 
 .include <bsd.port.mk>

Copied: head/comms/bluegps/files/patch-bluegps.1 (from r363137, head/comms/bluegps/files/patch-aa)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/bluegps/files/patch-bluegps.1	Mon Jul 28 14:54:09 2014	(r363168, copy of r363137, head/comms/bluegps/files/patch-aa)
@@ -0,0 +1,35 @@
+--- bluegps.1  2006-06-04 13:41:03.000000000 +0200
++++ bluegps.1  2007-07-29 18:53:13.000000000 +0200
+@@ -14,8 +14,9 @@
+ .LP
+ The bluetooth address (bdaddr) of the RBT-3000 to be used has to 
+ be specified on the command line. This bluetooth address can e.g. 
+-be determined using the \fBhcitool(1)\fP command.
+-
++be determined using the \fBhcitool(1)\fP command (linux). Or 
++alternatively use the friendly name. (freebsd, see
++\fBbluetooth.hosts(5)\fP).
+ .SH OPTIONS
+ .TP
+ .BI \-d " filename" 
+@@ -112,6 +113,13 @@
+ bluegps -d testlog.nmea 00:02:C7:00:11:22
+ .RE
+ .LP
++On freebsd; if there is an entry in /etc/bluetooth/hosts you can
++also use:
++.LP
++.RS +4
++bluegps -d testlog.nmea BlueGPS
++.RE
++.LP
+ If the GPS has been setup to use the password 1234 use the following 
+ command:
+ .LP
+@@ -130,4 +138,5 @@
+ accompanies each copy of \fIbluegps\fP.
+ .SH AUTHORS
+ Till Harbaum <Till at Harbaum.org>,
+-Simon Budig <simon at budig.de>
++Simon Budig <simon at budig.de> and
++some minor changes for FreeBSD by Dirk-Willem van Gulik <dirkx at webweaving.org>.

Copied: head/comms/bluegps/files/patch-bluegps.c (from r363137, head/comms/bluegps/files/patch-ab)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/bluegps/files/patch-bluegps.c	Mon Jul 28 14:54:09 2014	(r363168, copy of r363137, head/comms/bluegps/files/patch-ab)
@@ -0,0 +1,74 @@
+--- bluegps.c  2006-06-26 20:28:31.000000000 +0200
++++ bluegps.c  2007-07-29 18:54:17.000000000 +0200
+@@ -27,10 +27,21 @@
+ #include <stdarg.h>
+ #include <ctype.h>
+ 
++#ifdef __FreeBSD__
++#include <string.h>
++#include <sys/types.h>
++#include <sys/socket.h>
++#else
+ #include <netinet/ip.h>
++#endif
+ 
++
++#ifdef __FreeBSD__
++#include <bluetooth.h>
++#else
+ #include <bluetooth/bluetooth.h>
+ #include <bluetooth/rfcomm.h>
++#endif
+ 
+ #include "rbt3000.h"
+ 
+@@ -269,19 +280,44 @@
+ int
+ rbt3000_connect (char *device_addr)
+ {
+-
++#ifdef __FreeBSD__
++  struct sockaddr_rfcomm rem_addr;
++  struct hostent * he;
++
++  memset(&rem_addr, 0, sizeof(rem_addr));
++  rem_addr.rfcomm_len = sizeof(rem_addr);
++  rem_addr.rfcomm_family = AF_BLUETOOTH;
++  rem_addr.rfcomm_channel = RFCOMM_CHANNEL;
++
++  if ((he = bt_gethostbyname(device_addr))) {
++      context->device = *(bdaddr_t *) he->h_addr_list[0];
++      if (context->messages == MSG_VERBOSE) 
++              printf("Actual BT address for '%s': %s\n",
++                      device_addr, bt_ntoa(&(context->device),NULL));
++  } else
++  if (!bt_aton(device_addr, &context->device)) {
++      perror("No such device address");
++      return 0;
++  }
++  rem_addr.rfcomm_bdaddr = context->device;
++#else 
+   struct sockaddr_rc rem_addr;
+ 
+-  baswap (&context->device, strtoba (device_addr));
+-
+   rem_addr.rc_family  = AF_BLUETOOTH;
+-  rem_addr.rc_bdaddr  = context->device;
+   rem_addr.rc_channel = RFCOMM_CHANNEL;
++  baswap (&context->device, strtoba (device_addr));
++  rem_addr.rc_bdaddr  = context->device;
++#endif
+ 
+   /* bluez connects to BlueClient */
+   if ((context->device_fd = socket (PF_BLUETOOTH,
+                                     SOCK_STREAM,
+-                                    BTPROTO_RFCOMM)) < 0 )
++#ifdef __FreeBSD__
++                                  BLUETOOTH_PROTO_RFCOMM
++#else
++                                    BTPROTO_RFCOMM
++#endif
++              )) < 0 )
+     {
+       perror ("Can't create socket");
+       return 0;

Modified: head/comms/bpl+/Makefile
==============================================================================
--- head/comms/bpl+/Makefile	Mon Jul 28 14:53:11 2014	(r363167)
+++ head/comms/bpl+/Makefile	Mon Jul 28 14:54:09 2014	(r363168)
@@ -16,6 +16,6 @@ PLIST_FILES=	bin/bp bin/bpl
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bpl ${STAGEDIR}${PREFIX}/bin
-	(cd ${STAGEDIR}${PREFIX}/bin; ${LN} -sf bpl bp)
+	${LN} -sf bpl ${STAGEDIR}${PREFIX}/bin/bp
 
 .include <bsd.port.mk>

Copied: head/comms/bpl+/files/patch-bplexec.c_1 (from r363137, head/comms/bpl+/files/patch-ab)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/bpl+/files/patch-bplexec.c_1	Mon Jul 28 14:54:09 2014	(r363168, copy of r363137, head/comms/bpl+/files/patch-ab)
@@ -0,0 +1,11 @@
+--- bplexec.c.orig	Fri Feb 10 02:25:34 1995
++++ bplexec.c	Tue Feb  3 23:54:32 1998
+@@ -34,7 +34,7 @@
+ extern void hms(UCHAR *s);
+ extern void ldecout(ULONG l);
+ 
+-#ifdef SUN
++#if 0 /*ifdef SUN*/
+ extern int fclose(FILE *stream);
+ extern int fflush(FILE *stream);
+ extern int fseek(FILE *stream, long int offset, int origin);

Copied: head/comms/bpl+/files/patch-bplexec.c_2 (from r363137, head/comms/bpl+/files/patch-bplexec.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/bpl+/files/patch-bplexec.c_2	Mon Jul 28 14:54:09 2014	(r363168, copy of r363137, head/comms/bpl+/files/patch-bplexec.c)
@@ -0,0 +1,50 @@
+--- bplexec.c.orig	Thu Feb  9 17:25:34 1995
++++ bplexec.c	Wed Nov 15 20:45:53 2000
+@@ -17,6 +17,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <stdlib.h>
++#include <errno.h>
+ 
+ #include "bpl.h"
+ #include "machine.h"
+@@ -1096,7 +1097,7 @@
+ 
+ 	fname_w_index = strlen(fname_work);
+ 	if (copy_body(s)) { /* ƒtƒ@ƒCƒ‹–¼ˆÙí */
+-		strcpy(fname_work, tmpnam(NULL));
++		strcpy(fname_work, "/tmp/bpl.XXXXXXXXXX");
+ 	}
+ 
+ 	my_free(real_filename);
+@@ -1118,16 +1119,19 @@
+ 	FILE *fp;
+ 	UCHAR *my_tmp;
+ 	char *tmp;
++	int fd;
+ 
+-	tmp = tmpnam(NULL);
++	tmp = "/tmp/bpl.XXXXXXXXXX";
+ 	my_tmp = (UCHAR *) malloc(strlen(tmp) + 1);
+ 	if (my_tmp == NULL)
+ 		return NULL;
+ 	strcpy(my_tmp, tmp);
+ 
+-	fp = fopen(tmp, "wb");
+-	if (fp == NULL) {
++	if ((fd = mkstemp(my_tmp)) == -1 ||
++            (fp = fdopen(fd, "wb")) == NULL ) {
++		fprintf(stderr, "%s: %s\n", my_tmp, strerror(errno));
+ 		free(my_tmp);
++		return NULL;
+ 	} else {
+ 		/* ƒfƒBƒŒƒNƒgƒŠ‚Í current ‚ðŽg‚¤ */
+ 		strwarn(STR_CANT_CREATE_L); /* uƒtƒ@ƒCƒ‹‚ªì¬‚Å‚«‚È‚¢‚̂Łv */
+@@ -1136,6 +1140,7 @@
+ 		strwarn(STR_CANT_CREATE_R);
+ 		my_free(real_filename);
+ 		real_filename = my_tmp;
++		close(fd);
+ 	}
+ 	return fp;
+ }

Copied: head/comms/bpl+/files/patch-machine.h (from r363137, head/comms/bpl+/files/patch-aa)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/bpl+/files/patch-machine.h	Mon Jul 28 14:54:09 2014	(r363168, copy of r363137, head/comms/bpl+/files/patch-aa)
@@ -0,0 +1,8 @@
+--- machine.h.orig	Wed Oct 12 07:19:52 1994
++++ machine.h	Tue Feb  3 23:50:25 1998
+@@ -11,4 +11,4 @@
+  *	PC88VA		PC-88VA
+  */
+ 
+-#define Sun
++#define SUN

Copied: head/comms/conserver/files/patch-etc_conserver_consent.c (from r363137, head/comms/conserver/files/patch-ad)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/conserver/files/patch-etc_conserver_consent.c	Mon Jul 28 14:54:09 2014	(r363168, copy of r363137, head/comms/conserver/files/patch-ad)
@@ -0,0 +1,34 @@
+--- etc/conserver/consent.c.orig	Wed Nov 17 18:10:14 1999
++++ etc/conserver/consent.c	Wed Nov 17 18:12:57 1999
+@@ -295,7 +295,7 @@
+ 	 */
+ 	termp.c_iflag = IXON|IXOFF|BRKINT;
+ 	termp.c_oflag = 0;
+-	termp.c_cflag = CREAD;
++	termp.c_cflag = CREAD | (termp.c_cflag & (CLOCAL|CRTSCTS));
+ 	termp.c_cflag |= pCE->pparity->iset;
+ 	termp.c_lflag = 0;
+ 	/*
+@@ -303,7 +303,7 @@
+ 	 * Set the VTIME == 1 (0.1 sec)
+ 	 * Don't bother with the control characters as they are not used
+ 	 */
+-	termp.c_cc[VMIN] = 128;
++	termp.c_cc[VMIN] = 1;
+ 	termp.c_cc[VTIME] = 1;
+ 
+ 	if (-1 == cfsetospeed(&termp,pCE->pbaud->irate)) {
+@@ -563,11 +563,10 @@
+ 		exit(1);
+ 	}
+ #endif
+-	n_tios.c_iflag &= ~(IGNCR|IUCLC);
++	n_tios.c_iflag &= ~(IGNCR);
+ 	n_tios.c_iflag |= ICRNL|IXON|IXANY;
+-	n_tios.c_oflag &= ~(OLCUC|ONOCR|ONLRET|OFILL|NLDLY|CRDLY|TABDLY|BSDLY);
+ 	n_tios.c_oflag |= OPOST|ONLCR;
+-	n_tios.c_lflag &= ~(XCASE|NOFLSH|ECHOK|ECHONL);
++	n_tios.c_lflag &= ~(NOFLSH|ECHOK|ECHONL);
+ 	n_tios.c_lflag |= ISIG|ICANON|ECHO;
+ 	n_tios.c_cc[VEOF] = '\004';
+ 	n_tios.c_cc[VEOL] = '\000';

Copied: head/comms/conserver/files/patch-etc_conserver_console.m (from r363137, head/comms/conserver/files/patch-af)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/conserver/files/patch-etc_conserver_console.m	Mon Jul 28 14:54:09 2014	(r363168, copy of r363137, head/comms/conserver/files/patch-af)
@@ -0,0 +1,57 @@
+--- etc/console/console.m.orig	2000-08-02 11:39:42.000000000 -0700
++++ etc/console/console.m	2007-09-12 09:30:56.000000000 -0700
+@@ -582,17 +582,17 @@
+ 		return;
+ 
+ #if USE_TERMIOS
+-	if (0 != ioctl(0, TCGETS, & o_tios)) {
++	if (0 != tcgetattr(0, & o_tios)) {
+ 		fprintf(stderr, "%s: iotcl: getsw: %s\n", progname, strerror(errno));
+ 		exit(10);
+ 	}
+ 	n_tios = o_tios;
+-	n_tios.c_iflag &= ~(INLCR|IGNCR|ICRNL|IUCLC|IXON);
++	n_tios.c_iflag &= ~(INLCR|IGNCR|ICRNL|IXON);
+ 	n_tios.c_oflag &= ~OPOST;
+ 	n_tios.c_lflag &= ~(ICANON|ISIG|ECHO);
+ 	n_tios.c_cc[VMIN] = 1;
+ 	n_tios.c_cc[VTIME] = 0;
+-	if (0 != ioctl(0, TCSETS, & n_tios)) {
++	if (0 != tcsetattr(0, TCSANOW, & n_tios)) {
+ 		fprintf(stderr, "%s: getarrt: %s\n", progname, strerror(errno));
+ 		exit(10);
+ 	}
+@@ -668,7 +668,7 @@
+ 	if (!screwy)
+ 		return;
+ #if USE_TERMIOS
+-	(void)ioctl(0, TCSETS, (char *)&o_tios);
++	(void)tcsetattr(0, TCSANOW, &o_tios);
+ #else
+ #if USE_TERMIO
+ 	(void)ioctl(0, TCSETA, (char *)&o_tio);
+@@ -693,7 +693,7 @@
+ 	register int nr;
+ 
+ 	while (0 != iLen) {
+-		if (-1 == (nr = write(fd, pcBuf, iLen))) {
++		if (0 >= (nr = write(fd, pcBuf, iLen))) {
+ 			c2cooked();
+ 			fprintf(stderr, "%s: lost connection\n", progname);
+ 			exit(3);
+@@ -980,6 +980,7 @@
+ static int SawUrg = 0;
+ #if DO_POWER
+ static char acPowCtl[128];
++static int Indir();
+ 
+ /* We take a moment to call the power controller and ask		(ksb)
+  * them about the console line we were chatting with.  We'll be right
+@@ -991,7 +992,6 @@
+ char *pcControl, *pcLine, *pcCurrent;
+ {
+ 	register char *pcAt;
+-	static int Indir();
+ 
+ 	if ((char *)0 != (pcAt = strchr(pcControl, '@'))) {
+ 		*pcAt++ = '\000';

Copied: head/comms/conserver/files/patch-etc_conserver_group.c_1 (from r363137, head/comms/conserver/files/patch-ac)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/conserver/files/patch-etc_conserver_group.c_1	Mon Jul 28 14:54:09 2014	(r363168, copy of r363137, head/comms/conserver/files/patch-ac)
@@ -0,0 +1,31 @@
+--- etc/conserver/group.c.orig	Wed Nov 17 18:07:38 1999
++++ etc/conserver/group.c	Wed Nov 17 18:09:43 1999
+@@ -902,7 +902,7 @@
+ #endif
+ #if USE_TERMIO
+ 				if (-1 == ioctl(pCEServing->fdtty, TCSBRK, (char *)0)) {
+-					CSTROUT(pCLServing->fd, "failed]\r\n");
++					CSTROUT(pCLServing->fd, "tcsendbreak failed]\r\n");
+ 					continue;
+ 				}
+ #else
+@@ -1274,15 +1274,12 @@
+ 						continue;
+ 					}
+ #if !defined(XTABS)		/* XXX hack */
+-#define XTABS   TAB3
++#define XTABS   OXTABS
+ #endif
+-					if (XTABS == (TABDLY&sbuf.c_oflag)) {
+-						sbuf.c_oflag &= ~TABDLY;
+-						sbuf.c_oflag |= TAB0;
+-					} else {
+-						sbuf.c_oflag &= ~TABDLY;
++					if (XTABS & sbuf.c_oflag)
++						sbuf.c_oflag &= ~XTABS;
++					else
+ 						sbuf.c_oflag |= XTABS;
+-					}
+ 					if (-1 == tcsetattr(pCEServing->fdtty, TCSANOW, & sbuf)) {
+ 						CSTROUT(pCLServing->fd, "failed]\r\n");
+ 						continue;

Copied: head/comms/conserver/files/patch-etc_conserver_group.c_2 (from r363137, head/comms/conserver/files/patch-etc_conserver_group.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/conserver/files/patch-etc_conserver_group.c_2	Mon Jul 28 14:54:09 2014	(r363168, copy of r363137, head/comms/conserver/files/patch-etc_conserver_group.c)
@@ -0,0 +1,21 @@
+--- etc/conserver/group.c.orig	Thu Aug  3 03:39:42 2000
++++ etc/conserver/group.c	Sat Jul  7 16:10:53 2001
+@@ -228,6 +228,18 @@
+ struct passwd *pwd;
+ char *pcEPass, *pcWord;
+ {
++	if (pcEPass && '#' == pcEPass[0] && '#' == pcEPass[1] && '\0' != pcEPass[2] && (MAXLOGNAME + 1) > strlen(pcEPass)) {
++		 /* If the encrypted password field from the config file
++		  * looks like ##USER, look up the password for that
++		  * user for the match.
++		  */
++		pwd = getpwnam(pcEPass+2);
++		if ((struct passwd *) NULL == pwd) {
++			return 0;
++		}
++		pcEPass = (char *)0;
++	}
++
+ 	if (pcEPass && '\0' != pcEPass[0])
+ 		if (MD5CheckPass(pcEPass, pcWord))
+ 			return 1;

Copied: head/comms/conserver/files/patch-etc_conserver_master.c (from r363137, head/comms/conserver/files/patch-etc-conserver-master.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/conserver/files/patch-etc_conserver_master.c	Mon Jul 28 14:54:09 2014	(r363168, copy of r363137, head/comms/conserver/files/patch-etc-conserver-master.c)
@@ -0,0 +1,23 @@
+--- etc/conserver/master.c.orig	2000-08-02 11:39:42.000000000 -0700
++++ etc/conserver/master.c	2013-09-18 00:48:10.621087079 -0700
+@@ -200,17 +200,17 @@
+ 
+ 	if ((msfd=socket(AF_INET, SOCK_STREAM, 0)) < 0) {
+ 		fprintf(stderr, "%s: socket: %s\n", progname, strerror(errno));
+-		return;
++		return 0;
+ 	}
+ #if defined(SO_REUSEADDR) && defined(SOL_SOCKET)
+ 	if (setsockopt(msfd, SOL_SOCKET, SO_REUSEADDR, (char *)&iTrue, sizeof(iTrue))<0) {
+ 		fprintf(stderr, "%s: setsockopt: %s\n", progname, strerror(errno));
+-		return;
++		return 0;
+ 	}
+ #endif
+ 	if (bind(msfd, (struct sockaddr *)&master_port, sizeof(master_port))<0) {
+ 		fprintf(stderr, "%s: bind: %s\n", progname, strerror(errno));
+-		return;
++		return 0;
+ 	}
+ 	if (listen(msfd, SOMAXCONN) < 0) {
+ 		fprintf(stderr, "%s: listen: %s\n", progname, strerror(errno));

Copied: head/comms/gkermit/files/patch-Makefile (from r363137, head/comms/gkermit/files/patch-aa)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/gkermit/files/patch-Makefile	Mon Jul 28 14:54:09 2014	(r363168, copy of r363137, head/comms/gkermit/files/patch-aa)
@@ -0,0 +1,32 @@
+--- Makefile.orig	Tue Jan 11 08:42:38 2000
++++ Makefile	Tue Jan 11 08:44:12 2000
+@@ -37,8 +37,10 @@
+ 
+ # Default compiler and flags
+ 
+-CC=cc
+-CFLAGS= -DPOSIX -O $(KFLAGS)
++#CC=cc
++#CFLAGS= -DPOSIX -O $(KFLAGS)
++DEFS=-DPOSIX
++CFLAGS+=	$(DEFS)
+ 
+ # Object files
+ 
+@@ -70,13 +72,13 @@
+ 		$(CC) -o gkermit $(OBJECTS)
+ 
+ bsd:		gwart
+-		$(MAKE) "CC=$(CC)" "CFLAGS=-DBSD -O $(KFLAGS)" gkermit
++		$(MAKE) "CC=$(CC)" "DEFS=-DBSD $(KFLAGS)" gkermit
+ 
+ sysv:		gwart
+-		$(MAKE) "CC=$(CC)" "CFLAGS=-DSYSV -O $(KFLAGS)" gkermit
++		$(MAKE) "CC=$(CC)" "DEFS=-DSYSV $(KFLAGS)" gkermit
+ 
+ posix:		gwart
+-		$(MAKE) "CC=$(CC)" "CFLAGS=-DPOSIX -O $(KFLAGS)" gkermit
++		$(MAKE) "CC=$(CC)" "DEFS=-DPOSIX $(KFLAGS)" gkermit
+ 
+ sysvx:		gwart
+ 		$(MAKE) "CC=$(CC)" \

Copied: head/comms/mgetty+sendfax/files/patch-Makefile (from r363137, head/comms/mgetty+sendfax/files/patch-ab)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/mgetty+sendfax/files/patch-Makefile	Mon Jul 28 14:54:09 2014	(r363168, copy of r363137, head/comms/mgetty+sendfax/files/patch-ab)
@@ -0,0 +1,205 @@
+
+$FreeBSD$
+
+--- Makefile.orig
++++ Makefile
+@@ -4,8 +4,8 @@
+ #
+ # this is the C compiler to use (on SunOS, the standard "cc" does not
+ # grok my code, so please use gcc there. On ISC 4.0, use "icc".).
+-CC=gcc
+-#CC=cc
++#CC=gcc
++CC=cc
+ #
+ #### C Compiler Flags ####
+ #
+@@ -102,7 +102,7 @@
+ #	    USTAT	  - ustat(), no statfs etc.
+ #
+ #CFLAGS=-Wall -O2 -pipe -DSECUREWARE -DUSE_POLL
+-CFLAGS=-O2 -Wall -pipe
++#CFLAGS=-O2 -Wall -pipe
+ #CFLAGS=-O -DSVR4
+ #CFLAGS=-O -DSVR4 -DSVR42
+ #CFLAGS=-O -DUSE_POLL
+@@ -144,7 +144,7 @@
+ # For Linux, add "-lutil" if the linker complains about "updwtmp".
+ #
+ LDFLAGS=
+-LIBS=
++LIBS= -lutil
+ #LIBS=-lprot -lsocket				# SCO Unix
+ #LIBS=-lsocket
+ #LIBS=-lbsd					# OSF/1
+@@ -164,7 +164,8 @@
+ #
+ # if your systems doesn't have one, use the shell script that I provide
+ # in "inst.sh" (taken from X11R5). Needed on IRIX5.2
+-INSTALL=install -c -o bin -g bin
++INSTALL=install -c
++INSTALL_PROGRAM=install -s -c
+ #INSTALL=install -c -o root -g wheel		# NeXT/BSD
+ #INSTALL=/usr/ucb/install -c -o bin -g bin	# AIX, Solaris 2.x
+ #INSTALL=installbsd -c -o bin -g bin		# OSF/1, AIX 4.1, 4.2
+@@ -216,7 +217,7 @@
+ # (it's possible to run faxrunq(d) as root, but the FAX_OUT_USER 
+ #  MUST NOT BE root or any other privileged account).
+ #
+-FAX_OUT_USER=fax
++FAX_OUT_USER=root
+ #
+ #
+ # Where section 1 manual pages should be placed
+@@ -258,12 +259,12 @@
+ # and the "tkperl" frontends without PERL, so don't worry if you don't
+ # have it.
+ # If you specify command line arguments (-w), don't forget the quotes!
+-PERL="/usr/bin/perl -w"
++PERL="$(LOCALBASE)/bin/perl -w"
+ #
+ # If you have Perl with TK extentions, define it here. This may be the
+ # same as PERL=... above, or different, if you have TkPerl statically
+ # linked.
+-TKPERL=/usr/bin/tkperl
++#TKPERL=/usr/bin/tkperl
+ #
+ #
+ # An echo program that understands escapes like "\n" for newline or
+@@ -275,9 +276,9 @@
+ # please use the "mg.echo" program provided in the compat/ subdirectory.
+ # Set ECHO="mg.echo" and INSTALL_MECHO to mg.echo
+ #
+-ECHO="echo"
++ECHO="mg.echo"
+ #
+-# INSTALL_MECHO=mg.echo
++INSTALL_MECHO=mg.echo
+ 
+ #
+ # for mgetty, that's it. If you want to use the voice
+@@ -317,7 +318,7 @@
+ 
+ all:	bin-all doc-all
+ 
+-bin-all: mgetty sendfax newslock sedscript subdirs call-back 
++bin-all: mgetty sendfax newslock sedscript subdirs call-back vgetty
+ 
+ # a few C files need extra compiler arguments
+ 
+@@ -578,42 +579,39 @@
+ 	cd bindist; gtar cvvfz mgetty$(MR).$(SR)-bin.tgz *
+ 
+ 
+-install: install.bin install.doc
++install: install.bin install.doc install-vgetty
+ 
+ install.bin: mgetty sendfax newslock \
+-		login.config mgetty.config sendfax.config 
++		login.config #mgetty.config sendfax.config 
+ #
+ # binaries
+ #
+-	-test -d $(BINDIR)  || ( ./mkidirs $(BINDIR)  ; chmod 755 $(BINDIR)  )
+-	$(INSTALL) -m 755 newslock $(BINDIR)
++	-test -d $(STAGEDIR)$(BINDIR)  || ( ./mkidirs $(STAGEDIR)$(BINDIR)  ; chmod 755 $(STAGEDIR)$(BINDIR)  )
++	$(INSTALL_PROGRAM) -m 755 newslock $(STAGEDIR)$(BINDIR)
+ 
+-	-test -d $(SBINDIR) || ( ./mkidirs $(SBINDIR) ; chmod 755 $(SBINDIR) )
+-	-mv -f $(SBINDIR)/mgetty $(SBINDIR)/mgetty.old
+-	-mv -f $(SBINDIR)/sendfax $(SBINDIR)/sendfax.old
+-	$(INSTALL) -s -m 700 mgetty $(SBINDIR)
+-	$(INSTALL) -s -m 755 sendfax $(SBINDIR)
++	-test -d $(STAGEDIR)$(SBINDIR) || ( ./mkidirs $(STAGEDIR)$(SBINDIR) ; chmod 755 $(STAGEDIR)$(SBINDIR) )
++	-mv -f $(STAGEDIR)$(SBINDIR)/mgetty $(STAGEDIR)$(SBINDIR)/mgetty.old
++	-mv -f $(STAGEDIR)$(SBINDIR)/sendfax $(STAGEDIR)$(SBINDIR)/sendfax.old
++	$(INSTALL_PROGRAM) -s -m 700 mgetty $(STAGEDIR)$(SBINDIR)
++	$(INSTALL_PROGRAM) -s -m 755 sendfax $(STAGEDIR)$(SBINDIR)
++	$(INSTALL_PROGRAM) -s -m 755 callback/callback $(STAGEDIR)$(SBINDIR)
+ #
+ # data files + directories
+ #
+-	test -d $(LIBDIR)  || \
+-		( ./mkidirs $(LIBDIR) &&  chmod 755 $(LIBDIR) )
+-	test -d $(CONFDIR) || \
+-		( ./mkidirs $(CONFDIR) && chmod 755 $(CONFDIR))
+-	test -f $(CONFDIR)/login.config || \
+-		$(INSTALL) -o root -m 600 login.config $(CONFDIR)/
+-	test -f $(CONFDIR)/mgetty.config || \
+-		$(INSTALL) -o root -m 600 mgetty.config $(CONFDIR)/
+-	test -f $(CONFDIR)/sendfax.config || \
+-		$(INSTALL) -o root -m 644 sendfax.config $(CONFDIR)/
+-	test -f $(CONFDIR)/dialin.config || \
+-		$(INSTALL) -o root -m 600 dialin.config $(CONFDIR)/
+-	test -f $(CONFDIR)/faxrunq.config || \
+-		$(INSTALL) -o root -m 644 faxrunq.config $(CONFDIR)/
++	test -d $(STAGEDIR)$(LIBDIR)  || \
++		( ./mkidirs $(STAGEDIR)$(LIBDIR) &&  chmod 755 $(STAGEDIR)$(LIBDIR) )
++	test -d $(STAGEDIR)$(CONFDIR) || \
++		( ./mkidirs $(STAGEDIR)$(CONFDIR) && chmod 755 $(STAGEDIR)$(CONFDIR))
++	test -f $(STAGEDIR)$(CONFDIR)/login.config || \
++		$(INSTALL) -m 600 login.config $(STAGEDIR)$(CONFDIR)/
++	test -f $(STAGEDIR)$(CONFDIR)/dialin.config || \
++		$(INSTALL) -m 600 dialin.config $(STAGEDIR)$(CONFDIR)/
++	test -f $(STAGEDIR)$(CONFDIR)/faxrunq.config || \
++		$(INSTALL) -m 644 faxrunq.config $(STAGEDIR)$(CONFDIR)/
+ #
+ # test for outdated stuff
+ #
+-	- at if test -f $(LIBDIR)/mgetty.login ; \
++	- at if test -f $(STAGEDIR)$(LIBDIR)/mgetty.login ; \
+ 	then \
+ 	    echo "WARNING: the format of $(LIBDIR)/mgetty.login has " ;\
+ 	    echo "been changed. Because of this, to avoid confusions, it's called " ;\
+@@ -621,24 +619,9 @@
+ 	    echo "" ;\
+ 	fi
+ #
+-# fax spool directories
+-#
+-	test -d $(spool) || \
+-		( mkdir $(spool) && chmod 755 $(spool) )
+-	test -d $(FAX_SPOOL) || \
+-		( mkdir $(FAX_SPOOL) && \
+-		  chown $(FAX_OUT_USER) $(FAX_SPOOL) && \
+-		  chmod 755 $(FAX_SPOOL) )
+-	test -d $(FAX_SPOOL_IN) || \
+-		( mkdir $(FAX_SPOOL_IN) && chmod 755 $(FAX_SPOOL_IN) )
+-	test -d $(FAX_SPOOL_OUT) || \
+-		  mkdir $(FAX_SPOOL_OUT)
+-	chown $(FAX_OUT_USER) $(FAX_SPOOL_OUT)
+-	chmod 755 $(FAX_SPOOL_OUT)
+-#
+ # g3 tool programs
+ #
+-	cd g3 ; $(MAKE) install INSTALL="$(INSTALL)" \
++	cd g3 ; $(MAKE) install INSTALL="$(INSTALL_PROGRAM)" \
+ 				BINDIR=$(BINDIR) \
+ 				LIBDIR=$(LIBDIR) CONFDIR=$(CONFDIR)
+ #
+@@ -654,7 +637,7 @@
+ 	if [ ! -z "$(INSTALL_MECHO)" ] ; then \
+ 	    cd compat ; \
+ 	    $(CC) $(CFLAGS) -o mg.echo mg.echo.c && \
+-	    $(INSTALL) -s -m 755 mg.echo $(BINDIR) ; \
++	    $(INSTALL) -s -m 755 mg.echo $(STAGEDIR)$(BINDIR) ; \
+ 	fi
+ 
+ #
+@@ -662,11 +645,11 @@
+ #
+ install.doc:
+ 	cd doc ; $(MAKE) install INSTALL="$(INSTALL)" \
+-				MAN1DIR=$(MAN1DIR) \
+-				MAN4DIR=$(MAN4DIR) \
+-				MAN5DIR=$(MAN5DIR) \
+-				MAN8DIR=$(MAN8DIR) \
+-				INFODIR=$(INFODIR)
++				MAN1DIR=$(STAGEDIR)$(MAN1DIR) \
++				MAN4DIR=$(STAGEDIR)$(MAN4DIR) \
++				MAN5DIR=$(STAGEDIR)$(MAN5DIR) \
++				MAN8DIR=$(STAGEDIR)$(MAN8DIR) \
++				INFODIR=$(STAGEDIR)$(INFODIR)
+ 
+ #
+ # WWW frontend stuff

Copied: head/comms/mgetty+sendfax/files/patch-doc_Makefile (from r363137, head/comms/mgetty+sendfax/files/patch-ad)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/mgetty+sendfax/files/patch-doc_Makefile	Mon Jul 28 14:54:09 2014	(r363168, copy of r363137, head/comms/mgetty+sendfax/files/patch-ad)
@@ -0,0 +1,20 @@
+--- doc/Makefile.orig	Fri Nov 28 04:33:26 1997
++++ doc/Makefile	Tue Dec  1 00:49:56 1998
+@@ -26,7 +26,7 @@
+ 
+ all:
+ 
+-doc-all: mgetty.asc mgetty.info mgetty.dvi mgetty.ps fmt-manpages $(MANSRC) 
++doc-all: mgetty.asc mgetty.info fmt-manpages $(MANSRC) 
+ 
+ manpages: $(MANSRC)
+ 
+@@ -43,7 +43,7 @@
+ 	-texi2html -verbose mgetty.texi
+ 
+ mgetty.info: mgetty.texi
+-	-makeinfo mgetty.texi
++	-makeinfo --no-split mgetty.texi
+ 
+ mgetty.ps: mgetty.dvi
+ 	-dvips -o mgetty.ps mgetty.dvi

Copied: head/comms/mgetty+sendfax/files/patch-fax_faxspool.in (from r363137, head/comms/mgetty+sendfax/files/patch-aa)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/mgetty+sendfax/files/patch-fax_faxspool.in	Mon Jul 28 14:54:09 2014	(r363168, copy of r363137, head/comms/mgetty+sendfax/files/patch-aa)
@@ -0,0 +1,17 @@
+--- fax/faxspool.in~	Sat Jul  9 14:25:15 2005
++++ fax/faxspool.in	Sat Jul  9 14:30:44 2005
+@@ -401,11 +401,11 @@
+ 
+ # user name (for fax header only! auth is done by faxq-helper via getuid())
+ ##########
+-if user=`logname 2>/dev/null`
+-then :
++if [ `id -u` = 0 ]; then
++    user=root
+ else
+     id=`id`
+-    user=`expr "$id" : "[^( ]*(\([^)]*\)"`
++    user=`logname`
+ fi
+ test -z "$user" && user=$LOGNAME
+ test -z "$user" && user=$USER

Copied: head/comms/mgetty+sendfax/files/patch-voice_Makefile (from r363137, head/comms/mgetty+sendfax/files/patch-ac)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/mgetty+sendfax/files/patch-voice_Makefile	Mon Jul 28 14:54:09 2014	(r363168, copy of r363137, head/comms/mgetty+sendfax/files/patch-ac)
@@ -0,0 +1,38 @@
+
+$FreeBSD$
+
+--- voice/Makefile.orig
++++ voice/Makefile
+@@ -13,6 +13,8 @@
+ LN=ln
+ MV=mv
+ RM=rm
++INSTALL=install -c
++INSTALL_PROGRAM=install -s -c
+ 
+ MGETTYLIB=../../getdisk.o ../../goodies.o ../../io.o \
+ 	../../locks.o ../../tio.o ../../modem.o \
+@@ -83,16 +85,16 @@
+ 	@echo "  Installing the voice extensions"
+ 	@echo "  -------------------------------"
+ 	@echo ""
+-	$(INSTALL) -m 700 vgetty/vgetty $(SBINDIR)
+-	$(INSTALL) -m 755 vm/vm $(BINDIR)
++	$(INSTALL_PROGRAM) -m 700 vgetty/vgetty $(STAGEDIR)$(SBINDIR)
++	$(INSTALL_PROGRAM) -m 755 vm/vm $(STAGEDIR)$(BINDIR)
+ 	for i in $(PVFTOOLS); \
+ 	do \
+-	     $(INSTALL) -m 755 pvftools/$$i $(BINDIR); \
++	     $(INSTALL_PROGRAM) -m 755 pvftools/$$i $(STAGEDIR)$(BINDIR); \
+ 	done
+-	$(INSTALL) -m 644 man/man1/zplay.1 $(MAN1DIR)
+-	$(INSTALL) -m 644 man/man1/pvf.1 $(MAN1DIR)
+-	$(INSTALL) -m 644 man/man8/vgetty.8 $(MAN8DIR)
+-	cd $(MAN1DIR); \
++	$(INSTALL) -m 644 man/man1/zplay.1 $(STAGEDIR)$(MAN1DIR)
++	$(INSTALL) -m 644 man/man1/pvf.1 $(STAGEDIR)$(MAN1DIR)
++	$(INSTALL) -m 644 man/man8/vgetty.8 $(STAGEDIR)$(MAN8DIR)
++	cd $(STAGEDIR)$(MAN1DIR); \
+ 	for i in $(PVFTOOLS); \
+ 	do \
+ 	     $(RM) -f $$i.1; $(LN) -s pvf.1 $$i.1; \

Copied: head/comms/mgetty+sendfax/files/patch-voice_libvoice_signal.c (from r363137, head/comms/mgetty+sendfax/files/patch-v)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/mgetty+sendfax/files/patch-voice_libvoice_signal.c	Mon Jul 28 14:54:09 2014	(r363168, copy of r363137, head/comms/mgetty+sendfax/files/patch-v)
@@ -0,0 +1,30 @@
+--- voice/libvoice/signal.c.orig	Sat Oct 23 23:58:01 1999
++++ voice/libvoice/signal.c	Fri Jan 24 22:03:15 2003
+@@ -34,23 +34,16 @@
+ 
+ static void signal_sigchld(int sig)
+      {
++     /*
++	This appears to break passing back the shells exitstatus to vgetty
++
+      pid_t pid;
+      int status;
+-     pid = wait(&status); /* This appears to fix core dumps on HPUX. Maybe this
++     pid = wait(&status);*/ /* This appears to fix core dumps on HPUX. Maybe this
+                            * also fixes the same problem on Solaris.
+                            */
+      signal(SIGCHLD, signal_sigchld);
+-     if (status) {
+-        lprintf(L_WARN, "%s: Got child %d exit status %d signal",
+-                program_name,
+-                pid,
+-                status);
+-     }
+-     else {
+-        lprintf(L_JUNK, "%s: Got child %d exit signal",
+-                program_name,
+-                pid);
+-     }
++     lprintf(L_JUNK, "%s: Got child status change signal", program_name);
+      queue_event(create_event(SIGNAL_SIGCHLD));
+      }

Copied: head/comms/minicom/files/patch-src-updown.c (from r363137, head/comms/minicom/files/patch-ac)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/minicom/files/patch-src-updown.c	Mon Jul 28 14:54:09 2014	(r363168, copy of r363137, head/comms/minicom/files/patch-ac)
@@ -0,0 +1,11 @@
+--- src/updown.c.orig	2013-12-08 11:25:06.000000000 +0100
++++ src/updown.c	2014-01-02 20:30:33.000000000 +0100
+@@ -298,7 +298,7 @@ void updown(int what, int nr)
+     do_log("%s", cmdline);   /* jl 22.06.97 */
+ 
+   if (P_PFULL(g) == 'N') {
+-    win = mc_wopen(10, 7, 70, 13, BSINGLE, stdattr, mfcolor, mbcolor, 1, 0, 1);
++    win = mc_wopen(5, 5, 74, 11, BSINGLE, stdattr, mfcolor, mbcolor, 1, 0, 1);
+     snprintf(title, sizeof(title), _("%.30s %s - Press CTRL-C to quit"), P_PNAME(g),
+              what == 'U' ? _("upload") : _("download"));
+     mc_wtitle(win, TMID, title);

Copied: head/comms/minicom/files/patch-src-window.c (from r363137, head/comms/minicom/files/patch-af)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/minicom/files/patch-src-window.c	Mon Jul 28 14:54:09 2014	(r363168, copy of r363137, head/comms/minicom/files/patch-af)
@@ -0,0 +1,45 @@
+--- src/window.c.orig	2010-12-12 14:56:25.000000000 +0100
++++ src/window.c	2011-12-28 16:07:59.000000000 +0100
+@@ -66,6 +66,7 @@ static const char *CE, *Al, *Dl, *AL, *D
+ static const char *CS, *SF, *SR, *VB, *BL;
+ static const char *VE, *VI, *KS, *KE;
+ static const char *CD, *CL, *IC, *DC;
++static char *mcBC;
+ static const char *CR, *NL;
+ #ifdef ST_LINE
+ static const char *TS, *FS, *DS;
+@@ -335,8 +336,8 @@ static void _gotoxy(int x, int y)
+   else if (NL != NULL && x == 0 && x == curx && y == cury + 1)
+     outstr(NL);
+ #endif
+-  else if (BC != NULL && y == cury && x == curx - 1)
+-    outstr(BC);
++  else if (mcBC != NULL && y == cury && x == curx - 1)
++    outstr(mcBC);
+   else
+     outstr(tgoto(CM, x, y));
+   curx = x;
+@@ -2000,7 +2001,7 @@ int win_init(int fg, int bg, int attr)
+   CL = tgetstr("cl", &_tptr);
+   IC = tgetstr("ic", &_tptr);
+   DC = tgetstr("dc", &_tptr);
+-  BC = tgetstr("bc", &_tptr);
++  mcBC = tgetstr("bc", &_tptr);
+   CR = tgetstr("cr", &_tptr);
+   NL = tgetstr("nl", &_tptr);
+   AC = tgetstr("ac", &_tptr);
+@@ -2059,11 +2060,11 @@ int win_init(int fg, int bg, int attr)
+   _has_am = tgetflag("am");
+   _mv_standout = tgetflag("ms");
+   if (tgetflag("bs")) {
+-    if (BC == NULL)
+-      BC = "\b";
++    if (mcBC == NULL)
++      mcBC = "\b";
+   }
+   else
+-    BC = NULL;
++    mcBC = NULL;
+ 
+   /* Special IBM box-drawing characters */
+   D_UL  = 201;

Copied: head/comms/mlan3/files/patch-Makefiles (from r363137, head/comms/mlan3/files/patch-aa)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/mlan3/files/patch-Makefiles	Mon Jul 28 14:54:09 2014	(r363168, copy of r363137, head/comms/mlan3/files/patch-aa)
@@ -0,0 +1,301 @@
+--- Makefile	Thu Jan  1 01:00:00 1970
++++ Makefile	Wed Oct 27 17:03:17 2004
+@@ -0,0 +1,4 @@
++
++SUBDIR= lib apps
++
++.include <bsd.subdir.mk>
+--- apps/Makefile	Thu Jan  1 01:00:00 1970
++++ apps/Makefile	Wed Oct 27 17:03:17 2004
+@@ -0,0 +1,6 @@
++
++SUBDIR= atodtst counter coupler fish gethumd memutil mweather shaapp \
++	swtsngl temp tstfind
++
++.include <bsd.subdir.mk>
++
+--- apps/atodtst/Makefile	Thu Jan  1 01:00:00 1970
++++ apps/atodtst/Makefile	Wed Oct 27 17:03:17 2004
+@@ -0,0 +1,15 @@
++PROG=		atodtst
++PREFIX?=	/usr/local
++BINDIR=		${PREFIX}/bin
++MLANCOM=	${.CURDIR}/../../common
++MLANLIB=	${.CURDIR}/../../lib/userial
++CFLAGS=         -I. -Wall -I${MLANCOM}
++LDADD=		-L${MLANLIB} -lmlan
++DPADD=		${MLANLIB}/libmlan.a
++NO_MAN=		1
++SRCS=           ${PROG}.c
++
++test:		${PROG}
++		./${PROG} /dev/cuaa0
++
++.include	<bsd.prog.mk>
+--- apps/counter/Makefile	Thu Jan  1 01:00:00 1970
++++ apps/counter/Makefile	Wed Oct 27 17:03:17 2004
+@@ -0,0 +1,15 @@
++PROG=		counter
++PREFIX?=	/usr/local
++BINDIR=		${PREFIX}/bin
++MLANCOM=	${.CURDIR}/../../common
++MLANLIB=	${.CURDIR}/../../lib/userial
++CFLAGS=         -I. -Wall -I${MLANCOM}
++LDADD=		-L${MLANLIB} -lmlan
++DPADD=		${MLANLIB}/libmlan.a
++NOMAN=		1
++SRCS=           ${PROG}.c
++
++test:		${PROG}
++		./${PROG} /dev/cuaa0
++
++.include	<bsd.prog.mk>
+--- apps/coupler/Makefile	Thu Jan  1 01:00:00 1970
++++ apps/coupler/Makefile	Wed Oct 27 17:03:17 2004
+@@ -0,0 +1,15 @@
++PROG=		coupler
++PREFIX?=	/usr/local

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-ports-all mailing list