... and this does things to the build infrastructure.

It survives make release on amd64, it survived i386 in the past but
I'm currently running another make release. I'm trying armv7, too.

Tests on other archs would be very welcome, thanks!

diff --git distrib/amd64/common/list distrib/amd64/common/list
index 4b4f4b1..153c880 100644
--- distrib/amd64/common/list
+++ distrib/amd64/common/list
@@ -40,7 +40,7 @@ LINK  instbin                                 sbin/mount
 LINK   instbin                                 sbin/mount_cd9660
 LINK   instbin                                 sbin/mount_ffs
 LINK   instbin                                 sbin/newfs
-LINK   instbin                                 sbin/ping
+LINK   instbin                                 sbin/ping sbin/ping6
 LINK   instbin                                 sbin/reboot sbin/halt
 LINK   instbin                                 sbin/restore
 LINK   instbin                                 sbin/route
diff --git distrib/amd64/ramdisk_cd/list.local 
distrib/amd64/ramdisk_cd/list.local
index 79982af..7e149a8 100644
--- distrib/amd64/ramdisk_cd/list.local
+++ distrib/amd64/ramdisk_cd/list.local
@@ -1,8 +1,6 @@
 # $OpenBSD: list.local,v 1.26 2015/10/07 18:02:06 krw Exp $
 
 # add local links; use bin/sh since instbin has already been unlinked
-LINK   instbin                                 sbin/ping6
-
 LINK   instbin                                 sbin/dhclient
 LINK   instbin                                 sbin/bioctl
 
diff --git distrib/armv7/ramdisk/list distrib/armv7/ramdisk/list
index 0d13059..82d100e 100644
--- distrib/armv7/ramdisk/list
+++ distrib/armv7/ramdisk/list
@@ -47,8 +47,7 @@ LINK  instbin                                 sbin/mount_nfs
 LINK   instbin                                 sbin/newfs
 LINK   instbin                                 sbin/newfs_ext2fs
 LINK   instbin                                 sbin/newfs_msdos
-LINK   instbin                                 sbin/ping
-LINK   instbin                                 sbin/ping6
+LINK   instbin                                 sbin/ping sbin/ping6
 LINK   instbin                                 sbin/reboot sbin/halt
 LINK   instbin                                 sbin/route
 LINK   instbin                                 sbin/sysctl
diff --git distrib/hppa/list distrib/hppa/list
index 0e2e181..b0f23b7 100644
--- distrib/hppa/list
+++ distrib/hppa/list
@@ -40,8 +40,7 @@ LINK  instbin                                 
sbin/mount_cd9660
 LINK   instbin                                 sbin/mount_ffs
 LINK   instbin                                 sbin/mount_nfs
 LINK   instbin                                 sbin/newfs
-LINK   instbin                                 sbin/ping
-LINK   instbin                                 sbin/ping6
+LINK   instbin                                 sbin/ping sbin/ping6
 LINK   instbin                                 sbin/reboot sbin/halt
 LINK   instbin                                 sbin/route
 LINK   instbin                                 sbin/sysctl
diff --git distrib/i386/common/list distrib/i386/common/list
index 17d8e39..3d8b00f 100644
--- distrib/i386/common/list
+++ distrib/i386/common/list
@@ -41,7 +41,7 @@ LINK  instbin                                 sbin/mount
 LINK   instbin                                 sbin/mount_cd9660
 LINK   instbin                                 sbin/mount_ffs
 LINK   instbin                                 sbin/newfs
-LINK   instbin                                 sbin/ping
+LINK   instbin                                 sbin/ping sbin/ping6
 LINK   instbin                                 sbin/reboot sbin/halt
 LINK   instbin                                 sbin/route
 LINK   instbin                                 sbin/sysctl
diff --git distrib/i386/ramdisk_cd/list.local distrib/i386/ramdisk_cd/list.local
index 8a59bc8..18ad5b8 100644
--- distrib/i386/ramdisk_cd/list.local
+++ distrib/i386/ramdisk_cd/list.local
@@ -3,7 +3,6 @@
 # add local links; use bin/sh since instbin has already been unlinked
 LINK   instbin                                 sbin/mount_ext2fs
 LINK   instbin                                 sbin/mount_msdos
-LINK   instbin                                 sbin/ping6
 LINK   instbin                                 sbin/mount_udf
 LINK   instbin                                 sbin/restore
 LINK   instbin                                 sbin/bioctl
