CVS commit: pkgsrc/chat/phone

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Nov 30 12:26:08 UTC 2020

Modified Files:
        pkgsrc/chat/phone: Makefile distinfo
        pkgsrc/chat/phone/patches: patch-client_Makefile patch-master_Makefile

Log Message:
phone: Don't build with -g or -Werror.  Fixes build with gcc9.

Bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/chat/phone/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/chat/phone/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/chat/phone/patches/patch-client_Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/chat/phone/patches/patch-master_Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/chat/phone/Makefile
diff -u pkgsrc/chat/phone/Makefile:1.7 pkgsrc/chat/phone/Makefile:1.8
--- pkgsrc/chat/phone/Makefile:1.7      Thu Feb 25 11:28:58 2016
+++ pkgsrc/chat/phone/Makefile  Mon Nov 30 12:26:07 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2016/02/25 11:28:58 jperkin Exp $
+# $NetBSD: Makefile,v 1.8 2020/11/30 12:26:07 nia Exp $
 
 DISTNAME=      phone-2.0
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    chat
 MASTER_SITES=  ftp://ftp.astron.com/pub/phone/
 DIST_SUBDIR=   phone-2.0nb1

Index: pkgsrc/chat/phone/distinfo
diff -u pkgsrc/chat/phone/distinfo:1.10 pkgsrc/chat/phone/distinfo:1.11
--- pkgsrc/chat/phone/distinfo:1.10     Tue Feb  7 23:55:05 2017
+++ pkgsrc/chat/phone/distinfo  Mon Nov 30 12:26:07 2020
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.10 2017/02/07 23:55:05 joerg Exp $
+$NetBSD: distinfo,v 1.11 2020/11/30 12:26:07 nia Exp $
 
 SHA1 (phone-2.0nb1/phone-2.0.tar.gz) = 0d89cc63225ee96d821dd3d8ab310ac5ea69b40a
 RMD160 (phone-2.0nb1/phone-2.0.tar.gz) = c43ac0cd5de357cfb5dee1ac1546f2c2926be6ab
 SHA512 (phone-2.0nb1/phone-2.0.tar.gz) = 6bca3dc04a35b2604097e512d4520dadeda93a341631b68cc5ae8a837114877baa45d58971d1cc9bfb6d0192a275e566c0cab86f2cbfedaac240b26bed2d7e0b
 Size (phone-2.0nb1/phone-2.0.tar.gz) = 45663 bytes
-SHA1 (patch-client_Makefile) = 8f501f4dc5fe7f1ef2ce89f618980c8ea0a9e2fc
+SHA1 (patch-client_Makefile) = 80e9edbd066c7af446bbf6f70b896b97b6920a84
 SHA1 (patch-client_defs.h) = a2f807945ff17d0f3664789bbe94487e8e31672c
 SHA1 (patch-client_misc.c) = 70ce9dec31c95d63eabb17e9c618e91d7c49fd86
 SHA1 (patch-conv_Makefile) = fdacf30c339aecaf2326da956196e65bf6c8fe47
 SHA1 (patch-conv_convd.c) = 7f1ea576cceff2425daf7fbb99d29101ac7f1492
-SHA1 (patch-master_Makefile) = 07215108e5ae85c62c5a06a195e95a804776c8e3
+SHA1 (patch-master_Makefile) = 74dbea3ad98338d7570164ff787be4e988c42417
 SHA1 (patch-master_defs.h) = c9d79711b28d629dbe9c1493f2467faf915ee9be
 SHA1 (patch-master_page.c) = db2af3cb4069384e8159c8eaad43587280630954

Index: pkgsrc/chat/phone/patches/patch-client_Makefile
diff -u pkgsrc/chat/phone/patches/patch-client_Makefile:1.4 pkgsrc/chat/phone/patches/patch-client_Makefile:1.5
--- pkgsrc/chat/phone/patches/patch-client_Makefile:1.4 Thu Jun 25 07:02:42 2015
+++ pkgsrc/chat/phone/patches/patch-client_Makefile     Mon Nov 30 12:26:07 2020
@@ -1,7 +1,9 @@
-$NetBSD: patch-client_Makefile,v 1.4 2015/06/25 07:02:42 dholland Exp $
+$NetBSD: patch-client_Makefile,v 1.5 2020/11/30 12:26:07 nia Exp $
 
 Configure for pkgsrc.
 
+Don't build with -g or -Werror.
+
 Also, remove explicit depends on header files in /usr/include, many of
 which aren't actually used.
 
@@ -12,9 +14,10 @@ which aren't actually used.
  
  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+= -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
  #CFLAGS = -O -DSERVICES -DLOCAL_ECHO
- CFLAGS += -g -DSERVICES #-DLOCAL_ECHO
+-CFLAGS += -g -DSERVICES #-DLOCAL_ECHO
++CFLAGS += -DSERVICES #-DLOCAL_ECHO
  LIBS   = -lcurses -ltermlib #-lresolv
  
  LPR    = lpr 

Index: pkgsrc/chat/phone/patches/patch-master_Makefile
diff -u pkgsrc/chat/phone/patches/patch-master_Makefile:1.3 pkgsrc/chat/phone/patches/patch-master_Makefile:1.4
--- pkgsrc/chat/phone/patches/patch-master_Makefile:1.3 Mon Jan  6 22:11:50 2014
+++ pkgsrc/chat/phone/patches/patch-master_Makefile     Mon Nov 30 12:26:07 2020
@@ -1,4 +1,4 @@
-$NetBSD: patch-master_Makefile,v 1.3 2014/01/06 22:11:50 joerg Exp $
+$NetBSD: patch-master_Makefile,v 1.4 2020/11/30 12:26:07 nia Exp $
 
 Configure for pkgsrc.
 
@@ -11,9 +11,9 @@ Configure for pkgsrc.
 -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+= $(OFLAG) $(INETD) $(FORK) -DDPATH=\"${PREFIX}/libexec/convd\"
 +CFLAGS+= -DNO_WHO
-+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+= -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
  
  
  LPR   = lpr