Don't use -Wno-traditional, clang doesn't have it.

4 files changed, 29 insertions, 13 deletions

diff --git a/chat/phone/distinfo b/chat/phone/distinfo
index 164f3fa1055..20f64bd12dc 100644
--- a/chat/phone/distinfo
+++ b/chat/phone/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2014/01/01 23:52:32 dholland Exp $
+$NetBSD: distinfo,v 1.3 2014/01/06 22:11:50 joerg 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) = 40d9e564cb1361539bb7f6982b81a945a46f51a7
-SHA1 (patch-conv_Makefile) = 8356d737897207ba3492fcace90c5563ab0c97e4
-SHA1 (patch-master_Makefile) = 13a844f9db51b617d014db6c19b47d20d91ce21f
+SHA1 (patch-client_Makefile) = dc043bd15130f4d73b761aac25f2d9888212573a
+SHA1 (patch-conv_Makefile) = fdacf30c339aecaf2326da956196e65bf6c8fe47
+SHA1 (patch-master_Makefile) = 07215108e5ae85c62c5a06a195e95a804776c8e3
diff --git a/chat/phone/patches/patch-client_Makefile b/chat/phone/patches/patch-client_Makefile
index 1e76ee058fc..a69e3c50fb8 100644
--- a/chat/phone/patches/patch-client_Makefile
+++ b/chat/phone/patches/patch-client_Makefile
@@ -1,10 +1,18 @@
-$NetBSD: patch-client_Makefile,v 1.2 2014/01/01 23:52:32 dholland Exp $
+$NetBSD: patch-client_Makefile,v 1.3 2014/01/06 22:11:50 joerg Exp $
 
 Configure for pkgsrc.
 
---- client/Makefile~	2013-01-02 01:52:29.000000000 +0000
+--- client/Makefile.orig	2013-01-02 23:00:42.000000000 +0000
 +++ client/Makefile
-@@ -25,7 +25,7 @@ LIBS   = -lcurses -ltermlib #-lresolv
+@@ -18,14 +18,14 @@
+ 
+ 
+ CC     = cc
+-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 -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 = -O -DSERVICES -DLOCAL_ECHO
+ CFLAGS += -g -DSERVICES #-DLOCAL_ECHO
+ LIBS   = -lcurses -ltermlib #-lresolv
  
  LPR    = lpr 
  #RDEST	= /usr/ucb/phone
diff --git a/chat/phone/patches/patch-conv_Makefile b/chat/phone/patches/patch-conv_Makefile
index 05a2f74cc47..8dad0cebbcc 100644
--- a/chat/phone/patches/patch-conv_Makefile
+++ b/chat/phone/patches/patch-conv_Makefile
@@ -1,10 +1,16 @@
-$NetBSD: patch-conv_Makefile,v 1.1 2013/12/16 06:42:20 dholland Exp $
+$NetBSD: patch-conv_Makefile,v 1.2 2014/01/06 22:11:50 joerg Exp $
 
 Configure for pkgsrc.
 
---- conv/Makefile~	2013-01-01 19:20:59.000000000 +0000
+--- conv/Makefile.orig	2013-01-02 23:00:43.000000000 +0000
 +++ conv/Makefile
-@@ -10,17 +10,17 @@ CFLAGS+= -std=gnu99  -Wall -Wstrict-prot
+@@ -5,22 +5,22 @@
+ # This one is pretty straightforward - no special flags for it.
+ 
+ CC	=	cc
+-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 -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 +=	-g
  SRCS	=	convd.c
  DEST	=	convd
diff --git a/chat/phone/patches/patch-master_Makefile b/chat/phone/patches/patch-master_Makefile
index a8554f4118c..1031434548b 100644
--- a/chat/phone/patches/patch-master_Makefile
+++ b/chat/phone/patches/patch-master_Makefile
@@ -1,20 +1,22 @@
-$NetBSD: patch-master_Makefile,v 1.2 2014/01/01 23:52:32 dholland Exp $
+$NetBSD: patch-master_Makefile,v 1.3 2014/01/06 22:11:50 joerg Exp $
 
 Configure for pkgsrc.
 
 --- master/Makefile.orig	2013-01-02 23:00:43.000000000 +0000
 +++ master/Makefile
-@@ -24,7 +24,9 @@
+@@ -24,8 +24,10 @@
  OFLAG= -g
  #INETD= -DINETD
  FORK=-DFORK
 -CFLAGS	= $(OFLAG) $(INETD) $(FORK) -DSERVICES -DDPATH=\"/u/christos/phone/conv/convd\"
+-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
 +# not -DSERVICES
 +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 -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
  
  
+ LPR	= lpr
 @@ -41,7 +43,7 @@ OBJS	= child.o daemon.o dopage.o forward
  			reinvite.o sendit.o strsave.o utmp.o