diff --git distrib/landisk/ramdisk/list distrib/landisk/ramdisk/list
index ea06d58..ba42a8f 100644
--- distrib/landisk/ramdisk/list
+++ distrib/landisk/ramdisk/list
@@ -45,8 +45,7 @@ LINK  instbin                                 sbin/mount_msdos
 LINK   instbin                                 sbin/mount_nfs
 LINK   instbin                                 sbin/newfs
 LINK   instbin                                 sbin/newfs_msdos
-LINK   instbin                                 sbin/ping
-LINK   instbin                                 sbin/ping6
+LINK   instbin                                 sbin/ping sbin/ping6
 LINK   instbin                                 sbin/reboot sbin/halt
 LINK   instbin                                 sbin/route
 LINK   instbin                                 sbin/sysctl
diff --git distrib/loongson/ramdisk/list distrib/loongson/ramdisk/list
index a1a41ab..5006061 100644
--- distrib/loongson/ramdisk/list
+++ distrib/loongson/ramdisk/list
@@ -47,8 +47,7 @@ LINK  instbin                                 sbin/mount_udf
 LINK   instbin                                 sbin/newfs
 LINK   instbin                                 sbin/newfs_ext2fs
 LINK   instbin                                 sbin/newfs_msdos
-LINK   instbin                                 sbin/ping
-LINK   instbin                                 sbin/ping6
+LINK   instbin                                 sbin/ping sbin/ping6
 LINK   instbin                                 sbin/reboot sbin/halt
 LINK   instbin                                 sbin/route
 LINK   instbin                                 sbin/sysctl
diff --git distrib/luna88k/ramdisk/list distrib/luna88k/ramdisk/list
index a0c1210..7598af9 100644
--- distrib/luna88k/ramdisk/list
+++ distrib/luna88k/ramdisk/list
@@ -40,8 +40,7 @@ LINK  instbin                                 
sbin/mount_cd9660
 LINK   instbin                                 sbin/mount_ffs
 LINK   instbin                                 sbin/mount_nfs
 LINK   instbin                                 sbin/newfs
-LINK   instbin                                 sbin/ping
-LINK   instbin                                 sbin/ping6
+LINK   instbin                                 sbin/ping sbin/ping6
 LINK   instbin                                 sbin/reboot sbin/halt
 LINK   instbin                                 sbin/route
 LINK   instbin                                 sbin/sysctl
diff --git distrib/macppc/ramdisk/list distrib/macppc/ramdisk/list
index 2037cd5..c3caddb 100644
--- distrib/macppc/ramdisk/list
+++ distrib/macppc/ramdisk/list
@@ -46,8 +46,7 @@ LINK  instbin                                 sbin/mount_udf
 LINK   instbin                                 sbin/newfs
 LINK   instbin                                 sbin/newfs_msdos
 LINK   instbin                                 sbin/pdisk
-LINK   instbin                                 sbin/ping
-LINK   instbin                                 sbin/ping6
+LINK   instbin                                 sbin/ping sbin/ping6
 LINK   instbin                                 sbin/reboot sbin/halt
 LINK   instbin                                 sbin/route
 LINK   instbin                                 sbin/sysctl
diff --git distrib/miniroot/list distrib/miniroot/list
index 2ecac2c..5902d26 100644
--- distrib/miniroot/list
+++ distrib/miniroot/list
@@ -40,8 +40,7 @@ LINK  instbin                                 sbin/mount_ffs
 LINK   instbin                                 sbin/mount_nfs
 LINK   instbin                                 sbin/mount_udf
 LINK   instbin                                 sbin/newfs
-LINK   instbin                                 sbin/ping
-LINK   instbin                                 sbin/ping6
+LINK   instbin                                 sbin/ping sbin/ping6
 LINK   instbin                                 sbin/reboot sbin/halt
 LINK   instbin                                 sbin/route
 LINK   instbin                                 sbin/sysctl
diff --git distrib/octeon/ramdisk/list distrib/octeon/ramdisk/list
index 54ed83d..5922d0f 100644
--- distrib/octeon/ramdisk/list
+++ distrib/octeon/ramdisk/list
@@ -44,8 +44,7 @@ LINK  instbin                                 sbin/mount_nfs
 LINK   instbin                                 sbin/mount_udf
 LINK   instbin                                 sbin/newfs
 LINK   instbin                                 sbin/newfs_msdos
-LINK   instbin                                 sbin/ping
-LINK   instbin                                 sbin/ping6
+LINK   instbin                                 sbin/ping sbin/ping6
 LINK   instbin                                 sbin/reboot sbin/halt
 LINK   instbin                                 sbin/route
 LINK   instbin                                 sbin/sysctl
