Distfile changed upstream. (HI CHRISTOS.)

Changes were mostly whitespace.

PKGREVISION -> 1..

5 files changed, 18 insertions, 37 deletions

diff --git a/chat/phone/Makefile b/chat/phone/Makefile
index c46f87f588c..c0c67049cf1 100644
--- a/chat/phone/Makefile
+++ b/chat/phone/Makefile
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2013/12/16 06:42:20 dholland Exp $
+# $NetBSD: Makefile,v 1.2 2014/01/01 23:52:32 dholland Exp $
 
 DISTNAME=	phone-2.0
+PKGREVISION=	1
 CATEGORIES=	chat
 MASTER_SITES=	ftp://ftp.astron.com/pub/phone/
+DIST_SUBDIR=	phone-2.0nb1
 
 MAINTAINER=	christos@NetBSD.org
 HOMEPAGE=	ftp://ftp.astron.com/pub/phone/
diff --git a/chat/phone/distinfo b/chat/phone/distinfo
index 729ca01e75b..164f3fa1055 100644
--- a/chat/phone/distinfo
+++ b/chat/phone/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.1 2013/12/16 06:42:20 dholland Exp $
+$NetBSD: distinfo,v 1.2 2014/01/01 23:52:32 dholland Exp $
 
-SHA1 (phone-2.0.tar.gz) = 61f3decc0a6b778f61d8b6bdecd37536c5883e8c
-RMD160 (phone-2.0.tar.gz) = 777ed87ab0fa992d680bc57284f856ea960c279d
-Size (phone-2.0.tar.gz) = 45729 bytes
-SHA1 (patch-client_Makefile) = 9023d14175c35dedc4e69341613aa88b37c55d7c
+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) = 40d9e564cb1361539bb7f6982b81a945a46f51a7
 SHA1 (patch-conv_Makefile) = 8356d737897207ba3492fcace90c5563ab0c97e4
-SHA1 (patch-master_Makefile) = de0a6dcc2b6729e90683768096f21c51acef0162
-SHA1 (patch-master_utmp.c) = 31d34b14e0c951028961d229c67d5718ffe49e30
+SHA1 (patch-master_Makefile) = 13a844f9db51b617d014db6c19b47d20d91ce21f
diff --git a/chat/phone/patches/patch-client_Makefile b/chat/phone/patches/patch-client_Makefile
index e02210f1721..1e76ee058fc 100644
--- a/chat/phone/patches/patch-client_Makefile
+++ b/chat/phone/patches/patch-client_Makefile
@@ -1,4 +1,4 @@
-$NetBSD: patch-client_Makefile,v 1.1 2013/12/16 06:42:20 dholland Exp $
+$NetBSD: patch-client_Makefile,v 1.2 2014/01/01 23:52:32 dholland Exp $
 
 Configure for pkgsrc.
 
@@ -7,7 +7,7 @@ Configure for pkgsrc.
 @@ -25,7 +25,7 @@ LIBS   = -lcurses -ltermlib #-lresolv
  
  LPR    = lpr 
- #RDEST  = /usr/ucb/phone
+ #RDEST	= /usr/ucb/phone
 -RDEST  = /usr/local/bin/phone
 +RDEST  = ${PREFIX}/bin/phone
  
diff --git a/chat/phone/patches/patch-master_Makefile b/chat/phone/patches/patch-master_Makefile
index 88a8f96463d..a8554f4118c 100644
--- a/chat/phone/patches/patch-master_Makefile
+++ b/chat/phone/patches/patch-master_Makefile
@@ -1,20 +1,18 @@
-$NetBSD: patch-master_Makefile,v 1.1 2013/12/16 06:42:20 dholland Exp $
+$NetBSD: patch-master_Makefile,v 1.2 2014/01/01 23:52:32 dholland Exp $
 
 Configure for pkgsrc.
 
---- master/Makefile.orig	2013-01-01 23:59:38.000000000 +0000
+--- master/Makefile.orig	2013-01-02 23:00:43.000000000 +0000
 +++ master/Makefile
-@@ -23,8 +23,10 @@
- #OFLAG= -O
+@@ -24,7 +24,9 @@
  OFLAG= -g
  #INETD= -DINETD
--#FORK=-DFORK
--CFLAGS  = $(OFLAG) $(INETD) $(FORK) -DSERVICES -DDPATH=\"/u/christos/phone/conv/convd\"
-+FORK=-DFORK
+ FORK=-DFORK
+-CFLAGS	= $(OFLAG) $(INETD) $(FORK) -DSERVICES -DDPATH=\"/u/christos/phone/conv/convd\"
 +# not -DSERVICES
-+CFLAGS  = $(OFLAG) $(INETD) $(FORK) -DDPATH=\"${PREFIX}/libexec/convd\"
++CFLAGS	= $(OFLAG) $(INETD) $(FORK) -DDPATH=\"${PREFIX}/libexec/convd\"
 +CFLAGS+= -DNO_WHO
- CFLAGS+= -std=gnu99  -Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wno-sign-compare  -Wno-traditional  -Wa,--fatal-warnings -Wreturn-type -Wswitch -Wshadow -Wcast-qual -Wwrite-strings -Wextra -Wno-unused-parameter -Wno-sign-compare -Wold-style-definition -Wsign-compare -Wformat=2   -Wno-format-zero-length  -Werror
+ CFLAGS+= -std=gnu99  -Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wno-sign-compare  -Wno-traditional	 -Wa,--fatal-warnings -Wreturn-type -Wswitch -Wshadow -Wcast-qual -Wwrite-strings -Wextra -Wno-unused-parameter -Wno-sign-compare -Wold-style-definition -Wsign-compare -Wformat=2   -Wno-format-zero-length  -Werror
  
  
 @@ -41,7 +43,7 @@ OBJS	= child.o daemon.o dopage.o forward
diff --git a/chat/phone/patches/patch-master_utmp.c b/chat/phone/patches/patch-master_utmp.c
deleted file mode 100644
index 7da742a7b0a..00000000000
--- a/chat/phone/patches/patch-master_utmp.c
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-master_utmp.c,v 1.1 2013/12/16 06:42:20 dholland Exp $
-
-Fix build failure when NO_WHO is defined.
-
---- master/utmp.c~	2013-01-02 02:07:17.000000000 +0000
-+++ master/utmp.c
-@@ -69,9 +69,11 @@ findtty(const char *user, const char *tt
- void
- who(struct sockaddr_in *sin)
- {
-+#ifndef NO_WHO
-     struct  utmpx *utmp;
-     int     users = 0;
-     char   *msg = NULL;
-+#endif
- 
- #ifdef NO_WHO       /* not allowed here ... */
-     sendit(misc, sin, "%c%c%cwho@%s: this site doesn't allow remote who.",