summaryrefslogtreecommitdiff
path: root/distrib
diff options
context:
space:
mode:
Diffstat (limited to 'distrib')
-rw-r--r--distrib/special/Makefile.inc5
-rw-r--r--distrib/special/ccdconfig/Makefile5
-rw-r--r--distrib/special/dd/Makefile5
-rw-r--r--distrib/special/dhclient/Makefile6
-rw-r--r--distrib/special/dmesg/Makefile4
-rw-r--r--distrib/special/ed/Makefile5
-rw-r--r--distrib/special/ftp/Makefile14
-rw-r--r--distrib/special/grep/Makefile8
-rw-r--r--distrib/special/gzip/Makefile5
-rw-r--r--distrib/special/ifconfig/Makefile5
-rw-r--r--distrib/special/init/Makefile4
-rw-r--r--distrib/special/kbd/Makefile5
-rw-r--r--distrib/special/less/Makefile5
-rw-r--r--distrib/special/libstubs/Makefile6
-rw-r--r--distrib/special/more/Makefile5
-rw-r--r--distrib/special/mt/Makefile5
-rw-r--r--distrib/special/newfs/Makefile5
-rw-r--r--distrib/special/pppd/Makefile5
-rw-r--r--distrib/special/restore/Makefile4
-rw-r--r--distrib/special/rsh/Makefile6
-rw-r--r--distrib/special/sha256/Makefile4
-rw-r--r--distrib/special/sysctl/Makefile4
22 files changed, 35 insertions, 85 deletions
diff --git a/distrib/special/Makefile.inc b/distrib/special/Makefile.inc
new file mode 100644
index 00000000000..8e1a74e2da7
--- /dev/null
+++ b/distrib/special/Makefile.inc
@@ -0,0 +1,5 @@
+# options for all the directories below
+
+COPTS+=-Os
+MAN=
+LDSTATIC=-static
diff --git a/distrib/special/ccdconfig/Makefile b/distrib/special/ccdconfig/Makefile
index f5990f38a06..5cfe5c803d7 100644
--- a/distrib/special/ccdconfig/Makefile
+++ b/distrib/special/ccdconfig/Makefile
@@ -1,8 +1,7 @@
-# $OpenBSD: Makefile,v 1.1 2003/12/17 01:46:51 millert Exp $
+# $OpenBSD: Makefile,v 1.2 2009/10/28 07:36:49 deraadt Exp $
PROG= ccdconfig
-MAN=
-COPTS+=-Os -DSMALL
+COPTS+= -DSMALL
.PATH: ${.CURDIR}/../../../sbin/ccdconfig
DPADD= ${LIBUTIL}
diff --git a/distrib/special/dd/Makefile b/distrib/special/dd/Makefile
index 045f6c2d1b1..4392bb0bafc 100644
--- a/distrib/special/dd/Makefile
+++ b/distrib/special/dd/Makefile
@@ -1,13 +1,10 @@
-# $OpenBSD: Makefile,v 1.2 2008/09/15 18:13:36 kurt Exp $
+# $OpenBSD: Makefile,v 1.3 2009/10/28 07:36:49 deraadt Exp $
-COPTS+=-Os
# Define NO_CONV to disable character conversion
CFLAGS+=-DNO_CONV
-LDSTATIC=-static
PROG= dd
SRCS= args.c conv.c dd.c misc.c position.c
-MAN=
.PATH: ${.CURDIR}/../../../bin/dd
diff --git a/distrib/special/dhclient/Makefile b/distrib/special/dhclient/Makefile
index e4ce45e0656..cfa1590f79f 100644
--- a/distrib/special/dhclient/Makefile
+++ b/distrib/special/dhclient/Makefile
@@ -1,19 +1,15 @@
-# $OpenBSD: Makefile,v 1.9 2005/07/18 02:33:50 deraadt Exp $
+# $OpenBSD: Makefile,v 1.10 2009/10/28 07:36:49 deraadt Exp $
.include <bsd.own.mk>
.PATH: ${.CURDIR}/../../../sbin/dhclient
-COPTS+=-Os
CLIENT_PATH='"PATH=/usr/bin:/usr/sbin:/bin:/sbin"'
CPPFLAGS+= -I${.CURDIR}/../../../sbin/dhclient
SRCS= dhclient.c clparse.c dispatch.c bpf.c options.c \
conflex.c errwarn.c inet.c packet.c convert.c tables.c parse.c \
privsep.c
PROG= dhclient
-MAN=
-
-LDSTATIC?= -static
.include <bsd.prog.mk>
.include <bsd.subdir.mk>
diff --git a/distrib/special/dmesg/Makefile b/distrib/special/dmesg/Makefile
index 64c89e06371..d9846a56dda 100644
--- a/distrib/special/dmesg/Makefile
+++ b/distrib/special/dmesg/Makefile
@@ -1,8 +1,6 @@
-# $OpenBSD: Makefile,v 1.1 2001/06/22 23:24:26 deraadt Exp $
+# $OpenBSD: Makefile,v 1.2 2009/10/28 07:36:49 deraadt Exp $
PROG= dmesg
-MAN=
-COPTS+=-Os
CFLAGS+=-DNOKVM
.PATH: ${.CURDIR}/../../../sbin/dmesg
diff --git a/distrib/special/ed/Makefile b/distrib/special/ed/Makefile
index efe9cc3f820..891ad347964 100644
--- a/distrib/special/ed/Makefile
+++ b/distrib/special/ed/Makefile
@@ -1,11 +1,8 @@
-# $OpenBSD: Makefile,v 1.1 2009/10/28 05:06:37 deraadt Exp $
+# $OpenBSD: Makefile,v 1.2 2009/10/28 07:36:49 deraadt Exp $
-COPTS+=-Os
PROG= ed
CFLAGS+=-DBACKWARDS
SRCS= buf.c glbl.c io.c main.c re.c sub.c undo.c
-LDSTATIC=-static
-MAN=
.PATH: ${.CURDIR}/../../../bin/ed
.include <bsd.prog.mk>
diff --git a/distrib/special/ftp/Makefile b/distrib/special/ftp/Makefile
index f0c8266d982..6e09dbe0442 100644
--- a/distrib/special/ftp/Makefile
+++ b/distrib/special/ftp/Makefile
@@ -1,26 +1,14 @@
-# $OpenBSD: Makefile,v 1.7 2009/06/04 05:46:49 halex Exp $
+# $OpenBSD: Makefile,v 1.8 2009/10/28 07:36:49 deraadt 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
-COPTS+=-Os
CFLAGS+=-DSMALL -DINET6
-# 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 -I/usr/local/include
-#LDADD += -L/usr/local/lib -lsocks
-
PROG= ftp
SRCS= fetch.c ftp.c main.c small.c util.c
-MAN=
.PATH: ${.CURDIR}/../../../usr.bin/ftp
LDADD+= -lcurses -lutil
DPADD+= ${LIBCURSES} ${LIBUTIL}
-#COPTS+= -Wall -Wconversion -Wstrict-prototypes -Wmissing-prototypes
-
.include <bsd.prog.mk>
diff --git a/distrib/special/grep/Makefile b/distrib/special/grep/Makefile
index 13010dcd190..a68bdc64433 100644
--- a/distrib/special/grep/Makefile
+++ b/distrib/special/grep/Makefile
@@ -1,12 +1,8 @@
-# $OpenBSD: Makefile,v 1.2 2003/06/22 22:24:41 deraadt Exp $
+# $OpenBSD: Makefile,v 1.3 2009/10/28 07:36:49 deraadt Exp $
PROG= grep
SRCS= binary.c file.c grep.c mmfile.c queue.c util.c
-MAN=
-COPTS+=-Os -DNOZ
+COPTS+= -DNOZ
.PATH: ${.CURDIR}/../../../usr.bin/grep
-#LDADD=-lz
-#DPADD=${LIBZ}
-
.include <bsd.prog.mk>
diff --git a/distrib/special/gzip/Makefile b/distrib/special/gzip/Makefile
index 80cd34a6ad7..09d27be426e 100644
--- a/distrib/special/gzip/Makefile
+++ b/distrib/special/gzip/Makefile
@@ -1,10 +1,9 @@
-# $OpenBSD: Makefile,v 1.7 2003/12/17 19:37:59 henning Exp $
+# $OpenBSD: Makefile,v 1.8 2009/10/28 07:36:49 deraadt Exp $
PROG= gzip
SRCS= main.c gzopen.c
SRCS+= adler32.c crc32.c inflate.c inftrees.c zutil.c
-MAN=
-COPTS+=-Os -DSMALL -DDYNAMIC_CRC_TABLE -DNOBYFOUR -DNO_GZIP -DSLOW
+COPTS+= -DSMALL -DDYNAMIC_CRC_TABLE -DNOBYFOUR -DNO_GZIP -DSLOW
.PATH: ${.CURDIR}/../../../usr.bin/compress
.PATH: ${.CURDIR}/../../../lib/libz
diff --git a/distrib/special/ifconfig/Makefile b/distrib/special/ifconfig/Makefile
index 58235de0832..d883a8a1a70 100644
--- a/distrib/special/ifconfig/Makefile
+++ b/distrib/special/ifconfig/Makefile
@@ -1,8 +1,7 @@
-# $OpenBSD: Makefile,v 1.1 2004/12/25 11:22:08 deraadt Exp $
+# $OpenBSD: Makefile,v 1.2 2009/10/28 07:36:49 deraadt Exp $
PROG= ifconfig
-MAN=
-COPTS+=-Os -DSMALL
+COPTS+= -DSMALL
.PATH: ${.CURDIR}/../../../sbin/ifconfig
CPPFLAGS+=-DINET6
diff --git a/distrib/special/init/Makefile b/distrib/special/init/Makefile
index ea78f352164..ccf8111a84f 100644
--- a/distrib/special/init/Makefile
+++ b/distrib/special/init/Makefile
@@ -1,8 +1,6 @@
-# $OpenBSD: Makefile,v 1.2 2002/06/09 05:53:55 todd Exp $
+# $OpenBSD: Makefile,v 1.3 2009/10/28 07:36:49 deraadt Exp $
PROG= init
-MAN=
-COPTS+=-Os
CFLAGS+=-DDEFAULT_STATE=single_user
DPADD= ${LIBUTIL}
LDADD= -lutil
diff --git a/distrib/special/kbd/Makefile b/distrib/special/kbd/Makefile
index c762c12ba3c..8c0e0662d17 100644
--- a/distrib/special/kbd/Makefile
+++ b/distrib/special/kbd/Makefile
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.15 2009/10/11 12:19:49 maja Exp $
+# $OpenBSD: Makefile,v 1.16 2009/10/28 07:36:49 deraadt Exp $
.if ${MACHINE} != "aviion" && ${MACHINE} != "mvme68k" && \
${MACHINE} != "mvme88k"
PROG= kbd
-COPTS+= -Os
SRCS= main.c kbd_wscons.c
CFLAGS+=-DNOKVM
@@ -16,6 +15,4 @@ DPADD= ${LIBKVM}
NOPROG= Yes
.endif
-MAN=
-
.include <bsd.prog.mk>
diff --git a/distrib/special/less/Makefile b/distrib/special/less/Makefile
index eb9eed1e9a3..c142920bcee 100644
--- a/distrib/special/less/Makefile
+++ b/distrib/special/less/Makefile
@@ -1,12 +1,11 @@
-# $OpenBSD: Makefile,v 1.1 2003/04/14 14:35:04 millert Exp $
+# $OpenBSD: Makefile,v 1.2 2009/10/28 07:36:49 deraadt Exp $
PROG= less
SRCS= main.c screen.c brac.c ch.c charset.c cmdbuf.c command.c decode.c \
edit.c filename.c forwback.c help.c ifile.c input.c jump.c line.c \
linenum.c lsystem.c mark.c optfunc.c option.c opttbl.c os.c output.c \
position.c prompt.c search.c signal.c tags.c ttyin.c version.c
-CFLAGS= -Os ${PIPE} ${DEBUG} -I${.CURDIR}
-MAN=
+CFLAGS= ${PIPE} ${DEBUG} -I${.CURDIR}
DPADD= ${LIBOCURSES}
LDADD= -locurses
diff --git a/distrib/special/libstubs/Makefile b/distrib/special/libstubs/Makefile
index 2654de0a9a1..c73bad0c497 100644
--- a/distrib/special/libstubs/Makefile
+++ b/distrib/special/libstubs/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2009/10/28 07:34:36 guenther Exp $
+# $OpenBSD: Makefile,v 1.4 2009/10/28 07:36:49 deraadt Exp $
.include <bsd.own.mk>
LIB= stubs
@@ -6,9 +6,9 @@ SRCS= db.c setlocale.c sha2.c getgrent.c getpwent.c \
ethers.c getaddrinfo.c gethostnamadr.c getnetnamadr.c
NOPIC= Yes
NOPROFILE=Yes
-NOMAN=1
+NOMAN= 1
-CFLAGS+=-Os -D__DBINTERFACE_PRIVATE -DSHA256_ONLY -UYP -I${LIBCSRCDIR}/include
+CFLAGS+=-D__DBINTERFACE_PRIVATE -DSHA256_ONLY -UYP -I${LIBCSRCDIR}/include
LIBCSRCDIR=${.CURDIR}/../../../lib/libc
diff --git a/distrib/special/more/Makefile b/distrib/special/more/Makefile
index 644900b2c9f..96af8afd6b3 100644
--- a/distrib/special/more/Makefile
+++ b/distrib/special/more/Makefile
@@ -1,8 +1,7 @@
-# $OpenBSD: Makefile,v 1.9 2009/04/19 17:07:04 martynas Exp $
+# $OpenBSD: Makefile,v 1.10 2009/10/28 07:36:49 deraadt Exp $
PROG= more
-MAN=
-CFLAGS+= -D_USE_OLD_CURSES_ -I. -Os
+CFLAGS+= -D_USE_OLD_CURSES_ -I.
DPADD= ${LIBOCURSES}
LDADD= -locurses
CLEANFILES+=morehelp.h
diff --git a/distrib/special/mt/Makefile b/distrib/special/mt/Makefile
index 66697a0d8b4..411848a2b4d 100644
--- a/distrib/special/mt/Makefile
+++ b/distrib/special/mt/Makefile
@@ -1,12 +1,9 @@
-# $OpenBSD: Makefile,v 1.1 2009/10/28 05:17:34 deraadt Exp $
+# $OpenBSD: Makefile,v 1.2 2009/10/28 07:36:49 deraadt Exp $
-COPTS+=-Os
PROG= mt
SRCS= mt.c
DPADD= ${LIBUTIL}
LDADD= -lutil
-LDSTATIC=-static
-MAN=
.PATH: ${.CURDIR}/../../../bin/mt
diff --git a/distrib/special/newfs/Makefile b/distrib/special/newfs/Makefile
index 6433c7f66cb..cc5cebe0bbf 100644
--- a/distrib/special/newfs/Makefile
+++ b/distrib/special/newfs/Makefile
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.1 2007/11/26 15:36:40 deraadt Exp $
+# $OpenBSD: Makefile,v 1.2 2009/10/28 07:36:49 deraadt Exp $
PROG= newfs
-MAN=
SRCS= dkcksum.c getmntopts.c newfs.c mkfs.c
-COPTS+=-Os
+
CFLAGS+= -I${.CURDIR}/../../../sbin/mount
.PATH: ${.CURDIR}/../../../sbin/newfs
.PATH: ${.CURDIR}/../../../sbin/mount
diff --git a/distrib/special/pppd/Makefile b/distrib/special/pppd/Makefile
index bf6f8dcb13e..8df5c512602 100644
--- a/distrib/special/pppd/Makefile
+++ b/distrib/special/pppd/Makefile
@@ -1,14 +1,11 @@
-# $OpenBSD: Makefile,v 1.3 2007/06/04 18:25:29 henning Exp $
+# $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 $
-COPTS+=-Os
-
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
-MAN=
BINMODE=4555
BINOWN= root
diff --git a/distrib/special/restore/Makefile b/distrib/special/restore/Makefile
index e10979d382f..1d9c2e22611 100644
--- a/distrib/special/restore/Makefile
+++ b/distrib/special/restore/Makefile
@@ -1,9 +1,7 @@
-# $OpenBSD: Makefile,v 1.1 2009/10/28 05:07:24 deraadt Exp $
+# $OpenBSD: Makefile,v 1.2 2009/10/28 07:36:49 deraadt Exp $
-COPTS+=-Os
PROG= restore
SRCS= main.c interactive.c restore.c dirs.c symtab.c tape.c utilities.c
-MAN=
.PATH: ${.CURDIR}/../../../sbin/restore
diff --git a/distrib/special/rsh/Makefile b/distrib/special/rsh/Makefile
index 4ebaee07b7c..d2f5628b876 100644
--- a/distrib/special/rsh/Makefile
+++ b/distrib/special/rsh/Makefile
@@ -1,14 +1,10 @@
-# $OpenBSD: Makefile,v 1.2 1999/06/17 20:42:31 deraadt Exp $
+# $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
-COPTS+=-Os
-
-KERBEROS=no
.PATH: ${.CURDIR}/../../../usr.bin/rsh
-MAN=
BINMODE=4555
BINOWN= root
diff --git a/distrib/special/sha256/Makefile b/distrib/special/sha256/Makefile
index 53daf2bfe29..e786b35bb3c 100644
--- a/distrib/special/sha256/Makefile
+++ b/distrib/special/sha256/Makefile
@@ -1,7 +1,5 @@
-# $OpenBSD: Makefile,v 1.1 2009/04/17 03:48:35 deraadt Exp $
+# $OpenBSD: Makefile,v 1.2 2009/10/28 07:36:49 deraadt Exp $
PROG= sha256
-MAN=
-COPTS+=-Os
.include <bsd.prog.mk>
diff --git a/distrib/special/sysctl/Makefile b/distrib/special/sysctl/Makefile
index 7ae2abed16b..59428cfe7a8 100644
--- a/distrib/special/sysctl/Makefile
+++ b/distrib/special/sysctl/Makefile
@@ -1,9 +1,7 @@
-# $OpenBSD: Makefile,v 1.1 2009/04/19 00:57:44 deraadt Exp $
+# $OpenBSD: Makefile,v 1.2 2009/10/28 07:36:49 deraadt Exp $
PROG= sysctl
SRCS= sysctl.c
-CFLAGS+= -Os
-MAN=
.PATH: ${.CURDIR}/../../../distrib/special/sysctl
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-17 22:45:51 +0000