Remove explicit depends on files in /usr/include, some of which may not

exist on some platforms... and some of which weren't actually used anyway.

Also fix build failure that cropped up on netbsd-current while testing
the previous.

3 files changed, 87 insertions, 6 deletions

diff --git a/chat/phone/distinfo b/chat/phone/distinfo
index 8d42d09a62b..364b7ce243a 100644
--- a/chat/phone/distinfo
+++ b/chat/phone/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.6 2015/06/08 13:38:12 joerg Exp $
+$NetBSD: distinfo,v 1.7 2015/06/25 07:02:42 dholland Exp $
 
 SHA1 (phone-2.0nb1/phone-2.0.tar.gz) = 0d89cc63225ee96d821dd3d8ab310ac5ea69b40a
 RMD160 (phone-2.0nb1/phone-2.0.tar.gz) = c43ac0cd5de357cfb5dee1ac1546f2c2926be6ab
 Size (phone-2.0nb1/phone-2.0.tar.gz) = 45663 bytes
-SHA1 (patch-client_Makefile) = dc043bd15130f4d73b761aac25f2d9888212573a
+SHA1 (patch-client_Makefile) = 8f501f4dc5fe7f1ef2ce89f618980c8ea0a9e2fc
 SHA1 (patch-client_defs.h) = 1c88fff63c7db4d55ee35692e8882c620f9c1b7d
 SHA1 (patch-client_misc.c) = 70ce9dec31c95d63eabb17e9c618e91d7c49fd86
 SHA1 (patch-conv_Makefile) = fdacf30c339aecaf2326da956196e65bf6c8fe47
-SHA1 (patch-conv_convd.c) = 63c33e1571d84e9a51894003d085f136dc4ae4f2
+SHA1 (patch-conv_convd.c) = 627f5a0d604857681c6c41d999a8ccafb488b316
 SHA1 (patch-master_Makefile) = 07215108e5ae85c62c5a06a195e95a804776c8e3
 SHA1 (patch-master_defs.h) = c9d79711b28d629dbe9c1493f2467faf915ee9be
 SHA1 (patch-master_page.c) = db2af3cb4069384e8159c8eaad43587280630954
diff --git a/chat/phone/patches/patch-client_Makefile b/chat/phone/patches/patch-client_Makefile
index a69e3c50fb8..ba9ae3a4005 100644
--- a/chat/phone/patches/patch-client_Makefile
+++ b/chat/phone/patches/patch-client_Makefile
@@ -1,7 +1,10 @@
-$NetBSD: patch-client_Makefile,v 1.3 2014/01/06 22:11:50 joerg Exp $
+$NetBSD: patch-client_Makefile,v 1.4 2015/06/25 07:02:42 dholland Exp $
 
 Configure for pkgsrc.
 
+Also, remove explicit depends on header files in /usr/include, many of
+which aren't actually used.
+
 --- client/Makefile.orig	2013-01-02 23:00:42.000000000 +0000
 +++ client/Makefile
 @@ -18,14 +18,14 @@
@@ -39,3 +42,64 @@ Configure for pkgsrc.
  
  print:	${HDRS} ${SRCS}
  	pr -f ${HDRS} ${SRCS} | expand -4 | ${LPR}
