let X directories build even if you forget depend.

- use BUILDFIRST
- have fontconfig use normal 'all' targets to make sure its files are built
- explicitly document the fontconfig lib order

okay matthieu@

6 files changed, 19 insertions, 7 deletions

diff --git a/lib/fontconfig/Makefile b/lib/fontconfig/Makefile
index 43aee3dfe..74739b330 100644
--- a/lib/fontconfig/Makefile
+++ b/lib/fontconfig/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.4 2015/04/05 16:05:34 matthieu Exp $
+#	$OpenBSD: Makefile,v 1.5 2017/06/18 21:09:07 espie Exp $
 
 FONTCONFIG =	${.CURDIR}/../../dist/fontconfig
 FC_DEFAULT_FONTS = ${X11BASE}/lib/X11/fonts
@@ -6,7 +6,14 @@ FC_FONTPATH = "<dir>/usr/local/share/fonts</dir>"
 CONFIGDIR = conf.d
 FC_CACHEDIR = /var/cache/fontconfig
 
-SUBDIR =	fc-case fc-lang fc-glyphname src \
+# Respect order:
+SUBDIR =	fc-case 
+
+# fc-lang depends on fc-case
+SUBDIR += 	fc-lang fc-glyphname 
+
+# src requires fc-case fc-lang and fc-glyphname
+SUBDIR +=	src \
 		fc-cache fc-cat fc-list fc-match fc-pattern fc-query \
 		fc-scan fc-validate conf.d pc doc
 
diff --git a/lib/fontconfig/fc-case/Makefile b/lib/fontconfig/fc-case/Makefile
index 0582887d5..3fc366dc4 100644
--- a/lib/fontconfig/fc-case/Makefile
+++ b/lib/fontconfig/fc-case/Makefile
@@ -1,10 +1,11 @@
-#	$OpenBSD: Makefile,v 1.1 2013/03/09 14:34:44 matthieu Exp $
+#	$OpenBSD: Makefile,v 1.2 2017/06/18 21:09:07 espie Exp $
 
 FONTCONFIG=	${.CURDIR}/../../../dist/fontconfig
 
 PROG=	fc-case
 
 afterdepend: fccase.h
+all: fccase.h
 
 fccase.h: ${PROG}
 	./${PROG} ${FONTCONFIG}/fc-case/CaseFolding.txt \
diff --git a/lib/fontconfig/fc-glyphname/Makefile b/lib/fontconfig/fc-glyphname/Makefile
index 6c429d7c0..18210c092 100644
--- a/lib/fontconfig/fc-glyphname/Makefile
+++ b/lib/fontconfig/fc-glyphname/Makefile
@@ -1,10 +1,11 @@
-#	$OpenBSD: Makefile,v 1.1 2013/03/09 14:34:44 matthieu Exp $
+#	$OpenBSD: Makefile,v 1.2 2017/06/18 21:09:07 espie Exp $
 
 FONTCONFIG=	${.CURDIR}/../../../dist/fontconfig
 
 PROG=	fc-glyphname
 
 afterdepend: fcglyphname.h
+all: fcglyphname.h
 
 fcglyphname.h: ${PROG}
 	./${PROG} ${FONTCONFIG}/fc-glyphname/zapfdingbats.txt \
diff --git a/lib/fontconfig/fc-lang/Makefile b/lib/fontconfig/fc-lang/Makefile
index 31ea2de08..ec96d891a 100644
--- a/lib/fontconfig/fc-lang/Makefile
+++ b/lib/fontconfig/fc-lang/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.1 2013/03/09 14:34:44 matthieu Exp $
+#	$OpenBSD: Makefile,v 1.2 2017/06/18 21:09:07 espie Exp $
 
 FONTCONFIG=	${.CURDIR}/../../../dist/fontconfig
 
@@ -7,6 +7,7 @@ PROG=	fc-lang
 CFLAGS+=	-I../fc-case
 
 afterdepend: fclang.h
+all: fclang.h
 
 fclang.h: ${PROG}
 	./${PROG} -d ${FONTCONFIG}/fc-lang ${ORTH} \
diff --git a/lib/fontconfig/src/Makefile b/lib/fontconfig/src/Makefile
index ba0e7c07c..faaca164b 100644
--- a/lib/fontconfig/src/Makefile
+++ b/lib/fontconfig/src/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.8 2016/08/09 18:57:45 matthieu Exp $
+#	$OpenBSD: Makefile,v 1.9 2017/06/18 21:09:07 espie Exp $
 
 .include <bsd.xconf.mk>
 
@@ -68,6 +68,7 @@ fcobjshash.h: fcobjshash.gperf
 .endif
 
 beforedepend: fcalias.h fcftalias.h fcobjshash.h lib${LIB}.la
+BUILDFIRST = fcalias.h fcftalias.h fcobjshash.h lib${LIB}.la
 
 lib${LIB}.la: ${.CURDIR}/lib${LIB}.la.in
 	sed -e 's#@libdir@#${LIBDIR}#g' \
diff --git a/lib/freetype/Makefile b/lib/freetype/Makefile
index a4b297dae..122025b8e 100644
--- a/lib/freetype/Makefile
+++ b/lib/freetype/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.47 2017/01/13 11:19:58 dcoppa Exp $
+#	$OpenBSD: Makefile,v 1.48 2017/06/18 21:09:07 espie Exp $
 
 FREETYPESRC=	${.CURDIR}/src
 
@@ -30,6 +30,7 @@ CLEANFILES+=	freetype-config freetype2.pc
 obj:	_xenocara_obj
 
 beforedepend:	freetype-config freetype2.pc
+BUILDFIRST =	freetype-config freetype2.pc
 
 beforeinstall:
 	cd ${.CURDIR} ; exec ${MAKE} ${MAKE_FLAGS} includes