diff options
-rw-r--r-- | distrib/hppa/list | 3 | ||||
-rw-r--r-- | distrib/i386/ramdisk_cd/list.local | 3 | ||||
-rw-r--r-- | distrib/special/Makefile | 6 | ||||
-rw-r--r-- | distrib/special/ccdconfig/Makefile | 10 | ||||
-rw-r--r-- | distrib/special/pppd/Makefile | 16 | ||||
-rw-r--r-- | distrib/special/rsh/Makefile | 11 |
6 files changed, 5 insertions, 44 deletions
diff --git a/distrib/hppa/list b/distrib/hppa/list index 7fccb283c0f..092863b9415 100644 --- a/distrib/hppa/list +++ b/distrib/hppa/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.16 2010/10/18 04:07:50 deraadt Exp $ +# $OpenBSD: list,v 1.17 2011/10/06 15:29:44 deraadt Exp $ SRCDIRS distrib/special SRCDIRS bin sbin usr.bin usr.sbin @@ -28,7 +28,6 @@ LINK instbin bin/sha256 LINK instbin bin/sleep LINK instbin bin/stty LINK instbin bin/sync -LINK instbin sbin/ccdconfig LINK instbin sbin/dhclient LINK instbin sbin/dmesg LINK instbin sbin/fsck diff --git a/distrib/i386/ramdisk_cd/list.local b/distrib/i386/ramdisk_cd/list.local index bc0a720d795..7bc7884ead0 100644 --- a/distrib/i386/ramdisk_cd/list.local +++ b/distrib/i386/ramdisk_cd/list.local @@ -1,8 +1,7 @@ -# $OpenBSD: list.local,v 1.29 2011/08/02 01:14:28 deraadt Exp $ +# $OpenBSD: list.local,v 1.30 2011/10/06 15:29:45 deraadt Exp $ # add local links; use bin/sh since instbin has already been unlinked LINK instbin bin/sha256 -LINK instbin sbin/ccdconfig LINK instbin sbin/mount_ext2fs LINK instbin sbin/mount_msdos LINK instbin sbin/ping6 diff --git a/distrib/special/Makefile b/distrib/special/Makefile index 48b6eef2699..4a32c5d09c7 100644 --- a/distrib/special/Makefile +++ b/distrib/special/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.23 2011/09/17 14:05:27 haesbaert Exp $ +# $OpenBSD: Makefile,v 1.24 2011/10/06 15:29:45 deraadt Exp $ SUBDIR= libstubs \ - ccdconfig date dd dhclient dmesg ed ftp grep gzip ifconfig init \ - kbd less more mt newfs ping pppd restore rsh sha256 sysctl + date dd dhclient dmesg ed ftp grep gzip ifconfig init \ + kbd less more mt newfs ping restore sha256 sysctl install: diff --git a/distrib/special/ccdconfig/Makefile b/distrib/special/ccdconfig/Makefile deleted file mode 100644 index 5cfe5c803d7..00000000000 --- a/distrib/special/ccdconfig/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# $OpenBSD: Makefile,v 1.2 2009/10/28 07:36:49 deraadt Exp $ - -PROG= ccdconfig -COPTS+= -DSMALL -.PATH: ${.CURDIR}/../../../sbin/ccdconfig - -DPADD= ${LIBUTIL} -LDADD= -lutil - -.include <bsd.prog.mk> diff --git a/distrib/special/pppd/Makefile b/distrib/special/pppd/Makefile deleted file mode 100644 index 8df5c512602..00000000000 --- a/distrib/special/pppd/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# $OpenBSD: Makefile,v 1.4 2009/10/28 07:36:49 deraadt Exp $ -# $NetBSD: Makefile,v 1.13 1996/12/18 16:54:57 christos Exp $ - -PROG= pppd -SRCS= auth.c cbcp.c ccp.c chap.c chap_ms.c demand.c fsm.c ipcp.c \ - lcp.c magic.c main.c options.c sys-bsd.c upap.c - -.PATH: ${.CURDIR}/../../../usr.sbin/pppd ${.CURDIR}/../../sys/net -BINMODE=4555 -BINOWN= root - -LDADD= -lutil -DPADD= ${LIBUTIL} -CFLAGS+= -I. -DHAVE_PATHS_H - -.include <bsd.prog.mk> diff --git a/distrib/special/rsh/Makefile b/distrib/special/rsh/Makefile deleted file mode 100644 index d2f5628b876..00000000000 --- a/distrib/special/rsh/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $OpenBSD: Makefile,v 1.3 2009/10/28 07:36:49 deraadt Exp $ -# $NetBSD: Makefile,v 1.13 1996/12/18 16:54:57 christos Exp $ - -PROG= rsh -SRCS= rsh.c - -.PATH: ${.CURDIR}/../../../usr.bin/rsh -BINMODE=4555 -BINOWN= root - -.include <bsd.prog.mk> |