3 files changed, 40 insertions, 14 deletions

diff --git a/lib/fontconfig/Makefile b/lib/fontconfig/Makefile
index c05c1d61b..c43d96f64 100644
--- a/lib/fontconfig/Makefile
+++ b/lib/fontconfig/Makefile
@@ -1,4 +1,10 @@
-#	$OpenBSD: Makefile,v 1.1 2013/03/09 14:34:40 matthieu Exp $
+#	$OpenBSD: Makefile,v 1.2 2013/03/16 14:28:35 matthieu Exp $
+
+FONTCONFIG =	${.CURDIR}/../../dist/fontconfig
+FC_DEFAULT_FONTS = ${X11BASE}/lib/X11/fonts
+FC_FONTPATH = "<dir>/usr/local/lib/X11/fonts</dir>"
+CONFIGDIR = conf.d
+FC_CACHEDIR = /var/cache/fontconfig
 
 SUBDIR =	fc-case fc-lang fc-glyphname src \
 		fc-cache fc-cat fc-list fc-match fc-pattern fc-query \
@@ -10,5 +16,21 @@ SUBDIR += fontconfig
 
 obj:	_xenocara_obj
 
+all:	fonts.conf _SUBDIRUSE
+
+install: _SUBDIRUSE
+	${INSTALL_DATA} fonts.conf ${DESTDIR}/etc/fonts
+	${INSTALL_DATA} ${FONTCONFIG}/fonts.dtd ${DESTDIR}/etc/fonts
+
+fonts.conf:	${FONTCONFIG}/fonts.conf.in
+	@sed -e s,@FC_DEFAULT_FONTS@,${FC_DEFAULT_FONTS}, \
+		-e s,@FC_FONTPATH@,${FC_FONTPATH}, \
+		-e s,@CONFIGDIR@,${CONFIGDIR}, \
+		-e s,@FC_CACHEDIR@,${FC_CACHEDIR}, \
+		< ${FONTCONFIG}/fonts.conf.in > $@
+
+clean: _SUBDIRUSE
+	rm -f fonts.conf 
+
 .include <bsd.subdir.mk>
 .include <bsd.xorg.mk>
diff --git a/lib/fontconfig/conf.d/Makefile b/lib/fontconfig/conf.d/Makefile
index e3facf0ac..b4e87b0da 100644
--- a/lib/fontconfig/conf.d/Makefile
+++ b/lib/fontconfig/conf.d/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.1 2013/03/09 14:34:41 matthieu Exp $
+#	$OpenBSD: Makefile,v 1.6 2013/03/16 15:09:38 matthieu Exp $
 
 FONTCONFIG =	${.CURDIR}/../../../dist/fontconfig
 CONFIGDIR =	/etc/fonts/conf.d
@@ -41,8 +41,10 @@ AVAIL_FILES =				\
 	11-lcdfilter-light.conf		\
 	20-unhint-small-vera.conf	\
 	25-unhint-nonlatin.conf		\
+	30-lucida-aliases.conf		\
 	30-urw-aliases.conf		\
 	30-metric-aliases.conf		\
+	31-nonmst.conf			\
 	40-nonlatin.conf		\
 	45-latin.conf			\
 	49-sansserif.conf		\
@@ -58,19 +60,20 @@ AVAIL_FILES =				\
 	80-delicious.conf		\
 	90-synthetic.conf
 
-all:
+all cleandir:
 
 install:
-	@for i in $(AVAIL_FILES); do				\
-	   echo ${INSTALL_DATA} $$i $(DESTDIR)${CONFAVAILDIR}; \
-	   ${INSTALL_DATA} ${FONTCONFIG}/conf.d/$$i $(DESTDIR)${CONFAVAILDIR};	\
+	@for i in ${AVAIL_FILES}; do				\
+	   echo ${INSTALL_DATA} $$i ${DESTDIR}${CONFAVAILDIR}; \
+	   ${INSTALL_DATA} ${FONTCONFIG}/conf.d/$$i ${DESTDIR}${CONFAVAILDIR};	\
 	done
-	@(echo cd $(DESTDIR)$(CONFIGDIR);			\
-	  cd $(DESTDIR)$(CONFIGDIR);				\
-	  for i in $(CONF_LINKS); do				\
-	    echo rm $$i";" ln -s $(CONFAVAILDIR)/$$i .;	\
+	${INSTALL_DATA} ${FONTCONFIG}/conf.d/README ${DESTDIR}/${CONFIGDIR}
+	@(echo cd ${DESTDIR}${CONFIGDIR};			\
+	  cd ${DESTDIR}${CONFIGDIR};				\
+	  for i in ${CONF_LINKS}; do				\
+	    echo rm $$i";" ln -s ${CONFAVAILDIR}/$$i .;	\
 	    rm -f $$i;						\
-	    ln -s $(CONFAVAILDIR)/$$i .;			\
+	    ln -s ${CONFAVAILDIR}/$$i .;			\
 	  done)
 
 NOOBJ=
diff --git a/lib/fontconfig/doc/Makefile b/lib/fontconfig/doc/Makefile
index 321109d6b..ab780912f 100644
--- a/lib/fontconfig/doc/Makefile
+++ b/lib/fontconfig/doc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.1 2013/03/09 14:34:42 matthieu Exp $
+#	$OpenBSD: Makefile,v 1.3 2013/03/16 14:57:18 matthieu Exp $
 
 FONTCONFIG =	${.CURDIR}/../../../dist/fontconfig
 
@@ -186,7 +186,8 @@ MAN = FcAtomicCreate.3 \
 	FcValueDestroy.3 \
 	FcValueEqual.3 \
 	FcValuePrint.3 \
-	FcValueSave.3
+	FcValueSave.3 \
+	fonts-conf.5
 
 PDF_FILES = fontconfig-devel.pdf fontconfig-user.pdf
 TXT_FILES = fontconfig-devel.txt fontconfig-user.txt
@@ -386,7 +387,7 @@ afterinstall:
 	@for f in ${PDF_FILES} ${TXT_FILES} ${HTML_USER_FILES}; do \
 		echo "installing $$f" ; \
 		${INSTALL_DATA} ${FONTCONFIG}/doc/$$f \
-		  ${DESDIR}${X11BASE}/share/doc/fontconfig ; \
+		  ${DESTDIR}${X11BASE}/share/doc/fontconfig ; \
 	done
 	@for f in ${HTML_DEVEL_FILES}; do \
 		echo "installing $$f" ; \