Index: head/comms/bforce/files/patch-aa =================================================================== --- head/comms/bforce/files/patch-aa (revision 363167) +++ head/comms/bforce/files/patch-aa (nonexistent) @@ -1,25 +0,0 @@ ---- 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 Property changes on: head/comms/bforce/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/comms/bforce/files/patch-ab =================================================================== --- head/comms/bforce/files/patch-ab (revision 363167) +++ head/comms/bforce/files/patch-ab (nonexistent) @@ -1,88 +0,0 @@ ---- 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) */ Property changes on: head/comms/bforce/files/patch-ab ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/comms/bforce/files/patch-case-breaks =================================================================== --- head/comms/bforce/files/patch-case-breaks (nonexistent) +++ head/comms/bforce/files/patch-case-breaks (revision 363168) @@ -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) */ Property changes on: head/comms/bforce/files/patch-case-breaks ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/comms/bforce/files/patch-configure =================================================================== --- head/comms/bforce/files/patch-configure (nonexistent) +++ head/comms/bforce/files/patch-configure (revision 363168) @@ -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 Property changes on: head/comms/bforce/files/patch-configure ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/comms/bluegps/Makefile =================================================================== --- head/comms/bluegps/Makefile (revision 363167) +++ head/comms/bluegps/Makefile (revision 363168) @@ -1,15 +1,15 @@ # Created by: dirkx@webweaving.org # $FreeBSD$ PORTNAME= bluegps-linux PORTVERSION= 2.0 CATEGORIES= comms MASTER_SITES= http://www.harbaum.org/till/bluegps/ -EXTRACT_SUFX= .tgz MAINTAINER= dirkx@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 Index: head/comms/bluegps/files/patch-aa =================================================================== --- head/comms/bluegps/files/patch-aa (revision 363167) +++ head/comms/bluegps/files/patch-aa (nonexistent) @@ -1,35 +0,0 @@ ---- 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 , --Simon Budig -+Simon Budig and -+some minor changes for FreeBSD by Dirk-Willem van Gulik . Property changes on: head/comms/bluegps/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/comms/bluegps/files/patch-ab =================================================================== --- head/comms/bluegps/files/patch-ab (revision 363167) +++ head/comms/bluegps/files/patch-ab (nonexistent) @@ -1,74 +0,0 @@ ---- 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 - #include - -+#ifdef __FreeBSD__ -+#include -+#include -+#include -+#else - #include -+#endif - -+ -+#ifdef __FreeBSD__ -+#include -+#else - #include - #include -+#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; Property changes on: head/comms/bluegps/files/patch-ab ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/comms/bluegps/files/patch-bluegps.1 =================================================================== --- head/comms/bluegps/files/patch-bluegps.1 (nonexistent) +++ head/comms/bluegps/files/patch-bluegps.1 (revision 363168) @@ -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 , +-Simon Budig ++Simon Budig and ++some minor changes for FreeBSD by Dirk-Willem van Gulik . Property changes on: head/comms/bluegps/files/patch-bluegps.1 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/comms/bluegps/files/patch-bluegps.c =================================================================== --- head/comms/bluegps/files/patch-bluegps.c (nonexistent) +++ head/comms/bluegps/files/patch-bluegps.c (revision 363168) @@ -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 + #include + ++#ifdef __FreeBSD__ ++#include ++#include ++#include ++#else + #include ++#endif + ++ ++#ifdef __FreeBSD__ ++#include ++#else + #include + #include ++#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; Property changes on: head/comms/bluegps/files/patch-bluegps.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/comms/bpl+/Makefile =================================================================== --- head/comms/bpl+/Makefile (revision 363167) +++ head/comms/bpl+/Makefile (revision 363168) @@ -1,21 +1,21 @@ # Created by: Masafumi NAKANE # $FreeBSD$ PORTNAME= bpl+ PORTVERSION= 1.0 PORTREVISION= 1 CATEGORIES= comms MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= max DISTNAME= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= B Plus file transfer protocol 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 Index: head/comms/bpl+/files/patch-aa =================================================================== --- head/comms/bpl+/files/patch-aa (revision 363167) +++ head/comms/bpl+/files/patch-aa (nonexistent) @@ -1,8 +0,0 @@ ---- 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 Property changes on: head/comms/bpl+/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/comms/bpl+/files/patch-ab =================================================================== --- head/comms/bpl+/files/patch-ab (revision 363167) +++ head/comms/bpl+/files/patch-ab (nonexistent) @@ -1,11 +0,0 @@ ---- 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); Property changes on: head/comms/bpl+/files/patch-ab ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/comms/bpl+/files/patch-bplexec.c =================================================================== --- head/comms/bpl+/files/patch-bplexec.c (revision 363167) +++ head/comms/bpl+/files/patch-bplexec.c (nonexistent) @@ -1,50 +0,0 @@ ---- bplexec.c.orig Thu Feb 9 17:25:34 1995 -+++ bplexec.c Wed Nov 15 20:45:53 2000 -@@ -17,6 +17,7 @@ - #include - #include - #include -+#include - - #include "bpl.h" - #include "machine.h" -@@ -1096,7 +1097,7 @@ - - fname_w_index = strlen(fname_work); - if (copy_body(s)) { /* ファイル名異常 */ -- 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 { - /* ディレクトリは current を使う */ - strwarn(STR_CANT_CREATE_L); /* 「ファイルが作成できないので」 */ -@@ -1136,6 +1140,7 @@ - strwarn(STR_CANT_CREATE_R); - my_free(real_filename); - real_filename = my_tmp; -+ close(fd); - } - return fp; - } Property changes on: head/comms/bpl+/files/patch-bplexec.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/comms/bpl+/files/patch-bplexec.c_1 =================================================================== --- head/comms/bpl+/files/patch-bplexec.c_1 (nonexistent) +++ head/comms/bpl+/files/patch-bplexec.c_1 (revision 363168) @@ -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); Property changes on: head/comms/bpl+/files/patch-bplexec.c_1 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/comms/bpl+/files/patch-bplexec.c_2 =================================================================== --- head/comms/bpl+/files/patch-bplexec.c_2 (nonexistent) +++ head/comms/bpl+/files/patch-bplexec.c_2 (revision 363168) @@ -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 + #include + #include ++#include + + #include "bpl.h" + #include "machine.h" +@@ -1096,7 +1097,7 @@ + + fname_w_index = strlen(fname_work); + if (copy_body(s)) { /* ファイル名異常 */ +- 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 { + /* ディレクトリは current を使う */ + strwarn(STR_CANT_CREATE_L); /* 「ファイルが作成できないので」 */ +@@ -1136,6 +1140,7 @@ + strwarn(STR_CANT_CREATE_R); + my_free(real_filename); + real_filename = my_tmp; ++ close(fd); + } + return fp; + } Property changes on: head/comms/bpl+/files/patch-bplexec.c_2 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/comms/bpl+/files/patch-machine.h =================================================================== --- head/comms/bpl+/files/patch-machine.h (nonexistent) +++ head/comms/bpl+/files/patch-machine.h (revision 363168) @@ -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 Property changes on: head/comms/bpl+/files/patch-machine.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/comms/conserver/files/patch-ac =================================================================== --- head/comms/conserver/files/patch-ac (revision 363167) +++ head/comms/conserver/files/patch-ac (nonexistent) @@ -1,31 +0,0 @@ ---- 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; Property changes on: head/comms/conserver/files/patch-ac ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/comms/conserver/files/patch-ad =================================================================== --- head/comms/conserver/files/patch-ad (revision 363167) +++ head/comms/conserver/files/patch-ad (nonexistent) @@ -1,34 +0,0 @@ ---- 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'; Property changes on: head/comms/conserver/files/patch-ad ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/comms/conserver/files/patch-af =================================================================== --- head/comms/conserver/files/patch-af (revision 363167) +++ head/comms/conserver/files/patch-af (nonexistent) @@ -1,57 +0,0 @@ ---- 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'; Property changes on: head/comms/conserver/files/patch-af ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/comms/conserver/files/patch-etc_conserver_group.c =================================================================== --- head/comms/conserver/files/patch-etc_conserver_group.c (revision 363167) +++ head/comms/conserver/files/patch-etc_conserver_group.c (nonexistent) @@ -1,21 +0,0 @@ ---- 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; Property changes on: head/comms/conserver/files/patch-etc_conserver_group.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/comms/conserver/files/patch-etc-conserver-master.c =================================================================== --- head/comms/conserver/files/patch-etc-conserver-master.c (revision 363167) +++ head/comms/conserver/files/patch-etc-conserver-master.c (nonexistent) @@ -1,23 +0,0 @@ ---- 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)); Property changes on: head/comms/conserver/files/patch-etc-conserver-master.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/comms/conserver/files/patch-etc_conserver_consent.c =================================================================== --- head/comms/conserver/files/patch-etc_conserver_consent.c (nonexistent) +++ head/comms/conserver/files/patch-etc_conserver_consent.c (revision 363168) @@ -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'; Property changes on: head/comms/conserver/files/patch-etc_conserver_consent.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/comms/conserver/files/patch-etc_conserver_console.m =================================================================== --- head/comms/conserver/files/patch-etc_conserver_console.m (nonexistent) +++ head/comms/conserver/files/patch-etc_conserver_console.m (revision 363168) @@ -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'; Property changes on: head/comms/conserver/files/patch-etc_conserver_console.m ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/comms/conserver/files/patch-etc_conserver_group.c_1 =================================================================== --- head/comms/conserver/files/patch-etc_conserver_group.c_1 (nonexistent) +++ head/comms/conserver/files/patch-etc_conserver_group.c_1 (revision 363168) @@ -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; Property changes on: head/comms/conserver/files/patch-etc_conserver_group.c_1 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/comms/conserver/files/patch-etc_conserver_group.c_2 =================================================================== --- head/comms/conserver/files/patch-etc_conserver_group.c_2 (nonexistent) +++ head/comms/conserver/files/patch-etc_conserver_group.c_2 (revision 363168) @@ -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; Property changes on: head/comms/conserver/files/patch-etc_conserver_group.c_2 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/comms/conserver/files/patch-etc_conserver_master.c =================================================================== --- head/comms/conserver/files/patch-etc_conserver_master.c (nonexistent) +++ head/comms/conserver/files/patch-etc_conserver_master.c (revision 363168) @@ -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)); Property changes on: head/comms/conserver/files/patch-etc_conserver_master.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/comms/gkermit/files/patch-aa =================================================================== --- head/comms/gkermit/files/patch-aa (revision 363167) +++ head/comms/gkermit/files/patch-aa (nonexistent) @@ -1,32 +0,0 @@ ---- 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)" \ Property changes on: head/comms/gkermit/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/comms/gkermit/files/patch-Makefile =================================================================== --- head/comms/gkermit/files/patch-Makefile (nonexistent) +++ head/comms/gkermit/files/patch-Makefile (revision 363168) @@ -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)" \ Property changes on: head/comms/gkermit/files/patch-Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/comms/mgetty+sendfax/files/patch-aa =================================================================== --- head/comms/mgetty+sendfax/files/patch-aa (revision 363167) +++ head/comms/mgetty+sendfax/files/patch-aa (nonexistent) @@ -1,17 +0,0 @@ ---- 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 Property changes on: head/comms/mgetty+sendfax/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/comms/mgetty+sendfax/files/patch-ab =================================================================== --- head/comms/mgetty+sendfax/files/patch-ab (revision 363167) +++ head/comms/mgetty+sendfax/files/patch-ab (nonexistent) @@ -1,205 +0,0 @@ - -$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 - # -- -@if test -f $(LIBDIR)/mgetty.login ; \ -+ -@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 Property changes on: head/comms/mgetty+sendfax/files/patch-ab ___________________________________________________________________ Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/comms/mgetty+sendfax/files/patch-ac =================================================================== --- head/comms/mgetty+sendfax/files/patch-ac (revision 363167) +++ head/comms/mgetty+sendfax/files/patch-ac (nonexistent) @@ -1,38 +0,0 @@ - -$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; \ Property changes on: head/comms/mgetty+sendfax/files/patch-ac ___________________________________________________________________ Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/comms/mgetty+sendfax/files/patch-ad =================================================================== --- head/comms/mgetty+sendfax/files/patch-ad (revision 363167) +++ head/comms/mgetty+sendfax/files/patch-ad (nonexistent) @@ -1,20 +0,0 @@ ---- 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 Property changes on: head/comms/mgetty+sendfax/files/patch-ad ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/comms/mgetty+sendfax/files/patch-v =================================================================== --- head/comms/mgetty+sendfax/files/patch-v (revision 363167) +++ head/comms/mgetty+sendfax/files/patch-v (nonexistent) @@ -1,30 +0,0 @@ ---- 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)); - } Property changes on: head/comms/mgetty+sendfax/files/patch-v ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/comms/mgetty+sendfax/files/patch-Makefile =================================================================== --- head/comms/mgetty+sendfax/files/patch-Makefile (nonexistent) +++ head/comms/mgetty+sendfax/files/patch-Makefile (revision 363168) @@ -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 + # +- -@if test -f $(LIBDIR)/mgetty.login ; \ ++ -@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 Property changes on: head/comms/mgetty+sendfax/files/patch-Makefile ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/comms/mgetty+sendfax/files/patch-doc_Makefile =================================================================== --- head/comms/mgetty+sendfax/files/patch-doc_Makefile (nonexistent) +++ head/comms/mgetty+sendfax/files/patch-doc_Makefile (revision 363168) @@ -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 Property changes on: head/comms/mgetty+sendfax/files/patch-doc_Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/comms/mgetty+sendfax/files/patch-fax_faxspool.in =================================================================== --- head/comms/mgetty+sendfax/files/patch-fax_faxspool.in (nonexistent) +++ head/comms/mgetty+sendfax/files/patch-fax_faxspool.in (revision 363168) @@ -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 Property changes on: head/comms/mgetty+sendfax/files/patch-fax_faxspool.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/comms/mgetty+sendfax/files/patch-voice_Makefile =================================================================== --- head/comms/mgetty+sendfax/files/patch-voice_Makefile (nonexistent) +++ head/comms/mgetty+sendfax/files/patch-voice_Makefile (revision 363168) @@ -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; \ Property changes on: head/comms/mgetty+sendfax/files/patch-voice_Makefile ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/comms/mgetty+sendfax/files/patch-voice_libvoice_signal.c =================================================================== --- head/comms/mgetty+sendfax/files/patch-voice_libvoice_signal.c (nonexistent) +++ head/comms/mgetty+sendfax/files/patch-voice_libvoice_signal.c (revision 363168) @@ -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)); + } Property changes on: head/comms/mgetty+sendfax/files/patch-voice_libvoice_signal.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/comms/minicom/files/patch-ac =================================================================== --- head/comms/minicom/files/patch-ac (revision 363167) +++ head/comms/minicom/files/patch-ac (nonexistent) @@ -1,11 +0,0 @@ ---- 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); Property changes on: head/comms/minicom/files/patch-ac ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/comms/minicom/files/patch-af =================================================================== --- head/comms/minicom/files/patch-af (revision 363167) +++ head/comms/minicom/files/patch-af (nonexistent) @@ -1,45 +0,0 @@ ---- 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; Property changes on: head/comms/minicom/files/patch-af ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/comms/minicom/files/patch-src-updown.c =================================================================== --- head/comms/minicom/files/patch-src-updown.c (nonexistent) +++ head/comms/minicom/files/patch-src-updown.c (revision 363168) @@ -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); Property changes on: head/comms/minicom/files/patch-src-updown.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/comms/minicom/files/patch-src-window.c =================================================================== --- head/comms/minicom/files/patch-src-window.c (nonexistent) +++ head/comms/minicom/files/patch-src-window.c (revision 363168) @@ -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; Property changes on: head/comms/minicom/files/patch-src-window.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/comms/mlan3/files/patch-aa =================================================================== --- head/comms/mlan3/files/patch-aa (revision 363167) +++ head/comms/mlan3/files/patch-aa (nonexistent) @@ -1,301 +0,0 @@ ---- Makefile Thu Jan 1 01:00:00 1970 -+++ Makefile Wed Oct 27 17:03:17 2004 -@@ -0,0 +1,4 @@ -+ -+SUBDIR= lib apps -+ -+.include ---- 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 -+ ---- 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 ---- 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 ---- 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 -+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 ---- apps/fish/Makefile Thu Jan 1 01:00:00 1970 -+++ apps/fish/Makefile Wed Oct 27 17:03:17 2004 -@@ -0,0 +1,15 @@ -+PROG= fish -+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 ---- apps/gethumd/Makefile Thu Jan 1 01:00:00 1970 -+++ apps/gethumd/Makefile Wed Oct 27 17:03:17 2004 -@@ -0,0 +1,15 @@ -+PROG= gethumd -+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 ---- apps/memutil/Makefile Thu Jan 1 01:00:00 1970 -+++ apps/memutil/Makefile Wed Oct 27 17:03:17 2004 -@@ -0,0 +1,15 @@ -+PROG= memutil -+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 ---- apps/mweather/Makefile Thu Jan 1 01:00:00 1970 -+++ apps/mweather/Makefile Wed Oct 27 17:03:17 2004 -@@ -0,0 +1,15 @@ -+PROG= mweather -+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 ---- apps/shaapp/Makefile Thu Jan 1 01:00:00 1970 -+++ apps/shaapp/Makefile Wed Oct 27 17:03:17 2004 -@@ -0,0 +1,15 @@ -+PROG= shaapp -+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 ---- apps/swtloop/Makefile.app Thu Jan 1 01:00:00 1970 -+++ apps/swtloop/Makefile.app Wed Oct 27 17:03:17 2004 -@@ -0,0 +1,8 @@ -+PROG= tstfind -+CFLAGS= -I. -Wall -I ../../common -+LDFLAGS= -L ../../common -L ../../lib/userial -+LDADD= -lmlanser -lmlancom -+NOMAN= true -+SRCS= tstfind.c -+ -+.include ---- apps/swtsngl/Makefile Thu Jan 1 01:00:00 1970 -+++ apps/swtsngl/Makefile Wed Oct 27 17:03:17 2004 -@@ -0,0 +1,15 @@ -+PROG= swtsngl -+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 ---- apps/temp/Makefile Thu Jan 1 01:00:00 1970 -+++ apps/temp/Makefile Wed Oct 27 17:03:17 2004 -@@ -0,0 +1,15 @@ -+PROG= temp -+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 ---- apps/thermo/Makefile.app Thu Jan 1 01:00:00 1970 -+++ apps/thermo/Makefile.app Wed Oct 27 17:03:17 2004 -@@ -0,0 +1,8 @@ -+PROG= tstfind -+CFLAGS= -I. -Wall -I ../../common -+LDFLAGS= -L ../../common -L ../../lib/userial -+LDADD= -lmlanser -lmlancom -+NOMAN= true -+SRCS= tstfind.c -+ -+.include ---- apps/tstfind/Makefile Thu Jan 1 01:00:00 1970 -+++ apps/tstfind/Makefile Wed Oct 27 17:03:17 2004 -@@ -0,0 +1,15 @@ -+PROG= tstfind -+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 ---- common/ownet.h Fri Sep 28 21:42:02 2001 -+++ common/ownet.h Wed Oct 27 17:03:17 2004 -@@ -133,6 +133,10 @@ - typedef unsigned short ushort; - typedef unsigned long ulong; - #endif -+ #if (__FreeBSD__) -+ #include -+ typedef unsigned long ulong; -+ #endif - #endif - #ifdef SDCC - //intent of ushort is 2 bytes unsigned. ---- lib/Makefile Thu Jan 1 01:00:00 1970 -+++ lib/Makefile Wed Oct 27 17:03:17 2004 -@@ -0,0 +1,3 @@ -+SUBDIR= userial -+ -+.include ---- lib/userial/Link/linuxlnk.c Fri Sep 28 21:42:14 2001 -+++ lib/userial/Link/linuxlnk.c Wed Oct 27 17:03:17 2004 -@@ -93,6 +93,7 @@ - #include - #include - #include -+#include - - #include "ds2480.h" - #include "ownet.h" ---- lib/userial/Makefile Thu Jan 1 01:00:00 1970 -+++ lib/userial/Makefile Wed Oct 27 17:03:56 2004 -@@ -0,0 +1,33 @@ -+MLANCOM= ${.CURDIR}/../../common -+MLANLNK= ${.CURDIR}/Link -+LIB= mlan -+CFLAGS= -I. -Wall -I${MLANCOM} -+NOPROFILE= yes -+PREFIX?= /usr/local -+LIBDIR= ${PREFIX}/lib -+ -+ -+.PATH: ${MLANCOM} ${MLANLNK} -+ -+SRCS= ds2480ut.c owllu.c ownetu.c owsesu.c owtrnu.c -+ -+SRCS+= linuxlnk.c -+ -+SRCS+= ad26.c atod20.c cnt1d.c \ -+ crcutil.c findtype.c ibsha33o.c \ -+ ioutil.c mbappreg.c mbee.c \ -+ mbeprom.c mbnv.c mbnvcrc.c \ -+ mbscr.c mbscrcrc.c mbscree.c \ -+ mbscrex.c mbsha.c mbshaee.c \ -+ owcache.c owerr.c owfile.c \ -+ owpgrw.c owprgm.c rawmem.c \ -+ screenio.c sha18.c sha33.c \ -+ shadebit.c shadebitvm.c shaibutton.c \ -+ swt05.c swt12.c swt1f.c \ -+ temp10.c thermo21.c weather.c -+ -+beforeinstall: -+ ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ -+ ${_INSTALLFLAGS} ${MLANCOM}/ownet.h ${DESTDIR}/${PREFIX}/include -+ -+.include Property changes on: head/comms/mlan3/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/comms/mlan3/files/patch-Makefiles =================================================================== --- head/comms/mlan3/files/patch-Makefiles (nonexistent) +++ head/comms/mlan3/files/patch-Makefiles (revision 363168) @@ -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 +--- 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 ++ +--- 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 +--- 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 +--- 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 ++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 +--- apps/fish/Makefile Thu Jan 1 01:00:00 1970 ++++ apps/fish/Makefile Wed Oct 27 17:03:17 2004 +@@ -0,0 +1,15 @@ ++PROG= fish ++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 +--- apps/gethumd/Makefile Thu Jan 1 01:00:00 1970 ++++ apps/gethumd/Makefile Wed Oct 27 17:03:17 2004 +@@ -0,0 +1,15 @@ ++PROG= gethumd ++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 +--- apps/memutil/Makefile Thu Jan 1 01:00:00 1970 ++++ apps/memutil/Makefile Wed Oct 27 17:03:17 2004 +@@ -0,0 +1,15 @@ ++PROG= memutil ++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 +--- apps/mweather/Makefile Thu Jan 1 01:00:00 1970 ++++ apps/mweather/Makefile Wed Oct 27 17:03:17 2004 +@@ -0,0 +1,15 @@ ++PROG= mweather ++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 +--- apps/shaapp/Makefile Thu Jan 1 01:00:00 1970 ++++ apps/shaapp/Makefile Wed Oct 27 17:03:17 2004 +@@ -0,0 +1,15 @@ ++PROG= shaapp ++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 +--- apps/swtloop/Makefile.app Thu Jan 1 01:00:00 1970 ++++ apps/swtloop/Makefile.app Wed Oct 27 17:03:17 2004 +@@ -0,0 +1,8 @@ ++PROG= tstfind ++CFLAGS= -I. -Wall -I ../../common ++LDFLAGS= -L ../../common -L ../../lib/userial ++LDADD= -lmlanser -lmlancom ++NOMAN= true ++SRCS= tstfind.c ++ ++.include +--- apps/swtsngl/Makefile Thu Jan 1 01:00:00 1970 ++++ apps/swtsngl/Makefile Wed Oct 27 17:03:17 2004 +@@ -0,0 +1,15 @@ ++PROG= swtsngl ++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 +--- apps/temp/Makefile Thu Jan 1 01:00:00 1970 ++++ apps/temp/Makefile Wed Oct 27 17:03:17 2004 +@@ -0,0 +1,15 @@ ++PROG= temp ++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 +--- apps/thermo/Makefile.app Thu Jan 1 01:00:00 1970 ++++ apps/thermo/Makefile.app Wed Oct 27 17:03:17 2004 +@@ -0,0 +1,8 @@ ++PROG= tstfind ++CFLAGS= -I. -Wall -I ../../common ++LDFLAGS= -L ../../common -L ../../lib/userial ++LDADD= -lmlanser -lmlancom ++NOMAN= true ++SRCS= tstfind.c ++ ++.include +--- apps/tstfind/Makefile Thu Jan 1 01:00:00 1970 ++++ apps/tstfind/Makefile Wed Oct 27 17:03:17 2004 +@@ -0,0 +1,15 @@ ++PROG= tstfind ++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 +--- common/ownet.h Fri Sep 28 21:42:02 2001 ++++ common/ownet.h Wed Oct 27 17:03:17 2004 +@@ -133,6 +133,10 @@ + typedef unsigned short ushort; + typedef unsigned long ulong; + #endif ++ #if (__FreeBSD__) ++ #include ++ typedef unsigned long ulong; ++ #endif + #endif + #ifdef SDCC + //intent of ushort is 2 bytes unsigned. +--- lib/Makefile Thu Jan 1 01:00:00 1970 ++++ lib/Makefile Wed Oct 27 17:03:17 2004 +@@ -0,0 +1,3 @@ ++SUBDIR= userial ++ ++.include +--- lib/userial/Link/linuxlnk.c Fri Sep 28 21:42:14 2001 ++++ lib/userial/Link/linuxlnk.c Wed Oct 27 17:03:17 2004 +@@ -93,6 +93,7 @@ + #include + #include + #include ++#include + + #include "ds2480.h" + #include "ownet.h" +--- lib/userial/Makefile Thu Jan 1 01:00:00 1970 ++++ lib/userial/Makefile Wed Oct 27 17:03:56 2004 +@@ -0,0 +1,33 @@ ++MLANCOM= ${.CURDIR}/../../common ++MLANLNK= ${.CURDIR}/Link ++LIB= mlan ++CFLAGS= -I. -Wall -I${MLANCOM} ++NOPROFILE= yes ++PREFIX?= /usr/local ++LIBDIR= ${PREFIX}/lib ++ ++ ++.PATH: ${MLANCOM} ${MLANLNK} ++ ++SRCS= ds2480ut.c owllu.c ownetu.c owsesu.c owtrnu.c ++ ++SRCS+= linuxlnk.c ++ ++SRCS+= ad26.c atod20.c cnt1d.c \ ++ crcutil.c findtype.c ibsha33o.c \ ++ ioutil.c mbappreg.c mbee.c \ ++ mbeprom.c mbnv.c mbnvcrc.c \ ++ mbscr.c mbscrcrc.c mbscree.c \ ++ mbscrex.c mbsha.c mbshaee.c \ ++ owcache.c owerr.c owfile.c \ ++ owpgrw.c owprgm.c rawmem.c \ ++ screenio.c sha18.c sha33.c \ ++ shadebit.c shadebitvm.c shaibutton.c \ ++ swt05.c swt12.c swt1f.c \ ++ temp10.c thermo21.c weather.c ++ ++beforeinstall: ++ ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ++ ${_INSTALLFLAGS} ${MLANCOM}/ownet.h ${DESTDIR}/${PREFIX}/include ++ ++.include Property changes on: head/comms/mlan3/files/patch-Makefiles ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/comms/p5-Device-SerialPort/files/patch-aa =================================================================== --- head/comms/p5-Device-SerialPort/files/patch-aa (revision 363167) +++ head/comms/p5-Device-SerialPort/files/patch-aa (nonexistent) @@ -1,14 +0,0 @@ ---- Makefile.PL.orig Fri Jul 20 19:27:38 2007 -+++ Makefile.PL Wed Sep 12 15:53:10 2007 -@@ -25,8 +25,9 @@ - # testing. - if (scalar(@SERIALS)>0 && $SERIALS[0] eq "auto") { - print "Trying to find a serial port for testing...\n"; -- @SERIALS=( "/dev/ttyS1", "/dev/cua01", "/dev/cua/b", "/dev/tty1", -- "/dev/tty.modem" ); -+ @SERIALS=( "/dev/ttyU0", "/dev/ucom0", "/dev/ttyd0", "/dev/cuad0", -+ "/dev/ttyu0", "/dev/cuau0", "/dev/cuaa0", "/dev/ttya", -+ "/dev/ttyb" ); - print "(use 'perl Makefile.PL TESTPORT=' to override this search)\n"; - } - Property changes on: head/comms/p5-Device-SerialPort/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/comms/p5-Device-SerialPort/files/patch-Makefile.PL =================================================================== --- head/comms/p5-Device-SerialPort/files/patch-Makefile.PL (nonexistent) +++ head/comms/p5-Device-SerialPort/files/patch-Makefile.PL (revision 363168) @@ -0,0 +1,14 @@ +--- Makefile.PL.orig Fri Jul 20 19:27:38 2007 ++++ Makefile.PL Wed Sep 12 15:53:10 2007 +@@ -25,8 +25,9 @@ + # testing. + if (scalar(@SERIALS)>0 && $SERIALS[0] eq "auto") { + print "Trying to find a serial port for testing...\n"; +- @SERIALS=( "/dev/ttyS1", "/dev/cua01", "/dev/cua/b", "/dev/tty1", +- "/dev/tty.modem" ); ++ @SERIALS=( "/dev/ttyU0", "/dev/ucom0", "/dev/ttyd0", "/dev/cuad0", ++ "/dev/ttyu0", "/dev/cuau0", "/dev/cuaa0", "/dev/ttya", ++ "/dev/ttyb" ); + print "(use 'perl Makefile.PL TESTPORT=' to override this search)\n"; + } + Property changes on: head/comms/p5-Device-SerialPort/files/patch-Makefile.PL ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/comms/seyon/files/patch-aa =================================================================== --- head/comms/seyon/files/patch-aa (revision 363167) +++ head/comms/seyon/files/patch-aa (nonexistent) @@ -1,102 +0,0 @@ -diff -c ./SePort.c ../seyon.new/SePort.c -*** ./SePort.c Wed Apr 21 15:38:31 1993 ---- ../seyon.new/SePort.c Fri Feb 3 07:37:50 1995 -*************** -*** 627,645 **** - #endif - break; - #if USE_NONSTD_BAUD -- #ifdef linux - case 57600: - baudrate = B38400; - ser_io.flags &= ~ASYNC_SPD_MASK; - ser_io.flags |= ASYNC_SPD_HI; - break; - case 115200: - baudrate = B38400; - ser_io.flags &= ~ASYNC_SPD_MASK; - ser_io.flags |= ASYNC_SPD_VHI; - break; - #endif -- #endif - default: - return (-1); - } ---- 627,651 ---- - #endif - break; - #if USE_NONSTD_BAUD - case 57600: -+ #ifdef linux - baudrate = B38400; - ser_io.flags &= ~ASYNC_SPD_MASK; - ser_io.flags |= ASYNC_SPD_HI; -+ #else -+ baudrate = B57600; -+ #endif - break; - case 115200: -+ #ifdef linux - baudrate = B38400; - ser_io.flags &= ~ASYNC_SPD_MASK; - ser_io.flags |= ASYNC_SPD_VHI; -+ #else -+ baudrate = B115200; -+ #endif - break; - #endif - default: - return (-1); - } -*************** -*** 691,696 **** ---- 697,710 ---- - #endif - #endif - return 38400; -+ #if USE_NONSTD_BAUD -+ #ifndef linux -+ case B57600: -+ return(57600); -+ case B115200: -+ return(115200); -+ #endif -+ #endif - } - - SeError("Consistency error in baud rate"); -Only in ../seyon.new: SePort.c.orig -diff -c ./SeSubs.c ../seyon.new/SeSubs.c -*** ./SeSubs.c Fri Apr 23 12:24:17 1993 ---- ../seyon.new/SeSubs.c Fri Feb 3 07:47:37 1995 -*************** -*** 249,254 **** ---- 249,256 ---- - - if (setuid(getuid()) < 0) - SePError("Failed to set effective uid"); -+ if (setgid(getgid()) < 0) -+ SePError("Failed to set effective gid"); - - if (*scmd == '\0') { - SeNotice(FmtString1("Executing the shell ``%s''", shell)); -diff -c ./config.h ../seyon.new/config.h -*** ./config.h Wed Apr 21 14:47:48 1993 ---- ../seyon.new/config.h Fri Feb 3 07:37:50 1995 -*************** -*** 81,86 **** ---- 81,94 ---- - #define HAVE_USLEEP YES - #endif - -+ #ifdef __FreeBSD__ -+ #define USE_NONSTD_BAUD YES -+ #define LF_PATH "/var/spool/lock" -+ #define LF_PREFIX "LCK.." -+ #define LF_USE_ASCII_PID YES -+ #define LF_USE_DEV_NUMBERS NO -+ #endif -+ - #ifdef SVR4 - #define HAVE_TERMIOS YES - #define HAVE_MODEM_CONTROL YES Property changes on: head/comms/seyon/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/comms/seyon/files/patch-ab =================================================================== --- head/comms/seyon/files/patch-ab (revision 363167) +++ head/comms/seyon/files/patch-ab (nonexistent) @@ -1,29 +0,0 @@ ---- SePort.c.orig Thu Apr 4 11:44:26 1996 -+++ SePort.c Thu Apr 4 11:51:54 1996 -@@ -1011,6 +1011,7 @@ - pid_t pid, - lckpid; - char *modemname; -+ int killret; - #if LF_USE_ASCII_PID - char pidstr[20], - lckpidstr[20]; -@@ -1077,11 +1078,13 @@ - #endif - - lockPid = (pid_t) lckpid; -- if (kill(lckpid, 0) == 0) { -- SeErrorF("Device %s is locked by process %d", modem_port, lckpid, ""); -- unlink(ltmp); -- return -1; -- } -+ killret = kill(lockPid, 0); -+ if(killret == 0 || (killret == -1 && errno != ESRCH)) { -+ SeErrorF("Device %s is locked by process %d.", -+ modem_port, lckpid, ""); -+ unlink(ltmp); -+ return -1; -+ } - } - } - Property changes on: head/comms/seyon/files/patch-ab ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/comms/seyon/files/patch-ac =================================================================== --- head/comms/seyon/files/patch-ac (revision 363167) +++ head/comms/seyon/files/patch-ac (nonexistent) @@ -1,13 +0,0 @@ ---- SeDecl.h.orig Sat Nov 8 08:56:16 1997 -+++ SeDecl.h Sat Nov 8 10:53:12 1997 -@@ -56,7 +56,9 @@ - extern FILE *open_file(), - *open_file_va(); - extern void send_break(), -- usleep(), -+ #if !defined(__FreeBSD__) || (__FreeBSD__ < 3) -+ usleep(), -+ #endif - show(), - showf(), - SeyonMessage(), Property changes on: head/comms/seyon/files/patch-ac ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/comms/seyon/files/patch-ad =================================================================== --- head/comms/seyon/files/patch-ad (revision 363167) +++ head/comms/seyon/files/patch-ad (nonexistent) @@ -1,15 +0,0 @@ ---- Imakefile.orig Mon Mar 29 13:40:32 1999 -+++ Imakefile Mon Mar 29 13:40:41 1999 -@@ -46,13 +46,6 @@ - InstallAppDefaultsLong(Seyon-co,Seyon-color) - InstallNonExecFile(seyon.help,$(LIBDIR)) - --install:: -- @if [ ! -d $(HOME)/.seyon ]; then mkdir $(HOME)/.seyon; fi; \ -- echo "=== Copying example files (no overwrite) to $(HOME)/.seyon ..."; \ -- for i in phonelist protocols startup script.*; do \ -- if [ ! -f $(HOME)/.seyon/$$i ]; then cp $$i $(HOME)/.seyon; fi;\ -- done; -- - clean:: - rm -f version.h y.tab.* SeParse.c Property changes on: head/comms/seyon/files/patch-ad ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/comms/seyon/files/patch-FreeBSD-specific-fixes =================================================================== --- head/comms/seyon/files/patch-FreeBSD-specific-fixes (nonexistent) +++ head/comms/seyon/files/patch-FreeBSD-specific-fixes (revision 363168) @@ -0,0 +1,102 @@ +diff -c ./SePort.c ../seyon.new/SePort.c +*** ./SePort.c Wed Apr 21 15:38:31 1993 +--- ../seyon.new/SePort.c Fri Feb 3 07:37:50 1995 +*************** +*** 627,645 **** + #endif + break; + #if USE_NONSTD_BAUD +- #ifdef linux + case 57600: + baudrate = B38400; + ser_io.flags &= ~ASYNC_SPD_MASK; + ser_io.flags |= ASYNC_SPD_HI; + break; + case 115200: + baudrate = B38400; + ser_io.flags &= ~ASYNC_SPD_MASK; + ser_io.flags |= ASYNC_SPD_VHI; + break; + #endif +- #endif + default: + return (-1); + } +--- 627,651 ---- + #endif + break; + #if USE_NONSTD_BAUD + case 57600: ++ #ifdef linux + baudrate = B38400; + ser_io.flags &= ~ASYNC_SPD_MASK; + ser_io.flags |= ASYNC_SPD_HI; ++ #else ++ baudrate = B57600; ++ #endif + break; + case 115200: ++ #ifdef linux + baudrate = B38400; + ser_io.flags &= ~ASYNC_SPD_MASK; + ser_io.flags |= ASYNC_SPD_VHI; ++ #else ++ baudrate = B115200; ++ #endif + break; + #endif + default: + return (-1); + } +*************** +*** 691,696 **** +--- 697,710 ---- + #endif + #endif + return 38400; ++ #if USE_NONSTD_BAUD ++ #ifndef linux ++ case B57600: ++ return(57600); ++ case B115200: ++ return(115200); ++ #endif ++ #endif + } + + SeError("Consistency error in baud rate"); +Only in ../seyon.new: SePort.c.orig +diff -c ./SeSubs.c ../seyon.new/SeSubs.c +*** ./SeSubs.c Fri Apr 23 12:24:17 1993 +--- ../seyon.new/SeSubs.c Fri Feb 3 07:47:37 1995 +*************** +*** 249,254 **** +--- 249,256 ---- + + if (setuid(getuid()) < 0) + SePError("Failed to set effective uid"); ++ if (setgid(getgid()) < 0) ++ SePError("Failed to set effective gid"); + + if (*scmd == '\0') { + SeNotice(FmtString1("Executing the shell ``%s''", shell)); +diff -c ./config.h ../seyon.new/config.h +*** ./config.h Wed Apr 21 14:47:48 1993 +--- ../seyon.new/config.h Fri Feb 3 07:37:50 1995 +*************** +*** 81,86 **** +--- 81,94 ---- + #define HAVE_USLEEP YES + #endif + ++ #ifdef __FreeBSD__ ++ #define USE_NONSTD_BAUD YES ++ #define LF_PATH "/var/spool/lock" ++ #define LF_PREFIX "LCK.." ++ #define LF_USE_ASCII_PID YES ++ #define LF_USE_DEV_NUMBERS NO ++ #endif ++ + #ifdef SVR4 + #define HAVE_TERMIOS YES + #define HAVE_MODEM_CONTROL YES Property changes on: head/comms/seyon/files/patch-FreeBSD-specific-fixes ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/comms/seyon/files/patch-Imakefile =================================================================== --- head/comms/seyon/files/patch-Imakefile (nonexistent) +++ head/comms/seyon/files/patch-Imakefile (revision 363168) @@ -0,0 +1,15 @@ +--- Imakefile.orig Mon Mar 29 13:40:32 1999 ++++ Imakefile Mon Mar 29 13:40:41 1999 +@@ -46,13 +46,6 @@ + InstallAppDefaultsLong(Seyon-co,Seyon-color) + InstallNonExecFile(seyon.help,$(LIBDIR)) + +-install:: +- @if [ ! -d $(HOME)/.seyon ]; then mkdir $(HOME)/.seyon; fi; \ +- echo "=== Copying example files (no overwrite) to $(HOME)/.seyon ..."; \ +- for i in phonelist protocols startup script.*; do \ +- if [ ! -f $(HOME)/.seyon/$$i ]; then cp $$i $(HOME)/.seyon; fi;\ +- done; +- + clean:: + rm -f version.h y.tab.* SeParse.c Property changes on: head/comms/seyon/files/patch-Imakefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/comms/seyon/files/patch-SeDecl.h =================================================================== --- head/comms/seyon/files/patch-SeDecl.h (nonexistent) +++ head/comms/seyon/files/patch-SeDecl.h (revision 363168) @@ -0,0 +1,13 @@ +--- SeDecl.h.orig Sat Nov 8 08:56:16 1997 ++++ SeDecl.h Sat Nov 8 10:53:12 1997 +@@ -56,7 +56,9 @@ + extern FILE *open_file(), + *open_file_va(); + extern void send_break(), +- usleep(), ++ #if !defined(__FreeBSD__) || (__FreeBSD__ < 3) ++ usleep(), ++ #endif + show(), + showf(), + SeyonMessage(), Property changes on: head/comms/seyon/files/patch-SeDecl.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/comms/seyon/files/patch-SePort.c =================================================================== --- head/comms/seyon/files/patch-SePort.c (nonexistent) +++ head/comms/seyon/files/patch-SePort.c (revision 363168) @@ -0,0 +1,29 @@ +--- SePort.c.orig Thu Apr 4 11:44:26 1996 ++++ SePort.c Thu Apr 4 11:51:54 1996 +@@ -1011,6 +1011,7 @@ + pid_t pid, + lckpid; + char *modemname; ++ int killret; + #if LF_USE_ASCII_PID + char pidstr[20], + lckpidstr[20]; +@@ -1077,11 +1078,13 @@ + #endif + + lockPid = (pid_t) lckpid; +- if (kill(lckpid, 0) == 0) { +- SeErrorF("Device %s is locked by process %d", modem_port, lckpid, ""); +- unlink(ltmp); +- return -1; +- } ++ killret = kill(lockPid, 0); ++ if(killret == 0 || (killret == -1 && errno != ESRCH)) { ++ SeErrorF("Device %s is locked by process %d.", ++ modem_port, lckpid, ""); ++ unlink(ltmp); ++ return -1; ++ } + } + } + Property changes on: head/comms/seyon/files/patch-SePort.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/comms/sredird/files/patch-aa =================================================================== --- head/comms/sredird/files/patch-aa (revision 363167) +++ head/comms/sredird/files/patch-aa (nonexistent) @@ -1,52 +0,0 @@ ---- sredird.c.orig Wed Dec 28 15:35:00 2005 -+++ sredird.c Wed Dec 28 15:39:43 2005 -@@ -110,7 +110,12 @@ - #include - #include - #include -+#ifndef __FreeBSD__ - #include -+#else -+#include -+#include -+#endif - #include - #include - #include -@@ -196,6 +201,13 @@ - /* Default modem state polling in milliseconds (100 msec should be enough) */ - #define ModemStatePolling 100 - -+#ifdef __FreeBSD__ -+struct tms mytms; -+#define times(NULL) times(&mytms) -+#define SOL_TCP getprotobyname("TCP")->p_proto -+#define SOL_IP getprotobyname("IP")->p_proto -+#endif -+ - /* Standard boolean definition */ - typedef enum { False, True } Boolean; - -@@ -714,8 +726,10 @@ - return(115200UL); - case B230400: - return(230400UL); -+#ifndef __FreeBSD__ - case B460800: - return(460800UL); -+#endif - default: - return(0UL); - } -@@ -1094,9 +1108,11 @@ - case 230400UL: - Speed = B230400; - break; -+#ifndef __FreeBSD__ - case 460800UL: - Speed = B460800; - break; -+#endif - default: - LogMsg(LOG_WARNING,"Unknwon baud rate requested, setting to 9600."); - Speed = B9600; Property changes on: head/comms/sredird/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/comms/sredird/files/patch-ab =================================================================== --- head/comms/sredird/files/patch-ab (revision 363167) +++ head/comms/sredird/files/patch-ab (nonexistent) @@ -1,31 +0,0 @@ ---- README.orig Wed Dec 28 15:40:48 2005 -+++ README Wed Dec 28 15:42:52 2005 -@@ -101,21 +101,19 @@ - - 5 - Installation - --Put the executable in a suitable directory (/usr/sbin or /usr/local/sbin). -+Put the executable in a suitable directory (/usr/libexec or /usr/local/libexec). - Sredird is designed to run under inetd control. The line in the inetd - configuration file (usually /etc/inetd.conf) should look like this: - --sredir stream tcp nowait root /usr/sbin/tcpd /usr/sbin/sredird -i 5 /dev/modem /var/lock/LCK..modem -+sredir stream tcp nowait root /usr/local/libexec/sredird sredird -i 5 /dev/cuaa0 /var/spool/lock/LCK..cuaa0 - - Of course, "sredir" should be defined in the services file (usually --/etc/services, usual values start at port 7000) and "/dev/modem" should -+/etc/services, usual values start at port 7000) and "/dev/cuaa0" should - be substituted by the appropriate device. The lock and the device name --must match for correct interlocking with other programs. The tcpd program --is the usual tcp wrapper that's not needed for correct operation but --is useful for security purposes. Don't forget to send a SIGHUP to the --inetd daemon in order to force reload of the configuration file. The --initial -i paramater is optional and enables compatibility with the --Cisco IOS. -+must match for correct interlocking with other programs. Don't forget to -+send a SIGHUP to the inetd daemon in order to force reload of the -+configuration file. The initial -i paramater is optional and enables -+compatibility with the Cisco IOS. - - 6 - Bugs - Property changes on: head/comms/sredird/files/patch-ab ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/comms/sredird/files/patch-README =================================================================== --- head/comms/sredird/files/patch-README (nonexistent) +++ head/comms/sredird/files/patch-README (revision 363168) @@ -0,0 +1,31 @@ +--- README.orig Wed Dec 28 15:40:48 2005 ++++ README Wed Dec 28 15:42:52 2005 +@@ -101,21 +101,19 @@ + + 5 - Installation + +-Put the executable in a suitable directory (/usr/sbin or /usr/local/sbin). ++Put the executable in a suitable directory (/usr/libexec or /usr/local/libexec). + Sredird is designed to run under inetd control. The line in the inetd + configuration file (usually /etc/inetd.conf) should look like this: + +-sredir stream tcp nowait root /usr/sbin/tcpd /usr/sbin/sredird -i 5 /dev/modem /var/lock/LCK..modem ++sredir stream tcp nowait root /usr/local/libexec/sredird sredird -i 5 /dev/cuaa0 /var/spool/lock/LCK..cuaa0 + + Of course, "sredir" should be defined in the services file (usually +-/etc/services, usual values start at port 7000) and "/dev/modem" should ++/etc/services, usual values start at port 7000) and "/dev/cuaa0" should + be substituted by the appropriate device. The lock and the device name +-must match for correct interlocking with other programs. The tcpd program +-is the usual tcp wrapper that's not needed for correct operation but +-is useful for security purposes. Don't forget to send a SIGHUP to the +-inetd daemon in order to force reload of the configuration file. The +-initial -i paramater is optional and enables compatibility with the +-Cisco IOS. ++must match for correct interlocking with other programs. Don't forget to ++send a SIGHUP to the inetd daemon in order to force reload of the ++configuration file. The initial -i paramater is optional and enables ++compatibility with the Cisco IOS. + + 6 - Bugs + Property changes on: head/comms/sredird/files/patch-README ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/comms/sredird/files/patch-sredird.c =================================================================== --- head/comms/sredird/files/patch-sredird.c (nonexistent) +++ head/comms/sredird/files/patch-sredird.c (revision 363168) @@ -0,0 +1,52 @@ +--- sredird.c.orig Wed Dec 28 15:35:00 2005 ++++ sredird.c Wed Dec 28 15:39:43 2005 +@@ -110,7 +110,12 @@ + #include + #include + #include ++#ifndef __FreeBSD__ + #include ++#else ++#include ++#include ++#endif + #include + #include + #include +@@ -196,6 +201,13 @@ + /* Default modem state polling in milliseconds (100 msec should be enough) */ + #define ModemStatePolling 100 + ++#ifdef __FreeBSD__ ++struct tms mytms; ++#define times(NULL) times(&mytms) ++#define SOL_TCP getprotobyname("TCP")->p_proto ++#define SOL_IP getprotobyname("IP")->p_proto ++#endif ++ + /* Standard boolean definition */ + typedef enum { False, True } Boolean; + +@@ -714,8 +726,10 @@ + return(115200UL); + case B230400: + return(230400UL); ++#ifndef __FreeBSD__ + case B460800: + return(460800UL); ++#endif + default: + return(0UL); + } +@@ -1094,9 +1108,11 @@ + case 230400UL: + Speed = B230400; + break; ++#ifndef __FreeBSD__ + case 460800UL: + Speed = B460800; + break; ++#endif + default: + LogMsg(LOG_WARNING,"Unknwon baud rate requested, setting to 9600."); + Speed = B9600; Property changes on: head/comms/sredird/files/patch-sredird.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/comms/tkhylafax/files/patch-aa =================================================================== --- head/comms/tkhylafax/files/patch-aa (revision 363167) +++ head/comms/tkhylafax/files/patch-aa (nonexistent) @@ -1,74 +0,0 @@ ---- Makefile.orig 1998-03-14 20:57:48.000000000 +0100 -+++ Makefile 2013-10-23 15:12:54.000000000 +0200 -@@ -5,7 +5,7 @@ - - ### EDIT THE NEXT LINES ONLY ### - --PREFIX = /usr/local -+#PREFIX = /usr/local - - # The directory where the tkhylafax library will be installed - TCLLIB_DEST = $(PREFIX)/lib/tkhylafax-3.2 -@@ -17,13 +17,13 @@ - TCLMAN_DEST = $(PREFIX)/man/man1 - - # The full path to tclsh --TCLSH = /usr/bin/tclsh -+#TCLSH = /usr/bin/tclsh - - # The full path to wish. --WISH = /usr/bin/wish -+#WISH = /usr/bin/wish - - # The full path to your postscript viewer --GHOSTVIEW = /usr/X11/bin/gv -+GHOSTVIEW = ${LOCALBASE}/bin/gv - - ### DON'T EDIT ANYTHING BELOW THIS LINE ### - -@@ -52,11 +52,10 @@ - - all: - $(MAKE) build -- $(MAKE) install - - build: Makefile - @echo "Patching tkhylafax..." -- sed -e 's|XXX_TKHYLAFAX_XXX|$(TCLLIB_DEST)|g' \ -+ sed -e 's|XXX_TKHYLAFAX_XXX|$(TCLLIB_DEST:S/${STAGEDIR}//)|g' \ - -e 's|XXX_WISH_XXX|$(WISH)|g' \ - -e 's|XXX_GHOSTVIEW_XXX|$(GHOSTVIEW)|g' \ - tkhylafax.unpatched > $(TCLPRG_FILE) -@@ -66,27 +65,28 @@ - - $(TCLLIB_DEST): - if [ ! -d $(TCLLIB_DEST) ]; then mkdir -p $(TCLLIB_DEST); fi -- chmod 775 $(TCLLIB_DEST) -+ chmod 755 $(TCLLIB_DEST) - - install.lib: $(TCLLIB_DEST) - @echo "Installing tkhylafax library..." - -for i in $(TCLLIB_FILES) ; do \ - cp $$i $(TCLLIB_DEST)/$$i ; \ -- chmod 664 $(TCLLIB_DEST)/$$i ; \ -+ chmod 644 $(TCLLIB_DEST)/$$i ; \ - done - @echo "Done" - - $(TCLPRG_DEST): - if [ ! -d $(TCLPRG_DEST) ]; then mkdir -p $(TCLPRG_DEST); fi -- chmod 775 $(TCLPRG_DEST) -+ chmod 755 $(TCLPRG_DEST) - - install.tkhylafax: $(TCLPRG_DEST) $(TCLPRG_FILE) - @echo "Installing tkhylafax command..." - cp $(TCLPRG_FILE) $(TCLPRG_DEST)/$(TCLPRG_FILE) -- chmod 775 $(TCLPRG_DEST)/$(TCLPRG_FILE) -+ chmod 755 $(TCLPRG_DEST)/$(TCLPRG_FILE) - @echo "Done" - - install.man: -+ if [ ! -d $(TCLMAN_DEST) ]; then mkdir -p $(TCLMAN_DEST); fi - cp $(TCLMAN_FILE).man $(TCLMAN_DEST)/$(TCLMAN_FILE).1 - - clean: Property changes on: head/comms/tkhylafax/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/comms/tkhylafax/files/patch-ab =================================================================== --- head/comms/tkhylafax/files/patch-ab (revision 363167) +++ head/comms/tkhylafax/files/patch-ab (nonexistent) @@ -1,35 +0,0 @@ -*** faxIt.t.org Thu Jan 16 21:08:00 2003 ---- faxIt.t Thu Jan 16 21:10:58 2003 -*************** -*** 66,80 **** - $Th_Info(notifyOnRetry) - - if {[string length $Th_Info(name)]} { -- # This MUST appear. -- regsub -all {["'$\\]} $Th_Info(name) {\\&} name -- append options " -d \"$name@$Th_Info(phone)\"" -- - # Make an ID string for later usage - regsub -all {["'$\\]} $Th_Info(company) {\\&} company - append options " -i \"$name@$company\"" - } else { -! # This MUST appear. - append options " -d $Th_Info(phone)" - } - ---- 66,80 ---- - $Th_Info(notifyOnRetry) - - if {[string length $Th_Info(name)]} { - # Make an ID string for later usage -+ regsub -all {["'$\\]} $Th_Info(name) {\\&} name - regsub -all {["'$\\]} $Th_Info(company) {\\&} company - append options " -i \"$name@$company\"" -+ -+ # This MUST appear last. -+ append options " -d \"$name@$Th_Info(phone)\"" - } else { -! # This MUST appear last. - append options " -d $Th_Info(phone)" - } - Property changes on: head/comms/tkhylafax/files/patch-ab ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/comms/tkhylafax/files/patch-Makefile =================================================================== --- head/comms/tkhylafax/files/patch-Makefile (nonexistent) +++ head/comms/tkhylafax/files/patch-Makefile (revision 363168) @@ -0,0 +1,74 @@ +--- Makefile.orig 1998-03-14 20:57:48.000000000 +0100 ++++ Makefile 2013-10-23 15:12:54.000000000 +0200 +@@ -5,7 +5,7 @@ + + ### EDIT THE NEXT LINES ONLY ### + +-PREFIX = /usr/local ++#PREFIX = /usr/local + + # The directory where the tkhylafax library will be installed + TCLLIB_DEST = $(PREFIX)/lib/tkhylafax-3.2 +@@ -17,13 +17,13 @@ + TCLMAN_DEST = $(PREFIX)/man/man1 + + # The full path to tclsh +-TCLSH = /usr/bin/tclsh ++#TCLSH = /usr/bin/tclsh + + # The full path to wish. +-WISH = /usr/bin/wish ++#WISH = /usr/bin/wish + + # The full path to your postscript viewer +-GHOSTVIEW = /usr/X11/bin/gv ++GHOSTVIEW = ${LOCALBASE}/bin/gv + + ### DON'T EDIT ANYTHING BELOW THIS LINE ### + +@@ -52,11 +52,10 @@ + + all: + $(MAKE) build +- $(MAKE) install + + build: Makefile + @echo "Patching tkhylafax..." +- sed -e 's|XXX_TKHYLAFAX_XXX|$(TCLLIB_DEST)|g' \ ++ sed -e 's|XXX_TKHYLAFAX_XXX|$(TCLLIB_DEST:S/${STAGEDIR}//)|g' \ + -e 's|XXX_WISH_XXX|$(WISH)|g' \ + -e 's|XXX_GHOSTVIEW_XXX|$(GHOSTVIEW)|g' \ + tkhylafax.unpatched > $(TCLPRG_FILE) +@@ -66,27 +65,28 @@ + + $(TCLLIB_DEST): + if [ ! -d $(TCLLIB_DEST) ]; then mkdir -p $(TCLLIB_DEST); fi +- chmod 775 $(TCLLIB_DEST) ++ chmod 755 $(TCLLIB_DEST) + + install.lib: $(TCLLIB_DEST) + @echo "Installing tkhylafax library..." + -for i in $(TCLLIB_FILES) ; do \ + cp $$i $(TCLLIB_DEST)/$$i ; \ +- chmod 664 $(TCLLIB_DEST)/$$i ; \ ++ chmod 644 $(TCLLIB_DEST)/$$i ; \ + done + @echo "Done" + + $(TCLPRG_DEST): + if [ ! -d $(TCLPRG_DEST) ]; then mkdir -p $(TCLPRG_DEST); fi +- chmod 775 $(TCLPRG_DEST) ++ chmod 755 $(TCLPRG_DEST) + + install.tkhylafax: $(TCLPRG_DEST) $(TCLPRG_FILE) + @echo "Installing tkhylafax command..." + cp $(TCLPRG_FILE) $(TCLPRG_DEST)/$(TCLPRG_FILE) +- chmod 775 $(TCLPRG_DEST)/$(TCLPRG_FILE) ++ chmod 755 $(TCLPRG_DEST)/$(TCLPRG_FILE) + @echo "Done" + + install.man: ++ if [ ! -d $(TCLMAN_DEST) ]; then mkdir -p $(TCLMAN_DEST); fi + cp $(TCLMAN_FILE).man $(TCLMAN_DEST)/$(TCLMAN_FILE).1 + + clean: Property changes on: head/comms/tkhylafax/files/patch-Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/comms/tkhylafax/files/patch-faxIt.t =================================================================== --- head/comms/tkhylafax/files/patch-faxIt.t (nonexistent) +++ head/comms/tkhylafax/files/patch-faxIt.t (revision 363168) @@ -0,0 +1,35 @@ +*** faxIt.t.org Thu Jan 16 21:08:00 2003 +--- faxIt.t Thu Jan 16 21:10:58 2003 +*************** +*** 66,80 **** + $Th_Info(notifyOnRetry) + + if {[string length $Th_Info(name)]} { +- # This MUST appear. +- regsub -all {["'$\\]} $Th_Info(name) {\\&} name +- append options " -d \"$name@$Th_Info(phone)\"" +- + # Make an ID string for later usage + regsub -all {["'$\\]} $Th_Info(company) {\\&} company + append options " -i \"$name@$company\"" + } else { +! # This MUST appear. + append options " -d $Th_Info(phone)" + } + +--- 66,80 ---- + $Th_Info(notifyOnRetry) + + if {[string length $Th_Info(name)]} { + # Make an ID string for later usage ++ regsub -all {["'$\\]} $Th_Info(name) {\\&} name + regsub -all {["'$\\]} $Th_Info(company) {\\&} company + append options " -i \"$name@$company\"" ++ ++ # This MUST appear last. ++ append options " -d \"$name@$Th_Info(phone)\"" + } else { +! # This MUST appear last. + append options " -d $Th_Info(phone)" + } + Property changes on: head/comms/tkhylafax/files/patch-faxIt.t ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/comms/yaps/files/patch-aa =================================================================== --- head/comms/yaps/files/patch-aa (revision 363167) +++ head/comms/yaps/files/patch-aa (nonexistent) @@ -1,87 +0,0 @@ -*** Config.orig Sat Jun 14 19:32:18 1997 ---- Config Tue Aug 8 20:29:41 2000 -*************** -*** 1,9 **** - # -*- sh -*- - # SECTION A.) Global configuration - # Select compiler command -! CC = gcc - # -! CFLAGS = -Wall -Wno-parentheses -Wshadow -Wstrict-prototypes -Wmissing-prototypes - LDFLAGS = - EXLIBS = - # ---- 1,9 ---- - # -*- sh -*- - # SECTION A.) Global configuration - # Select compiler command -! #CC = gcc - # -! #CFLAGS = -Wall -Wno-parentheses -Wshadow -Wstrict-prototypes -Wmissing-prototypes - LDFLAGS = - EXLIBS = - # -*************** -*** 14,35 **** - #LUA = True - # - # Define this to disable debugging -! #NDEBUG = True - # - # - # - # SECTION B.) yaps configuration - # Name and location of global configuration file -! YAPS_CFGFILE = /etc/yaps.rc - # Name of local configuration file (location is $HOME.) - YAPS_LCFGFILE = .yapsrc - # Directory for installing the binary -! YAPS_BINDIR = /usr/local/bin - # Directory for optional support files -! YAPS_LIBDIR = /usr/local/lib/yaps - # User/Group/Mode for yaps - YAPS_USER = bin -! YAPS_GROUP = uucp - YAPS_MODE = 2711 - # User/Group/Mode for global configuration file - YAPS_RCUSER = bin ---- 14,35 ---- - #LUA = True - # - # Define this to disable debugging -! NDEBUG = True - # - # - # - # SECTION B.) yaps configuration - # Name and location of global configuration file -! YAPS_CFGFILE = ${PREFIX}/etc/yaps.rc - # Name of local configuration file (location is $HOME.) - YAPS_LCFGFILE = .yapsrc - # Directory for installing the binary -! YAPS_BINDIR = ${PREFIX}/bin - # Directory for optional support files -! YAPS_LIBDIR = ${PREFIX}/share/yaps - # User/Group/Mode for yaps - YAPS_USER = bin -! YAPS_GROUP = dialer - YAPS_MODE = 2711 - # User/Group/Mode for global configuration file - YAPS_RCUSER = bin -*************** -*** 56,62 **** - # - ifdef NDEBUG - DDEFS = -DNDEBUG -! G = -O - else - G = -g - endif ---- 56,62 ---- - # - ifdef NDEBUG - DDEFS = -DNDEBUG -! G = - else - G = -g - endif Property changes on: head/comms/yaps/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/comms/yaps/files/patch-ab =================================================================== --- head/comms/yaps/files/patch-ab (revision 363167) +++ head/comms/yaps/files/patch-ab (nonexistent) @@ -1,102 +0,0 @@ -*** config.h.orig Tue Sep 29 15:15:25 1998 ---- config.h Tue Sep 29 15:24:15 1998 -*************** -*** 27,31 **** - * in sys/time.h - */ -! # define HAVE_SYS_SELECT_H 0 - - /* ---- 27,31 ---- - * in sys/time.h - */ -! # define HAVE_SYS_SELECT_H 1 - - /* -*************** -*** 33,37 **** - * conversion/classification - */ -! # define HAVE_LOCALE_H 0 - - /* ---- 33,37 ---- - * conversion/classification - */ -! # define HAVE_LOCALE_H 1 - - /* -*************** -*** 39,48 **** - * very weak replacement is used to find matching services - */ -! # define HAVE_REGEX_H 0 - - /* - * one of these is required for SysV like lockfiles - */ -! # define HAVE_SYS_SYSMACROS_H 1 - # define HAVE_SYS_MKDEV_H 0 - ---- 39,48 ---- - * very weak replacement is used to find matching services - */ -! # define HAVE_REGEX_H 1 - - /* - * one of these is required for SysV like lockfiles - */ -! # define HAVE_SYS_SYSMACROS_H 0 - # define HAVE_SYS_MKDEV_H 0 - -*************** -*** 62,72 **** - * to get valid return values from localtime - */ -! # define HAVE_TZSET 0 - - /* - * If these are not set, chmod()/chown() are used - */ -! # define HAVE_FCHMOD 0 -! # define HAVE_FCHOWN 0 - - /* ---- 62,72 ---- - * to get valid return values from localtime - */ -! # define HAVE_TZSET 1 - - /* - * If these are not set, chmod()/chown() are used - */ -! # define HAVE_FCHMOD 1 -! # define HAVE_FCHOWN 1 - - /* -*************** -*** 74,78 **** - * longjmp() from the signal handler leads into chaos - */ -! # define HAVE_SIGSETJMP 0 - - /* ---- 74,78 ---- - * longjmp() from the signal handler leads into chaos - */ -! # define HAVE_SIGSETJMP 1 - - /* -*************** -*** 106,110 **** - * set this to 1, otherwise to 0 - */ -! # define BROKEN_REALLOC 1 - - /* -------------- END OF CHANGEABLE PART ------------------ */ ---- 106,110 ---- - * set this to 1, otherwise to 0 - */ -! # define BROKEN_REALLOC 0 - - /* -------------- END OF CHANGEABLE PART ------------------ */ Property changes on: head/comms/yaps/files/patch-ab ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/comms/yaps/files/patch-ac =================================================================== --- head/comms/yaps/files/patch-ac (revision 363167) +++ head/comms/yaps/files/patch-ac (nonexistent) @@ -1,10 +0,0 @@ -*** valid.c~ Tue Jun 3 12:09:49 1997 ---- valid.c Tue Sep 29 15:26:39 1998 -*************** -*** 4,7 **** ---- 4,8 ---- - # include - # include -+ # include - # include "pager.h" - # include "valid.h" Property changes on: head/comms/yaps/files/patch-ac ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/comms/yaps/files/patch-ad =================================================================== --- head/comms/yaps/files/patch-ad (revision 363167) +++ head/comms/yaps/files/patch-ad (nonexistent) @@ -1,13 +0,0 @@ -*** tty.c~ Sat Jun 7 16:32:21 1997 ---- tty.c Tue Sep 29 15:32:05 1998 -*************** -*** 23,28 **** ---- 23,30 ---- - # include - # else /* ! HAVE_SYS_SYSMACROS_H && ! HAVE_SYS_MKDEV_H */ -+ # ifndef major - # define major(xx) (((xx) >> 8) & 0xff) - # define minor(xx) ((xx) & 0xff) -+ # endif /* major */ - # endif /* HAVE_SYS_SYSMACROS_H || HAVE_SYS_MKDEV_H */ - # include "pager.h" Property changes on: head/comms/yaps/files/patch-ad ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/comms/yaps/files/patch-ae =================================================================== --- head/comms/yaps/files/patch-ae (revision 363167) +++ head/comms/yaps/files/patch-ae (nonexistent) @@ -1,284 +0,0 @@ ---- yaps.rc~ Wed Jun 11 19:39:06 1997 -+++ yaps.rc Tue Oct 17 21:11:37 2000 -@@ -7,12 +7,11 @@ - ######################################### - # --# This is a comma seperated list of available services. This --# is required for autodetect the matching service for a --# pager-id --services D1,D2,E+ -+# This is a comma seperated list of available services. This list -+# is required to autodetect the matching service for a pager-id. -+services D1_170,D1_171,D2_172,D2_173,E+_177,E+_178 - +services Telmi,Telmi-Fun,Telmi-Family,Telmi-Top,Telmi-Pro - +services Skyper,Quix - # --# This is the default caller-id. If the protocol/service allowes -+# This is the default caller-id. If the protocol/service allows - # it, this is inserted in the message (and the receiver gets this - # as the sender's number) -@@ -23,9 +22,9 @@ - signature (It's me!) - # --# You can either switch the use of the signature here on for all -+# You can either enable the use of the signature here for all - # services or in each service section for that particular service. - use-signature True - # --# To get more verbose output when running yaps increase this value. -+# Increase this value to get more verbose output when running yaps. - # Currently 4 is the highest supported value. - verbose 0 -@@ -33,5 +32,5 @@ - # If you'd like to log every sending session define this. It should - # point to a writeable file. If you install the software setgid, then --# change the group of this file to the same yaps uses and make it -+# change the group of this file to the one yaps uses and make it - # group writeable. - logfile /var/log/yaps.log -@@ -41,5 +40,5 @@ - modems standard - # --# some global defaults for the serial interface (even if the most -+# some global defaults for the serial interface (even if most - # protocols are assuming 7e1, these settings seem to work well) - speed 38400 -@@ -49,11 +48,11 @@ - - # --# To calculate the cost for each call, you can define some globales --# here and do the fine tuning in each protocol -+# To calculate the cost for each call, you can define some globals -+# here and do the fine tuning in each protocol section - cost cost=0.12,unit=DM,remainder=2,dial-overhead=13 - - # --# These are two example of internal conversion tables. The can be --# used using the `convert' entry (see below). -+# These are two examples of internal conversion tables. They can be -+# used via the `convert' entry (see below). - cv-default { - ﾄ [ -@@ -75,5 +74,5 @@ - # - # These values are normally only found in each service section, --# but are listen here with an explaination for completeness. -+# but are listed here with an explaination for completeness. - # - # This is the phone number of the modem gateway for this service -@@ -87,11 +86,11 @@ - - # --# Most services limit the length of a message to a specific length. --# Enter the value here to check valid messages -+# Most services limit the length of a message to some value. -+# Enter the value here to check valid messages. - #max-size 160 - - # - # If a message is longer than max-size, you can set this to split --# it off into several single messages of allowed length -+# it off into several single messages of maximum allowed length. - #may-split True - -@@ -103,5 +102,5 @@ - # - # Some services allow to send more than one message per session. If --# it is limited, set it using this parameter -+# there is a limit, set it using this parameter. - #max-messages 1 - -@@ -111,6 +110,6 @@ - - # --# If the service is reachable over a phonenumber where the pager-id --# is part of the phone number, define this and add a `%P' anywehere -+# If the service is reachable over a phone number where the pager-id -+# is part of the phone number, define this and add a `%P' anywhere - # in the `phone' number. - #insert-pager-id True -@@ -125,6 +124,6 @@ - - # --# Check for valid call id (see below for more details) While --# valid-pid is required, this is optional -+# Check for valid call id (see below for more details). While -+# valid-pid is required, this is optional. - #valid-cid ^(001|1) - #change-cid 001 -@@ -136,5 +135,5 @@ - #valid-pid ^(0171|0049171) - #valid-pid 0171|0049171 --# Use these paramters in the global section if you want do not want -+# Use these paramters in the global section if you do not want - # to check pager-ids (and do not set change-pid): - #valid-pid . -@@ -148,24 +147,24 @@ - # - # As the services do not use (in general) the ISO 8859/1 character set, --# one can define convertion tables. you can either specify a file which -+# one can define conversion tables. You can either specify a file which - # contains the convertion rules: - #conv-table /usr/local/lib/yaps/iso2din.tab - --# or use predefined convertion rules -+# or use predefined conversion rules: - #convert *no-control,*no-8bit,cv-default,cv-extended - - # - # If this is set, send a message even if a requested feature is --# not available -+# not available. - #force True - - # --# If the provider supportes to set a delay for sending the message, --# set this -+# If the provider supports to set a delay for sending the message, -+# set this. - #can-delay True - - # --# If the provider can delete a buffered message after a period of time, --# set this -+# If the provider may delete a buffered message after some period of time, -+# set this. - #can-expire True - -@@ -176,5 +175,5 @@ - # - # To check wether a call-id/pager-id is valid use these paramters. --# For the exact syntax see the documentation -+# For the exact syntax see the documentation. - #check-call-id >1111111111111111< - #check-pager-id >1111111111111111< -@@ -183,8 +182,8 @@ - # - # These values are typically found in a modem section, but can also --# appear in the global section to set some defaults -+# appear in the global section to set some defaults. - - # --# Set this to the modem device you wish to use -+# Set this to the modem device you wish to use. - #device /dev/modem - #device /dev/cua1 -@@ -201,5 +200,5 @@ - # The different format of the part which is appended to the lockfile - # and the contents can be specified here. See documentation for a --# full list inclusive explaination -+# full list inclusive explaination. - #lock-method sysv4 - #lock-method binary -@@ -208,13 +207,13 @@ - # - # These are send/expect sequences to talk to the modem. For an exact --# definition see (again) the documentation. Following entries are -+# definition see (again) the documentation. The following entries are - # supported: --# init: to initialize the modem -+# init: initialize the modem - # local-init: a second initialization string, used to customize --# already defined modems for different handling --# dial: to dial a phone number %L is replaced with the --# phone number itself --# timeout: the default timeout in seconds to wait for answers --# reset: to reset the modem -+# already initialized modems -+# dial: dial a phone number; %L is replaced with the -+# phone number to dial -+# timeout: the default timeout in seconds to wait for an answer -+# reset: reset the modem - - ######################################### -@@ -224,5 +223,26 @@ - # D1 (by Deutsche Telekom) - # --[D1] -+[D1_170] -+protocol tap -+valid-pid 0170|0049170|49170 -+change-pid 0170 -+convert *no-8bit,cv-d1 -+cv-d1 { -+ ﾄ [ -+ ﾖ \ -+ ﾜ ~ -+ { -+ | -+ ~ -+ ﾟ ^] -+} -++cost timetable=Wk0800-1800=5.7;Wk1800-0800=11.4;Ss=11.4 -+phone 01712092522 -+max-size 160 -+may-split True -+use-call-id False -+tap-old True -+# -+[D1_171] - protocol tap - valid-pid 0171|0049171|49171 -@@ -247,5 +267,5 @@ - # D2 (by Mannesmann Mobilfunk) - # --[D2] -+[D2_172] - modem standard-d2 - protocol ucp -@@ -265,8 +285,26 @@ - ucp-extend True - # -+[D2_173] -+modem standard-d2 -+protocol ucp -+valid-pid 0173|0049173|49173 -+change-pid 0173 -+convert *no-8bit,cv-default -++cost timetable=Wk0800-1800=5.7;Wk1800-0800=11.4;Ss=11.4 -+phone 01722278020 -+max-size 160 -+may-split True -+use-call-id True -+can-delay True -+can-expire True -+can-rds True -+check-call-id >1111111111111111< -+check-pager-id >1111111111111111< -+ucp-extend True -+# - # E+ (by ???) - # !! UNTESTED !! - # --[E+] -+[E+_177] - protocol tap - valid-pid 0177|0049177|49177 -@@ -279,4 +317,16 @@ - use-call-id False - # -+[E+_178] -+protocol tap -+valid-pid 0178|0049178|49178 -+change-pid 0178 -+convert *no-8bit,cv-default -++cost timetable=Wk0800-1800=5.7;Wk1800-0800=11.4;Ss=11.4 -+ls -ltr -+phone 01771167 -+max-size 160 -+may-split True -+use-call-id False -+# - # Telmi, Telmi-* (by Deutsche Funkruf) - # !! ONLY TESTED FOR TELMI-FUN !! -@@ -336,7 +386,8 @@ - # - # Older Unix versions --lock-prefix /usr/spool/uucp/LCK.. -+#lock-prefix /usr/spool/uucp/LCK.. - # Newer Unix versions --#lock-prefix /var/spool/uucp/LCK.. -+lock-prefix /var/spool/uucp/LCK.. -+#lock-prefix /var/spool/lock/LCK.. - #lock-prefix /var/lock/LCK.. - # SysV4 Property changes on: head/comms/yaps/files/patch-ae ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/comms/yaps/files/patch-Config =================================================================== --- head/comms/yaps/files/patch-Config (nonexistent) +++ head/comms/yaps/files/patch-Config (revision 363168) @@ -0,0 +1,87 @@ +*** Config.orig Sat Jun 14 19:32:18 1997 +--- Config Tue Aug 8 20:29:41 2000 +*************** +*** 1,9 **** + # -*- sh -*- + # SECTION A.) Global configuration + # Select compiler command +! CC = gcc + # +! CFLAGS = -Wall -Wno-parentheses -Wshadow -Wstrict-prototypes -Wmissing-prototypes + LDFLAGS = + EXLIBS = + # +--- 1,9 ---- + # -*- sh -*- + # SECTION A.) Global configuration + # Select compiler command +! #CC = gcc + # +! #CFLAGS = -Wall -Wno-parentheses -Wshadow -Wstrict-prototypes -Wmissing-prototypes + LDFLAGS = + EXLIBS = + # +*************** +*** 14,35 **** + #LUA = True + # + # Define this to disable debugging +! #NDEBUG = True + # + # + # + # SECTION B.) yaps configuration + # Name and location of global configuration file +! YAPS_CFGFILE = /etc/yaps.rc + # Name of local configuration file (location is $HOME.) + YAPS_LCFGFILE = .yapsrc + # Directory for installing the binary +! YAPS_BINDIR = /usr/local/bin + # Directory for optional support files +! YAPS_LIBDIR = /usr/local/lib/yaps + # User/Group/Mode for yaps + YAPS_USER = bin +! YAPS_GROUP = uucp + YAPS_MODE = 2711 + # User/Group/Mode for global configuration file + YAPS_RCUSER = bin +--- 14,35 ---- + #LUA = True + # + # Define this to disable debugging +! NDEBUG = True + # + # + # + # SECTION B.) yaps configuration + # Name and location of global configuration file +! YAPS_CFGFILE = ${PREFIX}/etc/yaps.rc + # Name of local configuration file (location is $HOME.) + YAPS_LCFGFILE = .yapsrc + # Directory for installing the binary +! YAPS_BINDIR = ${PREFIX}/bin + # Directory for optional support files +! YAPS_LIBDIR = ${PREFIX}/share/yaps + # User/Group/Mode for yaps + YAPS_USER = bin +! YAPS_GROUP = dialer + YAPS_MODE = 2711 + # User/Group/Mode for global configuration file + YAPS_RCUSER = bin +*************** +*** 56,62 **** + # + ifdef NDEBUG + DDEFS = -DNDEBUG +! G = -O + else + G = -g + endif +--- 56,62 ---- + # + ifdef NDEBUG + DDEFS = -DNDEBUG +! G = + else + G = -g + endif Property changes on: head/comms/yaps/files/patch-Config ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/comms/yaps/files/patch-config.h =================================================================== --- head/comms/yaps/files/patch-config.h (nonexistent) +++ head/comms/yaps/files/patch-config.h (revision 363168) @@ -0,0 +1,102 @@ +*** config.h.orig Tue Sep 29 15:15:25 1998 +--- config.h Tue Sep 29 15:24:15 1998 +*************** +*** 27,31 **** + * in sys/time.h + */ +! # define HAVE_SYS_SELECT_H 0 + + /* +--- 27,31 ---- + * in sys/time.h + */ +! # define HAVE_SYS_SELECT_H 1 + + /* +*************** +*** 33,37 **** + * conversion/classification + */ +! # define HAVE_LOCALE_H 0 + + /* +--- 33,37 ---- + * conversion/classification + */ +! # define HAVE_LOCALE_H 1 + + /* +*************** +*** 39,48 **** + * very weak replacement is used to find matching services + */ +! # define HAVE_REGEX_H 0 + + /* + * one of these is required for SysV like lockfiles + */ +! # define HAVE_SYS_SYSMACROS_H 1 + # define HAVE_SYS_MKDEV_H 0 + +--- 39,48 ---- + * very weak replacement is used to find matching services + */ +! # define HAVE_REGEX_H 1 + + /* + * one of these is required for SysV like lockfiles + */ +! # define HAVE_SYS_SYSMACROS_H 0 + # define HAVE_SYS_MKDEV_H 0 + +*************** +*** 62,72 **** + * to get valid return values from localtime + */ +! # define HAVE_TZSET 0 + + /* + * If these are not set, chmod()/chown() are used + */ +! # define HAVE_FCHMOD 0 +! # define HAVE_FCHOWN 0 + + /* +--- 62,72 ---- + * to get valid return values from localtime + */ +! # define HAVE_TZSET 1 + + /* + * If these are not set, chmod()/chown() are used + */ +! # define HAVE_FCHMOD 1 +! # define HAVE_FCHOWN 1 + + /* +*************** +*** 74,78 **** + * longjmp() from the signal handler leads into chaos + */ +! # define HAVE_SIGSETJMP 0 + + /* +--- 74,78 ---- + * longjmp() from the signal handler leads into chaos + */ +! # define HAVE_SIGSETJMP 1 + + /* +*************** +*** 106,110 **** + * set this to 1, otherwise to 0 + */ +! # define BROKEN_REALLOC 1 + + /* -------------- END OF CHANGEABLE PART ------------------ */ +--- 106,110 ---- + * set this to 1, otherwise to 0 + */ +! # define BROKEN_REALLOC 0 + + /* -------------- END OF CHANGEABLE PART ------------------ */ Property changes on: head/comms/yaps/files/patch-config.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/comms/yaps/files/patch-tty.c =================================================================== --- head/comms/yaps/files/patch-tty.c (nonexistent) +++ head/comms/yaps/files/patch-tty.c (revision 363168) @@ -0,0 +1,13 @@ +*** tty.c~ Sat Jun 7 16:32:21 1997 +--- tty.c Tue Sep 29 15:32:05 1998 +*************** +*** 23,28 **** +--- 23,30 ---- + # include + # else /* ! HAVE_SYS_SYSMACROS_H && ! HAVE_SYS_MKDEV_H */ ++ # ifndef major + # define major(xx) (((xx) >> 8) & 0xff) + # define minor(xx) ((xx) & 0xff) ++ # endif /* major */ + # endif /* HAVE_SYS_SYSMACROS_H || HAVE_SYS_MKDEV_H */ + # include "pager.h" Property changes on: head/comms/yaps/files/patch-tty.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/comms/yaps/files/patch-valid.c =================================================================== --- head/comms/yaps/files/patch-valid.c (nonexistent) +++ head/comms/yaps/files/patch-valid.c (revision 363168) @@ -0,0 +1,10 @@ +*** valid.c~ Tue Jun 3 12:09:49 1997 +--- valid.c Tue Sep 29 15:26:39 1998 +*************** +*** 4,7 **** +--- 4,8 ---- + # include + # include ++ # include + # include "pager.h" + # include "valid.h" Property changes on: head/comms/yaps/files/patch-valid.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/comms/yaps/files/patch-yaps.rc =================================================================== --- head/comms/yaps/files/patch-yaps.rc (nonexistent) +++ head/comms/yaps/files/patch-yaps.rc (revision 363168) @@ -0,0 +1,284 @@ +--- yaps.rc~ Wed Jun 11 19:39:06 1997 ++++ yaps.rc Tue Oct 17 21:11:37 2000 +@@ -7,12 +7,11 @@ + ######################################### + # +-# This is a comma seperated list of available services. This +-# is required for autodetect the matching service for a +-# pager-id +-services D1,D2,E+ ++# This is a comma seperated list of available services. This list ++# is required to autodetect the matching service for a pager-id. ++services D1_170,D1_171,D2_172,D2_173,E+_177,E+_178 + +services Telmi,Telmi-Fun,Telmi-Family,Telmi-Top,Telmi-Pro + +services Skyper,Quix + # +-# This is the default caller-id. If the protocol/service allowes ++# This is the default caller-id. If the protocol/service allows + # it, this is inserted in the message (and the receiver gets this + # as the sender's number) +@@ -23,9 +22,9 @@ + signature (It's me!) + # +-# You can either switch the use of the signature here on for all ++# You can either enable the use of the signature here for all + # services or in each service section for that particular service. + use-signature True + # +-# To get more verbose output when running yaps increase this value. ++# Increase this value to get more verbose output when running yaps. + # Currently 4 is the highest supported value. + verbose 0 +@@ -33,5 +32,5 @@ + # If you'd like to log every sending session define this. It should + # point to a writeable file. If you install the software setgid, then +-# change the group of this file to the same yaps uses and make it ++# change the group of this file to the one yaps uses and make it + # group writeable. + logfile /var/log/yaps.log +@@ -41,5 +40,5 @@ + modems standard + # +-# some global defaults for the serial interface (even if the most ++# some global defaults for the serial interface (even if most + # protocols are assuming 7e1, these settings seem to work well) + speed 38400 +@@ -49,11 +48,11 @@ + + # +-# To calculate the cost for each call, you can define some globales +-# here and do the fine tuning in each protocol ++# To calculate the cost for each call, you can define some globals ++# here and do the fine tuning in each protocol section + cost cost=0.12,unit=DM,remainder=2,dial-overhead=13 + + # +-# These are two example of internal conversion tables. The can be +-# used using the `convert' entry (see below). ++# These are two examples of internal conversion tables. They can be ++# used via the `convert' entry (see below). + cv-default { + ﾄ [ +@@ -75,5 +74,5 @@ + # + # These values are normally only found in each service section, +-# but are listen here with an explaination for completeness. ++# but are listed here with an explaination for completeness. + # + # This is the phone number of the modem gateway for this service +@@ -87,11 +86,11 @@ + + # +-# Most services limit the length of a message to a specific length. +-# Enter the value here to check valid messages ++# Most services limit the length of a message to some value. ++# Enter the value here to check valid messages. + #max-size 160 + + # + # If a message is longer than max-size, you can set this to split +-# it off into several single messages of allowed length ++# it off into several single messages of maximum allowed length. + #may-split True + +@@ -103,5 +102,5 @@ + # + # Some services allow to send more than one message per session. If +-# it is limited, set it using this parameter ++# there is a limit, set it using this parameter. + #max-messages 1 + +@@ -111,6 +110,6 @@ + + # +-# If the service is reachable over a phonenumber where the pager-id +-# is part of the phone number, define this and add a `%P' anywehere ++# If the service is reachable over a phone number where the pager-id ++# is part of the phone number, define this and add a `%P' anywhere + # in the `phone' number. + #insert-pager-id True +@@ -125,6 +124,6 @@ + + # +-# Check for valid call id (see below for more details) While +-# valid-pid is required, this is optional ++# Check for valid call id (see below for more details). While ++# valid-pid is required, this is optional. + #valid-cid ^(001|1) + #change-cid 001 +@@ -136,5 +135,5 @@ + #valid-pid ^(0171|0049171) + #valid-pid 0171|0049171 +-# Use these paramters in the global section if you want do not want ++# Use these paramters in the global section if you do not want + # to check pager-ids (and do not set change-pid): + #valid-pid . +@@ -148,24 +147,24 @@ + # + # As the services do not use (in general) the ISO 8859/1 character set, +-# one can define convertion tables. you can either specify a file which ++# one can define conversion tables. You can either specify a file which + # contains the convertion rules: + #conv-table /usr/local/lib/yaps/iso2din.tab + +-# or use predefined convertion rules ++# or use predefined conversion rules: + #convert *no-control,*no-8bit,cv-default,cv-extended + + # + # If this is set, send a message even if a requested feature is +-# not available ++# not available. + #force True + + # +-# If the provider supportes to set a delay for sending the message, +-# set this ++# If the provider supports to set a delay for sending the message, ++# set this. + #can-delay True + + # +-# If the provider can delete a buffered message after a period of time, +-# set this ++# If the provider may delete a buffered message after some period of time, ++# set this. + #can-expire True + +@@ -176,5 +175,5 @@ + # + # To check wether a call-id/pager-id is valid use these paramters. +-# For the exact syntax see the documentation ++# For the exact syntax see the documentation. + #check-call-id >1111111111111111< + #check-pager-id >1111111111111111< +@@ -183,8 +182,8 @@ + # + # These values are typically found in a modem section, but can also +-# appear in the global section to set some defaults ++# appear in the global section to set some defaults. + + # +-# Set this to the modem device you wish to use ++# Set this to the modem device you wish to use. + #device /dev/modem + #device /dev/cua1 +@@ -201,5 +200,5 @@ + # The different format of the part which is appended to the lockfile + # and the contents can be specified here. See documentation for a +-# full list inclusive explaination ++# full list inclusive explaination. + #lock-method sysv4 + #lock-method binary +@@ -208,13 +207,13 @@ + # + # These are send/expect sequences to talk to the modem. For an exact +-# definition see (again) the documentation. Following entries are ++# definition see (again) the documentation. The following entries are + # supported: +-# init: to initialize the modem ++# init: initialize the modem + # local-init: a second initialization string, used to customize +-# already defined modems for different handling +-# dial: to dial a phone number %L is replaced with the +-# phone number itself +-# timeout: the default timeout in seconds to wait for answers +-# reset: to reset the modem ++# already initialized modems ++# dial: dial a phone number; %L is replaced with the ++# phone number to dial ++# timeout: the default timeout in seconds to wait for an answer ++# reset: reset the modem + + ######################################### +@@ -224,5 +223,26 @@ + # D1 (by Deutsche Telekom) + # +-[D1] ++[D1_170] ++protocol tap ++valid-pid 0170|0049170|49170 ++change-pid 0170 ++convert *no-8bit,cv-d1 ++cv-d1 { ++ ﾄ [ ++ ﾖ \ ++ ﾜ ~ ++ { ++ | ++ ~ ++ ﾟ ^] ++} +++cost timetable=Wk0800-1800=5.7;Wk1800-0800=11.4;Ss=11.4 ++phone 01712092522 ++max-size 160 ++may-split True ++use-call-id False ++tap-old True ++# ++[D1_171] + protocol tap + valid-pid 0171|0049171|49171 +@@ -247,5 +267,5 @@ + # D2 (by Mannesmann Mobilfunk) + # +-[D2] ++[D2_172] + modem standard-d2 + protocol ucp +@@ -265,8 +285,26 @@ + ucp-extend True + # ++[D2_173] ++modem standard-d2 ++protocol ucp ++valid-pid 0173|0049173|49173 ++change-pid 0173 ++convert *no-8bit,cv-default +++cost timetable=Wk0800-1800=5.7;Wk1800-0800=11.4;Ss=11.4 ++phone 01722278020 ++max-size 160 ++may-split True ++use-call-id True ++can-delay True ++can-expire True ++can-rds True ++check-call-id >1111111111111111< ++check-pager-id >1111111111111111< ++ucp-extend True ++# + # E+ (by ???) + # !! UNTESTED !! + # +-[E+] ++[E+_177] + protocol tap + valid-pid 0177|0049177|49177 +@@ -279,4 +317,16 @@ + use-call-id False + # ++[E+_178] ++protocol tap ++valid-pid 0178|0049178|49178 ++change-pid 0178 ++convert *no-8bit,cv-default +++cost timetable=Wk0800-1800=5.7;Wk1800-0800=11.4;Ss=11.4 ++ls -ltr ++phone 01771167 ++max-size 160 ++may-split True ++use-call-id False ++# + # Telmi, Telmi-* (by Deutsche Funkruf) + # !! ONLY TESTED FOR TELMI-FUN !! +@@ -336,7 +386,8 @@ + # + # Older Unix versions +-lock-prefix /usr/spool/uucp/LCK.. ++#lock-prefix /usr/spool/uucp/LCK.. + # Newer Unix versions +-#lock-prefix /var/spool/uucp/LCK.. ++lock-prefix /var/spool/uucp/LCK.. ++#lock-prefix /var/spool/lock/LCK.. + #lock-prefix /var/lock/LCK.. + # SysV4 Property changes on: head/comms/yaps/files/patch-yaps.rc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/comms/zssh/files/patch-aa =================================================================== --- head/comms/zssh/files/patch-aa (revision 363167) +++ head/comms/zssh/files/patch-aa (nonexistent) @@ -1,23 +0,0 @@ ---- zssh.h -+++ zssh.h -@@ -36,19 +36,18 @@ - #include "config.h" - - #ifdef STDC_HEADERS -+#include - #include - #include - #include - #include - #include - #include --#include - #include - #include - - /*#include alpha */ - --#include - #include - #endif /* STDC_HEADERS */ - Property changes on: head/comms/zssh/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/comms/zssh/files/patch-zssh.h =================================================================== --- head/comms/zssh/files/patch-zssh.h (nonexistent) +++ head/comms/zssh/files/patch-zssh.h (revision 363168) @@ -0,0 +1,23 @@ +--- zssh.h ++++ zssh.h +@@ -36,19 +36,18 @@ + #include "config.h" + + #ifdef STDC_HEADERS ++#include + #include + #include + #include + #include + #include + #include +-#include + #include + #include + + /*#include alpha */ + +-#include + #include + #endif /* STDC_HEADERS */ + Property changes on: head/comms/zssh/files/patch-zssh.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property