diff --git distrib/ramdisk/list distrib/ramdisk/list
index 9ae8d3f..f17d6de 100644
--- distrib/ramdisk/list
+++ distrib/ramdisk/list
@@ -40,8 +40,7 @@ LINK  instbin                                 
sbin/mount_cd9660
 LINK   instbin                                 sbin/mount_ffs
 LINK   instbin                                 sbin/mount_nfs
 LINK   instbin                                 sbin/newfs
-LINK   instbin                                 sbin/ping
-LINK   instbin                                 sbin/ping6
+LINK   instbin                                 sbin/ping sbin/ping6
 LINK   instbin                                 sbin/reboot sbin/halt
 LINK   instbin                                 sbin/route
 LINK   instbin                                 sbin/sysctl
diff --git distrib/sgi/ramdisk/list distrib/sgi/ramdisk/list
index c58a0b2..846fbec 100644
--- distrib/sgi/ramdisk/list
+++ distrib/sgi/ramdisk/list
@@ -42,8 +42,7 @@ LINK  instbin                                 
sbin/mount_cd9660
 LINK   instbin                                 sbin/mount_ffs
 LINK   instbin                                 sbin/mount_nfs
 LINK   instbin                                 sbin/newfs
-LINK   instbin                                 sbin/ping
-LINK   instbin                                 sbin/ping6
+LINK   instbin                                 sbin/ping sbin/ping6
 LINK   instbin                                 sbin/reboot sbin/halt
 LINK   instbin                                 sbin/route
 LINK   instbin                                 sbin/sysctl
diff --git distrib/socppc/ramdisk/list distrib/socppc/ramdisk/list
index 9bdfb53..8c7550f 100644
--- distrib/socppc/ramdisk/list
+++ distrib/socppc/ramdisk/list
@@ -44,8 +44,7 @@ LINK  instbin                                 sbin/mount_nfs
 LINK   instbin                                 sbin/mount_udf
 LINK   instbin                                 sbin/newfs
 LINK   instbin                                 sbin/newfs_msdos
-LINK   instbin                                 sbin/ping
-LINK   instbin                                 sbin/ping6
+LINK   instbin                                 sbin/ping sbin/ping6
 LINK   instbin                                 sbin/reboot sbin/halt
 LINK   instbin                                 sbin/route
 LINK   instbin                                 sbin/sysctl
diff --git distrib/sparc64/bsd.rd/list distrib/sparc64/bsd.rd/list
index f56ccc5..6429191 100644
--- distrib/sparc64/bsd.rd/list
+++ distrib/sparc64/bsd.rd/list
@@ -42,8 +42,7 @@ LINK  instbin                                 sbin/mount_ffs
 LINK   instbin                                 sbin/mount_msdos
 LINK   instbin                                 sbin/mount_udf
 LINK   instbin                                 sbin/newfs
-LINK   instbin                                 sbin/ping
-LINK   instbin                                 sbin/ping6
+LINK   instbin                                 sbin/ping sbin/ping6
 LINK   instbin                                 sbin/reboot sbin/halt
 LINK   instbin                                 sbin/restore
 LINK   instbin                                 sbin/route
diff --git distrib/sparc64/ramdisk/list distrib/sparc64/ramdisk/list
index 1eac2c9..195417c 100644
--- distrib/sparc64/ramdisk/list
+++ distrib/sparc64/ramdisk/list
@@ -38,8 +38,7 @@ LINK  instbin                                 sbin/mknod
 LINK   instbin                                 sbin/mount
 LINK   instbin                                 sbin/mount_ffs
 LINK   instbin                                 sbin/newfs
-LINK   instbin                                 sbin/ping
-#LINK  instbin                                 sbin/ping6
+LINK   instbin                                 sbin/ping sbin/ping6
 LINK   instbin                                 sbin/reboot sbin/halt
 LINK   instbin                                 sbin/route
 LINK   instbin                                 sbin/sysctl
diff --git distrib/sparc64/ramdiskB/list distrib/sparc64/ramdiskB/list
index e4aadb6..fe2b1c3 100644
--- distrib/sparc64/ramdiskB/list
+++ distrib/sparc64/ramdiskB/list
@@ -38,7 +38,7 @@ LINK  instbin                                 sbin/mknod
 LINK   instbin                                 sbin/mount
 LINK   instbin                                 sbin/mount_ffs
 LINK   instbin                                 sbin/newfs
