summaryrefslogtreecommitdiff
path: root/distrib
diff options
context:
space:
mode:
Diffstat (limited to 'distrib')
-rw-r--r--distrib/i386/Makefile4
-rw-r--r--distrib/i386/floppies/ramdisk/instbin-nokrb.conf12
-rw-r--r--distrib/i386/floppies/ramdisk/instbin.conf10
-rw-r--r--distrib/i386/special/Makefile5
-rw-r--r--distrib/i386/special/ftp/Makefile26
-rw-r--r--distrib/i386/special/pppd/Makefile17
6 files changed, 61 insertions, 13 deletions
diff --git a/distrib/i386/Makefile b/distrib/i386/Makefile
index eff61cd2fc2..d8da97da8cc 100644
--- a/distrib/i386/Makefile
+++ b/distrib/i386/Makefile
@@ -1,5 +1,5 @@
-# $OpenBSD: Makefile,v 1.1 1996/06/02 11:43:50 deraadt Exp $
+# $OpenBSD: Makefile,v 1.2 1997/09/07 19:59:02 millert Exp $
-SUBDIR= ../crunch floppies
+SUBDIR= ../crunch special floppies
.include <bsd.subdir.mk>
diff --git a/distrib/i386/floppies/ramdisk/instbin-nokrb.conf b/distrib/i386/floppies/ramdisk/instbin-nokrb.conf
index 9e94a215d3a..2867385aa66 100644
--- a/distrib/i386/floppies/ramdisk/instbin-nokrb.conf
+++ b/distrib/i386/floppies/ramdisk/instbin-nokrb.conf
@@ -1,17 +1,17 @@
-# $OpenBSD: instbin-nokrb.conf,v 1.6 1997/09/06 09:05:47 deraadt Exp $
+# $OpenBSD: instbin-nokrb.conf,v 1.7 1997/09/07 19:59:03 millert Exp $
#
-# instbin.conf - unified binary for the inst/upgr floppies
+# instbin-nokrb.conf - unified binary for the inst/upgr floppies
#
-srcdirs bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin usr.sbin/pppd
-srcdirs usr.bin/vi sys/arch/i386/stand
+srcdirs distrib/i386/special bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin
+srcdirs usr.sbin/pppd usr.bin/vi sys/arch/i386/stand
progs cat chat chmod chown cp dd df disklabel ed
progs expr fsck_ffs ftp fdisk hostname
progs ifconfig init less ln ls mkdir mknod mount mount_cd9660
progs mount_ffs mount_msdos mount_nfs mount_kernfs mount_ext2fs
progs mv newfs pax pdksh ping pppd pwd reboot rm route build
-progs scsi sed slattach sleep stty sync test umount
+progs scsi sed slattach sleep stty sync test tip umount
progs rsh restore gzip sort grep cut installboot
ln chown chgrp
@@ -28,4 +28,4 @@ ln grep egrep
ln grep fgrep
ln build vi
-libs -ledit -lutil -lcurses -ll -lm -ltermlib -lpcap
+libs -lutil -lcurses -ll -lm -ltermlib
diff --git a/distrib/i386/floppies/ramdisk/instbin.conf b/distrib/i386/floppies/ramdisk/instbin.conf
index c6a1201ca7e..42213e3043c 100644
--- a/distrib/i386/floppies/ramdisk/instbin.conf
+++ b/distrib/i386/floppies/ramdisk/instbin.conf
@@ -1,17 +1,17 @@
-# $OpenBSD: instbin.conf,v 1.14 1997/09/06 09:05:49 deraadt Exp $
+# $OpenBSD: instbin.conf,v 1.15 1997/09/07 19:59:04 millert Exp $
#
# instbin.conf - unified binary for the inst/upgr floppies
#
-srcdirs bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin usr.sbin/pppd
-srcdirs usr.bin/vi sys/arch/i386/stand
+srcdirs distrib/i386/special bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin
+srcdirs usr.sbin/pppd usr.bin/vi sys/arch/i386/stand
progs cat chat chmod chown cp dd df disklabel ed
progs expr fsck_ffs ftp fdisk hostname
progs ifconfig init less ln ls mkdir mknod mount mount_cd9660
progs mount_ffs mount_msdos mount_nfs mount_kernfs mount_ext2fs
progs mv newfs pax pdksh ping pppd pwd reboot rm route build
-progs scsi sed slattach sleep stty sync test umount
+progs scsi sed slattach sleep stty sync test tip umount
progs rsh restore gzip sort grep cut installboot
ln chown chgrp
@@ -28,4 +28,4 @@ ln grep egrep
ln grep fgrep
ln build vi
-libs -ledit -lutil -lcurses -lkrb -ldes -ll -lm -ltermlib -lpcap
+libs -lutil -lcurses -lkrb -ldes -ll -lm -ltermlib
diff --git a/distrib/i386/special/Makefile b/distrib/i386/special/Makefile
new file mode 100644
index 00000000000..31cb1c36d8c
--- /dev/null
+++ b/distrib/i386/special/Makefile
@@ -0,0 +1,5 @@
+# $OpenBSD: Makefile,v 1.1 1997/09/07 19:59:04 millert Exp $
+
+SUBDIR= ftp pppd
+
+.include <bsd.subdir.mk>
diff --git a/distrib/i386/special/ftp/Makefile b/distrib/i386/special/ftp/Makefile
new file mode 100644
index 00000000000..46d79762b85
--- /dev/null
+++ b/distrib/i386/special/ftp/Makefile
@@ -0,0 +1,26 @@
+# $OpenBSD: Makefile,v 1.1 1997/09/07 19:59:05 millert Exp $
+# $NetBSD: Makefile,v 1.13 1997/08/18 10:20:13 lukem Exp $
+# from: @(#)Makefile 8.2 (Berkeley) 4/3/94
+
+# Define SMALL to disable command line editing
+CFLAGS+=-DSMALL
+
+# Uncomment the following to provide defaults for gate-ftp operation
+#CFLAGS+=-DGATE_SERVER=\"ftp-gw.host\" # -DGATE_PORT=21
+
+# Uncomment the following for socks5 support.
+#CFLAGS += -DSOCKS -include /usr/local/include/socks.h
+#LDADD += -lsocks5
+
+PROG= ftp
+SRCS= cmds.c cmdtab.c complete.c domacro.c fetch.c ftp.c main.c ruserpass.c \
+ stringlist.c util.c
+MAN=
+.PATH: ${.CURDIR}/../../../../usr.bin/ftp
+
+LDADD+= -ltermcap
+DPADD+= ${LIBTERMCAP}
+
+#COPTS+= -Wall -Wconversion -Wstrict-prototypes -Wmissing-prototypes
+
+.include <bsd.prog.mk>
diff --git a/distrib/i386/special/pppd/Makefile b/distrib/i386/special/pppd/Makefile
new file mode 100644
index 00000000000..634a4ef55d6
--- /dev/null
+++ b/distrib/i386/special/pppd/Makefile
@@ -0,0 +1,17 @@
+# $OpenBSD: Makefile,v 1.1 1997/09/07 19:59:06 millert 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 \
+ ipxcp.c lcp.c magic.c main.c options.c sys-bsd.c upap.c
+
+.PATH: ${.CURDIR}/../../../../usr.sbin/pppd ${.CURDIR}/../../sys/net
+MAN=
+BINMODE=4555
+BINOWN= root
+
+LDADD= -lutil
+DPADD= ${LIBUTIL}
+CFLAGS+= -I. -DHAVE_PATHS_H
+
+.include <bsd.prog.mk>