Put the lockfile in "/var/spool/lock/", as tip(1) does, instead of

"/var/spool/uucp/". Fixes pkg/8876.

4 files changed, 49 insertions, 7 deletions

diff --git a/comms/modemd/files/patch-sum b/comms/modemd/files/patch-sum
index 1b0da848405..000686f8541 100644
--- a/comms/modemd/files/patch-sum
+++ b/comms/modemd/files/patch-sum
@@ -1,14 +1,15 @@
-$NetBSD: patch-sum,v 1.2 1999/11/15 14:25:07 rh Exp $
+$NetBSD: patch-sum,v 1.3 2000/03/09 02:28:04 wiz Exp $
 
 MD5 (patch-aa) = 41da5ecb04c74735c4df5f0130ddf016
 MD5 (patch-ab) = c565979fce0b29634432ed730a6e449a
 MD5 (patch-ac) = a337a5181a9e66f9a9fa111917d316dd
 MD5 (patch-ad) = 773ea2e96727e133a9c9a245f099c47c
-MD5 (patch-ae) = aea43e3242bb57b0f1dcbb642cbd2c4c
+MD5 (patch-ae) = 1339a4bc735cec5f599a893a610502c3
 MD5 (patch-af) = 3b6a41e72efa7169154b6c8bdfd657ee
 MD5 (patch-ag) = 5367cbd4ebc25b7f2d85508da0d21ab3
-MD5 (patch-ah) = c34f140652832f5c81f10f5f1dd16d12
+MD5 (patch-ah) = 0b181a603fb8ea5d62d1db66b45c944d
 MD5 (patch-ai) = 7eb7137b3948a7fc6976e2a977129c70
 MD5 (patch-aj) = cbb023e99f27e272495819a25306ca5e
 MD5 (patch-ak) = 91b111878b7078820a4121bacb5bb849
 MD5 (patch-al) = fc793d7bfe7da20410dbb0e5ca45bce8
+MD5 (patch-am) = d51f1ed000604792c3df9bc32b68da57
diff --git a/comms/modemd/patches/patch-ae b/comms/modemd/patches/patch-ae
index 84832dfa4d1..20210c28225 100644
--- a/comms/modemd/patches/patch-ae
+++ b/comms/modemd/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.2 1998/08/07 10:36:45 agc Exp $
+$NetBSD: patch-ae,v 1.3 2000/03/09 02:28:05 wiz Exp $
 
 --- incoming/modemd.8.orig	Mon Sep  9 09:02:45 1996
-+++ incoming/modemd.8	Tue Mar  3 17:19:07 1998
++++ incoming/modemd.8	Thu Mar  9 03:11:23 2000
 @@ -16,7 +16,9 @@
  modem.  Each instance of
  .Xr modemd 8
@@ -13,3 +13,19 @@ $NetBSD: patch-ae,v 1.2 1998/08/07 10:36:45 agc Exp $
  telephone line to which it is attached is ringing, or for some process
  which understands uucico-style tty locking to take the modem for its
  own use.
+@@ -255,13 +257,13 @@
+ line.
+ .El
+ .Sh FILES
+-.Bl -tag -width /var/spool/uucp/LCK..\fIttyname\fR -compact
++.Bl -tag -width /var/spool/lock/LCK..\fIttyname\fR -compact
+ .It Pa /etc/modemcap
+ definitions which control the operation of
+ .Xr modemd 8
+ and
+ .Xr mpoold 8 .
+-.It Pa /var/spool/uucp/LCK..\fIttyname\fR
++.It Pa /var/spool/lock/LCK..\fIttyname\fR
+ lock files compatible with 
+ .Xr uucico 8 .
+ .It Pa /dev
diff --git a/comms/modemd/patches/patch-ah b/comms/modemd/patches/patch-ah
index d5189707f02..6caea1a074d 100644
--- a/comms/modemd/patches/patch-ah
+++ b/comms/modemd/patches/patch-ah
@@ -1,7 +1,7 @@
-$NetBSD: patch-ah,v 1.2 1998/08/07 10:36:45 agc Exp $
+$NetBSD: patch-ah,v 1.3 2000/03/09 02:28:05 wiz Exp $
 
 --- outgoing/mpoold.8.orig	Tue Sep 10 02:27:44 1996
-+++ outgoing/mpoold.8	Tue Mar  3 17:19:07 1998
++++ outgoing/mpoold.8	Thu Mar  9 03:12:11 2000
 @@ -40,6 +40,11 @@
  .Xr getty 8
  or similar programs, since it would be easy for an unscrupulous user
@@ -14,3 +14,19 @@ $NetBSD: patch-ah,v 1.2 1998/08/07 10:36:45 agc Exp $
  .Sh DIAGNOSTICS
  See the documentation for
  .Xr Mpoold 8
+@@ -53,13 +58,13 @@
+ and
+ .Xr mpoold 8.
+ .Sh FILES
+-.Bl -tag -width /var/spool/uucp/LCK..\fIttyname\fR -compact
++.Bl -tag -width /var/spool/lock/LCK..\fIttyname\fR -compact
+ .It Pa /etc/modemcap
+ definitions which control the operation of
+ .Xr mpoold 8
+ and
+ .Xr mpoold 8 .
+-.It Pa /var/spool/uucp/LCK..\fIttyname\fR
++.It Pa /var/spool/lock/LCK..\fIttyname\fR
+ lock files compatible with 
+ .Xr uucico 8 .
+ .It Pa /dev
diff --git a/comms/modemd/patches/patch-am b/comms/modemd/patches/patch-am
new file mode 100644
index 00000000000..668d3ffb983
--- /dev/null
+++ b/comms/modemd/patches/patch-am
@@ -0,0 +1,9 @@
+$NetBSD: patch-am,v 1.1 2000/03/09 02:28:05 wiz Exp $
+
+--- cf/netbsd.h.orig	Sat Feb 22 00:06:26 1997
++++ cf/netbsd.h	Thu Mar  9 03:09:11 2000
+@@ -76,3 +76,4 @@
+ 
+ #define _PATH_MPOOL_PID	"/var/run/mpoold.pid"
+ #define _PATH_LOGIN	"/usr/bin/login"
++#define _PATH_TTYLOCK	"/var/spool/lock/LCK..%s"