diff options
author | Okan Demirmen <okan@cvs.openbsd.org> | 2014-07-16 20:07:04 +0000 |
---|---|---|
committer | Okan Demirmen <okan@cvs.openbsd.org> | 2014-07-16 20:07:04 +0000 |
commit | 0b3287bd5b6471805de0553f5aa8f011c9fb6e7e (patch) | |
tree | 6b7407900a80a39b0b9028b2ec81c0bba9082cc4 | |
parent | 89b77ece8297b428ef405fbae69adb7180c3e9ca (diff) |
zap trailing newlines; "go for it" deraadt
28 files changed, 27 insertions, 56 deletions
diff --git a/regress/lib/libpthread/setsockopt/3a/Makefile b/regress/lib/libpthread/setsockopt/3a/Makefile index 0e02ab3194f..a18b5400477 100644 --- a/regress/lib/libpthread/setsockopt/3a/Makefile +++ b/regress/lib/libpthread/setsockopt/3a/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1 2009/12/26 01:34:18 fgsch Exp $ +# $OpenBSD: Makefile,v 1.2 2014/07/16 20:04:21 okan Exp $ PROG= setsockopt3a CFLAGS+= -I${.CURDIR}/../../include @@ -15,4 +15,3 @@ dummy: ${PROG} ln -sf ${.OBJDIR}/${PROG} .include <bsd.regress.mk> - diff --git a/regress/lib/libpthread/socket/2a/Makefile b/regress/lib/libpthread/socket/2a/Makefile index 10dda960750..a2cbfde23d6 100644 --- a/regress/lib/libpthread/socket/2a/Makefile +++ b/regress/lib/libpthread/socket/2a/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2002/10/09 20:09:15 marc Exp $ +# $OpenBSD: Makefile,v 1.6 2014/07/16 20:04:21 okan Exp $ PROG= socket2a CFLAGS+= -I${.CURDIR}/../../include @@ -16,4 +16,3 @@ dummy: ${PROG} @echo ${PROG} ready .include <bsd.regress.mk> - diff --git a/regress/lib/libskey/Makefile b/regress/lib/libskey/Makefile index 053f2f3584d..0f53a66c96d 100644 --- a/regress/lib/libskey/Makefile +++ b/regress/lib/libskey/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2003/06/16 13:35:33 mickey Exp $ +# $OpenBSD: Makefile,v 1.3 2014/07/16 20:04:21 okan Exp $ PROG= skeytest CFLAGS+=-Wall @@ -12,4 +12,3 @@ REGRESS_TARGETS=skey-regress .PHONY: ${REGRESS_TARGETS} .include <bsd.regress.mk> - diff --git a/regress/libexec/ld.so/dlopen/libaa/Makefile b/regress/libexec/ld.so/dlopen/libaa/Makefile index 2e48c8a1e93..9c317c4b6f3 100644 --- a/regress/libexec/ld.so/dlopen/libaa/Makefile +++ b/regress/libexec/ld.so/dlopen/libaa/Makefile @@ -3,4 +3,3 @@ SRCS= aa.C NOPROFILE=yes regress: all .include <bsd.lib.mk> - diff --git a/regress/libexec/ld.so/initfirst/test1/prog1/Makefile b/regress/libexec/ld.so/initfirst/test1/prog1/Makefile index aa720f9dff9..4a955b55006 100644 --- a/regress/libexec/ld.so/initfirst/test1/prog1/Makefile +++ b/regress/libexec/ld.so/initfirst/test1/prog1/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1 2011/11/29 04:36:15 kurt Exp $ +# $OpenBSD: Makefile,v 1.2 2014/07/16 20:04:21 okan Exp $ PROGS= prog1 prog2 prog3 prog4 SRCS= main.c @@ -29,4 +29,3 @@ do-prog4: prog4 ${PROGS}: ${LIBCRT0} ${OBJS} ${LIBC} ${CRTBEGIN} ${CRTEND} ${DPADD} ${CC} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} ${OBJS} ${LDADD_${.TARGET}} - diff --git a/regress/share/man/Makefile b/regress/share/man/Makefile index 218b948f61e..2f5dacde8d3 100644 --- a/regress/share/man/Makefile +++ b/regress/share/man/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2002/09/02 20:01:43 avsm Exp $ +# $OpenBSD: Makefile,v 1.10 2014/07/16 20:04:21 okan Exp $ REGRESS_TARGETS=do-cfman do-no3man do-scatman REGRESS_SLOW_TARGETS=${REGRESS_TARGETS} @@ -11,4 +11,3 @@ do-scatman: perl ${.CURDIR}/scatman /usr/share/man .include <bsd.regress.mk> - diff --git a/regress/sys/arch/hppa/probe/Makefile b/regress/sys/arch/hppa/probe/Makefile index 68befb2b601..330ba18d39b 100644 --- a/regress/sys/arch/hppa/probe/Makefile +++ b/regress/sys/arch/hppa/probe/Makefile @@ -1,6 +1,5 @@ -# $OpenBSD: Makefile,v 1.1 2004/05/12 22:54:13 mickey Exp $ +# $OpenBSD: Makefile,v 1.2 2014/07/16 20:04:21 okan Exp $ PROG= probe .include <bsd.regress.mk> - diff --git a/regress/sys/arch/hppa/sfuid/Makefile b/regress/sys/arch/hppa/sfuid/Makefile index df7cd7d999c..208323e6d75 100644 --- a/regress/sys/arch/hppa/sfuid/Makefile +++ b/regress/sys/arch/hppa/sfuid/Makefile @@ -1,6 +1,5 @@ -# $OpenBSD: Makefile,v 1.1 2004/05/13 01:22:05 mickey Exp $ +# $OpenBSD: Makefile,v 1.2 2014/07/16 20:04:21 okan Exp $ PROG= sfuid .include <bsd.regress.mk> - diff --git a/regress/sys/arch/i386/ldt/Makefile b/regress/sys/arch/i386/ldt/Makefile index a8dddd935db..c0d1dfa81b2 100644 --- a/regress/sys/arch/i386/ldt/Makefile +++ b/regress/sys/arch/i386/ldt/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2004/12/29 04:39:17 david Exp $ +# $OpenBSD: Makefile,v 1.8 2014/07/16 20:04:21 okan Exp $ # $NetBSD: Makefile,v 1.3 1995/04/20 22:42:19 cgd Exp $ # # C Optimizer (-O) breaks this program - don't use !! @@ -31,4 +31,3 @@ REGRESS_ROOT_TARGETS=${REGRESS_TARGETS} .PHONY: ${REGRESS_TARGETS} .include <bsd.regress.mk> - diff --git a/regress/sys/arch/sparc64/emul-ldqstq/badfreg/Makefile b/regress/sys/arch/sparc64/emul-ldqstq/badfreg/Makefile index 3ab26c15fa4..d8859a5b527 100644 --- a/regress/sys/arch/sparc64/emul-ldqstq/badfreg/Makefile +++ b/regress/sys/arch/sparc64/emul-ldqstq/badfreg/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2003/07/12 04:23:15 jason Exp $ +# $OpenBSD: Makefile,v 1.3 2014/07/16 20:04:21 okan Exp $ PROG=badfpreg NOMAN= @@ -215,4 +215,3 @@ t_ld_f62_reg: ${PROG} t_st_f62_reg: ${PROG} ${.OBJDIR}/${PROG} 62 st reg - diff --git a/regress/usr.bin/ssh/unittests/sshbuf/Makefile b/regress/usr.bin/ssh/unittests/sshbuf/Makefile index 42b7a20c217..2cdb7618e7e 100644 --- a/regress/usr.bin/ssh/unittests/sshbuf/Makefile +++ b/regress/usr.bin/ssh/unittests/sshbuf/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2014/06/24 01:14:18 djm Exp $ +# $OpenBSD: Makefile,v 1.3 2014/07/16 20:04:21 okan Exp $ TEST_ENV= "MALLOC_OPTIONS=AFGJPRX" @@ -16,4 +16,3 @@ run-regress-${PROG}: ${PROG} env ${TEST_ENV} ./${PROG} .include <bsd.regress.mk> - diff --git a/regress/usr.bin/ssh/unittests/sshkey/Makefile b/regress/usr.bin/ssh/unittests/sshkey/Makefile index 1bcd266762a..75f98ee6fb1 100644 --- a/regress/usr.bin/ssh/unittests/sshkey/Makefile +++ b/regress/usr.bin/ssh/unittests/sshkey/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1 2014/06/24 01:14:18 djm Exp $ +# $OpenBSD: Makefile,v 1.2 2014/07/16 20:04:21 okan Exp $ TEST_ENV= "MALLOC_OPTIONS=AFGJPRX" @@ -10,4 +10,3 @@ run-regress-${PROG}: ${PROG} env ${TEST_ENV} ./${PROG} -d ${.CURDIR}/testdata .include <bsd.regress.mk> - diff --git a/regress/usr.bin/tsort/Makefile b/regress/usr.bin/tsort/Makefile index 2b7da1ccf25..60ad166a36a 100644 --- a/regress/usr.bin/tsort/Makefile +++ b/regress/usr.bin/tsort/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2002/09/02 20:01:44 avsm Exp $ +# $OpenBSD: Makefile,v 1.8 2014/07/16 20:04:21 okan Exp $ REGRESS_TARGETS=t1 t2 t3 t4 t5 t6 REGRESS_SLOW_TARGETS=t4 @@ -49,4 +49,3 @@ pairs4: CLEANFILES+=t1.out t2.out t3.out t4.out t5.out t6.out pairs3 pairs4 .include <bsd.regress.mk> - diff --git a/sbin/pdisk/Makefile b/sbin/pdisk/Makefile index e332732fb66..2a79011a50d 100644 --- a/sbin/pdisk/Makefile +++ b/sbin/pdisk/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.11 2012/06/20 18:45:44 matthew Exp $ +# $Id: Makefile,v 1.12 2014/07/16 20:05:03 okan Exp $ .if ${MACHINE} == "macppc" PROG= pdisk @@ -18,4 +18,3 @@ MAN= pdisk.8 MANSUBDIR=macppc .include <bsd.prog.mk> - diff --git a/share/man/man1/Makefile b/share/man/man1/Makefile index 77ef537cd8e..f60bbe98857 100644 --- a/share/man/man1/Makefile +++ b/share/man/man1/Makefile @@ -1,7 +1,6 @@ -# $OpenBSD: Makefile,v 1.4 2008/01/11 20:16:02 jmc Exp $ +# $OpenBSD: Makefile,v 1.5 2014/07/16 20:05:28 okan Exp $ # $NetBSD: Makefile,v 1.4 1994/12/22 10:48:04 cgd Exp $ MAN= intro.1 gcc-local.1 .include <bsd.prog.mk> - diff --git a/usr.bin/banner/Makefile b/usr.bin/banner/Makefile index 3ce26fc6c0d..c857d8ab904 100644 --- a/usr.bin/banner/Makefile +++ b/usr.bin/banner/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 1997/09/21 11:48:23 deraadt Exp $ +# $OpenBSD: Makefile,v 1.4 2014/07/16 20:06:27 okan Exp $ PROG= banner @@ -14,4 +14,3 @@ SRCS= $(PROG).c chset.c #CFLAGS+= -DLPD_CHSET .include <bsd.prog.mk> - diff --git a/usr.bin/bgplg/traceroute/Makefile b/usr.bin/bgplg/traceroute/Makefile index adcfb228d1d..49c63e9d8e9 100644 --- a/usr.bin/bgplg/traceroute/Makefile +++ b/usr.bin/bgplg/traceroute/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2014/04/26 11:02:45 florian Exp $ +# $OpenBSD: Makefile,v 1.3 2014/07/16 20:06:27 okan Exp $ PROGDIR= ${.CURDIR}/../../../usr.sbin/traceroute @@ -14,4 +14,3 @@ LINKS= ${BINDIR}/traceroute ${BINDIR}/traceroute6 BINMODE= 000 .PATH: ${PROGDIR} - diff --git a/usr.bin/fstat/Makefile b/usr.bin/fstat/Makefile index a36d3a4094c..5eac0755816 100644 --- a/usr.bin/fstat/Makefile +++ b/usr.bin/fstat/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2009/07/08 16:04:00 millert Exp $ +# $OpenBSD: Makefile,v 1.11 2014/07/16 20:06:27 okan Exp $ PROG= fstat SRCS= fstat.c fuser.c @@ -10,4 +10,3 @@ LINKS= ${BINDIR}/fstat ${BINDIR}/fuser CFLAGS+=-DINET6 .include <bsd.prog.mk> - diff --git a/usr.bin/systat/Makefile b/usr.bin/systat/Makefile index 0baf9c6f3da..83d233abfbe 100644 --- a/usr.bin/systat/Makefile +++ b/usr.bin/systat/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.25 2013/09/07 11:43:49 reyk Exp $ +# $OpenBSD: Makefile,v 1.26 2014/07/16 20:06:27 okan Exp $ PROG= systat @@ -17,4 +17,3 @@ BINGRP= kmem BINMODE=2555 .include <bsd.prog.mk> - diff --git a/usr.bin/top/Makefile b/usr.bin/top/Makefile index a8aa0cb8a9d..060b1af32ae 100644 --- a/usr.bin/top/Makefile +++ b/usr.bin/top/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.15 2010/03/18 12:28:09 otto Exp $ +# $OpenBSD: Makefile,v 1.16 2014/07/16 20:06:27 okan Exp $ # # Makefile for OpenBSD top-3.4. @@ -10,4 +10,3 @@ DPADD= ${LIBCURSES} LDADD= -lcurses .include <bsd.prog.mk> - diff --git a/usr.bin/vmstat/Makefile b/usr.bin/vmstat/Makefile index 2f5ce1caca2..333793d72ad 100644 --- a/usr.bin/vmstat/Makefile +++ b/usr.bin/vmstat/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2014/07/02 00:12:34 dlg Exp $ +# $OpenBSD: Makefile,v 1.10 2014/07/16 20:06:27 okan Exp $ PROG= vmstat @@ -9,4 +9,3 @@ DPADD= ${LIBKVM} LDADD= -lkvm .include <bsd.prog.mk> - diff --git a/usr.bin/w/Makefile b/usr.bin/w/Makefile index dbf39d4c261..ffe40d2fd81 100644 --- a/usr.bin/w/Makefile +++ b/usr.bin/w/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2002/06/08 22:57:34 angelos Exp $ +# $OpenBSD: Makefile,v 1.7 2014/07/16 20:06:27 okan Exp $ PROG= w SRCS= fmt.c pr_time.c proc_compare.c w.c @@ -10,4 +10,3 @@ LINKS= ${BINDIR}/w ${BINDIR}/uptime .PATH: ${.CURDIR}/../../bin/ps .include <bsd.prog.mk> - diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index 0ffc155093a..06d4db7531a 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.177 2014/04/26 11:02:45 florian Exp $ +# $OpenBSD: Makefile,v 1.178 2014/07/16 20:07:03 okan Exp $ .include <bsd.own.mk> @@ -25,4 +25,3 @@ SUBDIR+=ypbind ypldap yppoll ypset ypserv .endif .include <bsd.subdir.mk> - diff --git a/usr.sbin/ldapd/Makefile b/usr.sbin/ldapd/Makefile index d285f1a5e79..d35945bbef8 100644 --- a/usr.sbin/ldapd/Makefile +++ b/usr.sbin/ldapd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2014/04/15 20:55:42 miod Exp $ +# $OpenBSD: Makefile,v 1.12 2014/07/16 20:07:03 okan Exp $ PROG= ldapd MAN= ldapd.8 ldapd.conf.5 @@ -27,4 +27,3 @@ distribution: done .include <bsd.prog.mk> - diff --git a/usr.sbin/mksuncd/Makefile b/usr.sbin/mksuncd/Makefile index b4bb250851a..1d2baff290b 100644 --- a/usr.sbin/mksuncd/Makefile +++ b/usr.sbin/mksuncd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2012/09/12 09:19:54 haesbaert Exp $ +# $OpenBSD: Makefile,v 1.4 2014/07/16 20:07:03 okan Exp $ .if ${MACHINE} == "sparc64" @@ -14,4 +14,3 @@ MAN= mksuncd.1 MANSUBDIR=sparc64 .include <bsd.prog.mk> - diff --git a/usr.sbin/mopd/otherOS/linux2/Makefile b/usr.sbin/mopd/otherOS/linux2/Makefile index 1d4596fcf9f..51cca1ab4bc 100644 --- a/usr.sbin/mopd/otherOS/linux2/Makefile +++ b/usr.sbin/mopd/otherOS/linux2/Makefile @@ -1,7 +1,7 @@ # Copyright (c) 1999 Mats O Jansson, Stockholm, Sweden # All rights reserved. # -# @(#) $OpenBSD: Makefile,v 1.1 1999/03/27 14:31:23 maja Exp $ +# @(#) $OpenBSD: Makefile,v 1.2 2014/07/16 20:07:03 okan Exp $ INSTBIN= install -c -s -o root -g root -m 755 INSTINIT= install -c -o root -g root -m 755 @@ -9,4 +9,3 @@ INSTINIT= install -c -o root -g root -m 755 install: mopd.init echo "Installing files in linux2"; $(INSTINIT) $< $(INSTALL)/etc/rc.d/init.d/mopd - diff --git a/usr.sbin/pstat/Makefile b/usr.sbin/pstat/Makefile index bc9d8d6a5bf..f606be93263 100644 --- a/usr.sbin/pstat/Makefile +++ b/usr.sbin/pstat/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2001/06/27 06:16:52 art Exp $ +# $OpenBSD: Makefile,v 1.7 2014/07/16 20:07:03 okan Exp $ PROG= pstat MAN= pstat.8 @@ -8,5 +8,3 @@ DPADD= ${LIBKVM} LDADD= -lkvm .include <bsd.prog.mk> - - diff --git a/usr.sbin/wsmoused/Makefile b/usr.sbin/wsmoused/Makefile index 36a88a58377..9b0cc880a64 100644 --- a/usr.sbin/wsmoused/Makefile +++ b/usr.sbin/wsmoused/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2004/05/03 15:18:21 drahn Exp $ +# $OpenBSD: Makefile,v 1.7 2014/07/16 20:07:03 okan Exp $ .if ${MACHINE} == "i386" || ${MACHINE} == "amd64" ||\ ${MACHINE} == "alpha" @@ -16,4 +16,3 @@ MAN= wsmoused.8 MANSUBDIR= i386 amd64 alpha .include <bsd.prog.mk> - |