From d9fc70eb7c46a30e9e750db8c921e215c311d137 Mon Sep 17 00:00:00 2001
From: matthieu <matthieu@openbsd.org>
Date: Mon, 10 Oct 2016 13:34:43 +0000
Subject: [PATCH] Remove the global 'make includes' step from 'make build'.
 This is no longer needed and gets in the way of tightening permission used
 during build. ok and suggestions natano@

---
 Makefile              |  3 +--
 app/fvwm/Makefile     |  4 +---
 lib/freetype/Makefile | 10 +++++-----
 lib/libepoxy/Makefile |  4 +++-
 share/mk/bsd.xorg.mk  |  6 +-----
 5 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/Makefile b/Makefile
index 59d2520a4..363ed766a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.73 2016/10/02 09:25:23 tb Exp $
+# $OpenBSD: Makefile,v 1.74 2016/10/10 13:34:43 matthieu Exp $
 .include <bsd.own.mk>
 .include <bsd.xconf.mk>
 
@@ -43,7 +43,6 @@ bootstrap-root:
 
 beforeinstall beforebuild:
 	cd util/macros && exec ${MAKE} -f Makefile.bsd-wrapper install
-	exec ${MAKE} includes
 
 afterinstall afterbuild:
 	exec ${MAKE} fix-appd
diff --git a/app/fvwm/Makefile b/app/fvwm/Makefile
index ba3b2b547..2b0ee160a 100644
--- a/app/fvwm/Makefile
+++ b/app/fvwm/Makefile
@@ -1,9 +1,7 @@
-# $OpenBSD: Makefile,v 1.3 2015/07/19 10:43:08 matthieu Exp $
+# $OpenBSD: Makefile,v 1.4 2016/10/10 13:34:43 matthieu Exp $
 
 SUBDIR= libs fvwm sample.fvwmrc utils icons modules
 
-includes:
-
 update:
 
 .include <bsd.subdir.mk>
diff --git a/lib/freetype/Makefile b/lib/freetype/Makefile
index 8e3b5a3c5..65aae4090 100644
--- a/lib/freetype/Makefile
+++ b/lib/freetype/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.44 2016/08/09 07:16:08 dcoppa Exp $
+#	$OpenBSD: Makefile,v 1.45 2016/10/10 13:34:43 matthieu Exp $
 
 FREETYPESRC=	${.CURDIR}/src
 
@@ -29,7 +29,10 @@ CLEANFILES+=	freetype-config freetype2.pc
 
 obj:	_xenocara_obj
 
-beforedepend:	freetype-config freetype2.pc includes-root
+beforedepend:	freetype-config freetype2.pc
+
+beforeinstall:
+	cd ${.CURDIR} ; exec ${MAKE} ${MAKE_FLAGS} includes
 
 includes: _SUBDIRUSE
 	@cmp -s ${DESTDIR}${X11BASE}/include/freetype2/ft2build.h \
@@ -41,9 +44,6 @@ includes: _SUBDIRUSE
 	${INSTALL_DATA} ${.CURDIR}/builds/unix/ftconfig.h \
 	  ${DESTDIR}${X11BASE}/include/freetype2/freetype/config/ftconfig.h
 
-includes-root:
-	cd ${.CURDIR} && exec ${SUDO} ${MAKE} includes
-
 install-pc: freetype2.pc
 	${INSTALL_DATA} freetype2.pc ${DESTDIR}${LIBDIR}/pkgconfig
 
diff --git a/lib/libepoxy/Makefile b/lib/libepoxy/Makefile
index 98900d7a6..4f36d9e27 100644
--- a/lib/libepoxy/Makefile
+++ b/lib/libepoxy/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2016/10/08 19:09:34 matthieu Exp $
+# $OpenBSD: Makefile,v 1.6 2016/10/10 13:34:43 matthieu Exp $
 .include <bsd.xconf.mk>
 
 EPOXY=	${.CURDIR}/../../dist/libepoxy
@@ -50,6 +50,8 @@ includes: _SUBDIRUSE
 		eval "$$j"; \
 	done
 
+beforeinstall: includes 
+
 NOPROFILE=
 
 PKGCONFIG=		epoxy.pc
diff --git a/share/mk/bsd.xorg.mk b/share/mk/bsd.xorg.mk
index b971fe670..2a7ef0317 100644
--- a/share/mk/bsd.xorg.mk
+++ b/share/mk/bsd.xorg.mk
@@ -1,4 +1,4 @@
-# $OpenBSD: bsd.xorg.mk,v 1.53 2016/03/28 11:59:06 matthieu Exp $ -*- makefile  -*-
+# $OpenBSD: bsd.xorg.mk,v 1.54 2016/10/10 13:34:43 matthieu Exp $ -*- makefile  -*-
 #
 # Copyright © 2006,2012 Matthieu Herrb
 #
@@ -129,10 +129,6 @@ realinstall: install-headers-subdirs
 .MAIN: all
 .endif
 
-.if !target(includes)
-includes: _SUBDIRUSE
-.endif
-
 .if defined(SHARED_LIBS)
 _lt_libs=
 .for _n _v in ${SHARED_LIBS}