Module Name: src
Committed By: mrg
Date: Mon Jun 20 07:44:04 UTC 2011
Modified Files:
src/crypto/external/bsd/openssh/bin/sftp: Makefile
src/crypto/external/bsd/openssh/bin/ssh: Makefile
src/crypto/external/bsd/openssh/bin/ssh-keygen: Makefile
src/crypto/external/bsd/openssh/bin/sshd: Makefile
src/crypto/external/bsd/openssh/lib: Makefile
src/distrib/utils/sysinst: Makefile.inc
src/distrib/utils/x_dhclient: Makefile
src/external/bsd/am-utils/bin/amd: Makefile
src/external/bsd/am-utils/bin/amq: Makefile
src/external/bsd/am-utils/bin/pawd: Makefile
src/external/bsd/am-utils/lib/libamu: Makefile
src/external/bsd/bind: Makefile.inc
src/external/bsd/bind/bin/named: Makefile
src/external/bsd/bind/lib/libdns: Makefile
src/external/historical/nawk/bin: Makefile
src/lib/libcrypt: Makefile
src/lib/libgssapi: Makefile
src/lib/libhdb: Makefile
src/lib/libheimntlm: Makefile
src/lib/libhx509: Makefile
src/lib/libkadm5clnt: Makefile
src/lib/libkadm5srv: Makefile
src/lib/libm: Makefile
src/lib/libtelnet: Makefile
src/libexec/ipropd-master: Makefile
src/libexec/ipropd-slave: Makefile
src/libexec/kadmind: Makefile
src/libexec/kpasswdd: Makefile
src/regress/sys/kern/ras/ras1: Makefile
src/regress/sys/kern/ras/ras2: Makefile
src/regress/sys/kern/ras/ras3: Makefile
src/sbin/dkctl: Makefile
src/sbin/dump: Makefile
src/sbin/fsck_ext2fs: Makefile
src/sbin/fsck_ffs: Makefile
src/sbin/fsdb: Makefile
src/sbin/mount_smbfs: Makefile.inc
src/sbin/newfs: Makefile
src/sbin/newfs_sysvbfs: Makefile
src/sbin/restore: Makefile
src/share/mk: bsd.kmodule.mk
src/usr.bin/awk: Makefile
src/usr.bin/crontab: Makefile
src/usr.bin/ctags: Makefile
src/usr.bin/gzip: Makefile
src/usr.bin/nvi/build: Makefile
src/usr.bin/telnet: Makefile
src/usr.bin/tr: Makefile
src/usr.sbin/bootp/bootptest: Makefile
src/usr.sbin/cron: Makefile
src/usr.sbin/dhcp: Makefile.inc
src/usr.sbin/dumplfs: Makefile
src/usr.sbin/hprop: Makefile
src/usr.sbin/installboot: Makefile
src/usr.sbin/iprop-log: Makefile
src/usr.sbin/isdn/isdnd: Makefile
src/usr.sbin/isdn/isdnmonitor: Makefile
src/usr.sbin/isdn/isdntel: Makefile
src/usr.sbin/isdn/isdntrace: Makefile
src/usr.sbin/makefs/cd9660: Makefile.inc
src/usr.sbin/mopd/common: Makefile
src/usr.sbin/mopd/mopd: Makefile
src/usr.sbin/mopd/mopprobe: Makefile
src/usr.sbin/mscdlabel: Makefile
src/usr.sbin/pppd: Makefile.inc
src/usr.sbin/pppd/pppd: Makefile
src/usr.sbin/rarpd: Makefile
src/usr.sbin/rbootd: Makefile
src/usr.sbin/rpc.pcnfsd: Makefile
src/usr.sbin/rtadvd: Makefile
src/usr.sbin/tcpdump: Makefile
src/usr.sbin/wiconfig: Makefile
Log Message:
remove most of the remaining HAVE_GCC tests that are always true in
the modern world.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/openssh/bin/sftp/Makefile
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/openssh/bin/ssh/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/openssh/bin/sshd/Makefile
cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/openssh/lib/Makefile
cvs rdiff -u -r1.52 -r1.53 src/distrib/utils/sysinst/Makefile.inc
cvs rdiff -u -r1.16 -r1.17 src/distrib/utils/x_dhclient/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/am-utils/bin/amd/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/am-utils/bin/amq/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/am-utils/bin/pawd/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/am-utils/lib/libamu/Makefile
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/bind/Makefile.inc
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/bind/bin/named/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/bind/lib/libdns/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/historical/nawk/bin/Makefile
cvs rdiff -u -r1.21 -r1.22 src/lib/libcrypt/Makefile
cvs rdiff -u -r1.22 -r1.23 src/lib/libgssapi/Makefile
cvs rdiff -u -r1.24 -r1.25 src/lib/libhdb/Makefile
cvs rdiff -u -r1.3 -r1.4 src/lib/libheimntlm/Makefile
cvs rdiff -u -r1.6 -r1.7 src/lib/libhx509/Makefile
cvs rdiff -u -r1.25 -r1.26 src/lib/libkadm5clnt/Makefile
cvs rdiff -u -r1.28 -r1.29 src/lib/libkadm5srv/Makefile
cvs rdiff -u -r1.110 -r1.111 src/lib/libm/Makefile
cvs rdiff -u -r1.32 -r1.33 src/lib/libtelnet/Makefile
cvs rdiff -u -r1.3 -r1.4 src/libexec/ipropd-master/Makefile
cvs rdiff -u -r1.3 -r1.4 src/libexec/ipropd-slave/Makefile
cvs rdiff -u -r1.21 -r1.22 src/libexec/kadmind/Makefile
cvs rdiff -u -r1.16 -r1.17 src/libexec/kpasswdd/Makefile
cvs rdiff -u -r1.4 -r1.5 src/regress/sys/kern/ras/ras1/Makefile
cvs rdiff -u -r1.4 -r1.5 src/regress/sys/kern/ras/ras2/Makefile
cvs rdiff -u -r1.4 -r1.5 src/regress/sys/kern/ras/ras3/Makefile
cvs rdiff -u -r1.5 -r1.6 src/sbin/dkctl/Makefile
cvs rdiff -u -r1.36 -r1.37 src/sbin/dump/Makefile
cvs rdiff -u -r1.14 -r1.15 src/sbin/fsck_ext2fs/Makefile
cvs rdiff -u -r1.41 -r1.42 src/sbin/fsck_ffs/Makefile
cvs rdiff -u -r1.28 -r1.29 src/sbin/fsdb/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sbin/mount_smbfs/Makefile.inc
cvs rdiff -u -r1.37 -r1.38 src/sbin/newfs/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sbin/newfs_sysvbfs/Makefile
cvs rdiff -u -r1.24 -r1.25 src/sbin/restore/Makefile
cvs rdiff -u -r1.29 -r1.30 src/share/mk/bsd.kmodule.mk
cvs rdiff -u -r1.15 -r1.16 src/usr.bin/awk/Makefile
cvs rdiff -u -r1.26 -r1.27 src/usr.bin/crontab/Makefile
cvs rdiff -u -r1.11 -r1.12 src/usr.bin/ctags/Makefile
cvs rdiff -u -r1.14 -r1.15 src/usr.bin/gzip/Makefile
cvs rdiff -u -r1.14 -r1.15 src/usr.bin/nvi/build/Makefile
cvs rdiff -u -r1.46 -r1.47 src/usr.bin/telnet/Makefile
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/tr/Makefile
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/bootp/bootptest/Makefile
cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/cron/Makefile
cvs rdiff -u -r1.24 -r1.25 src/usr.sbin/dhcp/Makefile.inc
cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/dumplfs/Makefile
cvs rdiff -u -r1.17 -r1.18 src/usr.sbin/hprop/Makefile
cvs rdiff -u -r1.43 -r1.44 src/usr.sbin/installboot/Makefile
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/iprop-log/Makefile
cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/isdn/isdnd/Makefile
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/isdn/isdnmonitor/Makefile
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/isdn/isdntel/Makefile
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/isdn/isdntrace/Makefile
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/makefs/cd9660/Makefile.inc
cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/mopd/common/Makefile
cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/mopd/mopd/Makefile
cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/mopd/mopprobe/Makefile
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/mscdlabel/Makefile
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/pppd/Makefile.inc
cvs rdiff -u -r1.40 -r1.41 src/usr.sbin/pppd/pppd/Makefile
cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/rarpd/Makefile
cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/rbootd/Makefile
cvs rdiff -u -r1.21 -r1.22 src/usr.sbin/rpc.pcnfsd/Makefile
cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/rtadvd/Makefile
cvs rdiff -u -r1.51 -r1.52 src/usr.sbin/tcpdump/Makefile
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/wiconfig/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssh/bin/sftp/Makefile
diff -u src/crypto/external/bsd/openssh/bin/sftp/Makefile:1.3 src/crypto/external/bsd/openssh/bin/sftp/Makefile:1.4
--- src/crypto/external/bsd/openssh/bin/sftp/Makefile:1.3 Sun Nov 21 19:19:22 2010
+++ src/crypto/external/bsd/openssh/bin/sftp/Makefile Mon Jun 20 07:43:56 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2010/11/21 19:19:22 adam Exp $
+# $NetBSD: Makefile,v 1.4 2011/06/20 07:43:56 mrg Exp $
BINDIR= /usr/bin
@@ -11,7 +11,7 @@
.include <bsd.prog.mk>
-.if (defined(HAVE_GCC) && ${HAVE_GCC} == 4) || defined(HAVE_PCC)
+.if defined(HAVE_GCC) || defined(HAVE_PCC)
COPTS.sftp.c+= -Wno-pointer-sign
COPTS.sftp-client.c+= -Wno-pointer-sign
.endif
Index: src/crypto/external/bsd/openssh/bin/ssh/Makefile
diff -u src/crypto/external/bsd/openssh/bin/ssh/Makefile:1.4 src/crypto/external/bsd/openssh/bin/ssh/Makefile:1.5
--- src/crypto/external/bsd/openssh/bin/ssh/Makefile:1.4 Sat Jun 4 02:08:50 2011
+++ src/crypto/external/bsd/openssh/bin/ssh/Makefile Mon Jun 20 07:43:56 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2011/06/04 02:08:50 tsutsui Exp $
+# $NetBSD: Makefile,v 1.5 2011/06/20 07:43:56 mrg Exp $
.include <bsd.own.mk>
@@ -10,7 +10,7 @@
roaming_common.c roaming_client.c
COPTS.sshconnect1.c= -fno-strict-aliasing
-.if (defined(HAVE_GCC) && ${HAVE_GCC} == 4) || defined(HAVE_PCC)
+.if defined(HAVE_GCC) || defined(HAVE_PCC)
COPTS.mux.c= -Wno-pointer-sign
COPTS.sshconnect2.c= -Wno-pointer-sign
.endif
Index: src/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile
diff -u src/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile:1.2 src/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile:1.3
--- src/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile:1.2 Sun Nov 21 19:19:22 2010
+++ src/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile Mon Jun 20 07:43:56 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/11/21 19:19:22 adam Exp $
+# $NetBSD: Makefile,v 1.3 2011/06/20 07:43:56 mrg Exp $
BINDIR= /usr/bin
@@ -7,6 +7,6 @@
.include <bsd.prog.mk>
-.if (defined(HAVE_GCC) && ${HAVE_GCC} == 4) || defined(HAVE_PCC)
+.if defined(HAVE_GCC) || defined(HAVE_PCC)
COPTS.ssh-keygen.c= -Wno-pointer-sign
.endif
Index: src/crypto/external/bsd/openssh/bin/sshd/Makefile
diff -u src/crypto/external/bsd/openssh/bin/sshd/Makefile:1.4 src/crypto/external/bsd/openssh/bin/sshd/Makefile:1.5
--- src/crypto/external/bsd/openssh/bin/sshd/Makefile:1.4 Thu Dec 2 10:21:28 2010
+++ src/crypto/external/bsd/openssh/bin/sshd/Makefile Mon Jun 20 07:43:56 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2010/12/02 10:21:28 he Exp $
+# $NetBSD: Makefile,v 1.5 2011/06/20 07:43:56 mrg Exp $
.include <bsd.own.mk>
@@ -17,7 +17,7 @@
kexdhs.c kexgexs.c sftp-server.c sftp-common.c auth2-jpake.c \
roaming_common.c roaming_serv.c
-.if (defined(HAVE_GCC) && ${HAVE_GCC} == 4) || defined(HAVE_PCC)
+.if defined(HAVE_GCC) || defined(HAVE_PCC)
COPTS.auth-options.c= -Wno-pointer-sign
.endif
Index: src/crypto/external/bsd/openssh/lib/Makefile
diff -u src/crypto/external/bsd/openssh/lib/Makefile:1.8 src/crypto/external/bsd/openssh/lib/Makefile:1.9
--- src/crypto/external/bsd/openssh/lib/Makefile:1.8 Sat Feb 5 16:01:57 2011
+++ src/crypto/external/bsd/openssh/lib/Makefile Mon Jun 20 07:43:56 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2011/02/05 16:01:57 christos Exp $
+# $NetBSD: Makefile,v 1.9 2011/06/20 07:43:56 mrg Exp $
.include <bsd.own.mk>
@@ -28,10 +28,13 @@
crypt ${NETBSDSRCDIR}/lib/libcrypt \
z ${NETBSDSRCDIR}/lib/libz
-.if (defined(HAVE_GCC) && ${HAVE_GCC} == 4) || defined(HAVE_PCC)
+.if defined(HAVE_GCC) || defined(HAVE_PCC)
.for f in dns channels hostfile ssh-pkcs11
COPTS.${f}.c+= -Wno-pointer-sign
.endfor
.endif
.include <bsd.lib.mk>
+
+# XXX
+COPTS.channels.c+= -fno-strict-aliasing
Index: src/distrib/utils/sysinst/Makefile.inc
diff -u src/distrib/utils/sysinst/Makefile.inc:1.52 src/distrib/utils/sysinst/Makefile.inc:1.53
--- src/distrib/utils/sysinst/Makefile.inc:1.52 Sun Feb 20 08:26:09 2011
+++ src/distrib/utils/sysinst/Makefile.inc Mon Jun 20 07:43:56 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.52 2011/02/20 08:26:09 matt Exp $
+# $NetBSD: Makefile.inc,v 1.53 2011/06/20 07:43:56 mrg Exp $
#
# Makefile for sysinst
@@ -46,7 +46,7 @@
CPPFLAGS+=-DINET6
.endif
-.if (defined(HAVE_GCC) && ${HAVE_GCC} == 4) || defined(HAVE_PCC)
+.if defined(HAVE_GCC) || defined(HAVE_PCC)
COPTS.label.c+= -Wno-pointer-sign
.endif
Index: src/distrib/utils/x_dhclient/Makefile
diff -u src/distrib/utils/x_dhclient/Makefile:1.16 src/distrib/utils/x_dhclient/Makefile:1.17
--- src/distrib/utils/x_dhclient/Makefile:1.16 Fri Aug 29 00:02:22 2008
+++ src/distrib/utils/x_dhclient/Makefile Mon Jun 20 07:43:57 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2008/08/29 00:02:22 gmcgarry Exp $
+# $NetBSD: Makefile,v 1.17 2011/06/20 07:43:57 mrg Exp $
NOMAN=
.include <bsd.own.mk>
@@ -12,7 +12,7 @@
CPPFLAGS+= -DCLIENT_PATH='"PATH=/usr/bin:/usr/sbin:/bin:/sbin"' \
-DSMALL -I${RSRCDIR} -I${RSRCDIR}/includes
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 4
+.if defined(HAVE_GCC)
CPPFLAGS+= -fno-strict-aliasing
.endif
Index: src/external/bsd/am-utils/bin/amd/Makefile
diff -u src/external/bsd/am-utils/bin/amd/Makefile:1.6 src/external/bsd/am-utils/bin/amd/Makefile:1.7
--- src/external/bsd/am-utils/bin/amd/Makefile:1.6 Thu May 26 12:56:25 2011
+++ src/external/bsd/am-utils/bin/amd/Makefile Mon Jun 20 07:43:57 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2011/05/26 12:56:25 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2011/06/20 07:43:57 mrg Exp $
.include "${.CURDIR}/../Makefile.inc"
@@ -44,7 +44,7 @@
SRCS+= info_nis.c
.endif
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 4
+.if defined(HAVE_GCC)
COPTS.amq_subr.c+= -fno-strict-aliasing
.endif
Index: src/external/bsd/am-utils/bin/amq/Makefile
diff -u src/external/bsd/am-utils/bin/amq/Makefile:1.2 src/external/bsd/am-utils/bin/amq/Makefile:1.3
--- src/external/bsd/am-utils/bin/amq/Makefile:1.2 Mon Feb 8 07:56:38 2010
+++ src/external/bsd/am-utils/bin/amq/Makefile Mon Jun 20 07:43:57 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/02/08 07:56:38 plunky Exp $
+# $NetBSD: Makefile,v 1.3 2011/06/20 07:43:57 mrg Exp $
.include "${.CURDIR}/../Makefile.inc"
@@ -13,7 +13,7 @@
CPPFLAGS+= -I${DIST}
LDADD+= ${LIBAMU}
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 4
+.if defined(HAVE_GCC)
COPTS.amq_xdr.c+= -fno-strict-aliasing
COPTS.amq.c+= -fno-strict-aliasing
.endif
Index: src/external/bsd/am-utils/bin/pawd/Makefile
diff -u src/external/bsd/am-utils/bin/pawd/Makefile:1.3 src/external/bsd/am-utils/bin/pawd/Makefile:1.4
--- src/external/bsd/am-utils/bin/pawd/Makefile:1.3 Mon Feb 8 07:56:38 2010
+++ src/external/bsd/am-utils/bin/pawd/Makefile Mon Jun 20 07:43:57 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2010/02/08 07:56:38 plunky Exp $
+# $NetBSD: Makefile,v 1.4 2011/06/20 07:43:57 mrg Exp $
BINDIR= /usr/bin
@@ -15,7 +15,7 @@
CPPFLAGS+= -I${DIST}
LDADD+= ${LIBAMU}
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 4
+.if defined(HAVE_GCC)
COPTS.amq_xdr.c+= -fno-strict-aliasing
.endif
Index: src/external/bsd/am-utils/lib/libamu/Makefile
diff -u src/external/bsd/am-utils/lib/libamu/Makefile:1.2 src/external/bsd/am-utils/lib/libamu/Makefile:1.3
--- src/external/bsd/am-utils/lib/libamu/Makefile:1.2 Mon Feb 8 07:56:38 2010
+++ src/external/bsd/am-utils/lib/libamu/Makefile Mon Jun 20 07:43:57 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/02/08 07:56:38 plunky Exp $
+# $NetBSD: Makefile,v 1.3 2011/06/20 07:43:57 mrg Exp $
NOLINKLIB= # defined
@@ -18,7 +18,7 @@
wire.c xdr_func.c xutil.c
# XXX
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 4
+.if defined(HAVE_GCC)
COPTS.xdr_func.c+= -fno-strict-aliasing
.endif
Index: src/external/bsd/bind/Makefile.inc
diff -u src/external/bsd/bind/Makefile.inc:1.11 src/external/bsd/bind/Makefile.inc:1.12
--- src/external/bsd/bind/Makefile.inc:1.11 Thu May 26 12:56:25 2011
+++ src/external/bsd/bind/Makefile.inc Mon Jun 20 07:43:57 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.11 2011/05/26 12:56:25 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.12 2011/06/20 07:43:57 mrg Exp $
.if !defined(BIND9_MAKEFILE_INC)
BIND9_MAKEFILE_INC=yes
@@ -52,7 +52,7 @@
CPPFLAGS+= -DWANT_IPV6
.endif
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 4
+.if defined(HAVE_GCC)
COPTS+= -Wno-pointer-sign
.endif
Index: src/external/bsd/bind/bin/named/Makefile
diff -u src/external/bsd/bind/bin/named/Makefile:1.2 src/external/bsd/bind/bin/named/Makefile:1.3
--- src/external/bsd/bind/bin/named/Makefile:1.2 Tue Jul 28 21:18:01 2009
+++ src/external/bsd/bind/bin/named/Makefile Mon Jun 20 07:43:57 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/07/28 21:18:01 christos Exp $
+# $NetBSD: Makefile,v 1.3 2011/06/20 07:43:57 mrg Exp $
.include <bsd.own.mk>
@@ -13,7 +13,7 @@
CPPFLAGS+=-I${DIST}/include -I${DIST}/unix/include -DCONFIGARGS=\"defaults\"
CPPFLAGS+=-DNO_VERSION_DATE
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 4
+.if defined(HAVE_GCC)
.for f in client
COPTS.${f}.c+= -fno-strict-aliasing
.endfor
Index: src/external/bsd/bind/lib/libdns/Makefile
diff -u src/external/bsd/bind/lib/libdns/Makefile:1.3 src/external/bsd/bind/lib/libdns/Makefile:1.4
--- src/external/bsd/bind/lib/libdns/Makefile:1.3 Wed Feb 16 03:47:21 2011
+++ src/external/bsd/bind/lib/libdns/Makefile Mon Jun 20 07:43:57 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/02/16 03:47:21 christos Exp $
+# $NetBSD: Makefile,v 1.4 2011/06/20 07:43:57 mrg Exp $
LIB=dns
@@ -12,7 +12,7 @@
.PATH.c: ${DIST}/unix ${DIST}/sec/dst ${DIST}
CPPFLAGS+= -I${BIND_SRCDIR}/include/dns -I${DIST}
-.if (defined(HAVE_GCC) && ${HAVE_GCC} == 4) || defined(HAVE_PCC)
+.if defined(HAVE_GCC) || defined(HAVE_PCC)
.for f in lookup byaddr request sdb validator
COPTS.${f}.c+= -Wno-pointer-sign -fno-strict-aliasing
.endfor
Index: src/external/historical/nawk/bin/Makefile
diff -u src/external/historical/nawk/bin/Makefile:1.5 src/external/historical/nawk/bin/Makefile:1.6
--- src/external/historical/nawk/bin/Makefile:1.5 Thu May 26 12:56:27 2011
+++ src/external/historical/nawk/bin/Makefile Mon Jun 20 07:43:57 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2011/05/26 12:56:27 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2011/06/20 07:43:57 mrg Exp $
WARNS?= 4
CWARNFLAGS.clang+= -Wno-array-bounds -Wno-self-assign
@@ -17,7 +17,7 @@
DPADD+= ${LIBM}
.endif
YHEADER= yes
-.if (defined(HAVE_GCC) && ${HAVE_GCC} == 4) || defined(HAVE_PCC)
+.if defined(HAVE_GCC) || defined(HAVE_PCC)
COPTS+= -Wno-pointer-sign
.endif
Index: src/lib/libcrypt/Makefile
diff -u src/lib/libcrypt/Makefile:1.21 src/lib/libcrypt/Makefile:1.22
--- src/lib/libcrypt/Makefile:1.21 Fri Aug 29 00:02:22 2008
+++ src/lib/libcrypt/Makefile Mon Jun 20 07:43:58 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2008/08/29 00:02:22 gmcgarry Exp $
+# $NetBSD: Makefile,v 1.22 2011/06/20 07:43:58 mrg Exp $
USE_SHLIBDIR= yes
@@ -25,6 +25,6 @@
.include <bsd.lib.mk>
.endif
-.if (defined(HAVE_GCC) && ${HAVE_GCC} == 4) || defined(HAVE_PCC)
+.if defined(HAVE_GCC) || defined(HAVE_PCC)
COPTS.crypt-sha1.c+= -Wno-pointer-sign
.endif
Index: src/lib/libgssapi/Makefile
diff -u src/lib/libgssapi/Makefile:1.22 src/lib/libgssapi/Makefile:1.23
--- src/lib/libgssapi/Makefile:1.22 Mon Jul 20 17:28:51 2009
+++ src/lib/libgssapi/Makefile Mon Jun 20 07:43:58 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2009/07/20 17:28:51 christos Exp $
+# $NetBSD: Makefile,v 1.23 2011/06/20 07:43:58 mrg Exp $
USE_FORT?= yes # network protocol library
@@ -301,7 +301,7 @@
CPPFLAGS+=-DHAVE_IPV6
.endif
-.if (defined(HAVE_GCC) && ${HAVE_GCC} == 4) || defined(HAVE_PCC)
+.if defined(HAVE_GCC) || defined(HAVE_PCC)
COPTS+= -Wno-pointer-sign
.endif
Index: src/lib/libhdb/Makefile
diff -u src/lib/libhdb/Makefile:1.24 src/lib/libhdb/Makefile:1.25
--- src/lib/libhdb/Makefile:1.24 Fri Aug 29 00:02:22 2008
+++ src/lib/libhdb/Makefile Mon Jun 20 07:43:58 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2008/08/29 00:02:22 gmcgarry Exp $
+# $NetBSD: Makefile,v 1.25 2011/06/20 07:43:58 mrg Exp $
USE_FORT?= yes # network protocol library
@@ -92,10 +92,8 @@
CPPFLAGS+=-DHAVE_IPV6
.endif
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 4
-.for f in mkey
-COPTS.${f}.c+= -Wno-pointer-sign
-.endfor
+.if defined(HAVE_GCC)
+COPTS.mkey.c+= -Wno-pointer-sign
.endif
${gen_files} hdb_asn1.hx: hdb_asn1_files
Index: src/lib/libheimntlm/Makefile
diff -u src/lib/libheimntlm/Makefile:1.3 src/lib/libheimntlm/Makefile:1.4
--- src/lib/libheimntlm/Makefile:1.3 Mon Oct 27 07:26:55 2008
+++ src/lib/libheimntlm/Makefile Mon Jun 20 07:43:58 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/10/27 07:26:55 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2011/06/20 07:43:58 mrg Exp $
USE_FORT?= yes # cryptographic software
@@ -42,7 +42,7 @@
CPPFLAGS+=-DHAVE_IPV6
.endif
-.if (defined(HAVE_GCC) && ${HAVE_GCC} == 4) || defined(HAVE_PCC)
+.if defined(HAVE_GCC) || defined(HAVE_PCC)
COPTS+= -Wno-pointer-sign
.endif
Index: src/lib/libhx509/Makefile
diff -u src/lib/libhx509/Makefile:1.6 src/lib/libhx509/Makefile:1.7
--- src/lib/libhx509/Makefile:1.6 Mon Jul 20 12:16:37 2009
+++ src/lib/libhx509/Makefile Mon Jun 20 07:43:58 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/07/20 12:16:37 skrll Exp $
+# $NetBSD: Makefile,v 1.7 2011/06/20 07:43:58 mrg Exp $
USE_FORT?= yes # cryptographic software
@@ -140,10 +140,8 @@
CPPFLAGS+=-DHAVE_IPV6
.endif
-.if (defined(HAVE_GCC) && ${HAVE_GCC} == 4) || defined(HAVE_PCC)
-.for f in mkey
-COPTS.${f}.c+= -Wno-pointer-sign
-.endfor
+.if defined(HAVE_GCC) || defined(HAVE_PCC)
+COPTS.mkey.c+= -Wno-pointer-sign
.endif
${gen_files_ocsp} ocsp_asn1.hx: ocsp_asn1_files
Index: src/lib/libkadm5clnt/Makefile
diff -u src/lib/libkadm5clnt/Makefile:1.25 src/lib/libkadm5clnt/Makefile:1.26
--- src/lib/libkadm5clnt/Makefile:1.25 Fri Aug 29 00:02:22 2008
+++ src/lib/libkadm5clnt/Makefile Mon Jun 20 07:43:58 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2008/08/29 00:02:22 gmcgarry Exp $
+# $NetBSD: Makefile,v 1.26 2011/06/20 07:43:58 mrg Exp $
USE_FORT?= yes # network protocol library
@@ -89,7 +89,7 @@
fi
.endif
-.if (defined(HAVE_GCC) && ${HAVE_GCC} == 4) || defined(HAVE_PCC)
+.if defined(HAVE_GCC) || defined(HAVE_PCC)
COPTS.marshall.c+= -Wno-pointer-sign
.endif
Index: src/lib/libkadm5srv/Makefile
diff -u src/lib/libkadm5srv/Makefile:1.28 src/lib/libkadm5srv/Makefile:1.29
--- src/lib/libkadm5srv/Makefile:1.28 Fri Aug 29 00:02:22 2008
+++ src/lib/libkadm5srv/Makefile Mon Jun 20 07:43:58 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2008/08/29 00:02:22 gmcgarry Exp $
+# $NetBSD: Makefile,v 1.29 2011/06/20 07:43:58 mrg Exp $
USE_FORT?= yes # network protocol library
@@ -102,7 +102,7 @@
CPPFLAGS+= -DNO_DLOPEN
.endif
-.if (defined(HAVE_GCC) && ${HAVE_GCC} == 4) || defined(HAVE_PCC)
+.if defined(HAVE_GCC) || defined(HAVE_PCC)
COPTS.marshall.c+= -Wno-pointer-sign
.endif
Index: src/lib/libm/Makefile
diff -u src/lib/libm/Makefile:1.110 src/lib/libm/Makefile:1.111
--- src/lib/libm/Makefile:1.110 Fri May 20 21:42:48 2011
+++ src/lib/libm/Makefile Mon Jun 20 07:43:58 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.110 2011/05/20 21:42:48 nakayama Exp $
+# $NetBSD: Makefile,v 1.111 2011/06/20 07:43:58 mrg Exp $
#
# @(#)Makefile 5.1beta 93/09/24
#
@@ -158,7 +158,7 @@
.PATH: ${.CURDIR}/compat
COMMON_SRCS+= compat_cabs.c compat_cabsf.c
# XXX our compatibility cabs() is different!
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 4
+.if defined(HAVE_GCC)
COPTS.compat_cabs.c= -fno-builtin-cabs
COPTS.compat_cabsf.c= -fno-builtin-cabsf
.endif
Index: src/lib/libtelnet/Makefile
diff -u src/lib/libtelnet/Makefile:1.32 src/lib/libtelnet/Makefile:1.33
--- src/lib/libtelnet/Makefile:1.32 Sun Apr 24 19:00:56 2011
+++ src/lib/libtelnet/Makefile Mon Jun 20 07:43:58 2011
@@ -1,5 +1,5 @@
# from: @(#)Makefile 8.2 (Berkeley) 12/15/93
-# $NetBSD: Makefile,v 1.32 2011/04/24 19:00:56 elric Exp $
+# $NetBSD: Makefile,v 1.33 2011/06/20 07:43:58 mrg Exp $
USE_FORT?= yes # network protocol library
@@ -29,7 +29,7 @@
CPPFLAGS+= -DSRA
.endif
-.if (defined(HAVE_GCC) && ${HAVE_GCC} == 4) || defined(HAVE_PCC)
+.if defined(HAVE_GCC) || defined(HAVE_PCC)
.for f in auth enc_des kerberos5 pk
COPTS.${f}.c+= -Wno-pointer-sign
.endfor
Index: src/libexec/ipropd-master/Makefile
diff -u src/libexec/ipropd-master/Makefile:1.3 src/libexec/ipropd-master/Makefile:1.4
--- src/libexec/ipropd-master/Makefile:1.3 Fri Aug 29 00:02:22 2008
+++ src/libexec/ipropd-master/Makefile Mon Jun 20 07:43:59 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/08/29 00:02:22 gmcgarry Exp $
+# $NetBSD: Makefile,v 1.4 2011/06/20 07:43:59 mrg Exp $
NOLINT= # defined
@@ -26,7 +26,7 @@
-I${DESTDIR}/usr/include/krb5 \
-DHAVE_CONFIG_H
-.if (defined(HAVE_GCC) && ${HAVE_GCC} == 4) || defined(HAVE_PCC)
+.if defined(HAVE_GCC) || defined(HAVE_PCC)
COPTS.server.c+= -Wno-pointer-sign
.endif
Index: src/libexec/ipropd-slave/Makefile
diff -u src/libexec/ipropd-slave/Makefile:1.3 src/libexec/ipropd-slave/Makefile:1.4
--- src/libexec/ipropd-slave/Makefile:1.3 Fri Aug 29 00:02:23 2008
+++ src/libexec/ipropd-slave/Makefile Mon Jun 20 07:43:59 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/08/29 00:02:23 gmcgarry Exp $
+# $NetBSD: Makefile,v 1.4 2011/06/20 07:43:59 mrg Exp $
NOLINT= # defined
@@ -25,7 +25,7 @@
-I${DESTDIR}/usr/include/krb5 \
-DHAVE_CONFIG_H
-.if (defined(HAVE_GCC) && ${HAVE_GCC} == 4) || defined(HAVE_PCC)
+.if defined(HAVE_GCC) || defined(HAVE_PCC)
COPTS.server.c+= -Wno-pointer-sign
.endif
Index: src/libexec/kadmind/Makefile
diff -u src/libexec/kadmind/Makefile:1.21 src/libexec/kadmind/Makefile:1.22
--- src/libexec/kadmind/Makefile:1.21 Fri Aug 29 00:02:23 2008
+++ src/libexec/kadmind/Makefile Mon Jun 20 07:43:59 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2008/08/29 00:02:23 gmcgarry Exp $
+# $NetBSD: Makefile,v 1.22 2011/06/20 07:43:59 mrg Exp $
NOLINT= # defined
@@ -25,7 +25,7 @@
-I${DESTDIR}/usr/include/krb5 \
-DHAVE_CONFIG_H
-.if (defined(HAVE_GCC) && ${HAVE_GCC} == 4) || defined(HAVE_PCC)
+.if defined(HAVE_GCC) || defined(HAVE_PCC)
COPTS.server.c+= -Wno-pointer-sign
.endif
Index: src/libexec/kpasswdd/Makefile
diff -u src/libexec/kpasswdd/Makefile:1.16 src/libexec/kpasswdd/Makefile:1.17
--- src/libexec/kpasswdd/Makefile:1.16 Fri Aug 29 00:02:23 2008
+++ src/libexec/kpasswdd/Makefile Mon Jun 20 07:43:59 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2008/08/29 00:02:23 gmcgarry Exp $
+# $NetBSD: Makefile,v 1.17 2011/06/20 07:43:59 mrg Exp $
NOLINT= # defined
@@ -23,7 +23,7 @@
CPPFLAGS+=-DHAVE_IPV6
.endif
-.if (defined(HAVE_GCC) && ${HAVE_GCC} == 4) || defined(HAVE_PCC)
+.if defined(HAVE_GCC) || defined(HAVE_PCC)
COPTS.kpasswdd.c+= -fno-strict-aliasing
.endif
Index: src/regress/sys/kern/ras/ras1/Makefile
diff -u src/regress/sys/kern/ras/ras1/Makefile:1.4 src/regress/sys/kern/ras/ras1/Makefile:1.5
--- src/regress/sys/kern/ras/ras1/Makefile:1.4 Fri Aug 29 00:02:23 2008
+++ src/regress/sys/kern/ras/ras1/Makefile Mon Jun 20 07:43:59 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/08/29 00:02:23 gmcgarry Exp $
+# $NetBSD: Makefile,v 1.5 2011/06/20 07:43:59 mrg Exp $
NOMAN= #defined
@@ -14,7 +14,7 @@
.include <bsd.prog.mk>
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 4
+.if defined(HAVE_GCC)
CFLAGS+= -fno-reorder-blocks
.endif
Index: src/regress/sys/kern/ras/ras2/Makefile
diff -u src/regress/sys/kern/ras/ras2/Makefile:1.4 src/regress/sys/kern/ras/ras2/Makefile:1.5
--- src/regress/sys/kern/ras/ras2/Makefile:1.4 Fri Aug 29 00:02:23 2008
+++ src/regress/sys/kern/ras/ras2/Makefile Mon Jun 20 07:43:59 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/08/29 00:02:23 gmcgarry Exp $
+# $NetBSD: Makefile,v 1.5 2011/06/20 07:43:59 mrg Exp $
NOMAN= #defined
@@ -14,6 +14,6 @@
.include <bsd.prog.mk>
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 4
+.if defined(HAVE_GCC)
CFLAGS+= -fno-reorder-blocks
.endif
Index: src/regress/sys/kern/ras/ras3/Makefile
diff -u src/regress/sys/kern/ras/ras3/Makefile:1.4 src/regress/sys/kern/ras/ras3/Makefile:1.5
--- src/regress/sys/kern/ras/ras3/Makefile:1.4 Fri Aug 29 00:02:23 2008
+++ src/regress/sys/kern/ras/ras3/Makefile Mon Jun 20 07:43:59 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/08/29 00:02:23 gmcgarry Exp $
+# $NetBSD: Makefile,v 1.5 2011/06/20 07:43:59 mrg Exp $
NOMAN= #defined
PROG= ras3
@@ -13,6 +13,6 @@
.include <bsd.prog.mk>
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 4
+.if defined(HAVE_GCC)
CFLAGS+= -fno-reorder-blocks
.endif
Index: src/sbin/dkctl/Makefile
diff -u src/sbin/dkctl/Makefile:1.5 src/sbin/dkctl/Makefile:1.6
--- src/sbin/dkctl/Makefile:1.5 Fri Aug 29 00:02:23 2008
+++ src/sbin/dkctl/Makefile Mon Jun 20 07:43:59 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2008/08/29 00:02:23 gmcgarry Exp $
+# $NetBSD: Makefile,v 1.6 2011/06/20 07:43:59 mrg Exp $
PROG= dkctl
MAN= dkctl.8
@@ -8,6 +8,6 @@
.include <bsd.prog.mk>
-.if (defined(HAVE_GCC) && ${HAVE_GCC} == 4) || defined(HAVE_PCC)
+.if defined(HAVE_GCC) || defined(HAVE_PCC)
COPTS.dkctl.c+= -Wno-pointer-sign
.endif
Index: src/sbin/dump/Makefile
diff -u src/sbin/dump/Makefile:1.36 src/sbin/dump/Makefile:1.37
--- src/sbin/dump/Makefile:1.36 Sat Apr 11 07:58:11 2009
+++ src/sbin/dump/Makefile Mon Jun 20 07:43:59 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2009/04/11 07:58:11 lukem Exp $
+# $NetBSD: Makefile,v 1.37 2011/06/20 07:43:59 mrg Exp $
# @(#)Makefile 8.1 (Berkeley) 6/5/93
# dump.h header file
@@ -35,7 +35,7 @@
.PATH: ${NETBSDSRCDIR}/sys/ufs/ffs
-.if (defined(HAVE_GCC) && ${HAVE_GCC} == 4) || defined(HAVE_PCC)
+.if defined(HAVE_GCC) || defined(HAVE_PCC)
COPTS.ffs_inode.c+= -Wno-pointer-sign
.endif
Index: src/sbin/fsck_ext2fs/Makefile
diff -u src/sbin/fsck_ext2fs/Makefile:1.14 src/sbin/fsck_ext2fs/Makefile:1.15
--- src/sbin/fsck_ext2fs/Makefile:1.14 Fri Aug 29 00:02:23 2008
+++ src/sbin/fsck_ext2fs/Makefile Mon Jun 20 07:44:00 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2008/08/29 00:02:23 gmcgarry Exp $
+# $NetBSD: Makefile,v 1.15 2011/06/20 07:44:00 mrg Exp $
# @(#)Makefile 8.1 (Berkeley) 6/5/93
.include <bsd.own.mk>
@@ -16,7 +16,7 @@
LDADD+=-lutil
DPADD+=${LIBUTIL}
-.if (defined(HAVE_GCC) && ${HAVE_GCC} == 4) || defined(HAVE_PCC)
+.if defined(HAVE_GCC) || defined(HAVE_PCC)
.for f in pass5 utilities
COPTS.${f}.c+= -Wno-pointer-sign
.endfor
Index: src/sbin/fsck_ffs/Makefile
diff -u src/sbin/fsck_ffs/Makefile:1.41 src/sbin/fsck_ffs/Makefile:1.42
--- src/sbin/fsck_ffs/Makefile:1.41 Sun Mar 6 17:08:16 2011
+++ src/sbin/fsck_ffs/Makefile Mon Jun 20 07:44:00 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2011/03/06 17:08:16 bouyer Exp $
+# $NetBSD: Makefile,v 1.42 2011/06/20 07:44:00 mrg Exp $
# @(#)Makefile 8.2 (Berkeley) 4/27/95
WARNS?= 3 # XXX: sign-compare issues
@@ -32,7 +32,7 @@
LDADD+=-lprop
DPADD+=${LIBPROP}
-.if (defined(HAVE_GCC) && ${HAVE_GCC} == 4) || defined(HAVE_PCC)
+.if defined(HAVE_GCC) || defined(HAVE_PCC)
COPTS.ffs_appleufs.c+= -Wno-pointer-sign
.endif
Index: src/sbin/fsdb/Makefile
diff -u src/sbin/fsdb/Makefile:1.28 src/sbin/fsdb/Makefile:1.29
--- src/sbin/fsdb/Makefile:1.28 Sun Mar 6 17:08:16 2011
+++ src/sbin/fsdb/Makefile Mon Jun 20 07:44:00 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2011/03/06 17:08:16 bouyer Exp $
+# $NetBSD: Makefile,v 1.29 2011/06/20 07:44:00 mrg Exp $
# @(#)Makefile 8.1 (Berkeley) 6/5/93
WARNS?= 3 # XXX: sign-compare issues in ../fsck_ffs
@@ -33,7 +33,7 @@
DPADD+= ${LIBUTIL} ${LIBEDIT} ${LIBTERMINFO} ${LIBPROP}
.endif
-.if (defined(HAVE_GCC) && ${HAVE_GCC} == 4) || defined(HAVE_PCC)
+.if defined(HAVE_GCC) || defined(HAVE_PCC)
.for f in fsdb ffs_appleufs
COPTS.${f}.c+= -Wno-pointer-sign
.endfor
Index: src/sbin/mount_smbfs/Makefile.inc
diff -u src/sbin/mount_smbfs/Makefile.inc:1.3 src/sbin/mount_smbfs/Makefile.inc:1.4
--- src/sbin/mount_smbfs/Makefile.inc:1.3 Sat Apr 3 11:55:41 2010
+++ src/sbin/mount_smbfs/Makefile.inc Mon Jun 20 07:44:00 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.3 2010/04/03 11:55:41 plunky Exp $
+# $NetBSD: Makefile.inc,v 1.4 2011/06/20 07:44:00 mrg Exp $
#
SRCS+= rcfile.c ctx.c cfopt.c subr.c nls.c rap.c mbuf.c rq.c file.c \
@@ -13,7 +13,7 @@
DPADD+=${LIBUTIL}
LDADD+=-lutil
-.if (defined(HAVE_GCC) && ${HAVE_GCC} == 4) || defined(HAVE_PCC)
+.if defined(HAVE_GCC) || defined(HAVE_PCC)
.for f in ctx mbuf nb_name nbns_rq
COPTS.${f}.c+= -Wno-pointer-sign
.endfor
Index: src/sbin/newfs/Makefile
diff -u src/sbin/newfs/Makefile:1.37 src/sbin/newfs/Makefile:1.38
--- src/sbin/newfs/Makefile:1.37 Sun Mar 6 17:08:16 2011
+++ src/sbin/newfs/Makefile Mon Jun 20 07:44:00 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2011/03/06 17:08:16 bouyer Exp $
+# $NetBSD: Makefile,v 1.38 2011/06/20 07:44:00 mrg Exp $
# @(#)Makefile 8.2 (Berkeley) 3/27/94
.include <bsd.own.mk>
@@ -28,6 +28,6 @@
.include <bsd.prog.mk>
-.if (defined(HAVE_GCC) && ${HAVE_GCC} == 4) || defined(HAVE_PCC)
+.if defined(HAVE_GCC) || defined(HAVE_PCC)
COPTS.ffs_appleufs.c+= -Wno-pointer-sign
.endif
Index: src/sbin/newfs_sysvbfs/Makefile
diff -u src/sbin/newfs_sysvbfs/Makefile:1.3 src/sbin/newfs_sysvbfs/Makefile:1.4
--- src/sbin/newfs_sysvbfs/Makefile:1.3 Fri Aug 29 00:02:23 2008
+++ src/sbin/newfs_sysvbfs/Makefile Mon Jun 20 07:44:00 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/08/29 00:02:23 gmcgarry Exp $
+# $NetBSD: Makefile,v 1.4 2011/06/20 07:44:00 mrg Exp $
.include <bsd.own.mk>
@@ -8,7 +8,7 @@
DPADD+= ${LIBUTIL}
LDADD+= -lutil
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 4
+.if defined(HAVE_GCC)
COPTS.newfs_sysvbfs.c+= -Wno-pointer-sign
.endif
Index: src/sbin/restore/Makefile
diff -u src/sbin/restore/Makefile:1.24 src/sbin/restore/Makefile:1.25
--- src/sbin/restore/Makefile:1.24 Fri Aug 29 00:02:23 2008
+++ src/sbin/restore/Makefile Mon Jun 20 07:44:00 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2008/08/29 00:02:23 gmcgarry Exp $
+# $NetBSD: Makefile,v 1.25 2011/06/20 07:44:00 mrg Exp $
# @(#)Makefile 8.1 (Berkeley) 6/5/93
.include <bsd.own.mk>
@@ -12,7 +12,7 @@
MLINKS+=restore.8 rrestore.8
.PATH: ${NETBSDSRCDIR}/sbin/dump
-.if (defined(HAVE_GCC) && ${HAVE_GCC} == 4) || defined(HAVE_PCC)
+.if defined(HAVE_GCC) || defined(HAVE_PCC)
COPTS.tape.c+= -Wno-pointer-sign
.endif
Index: src/share/mk/bsd.kmodule.mk
diff -u src/share/mk/bsd.kmodule.mk:1.29 src/share/mk/bsd.kmodule.mk:1.30
--- src/share/mk/bsd.kmodule.mk:1.29 Tue May 17 01:12:34 2011
+++ src/share/mk/bsd.kmodule.mk Mon Jun 20 07:44:00 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.kmodule.mk,v 1.29 2011/05/17 01:12:34 christos Exp $
+# $NetBSD: bsd.kmodule.mk,v 1.30 2011/06/20 07:44:00 mrg Exp $
# We are not building this with PIE
MKPIE=no
@@ -19,7 +19,7 @@
CPPFLAGS+= -D_KERNEL -D_LKM -D_MODULE
# XXX until the kernel is fixed again...
-.if (defined(HAVE_GCC) && ${HAVE_GCC} == 4) || defined(HAVE_PCC)
+.if defined(HAVE_GCC) || defined(HAVE_PCC)
CFLAGS+= -fno-strict-aliasing -Wno-pointer-sign
.endif
Index: src/usr.bin/awk/Makefile
diff -u src/usr.bin/awk/Makefile:1.15 src/usr.bin/awk/Makefile:1.16
--- src/usr.bin/awk/Makefile:1.15 Wed Dec 15 08:09:23 2010
+++ src/usr.bin/awk/Makefile Mon Jun 20 07:44:00 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2010/12/15 08:09:23 he Exp $
+# $NetBSD: Makefile,v 1.16 2011/06/20 07:44:00 mrg Exp $
WARNS?= 1 # fails -Wshadow -Wcast-qual
@@ -15,7 +15,7 @@
DPADD+= ${LIBM}
.endif
YHEADER= yes
-.if (defined(HAVE_GCC) && ${HAVE_GCC} == 4) || defined(HAVE_PCC)
+.if defined(HAVE_GCC) || defined(HAVE_PCC)
COPTS+= -Wno-pointer-sign
.endif
Index: src/usr.bin/crontab/Makefile
diff -u src/usr.bin/crontab/Makefile:1.26 src/usr.bin/crontab/Makefile:1.27
--- src/usr.bin/crontab/Makefile:1.26 Fri Aug 29 00:02:24 2008
+++ src/usr.bin/crontab/Makefile Mon Jun 20 07:44:01 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2008/08/29 00:02:24 gmcgarry Exp $
+# $NetBSD: Makefile,v 1.27 2011/06/20 07:44:01 mrg Exp $
.include <bsd.own.mk>
@@ -15,6 +15,6 @@
.include <bsd.prog.mk>
-.if (defined(HAVE_GCC) && ${HAVE_GCC} == 4) || defined(HAVE_PCC)
+.if defined(HAVE_GCC) || defined(HAVE_PCC)
COPTS.misc.c+= -Wno-pointer-sign
.endif
Index: src/usr.bin/ctags/Makefile
diff -u src/usr.bin/ctags/Makefile:1.11 src/usr.bin/ctags/Makefile:1.12
--- src/usr.bin/ctags/Makefile:1.11 Tue Apr 14 22:15:19 2009
+++ src/usr.bin/ctags/Makefile Mon Jun 20 07:44:01 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2009/04/14 22:15:19 lukem Exp $
+# $NetBSD: Makefile,v 1.12 2011/06/20 07:44:01 mrg Exp $
# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= ctags
@@ -8,7 +8,7 @@
.include <bsd.prog.mk>
.if !defined(HOSTPROGNAME)
-.if (defined(HAVE_GCC) && ${HAVE_GCC} == 4) || defined(HAVE_PCC)
+.if defined(HAVE_GCC) || defined(HAVE_PCC)
COPTS.ctags.c+= -Wno-pointer-sign
.endif
.endif
Index: src/usr.bin/gzip/Makefile
diff -u src/usr.bin/gzip/Makefile:1.14 src/usr.bin/gzip/Makefile:1.15
--- src/usr.bin/gzip/Makefile:1.14 Sun Jun 19 00:43:54 2011
+++ src/usr.bin/gzip/Makefile Mon Jun 20 07:44:01 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2011/06/19 00:43:54 christos Exp $
+# $NetBSD: Makefile,v 1.15 2011/06/20 07:44:01 mrg Exp $
USE_FORT?= yes # data-driven bugs?
@@ -26,6 +26,6 @@
.include <bsd.prog.mk>
-.if (defined(HAVE_GCC) && ${HAVE_GCC} == 4) || defined(HAVE_PCC)
+.if defined(HAVE_GCC) || defined(HAVE_PCC)
COPTS.gzip.c+= -Wno-pointer-sign
.endif
Index: src/usr.bin/nvi/build/Makefile
diff -u src/usr.bin/nvi/build/Makefile:1.14 src/usr.bin/nvi/build/Makefile:1.15
--- src/usr.bin/nvi/build/Makefile:1.14 Thu May 26 12:56:33 2011
+++ src/usr.bin/nvi/build/Makefile Mon Jun 20 07:44:01 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2011/05/26 12:56:33 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2011/06/20 07:44:01 mrg Exp $
.include <bsd.own.mk>
@@ -10,7 +10,7 @@
#DBG=-g
#CWARNFLAGS+=-Wno-parentheses -Wno-unused -Wno-missing-prototypes
-#.if defined(HAVE_GCC) && ${HAVE_GCC} == 4
+#.if defined(HAVE_GCC)
#CWARNFLAGS+=-Wno-pointer-sign
#COPTS+=-fno-strict-aliasing
#.endif
Index: src/usr.bin/telnet/Makefile
diff -u src/usr.bin/telnet/Makefile:1.46 src/usr.bin/telnet/Makefile:1.47
--- src/usr.bin/telnet/Makefile:1.46 Thu May 26 12:56:33 2011
+++ src/usr.bin/telnet/Makefile Mon Jun 20 07:44:01 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2011/05/26 12:56:33 joerg Exp $
+# $NetBSD: Makefile,v 1.47 2011/06/20 07:44:01 mrg Exp $
#
# Copyright (c) 1990 The Regents of the University of California.
# All rights reserved.
@@ -77,7 +77,7 @@
DPADD+= ${LIBDES} ${LIBCOM_ERR} ${LIBROKEN}
.endif
-.if (defined(HAVE_GCC) && ${HAVE_GCC} == 4) || defined(HAVE_PCC)
+.if defined(HAVE_GCC) || defined(HAVE_PCC)
.for f in commands telnet terminal utilities
COPTS.${f}.c+= -Wno-pointer-sign
.endfor
Index: src/usr.bin/tr/Makefile
diff -u src/usr.bin/tr/Makefile:1.6 src/usr.bin/tr/Makefile:1.7
--- src/usr.bin/tr/Makefile:1.6 Fri Aug 29 00:02:24 2008
+++ src/usr.bin/tr/Makefile Mon Jun 20 07:44:01 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2008/08/29 00:02:24 gmcgarry Exp $
+# $NetBSD: Makefile,v 1.7 2011/06/20 07:44:01 mrg Exp $
# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= tr
@@ -6,7 +6,7 @@
.include <bsd.prog.mk>
-.if (defined(HAVE_GCC) && ${HAVE_GCC} == 4) || defined(HAVE_PCC)
+.if defined(HAVE_GCC) || defined(HAVE_PCC)
.for f in str tr
COPTS.${f}.c+= -Wno-pointer-sign
.endfor
Index: src/usr.sbin/bootp/bootptest/Makefile
diff -u src/usr.sbin/bootp/bootptest/Makefile:1.3 src/usr.sbin/bootp/bootptest/Makefile:1.4
--- src/usr.sbin/bootp/bootptest/Makefile:1.3 Fri Aug 29 00:02:25 2008
+++ src/usr.sbin/bootp/bootptest/Makefile Mon Jun 20 07:44:01 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/08/29 00:02:25 gmcgarry Exp $
+# $NetBSD: Makefile,v 1.4 2011/06/20 07:44:01 mrg Exp $
PROG= bootptest
SRCS= bootptest.c print-bootp.c getether.c
@@ -6,6 +6,6 @@
.include <bsd.prog.mk>
-.if (defined(HAVE_GCC) && ${HAVE_GCC} == 4) || defined(HAVE_PCC)
+.if defined(HAVE_GCC) || defined(HAVE_PCC)
COPTS.print-bootp.c+= -Wno-pointer-sign
.endif
Index: src/usr.sbin/cron/Makefile
diff -u src/usr.sbin/cron/Makefile:1.14 src/usr.sbin/cron/Makefile:1.15
--- src/usr.sbin/cron/Makefile:1.14 Wed Apr 22 15:23:02 2009
+++ src/usr.sbin/cron/Makefile Mon Jun 20 07:44:01 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2009/04/22 15:23:02 lukem Exp $
+# $NetBSD: Makefile,v 1.15 2011/06/20 07:44:01 mrg Exp $
PROG= cron
SRCS= cron.c database.c do_command.c entry.c env.c job.c \
@@ -9,6 +9,6 @@
.include <bsd.prog.mk>
-.if (defined(HAVE_GCC) && ${HAVE_GCC} == 4) || defined(HAVE_PCC)
+.if defined(HAVE_GCC) || defined(HAVE_PCC)
COPTS.misc.c+= -Wno-pointer-sign
.endif
Index: src/usr.sbin/dhcp/Makefile.inc
diff -u src/usr.sbin/dhcp/Makefile.inc:1.24 src/usr.sbin/dhcp/Makefile.inc:1.25
--- src/usr.sbin/dhcp/Makefile.inc:1.24 Thu May 26 12:56:33 2011
+++ src/usr.sbin/dhcp/Makefile.inc Mon Jun 20 07:44:02 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.24 2011/05/26 12:56:33 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.25 2011/06/20 07:44:02 mrg Exp $
WARNS?= 1 # XXX -Wshadow -Wcast-qual -Wsign-compare
@@ -17,7 +17,7 @@
MROBJDIR!=cd $(.CURDIR)/../minires && ${PRINTOBJDIR}
DSTOBJDIR!=cd $(.CURDIR)/../dst && ${PRINTOBJDIR}
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 4
+.if defined(HAVE_GCC)
COPTS+= -fno-strict-aliasing
.endif
Index: src/usr.sbin/dumplfs/Makefile
diff -u src/usr.sbin/dumplfs/Makefile:1.13 src/usr.sbin/dumplfs/Makefile:1.14
--- src/usr.sbin/dumplfs/Makefile:1.13 Wed Apr 22 15:23:03 2009
+++ src/usr.sbin/dumplfs/Makefile Mon Jun 20 07:44:02 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2009/04/22 15:23:03 lukem Exp $
+# $NetBSD: Makefile,v 1.14 2011/06/20 07:44:02 mrg Exp $
# @(#)Makefile 8.1 (Berkeley) 6/18/93
WARNS?= 3 # XXX -Wsign-compare
@@ -10,7 +10,7 @@
.PATH: ${NETBSDSRCDIR}/sys/ufs/lfs
MAN= dumplfs.8
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 4
+.if defined(HAVE_GCC)
COPTS+= -fno-strict-aliasing
.endif
Index: src/usr.sbin/hprop/Makefile
diff -u src/usr.sbin/hprop/Makefile:1.17 src/usr.sbin/hprop/Makefile:1.18
--- src/usr.sbin/hprop/Makefile:1.17 Wed Apr 22 15:23:03 2009
+++ src/usr.sbin/hprop/Makefile Mon Jun 20 07:44:02 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2009/04/22 15:23:03 lukem Exp $
+# $NetBSD: Makefile,v 1.18 2011/06/20 07:44:02 mrg Exp $
WARNS?= 2 # XXX -Wextra -Wsign-compare
NOLINT= # defined
@@ -29,7 +29,7 @@
CPPFLAGS+=-DHAVE_IPV6
.endif
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 4
+.if defined(HAVE_GCC)
COPTS.mit_dump.c+= -Wno-pointer-sign
.endif
Index: src/usr.sbin/installboot/Makefile
diff -u src/usr.sbin/installboot/Makefile:1.43 src/usr.sbin/installboot/Makefile:1.44
--- src/usr.sbin/installboot/Makefile:1.43 Wed Jan 26 01:18:55 2011
+++ src/usr.sbin/installboot/Makefile Mon Jun 20 07:44:02 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2011/01/26 01:18:55 pooka Exp $
+# $NetBSD: Makefile,v 1.44 2011/06/20 07:44:02 mrg Exp $
#
.include <bsd.own.mk>
@@ -44,7 +44,7 @@
.PATH: ${.CURDIR}/arch ${UFSSRC}/ffs ${UFSSRC}/ext2fs
.if !defined(HOSTPROGNAME)
-.if (defined(HAVE_GCC) && ${HAVE_GCC} == 4) || defined(HAVE_PCC)
+.if defined(HAVE_GCC) || defined(HAVE_PCC)
.for f in i386 macppc
COPTS.${f}.c+= -Wno-pointer-sign
.endfor
Index: src/usr.sbin/iprop-log/Makefile
diff -u src/usr.sbin/iprop-log/Makefile:1.5 src/usr.sbin/iprop-log/Makefile:1.6
--- src/usr.sbin/iprop-log/Makefile:1.5 Wed Feb 3 15:34:46 2010
+++ src/usr.sbin/iprop-log/Makefile Mon Jun 20 07:44:02 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2010/02/03 15:34:46 roy Exp $
+# $NetBSD: Makefile,v 1.6 2011/06/20 07:44:02 mrg Exp $
WARNS?= 2 # XXX -Wextra -Wsign-compare
NOLINT= # defined
@@ -26,7 +26,7 @@
CPPFLAGS+=-DHAVE_IPV6
.endif
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 4
+.if defined(HAVE_GCC)
COPTS.mit_dump.c+= -Wno-pointer-sign
.endif
Index: src/usr.sbin/isdn/isdnd/Makefile
diff -u src/usr.sbin/isdn/isdnd/Makefile:1.10 src/usr.sbin/isdn/isdnd/Makefile:1.11
--- src/usr.sbin/isdn/isdnd/Makefile:1.10 Wed Feb 3 15:34:46 2010
+++ src/usr.sbin/isdn/isdnd/Makefile Mon Jun 20 07:44:02 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2010/02/03 15:34:46 roy Exp $
+# $NetBSD: Makefile,v 1.11 2011/06/20 07:44:02 mrg Exp $
PROG = isdnd
SRCS = rc_parse.y rc_scan.l main.c rc_config.c log.c curses.c \
@@ -32,7 +32,7 @@
.endif
.endif
-.if (defined(HAVE_GCC) && ${HAVE_GCC} == 4) || defined(HAVE_PCC)
+.if defined(HAVE_GCC) || defined(HAVE_PCC)
COPTS.alias.c+= -Wno-pointer-sign
COPTS.holiday.c+= -Wno-pointer-sign
COPTS.monitor.c+= -Wno-pointer-sign
Index: src/usr.sbin/isdn/isdnmonitor/Makefile
diff -u src/usr.sbin/isdn/isdnmonitor/Makefile:1.5 src/usr.sbin/isdn/isdnmonitor/Makefile:1.6
--- src/usr.sbin/isdn/isdnmonitor/Makefile:1.5 Sat Feb 6 23:45:27 2010
+++ src/usr.sbin/isdn/isdnmonitor/Makefile Mon Jun 20 07:44:02 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2010/02/06 23:45:27 he Exp $
+# $NetBSD: Makefile,v 1.6 2011/06/20 07:44:02 mrg Exp $
PROG = isdnmonitor
SRCS = main.c curses.c
@@ -10,6 +10,6 @@
.include <bsd.prog.mk>
-.if (defined(HAVE_GCC) && ${HAVE_GCC} == 4) || defined(HAVE_PCC)
+.if defined(HAVE_GCC) || defined(HAVE_PCC)
COPTS.main.c+= -Wno-pointer-sign
.endif
Index: src/usr.sbin/isdn/isdntel/Makefile
diff -u src/usr.sbin/isdn/isdntel/Makefile:1.4 src/usr.sbin/isdn/isdntel/Makefile:1.5
--- src/usr.sbin/isdn/isdntel/Makefile:1.4 Wed Feb 3 15:34:46 2010
+++ src/usr.sbin/isdn/isdntel/Makefile Mon Jun 20 07:44:02 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2010/02/03 15:34:46 roy Exp $
+# $NetBSD: Makefile,v 1.5 2011/06/20 07:44:02 mrg Exp $
PROG = isdntel
SRCS = main.c display.c files.c alias.c
@@ -7,6 +7,6 @@
.include <bsd.prog.mk>
-.if (defined(HAVE_GCC) && ${HAVE_GCC} == 4) || defined(HAVE_PCC)
+.if defined(HAVE_GCC) || defined(HAVE_PCC)
COPTS.alias.c+= -Wno-pointer-sign
.endif
Index: src/usr.sbin/isdn/isdntrace/Makefile
diff -u src/usr.sbin/isdn/isdntrace/Makefile:1.3 src/usr.sbin/isdn/isdntrace/Makefile:1.4
--- src/usr.sbin/isdn/isdntrace/Makefile:1.3 Fri Aug 29 00:02:25 2008
+++ src/usr.sbin/isdn/isdntrace/Makefile Mon Jun 20 07:44:02 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/08/29 00:02:25 gmcgarry Exp $
+# $NetBSD: Makefile,v 1.4 2011/06/20 07:44:02 mrg Exp $
PROG = isdntrace
SRCS = q921.c q931.c q931_util.c q932_fac.c 1tr6.c trace.c \
@@ -7,7 +7,7 @@
.include <bsd.prog.mk>
-.if (defined(HAVE_GCC) && ${HAVE_GCC} == 4) || defined(HAVE_PCC)
+.if defined(HAVE_GCC) || defined(HAVE_PCC)
COPTS.q932_fac.c+= -Wno-pointer-sign
COPTS.trace.c+= -Wno-pointer-sign
.endif
Index: src/usr.sbin/makefs/cd9660/Makefile.inc
diff -u src/usr.sbin/makefs/cd9660/Makefile.inc:1.1 src/usr.sbin/makefs/cd9660/Makefile.inc:1.2
--- src/usr.sbin/makefs/cd9660/Makefile.inc:1.1 Fri Jan 16 19:39:52 2009
+++ src/usr.sbin/makefs/cd9660/Makefile.inc Mon Jun 20 07:44:03 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.1 2009/01/16 19:39:52 pooka Exp $
+# $NetBSD: Makefile.inc,v 1.2 2011/06/20 07:44:03 mrg Exp $
#
.PATH: ${.CURDIR}/cd9660 ${NETBSDSRCDIR}/sys/fs/cd9660
@@ -9,7 +9,7 @@
SRCS+= cd9660_write.c cd9660_conversion.c iso9660_rrip.c cd9660_archimedes.c
.if !defined(HOSTPROGNAME)
-.if (defined(HAVE_GCC) && ${HAVE_GCC} == 4) || defined(HAVE_PCC)
+.if defined(HAVE_GCC) || defined(HAVE_PCC)
.for f in cd9660_debug cd9660_write
COPTS.${f}.c+= -Wno-pointer-sign
.endfor
Index: src/usr.sbin/mopd/common/Makefile
diff -u src/usr.sbin/mopd/common/Makefile:1.14 src/usr.sbin/mopd/common/Makefile:1.15
--- src/usr.sbin/mopd/common/Makefile:1.14 Thu Aug 20 21:59:12 2009
+++ src/usr.sbin/mopd/common/Makefile Mon Jun 20 07:44:03 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2009/08/20 21:59:12 he Exp $
+# $NetBSD: Makefile,v 1.15 2011/06/20 07:44:03 mrg Exp $
LIBISPRIVATE= yes
@@ -20,6 +20,6 @@
.include <bsd.lib.mk>
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 4 || defined(HAVE_PCC)
+.if defined(HAVE_GCC) || defined(HAVE_PCC)
COPTS.print.c+= -Wno-pointer-sign
.endif
Index: src/usr.sbin/mopd/mopd/Makefile
diff -u src/usr.sbin/mopd/mopd/Makefile:1.10 src/usr.sbin/mopd/mopd/Makefile:1.11
--- src/usr.sbin/mopd/mopd/Makefile:1.10 Fri Aug 29 00:02:25 2008
+++ src/usr.sbin/mopd/mopd/Makefile Mon Jun 20 07:44:03 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2008/08/29 00:02:25 gmcgarry Exp $
+# $NetBSD: Makefile,v 1.11 2011/06/20 07:44:03 mrg Exp $
PROG= mopd
SRCS= mopd.c process.c
@@ -9,6 +9,6 @@
.include <bsd.prog.mk>
-.if (defined(HAVE_GCC) && ${HAVE_GCC} == 4) || defined(HAVE_PCC)
+.if defined(HAVE_GCC) || defined(HAVE_PCC)
COPTS.process.c+= -Wno-pointer-sign
.endif
Index: src/usr.sbin/mopd/mopprobe/Makefile
diff -u src/usr.sbin/mopd/mopprobe/Makefile:1.8 src/usr.sbin/mopd/mopprobe/Makefile:1.9
--- src/usr.sbin/mopd/mopprobe/Makefile:1.8 Fri Aug 29 00:02:25 2008
+++ src/usr.sbin/mopd/mopprobe/Makefile Mon Jun 20 07:44:03 2011
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2008/08/29 00:02:25 gmcgarry Exp $
+# $NetBSD: Makefile,v 1.9 2011/06/20 07:44:03 mrg Exp $
PROG= mopprobe
.include <bsd.prog.mk>
-.if (defined(HAVE_GCC) && ${HAVE_GCC} == 4) || defined(HAVE_PCC)
+.if defined(HAVE_GCC) || defined(HAVE_PCC)
COPTS.mopprobe.c+= -Wno-pointer-sign
.endif
Index: src/usr.sbin/mscdlabel/Makefile
diff -u src/usr.sbin/mscdlabel/Makefile:1.7 src/usr.sbin/mscdlabel/Makefile:1.8
--- src/usr.sbin/mscdlabel/Makefile:1.7 Fri Aug 29 00:02:25 2008
+++ src/usr.sbin/mscdlabel/Makefile Mon Jun 20 07:44:03 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2008/08/29 00:02:25 gmcgarry Exp $
+# $NetBSD: Makefile,v 1.8 2011/06/20 07:44:03 mrg Exp $
.include <bsd.own.mk>
@@ -15,7 +15,7 @@
.PATH: ${DISKLABEL_SRC}
CPPFLAGS+= -I${DISKLABEL_SRC}
-.if (defined(HAVE_GCC) && ${HAVE_GCC} == 4) || defined(HAVE_PCC)
+.if defined(HAVE_GCC) || defined(HAVE_PCC)
COPTS.iso9660.c+= -Wno-pointer-sign
.endif
Index: src/usr.sbin/pppd/Makefile.inc
diff -u src/usr.sbin/pppd/Makefile.inc:1.6 src/usr.sbin/pppd/Makefile.inc:1.7
--- src/usr.sbin/pppd/Makefile.inc:1.6 Wed Apr 22 15:23:06 2009
+++ src/usr.sbin/pppd/Makefile.inc Mon Jun 20 07:44:03 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.6 2009/04/22 15:23:06 lukem Exp $
+# $NetBSD: Makefile.inc,v 1.7 2011/06/20 07:44:03 mrg Exp $
WARNS?= 1 # XXX -Wshadow -Wcast-qual -Wsign-compare
@@ -10,6 +10,6 @@
.include <bsd.own.mk>
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 4
+.if defined(HAVE_GCC)
COPTS+= -fno-strict-aliasing
.endif
Index: src/usr.sbin/pppd/pppd/Makefile
diff -u src/usr.sbin/pppd/pppd/Makefile:1.40 src/usr.sbin/pppd/pppd/Makefile:1.41
--- src/usr.sbin/pppd/pppd/Makefile:1.40 Thu May 26 12:56:34 2011
+++ src/usr.sbin/pppd/pppd/Makefile Mon Jun 20 07:44:03 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2011/05/26 12:56:34 joerg Exp $
+# $NetBSD: Makefile,v 1.41 2011/06/20 07:44:03 mrg Exp $
.include <bsd.own.mk>
@@ -33,7 +33,7 @@
LDADD+= -lpcap -lcrypt -lutil -Wl,--export-dynamic
DPADD+= ${LIBPCAP} ${LIBCRYPT} ${LIBUTIL}
-.if (defined(HAVE_GCC) && ${HAVE_GCC} == 4) || defined(HAVE_PCC)
+.if defined(HAVE_GCC) || defined(HAVE_PCC)
.for f in chap-md5 chap_ms eap
COPTS.${f}.c+= -Wno-pointer-sign
.endfor
Index: src/usr.sbin/rarpd/Makefile
diff -u src/usr.sbin/rarpd/Makefile:1.12 src/usr.sbin/rarpd/Makefile:1.13
--- src/usr.sbin/rarpd/Makefile:1.12 Fri Aug 29 00:02:25 2008
+++ src/usr.sbin/rarpd/Makefile Mon Jun 20 07:44:03 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2008/08/29 00:02:25 gmcgarry Exp $
+# $NetBSD: Makefile,v 1.13 2011/06/20 07:44:03 mrg Exp $
USE_FORT?= yes # network server
@@ -16,6 +16,6 @@
.include <bsd.prog.mk>
-.if (defined(HAVE_GCC) && ${HAVE_GCC} == 4) || defined(HAVE_PCC)
+.if defined(HAVE_GCC) || defined(HAVE_PCC)
COPTS.mkarp.c+= -Wno-pointer-sign
.endif
Index: src/usr.sbin/rbootd/Makefile
diff -u src/usr.sbin/rbootd/Makefile:1.12 src/usr.sbin/rbootd/Makefile:1.13
--- src/usr.sbin/rbootd/Makefile:1.12 Fri Aug 29 00:02:25 2008
+++ src/usr.sbin/rbootd/Makefile Mon Jun 20 07:44:03 2011
@@ -1,5 +1,5 @@
# from: @(#)Makefile 8.1 (Berkeley) 6/4/93
-# $NetBSD: Makefile,v 1.12 2008/08/29 00:02:25 gmcgarry Exp $
+# $NetBSD: Makefile,v 1.13 2011/06/20 07:44:03 mrg Exp $
USE_FORT?= yes # network server
@@ -12,7 +12,7 @@
.include <bsd.own.mk>
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 4
+.if defined(HAVE_GCC)
COPTS.utils.c+= -fno-strict-aliasing
.endif
Index: src/usr.sbin/rpc.pcnfsd/Makefile
diff -u src/usr.sbin/rpc.pcnfsd/Makefile:1.21 src/usr.sbin/rpc.pcnfsd/Makefile:1.22
--- src/usr.sbin/rpc.pcnfsd/Makefile:1.21 Tue Sep 30 06:25:22 2008
+++ src/usr.sbin/rpc.pcnfsd/Makefile Mon Jun 20 07:44:04 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2008/09/30 06:25:22 dholland Exp $
+# $NetBSD: Makefile,v 1.22 2011/06/20 07:44:04 mrg Exp $
.include <bsd.own.mk>
@@ -24,7 +24,7 @@
RPC_SVCCLASS= udp tcp
RPC_SVCFLAGS= -I
-.if (defined(HAVE_GCC) && ${HAVE_GCC} == 4) || defined(HAVE_PCC)
+.if defined(HAVE_GCC) || defined(HAVE_PCC)
COPTS.pcnfsd_v1.c+= -Wno-pointer-sign
COPTS.pcnfsd_v2.c+= -Wno-pointer-sign
.endif
Index: src/usr.sbin/rtadvd/Makefile
diff -u src/usr.sbin/rtadvd/Makefile:1.14 src/usr.sbin/rtadvd/Makefile:1.15
--- src/usr.sbin/rtadvd/Makefile:1.14 Sat Oct 31 22:32:51 2009
+++ src/usr.sbin/rtadvd/Makefile Mon Jun 20 07:44:04 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2009/10/31 22:32:51 christos Exp $
+# $NetBSD: Makefile,v 1.15 2011/06/20 07:44:04 mrg Exp $
WARNS?= 2 # XXX -Wcast-qual -Wsign-compare
@@ -21,6 +21,6 @@
.include <bsd.prog.mk>
-.if (defined(HAVE_GCC) && ${HAVE_GCC} == 4)
+.if defined(HAVE_GCC)
COPTS.dump.c=-fno-strict-aliasing
.endif
Index: src/usr.sbin/tcpdump/Makefile
diff -u src/usr.sbin/tcpdump/Makefile:1.51 src/usr.sbin/tcpdump/Makefile:1.52
--- src/usr.sbin/tcpdump/Makefile:1.51 Fri Dec 17 09:54:28 2010
+++ src/usr.sbin/tcpdump/Makefile Mon Jun 20 07:44:04 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2010/12/17 09:54:28 jruoho Exp $
+# $NetBSD: Makefile,v 1.52 2011/06/20 07:44:04 mrg Exp $
WARNS?= 1 # XXX: out of date third-party program
@@ -93,7 +93,7 @@
DPADD+= ${LIBCRYPTO} ${LIBCRYPT}
.endif
-.if (defined(HAVE_GCC) && ${HAVE_GCC} == 4) || defined(HAVE_PCC)
+.if defined(HAVE_GCC) || defined(HAVE_PCC)
COPTS+= -fno-strict-aliasing
.for f in print-802_11 print-esp print-fr print-radius print-telnet tcpdump util
COPTS.${f}.c+= -Wno-pointer-sign
Index: src/usr.sbin/wiconfig/Makefile
diff -u src/usr.sbin/wiconfig/Makefile:1.4 src/usr.sbin/wiconfig/Makefile:1.5
--- src/usr.sbin/wiconfig/Makefile:1.4 Fri Aug 29 00:02:26 2008
+++ src/usr.sbin/wiconfig/Makefile Mon Jun 20 07:44:04 2011
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2008/08/29 00:02:26 gmcgarry Exp $
+# $NetBSD: Makefile,v 1.5 2011/06/20 07:44:04 mrg Exp $
PROG= wiconfig
MAN= wiconfig.8
.include <bsd.prog.mk>
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 4
+.if defined(HAVE_GCC)
COPTS+= -fno-strict-aliasing
.endif
