From 1e29880ecad1dcdf7e9a0fa3b523cb5007f215ec Mon Sep 17 00:00:00 2001 From: okan Date: Wed, 16 Jul 2014 20:02:17 +0000 Subject: [PATCH] zap trailing newlines; "go for it" deraadt --- lib/libarch/amd64/Makefile | 3 +-- lib/libarch/i386/Makefile | 3 +-- lib/libc/arch/hppa64/string/Makefile.inc | 3 +-- lib/libc/arch/ia64/string/Makefile.inc | 1 - lib/libc/arch/powerpc/net/Makefile.inc | 1 - lib/libc/thread/Makefile.inc | 3 +-- lib/libocurses/PSD.doc/Makefile | 2 -- lib/libossaudio/Makefile | 3 +-- lib/libpthread/include/Makefile.inc | 3 +-- lib/libpthread/man/Makefile.inc | 3 +-- lib/librthread/Makefile | 3 +-- 11 files changed, 8 insertions(+), 20 deletions(-) diff --git a/lib/libarch/amd64/Makefile b/lib/libarch/amd64/Makefile index bc11cd2ec78..d6e249cdb2a 100644 --- a/lib/libarch/amd64/Makefile +++ b/lib/libarch/amd64/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2013/05/05 19:27:23 tedu Exp $ +# $OpenBSD: Makefile,v 1.12 2014/07/16 20:02:17 okan Exp $ # $NetBSD: Makefile,v 1.1 1996/02/21 02:45:47 jtk Exp $ MANSUBDIR=amd64 @@ -14,4 +14,3 @@ SRCS+= amd64_iopl.c amd64_get_fsbase.c amd64_set_fsbase.c NOPROG= .include .endif - diff --git a/lib/libarch/i386/Makefile b/lib/libarch/i386/Makefile index e8c1dd9859e..4cb11d3dc2e 100644 --- a/lib/libarch/i386/Makefile +++ b/lib/libarch/i386/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2011/03/12 04:12:29 guenther Exp $ +# $OpenBSD: Makefile,v 1.7 2014/07/16 20:02:17 okan Exp $ # $NetBSD: Makefile,v 1.1 1996/02/21 02:45:47 jtk Exp $ MAN+= i386_get_ldt.2 \ @@ -24,4 +24,3 @@ SRCS+= i386_get_ldt.c i386_set_ldt.c \ NOPROG= .include .endif - diff --git a/lib/libc/arch/hppa64/string/Makefile.inc b/lib/libc/arch/hppa64/string/Makefile.inc index 51954ba1a74..623fdff6873 100644 --- a/lib/libc/arch/hppa64/string/Makefile.inc +++ b/lib/libc/arch/hppa64/string/Makefile.inc @@ -1,7 +1,6 @@ -# $OpenBSD: Makefile.inc,v 1.1 2005/04/01 10:54:27 mickey Exp $ +# $OpenBSD: Makefile.inc,v 1.2 2014/07/16 20:02:17 okan Exp $ SRCS+= bcmp.c bzero.c bcopy.c memchr.c memcmp.c memset.c index.c rindex.c \ strcat.c strcmp.c strcpy.c strlcpy.c strcspn.c strlen.c \ strncat.c strncmp.c strncpy.c strpbrk.c strsep.c \ strspn.c strstr.c swab.c ffs.c - diff --git a/lib/libc/arch/ia64/string/Makefile.inc b/lib/libc/arch/ia64/string/Makefile.inc index eebf40a43a6..f0599d9418e 100644 --- a/lib/libc/arch/ia64/string/Makefile.inc +++ b/lib/libc/arch/ia64/string/Makefile.inc @@ -1,2 +1 @@ # $NetBSD: Makefile.inc,v 1.4 2009/07/30 20:57:16 dsl Exp $ - diff --git a/lib/libc/arch/powerpc/net/Makefile.inc b/lib/libc/arch/powerpc/net/Makefile.inc index 86017c7b155..1b8cd45dafb 100644 --- a/lib/libc/arch/powerpc/net/Makefile.inc +++ b/lib/libc/arch/powerpc/net/Makefile.inc @@ -1,2 +1 @@ SRCS += ntohl.c ntohs.c htons.c htonl.c - diff --git a/lib/libc/thread/Makefile.inc b/lib/libc/thread/Makefile.inc index 6d4c1cacdf6..248e6ede8cf 100644 --- a/lib/libc/thread/Makefile.inc +++ b/lib/libc/thread/Makefile.inc @@ -1,6 +1,5 @@ -# $OpenBSD: Makefile.inc,v 1.7 2007/06/05 18:11:48 kurt Exp $ +# $OpenBSD: Makefile.inc,v 1.8 2014/07/16 20:02:17 okan Exp $ .PATH: ${LIBCSRCDIR}/thread SRCS+= unithread_malloc_lock.c unithread_mutex.c unithread_tag.c - diff --git a/lib/libocurses/PSD.doc/Makefile b/lib/libocurses/PSD.doc/Makefile index 14dcd095552..33c4a93344c 100644 --- a/lib/libocurses/PSD.doc/Makefile +++ b/lib/libocurses/PSD.doc/Makefile @@ -38,5 +38,3 @@ intro.2.tbl: intro.2 ${TBL} intro.2 > intro.2.tbl .include - - diff --git a/lib/libossaudio/Makefile b/lib/libossaudio/Makefile index e76cda5db99..de1d0e7deeb 100644 --- a/lib/libossaudio/Makefile +++ b/lib/libossaudio/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2012/08/02 13:38:39 okan Exp $ +# $OpenBSD: Makefile,v 1.5 2014/07/16 20:02:17 okan Exp $ # $NetBSD: Makefile,v 1.5 1998/04/13 14:18:45 lukem Exp $ LIB= ossaudio @@ -14,4 +14,3 @@ includes: ${DESTDIR}/usr/include .include - diff --git a/lib/libpthread/include/Makefile.inc b/lib/libpthread/include/Makefile.inc index b8fd2151c2e..d46b5e6386c 100644 --- a/lib/libpthread/include/Makefile.inc +++ b/lib/libpthread/include/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.6 2013/06/02 22:03:12 tedu Exp $ +# $OpenBSD: Makefile.inc,v 1.7 2014/07/16 20:02:17 okan Exp $ includes: @cd ${SRCDIR}/include; \ @@ -9,4 +9,3 @@ includes: ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \ $$h ${DESTDIR}/usr/include) || exit 1; \ done - diff --git a/lib/libpthread/man/Makefile.inc b/lib/libpthread/man/Makefile.inc index 7fd3ba1dcd6..50c531fedd3 100644 --- a/lib/libpthread/man/Makefile.inc +++ b/lib/libpthread/man/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.34 2013/06/17 19:11:54 guenther Exp $ +# $OpenBSD: Makefile.inc,v 1.35 2014/07/16 20:02:17 okan Exp $ # $FreeBSD: Makefile.inc,v 1.6 1999/08/28 00:03:02 peter Exp $ # POSIX thread man files @@ -121,4 +121,3 @@ MLINKS+=flockfile.3 funlockfile.3 \ sem_open.3 sem_unlink.3 \ sem_wait.3 sem_timedwait.3 \ sem_wait.3 sem_trywait.3 - diff --git a/lib/librthread/Makefile b/lib/librthread/Makefile index a07cf92b71b..1af81daa7a3 100644 --- a/lib/librthread/Makefile +++ b/lib/librthread/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.38 2014/07/10 13:46:30 guenther Exp $ +# $OpenBSD: Makefile,v 1.39 2014/07/16 20:02:17 okan Exp $ LIB=pthread LIBCSRCDIR= ${.CURDIR}/../libc @@ -43,4 +43,3 @@ SRCDIR= ${.CURDIR}/../libpthread .include "${SRCDIR}/include/Makefile.inc" .include "${SRCDIR}/man/Makefile.inc" .include - -- 2.20.1