+@@ -99,60 +99,9 @@ depend: ${SRCS}
+ # DO NOT DELETE THE FOLLOWING LINE
+ # Dependencies follow
+ 
+-who.o: /usr/include/sys/file.h
+-
+-who.o: /usr/include/utmp.h
+-
+-runprog.o: /usr/include/fcntl.h
+-
+-runprog.o: /usr/include/sys/resource.h
+-
+-runprog.o: /usr/include/sys/wait.h
+-
+-tilde.o names.o: /usr/include/pwd.h
+-
+-windows.o stop.o runprog.o readstream.o misc.o kb.o: /usr/include/sgtty.h
+-
+-windows.o stop.o runprog.o readstream.o misc.o kb.o: /usr/include/curses.h
+-
+-windows.o stop.o sig.o runprog.o readstream.o misc.o kb.o: \
+-/usr/include/sys/ttydev.h
+-
+-windows.o stop.o sig.o runprog.o readstream.o misc.o kb.o: \
+-/usr/include/sys/ttychars.h
+-
+-windows.o windows.o stop.o sig.o runprog.o readstream.o misc.o kb.o: \
+-/usr/include/sys/ioctl.h
+-
+-runprog.o main.o getdaemon.o: /usr/include/errno.h
+-
+-windows.o strsave.o stop.o sig.o message.o main.o getdaemon.o \
+-connect_daemon.o: /usr/include/signal.h
+-
+-sendit.o runprog.o getdaemon.o calls.o: /usr/include/time.h
+-
+-sendit.o runprog.o getdaemon.o calls.o: /usr/include/sys/time.h
+-
+-who.o names.o connect_daemon.o calls.o: /usr/include/netdb.h
+-
+ who.o runprog.o readstream.o readctl.o names.o main.o getdaemon.o \
+ connect_daemon.o check_invite.o calls.o: ./../common.h
+ 
+-windows.o strsave.o stop.o runprog.o readstream.o readrc.o names.o misc.o \
+-message.o main.o kb.o connect_daemon.o calls.o: /usr/include/stdio.h
+-
+-windows.o who.o stop.o set.o sendit.o runprog.o readstream.o readrc.o \
+-readctl.o names.o misc.o message.o main.o kb.o getdaemon.o connect_daemon.o \
+-check_invite.o calls.o alias.o: /usr/include/netinet/in.h
+-
+-windows.o who.o stop.o set.o sendit.o runprog.o readstream.o readrc.o \
+-readctl.o names.o misc.o message.o main.o kb.o getdaemon.o connect_daemon.o \
+-check_invite.o calls.o alias.o: /usr/include/sys/socket.h
+-
+-windows.o who.o stop.o set.o sendit.o runprog.o runprog.o readstream.o \
+-readrc.o readctl.o names.o misc.o message.o main.o kb.o getdaemon.o \
+-connect_daemon.o check_invite.o calls.o alias.o: /usr/include/sys/types.h
+-
+ windows.o who.o stop.o set.o sendit.o runprog.o readstream.o readrc.o \
+ readctl.o names.o misc.o message.o main.o kb.o getdaemon.o connect_daemon.o \
+ check_invite.o calls.o alias.o: ./defs.h
diff --git a/chat/phone/patches/patch-conv_convd.c b/chat/phone/patches/patch-conv_convd.c
index f0fa207fd77..0af1359c403 100644
--- a/chat/phone/patches/patch-conv_convd.c
+++ b/chat/phone/patches/patch-conv_convd.c
@@ -1,8 +1,9 @@
-$NetBSD: patch-conv_convd.c,v 1.1 2014/09/11 07:15:56 dholland Exp $
+$NetBSD: patch-conv_convd.c,v 1.2 2015/06/25 07:02:42 dholland Exp $
 
 - Don't rely on __unused from netbsd's <cdefs.h> existing.
+- Remove unused variable that causes build failure with gcc48.
 
---- conv/convd.c~	2013-01-02 23:00:43.000000000 +0000
+--- conv/convd.c.orig	2013-01-02 23:00:43.000000000 +0000
 +++ conv/convd.c
 @@ -48,6 +48,10 @@
  
@@ -15,3 +16,19 @@ $NetBSD: patch-conv_convd.c,v 1.1 2014/09/11 07:15:56 dholland Exp $
  #ifndef lint
  #if 0
  static char __unused char RCSid[] = "Header: convd.c,v 1.1 85/10/29 14:20:06 broome Exp ";
+@@ -98,7 +102,6 @@ main(int argc, char *argv[])
+     int	 sl;
+     int	 fds;
+     int	 r;
+-    int	 changed;
+     static	int  new, old;
+     struct	iovec iov[2];
+     char	recvbuf[BUFSIZ];
+@@ -113,7 +116,6 @@ main(int argc, char *argv[])
+     stayaround = 1;
+     currslot = -1;
+     highslot = -1;
+-    changed = 0;
+ 
+     signal(SIGPIPE, SIG_IGN);  /* we'll find out soon enough */
+     signal(SIGALRM, sigalrm);  /* to handle timeout */