From 938d1370478b2252a5daea843aab02ee8900ed58 Mon Sep 17 00:00:00 2001
From: marius <marius@FreeBSD.org>
Date: Thu, 23 Sep 2010 14:06:15 +0000
Subject: [PATCH] Try to adhere to style.Makefile(5).

MFC after:	3 days
---
 libexec/tftpd/Makefile |  8 +++-----
 usr.bin/tftp/Makefile  | 14 ++++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/libexec/tftpd/Makefile b/libexec/tftpd/Makefile
index 656f5bda9561..48c5e0dc08d7 100644
--- a/libexec/tftpd/Makefile
+++ b/libexec/tftpd/Makefile
@@ -2,13 +2,11 @@
 # $FreeBSD$
 
 PROG=	tftpd
-SRCS=	tftpd.c tftp-io.c tftp-utils.c tftp-file.c tftp-transfer.c tftp-options.c
+MAN=	tftpd.8
+SRCS=	tftp-file.c tftp-io.c tftp-options.c tftp-transfer.c tftp-utils.c
+SRCS+=	tftpd.c
 WARNS=	3
 WFORMAT=0
-MAN=	tftpd.8
-CFLAGS+=-I${.CURDIR}/../../usr.bin/tftp -I${.CURDIR}/../../libexec/tftpd
-.PATH:	${.CURDIR}/../../usr.bin/tftp
-COPTFLAGS = -O
 LDFLAGS= -lwrap
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/tftp/Makefile b/usr.bin/tftp/Makefile
index 129746978eb2..12b8216c0450 100644
--- a/usr.bin/tftp/Makefile
+++ b/usr.bin/tftp/Makefile
@@ -1,12 +1,14 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 # $FreeBSD$
 
-WARNS=	3
-PROG=	tftp
-SRCS=	main.c tftp.c tftp-utils.c tftp-io.c tftp-file.c tftp-transfer.c tftp-options.c
-DPADD=	${LIBEDIT} ${LIBTERMCAP}
-LDADD=	-ledit -ltermcap
-CFLAGS+=-I${.CURDIR}/../../libexec/tftpd -I${.CURDIR}/../../usr.bin/tftp
 .PATH:  ${.CURDIR}/../../libexec/tftpd
 
+PROG=	tftp
+SRCS=	main.c tftp-file.c tftp-io.c tftp-options.c tftp-transfer.c
+SRCS+=	tftp-utils.c tftp.c
+WARNS=	3
+CFLAGS+=-I${.CURDIR}/../../libexec/tftpd
+DPADD=	${LIBEDIT} ${LIBTERMCAP}
+LDADD=	-ledit -ltermcap
+
 .include <bsd.prog.mk>