-LINK   instbin                                 sbin/ping
+LINK   instbin                                 sbin/ping sbin/ping6
 LINK   instbin                                 sbin/reboot sbin/halt
 LINK   instbin                                 sbin/route
 LINK   instbin                                 sbin/sysctl
diff --git distrib/special/Makefile distrib/special/Makefile
index 7c345b1..e9b6ac8 100644
--- distrib/special/Makefile
+++ distrib/special/Makefile
@@ -6,7 +6,7 @@ SUBDIR= libstubs \
        grep gzip hostname ifconfig init installboot kbd ksh ln ls md5 \
        mkdir mknod mkuboot more mount mount_cd9660 mount_ext2fs \
        mount_ffs mount_msdos mount_nfs mount_udf mt mv newfs newfs_ext2fs \
-       newfs_msdos pax pdisk ping ping6 pwd_mkdb reboot restore rm route sed \
+       newfs_msdos pax pdisk ping pwd_mkdb reboot restore rm route sed \
        signify sleep stty sync sysctl umount
 
 install:
diff --git distrib/special/ping6/Makefile distrib/special/ping6/Makefile
deleted file mode 100644
index b52a886..0000000
--- distrib/special/ping6/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-#      $OpenBSD: Makefile,v 1.1 2014/12/23 17:16:03 deraadt Exp $
-
-PROG=  ping6
-
-CFLAGS+= -Wall
-CFLAGS+= -Wstrict-prototypes -Wmissing-prototypes
-CFLAGS+= -Wmissing-declarations
-CFLAGS+= -Wshadow -Wpointer-arith -Wcast-qual
-
-MAN=   ping6.8
-
-LDADD= -lm
-DPADD= ${LIBM}
-
-BINOWN=        root
-BINGRP=        bin
-BINMODE=4555
-
-.PATH:  ${.CURDIR}/../../../sbin/ping6
-.include <bsd.prog.mk>
diff --git sbin/ping/Makefile sbin/ping/Makefile
index f1dbffb..288386e 100644
--- sbin/ping/Makefile
+++ sbin/ping/Makefile
@@ -12,6 +12,7 @@ MAN=  ping.8
 LDADD= -lm
 DPADD= ${LIBM}
 
+LINKS= ${BINDIR}/ping ${BINDIR}/ping6
 BINOWN=        root
 BINMODE=4555
 
diff --git sbin/ping6/Makefile sbin/ping6/Makefile
index b4d6f10..f9ebeea 100644
--- sbin/ping6/Makefile
+++ sbin/ping6/Makefile
@@ -1,19 +1,5 @@
 #      $OpenBSD: Makefile,v 1.11 2014/07/11 15:28:27 florian Exp $
 
-PROG=  ping6
-
-CFLAGS+= -Wall
-CFLAGS+= -Wstrict-prototypes -Wmissing-prototypes
-CFLAGS+= -Wmissing-declarations
-CFLAGS+= -Wshadow -Wpointer-arith -Wcast-qual
-
 MAN=   ping6.8
 
-LDADD= -lm
-DPADD= ${LIBM}
-
-BINOWN=        root
-BINGRP=        bin
-BINMODE=4555
-
 .include <bsd.prog.mk>
diff --git usr.bin/bgplg/Makefile usr.bin/bgplg/Makefile
index a573017..5667ce0 100644
--- usr.bin/bgplg/Makefile
+++ usr.bin/bgplg/Makefile
@@ -2,7 +2,7 @@
 
 .include <bsd.own.mk>
 
-SUBDIR=                bgplg bgplgsh bgpctl ping traceroute ping6
+SUBDIR=                bgplg bgplgsh bgpctl ping traceroute
 
 INCFILES=      bgplg.head \
                bgplg.foot \
diff --git usr.bin/bgplg/ping/Makefile usr.bin/bgplg/ping/Makefile
index f157d86..8b66aa5 100644
--- usr.bin/bgplg/ping/Makefile
+++ usr.bin/bgplg/ping/Makefile
@@ -6,9 +6,11 @@ LDSTATIC=      ${STATIC}
 CFLAGS+=       -I${PROGDIR}
 NOMAN=         yes
 
+BINDIR=                /var/www/bin
+LINKS=         ${BINDIR}/ping ${BINDIR}/ping6
+
 .include "${PROGDIR}/Makefile"
 
-BINDIR=                /var/www/bin
 BINMODE=       000
 
 .PATH:         ${PROGDIR}


-- 
I'm not entirely sure you are real.

Reply via email to