* xorg-font*:

new font stuff git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@6736 33e552b5-05e3-0310-8538-816dae2090ed
author: Marc Kleine-Budde <mkl@pengutronix.de> 2007-01-05 14:23:42 +0000
committer: Marc Kleine-Budde <mkl@pengutronix.de> 2007-01-05 14:23:42 +0000
commit: 5dfe4e471fbd2bd1c55f4fb69ade42994f3fdd3c (patch)
tree: 4b6313dc79e91a12cb31f06321d47bcfff0e33d9
parent: e5201bdfed55667611e3164099849cff20683c8d (diff)
download: ptxdist-5dfe4e471fbd2bd1c55f4fb69ade42994f3fdd3c.tar.gz
ptxdist-5dfe4e471fbd2bd1c55f4fb69ade42994f3fdd3c.tar.xz
85 files changed, 977 insertions, 966 deletions
diff --git a/rules/xorg-font-100dpi-trans.in b/rules/xorg-font-100dpi-trans.in
index 56720f632..6a34b50f3 100644
--- a/rules/xorg-font-100dpi-trans.in
+++ b/rules/xorg-font-100dpi-trans.in
@@ -1,41 +1,30 @@
-# evil hack to break dependencies, so that we can put the transcode
-# menu under menuconfig
-comment "invisible line"
-	depends on BROKEN
 menu "xorg 100 dpi fonts(transcoded)"
-	depends on XORG_FONT_100DPI
 
 config XORG_FONT_ADOBE_100DPI_TRANS
 	bool
-	depends on XORG_FONT_100DPI
+	depends on XORG_FONT_ADOBE_100DPI
 	prompt "Adobe 100dpi transcoded"
 	help
 	  xfonts-100dpi provides a set of bitmapped fonts
 	  at 100 dots per inch. In most cases it is desirable
 	  to have the X font server (xfs) and/or an X server
 	  installed to make the fonts available to X clients.
-	  This package contains only fonts in the ISO 10646-1,
-	  ISO 8859-1 and ISO 8859-15 encodings
 	  This package contains fonts in several ISO 8859
 	  encodings: -2, -3, -4, -9, -10, -13 and -14.
 
 config XORG_FONT_ADOBE_UTOPIA_100DPI_TRANS
 	bool
-	depends on XORG_FONT_100DPI
-	select HOST_XORG_APP_BDFTOPCF
+	depends on XORG_FONT_ADOBE_UTOPIA_100DPI
 	prompt "Adobe Utopia 100dpi transcoded"
 	help
 	  adobe utopia fonts, containing Utopia Regular,
 	  Utopia Italic, Utopia Bold and Utopia Bold Italic.
-	  This package contains only fonts in the ISO 10646-1,
-	  ISO 8859-1 and ISO 8859-15 encodings.
 	  This package contains fonts in several ISO 8859
 	  encodings: -2, -3, -4, -9, -10, -13 and -14.
 
 config XORG_FONT_BH_100DPI_TRANS
 	bool
-	depends on XORG_100DPI
-	select HOST_XORG_APP_BDFTOPCF
+	depends on XORG_FONT_BH_100DPI
 	prompt "BH 100dpi transcoded"
 	help
 	  This package contains fonts in several ISO 8859
@@ -43,19 +32,10 @@ config XORG_FONT_BH_100DPI_TRANS
 
 config XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_TRANS
 	bool
-	depends on XORG_FONT_100DPI
-	select HOST_XORG_APP_BDFTOPCF
+	depends on XORG_FONT_BH_LUCIDATYPEWRITER_100DPI
 	prompt "BH Lucida Typewriter 100dpi transcoded"
 	help
 	  This package contains fonts in several ISO 8859
 	  encodings: -2, -3, -4, -9, -10, -13 and -14.
 
-config XORG_FONT_BITSTREAM_100DPI_TRANS
-	bool
-	depends on XORG_FONT_100DPI
-	prompt "Bitstream 100dpi transcoded"
-	help
-	  This package contains fonts in several ISO 8859
-	  encodings: -2, -3, -4, -9, -10, -13 and -14.
-
 endmenu
diff --git a/rules/xorg-font-100dpi.in b/rules/xorg-font-100dpi.in
index f25a710b9..75a44e8fb 100644
--- a/rules/xorg-font-100dpi.in
+++ b/rules/xorg-font-100dpi.in
@@ -1,5 +1,4 @@
-menuconfig XORG_FONT_100DPI
-        bool "xorg 100 dpi fonts            "
+menu "xorg 100 dpi fonts            "
 
 source "rules/xorg-font-adobe-100dpi.in"
 source "rules/xorg-font-adobe-utopia-100dpi.in"
@@ -7,3 +6,4 @@ source "rules/xorg-font-bh-100dpi.in"
 source "rules/xorg-font-bh-lucidatypewriter-100dpi.in"
 source "rules/xorg-font-bitstream-100dpi.in"
 
+endmenu
diff --git a/rules/xorg-font-75dpi-trans.in b/rules/xorg-font-75dpi-trans.in
index bfeb8bbea..50aa39cf9 100644
--- a/rules/xorg-font-75dpi-trans.in
+++ b/rules/xorg-font-75dpi-trans.in
@@ -1,40 +1,30 @@
-# evil hack to break dependencies, so that we can put the transcode
-# menu under menuconfig
-comment "invisible line"
-	depends on BROKEN
 menu "xorg 75 dpi fonts (transcoded)"
-	depends on XORG_FONT_75DPI
 
 config XORG_FONT_ADOBE_75DPI_TRANS
 	bool
-	depends on XORG_FONT_75DPI
+	depends on XORG_FONT_ADOBE_75DPI
 	prompt "Adobe 75dpi transcoded"
 	help
 	  xfonts-75dpi provides a set of bitmapped fonts
 	  at 75 dots per inch. In most cases it is desirable
 	  to have the X font server (xfs) and/or an X server
 	  installed to make the fonts available to X clients.
-	  This package contains only fonts in the ISO 10646-1,
-	  ISO 8859-1 and ISO 8859-15 encodings
 	  This package contains fonts in several ISO 8859
 	  encodings: -2, -3, -4, -9, -10, -13 and -14.
 
 config XORG_FONT_ADOBE_UTOPIA_75DPI_TRANS
 	bool
-	depends on XORG_FONT_75DPI
-	select HOST_XORG_APP_BDFTOPCF
+	depends on XORG_FONT_ADOBE_UTOPIA_75DPI
 	prompt "Adobe Utopia 75dpi transcoded"
 	help
 	  adobe utopia fonts, containing Utopia Regular,
 	  Utopia Italic, Utopia Bold and Utopia Bold Italic.
-	  This package contains only fonts in the ISO 10646-1,
-	  ISO 8859-1 and ISO 8859-15 encodings.
 	  This package contains fonts in several ISO 8859
 	  encodings: -2, -3, -4, -9, -10, -13 and -14.
+
 config XORG_FONT_BH_75DPI_TRANS
 	bool
-	depends on XORG_75DPI
-	select HOST_XORG_APP_BDFTOPCF
+	depends on XORG_FONT_BH_75DPI
 	prompt "BH 75dpi transcoded"
 	help
 	  This package contains fonts in several ISO 8859
@@ -42,19 +32,10 @@ config XORG_FONT_BH_75DPI_TRANS
 
 config XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_TRANS
 	bool
-	depends on XORG_FONT_75DPI
-	select HOST_XORG_APP_BDFTOPCF
+	depends on XORG_FONT_BH_LUCIDATYPEWRITER_75DPI
 	prompt "BH Lucida Typewriter 75dpi transcoded"
 	help
 	  This package contains fonts in several ISO 8859
 	  encodings: -2, -3, -4, -9, -10, -13 and -14.
 
-config XORG_FONT_BITSTREAM_75DPI_TRANS
-	bool
-	depends on XORG_FONT_75DPI
-	prompt "Bitstream 75dpi transcoded"
-	help
-	  This package contains fonts in several ISO 8859
-	  encodings: -2, -3, -4, -9, -10, -13 and -14.
-
 endmenu
diff --git a/rules/xorg-font-75dpi.in b/rules/xorg-font-75dpi.in
index e940c9284..ae1c04bad 100644
--- a/rules/xorg-font-75dpi.in
+++ b/rules/xorg-font-75dpi.in
@@ -1,8 +1,10 @@
-menuconfig XORG_FONT_75DPI
-        bool "xorg 75 dpi fonts             "
+menu "xorg 75 dpi fonts             "
 
 source "rules/xorg-font-adobe-75dpi.in"
 source "rules/xorg-font-adobe-utopia-75dpi.in"
 source "rules/xorg-font-bh-75dpi.in"
 source "rules/xorg-font-bh-lucidatypewriter-75dpi.in"
 source "rules/xorg-font-bitstream-75dpi.in"
+
+endmenu
+
diff --git a/rules/xorg-font-adobe-100dpi.in b/rules/xorg-font-adobe-100dpi.in
index 5dd6c666f..6e4cc45a4 100644
--- a/rules/xorg-font-adobe-100dpi.in
+++ b/rules/xorg-font-adobe-100dpi.in
@@ -1,11 +1,6 @@
 config XORG_FONT_ADOBE_100DPI
 	bool
-	depends on XORG_FONT_100DPI
-	select XORG_FONT_UTIL
-	select HOST_XORG_APP_MKFONTDIR
-	select HOST_XORG_APP_MKFONTSCALE
-	select HOST_XORG_APP_BDFTOPCF
-	select HOST_XORG_FONT_UTIL
+	select XORG_FONTS
 	default y
 	prompt "Adobe 100dpi"
 	help
@@ -13,6 +8,6 @@ config XORG_FONT_ADOBE_100DPI
 	  100 dots per inch. In most cases it is desirable 
 	  to have the X font server (xfs) and/or an X server 
 	  installed to make the fonts available to X clients.
-	  This package contains only fonts in the ISO 10646-1 
-	  ,ISO 8859-1 and ISO 8859-15 encodings
+	  This package contains only fonts in the ISO 10646-1,
+	  ISO 8859-1 and ISO 8859-15 encodings
 
diff --git a/rules/xorg-font-adobe-100dpi.make b/rules/xorg-font-adobe-100dpi.make
index f2f8d4086..ce99aa6b9 100644
--- a/rules/xorg-font-adobe-100dpi.make
+++ b/rules/xorg-font-adobe-100dpi.make
@@ -24,6 +24,9 @@ XORG_FONT_ADOBE_100DPI_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XOR
 XORG_FONT_ADOBE_100DPI_SOURCE	:= $(SRCDIR)/$(XORG_FONT_ADOBE_100DPI).$(XORG_FONT_ADOBE_100DPI_SUFFIX)
 XORG_FONT_ADOBE_100DPI_DIR	:= $(BUILDDIR)/$(XORG_FONT_ADOBE_100DPI)
 
+ifdef PTXCONF_XORG_FONT_ADOBE_100DPI
+$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-adobe-100dpi.targetinstall
+endif
 
 # ----------------------------------------------------------------------------
 # Get
@@ -64,7 +67,9 @@ XORG_FONT_ADOBE_100DPI_ENV 	:=  $(CROSS_ENV)
 #
 # autoconf
 #
-XORG_FONT_ADOBE_100DPI_AUTOCONF := $(CROSS_AUTOCONF_USR)
+XORG_FONT_ADOBE_100DPI_AUTOCONF := \
+	$(CROSS_AUTOCONF_USR) \
+	--with-fontdir=$(XORG_FONTDIR)/100dpi
 
 $(STATEDIR)/xorg-font-adobe-100dpi.prepare: $(xorg-font-adobe-100dpi_prepare_deps_default)
 	@$(call targetinfo, $@)
@@ -82,7 +87,7 @@ xorg-font-adobe-100dpi_compile: $(STATEDIR)/xorg-font-adobe-100dpi.compile
 
 $(STATEDIR)/xorg-font-adobe-100dpi.compile: $(xorg-font-adobe-100dpi_compile_deps_default)
 	@$(call targetinfo, $@)
-	cd $(XORG_FONT_ADOBE_100DPI_DIR) && $(XORG_FONT_ADOBE_100DPI_PATH) make
+	cd $(XORG_FONT_ADOBE_100DPI_DIR) && $(XORG_FONT_ADOBE_100DPI_PATH) $(MAKE)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
@@ -93,7 +98,6 @@ xorg-font-adobe-100dpi_install: $(STATEDIR)/xorg-font-adobe-100dpi.install
 
 $(STATEDIR)/xorg-font-adobe-100dpi.install: $(xorg-font-adobe-100dpi_install_deps_default)
 	@$(call targetinfo, $@)
-	@$(call install, XORG_FONT_ADOBE_100DPI)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
@@ -105,38 +109,31 @@ xorg-font-adobe-100dpi_targetinstall: $(STATEDIR)/xorg-font-adobe-100dpi.targeti
 $(STATEDIR)/xorg-font-adobe-100dpi.targetinstall: $(xorg-font-adobe-100dpi_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init, xorg-font-adobe-100dpi)
-	@$(call install_fixup, xorg-font-adobe-100dpi,PACKAGE,xorg-font-adobe-100dpi)
-	@$(call install_fixup, xorg-font-adobe-100dpi,PRIORITY,optional)
-	@$(call install_fixup, xorg-font-adobe-100dpi,VERSION,$(XORG_FONT_ADOBE_100DPI_VERSION))
-	@$(call install_fixup, xorg-font-adobe-100dpi,SECTION,base)
-	@$(call install_fixup, xorg-font-adobe-100dpi,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup, xorg-font-adobe-100dpi,DEPENDS,)
-	@$(call install_fixup, xorg-font-adobe-100dpi,DESCRIPTION,missing)
-
-	@cd $(XORG_FONT_ADOBE_100DPI_DIR); \
-	for file in `find . -name "*.pcf.gz" -a \! -name "*ISO8859*"`; do	\
-		if [ -e $$file ]; then \
-			$(call install_copy, xorg-font-adobe-100dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/100dpi/$$file, n); \
-		fi; \
-	done;
-
-	@cd $(XORG_FONT_ADOBE_100DPI_DIR); \
-	for file in *{ISO8859-15,ISO8859-1}.pcf.gz; do \
-		if [ -e $$file ]; then \
-			$(call install_copy, xorg-font-adobe-100dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/100dpi/$$file, n); \
-		fi; \
-	done;
+	@mkdir -p $(XORG_FONTS_DIR_INSTALL)/100dpi
+
+	@find $(XORG_FONT_ADOBE_100DPI_DIR) \
+		-name "*.pcf.gz" -a \! -name "*ISO8859*" \
+		-o -name "*ISO8859-1.pcf.gz" \
+		-o -name "*ISO8859-15.pcf.gz" \
+		| \
+		while read file; do \
+		install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/100dpi; \
+	done
 
 ifdef PTXCONF_XORG_FONT_ADOBE_100DPI_TRANS
-	@cd $(XORG_FONT_ADOBE_100DPI_DIR); \
-	for file in *{ISO8859-2,ISO8859-3,ISO8859-4,ISO8859-9,ISO8859-10,ISO8859-13,ISO8859-14}.pcf.gz; do \
-		if [ -e $$file ]; then \
-			$(call install_copy, xorg-font-adobe-100dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/100dpi/$$file, n); \
-		fi; \
-	done;
+	@find $(XORG_FONT_ADOBE_100DPI_DIR) \
+		-name "*ISO8859-2.pcf.gz" \
+		-o -name "*ISO8859-3.pcf.gz" \
+		-o -name "*ISO8859-4.pcf.gz" \
+		-o -name "*ISO8859-9.pcf.gz" \
+		-o -name "*ISO8859-10.pcf.gz" \
+		-o -name "*ISO8859-13.pcf.gz" \
+		-o -name "*ISO8859-14.pcf.gz" \
+		| \
+		while read file; do \
+		install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/100dpi; \
+	done
 endif
-	@$(call install_finish, xorg-font-adobe-100dpi)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-font-adobe-75dpi.in b/rules/xorg-font-adobe-75dpi.in
index 82ad3e3e5..4fad4db4b 100644
--- a/rules/xorg-font-adobe-75dpi.in
+++ b/rules/xorg-font-adobe-75dpi.in
@@ -1,8 +1,7 @@
 config XORG_FONT_ADOBE_75DPI
 	bool
-	depends on XORG_FONT_75DPI
-	select HOST_XORG_APP_BDFTOPCF
 	default y
+	select XORG_FONTS
 	prompt "Adobe 75dpi"
 	help
 	  xfonts-75dpi provides a set of bitmapped fonts
diff --git a/rules/xorg-font-adobe-75dpi.make b/rules/xorg-font-adobe-75dpi.make
index 155036309..e9e8b801b 100644
--- a/rules/xorg-font-adobe-75dpi.make
+++ b/rules/xorg-font-adobe-75dpi.make
@@ -20,10 +20,13 @@ PACKAGES-$(PTXCONF_XORG_FONT_ADOBE_75DPI) += xorg-font-adobe-75dpi
 XORG_FONT_ADOBE_75DPI_VERSION	:= 1.0.0
 XORG_FONT_ADOBE_75DPI		:= font-adobe-75dpi-X11R7.0-$(XORG_FONT_ADOBE_75DPI_VERSION)
 XORG_FONT_ADOBE_75DPI_SUFFIX	:= tar.bz2
-XORG_FONT_ADOBE_75DPI_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font//$(XORG_FONT_ADOBE_75DPI).$(XORG_FONT_ADOBE_75DPI_SUFFIX)
+XORG_FONT_ADOBE_75DPI_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_ADOBE_75DPI).$(XORG_FONT_ADOBE_75DPI_SUFFIX)
 XORG_FONT_ADOBE_75DPI_SOURCE	:= $(SRCDIR)/$(XORG_FONT_ADOBE_75DPI).$(XORG_FONT_ADOBE_75DPI_SUFFIX)
 XORG_FONT_ADOBE_75DPI_DIR	:= $(BUILDDIR)/$(XORG_FONT_ADOBE_75DPI)
 
+ifdef PTXCONF_XORG_FONT_ADOBE_75DPI
+$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-adobe-75dpi.targetinstall
+endif
 
 # ----------------------------------------------------------------------------
 # Get
@@ -64,7 +67,9 @@ XORG_FONT_ADOBE_75DPI_ENV 	:=  $(CROSS_ENV)
 #
 # autoconf
 #
-XORG_FONT_ADOBE_75DPI_AUTOCONF := $(CROSS_AUTOCONF_USR)
+XORG_FONT_ADOBE_75DPI_AUTOCONF := \
+	$(CROSS_AUTOCONF_USR) \
+	--with-fontdir=$(XORG_FONTDIR)/75dpi
 
 $(STATEDIR)/xorg-font-adobe-75dpi.prepare: $(xorg-font-adobe-75dpi_prepare_deps_default)
 	@$(call targetinfo, $@)
@@ -82,7 +87,7 @@ xorg-font-adobe-75dpi_compile: $(STATEDIR)/xorg-font-adobe-75dpi.compile
 
 $(STATEDIR)/xorg-font-adobe-75dpi.compile: $(xorg-font-adobe-75dpi_compile_deps_default)
 	@$(call targetinfo, $@)
-	cd $(XORG_FONT_ADOBE_75DPI_DIR) && $(XORG_FONT_ADOBE_75DPI_PATH) make
+	cd $(XORG_FONT_ADOBE_75DPI_DIR) && $(XORG_FONT_ADOBE_75DPI_PATH) $(MAKE)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
@@ -104,41 +109,33 @@ xorg-font-adobe-75dpi_targetinstall: $(STATEDIR)/xorg-font-adobe-75dpi.targetins
 $(STATEDIR)/xorg-font-adobe-75dpi.targetinstall: $(xorg-font-adobe-75dpi_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init, xorg-font-adobe-75dpi)
-	@$(call install_fixup, xorg-font-adobe-75dpi,PACKAGE,xorg-font-adobe-75dpi)
-	@$(call install_fixup, xorg-font-adobe-75dpi,PRIORITY,optional)
-	@$(call install_fixup, xorg-font-adobe-75dpi,VERSION,$(XORG_FONT_ADOBE_75DPI_VERSION))
-	@$(call install_fixup, xorg-font-adobe-75dpi,SECTION,base)
-	@$(call install_fixup, xorg-font-adobe-75dpi,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup, xorg-font-adobe-75dpi,DEPENDS,)
-	@$(call install_fixup, xorg-font-adobe-75dpi,DESCRIPTION,missing)
+	@mkdir -p $(XORG_FONTS_DIR_INSTALL)/75dpi
 
 	@cd $(XORG_FONT_ADOBE_75DPI_DIR); \
-	for file in `find . -name "*.pcf.gz" -a \! -name "*ISO8859*"`; do	\
-		if [ -e $$file ]; then \
-			$(call install_copy, xorg-font-adobe-75dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/75dpi/$$file, n); \
-		fi; \
-	done;
+	find . -name "*.pcf.gz" -a \! -name "*ISO8859*" \
+		-o -name "*ISO8859-1.pcf.gz" \
+		-o -name "*ISO8859-15.pcf.gz" \
+		| \
+		while read file; do \
+		install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/75dpi; \
+	done
 
-	@cd $(XORG_FONT_ADOBE_75DPI_DIR); \
-	for file in *{ISO8859-15,ISO8859-1}.pcf.gz; do \
-		if [ -e $$file ]; then \
-			$(call install_copy, xorg-font-adobe-75dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/75dpi/$$file, n); \
-		fi; \
-	done;
 
 ifdef PTXCONF_XORG_FONT_ADOBE_75DPI_TRANS
 	@cd $(XORG_FONT_ADOBE_75DPI_DIR); \
-	for file in *{ISO8859-2,ISO8859-3,ISO8859-4,ISO8859-9,ISO8859-10,ISO8859-13,ISO8859-14}.pcf.gz; do \
-		if [ -e $$file ]; then \
-			$(call install_copy, xorg-font-adobe-75dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/75dpi/$$file, n); \
-		fi; \
-	done;
+	find . -name "*ISO8859-2.pcf.gz" \
+		-o -name "*ISO8859-3.pcf.gz" \
+		-o -name "*ISO8859-4.pcf.gz" \
+		-o -name "*ISO8859-9.pcf.gz" \
+		-o -name "*ISO8859-10.pcf.gz" \
+		-o -name "*ISO8859-13.pcf.gz" \
+		-o -name "*ISO8859-14.pcf.gz" \
+		| \
+		while read file; do \
+		install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/75dpi; \
+	done
 endif
 
-
-	@$(call install_finish, xorg-font-adobe-75dpi)
-
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
diff --git a/rules/xorg-font-adobe-utopia-100dpi.in b/rules/xorg-font-adobe-utopia-100dpi.in
index 324fc1e7b..938770082 100644
--- a/rules/xorg-font-adobe-utopia-100dpi.in
+++ b/rules/xorg-font-adobe-utopia-100dpi.in
@@ -1,7 +1,6 @@
 config XORG_FONT_ADOBE_UTOPIA_100DPI
 	bool
-	depends on XORG_FONT_100DPI
-	select HOST_XORG_APP_BDFTOPCF
+	select XORG_FONTS
 	prompt "Adobe Utopia 100dpi"
 	help
 	  adobe utopia fonts, containing Utopia Regular, 
diff --git a/rules/xorg-font-adobe-utopia-100dpi.make b/rules/xorg-font-adobe-utopia-100dpi.make
index 9f8c9989a..ad17e493a 100644
--- a/rules/xorg-font-adobe-utopia-100dpi.make
+++ b/rules/xorg-font-adobe-utopia-100dpi.make
@@ -20,10 +20,13 @@ PACKAGES-$(PTXCONF_XORG_FONT_ADOBE_UTOPIA_100DPI) += xorg-font-adobe-utopia-100d
 XORG_FONT_ADOBE_UTOPIA_100DPI_VERSION	:= 1.0.1
 XORG_FONT_ADOBE_UTOPIA_100DPI		:= font-adobe-utopia-100dpi-X11R7.0-$(XORG_FONT_ADOBE_UTOPIA_100DPI_VERSION)
 XORG_FONT_ADOBE_UTOPIA_100DPI_SUFFIX	:= tar.bz2
-XORG_FONT_ADOBE_UTOPIA_100DPI_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font//$(XORG_FONT_ADOBE_UTOPIA_100DPI).$(XORG_FONT_ADOBE_UTOPIA_100DPI_SUFFIX)
+XORG_FONT_ADOBE_UTOPIA_100DPI_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_ADOBE_UTOPIA_100DPI).$(XORG_FONT_ADOBE_UTOPIA_100DPI_SUFFIX)
 XORG_FONT_ADOBE_UTOPIA_100DPI_SOURCE	:= $(SRCDIR)/$(XORG_FONT_ADOBE_UTOPIA_100DPI).$(XORG_FONT_ADOBE_UTOPIA_100DPI_SUFFIX)
 XORG_FONT_ADOBE_UTOPIA_100DPI_DIR	:= $(BUILDDIR)/$(XORG_FONT_ADOBE_UTOPIA_100DPI)
 
+ifdef PTXCONF_XORG_FONT_ADOBE_UTOPIA_100DPI
+$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-adobe-utopia-100dpi.targetinstall
+endif
 
 # ----------------------------------------------------------------------------
 # Get
@@ -64,7 +67,10 @@ XORG_FONT_ADOBE_UTOPIA_100DPI_ENV 	:=  $(CROSS_ENV)
 #
 # autoconf
 #
-XORG_FONT_ADOBE_UTOPIA_100DPI_AUTOCONF := $(CROSS_AUTOCONF_USR)
+XORG_FONT_ADOBE_UTOPIA_100DPI_AUTOCONF := \
+	$(CROSS_AUTOCONF_USR) \
+	--with-fontdir=$(XORG_FONTDIR)/100dpi
+
 
 $(STATEDIR)/xorg-font-adobe-utopia-100dpi.prepare: $(xorg-font-adobe-utopia-100dpi_prepare_deps_default)
 	@$(call targetinfo, $@)
@@ -82,7 +88,7 @@ xorg-font-adobe-utopia-100dpi_compile: $(STATEDIR)/xorg-font-adobe-utopia-100dpi
 
 $(STATEDIR)/xorg-font-adobe-utopia-100dpi.compile: $(xorg-font-adobe-utopia-100dpi_compile_deps_default)
 	@$(call targetinfo, $@)
-	cd $(XORG_FONT_ADOBE_UTOPIA_100DPI_DIR) && $(XORG_FONT_ADOBE_UTOPIA_100DPI_PATH) make
+	cd $(XORG_FONT_ADOBE_UTOPIA_100DPI_DIR) && $(XORG_FONT_ADOBE_UTOPIA_100DPI_PATH) $(MAKE)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
@@ -104,40 +110,32 @@ xorg-font-adobe-utopia-100dpi_targetinstall: $(STATEDIR)/xorg-font-adobe-utopia-
 $(STATEDIR)/xorg-font-adobe-utopia-100dpi.targetinstall: $(xorg-font-adobe-utopia-100dpi_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init, xorg-font-adobe-utopia-100dpi)
-	@$(call install_fixup, xorg-font-adobe-utopia-100dpi,PACKAGE,xorg-font-adobe-utopia-100dpi)
-	@$(call install_fixup, xorg-font-adobe-utopia-100dpi,PRIORITY,optional)
-	@$(call install_fixup, xorg-font-adobe-utopia-100dpi,VERSION,$(XORG_FONT_ADOBE_UTOPIA_100DPI_VERSION))
-	@$(call install_fixup, xorg-font-adobe-utopia-100dpi,SECTION,base)
-	@$(call install_fixup, xorg-font-adobe-utopia-100dpi,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup, xorg-font-adobe-utopia-100dpi,DEPENDS,)
-	@$(call install_fixup, xorg-font-adobe-utopia-100dpi,DESCRIPTION,missing)
+	@mkdir -p $(XORG_FONTS_DIR_INSTALL)/100dpi
 
 	@cd $(XORG_FONT_ADOBE_UTOPIA_100DPI_DIR); \
-	for file in `find . -name "*.pcf.gz" -a \! -name "*ISO8859*"`; do	\
-		if [ -e $$file ]; then \
-			$(call install_copy, xorg-font-adobe-utopia-100dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/100dpi/$$file, n); \
-		fi; \
-	done;
-
-	@cd $(XORG_FONT_ADOBE_UTOPIA_100DPI_DIR); \
-	for file in *{ISO8859-15,ISO8859-1}.pcf.gz; do \
-		if [ -e $$file ]; then \
-			$(call install_copy, xorg-font-adobe-utopia-100dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/100dpi/$$file, n); \
-		fi; \
-	done;
+	find . -name "*.pcf.gz" -a \! -name "*ISO8859*" \
+		-o -name "*ISO8859-1.pcf.gz" \
+		-o -name "*ISO8859-15.pcf.gz" \
+		| \
+		while read file; do \
+		install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/100dpi; \
+	done
 
 ifdef PTXCONF_XORG_FONT_ADOBE_UTOPIA_100DPI_TRANS
 	@cd $(XORG_FONT_ADOBE_UTOPIA_100DPI_DIR); \
-	for file in *{ISO8859-2,ISO8859-3,ISO8859-4,ISO8859-9,ISO8859-10,ISO8859-13,ISO8859-14}.pcf.gz; do \
-		if [ -e $$file ]; then \
-			$(call install_copy, xorg-font-adobe-utopia-100dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/100dpi/$$file, n); \
-		fi; \
-	done;
+	find . -name "*ISO8859-2.pcf.gz" \
+		-o -name "*ISO8859-3.pcf.gz" \
+		-o -name "*ISO8859-4.pcf.gz" \
+		-o -name "*ISO8859-9.pcf.gz" \
+		-o -name "*ISO8859-10.pcf.gz" \
+		-o -name "*ISO8859-13.pcf.gz" \
+		-o -name "*ISO8859-14.pcf.gz" \
+		| \
+		while read file; do \
+		install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/100dpi; \
+	done
 endif
 
-	@$(call install_finish, xorg-font-adobe-utopia-100dpi)
-
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
diff --git a/rules/xorg-font-adobe-utopia-75dpi.in b/rules/xorg-font-adobe-utopia-75dpi.in
index b67a19212..f9207126b 100644
--- a/rules/xorg-font-adobe-utopia-75dpi.in
+++ b/rules/xorg-font-adobe-utopia-75dpi.in
@@ -1,7 +1,6 @@
 config XORG_FONT_ADOBE_UTOPIA_75DPI
 	bool
-	depends on XORG_FONT_75DPI
-	select HOST_XORG_APP_BDFTOPCF
+	select XORG_FONTS
 	prompt "Adobe Utopia 75dpi"
 	help
 	  adobe utopia fonts, containing Utopia Regular, 
diff --git a/rules/xorg-font-adobe-utopia-75dpi.make b/rules/xorg-font-adobe-utopia-75dpi.make
index 1ba577d48..8cee0a666 100644
--- a/rules/xorg-font-adobe-utopia-75dpi.make
+++ b/rules/xorg-font-adobe-utopia-75dpi.make
@@ -20,10 +20,13 @@ PACKAGES-$(PTXCONF_XORG_FONT_ADOBE_UTOPIA_75DPI) += xorg-font-adobe-utopia-75dpi
 XORG_FONT_ADOBE_UTOPIA_75DPI_VERSION	:= 1.0.1
 XORG_FONT_ADOBE_UTOPIA_75DPI		:= font-adobe-utopia-75dpi-X11R7.0-$(XORG_FONT_ADOBE_UTOPIA_75DPI_VERSION)
 XORG_FONT_ADOBE_UTOPIA_75DPI_SUFFIX	:= tar.bz2
-XORG_FONT_ADOBE_UTOPIA_75DPI_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font//$(XORG_FONT_ADOBE_UTOPIA_75DPI).$(XORG_FONT_ADOBE_UTOPIA_75DPI_SUFFIX)
+XORG_FONT_ADOBE_UTOPIA_75DPI_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_ADOBE_UTOPIA_75DPI).$(XORG_FONT_ADOBE_UTOPIA_75DPI_SUFFIX)
 XORG_FONT_ADOBE_UTOPIA_75DPI_SOURCE	:= $(SRCDIR)/$(XORG_FONT_ADOBE_UTOPIA_75DPI).$(XORG_FONT_ADOBE_UTOPIA_75DPI_SUFFIX)
 XORG_FONT_ADOBE_UTOPIA_75DPI_DIR	:= $(BUILDDIR)/$(XORG_FONT_ADOBE_UTOPIA_75DPI)
 
+ifdef PTXCONF_XORG_FONT_ADOBE_UTOPIA_75DPI
+$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-adobe-utopia-75dpi.targetinstall
+endif
 
 # ----------------------------------------------------------------------------
 # Get
@@ -64,7 +67,9 @@ XORG_FONT_ADOBE_UTOPIA_75DPI_ENV 	:=  $(CROSS_ENV)
 #
 # autoconf
 #
-XORG_FONT_ADOBE_UTOPIA_75DPI_AUTOCONF := $(CROSS_AUTOCONF_USR)
+XORG_FONT_ADOBE_UTOPIA_75DPI_AUTOCONF := \
+	$(CROSS_AUTOCONF_USR) \
+	--with-fontdir=$(XORG_FONTDIR)/75dpi
 
 $(STATEDIR)/xorg-font-adobe-utopia-75dpi.prepare: $(xorg-font-adobe-utopia-75dpi_prepare_deps_default)
 	@$(call targetinfo, $@)
@@ -82,7 +87,7 @@ xorg-font-adobe-utopia-75dpi_compile: $(STATEDIR)/xorg-font-adobe-utopia-75dpi.c
 
 $(STATEDIR)/xorg-font-adobe-utopia-75dpi.compile: $(xorg-font-adobe-utopia-75dpi_compile_deps_default)
 	@$(call targetinfo, $@)
-	cd $(XORG_FONT_ADOBE_UTOPIA_75DPI_DIR) && $(XORG_FONT_ADOBE_UTOPIA_75DPI_PATH) make
+	cd $(XORG_FONT_ADOBE_UTOPIA_75DPI_DIR) && $(XORG_FONT_ADOBE_UTOPIA_75DPI_PATH) $(MAKE)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
@@ -104,40 +109,33 @@ xorg-font-adobe-utopia-75dpi_targetinstall: $(STATEDIR)/xorg-font-adobe-utopia-7
 $(STATEDIR)/xorg-font-adobe-utopia-75dpi.targetinstall: $(xorg-font-adobe-utopia-75dpi_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init, xorg-font-adobe-utopia-75dpi)
-	@$(call install_fixup, xorg-font-adobe-utopia-75dpi,PACKAGE,xorg-font-adobe-utopia-75dpi)
-	@$(call install_fixup, xorg-font-adobe-utopia-75dpi,PRIORITY,optional)
-	@$(call install_fixup, xorg-font-adobe-utopia-75dpi,VERSION,$(XORG_FONT_ADOBE_UTOPIA_75DPI_VERSION))
-	@$(call install_fixup, xorg-font-adobe-utopia-75dpi,SECTION,base)
-	@$(call install_fixup, xorg-font-adobe-utopia-75dpi,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup, xorg-font-adobe-utopia-75dpi,DEPENDS,)
-	@$(call install_fixup, xorg-font-adobe-utopia-75dpi,DESCRIPTION,missing)
+	@mkdir -p $(XORG_FONTS_DIR_INSTALL)/75dpi
 
 	@cd $(XORG_FONT_ADOBE_UTOPIA_75DPI_DIR); \
-	for file in `find . -name "*.pcf.gz" -a \! -name "*ISO8859*"`; do	\
-		if [ -e $$file ];then \
-			$(call install_copy, xorg-font-adobe-utopia-75dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/75dpi/$$file, n); \
-		fi; \
-	done;
+	find . -name "*.pcf.gz" -a \! -name "*ISO8859*" \
+		-o -name "*ISO8859-1.pcf.gz" \
+		-o -name "*ISO8859-15.pcf.gz" \
+		| \
+		while read file; do \
+		install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/75dpi; \
+	done
 
-	@cd $(XORG_FONT_ADOBE_UTOPIA_75DPI_DIR); \
-	for file in *{ISO8859-15,ISO8859-1}.pcf.gz; do \
-		if [ -e $$file ];then \
-			$(call install_copy, xorg-font-adobe-utopia-75dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/75dpi/$$file, n); \
-		fi; \
-	done;
 
 ifdef PTXCONF_XORG_FONT_ADOBE_UTOPIA_75DPI_TRANS
 	@cd $(XORG_FONT_ADOBE_UTOPIA_75DPI_DIR); \
-	for file in *{ISO8859-2,ISO8859-3,ISO8859-4,ISO8859-9,ISO8859-10,ISO8859-13,ISO8859-14}.pcf.gz; do \
-		if [ -e $$file ]; then \
-			$(call install_copy, xorg-font-adobe-utopia-75dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/75dpi/$$file, n); \
-		fi; \
-	done;
+	find . -name "*ISO8859-2.pcf.gz" \
+		-o -name "*ISO8859-3.pcf.gz" \
+		-o -name "*ISO8859-4.pcf.gz" \
+		-o -name "*ISO8859-9.pcf.gz" \
+		-o -name "*ISO8859-10.pcf.gz" \
+		-o -name "*ISO8859-13.pcf.gz" \
+		-o -name "*ISO8859-14.pcf.gz" \
+		| \
+		while read file; do \
+		install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/75dpi; \
+	done
 endif
 
-	@$(call install_finish, xorg-font-adobe-utopia-75dpi)
-
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
diff --git a/rules/xorg-font-adobe-utopia-type1.in b/rules/xorg-font-adobe-utopia-type1.in
index 7d8c76d80..2e0c840d4 100644
--- a/rules/xorg-font-adobe-utopia-type1.in
+++ b/rules/xorg-font-adobe-utopia-type1.in
@@ -1,6 +1,6 @@
 config XORG_FONT_ADOBE_UTOPIA_TYPE1
 	bool
-	depends on XORG_FONT_SCALABLE
+	select XORG_FONTS
 	prompt "Adobe Utopia type1"
 	help
 	  FIXME
diff --git a/rules/xorg-font-adobe-utopia-type1.make b/rules/xorg-font-adobe-utopia-type1.make
index 23323b3da..32fdbc1c5 100644
--- a/rules/xorg-font-adobe-utopia-type1.make
+++ b/rules/xorg-font-adobe-utopia-type1.make
@@ -20,10 +20,13 @@ PACKAGES-$(PTXCONF_XORG_FONT_ADOBE_UTOPIA_TYPE1) += xorg-font-adobe-utopia-type1
 XORG_FONT_ADOBE_UTOPIA_TYPE1_VERSION	:= 1.0.1
 XORG_FONT_ADOBE_UTOPIA_TYPE1		:= font-adobe-utopia-type1-X11R7.0-$(XORG_FONT_ADOBE_UTOPIA_TYPE1_VERSION)
 XORG_FONT_ADOBE_UTOPIA_TYPE1_SUFFIX	:= tar.bz2
-XORG_FONT_ADOBE_UTOPIA_TYPE1_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font//$(XORG_FONT_ADOBE_UTOPIA_TYPE1).$(XORG_FONT_ADOBE_UTOPIA_TYPE1_SUFFIX)
+XORG_FONT_ADOBE_UTOPIA_TYPE1_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_ADOBE_UTOPIA_TYPE1).$(XORG_FONT_ADOBE_UTOPIA_TYPE1_SUFFIX)
 XORG_FONT_ADOBE_UTOPIA_TYPE1_SOURCE	:= $(SRCDIR)/$(XORG_FONT_ADOBE_UTOPIA_TYPE1).$(XORG_FONT_ADOBE_UTOPIA_TYPE1_SUFFIX)
 XORG_FONT_ADOBE_UTOPIA_TYPE1_DIR	:= $(BUILDDIR)/$(XORG_FONT_ADOBE_UTOPIA_TYPE1)
 
+ifdef PTXCONF_XORG_FONT_ADOBE_UTOPIA_TYPE1
+$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-adobe-utopia-type1.targetinstall
+endif
 
 # ----------------------------------------------------------------------------
 # Get
@@ -64,7 +67,9 @@ XORG_FONT_ADOBE_UTOPIA_TYPE1_ENV 	:=  $(CROSS_ENV)
 #
 # autoconf
 #
-XORG_FONT_ADOBE_UTOPIA_TYPE1_AUTOCONF := $(CROSS_AUTOCONF_USR)
+XORG_FONT_ADOBE_UTOPIA_TYPE1_AUTOCONF := \
+	$(CROSS_AUTOCONF_USR) \
+	--with-fontdir=$(XORG_FONTDIR)/Type1
 
 $(STATEDIR)/xorg-font-adobe-utopia-type1.prepare: $(xorg-font-adobe-utopia-type1_prepare_deps_default)
 	@$(call targetinfo, $@)
@@ -82,7 +87,7 @@ xorg-font-adobe-utopia-type1_compile: $(STATEDIR)/xorg-font-adobe-utopia-type1.c
 
 $(STATEDIR)/xorg-font-adobe-utopia-type1.compile: $(xorg-font-adobe-utopia-type1_compile_deps_default)
 	@$(call targetinfo, $@)
-	cd $(XORG_FONT_ADOBE_UTOPIA_TYPE1_DIR) && $(XORG_FONT_ADOBE_UTOPIA_TYPE1_PATH) make
+	cd $(XORG_FONT_ADOBE_UTOPIA_TYPE1_DIR) && $(XORG_FONT_ADOBE_UTOPIA_TYPE1_PATH) $(MAKE)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
@@ -104,21 +109,15 @@ xorg-font-adobe-utopia-type1_targetinstall: $(STATEDIR)/xorg-font-adobe-utopia-t
 $(STATEDIR)/xorg-font-adobe-utopia-type1.targetinstall: $(xorg-font-adobe-utopia-type1_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init, xorg-font-adobe-utopia-type1)
-	@$(call install_fixup, xorg-font-adobe-utopia-type1,PACKAGE,xorg-font-adobe-utopia-type1)
-	@$(call install_fixup, xorg-font-adobe-utopia-type1,PRIORITY,optional)
-	@$(call install_fixup, xorg-font-adobe-utopia-type1,VERSION,$(XORG_FONT_ADOBE_UTOPIA_TYPE1_VERSION))
-	@$(call install_fixup, xorg-font-adobe-utopia-type1,SECTION,base)
-	@$(call install_fixup, xorg-font-adobe-utopia-type1,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup, xorg-font-adobe-utopia-type1,DEPENDS,)
-	@$(call install_fixup, xorg-font-adobe-utopia-type1,DESCRIPTION,missing)
-
-	@cd $(XORG_FONT_ADOBE_UTOPIA_TYPE1_DIR); \
-	for file in *.afm *.pfa; do	\
-		$(call install_copy, xorg-font-adobe-utopia-type1, 0, 0, 0644, $$file, $(XORG_FONTDIR)/Type1/$$file, n); \
-	done
+	@mkdir -p $(XORG_FONTS_DIR_INSTALL)/Type1
 
-	@$(call install_finish, xorg-font-adobe-utopia-type1)
+	@find $(XORG_FONT_ADOBE_UTOPIA_TYPE1_DIR) \
+		-name "*.afm" \
+		-o -name "*.pfa" \
+		| \
+		while read file; do \
+		install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/Type1; \
+	done
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-font-alias.in b/rules/xorg-font-alias.in
index bb607bf67..9d1d74c14 100644
--- a/rules/xorg-font-alias.in
+++ b/rules/xorg-font-alias.in
@@ -1,8 +1,2 @@
 config XORG_FONT_ALIAS
 	bool
-	select XORG_FONT_UTIL
-	default y
-	prompt "Alias                         "
-	help
-	  defines alias names for fonts. This is an essential
-	  package, you migh most probably want it.
diff --git a/rules/xorg-font-alias.make b/rules/xorg-font-alias.make
index c9d9b874f..d7bd8c6cb 100644
--- a/rules/xorg-font-alias.make
+++ b/rules/xorg-font-alias.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_FONT_ALIAS) += xorg-font-alias
 XORG_FONT_ALIAS_VERSION	:= 1.0.1
 XORG_FONT_ALIAS		:= font-alias-X11R7.0-$(XORG_FONT_ALIAS_VERSION)
 XORG_FONT_ALIAS_SUFFIX	:= tar.bz2
-XORG_FONT_ALIAS_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font//$(XORG_FONT_ALIAS).$(XORG_FONT_ALIAS_SUFFIX)
+XORG_FONT_ALIAS_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_ALIAS).$(XORG_FONT_ALIAS_SUFFIX)
 XORG_FONT_ALIAS_SOURCE	:= $(SRCDIR)/$(XORG_FONT_ALIAS).$(XORG_FONT_ALIAS_SUFFIX)
 XORG_FONT_ALIAS_DIR	:= $(BUILDDIR)/$(XORG_FONT_ALIAS)
 
@@ -64,7 +64,9 @@ XORG_FONT_ALIAS_ENV 	:=  $(CROSS_ENV)
 #
 # autoconf
 #
-XORG_FONT_ALIAS_AUTOCONF := $(CROSS_AUTOCONF_USR)
+XORG_FONT_ALIAS_AUTOCONF := \
+	$(CROSS_AUTOCONF_USR) \
+	--with-top-fontdir=$(XORG_FONTDIR)
 
 $(STATEDIR)/xorg-font-alias.prepare: $(xorg-font-alias_prepare_deps_default)
 	@$(call targetinfo, $@)
@@ -82,7 +84,7 @@ xorg-font-alias_compile: $(STATEDIR)/xorg-font-alias.compile
 
 $(STATEDIR)/xorg-font-alias.compile: $(xorg-font-alias_compile_deps_default)
 	@$(call targetinfo, $@)
-	cd $(XORG_FONT_ALIAS_DIR) && $(XORG_FONT_ALIAS_PATH) make
+	cd $(XORG_FONT_ALIAS_DIR) && $(XORG_FONT_ALIAS_PATH) $(MAKE)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
@@ -114,10 +116,10 @@ $(STATEDIR)/xorg-font-alias.targetinstall: $(xorg-font-alias_targetinstall_deps_
 	@$(call install_fixup, xorg-font-alias,DEPENDS,)
 	@$(call install_fixup, xorg-font-alias,DESCRIPTION,missing)
 
-	@$(call install_copy, xorg-font-alias, 0, 0, 0644, $(XORG_FONT_ALIAS_DIR)/100dpi/fonts.alias, $(XORG_FONTDIR)/100dpi/fonts.alias)
-	@$(call install_copy, xorg-font-alias, 0, 0, 0644, $(XORG_FONT_ALIAS_DIR)/75dpi/fonts.alias, $(XORG_FONTDIR)/75dpi/fonts.alias)
-	@$(call install_copy, xorg-font-alias, 0, 0, 0644, $(XORG_FONT_ALIAS_DIR)/cyrillic/fonts.alias, $(XORG_FONTDIR)/cyrillic/fonts.alias)
-	@$(call install_copy, xorg-font-alias, 0, 0, 0644, $(XORG_FONT_ALIAS_DIR)/misc/fonts.alias, $(XORG_FONTDIR)/misc/fonts.alias)
+	@$(call install_copy, xorg-font-alias, 0, 0, 0644, $(XORG_FONT_ALIAS_DIR)/100dpi/fonts.alias, $(XORG_FONTDIR)/100dpi/fonts.alias, n)
+	@$(call install_copy, xorg-font-alias, 0, 0, 0644, $(XORG_FONT_ALIAS_DIR)/75dpi/fonts.alias, $(XORG_FONTDIR)/75dpi/fonts.alias, n)
+	@$(call install_copy, xorg-font-alias, 0, 0, 0644, $(XORG_FONT_ALIAS_DIR)/cyrillic/fonts.alias, $(XORG_FONTDIR)/cyrillic/fonts.alias, n)
+	@$(call install_copy, xorg-font-alias, 0, 0, 0644, $(XORG_FONT_ALIAS_DIR)/misc/fonts.alias, $(XORG_FONTDIR)/misc/fonts.alias, n)
 
 	@$(call install_finish, xorg-font-alias)
 
diff --git a/rules/xorg-font-arabic-misc.in b/rules/xorg-font-arabic-misc.in
index 848495d66..67c447c38 100644
--- a/rules/xorg-font-arabic-misc.in
+++ b/rules/xorg-font-arabic-misc.in
@@ -1,7 +1,6 @@
 config XORG_FONT_ARABIC_MISC
 	bool
-	depends on XORG_FONT_INTL
-	select HOST_XORG_APP_BDFTOPCF
+	select XORG_FONTS
 	prompt "Arabic misc."
 	help
 	  FIXME
diff --git a/rules/xorg-font-arabic-misc.make b/rules/xorg-font-arabic-misc.make
index 7817ad221..46d13edfd 100644
--- a/rules/xorg-font-arabic-misc.make
+++ b/rules/xorg-font-arabic-misc.make
@@ -20,10 +20,13 @@ PACKAGES-$(PTXCONF_XORG_FONT_ARABIC_MISC) += xorg-font-arabic-misc
 XORG_FONT_ARABIC_MISC_VERSION	:= 1.0.0
 XORG_FONT_ARABIC_MISC		:= font-arabic-misc-X11R7.0-$(XORG_FONT_ARABIC_MISC_VERSION)
 XORG_FONT_ARABIC_MISC_SUFFIX	:= tar.bz2
-XORG_FONT_ARABIC_MISC_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font//$(XORG_FONT_ARABIC_MISC).$(XORG_FONT_ARABIC_MISC_SUFFIX)
+XORG_FONT_ARABIC_MISC_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_ARABIC_MISC).$(XORG_FONT_ARABIC_MISC_SUFFIX)
 XORG_FONT_ARABIC_MISC_SOURCE	:= $(SRCDIR)/$(XORG_FONT_ARABIC_MISC).$(XORG_FONT_ARABIC_MISC_SUFFIX)
 XORG_FONT_ARABIC_MISC_DIR	:= $(BUILDDIR)/$(XORG_FONT_ARABIC_MISC)
 
+ifdef PTXCONF_XORG_FONT_ARABIC_MISC
+$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-arabic-misc.targetinstall
+endif
 
 # ----------------------------------------------------------------------------
 # Get
@@ -64,7 +67,9 @@ XORG_FONT_ARABIC_MISC_ENV 	:=  $(CROSS_ENV)
 #
 # autoconf
 #
-XORG_FONT_ARABIC_MISC_AUTOCONF := $(CROSS_AUTOCONF_USR)
+XORG_FONT_ARABIC_MISC_AUTOCONF := \
+	$(CROSS_AUTOCONF_USR) \
+	--with-fontdir=$(XORG_FONTDIR)/misc
 
 $(STATEDIR)/xorg-font-arabic-misc.prepare: $(xorg-font-arabic-misc_prepare_deps_default)
 	@$(call targetinfo, $@)
@@ -82,7 +87,7 @@ xorg-font-arabic-misc_compile: $(STATEDIR)/xorg-font-arabic-misc.compile
 
 $(STATEDIR)/xorg-font-arabic-misc.compile: $(xorg-font-arabic-misc_compile_deps_default)
 	@$(call targetinfo, $@)
-	cd $(XORG_FONT_ARABIC_MISC_DIR) && $(XORG_FONT_ARABIC_MISC_PATH) make
+	cd $(XORG_FONT_ARABIC_MISC_DIR) && $(XORG_FONT_ARABIC_MISC_PATH) $(MAKE)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
@@ -104,21 +109,14 @@ xorg-font-arabic-misc_targetinstall: $(STATEDIR)/xorg-font-arabic-misc.targetins
 $(STATEDIR)/xorg-font-arabic-misc.targetinstall: $(xorg-font-arabic-misc_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init, xorg-font-arabic-misc)
-	@$(call install_fixup, xorg-font-arabic-misc,PACKAGE,xorg-font-arabic-misc)
-	@$(call install_fixup, xorg-font-arabic-misc,PRIORITY,optional)
-	@$(call install_fixup, xorg-font-arabic-misc,VERSION,$(XORG_FONT_ARABIC_MISC_VERSION))
-	@$(call install_fixup, xorg-font-arabic-misc,SECTION,base)
-	@$(call install_fixup, xorg-font-arabic-misc,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup, xorg-font-arabic-misc,DEPENDS,)
-	@$(call install_fixup, xorg-font-arabic-misc,DESCRIPTION,missing)
-
-	@cd $(XORG_FONT_ARABIC_MISC_DIR); \
-	for file in *.pcf.gz; do	\
-		$(call install_copy, xorg-font-arabic-misc, 0, 0, 0644, $$file, $(XORG_FONTDIR)/misc/$$file, n); \
-	done
+	@mkdir -p $(XORG_FONTS_DIR_INSTALL)/misc
 
-	@$(call install_finish, xorg-font-arabic-misc)
+	@find $(XORG_FONT_ARABIC_MISC_DIR) \
+		-name "*.pcf.gz" \
+		| \
+		while read file; do \
+		install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/misc; \
+	done
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-font-base-trans.in b/rules/xorg-font-base-trans.in
index c6b305785..3b0d28263 100644
--- a/rules/xorg-font-base-trans.in
+++ b/rules/xorg-font-base-trans.in
@@ -1,10 +1,4 @@
-# evil hack to break dependencies, so that we can put the transcode
-# menu under menuconfig
-comment "invisible line"
-	depends on BROKEN
-
 menu "xorg base fonts(transcoded)   "
-	depends on XORG_FONT_BASE
 
 config XORG_FONT_MISC_MISC_TRANS
 	bool
@@ -16,4 +10,13 @@ config XORG_FONT_MISC_MISC_TRANS
 	  This package contains fonts in several ISO 8859
 	  encodings: -2, -3, -4, -9, -10, -13 and -14.
 
+config XORG_FONT_SCHUMACHER_MISC_TRANS
+	bool
+	depends on XORG_FONT_SCHUMACHER_MISC
+	select XORG_FONTS
+	prompt "Schumacher misc transcoded"
+	help
+	  This package contains fonts in several ISO 8859
+	  encodings: -2, -3, -4, -9, -10, -13 and -14.
+
 endmenu
diff --git a/rules/xorg-font-base.in b/rules/xorg-font-base.in
index 15f60d42c..b98010987 100644
--- a/rules/xorg-font-base.in
+++ b/rules/xorg-font-base.in
@@ -1,5 +1,4 @@
-menuconfig XORG_FONT_BASE
-        bool "xorg base fonts               "
+menu "xorg base fonts               "
 
 source "rules/xorg-font-misc-misc.in"
 source "rules/xorg-font-cursor-misc.in"
@@ -14,3 +13,4 @@ source "rules/xorg-font-schumacher-misc.in"
 source "rules/xorg-font-sony-misc.in"
 source "rules/xorg-font-sun-misc.in"
 
+endmenu
diff --git a/rules/xorg-font-bh-100dpi.in b/rules/xorg-font-bh-100dpi.in
index 21393d3ac..2b6699cf4 100644
--- a/rules/xorg-font-bh-100dpi.in
+++ b/rules/xorg-font-bh-100dpi.in
@@ -1,8 +1,6 @@
 config XORG_FONT_BH_100DPI
 	bool
-	depends on XORG_FONT_100DPI
-	select HOST_XORG_APP_BDFTOPCF
-	select HOST_XORG_FONT_UTIL
+	select XORG_FONTS
 	prompt "BH 100dpi"
 	help
 	  This package contains BH fonts in the ISO 10646-1,
diff --git a/rules/xorg-font-bh-100dpi.make b/rules/xorg-font-bh-100dpi.make
index 4461817e4..3e894e541 100644
--- a/rules/xorg-font-bh-100dpi.make
+++ b/rules/xorg-font-bh-100dpi.make
@@ -20,10 +20,13 @@ PACKAGES-$(PTXCONF_XORG_FONT_BH_100DPI) += xorg-font-bh-100dpi
 XORG_FONT_BH_100DPI_VERSION	:= 1.0.0
 XORG_FONT_BH_100DPI		:= font-bh-100dpi-X11R7.0-$(XORG_FONT_BH_100DPI_VERSION)
 XORG_FONT_BH_100DPI_SUFFIX	:= tar.bz2
-XORG_FONT_BH_100DPI_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font//$(XORG_FONT_BH_100DPI).$(XORG_FONT_BH_100DPI_SUFFIX)
+XORG_FONT_BH_100DPI_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_BH_100DPI).$(XORG_FONT_BH_100DPI_SUFFIX)
 XORG_FONT_BH_100DPI_SOURCE	:= $(SRCDIR)/$(XORG_FONT_BH_100DPI).$(XORG_FONT_BH_100DPI_SUFFIX)
 XORG_FONT_BH_100DPI_DIR		:= $(BUILDDIR)/$(XORG_FONT_BH_100DPI)
 
+ifdef PTXCONF_XORG_FONT_BH_100DPI
+$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-bh-100dpi.targetinstall
+endif
 
 # ----------------------------------------------------------------------------
 # Get
@@ -64,7 +67,9 @@ XORG_FONT_BH_100DPI_ENV 	:=  $(CROSS_ENV)
 #
 # autoconf
 #
-XORG_FONT_BH_100DPI_AUTOCONF := $(CROSS_AUTOCONF_USR)
+XORG_FONT_BH_100DPI_AUTOCONF := \
+	$(CROSS_AUTOCONF_USR) \
+	--with-fontdir=$(XORG_FONTDIR)/100dpi
 
 $(STATEDIR)/xorg-font-bh-100dpi.prepare: $(xorg-font-bh-100dpi_prepare_deps_default)
 	@$(call targetinfo, $@)
@@ -82,7 +87,7 @@ xorg-font-bh-100dpi_compile: $(STATEDIR)/xorg-font-bh-100dpi.compile
 
 $(STATEDIR)/xorg-font-bh-100dpi.compile: $(xorg-font-bh-100dpi_compile_deps_default)
 	@$(call targetinfo, $@)
-	cd $(XORG_FONT_BH_100DPI_DIR) && $(XORG_FONT_BH_100DPI_PATH) make UTIL_DIR=$(SYSROOT)/usr/lib/X11/fonts/util/
+	cd $(XORG_FONT_BH_100DPI_DIR) && $(XORG_FONT_BH_100DPI_PATH) $(MAKE)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
@@ -104,40 +109,32 @@ xorg-font-bh-100dpi_targetinstall: $(STATEDIR)/xorg-font-bh-100dpi.targetinstall
 $(STATEDIR)/xorg-font-bh-100dpi.targetinstall: $(xorg-font-bh-100dpi_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init, xorg-font-bh-100dpi)
-	@$(call install_fixup, xorg-font-bh-100dpi,PACKAGE,xorg-font-bh-100dpi)
-	@$(call install_fixup, xorg-font-bh-100dpi,PRIORITY,optional)
-	@$(call install_fixup, xorg-font-bh-100dpi,VERSION,$(XORG_FONT_BH_100DPI_VERSION))
-	@$(call install_fixup, xorg-font-bh-100dpi,SECTION,base)
-	@$(call install_fixup, xorg-font-bh-100dpi,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup, xorg-font-bh-100dpi,DEPENDS,)
-	@$(call install_fixup, xorg-font-bh-100dpi,DESCRIPTION,missing)
-
-	@cd $(XORG_FONT_BH_100DPI_DIR); \
-	for file in `find . -name "*.pcf.gz" -a \! -name "*ISO8859*"`; do	\
-		if [ -e $$file ]; then \
-			$(call install_copy, xorg-font-bh-100dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/100dpi/$$file, n); \
-		fi; \
-	done;
-
-	@cd $(XORG_FONT_BH_100DPI_DIR); \
-	for file in *{ISO8859-15,ISO8859-1}.pcf.gz; do \
-		if [ -e $$file ]; then \
-			$(call install_copy, xorg-font-bh-100dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/100dpi/$$file, n); \
-		fi; \
-	done;
+	@mkdir -p $(XORG_FONTS_DIR_INSTALL)/100dpi
+
+	@find $(XORG_FONT_BH_100DPI_DIR) \
+		-name "*.pcf.gz" -a \! -name "*ISO8859*" \
+		-o -name "*ISO8859-1.pcf.gz" \
+		-o -name "*ISO8859-15.pcf.gz" \
+		| \
+		while read file; do \
+		install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/100dpi; \
+	done
 
 ifdef PTXCONF_XORG_FONT_BH_100DPI_TRANS
-	@cd $(XORG_FONT_BH_100DPI_DIR); \
-	for file in *{ISO8859-2,ISO8859-3,ISO8859-4,ISO8859-9,ISO8859-10,ISO8859-13,ISO8859-14}.pcf.gz; do \
-		if [ -e $$file ]; then \
-			$(call install_copy, xorg-font-bh-100dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/100dpi/$$file, n); \
-		fi; \
-	done;
+	@find $(XORG_FONT_BH_100DPI_DIR) \
+		-name "*ISO8859-2.pcf.gz" \
+		-o -name "*ISO8859-3.pcf.gz" \
+		-o -name "*ISO8859-4.pcf.gz" \
+		-o -name "*ISO8859-9.pcf.gz" \
+		-o -name "*ISO8859-10.pcf.gz" \
+		-o -name "*ISO8859-13.pcf.gz" \
+		-o -name "*ISO8859-14.pcf.gz" \
+		| \
+		while read file; do \
+		install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/100dpi; \
+	done
 endif
 
-	@$(call install_finish, xorg-font-bh-100dpi)
-
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
diff --git a/rules/xorg-font-bh-75dpi.in b/rules/xorg-font-bh-75dpi.in
index 4d81f0eea..c831f4e48 100644
--- a/rules/xorg-font-bh-75dpi.in
+++ b/rules/xorg-font-bh-75dpi.in
@@ -1,8 +1,6 @@
 config XORG_FONT_BH_75DPI
 	bool
-	depends on XORG_FONT_75DPI
-	select HOST_XORG_APP_BDFTOPCF
-	select HOST_XORG_FONT_UTIL
+	select XORG_FONTS
 	prompt "BH 75dpi"
 	help
 	  This package contains BH fonts in the ISO 10646-1,
diff --git a/rules/xorg-font-bh-75dpi.make b/rules/xorg-font-bh-75dpi.make
index 6ac178c44..16d977aad 100644
--- a/rules/xorg-font-bh-75dpi.make
+++ b/rules/xorg-font-bh-75dpi.make
@@ -20,10 +20,13 @@ PACKAGES-$(PTXCONF_XORG_FONT_BH_75DPI) += xorg-font-bh-75dpi
 XORG_FONT_BH_75DPI_VERSION	:= 1.0.0
 XORG_FONT_BH_75DPI		:= font-bh-75dpi-X11R7.0-$(XORG_FONT_BH_75DPI_VERSION)
 XORG_FONT_BH_75DPI_SUFFIX	:= tar.bz2
-XORG_FONT_BH_75DPI_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font//$(XORG_FONT_BH_75DPI).$(XORG_FONT_BH_75DPI_SUFFIX)
+XORG_FONT_BH_75DPI_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_BH_75DPI).$(XORG_FONT_BH_75DPI_SUFFIX)
 XORG_FONT_BH_75DPI_SOURCE	:= $(SRCDIR)/$(XORG_FONT_BH_75DPI).$(XORG_FONT_BH_75DPI_SUFFIX)
 XORG_FONT_BH_75DPI_DIR		:= $(BUILDDIR)/$(XORG_FONT_BH_75DPI)
 
+ifdef PTXCONF_XORG_FONT_BH_75DPI
+$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-bh-75dpi.targetinstall
+endif
 
 # ----------------------------------------------------------------------------
 # Get
@@ -64,7 +67,9 @@ XORG_FONT_BH_75DPI_ENV 	:=  $(CROSS_ENV)
 #
 # autoconf
 #
-XORG_FONT_BH_75DPI_AUTOCONF := $(CROSS_AUTOCONF_USR)
+XORG_FONT_BH_75DPI_AUTOCONF := \
+	$(CROSS_AUTOCONF_USR) \
+	--with-fontdir=$(XORG_FONTDIR)/75dpi
 
 $(STATEDIR)/xorg-font-bh-75dpi.prepare: $(xorg-font-bh-75dpi_prepare_deps_default)
 	@$(call targetinfo, $@)
@@ -82,7 +87,7 @@ xorg-font-bh-75dpi_compile: $(STATEDIR)/xorg-font-bh-75dpi.compile
 
 $(STATEDIR)/xorg-font-bh-75dpi.compile: $(xorg-font-bh-75dpi_compile_deps_default)
 	@$(call targetinfo, $@)
-	cd $(XORG_FONT_BH_75DPI_DIR) && $(XORG_FONT_BH_75DPI_PATH) make UTIL_DIR=$(SYSROOT)/usr/lib/X11/fonts/util/
+	cd $(XORG_FONT_BH_75DPI_DIR) && $(XORG_FONT_BH_75DPI_PATH) $(MAKE)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
@@ -104,40 +109,32 @@ xorg-font-bh-75dpi_targetinstall: $(STATEDIR)/xorg-font-bh-75dpi.targetinstall
 $(STATEDIR)/xorg-font-bh-75dpi.targetinstall: $(xorg-font-bh-75dpi_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init, xorg-font-bh-75dpi)
-	@$(call install_fixup, xorg-font-bh-75dpi,PACKAGE,xorg-font-bh-75dpi)
-	@$(call install_fixup, xorg-font-bh-75dpi,PRIORITY,optional)
-	@$(call install_fixup, xorg-font-bh-75dpi,VERSION,$(XORG_FONT_BH_75DPI_VERSION))
-	@$(call install_fixup, xorg-font-bh-75dpi,SECTION,base)
-	@$(call install_fixup, xorg-font-bh-75dpi,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup, xorg-font-bh-75dpi,DEPENDS,)
-	@$(call install_fixup, xorg-font-bh-75dpi,DESCRIPTION,missing)
-
-	@cd $(XORG_FONT_BH_75DPI_DIR); \
-	for file in `find . -name "*.pcf.gz" -a \! -name "*ISO8859*"`; do	\
-		if [ -e $$file ]; then \
-			$(call install_copy, xorg-font-bh-75dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/75dpi/$$file, n); \
-		fi; \
-	done;
-
-	@cd $(XORG_FONT_BH_75DPI_DIR); \
-	for file in *{ISO8859-15,ISO8859-1}.pcf.gz; do \
-		if [ -e $$file ]; then \
-			$(call install_copy, xorg-font-bh-75dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/75dpi/$$file, n); \
-		fi; \
-	done;
+	@mkdir -p $(XORG_FONTS_DIR_INSTALL)/75dpi
+
+	@find $(XORG_FONT_BH_75DPI_DIR) \
+		-name "*.pcf.gz" -a \! -name "*ISO8859*" \
+		-o -name "*ISO8859-1.pcf.gz" \
+		-o -name "*ISO8859-15.pcf.gz" \
+		| \
+		while read file; do \
+		install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/75dpi; \
+	done
 
 ifdef PTXCONF_XORG_FONT_BH_75DPI_TRANS
-	@cd $(XORG_FONT_BH_75DPI_DIR); \
-	for file in *{ISO8859-2,ISO8859-3,ISO8859-4,ISO8859-9,ISO8859-10,ISO8859-13,ISO8859-14}.pcf.gz; do \
-		if [ -e $$file ]; then \
-			$(call install_copy, xorg-font-bh-75dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/75dpi/$$file, n); \
-		fi; \
-	done;
+	@find $(XORG_FONT_BH_75DPI_DIR) \
+		-name "*ISO8859-2.pcf.gz" \
+		-o -name "*ISO8859-3.pcf.gz" \
+		-o -name "*ISO8859-4.pcf.gz" \
+		-o -name "*ISO8859-9.pcf.gz" \
+		-o -name "*ISO8859-10.pcf.gz" \
+		-o -name "*ISO8859-13.pcf.gz" \
+		-o -name "*ISO8859-14.pcf.gz" \
+		| \
+		while read file; do \
+		install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/75dpi; \
+	done
 endif
 
-	@$(call install_finish, xorg-font-bh-75dpi)
-
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
diff --git a/rules/xorg-font-bh-lucidatypewriter-100dpi.in b/rules/xorg-font-bh-lucidatypewriter-100dpi.in
index 8da94355b..c4690e0e5 100644
--- a/rules/xorg-font-bh-lucidatypewriter-100dpi.in
+++ b/rules/xorg-font-bh-lucidatypewriter-100dpi.in
@@ -1,8 +1,6 @@
 config XORG_FONT_BH_LUCIDATYPEWRITER_100DPI
 	bool
-	depends on XORG_FONT_100DPI
-	select HOST_XORG_APP_BDFTOPCF
-	select HOST_XORG_FONT_UTIL
+	select XORG_FONTS
 	prompt "BH Lucida Typewriter 100dpi"
 	help
 	  This package contains Lucida fonts in the ISO 10646-1,
diff --git a/rules/xorg-font-bh-lucidatypewriter-100dpi.make b/rules/xorg-font-bh-lucidatypewriter-100dpi.make
index 83174e2e6..71037b1c4 100644
--- a/rules/xorg-font-bh-lucidatypewriter-100dpi.make
+++ b/rules/xorg-font-bh-lucidatypewriter-100dpi.make
@@ -20,10 +20,13 @@ PACKAGES-$(PTXCONF_XORG_FONT_BH_LUCIDATYPEWRITER_100DPI) += xorg-font-bh-lucidat
 XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_VERSION	:= 1.0.0
 XORG_FONT_BH_LUCIDATYPEWRITER_100DPI		:= font-bh-lucidatypewriter-100dpi-X11R7.0-$(XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_VERSION)
 XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_SUFFIX	:= tar.bz2
-XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font//$(XORG_FONT_BH_LUCIDATYPEWRITER_100DPI).$(XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_SUFFIX)
+XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_BH_LUCIDATYPEWRITER_100DPI).$(XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_SUFFIX)
 XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_SOURCE	:= $(SRCDIR)/$(XORG_FONT_BH_LUCIDATYPEWRITER_100DPI).$(XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_SUFFIX)
 XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_DIR	:= $(BUILDDIR)/$(XORG_FONT_BH_LUCIDATYPEWRITER_100DPI)
 
+ifdef PTXCONF_XORG_FONT_BH_LUCIDATYPEWRITER_100DPI
+$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-bh-lucidatypewriter-100dpi.targetinstall
+endif
 
 # ----------------------------------------------------------------------------
 # Get
@@ -64,7 +67,9 @@ XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_ENV 	:=  $(CROSS_ENV)
 #
 # autoconf
 #
-XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_AUTOCONF := $(CROSS_AUTOCONF_USR)
+XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_AUTOCONF := \
+	$(CROSS_AUTOCONF_USR) \
+	--with-fontdir=$(XORG_FONTDIR)/100dpi
 
 $(STATEDIR)/xorg-font-bh-lucidatypewriter-100dpi.prepare: $(xorg-font-bh-lucidatypewriter-100dpi_prepare_deps_default)
 	@$(call targetinfo, $@)
@@ -104,40 +109,32 @@ xorg-font-bh-lucidatypewriter-100dpi_targetinstall: $(STATEDIR)/xorg-font-bh-luc
 $(STATEDIR)/xorg-font-bh-lucidatypewriter-100dpi.targetinstall: $(xorg-font-bh-lucidatypewriter-100dpi_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init, xorg-font-bh-lucidatypewriter-100dpi)
-	@$(call install_fixup, xorg-font-bh-lucidatypewriter-100dpi,PACKAGE,xorg-font-bh-lucidatypewriter-100dpi)
-	@$(call install_fixup, xorg-font-bh-lucidatypewriter-100dpi,PRIORITY,optional)
-	@$(call install_fixup, xorg-font-bh-lucidatypewriter-100dpi,VERSION,$(XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_VERSION))
-	@$(call install_fixup, xorg-font-bh-lucidatypewriter-100dpi,SECTION,base)
-	@$(call install_fixup, xorg-font-bh-lucidatypewriter-100dpi,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup, xorg-font-bh-lucidatypewriter-100dpi,DEPENDS,)
-	@$(call install_fixup, xorg-font-bh-lucidatypewriter-100dpi,DESCRIPTION,missing)
-
-	@cd $(XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_DIR); \
-	for file in `find . -name "*.pcf.gz" -a \! -name "*ISO8859*"`; do	\
-		if [ -e $$file ]; then \
-			$(call install_copy, xorg-font-bh-lucidatypewriter-100dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/100dpi/$$file, n); \
-		fi; \
-	done;
-
-	@cd $(XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_DIR); \
-	for file in *{ISO8859-15,ISO8859-1}.pcf.gz; do \
-		if [ -e $$file ]; then \
-			$(call install_copy, xorg-font-bh-lucidatypewriter-100dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/100dpi/$$file, n); \
-		fi; \
-	done;
+	@mkdir -p $(XORG_FONTS_DIR_INSTALL)/100dpi
+
+	@find $(XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_DIR) \
+		-name "*.pcf.gz" -a \! -name "*ISO8859*" \
+		-o -name "*ISO8859-1.pcf.gz" \
+		-o -name "*ISO8859-15.pcf.gz" \
+		| \
+		while read file; do \
+		install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/100dpi; \
+	done
 
 ifdef PTXCONF_XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_TRANS
-	@cd $(XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_DIR); \
-	for file in *{ISO8859-2,ISO8859-3,ISO8859-4,ISO8859-9,ISO8859-10,ISO8859-13,ISO8859-14}.pcf.gz; do \
-		if [ -e $$file ]; then \
-			$(call install_copy, xorg-font-bh-lucidatypewriter-100dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/100dpi/$$file, n); \
-		fi; \
-	done;
+	@find $(XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_DIR) \
+		-name "*ISO8859-2.pcf.gz" \
+		-o -name "*ISO8859-3.pcf.gz" \
+		-o -name "*ISO8859-4.pcf.gz" \
+		-o -name "*ISO8859-9.pcf.gz" \
+		-o -name "*ISO8859-10.pcf.gz" \
+		-o -name "*ISO8859-13.pcf.gz" \
+		-o -name "*ISO8859-14.pcf.gz" \
+		| \
+		while read file; do \
+		install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/100dpi; \
+	done
 endif
 
-	@$(call install_finish, xorg-font-bh-lucidatypewriter-100dpi)
-
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
diff --git a/rules/xorg-font-bh-lucidatypewriter-75dpi.in b/rules/xorg-font-bh-lucidatypewriter-75dpi.in
index 1ec6a3b8e..2e01d86cd 100644
--- a/rules/xorg-font-bh-lucidatypewriter-75dpi.in
+++ b/rules/xorg-font-bh-lucidatypewriter-75dpi.in
@@ -1,8 +1,6 @@
 config XORG_FONT_BH_LUCIDATYPEWRITER_75DPI
 	bool
-	depends on XORG_FONT_75DPI
-	select HOST_XORG_APP_BDFTOPCF
-	select HOST_XORG_FONT_UTIL
+	select XORG_FONTS
 	prompt "BH Lucida Typewriter 75dpi"
 	help
 	  This package contains fonts in the ISO 10646-1,
diff --git a/rules/xorg-font-bh-lucidatypewriter-75dpi.make b/rules/xorg-font-bh-lucidatypewriter-75dpi.make
index 93ebf6fb7..3c6c2171a 100644
--- a/rules/xorg-font-bh-lucidatypewriter-75dpi.make
+++ b/rules/xorg-font-bh-lucidatypewriter-75dpi.make
@@ -20,10 +20,13 @@ PACKAGES-$(PTXCONF_XORG_FONT_BH_LUCIDATYPEWRITER_75DPI) += xorg-font-bh-lucidaty
 XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_VERSION	:= 1.0.0
 XORG_FONT_BH_LUCIDATYPEWRITER_75DPI		:= font-bh-lucidatypewriter-75dpi-X11R7.0-$(XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_VERSION)
 XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_SUFFIX	:= tar.bz2
-XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font//$(XORG_FONT_BH_LUCIDATYPEWRITER_75DPI).$(XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_SUFFIX)
+XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_BH_LUCIDATYPEWRITER_75DPI).$(XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_SUFFIX)
 XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_SOURCE	:= $(SRCDIR)/$(XORG_FONT_BH_LUCIDATYPEWRITER_75DPI).$(XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_SUFFIX)
 XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_DIR		:= $(BUILDDIR)/$(XORG_FONT_BH_LUCIDATYPEWRITER_75DPI)
 
+ifdef PTXCONF_XORG_FONT_BH_LUCIDATYPEWRITER_75DPI
+$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-bh-lucidatypewriter-75dpi.targetinstall
+endif
 
 # ----------------------------------------------------------------------------
 # Get
@@ -64,7 +67,9 @@ XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_ENV 	:=  $(CROSS_ENV)
 #
 # autoconf
 #
-XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_AUTOCONF := $(CROSS_AUTOCONF_USR)
+XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_AUTOCONF := \
+	$(CROSS_AUTOCONF_USR) \
+	--with-fontdir=$(XORG_FONTDIR)/100dpi
 
 $(STATEDIR)/xorg-font-bh-lucidatypewriter-75dpi.prepare: $(xorg-font-bh-lucidatypewriter-75dpi_prepare_deps_default)
 	@$(call targetinfo, $@)
@@ -104,40 +109,32 @@ xorg-font-bh-lucidatypewriter-75dpi_targetinstall: $(STATEDIR)/xorg-font-bh-luci
 $(STATEDIR)/xorg-font-bh-lucidatypewriter-75dpi.targetinstall: $(xorg-font-bh-lucidatypewriter-75dpi_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init, xorg-font-bh-lucidatypewriter-75dpi)
-	@$(call install_fixup, xorg-font-bh-lucidatypewriter-75dpi,PACKAGE,xorg-font-bh-lucidatypewriter-75dpi)
-	@$(call install_fixup, xorg-font-bh-lucidatypewriter-75dpi,PRIORITY,optional)
-	@$(call install_fixup, xorg-font-bh-lucidatypewriter-75dpi,VERSION,$(XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_VERSION))
-	@$(call install_fixup, xorg-font-bh-lucidatypewriter-75dpi,SECTION,base)
-	@$(call install_fixup, xorg-font-bh-lucidatypewriter-75dpi,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup, xorg-font-bh-lucidatypewriter-75dpi,DEPENDS,)
-	@$(call install_fixup, xorg-font-bh-lucidatypewriter-75dpi,DESCRIPTION,missing)
-
-	@cd $(XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_DIR); \
-	for file in `find . -name "*.pcf.gz" -a \! -name "*ISO8859*"`; do	\
-		if [ -e $$file ]; then \
-			$(call install_copy, xorg-font-bh-lucidatypewriter-75dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/75dpi/$$file, n); \
-		fi; \
-	done;
-
-	@cd $(XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_DIR); \
-	for file in *{ISO8859-15,ISO8859-1}.pcf.gz; do \
-		if [ -e $$file ]; then \
-			$(call install_copy, xorg-font-bh-lucidatypewriter-75dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/75dpi/$$file, n); \
-		fi; \
-	done;
+	@mkdir -p $(XORG_FONTS_DIR_INSTALL)/75dpi
+
+	@find $(XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_DIR) \
+		-name "*.pcf.gz" -a \! -name "*ISO8859*" \
+		-o -name "*ISO8859-1.pcf.gz" \
+		-o -name "*ISO8859-15.pcf.gz" \
+		| \
+		while read file; do \
+		install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/75dpi; \
+	done
 
 ifdef PTXCONF_XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_TRANS
-	@cd $(XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_DIR); \
-	for file in *{ISO8859-2,ISO8859-3,ISO8859-4,ISO8859-9,ISO8859-10,ISO8859-13,ISO8859-14}.pcf.gz; do \
-		if [ -e $$file ]; then \
-			$(call install_copy, xorg-font-bh-lucidatypewriter-75dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/75dpi/$$file, n); \
-		fi; \
-	done;
+	@find $(XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_DIR) \
+		-name "*ISO8859-2.pcf.gz" \
+		-o -name "*ISO8859-3.pcf.gz" \
+		-o -name "*ISO8859-4.pcf.gz" \
+		-o -name "*ISO8859-9.pcf.gz" \
+		-o -name "*ISO8859-10.pcf.gz" \
+		-o -name "*ISO8859-13.pcf.gz" \
+		-o -name "*ISO8859-14.pcf.gz" \
+		| \
+		while read file; do \
+		install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/75dpi; \
+	done
 endif
 
-	@$(call install_finish, xorg-font-bh-lucidatypewriter-75dpi)
-
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
diff --git a/rules/xorg-font-bh-ttf.in b/rules/xorg-font-bh-ttf.in
index debab2d25..23b455ed9 100644
--- a/rules/xorg-font-bh-ttf.in
+++ b/rules/xorg-font-bh-ttf.in
@@ -1,6 +1,6 @@
 config XORG_FONT_BH_TTF
 	bool
-	depends on XORG_FONT_TTF
+	select XORG_FONTS
 	default y
 	prompt "BH ttf"
 	help
diff --git a/rules/xorg-font-bh-ttf.make b/rules/xorg-font-bh-ttf.make
index 7a8243b12..6d7139ccd 100644
--- a/rules/xorg-font-bh-ttf.make
+++ b/rules/xorg-font-bh-ttf.make
@@ -20,10 +20,13 @@ PACKAGES-$(PTXCONF_XORG_FONT_BH_TTF) += xorg-font-bh-ttf
 XORG_FONT_BH_TTF_VERSION	:= 1.0.0
 XORG_FONT_BH_TTF		:= font-bh-ttf-X11R7.0-$(XORG_FONT_BH_TTF_VERSION)
 XORG_FONT_BH_TTF_SUFFIX		:= tar.bz2
-XORG_FONT_BH_TTF_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font//$(XORG_FONT_BH_TTF).$(XORG_FONT_BH_TTF_SUFFIX)
+XORG_FONT_BH_TTF_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_BH_TTF).$(XORG_FONT_BH_TTF_SUFFIX)
 XORG_FONT_BH_TTF_SOURCE		:= $(SRCDIR)/$(XORG_FONT_BH_TTF).$(XORG_FONT_BH_TTF_SUFFIX)
 XORG_FONT_BH_TTF_DIR		:= $(BUILDDIR)/$(XORG_FONT_BH_TTF)
 
+ifdef PTXCONF_XORG_FONT_BH_TTF
+$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-bh-ttf.targetinstall
+endif
 
 # ----------------------------------------------------------------------------
 # Get
@@ -64,7 +67,9 @@ XORG_FONT_BH_TTF_ENV 	:=  $(CROSS_ENV)
 #
 # autoconf
 #
-XORG_FONT_BH_TTF_AUTOCONF := $(CROSS_AUTOCONF_USR)
+XORG_FONT_BH_TTF_AUTOCONF := \
+	$(CROSS_AUTOCONF_USR) \
+	--with-fontdir=$(XORG_FONTDIR)/truetype
 
 $(STATEDIR)/xorg-font-bh-ttf.prepare: $(xorg-font-bh-ttf_prepare_deps_default)
 	@$(call targetinfo, $@)
@@ -82,7 +87,7 @@ xorg-font-bh-ttf_compile: $(STATEDIR)/xorg-font-bh-ttf.compile
 
 $(STATEDIR)/xorg-font-bh-ttf.compile: $(xorg-font-bh-ttf_compile_deps_default)
 	@$(call targetinfo, $@)
-	cd $(XORG_FONT_BH_TTF_DIR) && $(XORG_FONT_BH_TTF_PATH) make
+	cd $(XORG_FONT_BH_TTF_DIR) && $(XORG_FONT_BH_TTF_PATH) $(MAKE)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
@@ -104,23 +109,14 @@ xorg-font-bh-ttf_targetinstall: $(STATEDIR)/xorg-font-bh-ttf.targetinstall
 $(STATEDIR)/xorg-font-bh-ttf.targetinstall: $(xorg-font-bh-ttf_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init, xorg-font-bh-ttf)
-	@$(call install_fixup, xorg-font-bh-ttf,PACKAGE,xorg-font-bh-ttf)
-	@$(call install_fixup, xorg-font-bh-ttf,PRIORITY,optional)
-	@$(call install_fixup, xorg-font-bh-ttf,VERSION,$(XORG_FONT_BH_TTF_VERSION))
-	@$(call install_fixup, xorg-font-bh-ttf,SECTION,base)
-	@$(call install_fixup, xorg-font-bh-ttf,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup, xorg-font-bh-ttf,DEPENDS,)
-	@$(call install_fixup, xorg-font-bh-ttf,DESCRIPTION,missing)
-
-	@cd $(XORG_FONT_BH_TTF_DIR); \
-	for file in *.ttf; do \
-		if [ -e $$file ]; then \
-			$(call install_copy, xorg-font-bh-ttf, 0, 0, 0644, $$file, $(XORG_FONTDIR)/truetype/$$file, n); \
-		fi; \
-	done;
-
-	@$(call install_finish, xorg-font-bh-ttf)
+	@mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
+
+	@find $(XORG_FONT_BH_TTF_DIR) \
+		-name "*.ttf" \
+		| \
+		while read file; do \
+		install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
+	done
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-font-bitstream-100dpi.in b/rules/xorg-font-bitstream-100dpi.in
index f5ade65bc..260f63a9c 100644
--- a/rules/xorg-font-bitstream-100dpi.in
+++ b/rules/xorg-font-bitstream-100dpi.in
@@ -1,6 +1,6 @@
 config XORG_FONT_BITSTREAM_100DPI
 	bool
-	depends on XORG_FONT_100DPI
+	select XORG_FONTS
 	prompt "Bitstream 100dpi"
 	help
 	  This package contains Bitstream fonts in the ISO 10646-1,
diff --git a/rules/xorg-font-bitstream-100dpi.make b/rules/xorg-font-bitstream-100dpi.make
index 30cdbce09..f0315a439 100644
--- a/rules/xorg-font-bitstream-100dpi.make
+++ b/rules/xorg-font-bitstream-100dpi.make
@@ -20,10 +20,13 @@ PACKAGES-$(PTXCONF_XORG_FONT_BITSTREAM_100DPI) += xorg-font-bitstream-100dpi
 XORG_FONT_BITSTREAM_100DPI_VERSION	:= 1.0.0
 XORG_FONT_BITSTREAM_100DPI		:= font-bitstream-100dpi-X11R7.0-$(XORG_FONT_BITSTREAM_100DPI_VERSION)
 XORG_FONT_BITSTREAM_100DPI_SUFFIX	:= tar.bz2
-XORG_FONT_BITSTREAM_100DPI_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font//$(XORG_FONT_BITSTREAM_100DPI).$(XORG_FONT_BITSTREAM_100DPI_SUFFIX)
+XORG_FONT_BITSTREAM_100DPI_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_BITSTREAM_100DPI).$(XORG_FONT_BITSTREAM_100DPI_SUFFIX)
 XORG_FONT_BITSTREAM_100DPI_SOURCE	:= $(SRCDIR)/$(XORG_FONT_BITSTREAM_100DPI).$(XORG_FONT_BITSTREAM_100DPI_SUFFIX)
 XORG_FONT_BITSTREAM_100DPI_DIR		:= $(BUILDDIR)/$(XORG_FONT_BITSTREAM_100DPI)
 
+ifdef PTXCONF_XORG_FONT_BITSTREAM_100DPI
+$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-bitstream-100dpi.targetinstall
+endif
 
 # ----------------------------------------------------------------------------
 # Get
@@ -64,7 +67,9 @@ XORG_FONT_BITSTREAM_100DPI_ENV 	:=  $(CROSS_ENV)
 #
 # autoconf
 #
-XORG_FONT_BITSTREAM_100DPI_AUTOCONF := $(CROSS_AUTOCONF_USR)
+XORG_FONT_BITSTREAM_100DPI_AUTOCONF := \
+	$(CROSS_AUTOCONF_USR) \
+	--with-fontdir=$(XORG_FONTDIR)/100dpi
 
 $(STATEDIR)/xorg-font-bitstream-100dpi.prepare: $(xorg-font-bitstream-100dpi_prepare_deps_default)
 	@$(call targetinfo, $@)
@@ -82,7 +87,7 @@ xorg-font-bitstream-100dpi_compile: $(STATEDIR)/xorg-font-bitstream-100dpi.compi
 
 $(STATEDIR)/xorg-font-bitstream-100dpi.compile: $(xorg-font-bitstream-100dpi_compile_deps_default)
 	@$(call targetinfo, $@)
-	cd $(XORG_FONT_BITSTREAM_100DPI_DIR) && $(XORG_FONT_BITSTREAM_100DPI_PATH) make
+	cd $(XORG_FONT_BITSTREAM_100DPI_DIR) && $(XORG_FONT_BITSTREAM_100DPI_PATH) $(MAKE)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
@@ -104,39 +109,14 @@ xorg-font-bitstream-100dpi_targetinstall: $(STATEDIR)/xorg-font-bitstream-100dpi
 $(STATEDIR)/xorg-font-bitstream-100dpi.targetinstall: $(xorg-font-bitstream-100dpi_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init, xorg-font-bitstream-100dpi)
-	@$(call install_fixup, xorg-font-bitstream-100dpi,PACKAGE,xorg-font-bitstream-100dpi)
-	@$(call install_fixup, xorg-font-bitstream-100dpi,PRIORITY,optional)
-	@$(call install_fixup, xorg-font-bitstream-100dpi,VERSION,$(XORG_FONT_BITSTREAM_100DPI_VERSION))
-	@$(call install_fixup, xorg-font-bitstream-100dpi,SECTION,base)
-	@$(call install_fixup, xorg-font-bitstream-100dpi,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup, xorg-font-bitstream-100dpi,DEPENDS,)
-	@$(call install_fixup, xorg-font-bitstream-100dpi,DESCRIPTION,missing)
-
-	@cd $(XORG_FONT_BITSTREAM_100DPI_DIR); \
-	for file in `find . -name "*.pcf.gz" -a \! -name "*ISO8859*"`; do	\
-		if [ -e $$file ]; then \
-			$(call install_copy, xorg-font-bitstream-100dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/100dpi/$$file, n); \
-		fi; \
-	done;
-
-	@cd $(XORG_FONT_BITSTREAM_100DPI_DIR); \
-	for file in *{ISO8859-15,ISO8859-1}.pcf.gz; do \
-		if [ -e $$file ];then \
-			$(call install_copy, xorg-font-bitstream-100dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/100dpi/$$file, n); \
-		fi; \
-	done;
-
-ifdef PTXCONF_XORG_FONT_BITSTREAM_100DPI_TRANS
-	@cd $(XORG_FONT_BITSTREAM_100DPI_DIR); \
-	for file in *{ISO8859-2,ISO8859-3,ISO8859-4,ISO8859-9,ISO8859-10,ISO8859-13,ISO8859-14}.pcf.gz; do \
-		if [ -e $$file ]; then \
-			$(call install_copy, xorg-font-bitstream-100dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/100dpi/$$file, n); \
-		fi; \
-	done;
-endif
+	@mkdir -p $(XORG_FONTS_DIR_INSTALL)/100dpi
 
-	@$(call install_finish, xorg-font-bitstream-100dpi)
+	@find $(XORG_FONT_BITSTREAM_100DPI_DIR) \
+		-name "*.pcf.gz" \
+		| \
+		while read file; do \
+		install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/100dpi; \
+	done
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-font-bitstream-75dpi.in b/rules/xorg-font-bitstream-75dpi.in
index 7ac0a27bf..f54725045 100644
--- a/rules/xorg-font-bitstream-75dpi.in
+++ b/rules/xorg-font-bitstream-75dpi.in
@@ -1,6 +1,6 @@
 config XORG_FONT_BITSTREAM_75DPI
 	bool
-	depends on XORG_FONT_75DPI
+	select XORG_FONTS
 	prompt "Bitstream 75dpi"
 	help
 	  This package contains Bitstream fonts in the ISO 10646-1,
diff --git a/rules/xorg-font-bitstream-75dpi.make b/rules/xorg-font-bitstream-75dpi.make
index 5338c0ff3..20bfaa05f 100644
--- a/rules/xorg-font-bitstream-75dpi.make
+++ b/rules/xorg-font-bitstream-75dpi.make
@@ -20,10 +20,13 @@ PACKAGES-$(PTXCONF_XORG_FONT_BITSTREAM_75DPI) += xorg-font-bitstream-75dpi
 XORG_FONT_BITSTREAM_75DPI_VERSION	:= 1.0.0
 XORG_FONT_BITSTREAM_75DPI		:= font-bitstream-75dpi-X11R7.0-$(XORG_FONT_BITSTREAM_75DPI_VERSION)
 XORG_FONT_BITSTREAM_75DPI_SUFFIX	:= tar.bz2
-XORG_FONT_BITSTREAM_75DPI_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font//$(XORG_FONT_BITSTREAM_75DPI).$(XORG_FONT_BITSTREAM_75DPI_SUFFIX)
+XORG_FONT_BITSTREAM_75DPI_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_BITSTREAM_75DPI).$(XORG_FONT_BITSTREAM_75DPI_SUFFIX)
 XORG_FONT_BITSTREAM_75DPI_SOURCE	:= $(SRCDIR)/$(XORG_FONT_BITSTREAM_75DPI).$(XORG_FONT_BITSTREAM_75DPI_SUFFIX)
 XORG_FONT_BITSTREAM_75DPI_DIR		:= $(BUILDDIR)/$(XORG_FONT_BITSTREAM_75DPI)
 
+ifdef PTXCONF_XORG_FONT_BITSTREAM_75DPI
+$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-bitstream-75dpi.targetinstall
+endif
 
 # ----------------------------------------------------------------------------
 # Get
@@ -64,7 +67,10 @@ XORG_FONT_BITSTREAM_75DPI_ENV 	:=  $(CROSS_ENV)
 #
 # autoconf
 #
-XORG_FONT_BITSTREAM_75DPI_AUTOCONF := $(CROSS_AUTOCONF_USR)
+XORG_FONT_BITSTREAM_75DPI_AUTOCONF := \
+	$(CROSS_AUTOCONF_USR) \
+	--with-fontdir=$(XORG_FONTDIR)/75dpi
+
 
 $(STATEDIR)/xorg-font-bitstream-75dpi.prepare: $(xorg-font-bitstream-75dpi_prepare_deps_default)
 	@$(call targetinfo, $@)
@@ -82,7 +88,7 @@ xorg-font-bitstream-75dpi_compile: $(STATEDIR)/xorg-font-bitstream-75dpi.compile
 
 $(STATEDIR)/xorg-font-bitstream-75dpi.compile: $(xorg-font-bitstream-75dpi_compile_deps_default)
 	@$(call targetinfo, $@)
-	cd $(XORG_FONT_BITSTREAM_75DPI_DIR) && $(XORG_FONT_BITSTREAM_75DPI_PATH) make
+	cd $(XORG_FONT_BITSTREAM_75DPI_DIR) && $(XORG_FONT_BITSTREAM_75DPI_PATH) $(MAKE)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
@@ -104,39 +110,14 @@ xorg-font-bitstream-75dpi_targetinstall: $(STATEDIR)/xorg-font-bitstream-75dpi.t
 $(STATEDIR)/xorg-font-bitstream-75dpi.targetinstall: $(xorg-font-bitstream-75dpi_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init, xorg-font-bitstream-75dpi)
-	@$(call install_fixup, xorg-font-bitstream-75dpi,PACKAGE,xorg-font-bitstream-75dpi)
-	@$(call install_fixup, xorg-font-bitstream-75dpi,PRIORITY,optional)
-	@$(call install_fixup, xorg-font-bitstream-75dpi,VERSION,$(XORG_FONT_BITSTREAM_75DPI_VERSION))
-	@$(call install_fixup, xorg-font-bitstream-75dpi,SECTION,base)
-	@$(call install_fixup, xorg-font-bitstream-75dpi,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup, xorg-font-bitstream-75dpi,DEPENDS,)
-	@$(call install_fixup, xorg-font-bitstream-75dpi,DESCRIPTION,missing)
-
-	@cd $(XORG_FONT_BITSTREAM_75DPI_DIR); \
-	for file in `find . -name "*.pcf.gz" -a \! -name "*ISO8859*"`; do	\
-		if [ -e $$file ]; then \
-			$(call install_copy, xorg-font-bitstream-75dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/75dpi/$$file, n); \
-		fi; \
-	done;
-
-	@cd $(XORG_FONT_BITSTREAM_75DPI_DIR); \
-	for file in *{ISO8859-15,ISO8859-1}.pcf.gz; do \
-		if [ -e $$file ];then \
-			$(call install_copy, xorg-font-bitstream-75dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/75dpi/$$file, n); \
-		fi; \
-	done;
-
-ifdef PTXCONF_XORG_FONT_BITSTREAM_75DPI_TRANS
-	@cd $(XORG_FONT_BITSTREAM_75DPI_DIR); \
-	for file in *{ISO8859-2,ISO8859-3,ISO8859-4,ISO8859-9,ISO8859-10,ISO8859-13,ISO8859-14}.pcf.gz; do \
-		if [ -e $$file ]; then \
-			$(call install_copy, xorg-font-bitstream-75dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/75dpi/$$file, n); \
-		fi; \
-	done;
-endif
+	@mkdir -p $(XORG_FONTS_DIR_INSTALL)/75dpi
 
-	@$(call install_finish, xorg-font-bitstream-75dpi)
+	@find $(XORG_FONT_BITSTREAM_75DPI_DIR) \
+		-name "*.pcf.gz" \
+		| \
+		while read file; do \
+		install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/75dpi; \
+	done
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-font-bitstream-speedo.in b/rules/xorg-font-bitstream-speedo.in
index cd37630ad..522ef9e14 100644
--- a/rules/xorg-font-bitstream-speedo.in
+++ b/rules/xorg-font-bitstream-speedo.in
@@ -1,6 +1,6 @@
 config XORG_FONT_BITSTREAM_SPEEDO
 	bool
-	depends on XORG_FONT_SCALABLE
+	select XORG_FONTS
 	prompt "Bitstream speedo"
 	help
 	  This package contains the Speedo version of Bitstream 
diff --git a/rules/xorg-font-bitstream-speedo.make b/rules/xorg-font-bitstream-speedo.make
index c500b20e0..83414ab7e 100644
--- a/rules/xorg-font-bitstream-speedo.make
+++ b/rules/xorg-font-bitstream-speedo.make
@@ -20,10 +20,13 @@ PACKAGES-$(PTXCONF_XORG_FONT_BITSTREAM_SPEEDO) += xorg-font-bitstream-speedo
 XORG_FONT_BITSTREAM_SPEEDO_VERSION	:= 1.0.0
 XORG_FONT_BITSTREAM_SPEEDO		:= font-bitstream-speedo-X11R7.0-$(XORG_FONT_BITSTREAM_SPEEDO_VERSION)
 XORG_FONT_BITSTREAM_SPEEDO_SUFFIX	:= tar.bz2
-XORG_FONT_BITSTREAM_SPEEDO_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font//$(XORG_FONT_BITSTREAM_SPEEDO).$(XORG_FONT_BITSTREAM_SPEEDO_SUFFIX)
+XORG_FONT_BITSTREAM_SPEEDO_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_BITSTREAM_SPEEDO).$(XORG_FONT_BITSTREAM_SPEEDO_SUFFIX)
 XORG_FONT_BITSTREAM_SPEEDO_SOURCE	:= $(SRCDIR)/$(XORG_FONT_BITSTREAM_SPEEDO).$(XORG_FONT_BITSTREAM_SPEEDO_SUFFIX)
 XORG_FONT_BITSTREAM_SPEEDO_DIR		:= $(BUILDDIR)/$(XORG_FONT_BITSTREAM_SPEEDO)
 
+ifdef PTXCONF_XORG_FONT_BITSTREAM_SPEEDO
+$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-bitstream-speedo.targetinstall
+endif
 
 # ----------------------------------------------------------------------------
 # Get
@@ -64,7 +67,9 @@ XORG_FONT_BITSTREAM_SPEEDO_ENV 	:=  $(CROSS_ENV)
 #
 # autoconf
 #
-XORG_FONT_BITSTREAM_SPEEDO_AUTOCONF := $(CROSS_AUTOCONF_USR)
+XORG_FONT_BITSTREAM_SPEEDO_AUTOCONF := \
+	$(CROSS_AUTOCONF_USR) \
+	--with-fontdir=$(XORG_FONTDIR)/Speedo
 
 $(STATEDIR)/xorg-font-bitstream-speedo.prepare: $(xorg-font-bitstream-speedo_prepare_deps_default)
 	@$(call targetinfo, $@)
@@ -104,21 +109,15 @@ xorg-font-bitstream-speedo_targetinstall: $(STATEDIR)/xorg-font-bitstream-speedo
 $(STATEDIR)/xorg-font-bitstream-speedo.targetinstall: $(xorg-font-bitstream-speedo_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init, xorg-font-bitstream-speedo)
-	@$(call install_fixup, xorg-font-bitstream-speedo,PACKAGE,xorg-font-bitstream-speedo)
-	@$(call install_fixup, xorg-font-bitstream-speedo,PRIORITY,optional)
-	@$(call install_fixup, xorg-font-bitstream-speedo,VERSION,$(XORG_FONT_BITSTREAM_SPEEDO_VERSION))
-	@$(call install_fixup, xorg-font-bitstream-speedo,SECTION,base)
-	@$(call install_fixup, xorg-font-bitstream-speedo,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup, xorg-font-bitstream-speedo,DEPENDS,)
-	@$(call install_fixup, xorg-font-bitstream-speedo,DESCRIPTION,missing)
-
-	@cd $(XORG_FONT_BITSTREAM_SPEEDO_DIR); \
-	for file in *.spd; do	\
-		$(call install_copy, xorg-font-bitstream-speedo, 0, 0, 0644, $$file, $(XORG_FONTDIR)/Speedo/$$file, n); \
-	done
+	@mkdir -p $(XORG_FONTS_DIR_INSTALL)/Speedo
 
-	@$(call install_finish, xorg-font-bitstream-speedo)
+	@find $(XORG_FONT_BITSTREAM_SPEEDO_DIR) \
+		-name "*.spd" \
+		-o -name "fonts.scale" \
+		| \
+		while read file; do \
+		install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/Speedo; \
+	done
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-font-bitstream-type1.in b/rules/xorg-font-bitstream-type1.in
index af978249d..f9f9c738e 100644
--- a/rules/xorg-font-bitstream-type1.in
+++ b/rules/xorg-font-bitstream-type1.in
@@ -1,6 +1,6 @@
 config XORG_FONT_BITSTREAM_TYPE1
 	bool
-	depends on XORG_FONT_SCALABLE
+	select XORG_FONTS
 	default y
 	prompt "Bitstream type1"
 	help
diff --git a/rules/xorg-font-bitstream-type1.make b/rules/xorg-font-bitstream-type1.make
index 1f6d14137..3f5b7d0fa 100644
--- a/rules/xorg-font-bitstream-type1.make
+++ b/rules/xorg-font-bitstream-type1.make
@@ -20,10 +20,13 @@ PACKAGES-$(PTXCONF_XORG_FONT_BITSTREAM_TYPE1) += xorg-font-bitstream-type1
 XORG_FONT_BITSTREAM_TYPE1_VERSION	:= 1.0.0
 XORG_FONT_BITSTREAM_TYPE1		:= font-bitstream-type1-X11R7.0-$(XORG_FONT_BITSTREAM_TYPE1_VERSION)
 XORG_FONT_BITSTREAM_TYPE1_SUFFIX	:= tar.bz2
-XORG_FONT_BITSTREAM_TYPE1_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font//$(XORG_FONT_BITSTREAM_TYPE1).$(XORG_FONT_BITSTREAM_TYPE1_SUFFIX)
+XORG_FONT_BITSTREAM_TYPE1_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_BITSTREAM_TYPE1).$(XORG_FONT_BITSTREAM_TYPE1_SUFFIX)
 XORG_FONT_BITSTREAM_TYPE1_SOURCE	:= $(SRCDIR)/$(XORG_FONT_BITSTREAM_TYPE1).$(XORG_FONT_BITSTREAM_TYPE1_SUFFIX)
 XORG_FONT_BITSTREAM_TYPE1_DIR		:= $(BUILDDIR)/$(XORG_FONT_BITSTREAM_TYPE1)
 
+ifdef PTXCONF_XORG_FONT_BITSTREAM_TYPE1
+$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-bitstream-type1.targetinstall
+endif
 
 # ----------------------------------------------------------------------------
 # Get
@@ -64,7 +67,9 @@ XORG_FONT_BITSTREAM_TYPE1_ENV 	:=  $(CROSS_ENV)
 #
 # autoconf
 #
-XORG_FONT_BITSTREAM_TYPE1_AUTOCONF := $(CROSS_AUTOCONF_USR)
+XORG_FONT_BITSTREAM_TYPE1_AUTOCONF := \
+	$(CROSS_AUTOCONF_USR) \
+	--with-fontdir=$(XORG_FONTDIR)/Type1
 
 $(STATEDIR)/xorg-font-bitstream-type1.prepare: $(xorg-font-bitstream-type1_prepare_deps_default)
 	@$(call targetinfo, $@)
@@ -82,7 +87,7 @@ xorg-font-bitstream-type1_compile: $(STATEDIR)/xorg-font-bitstream-type1.compile
 
 $(STATEDIR)/xorg-font-bitstream-type1.compile: $(xorg-font-bitstream-type1_compile_deps_default)
 	@$(call targetinfo, $@)
-	cd $(XORG_FONT_BITSTREAM_TYPE1_DIR) && $(XORG_FONT_BITSTREAM_TYPE1_PATH) make
+	cd $(XORG_FONT_BITSTREAM_TYPE1_DIR) && $(XORG_FONT_BITSTREAM_TYPE1_PATH) $(MAKE)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
@@ -104,21 +109,15 @@ xorg-font-bitstream-type1_targetinstall: $(STATEDIR)/xorg-font-bitstream-type1.t
 $(STATEDIR)/xorg-font-bitstream-type1.targetinstall: $(xorg-font-bitstream-type1_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init, xorg-font-bitstream-type1)
-	@$(call install_fixup, xorg-font-bitstream-type1,PACKAGE,xorg-font-bitstream-type1)
-	@$(call install_fixup, xorg-font-bitstream-type1,PRIORITY,optional)
-	@$(call install_fixup, xorg-font-bitstream-type1,VERSION,$(XORG_FONT_BITSTREAM_TYPE1_VERSION))
-	@$(call install_fixup, xorg-font-bitstream-type1,SECTION,base)
-	@$(call install_fixup, xorg-font-bitstream-type1,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup, xorg-font-bitstream-type1,DEPENDS,)
-	@$(call install_fixup, xorg-font-bitstream-type1,DESCRIPTION,missing)
-
-	@cd $(XORG_FONT_BITSTREAM_TYPE1_DIR); \
-	for file in *.afm *.pfb; do	\
-		$(call install_copy, xorg-font-bitstream-type1, 0, 0, 0644, $$file, $(XORG_FONTDIR)/Type1/$$file, n); \
-	done
+	@mkdir -p $(XORG_FONTS_DIR_INSTALL)/Type1
 
-	@$(call install_finish, xorg-font-bitstream-type1)
+	@find $(XORG_FONT_BITSTREAM_TYPE1_DIR) \
+		-name "*.afm" \
+		-o -name "*.pfb" \
+		| \
+		while read file; do \
+		install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/Type1; \
+	done
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-font-cronyx-cyrillic.in b/rules/xorg-font-cronyx-cyrillic.in
index 5fd01dd6d..273fd62b4 100644
--- a/rules/xorg-font-cronyx-cyrillic.in
+++ b/rules/xorg-font-cronyx-cyrillic.in
@@ -1,6 +1,6 @@
 config XORG_FONT_CRONYX_CYRILLIC
 	bool
-	depends on XORG_FONT_INTL
+	select XORG_FONTS
 	prompt "Cronyx cyrillic"
 	help
 	  FIXME
diff --git a/rules/xorg-font-cronyx-cyrillic.make b/rules/xorg-font-cronyx-cyrillic.make
index a89df0ee7..fe8c63ef8 100644
--- a/rules/xorg-font-cronyx-cyrillic.make
+++ b/rules/xorg-font-cronyx-cyrillic.make
@@ -20,10 +20,13 @@ PACKAGES-$(PTXCONF_XORG_FONT_CRONYX_CYRILLIC) += xorg-font-cronyx-cyrillic
 XORG_FONT_CRONYX_CYRILLIC_VERSION	:= 1.0.0
 XORG_FONT_CRONYX_CYRILLIC		:= font-cronyx-cyrillic-X11R7.0-$(XORG_FONT_CRONYX_CYRILLIC_VERSION)
 XORG_FONT_CRONYX_CYRILLIC_SUFFIX	:= tar.bz2
-XORG_FONT_CRONYX_CYRILLIC_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font//$(XORG_FONT_CRONYX_CYRILLIC).$(XORG_FONT_CRONYX_CYRILLIC_SUFFIX)
+XORG_FONT_CRONYX_CYRILLIC_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_CRONYX_CYRILLIC).$(XORG_FONT_CRONYX_CYRILLIC_SUFFIX)
 XORG_FONT_CRONYX_CYRILLIC_SOURCE	:= $(SRCDIR)/$(XORG_FONT_CRONYX_CYRILLIC).$(XORG_FONT_CRONYX_CYRILLIC_SUFFIX)
 XORG_FONT_CRONYX_CYRILLIC_DIR		:= $(BUILDDIR)/$(XORG_FONT_CRONYX_CYRILLIC)
 
+ifdef PTXCONF_XORG_FONT_CRONYX_CYRILLIC
+$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-cronyx-cyrillic.targetinstall
+endif
 
 # ----------------------------------------------------------------------------
 # Get
@@ -64,7 +67,9 @@ XORG_FONT_CRONYX_CYRILLIC_ENV 	:=  $(CROSS_ENV)
 #
 # autoconf
 #
-XORG_FONT_CRONYX_CYRILLIC_AUTOCONF := $(CROSS_AUTOCONF_USR)
+XORG_FONT_CRONYX_CYRILLIC_AUTOCONF := \
+	$(CROSS_AUTOCONF_USR) \
+	--with-fontdir=$(XORG_FONTDIR)/cyrillic
 
 $(STATEDIR)/xorg-font-cronyx-cyrillic.prepare: $(xorg-font-cronyx-cyrillic_prepare_deps_default)
 	@$(call targetinfo, $@)
@@ -82,7 +87,7 @@ xorg-font-cronyx-cyrillic_compile: $(STATEDIR)/xorg-font-cronyx-cyrillic.compile
 
 $(STATEDIR)/xorg-font-cronyx-cyrillic.compile: $(xorg-font-cronyx-cyrillic_compile_deps_default)
 	@$(call targetinfo, $@)
-	cd $(XORG_FONT_CRONYX_CYRILLIC_DIR) && $(XORG_FONT_CRONYX_CYRILLIC_PATH) make
+	cd $(XORG_FONT_CRONYX_CYRILLIC_DIR) && $(XORG_FONT_CRONYX_CYRILLIC_PATH) $(MAKE)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
@@ -104,21 +109,14 @@ xorg-font-cronyx-cyrillic_targetinstall: $(STATEDIR)/xorg-font-cronyx-cyrillic.t
 $(STATEDIR)/xorg-font-cronyx-cyrillic.targetinstall: $(xorg-font-cronyx-cyrillic_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init, xorg-font-cronyx-cyrillic)
-	@$(call install_fixup, xorg-font-cronyx-cyrillic,PACKAGE,xorg-font-cronyx-cyrillic)
-	@$(call install_fixup, xorg-font-cronyx-cyrillic,PRIORITY,optional)
-	@$(call install_fixup, xorg-font-cronyx-cyrillic,VERSION,$(XORG_FONT_CRONYX_CYRILLIC_VERSION))
-	@$(call install_fixup, xorg-font-cronyx-cyrillic,SECTION,base)
-	@$(call install_fixup, xorg-font-cronyx-cyrillic,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup, xorg-font-cronyx-cyrillic,DEPENDS,)
-	@$(call install_fixup, xorg-font-cronyx-cyrillic,DESCRIPTION,missing)
-
-	@cd $(XORG_FONT_CRONYX_CYRILLIC_DIR); \
-	for file in *.pcf.gz; do	\
-		$(call install_copy, xorg-font-cronyx-cyrillic, 0, 0, 0644, $$file, $(XORG_FONTDIR)/cyrillic/$$file, n); \
-	done
+	@mkdir -p $(XORG_FONTS_DIR_INSTALL)/cyrillic
 
-	@$(call install_finish, xorg-font-cronyx-cyrillic)
+	@find $(XORG_FONT_CRONYX_CYRILLIC_DIR) \
+		-name "*.pcf.gz" \
+		| \
+		while read file; do \
+		install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/cyrillic; \
+	done
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-font-cursor-misc.in b/rules/xorg-font-cursor-misc.in
index 257f1dae0..8375a3e79 100644
--- a/rules/xorg-font-cursor-misc.in
+++ b/rules/xorg-font-cursor-misc.in
@@ -1,7 +1,6 @@
 config XORG_FONT_CURSOR_MISC
 	bool
-	depends on XORG_FONT_BASE
-	select HOST_XORG_APP_BDFTOPCF
+	select XORG_FONTS
 	default y
 	prompt "Cursor misc"
 	help
diff --git a/rules/xorg-font-cursor-misc.make b/rules/xorg-font-cursor-misc.make
index eebb28a0c..4105bcac9 100644
--- a/rules/xorg-font-cursor-misc.make
+++ b/rules/xorg-font-cursor-misc.make
@@ -24,6 +24,9 @@ XORG_FONT_CURSOR_MISC_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font//$(XOR
 XORG_FONT_CURSOR_MISC_SOURCE	:= $(SRCDIR)/$(XORG_FONT_CURSOR_MISC).$(XORG_FONT_CURSOR_MISC_SUFFIX)
 XORG_FONT_CURSOR_MISC_DIR	:= $(BUILDDIR)/$(XORG_FONT_CURSOR_MISC)
 
+ifdef PTXCONF_XORG_FONT_CURSOR_MISC
+$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-cursor-misc.targetinstall
+endif
 
 # ----------------------------------------------------------------------------
 # Get
@@ -64,7 +67,9 @@ XORG_FONT_CURSOR_MISC_ENV 	:=  $(CROSS_ENV)
 #
 # autoconf
 #
-XORG_FONT_CURSOR_MISC_AUTOCONF := $(CROSS_AUTOCONF_USR)
+XORG_FONT_CURSOR_MISC_AUTOCONF := \
+	$(CROSS_AUTOCONF_USR) \
+	--with-fontdir=$(XORG_FONTDIR)/misc
 
 $(STATEDIR)/xorg-font-cursor-misc.prepare: $(xorg-font-cursor-misc_prepare_deps_default)
 	@$(call targetinfo, $@)
@@ -82,7 +87,7 @@ xorg-font-cursor-misc_compile: $(STATEDIR)/xorg-font-cursor-misc.compile
 
 $(STATEDIR)/xorg-font-cursor-misc.compile: $(xorg-font-cursor-misc_compile_deps_default)
 	@$(call targetinfo, $@)
-	cd $(XORG_FONT_CURSOR_MISC_DIR) && $(XORG_FONT_CURSOR_MISC_PATH) make
+	cd $(XORG_FONT_CURSOR_MISC_DIR) && $(XORG_FONT_CURSOR_MISC_PATH) $(MAKE)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
@@ -104,21 +109,14 @@ xorg-font-cursor-misc_targetinstall: $(STATEDIR)/xorg-font-cursor-misc.targetins
 $(STATEDIR)/xorg-font-cursor-misc.targetinstall: $(xorg-font-cursor-misc_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init, xorg-font-cursor-misc)
-	@$(call install_fixup, xorg-font-cursor-misc,PACKAGE,xorg-font-cursor-misc)
-	@$(call install_fixup, xorg-font-cursor-misc,PRIORITY,optional)
-	@$(call install_fixup, xorg-font-cursor-misc,VERSION,$(XORG_FONT_CURSOR_MISC_VERSION))
-	@$(call install_fixup, xorg-font-cursor-misc,SECTION,base)
-	@$(call install_fixup, xorg-font-cursor-misc,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup, xorg-font-cursor-misc,DEPENDS,)
-	@$(call install_fixup, xorg-font-cursor-misc,DESCRIPTION,missing)
-
-	@cd $(XORG_FONT_CURSOR_MISC_DIR); \
-	for file in *.pcf.gz; do	\
-		$(call install_copy, xorg-font-cursor-misc, 0, 0, 0644, $$file, $(XORG_FONTDIR)/misc/$$file, n); \
-	done
+	@mkdir -p $(XORG_FONTS_DIR_INSTALL)/misc
 
-	@$(call install_finish, xorg-font-cursor-misc)
+	@find $(XORG_FONT_CURSOR_MISC_DIR) \
+		-name "*.pcf.gz" \
+		| \
+		while read file; do \
+		install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/misc; \
+	done
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-font-daewoo-misc.in b/rules/xorg-font-daewoo-misc.in
index 33912528a..e7c60c68a 100644
--- a/rules/xorg-font-daewoo-misc.in
+++ b/rules/xorg-font-daewoo-misc.in
@@ -1,7 +1,6 @@
 config XORG_FONT_DAEWOO_MISC
 	bool
-	depends on XORG_FONT_BASE
-	select HOST_XORG_APP_BDFTOPCF
+	select XORG_FONTS
 	prompt "Daewoo misc"
 	help
 	  FIXME
diff --git a/rules/xorg-font-daewoo-misc.make b/rules/xorg-font-daewoo-misc.make
index 86c79160d..cae3cd3d3 100644
--- a/rules/xorg-font-daewoo-misc.make
+++ b/rules/xorg-font-daewoo-misc.make
@@ -20,10 +20,13 @@ PACKAGES-$(PTXCONF_XORG_FONT_DAEWOO_MISC) += xorg-font-daewoo-misc
 XORG_FONT_DAEWOO_MISC_VERSION	:= 1.0.0
 XORG_FONT_DAEWOO_MISC		:= font-daewoo-misc-X11R7.0-$(XORG_FONT_DAEWOO_MISC_VERSION)
 XORG_FONT_DAEWOO_MISC_SUFFIX	:= tar.bz2
-XORG_FONT_DAEWOO_MISC_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font//$(XORG_FONT_DAEWOO_MISC).$(XORG_FONT_DAEWOO_MISC_SUFFIX)
+XORG_FONT_DAEWOO_MISC_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_DAEWOO_MISC).$(XORG_FONT_DAEWOO_MISC_SUFFIX)
 XORG_FONT_DAEWOO_MISC_SOURCE	:= $(SRCDIR)/$(XORG_FONT_DAEWOO_MISC).$(XORG_FONT_DAEWOO_MISC_SUFFIX)
 XORG_FONT_DAEWOO_MISC_DIR	:= $(BUILDDIR)/$(XORG_FONT_DAEWOO_MISC)
 
+ifdef PTXCONF_XORG_FONT_DAEWOO_MISC
+$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-daewoo-misc.targetinstall
+endif
 
 # ----------------------------------------------------------------------------
 # Get
@@ -64,7 +67,9 @@ XORG_FONT_DAEWOO_MISC_ENV 	:=  $(CROSS_ENV)
 #
 # autoconf
 #
-XORG_FONT_DAEWOO_MISC_AUTOCONF := $(CROSS_AUTOCONF_USR)
+XORG_FONT_DAEWOO_MISC_AUTOCONF := \
+	$(CROSS_AUTOCONF_USR) \
+	--with-fontdir=$(XORG_FONTDIR)/misc
 
 $(STATEDIR)/xorg-font-daewoo-misc.prepare: $(xorg-font-daewoo-misc_prepare_deps_default)
 	@$(call targetinfo, $@)
@@ -104,21 +109,14 @@ xorg-font-daewoo-misc_targetinstall: $(STATEDIR)/xorg-font-daewoo-misc.targetins
 $(STATEDIR)/xorg-font-daewoo-misc.targetinstall: $(xorg-font-daewoo-misc_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init, xorg-font-daewoo-misc)
-	@$(call install_fixup, xorg-font-daewoo-misc,PACKAGE,xorg-font-daewoo-misc)
-	@$(call install_fixup, xorg-font-daewoo-misc,PRIORITY,optional)
-	@$(call install_fixup, xorg-font-daewoo-misc,VERSION,$(XORG_FONT_DAEWOO_MISC_VERSION))
-	@$(call install_fixup, xorg-font-daewoo-misc,SECTION,base)
-	@$(call install_fixup, xorg-font-daewoo-misc,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup, xorg-font-daewoo-misc,DEPENDS,)
-	@$(call install_fixup, xorg-font-daewoo-misc,DESCRIPTION,missing)
-
-	@cd $(XORG_FONT_DAEWOO_MISC_DIR); \
-	for file in *.pcf.gz; do	\
-		$(call install_copy, xorg-font-daewoo-misc, 0, 0, 0644, $$file, $(XORG_FONTDIR)/misc/$$file, n); \
-	done
+	@mkdir -p $(XORG_FONTS_DIR_INSTALL)/misc
 
-	@$(call install_finish, xorg-font-daewoo-misc)
+	@find $(XORG_FONT_DAEWOO_MISC_DIR) \
+		-name "*.pcf.gz" \
+		| \
+		while read file; do \
+		install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/misc; \
+	done
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-font-dec-misc.in b/rules/xorg-font-dec-misc.in
index 427f78802..f7a6a4f74 100644
--- a/rules/xorg-font-dec-misc.in
+++ b/rules/xorg-font-dec-misc.in
@@ -1,7 +1,6 @@
 config XORG_FONT_DEC_MISC
 	bool
-	depends on XORG_FONT_BASE
-	select HOST_XORG_APP_BDFTOPCF
+	select XORG_FONTS
 	prompt "DEC misc"
 	help
 	  FIXME
diff --git a/rules/xorg-font-dec-misc.make b/rules/xorg-font-dec-misc.make
index bafdc4fac..5d61cd498 100644
--- a/rules/xorg-font-dec-misc.make
+++ b/rules/xorg-font-dec-misc.make
@@ -20,10 +20,13 @@ PACKAGES-$(PTXCONF_XORG_FONT_DEC_MISC) += xorg-font-dec-misc
 XORG_FONT_DEC_MISC_VERSION	:= 1.0.0
 XORG_FONT_DEC_MISC		:= font-dec-misc-X11R7.0-$(XORG_FONT_DEC_MISC_VERSION)
 XORG_FONT_DEC_MISC_SUFFIX	:= tar.bz2
-XORG_FONT_DEC_MISC_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font//$(XORG_FONT_DEC_MISC).$(XORG_FONT_DEC_MISC_SUFFIX)
+XORG_FONT_DEC_MISC_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_DEC_MISC).$(XORG_FONT_DEC_MISC_SUFFIX)
 XORG_FONT_DEC_MISC_SOURCE	:= $(SRCDIR)/$(XORG_FONT_DEC_MISC).$(XORG_FONT_DEC_MISC_SUFFIX)
 XORG_FONT_DEC_MISC_DIR		:= $(BUILDDIR)/$(XORG_FONT_DEC_MISC)
 
+ifdef PTXCONF_XORG_FONT_DEC_MISC
+$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-dec-misc.targetinstall
+endif
 
 # ----------------------------------------------------------------------------
 # Get
@@ -64,7 +67,9 @@ XORG_FONT_DEC_MISC_ENV 	:=  $(CROSS_ENV)
 #
 # autoconf
 #
-XORG_FONT_DEC_MISC_AUTOCONF := $(CROSS_AUTOCONF_USR)
+XORG_FONT_DEC_MISC_AUTOCONF := \
+	$(CROSS_AUTOCONF_USR) \
+	--with-fontdir=$(XORG_FONTDIR)/misc
 
 $(STATEDIR)/xorg-font-dec-misc.prepare: $(xorg-font-dec-misc_prepare_deps_default)
 	@$(call targetinfo, $@)
@@ -82,7 +87,7 @@ xorg-font-dec-misc_compile: $(STATEDIR)/xorg-font-dec-misc.compile
 
 $(STATEDIR)/xorg-font-dec-misc.compile: $(xorg-font-dec-misc_compile_deps_default)
 	@$(call targetinfo, $@)
-	cd $(XORG_FONT_DEC_MISC_DIR) && $(XORG_FONT_DEC_MISC_PATH) make
+	cd $(XORG_FONT_DEC_MISC_DIR) && $(XORG_FONT_DEC_MISC_PATH) $(MAKE)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
@@ -93,7 +98,6 @@ xorg-font-dec-misc_install: $(STATEDIR)/xorg-font-dec-misc.install
 
 $(STATEDIR)/xorg-font-dec-misc.install: $(xorg-font-dec-misc_install_deps_default)
 	@$(call targetinfo, $@)
-	@$(call install, XORG_FONT_DEC_MISC)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
@@ -105,21 +109,14 @@ xorg-font-dec-misc_targetinstall: $(STATEDIR)/xorg-font-dec-misc.targetinstall
 $(STATEDIR)/xorg-font-dec-misc.targetinstall: $(xorg-font-dec-misc_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init, xorg-font-dec-misc)
-	@$(call install_fixup, xorg-font-dec-misc,PACKAGE,xorg-font-dec-misc)
-	@$(call install_fixup, xorg-font-dec-misc,PRIORITY,optional)
-	@$(call install_fixup, xorg-font-dec-misc,VERSION,$(XORG_FONT_DEC_MISC_VERSION))
-	@$(call install_fixup, xorg-font-dec-misc,SECTION,base)
-	@$(call install_fixup, xorg-font-dec-misc,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup, xorg-font-dec-misc,DEPENDS,)
-	@$(call install_fixup, xorg-font-dec-misc,DESCRIPTION,missing)
-
-	@cd $(XORG_FONT_DEC_MISC_DIR); \
-	for file in *.pcf.gz; do	\
-		$(call install_copy, xorg-font-dec-misc, 0, 0, 0644, $$file, $(XORG_FONTDIR)/misc/$$file, n); \
-	done
+	@mkdir -p $(XORG_FONTS_DIR_INSTALL)/misc
 
-	@$(call install_finish, xorg-font-dec-misc)
+	@find $(XORG_FONT_DEC_MISC_DIR) \
+		-name "*.pcf.gz" \
+		| \
+		while read file; do \
+		install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/misc; \
+	done
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-font-encodings.in b/rules/xorg-font-encodings.in
index 1f54afb53..2cf2a298a 100644
--- a/rules/xorg-font-encodings.in
+++ b/rules/xorg-font-encodings.in
@@ -1,6 +1,6 @@
 config XORG_FONT_ENCODINGS
 	bool
-	depends on XORG_FONT_BASE
+	select XORG_FONTS
 	prompt "encodings"
 	help
 	  contains encoding files used by fontenc layer to 
diff --git a/rules/xorg-font-encodings.make b/rules/xorg-font-encodings.make
index eb224f0c5..9cba979dd 100644
--- a/rules/xorg-font-encodings.make
+++ b/rules/xorg-font-encodings.make
@@ -20,10 +20,13 @@ PACKAGES-$(PTXCONF_XORG_FONT_ENCODINGS) += xorg-font-encodings
 XORG_FONT_ENCODINGS_VERSION	:= 1.0.0
 XORG_FONT_ENCODINGS		:= encodings-X11R7.0-$(XORG_FONT_ENCODINGS_VERSION)
 XORG_FONT_ENCODINGS_SUFFIX	:= tar.bz2
-XORG_FONT_ENCODINGS_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font//$(XORG_FONT_ENCODINGS).$(XORG_FONT_ENCODINGS_SUFFIX)
+XORG_FONT_ENCODINGS_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_ENCODINGS).$(XORG_FONT_ENCODINGS_SUFFIX)
 XORG_FONT_ENCODINGS_SOURCE	:= $(SRCDIR)/$(XORG_FONT_ENCODINGS).$(XORG_FONT_ENCODINGS_SUFFIX)
 XORG_FONT_ENCODINGS_DIR		:= $(BUILDDIR)/$(XORG_FONT_ENCODINGS)
 
+ifdef PTXCONF_XORG_FONT_ENCODINGS
+$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-encodings.targetinstall
+endif
 
 # ----------------------------------------------------------------------------
 # Get
@@ -58,13 +61,15 @@ $(STATEDIR)/xorg-font-encodings.extract: $(xorg-font-encodings_extract_deps_defa
 
 xorg-font-encodings_prepare: $(STATEDIR)/xorg-font-encodings.prepare
 
-XORG_FONT_ENCODINGS_PATH	:=  PATH=$(CROSS_PATH)
-XORG_FONT_ENCODINGS_ENV 	:=  $(CROSS_ENV)
+XORG_FONT_ENCODINGS_PATH	:= PATH=$(CROSS_PATH)
+XORG_FONT_ENCODINGS_ENV 	:= $(CROSS_ENV)
 
 #
 # autoconf
 #
-XORG_FONT_ENCODINGS_AUTOCONF := $(CROSS_AUTOCONF_USR)
+XORG_FONT_ENCODINGS_AUTOCONF := 
+	$(CROSS_AUTOCONF_USR) \
+	--with-encodingsdir=$(XORG_FONTDIR)/encodings
 
 $(STATEDIR)/xorg-font-encodings.prepare: $(xorg-font-encodings_prepare_deps_default)
 	@$(call targetinfo, $@)
@@ -82,7 +87,7 @@ xorg-font-encodings_compile: $(STATEDIR)/xorg-font-encodings.compile
 
 $(STATEDIR)/xorg-font-encodings.compile: $(xorg-font-encodings_compile_deps_default)
 	@$(call targetinfo, $@)
-	cd $(XORG_FONT_ENCODINGS_DIR) && $(XORG_FONT_ENCODINGS_PATH) make
+	cd $(XORG_FONT_ENCODINGS_DIR) && $(XORG_FONT_ENCODINGS_PATH) $(MAKE)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
@@ -105,23 +110,17 @@ xorg-font-encodings_targetinstall: $(STATEDIR)/xorg-font-encodings.targetinstall
 $(STATEDIR)/xorg-font-encodings.targetinstall: $(xorg-font-encodings_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init, xorg-font-encodings)
-	@$(call install_fixup, xorg-font-encodings,PACKAGE,xorg-font-encodings)
-	@$(call install_fixup, xorg-font-encodings,PRIORITY,optional)
-	@$(call install_fixup, xorg-font-encodings,VERSION,$(XORG_FONT_ENCODINGS_VERSION))
-	@$(call install_fixup, xorg-font-encodings,SECTION,base)
-	@$(call install_fixup, xorg-font-encodings,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup, xorg-font-encodings,DEPENDS,)
-	@$(call install_fixup, xorg-font-encodings,DESCRIPTION,missing)
-
-	@cd $(XORG_FONT_ENCODINGS_DIR); \
-	for file in *.enc.gz; do	\
-		$(call install_copy, xorg-font-encodings, 0, 0, 0644, $$file, $(XORG_FONTDIR)/encodings/$$file, n); \
-	done
+	@mkdir -p $(XORG_FONTS_DIR_INSTALL)/encodings
 
-	@$(call install_copy, xorg-font-encodings, 0, 0, 0644, $(XORG_FONT_ENCODINGS_DIR)/encodings.dir, $(XORG_FONTDIR)/encodings/encodings.dir, n)
+# FIXME: handle encodings/large
 
-	@$(call install_finish, xorg-font-encodings)
+	@find $(XORG_FONT_ENCODINGS_DIR) \
+		-maxdepth 1 \
+		-name "*.enc.gz" \
+		| \
+		while read file; do \
+		install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/encodings; \
+	done
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-font-ibm-type1.in b/rules/xorg-font-ibm-type1.in
index de8abfecc..080f0fbf3 100644
--- a/rules/xorg-font-ibm-type1.in
+++ b/rules/xorg-font-ibm-type1.in
@@ -1,6 +1,6 @@
 config XORG_FONT_IBM_TYPE1
 	bool
-	depends on XORG_FONT_SCALABLE
+	select XORG_FONTS
 	prompt "IBM type1"
 	help
 	  scalable IBM type1 fonts, as used on OS/2 systems. 
diff --git a/rules/xorg-font-ibm-type1.make b/rules/xorg-font-ibm-type1.make
index e6a61e7a5..1f0698e76 100644
--- a/rules/xorg-font-ibm-type1.make
+++ b/rules/xorg-font-ibm-type1.make
@@ -20,10 +20,13 @@ PACKAGES-$(PTXCONF_XORG_FONT_IBM_TYPE1) += xorg-font-ibm-type1
 XORG_FONT_IBM_TYPE1_VERSION	:= 1.0.0
 XORG_FONT_IBM_TYPE1		:= font-ibm-type1-X11R7.0-$(XORG_FONT_IBM_TYPE1_VERSION)
 XORG_FONT_IBM_TYPE1_SUFFIX	:= tar.bz2
-XORG_FONT_IBM_TYPE1_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font//$(XORG_FONT_IBM_TYPE1).$(XORG_FONT_IBM_TYPE1_SUFFIX)
+XORG_FONT_IBM_TYPE1_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_IBM_TYPE1).$(XORG_FONT_IBM_TYPE1_SUFFIX)
 XORG_FONT_IBM_TYPE1_SOURCE	:= $(SRCDIR)/$(XORG_FONT_IBM_TYPE1).$(XORG_FONT_IBM_TYPE1_SUFFIX)
 XORG_FONT_IBM_TYPE1_DIR		:= $(BUILDDIR)/$(XORG_FONT_IBM_TYPE1)
 
+ifdef PTXCONF_XORG_FONT_IBM_TYPE1
+$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ibm-type1.targetinstall
+endif
 
 # ----------------------------------------------------------------------------
 # Get
@@ -64,7 +67,9 @@ XORG_FONT_IBM_TYPE1_ENV 	:=  $(CROSS_ENV)
 #
 # autoconf
 #
-XORG_FONT_IBM_TYPE1_AUTOCONF := $(CROSS_AUTOCONF_USR)
+XORG_FONT_IBM_TYPE1_AUTOCONF := \
+	$(CROSS_AUTOCONF_USR) \
+	--with-fontdir=$(XORG_FONTDIR)/Type1
 
 $(STATEDIR)/xorg-font-ibm-type1.prepare: $(xorg-font-ibm-type1_prepare_deps_default)
 	@$(call targetinfo, $@)
@@ -82,7 +87,7 @@ xorg-font-ibm-type1_compile: $(STATEDIR)/xorg-font-ibm-type1.compile
 
 $(STATEDIR)/xorg-font-ibm-type1.compile: $(xorg-font-ibm-type1_compile_deps_default)
 	@$(call targetinfo, $@)
-	cd $(XORG_FONT_IBM_TYPE1_DIR) && $(XORG_FONT_IBM_TYPE1_PATH) make
+	cd $(XORG_FONT_IBM_TYPE1_DIR) && $(XORG_FONT_IBM_TYPE1_PATH) $(MAKE)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
@@ -104,21 +109,15 @@ xorg-font-ibm-type1_targetinstall: $(STATEDIR)/xorg-font-ibm-type1.targetinstall
 $(STATEDIR)/xorg-font-ibm-type1.targetinstall: $(xorg-font-ibm-type1_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init, xorg-font-ibm-type1)
-	@$(call install_fixup, xorg-font-ibm-type1,PACKAGE,xorg-font-ibm-type1)
-	@$(call install_fixup, xorg-font-ibm-type1,PRIORITY,optional)
-	@$(call install_fixup, xorg-font-ibm-type1,VERSION,$(XORG_FONT_IBM_TYPE1_VERSION))
-	@$(call install_fixup, xorg-font-ibm-type1,SECTION,base)
-	@$(call install_fixup, xorg-font-ibm-type1,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup, xorg-font-ibm-type1,DEPENDS,)
-	@$(call install_fixup, xorg-font-ibm-type1,DESCRIPTION,missing)
-
-	@cd $(XORG_FONT_IBM_TYPE1_DIR); \
-	for file in *.pfa *.afm; do	\
-		$(call install_copy, xorg-font-ibm-type1, 0, 0, 0644, $$file, $(XORG_FONTDIR)/Type1/$$file, n); \
-	done
+	@mkdir -p $(XORG_FONTS_DIR_INSTALL)/Type1
 
-	@$(call install_finish, xorg-font-ibm-type1)
+	@find $(XORG_FONT_IBM_TYPE1_DIR) \
+		-name "*.afm" \
+		-o -name "*.pfa" \
+		| \
+		while read file; do \
+		install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/Type1; \
+	done
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-font-intl.in b/rules/xorg-font-intl.in
index 13e3e9700..660e55cba 100644
--- a/rules/xorg-font-intl.in
+++ b/rules/xorg-font-intl.in
@@ -1,8 +1,9 @@
-menuconfig XORG_FONT_INTL
-        bool "international fonts for X     "
+menu "international fonts for X     "
 
-comment "chinese and other asian fonts"
-	depends on XORG_FONT_INTL
+menuconfig XORG_FONT_INTL
+	bool
+	prompt "chinese and other asian fonts"
+	select XORG_FONTS
 
 config XORG_FONT_INTL_CHIN
 	bool
@@ -16,7 +17,7 @@ config XORG_FONT_INTL_CHIN
 config XORG_FONT_INTL_CHIN_BIG
 	bool
 	prompt "chinese fonts (big size)"
-	depends on XORG_FONT_INTL_CHIN
+	depends on XORG_FONT_INTL
 	help
 	  This package contains two GB coded fonts in big size
 
@@ -30,12 +31,10 @@ config XORG_FONT_INTL_JAP
 	  will need the fonts if you plan to view, print or author documents using
 	  the Japanese language and any of the encodings specified above.
 
-
-
 config XORG_FONT_INTL_JAP_BIG
 	bool
 	prompt "Japanese fonts (big size)"
-	depends on XORG_FONT_INTL_JAP
+	depends on XORG_FONT_INTL
 	help
 	  This package contains two JISX coded fonts in big size
 
@@ -49,15 +48,15 @@ config XORG_FONT_INTL_ASIAN
 	  further asian languages.
 
 comment "cyrillic fonts"
-	depends on XORG_FONT_INTL
 source "rules/xorg-font-misc-cyrillic.in"
 source "rules/xorg-font-cronyx-cyrillic.in"
 source "rules/xorg-font-screen-cyrillic.in"
 source "rules/xorg-font-winitzki-cyrillic.in"
 
 comment "other language fonts    "
-	depends on XORG_FONT_INTL
 source "rules/xorg-font-arabic-misc.in"
 source "rules/xorg-font-misc-ethiopic.in"
 source "rules/xorg-font-misc-meltho.in"
 
+endmenu
+
diff --git a/rules/xorg-font-intl.make b/rules/xorg-font-intl.make
index 2f08cf797..c3b7c028d 100644
--- a/rules/xorg-font-intl.make
+++ b/rules/xorg-font-intl.make
@@ -19,10 +19,14 @@ PACKAGES-$(PTXCONF_XORG_FONT_INTL) += xorg-font-intl
 #
 XORG_FONT_INTL_VERSION	:= 1.2.1
 XORG_FONT_INTL		:= intlfonts-$(XORG_FONT_INTL_VERSION)
-XORG_FONT_INTL_SUFFIX		:= tar.gz
-XORG_FONT_INTL_URL		:= http://ftp.gnu.org/pub/gnu/intlfonts/$(XORG_FONT_INTL).$(XORG_FONT_INTL_SUFFIX)
-XORG_FONT_INTL_SOURCE		:= $(SRCDIR)/$(XORG_FONT_INTL).$(XORG_FONT_INTL_SUFFIX)
-XORG_FONT_INTL_DIR		:= $(BUILDDIR)/$(XORG_FONT_INTL)
+XORG_FONT_INTL_SUFFIX	:= tar.gz
+XORG_FONT_INTL_URL	:= $(PTXCONF_SETUP_GNUMIRROR)/intlfonts/$(XORG_FONT_INTL).$(XORG_FONT_INTL_SUFFIX)
+XORG_FONT_INTL_SOURCE	:= $(SRCDIR)/$(XORG_FONT_INTL).$(XORG_FONT_INTL_SUFFIX)
+XORG_FONT_INTL_DIR	:= $(BUILDDIR)/$(XORG_FONT_INTL)
+
+ifdef PTXCONF_XORG_FONT_INTL
+$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-intl.targetinstall
+endif
 
 # ----------------------------------------------------------------------------
 # Get
@@ -59,55 +63,57 @@ xorg-font-intl_prepare: $(STATEDIR)/xorg-font-intl.prepare
 
 XORG_FONT_INTL_PATH	:= PATH=$(CROSS_PATH)
 XORG_FONT_INTL_ENV 	:= $(CROSS_ENV)
-
-#
-# autoconf
-#
-XORG_FONT_INTL_AUTOCONF := $(CROSS_AUTOCONF_USR)
-
-$(STATEDIR)/xorg-font-intl.prepare: $(xorg-font-intl_prepare_deps_default)
-	@$(call targetinfo, $@)
-	@$(call clean, $(XORG_FONT_INTL_DIR)/config.cache)
-	cd $(XORG_FONT_INTL_DIR) && \
-		$(XORG_FONT_INTL_PATH) $(XORG_FONT_INTL_ENV) \
-		./configure $(XORG_FONT_INTL_AUTOCONF)
-	@$(call touch, $@)
-
-# ----------------------------------------------------------------------------
-# Compile
-# ----------------------------------------------------------------------------
-
-xorg-font-intl_compile: $(STATEDIR)/xorg-font-intl.compile
 XORG_FONT_INTL_MAKEVARS := \
-	fontdir=.\
-	COMPRESS=gzip \
 	SUBDIRS= \
 	SUBDIRS_X= \
 	SUBDIRS_BIG=
+
 ifdef PTXCONF_XORG_FONT_INTL_CHIN
-	XORG_FONT_INTL_MAKEVARS += SUBDIRS+=Chinese SUBDIRS_X+=Chinese.X
+XORG_FONT_INTL_MAKEVARS += SUBDIRS+=Chinese SUBDIRS_X+=Chinese.X
 endif
 
 ifdef PTXCONF_XORG_FONT_INTL_CHIN_BIG
-	XORG_FONT_INTL_MAKEVARS += SUBDIRS_BIG+=Chinese.BIG 
+XORG_FONT_INTL_MAKEVARS += SUBDIRS_BIG+=Chinese.BIG 
 endif
 
 ifdef PTXCONF_XORG_FONT_INTL_JAP
-	XORG_FONT_INTL_MAKEVARS += SUBDIRS+=Japanese SUBDIRS_X+=Japanese.X
+XORG_FONT_INTL_MAKEVARS += SUBDIRS+=Japanese SUBDIRS_X+=Japanese.X
 endif
 
 ifdef PTXCONF_XORG_FONT_INTL_JAP_BIG
-	XORG_FONT_INTL_MAKEVARS += SUBDIRS_BIG+=Japanese.BIG
+XORG_FONT_INTL_MAKEVARS += SUBDIRS_BIG+=Japanese.BIG
 endif
 
 ifdef PTXCONF_XORG_FONT_INTL_ASIAN
-	XORG_FONT_INTL_MAKEVARS += SUBDIRS+=Asian
+XORG_FONT_INTL_MAKEVARS += SUBDIRS+=Asian
 endif
 
+#
+# autoconf
+#
+XORG_FONT_INTL_AUTOCONF := \
+	$(CROSS_AUTOCONF_USR) \
+	--enable-compress \
+	--with-fontdir=$(XORG_FONT_INTL_DIR)/install \
+	--without-bdf
+
+$(STATEDIR)/xorg-font-intl.prepare: $(xorg-font-intl_prepare_deps_default)
+	@$(call targetinfo, $@)
+	@$(call clean, $(XORG_FONT_INTL_DIR)/config.cache)
+	cd $(XORG_FONT_INTL_DIR) && \
+		$(XORG_FONT_INTL_PATH) $(XORG_FONT_INTL_ENV) \
+		./configure $(XORG_FONT_INTL_AUTOCONF)
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Compile
+# ----------------------------------------------------------------------------
+
+xorg-font-intl_compile: $(STATEDIR)/xorg-font-intl.compile
 
 $(STATEDIR)/xorg-font-intl.compile: $(xorg-font-intl_compile_deps_default)
 	@$(call targetinfo, $@)
-	cd $(XORG_FONT_INTL_DIR) && $(XORG_FONT_INTL_PATH) $(MAKE) $(XORG_FONT_INTL_MAKEVARS) pcf
+	cd $(XORG_FONT_INTL_DIR) && $(XORG_FONT_INTL_PATH) $(MAKE) $(XORG_FONT_INTL_MAKEVARS)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
@@ -118,6 +124,7 @@ xorg-font-intl_install: $(STATEDIR)/xorg-font-intl.install
 
 $(STATEDIR)/xorg-font-intl.install: $(xorg-font-intl_install_deps_default)
 	@$(call targetinfo, $@)
+	@$(call install, XORG_FONT_INTL)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
@@ -129,23 +136,18 @@ xorg-font-intl_targetinstall: $(STATEDIR)/xorg-font-intl.targetinstall
 $(STATEDIR)/xorg-font-intl.targetinstall: $(xorg-font-intl_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init, xorg-font-intl)
-	@$(call install_fixup, xorg-font-intl,PACKAGE,xorg-font-intl)
-	@$(call install_fixup, xorg-font-intl,PRIORITY,optional)
-	@$(call install_fixup, xorg-font-intl,VERSION,$(XORG_FONT_INTL_VERSION))
-	@$(call install_fixup, xorg-font-intl,SECTION,base)
-	@$(call install_fixup, xorg-font-intl,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup, xorg-font-intl,DEPENDS,)
-	@$(call install_fixup, xorg-font-intl,DESCRIPTION,missing)
-
-	@cd $(XORG_FONT_INTL_DIR); \
-	for file in *.pcf.gz; do \
-		if [ -e $$file ];then \
-			$(call install_copy, xorg-font-intl, 0, 0, 0644, $$file, $(XORG_FONTDIR)/misc/$$file, n); \
-		fi; \
-	done;
-
-	@$(call install_finish, xorg-font-intl)
+	@mkdir -p $(XORG_FONTS_DIR_INSTALL)/misc
+
+# FIXME: font.alias handling
+# FIXME: what about truetype and type1
+
+	@find $(XORG_FONT_INTL_DIR) \
+		-name "*.pcf.gz" \
+		| \
+		while read file; do \
+		install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/misc; \
+	done
+
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-font-isas-misc.in b/rules/xorg-font-isas-misc.in
index 35c0767bf..20bd719f8 100644
--- a/rules/xorg-font-isas-misc.in
+++ b/rules/xorg-font-isas-misc.in
@@ -1,7 +1,6 @@
 config XORG_FONT_ISAS_MISC
 	bool
-	depends on XORG_FONT_BASE
-	select HOST_XORG_APP_BDFTOPCF
+	select XORG_FONTS
 	prompt "Isas misc"
 	help
 	  FIXME
diff --git a/rules/xorg-font-isas-misc.make b/rules/xorg-font-isas-misc.make
index d4d1d4f7f..8d11c1dee 100644
--- a/rules/xorg-font-isas-misc.make
+++ b/rules/xorg-font-isas-misc.make
@@ -20,10 +20,13 @@ PACKAGES-$(PTXCONF_XORG_FONT_ISAS_MISC) += xorg-font-isas-misc
 XORG_FONT_ISAS_MISC_VERSION	:= 1.0.0
 XORG_FONT_ISAS_MISC		:= font-isas-misc-X11R7.0-$(XORG_FONT_ISAS_MISC_VERSION)
 XORG_FONT_ISAS_MISC_SUFFIX	:= tar.bz2
-XORG_FONT_ISAS_MISC_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font//$(XORG_FONT_ISAS_MISC).$(XORG_FONT_ISAS_MISC_SUFFIX)
+XORG_FONT_ISAS_MISC_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_ISAS_MISC).$(XORG_FONT_ISAS_MISC_SUFFIX)
 XORG_FONT_ISAS_MISC_SOURCE	:= $(SRCDIR)/$(XORG_FONT_ISAS_MISC).$(XORG_FONT_ISAS_MISC_SUFFIX)
 XORG_FONT_ISAS_MISC_DIR		:= $(BUILDDIR)/$(XORG_FONT_ISAS_MISC)
 
+ifdef PTXCONF_XORG_FONT_ISAS_MISC
+$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-isas-misc.targetinstall
+endif
 
 # ----------------------------------------------------------------------------
 # Get
@@ -64,7 +67,9 @@ XORG_FONT_ISAS_MISC_ENV 	:=  $(CROSS_ENV)
 #
 # autoconf
 #
-XORG_FONT_ISAS_MISC_AUTOCONF := $(CROSS_AUTOCONF_USR)
+XORG_FONT_ISAS_MISC_AUTOCONF := \
+	$(CROSS_AUTOCONF_USR) \
+	--with-fontdir=$(XORG_FONTDIR)/misc
 
 $(STATEDIR)/xorg-font-isas-misc.prepare: $(xorg-font-isas-misc_prepare_deps_default)
 	@$(call targetinfo, $@)
@@ -82,7 +87,7 @@ xorg-font-isas-misc_compile: $(STATEDIR)/xorg-font-isas-misc.compile
 
 $(STATEDIR)/xorg-font-isas-misc.compile: $(xorg-font-isas-misc_compile_deps_default)
 	@$(call targetinfo, $@)
-	cd $(XORG_FONT_ISAS_MISC_DIR) && $(XORG_FONT_ISAS_MISC_PATH) make
+	cd $(XORG_FONT_ISAS_MISC_DIR) && $(XORG_FONT_ISAS_MISC_PATH) $(MAKE)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
@@ -104,21 +109,14 @@ xorg-font-isas-misc_targetinstall: $(STATEDIR)/xorg-font-isas-misc.targetinstall
 $(STATEDIR)/xorg-font-isas-misc.targetinstall: $(xorg-font-isas-misc_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init, xorg-font-isas-misc)
-	@$(call install_fixup, xorg-font-isas-misc,PACKAGE,xorg-font-isas-misc)
-	@$(call install_fixup, xorg-font-isas-misc,PRIORITY,optional)
-	@$(call install_fixup, xorg-font-isas-misc,VERSION,$(XORG_FONT_ISAS_MISC_VERSION))
-	@$(call install_fixup, xorg-font-isas-misc,SECTION,base)
-	@$(call install_fixup, xorg-font-isas-misc,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup, xorg-font-isas-misc,DEPENDS,)
-	@$(call install_fixup, xorg-font-isas-misc,DESCRIPTION,missing)
-
-	@cd $(XORG_FONT_ISAS_MISC_DIR); \
-	for file in *.pcf.gz; do	\
-		$(call install_copy, xorg-font-isas-misc, 0, 0, 0644, $$file, $(XORG_FONTDIR)/misc/$$file, n); \
-	done
+	@mkdir -p $(XORG_FONTS_DIR_INSTALL)/misc
 
-	@$(call install_finish, xorg-font-isas-misc)
+	@find $(XORG_FONT_ISAS_MISC_DIR) \
+		-name "*.pcf.gz" \
+		| \
+		while read file; do \
+		install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/misc; \
+	done
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-font-jis-misc.in b/rules/xorg-font-jis-misc.in
index fddb6a3fd..c5594567f 100644
--- a/rules/xorg-font-jis-misc.in
+++ b/rules/xorg-font-jis-misc.in
@@ -1,7 +1,6 @@
 config XORG_FONT_JIS_MISC
 	bool
-	depends on XORG_FONT_BASE
-	select HOST_XORG_APP_BDFTOPCF
+	select XORG_FONTS
 	prompt "Jis misc"
 	help
 	  FIXME
diff --git a/rules/xorg-font-jis-misc.make b/rules/xorg-font-jis-misc.make
index 33265ddbd..8556658bd 100644
--- a/rules/xorg-font-jis-misc.make
+++ b/rules/xorg-font-jis-misc.make
@@ -20,10 +20,13 @@ PACKAGES-$(PTXCONF_XORG_FONT_JIS_MISC) += xorg-font-jis-misc
 XORG_FONT_JIS_MISC_VERSION	:= 1.0.0
 XORG_FONT_JIS_MISC		:= font-jis-misc-X11R7.0-$(XORG_FONT_JIS_MISC_VERSION)
 XORG_FONT_JIS_MISC_SUFFIX	:= tar.bz2
-XORG_FONT_JIS_MISC_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font//$(XORG_FONT_JIS_MISC).$(XORG_FONT_JIS_MISC_SUFFIX)
+XORG_FONT_JIS_MISC_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_JIS_MISC).$(XORG_FONT_JIS_MISC_SUFFIX)
 XORG_FONT_JIS_MISC_SOURCE	:= $(SRCDIR)/$(XORG_FONT_JIS_MISC).$(XORG_FONT_JIS_MISC_SUFFIX)
 XORG_FONT_JIS_MISC_DIR		:= $(BUILDDIR)/$(XORG_FONT_JIS_MISC)
 
+ifdef PTXCONF_XORG_FONT_JIS_MISC
+$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-jis-misc.targetinstall
+endif
 
 # ----------------------------------------------------------------------------
 # Get
@@ -64,7 +67,9 @@ XORG_FONT_JIS_MISC_ENV 	:=  $(CROSS_ENV)
 #
 # autoconf
 #
-XORG_FONT_JIS_MISC_AUTOCONF := $(CROSS_AUTOCONF_USR)
+XORG_FONT_JIS_MISC_AUTOCONF := \
+	$(CROSS_AUTOCONF_USR) \
+	--with-fontdir=$(XORG_FONTDIR)/misc
 
 $(STATEDIR)/xorg-font-jis-misc.prepare: $(xorg-font-jis-misc_prepare_deps_default)
 	@$(call targetinfo, $@)
@@ -82,7 +87,7 @@ xorg-font-jis-misc_compile: $(STATEDIR)/xorg-font-jis-misc.compile
 
 $(STATEDIR)/xorg-font-jis-misc.compile: $(xorg-font-jis-misc_compile_deps_default)
 	@$(call targetinfo, $@)
-	cd $(XORG_FONT_JIS_MISC_DIR) && $(XORG_FONT_JIS_MISC_PATH) make
+	cd $(XORG_FONT_JIS_MISC_DIR) && $(XORG_FONT_JIS_MISC_PATH) $(MAKE)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
@@ -104,21 +109,14 @@ xorg-font-jis-misc_targetinstall: $(STATEDIR)/xorg-font-jis-misc.targetinstall
 $(STATEDIR)/xorg-font-jis-misc.targetinstall: $(xorg-font-jis-misc_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init, xorg-font-jis-misc)
-	@$(call install_fixup, xorg-font-jis-misc,PACKAGE,xorg-font-jis-misc)
-	@$(call install_fixup, xorg-font-jis-misc,PRIORITY,optional)
-	@$(call install_fixup, xorg-font-jis-misc,VERSION,$(XORG_FONT_JIS_MISC_VERSION))
-	@$(call install_fixup, xorg-font-jis-misc,SECTION,base)
-	@$(call install_fixup, xorg-font-jis-misc,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup, xorg-font-jis-misc,DEPENDS,)
-	@$(call install_fixup, xorg-font-jis-misc,DESCRIPTION,missing)
-
-	@cd $(XORG_FONT_JIS_MISC_DIR); \
-	for file in *.pcf.gz; do	\
-		$(call install_copy, xorg-font-jis-misc, 0, 0, 0644, $$file, $(XORG_FONTDIR)/misc/$$file, n); \
-	done
+	@mkdir -p $(XORG_FONTS_DIR_INSTALL)/misc
 
-	@$(call install_finish, xorg-font-jis-misc)
+	@find $(XORG_FONT_JIS_MISC_DIR) \
+		-name "*.pcf.gz" \
+		| \
+		while read file; do \
+		install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/misc; \
+	done
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-font-micro-misc.in b/rules/xorg-font-micro-misc.in
index 4114c50f8..6b4ad6d5d 100644
--- a/rules/xorg-font-micro-misc.in
+++ b/rules/xorg-font-micro-misc.in
@@ -1,7 +1,6 @@
 config XORG_FONT_MICRO_MISC
 	bool
-	depends on XORG_FONT_BASE
-	select HOST_XORG_APP_BDFTOPCF
+	select XORG_FONTS
 	prompt "micro misc"
 	help
 	  FIXME
diff --git a/rules/xorg-font-micro-misc.make b/rules/xorg-font-micro-misc.make
index 599aa47b8..6e5dfd718 100644
--- a/rules/xorg-font-micro-misc.make
+++ b/rules/xorg-font-micro-misc.make
@@ -24,6 +24,9 @@ XORG_FONT_MICRO_MISC_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font//$(XORG
 XORG_FONT_MICRO_MISC_SOURCE	:= $(SRCDIR)/$(XORG_FONT_MICRO_MISC).$(XORG_FONT_MICRO_MISC_SUFFIX)
 XORG_FONT_MICRO_MISC_DIR	:= $(BUILDDIR)/$(XORG_FONT_MICRO_MISC)
 
+ifdef PTXCONF_XORG_FONT_MICRO_MISC
+$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-micro-misc.targetinstall
+endif
 
 # ----------------------------------------------------------------------------
 # Get
@@ -64,7 +67,9 @@ XORG_FONT_MICRO_MISC_ENV 	:=  $(CROSS_ENV)
 #
 # autoconf
 #
-XORG_FONT_MICRO_MISC_AUTOCONF := $(CROSS_AUTOCONF_USR)
+XORG_FONT_MICRO_MISC_AUTOCONF := \
+	$(CROSS_AUTOCONF_USR) \
+	--with-fontdir=$(XORG_FONTDIR)/misc
 
 $(STATEDIR)/xorg-font-micro-misc.prepare: $(xorg-font-micro-misc_prepare_deps_default)
 	@$(call targetinfo, $@)
@@ -104,22 +109,13 @@ xorg-font-micro-misc_targetinstall: $(STATEDIR)/xorg-font-micro-misc.targetinsta
 $(STATEDIR)/xorg-font-micro-misc.targetinstall: $(xorg-font-micro-misc_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init, xorg-font-micro-misc)
-	@$(call install_fixup, xorg-font-micro-misc,PACKAGE,xorg-font-micro-misc)
-	@$(call install_fixup, xorg-font-micro-misc,PRIORITY,optional)
-	@$(call install_fixup, xorg-font-micro-misc,VERSION,$(XORG_FONT_MICRO_MISC_VERSION))
-	@$(call install_fixup, xorg-font-micro-misc,SECTION,base)
-	@$(call install_fixup, xorg-font-micro-misc,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup, xorg-font-micro-misc,DEPENDS,)
-	@$(call install_fixup, xorg-font-micro-misc,DESCRIPTION,missing)
-
-	@cd $(XORG_FONT_MICRO_MISC_DIR); \
-	for file in *.pcf.gz; do	\
-		$(call install_copy, xorg-font-micro-misc, 0, 0, 0644, $$file, $(XORG_FONTDIR)/misc/$$file, n); \
+	@find $(XORG_FONT_MICRO_MISC_DIR) \
+		-name "*.pcf.gz" \
+		| \
+		while read file; do \
+		install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/misc; \
 	done
 
-	@$(call install_finish, xorg-font-micro-misc)
-
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
diff --git a/rules/xorg-font-misc-cyrillic.in b/rules/xorg-font-misc-cyrillic.in
index 1bbbd9346..2121970dd 100644
--- a/rules/xorg-font-misc-cyrillic.in
+++ b/rules/xorg-font-misc-cyrillic.in
@@ -1,7 +1,6 @@
 config XORG_FONT_MISC_CYRILLIC
 	bool
-	depends on XORG_FONT_INTL
-	select HOST_XORG_APP_BDFTOPCF
+	select XORG_FONTS
 	prompt "misc cyrillic"
 	help
 	  FIXME
diff --git a/rules/xorg-font-misc-cyrillic.make b/rules/xorg-font-misc-cyrillic.make
index a41b3130c..eccbeb83e 100644
--- a/rules/xorg-font-misc-cyrillic.make
+++ b/rules/xorg-font-misc-cyrillic.make
@@ -20,10 +20,13 @@ PACKAGES-$(PTXCONF_XORG_FONT_MISC_CYRILLIC) += xorg-font-misc-cyrillic
 XORG_FONT_MISC_CYRILLIC_VERSION	:= 1.0.0
 XORG_FONT_MISC_CYRILLIC		:= font-misc-cyrillic-X11R7.0-$(XORG_FONT_MISC_CYRILLIC_VERSION)
 XORG_FONT_MISC_CYRILLIC_SUFFIX	:= tar.bz2
-XORG_FONT_MISC_CYRILLIC_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font//$(XORG_FONT_MISC_CYRILLIC).$(XORG_FONT_MISC_CYRILLIC_SUFFIX)
+XORG_FONT_MISC_CYRILLIC_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_MISC_CYRILLIC).$(XORG_FONT_MISC_CYRILLIC_SUFFIX)
 XORG_FONT_MISC_CYRILLIC_SOURCE	:= $(SRCDIR)/$(XORG_FONT_MISC_CYRILLIC).$(XORG_FONT_MISC_CYRILLIC_SUFFIX)
 XORG_FONT_MISC_CYRILLIC_DIR	:= $(BUILDDIR)/$(XORG_FONT_MISC_CYRILLIC)
 
+ifdef PTXCONF_XORG_FONT_MISC_CYRILLIC
+$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-misc-cyrillic.targetinstall
+endif
 
 # ----------------------------------------------------------------------------
 # Get
@@ -64,7 +67,9 @@ XORG_FONT_MISC_CYRILLIC_ENV 	:=  $(CROSS_ENV)
 #
 # autoconf
 #
-XORG_FONT_MISC_CYRILLIC_AUTOCONF := $(CROSS_AUTOCONF_USR)
+XORG_FONT_MISC_CYRILLIC_AUTOCONF := \
+	$(CROSS_AUTOCONF_USR) \
+	--with-fontdir=$(XORG_FONTDIR)/cyrillic
 
 $(STATEDIR)/xorg-font-misc-cyrillic.prepare: $(xorg-font-misc-cyrillic_prepare_deps_default)
 	@$(call targetinfo, $@)
@@ -82,7 +87,7 @@ xorg-font-misc-cyrillic_compile: $(STATEDIR)/xorg-font-misc-cyrillic.compile
 
 $(STATEDIR)/xorg-font-misc-cyrillic.compile: $(xorg-font-misc-cyrillic_compile_deps_default)
 	@$(call targetinfo, $@)
-	cd $(XORG_FONT_MISC_CYRILLIC_DIR) && $(XORG_FONT_MISC_CYRILLIC_PATH) make
+	cd $(XORG_FONT_MISC_CYRILLIC_DIR) && $(XORG_FONT_MISC_CYRILLIC_PATH) $(MAKE)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
@@ -104,21 +109,14 @@ xorg-font-misc-cyrillic_targetinstall: $(STATEDIR)/xorg-font-misc-cyrillic.targe
 $(STATEDIR)/xorg-font-misc-cyrillic.targetinstall: $(xorg-font-misc-cyrillic_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init, xorg-font-misc-cyrillic)
-	@$(call install_fixup, xorg-font-misc-cyrillic,PACKAGE,xorg-font-misc-cyrillic)
-	@$(call install_fixup, xorg-font-misc-cyrillic,PRIORITY,optional)
-	@$(call install_fixup, xorg-font-misc-cyrillic,VERSION,$(XORG_FONT_MISC_CYRILLIC_VERSION))
-	@$(call install_fixup, xorg-font-misc-cyrillic,SECTION,base)
-	@$(call install_fixup, xorg-font-misc-cyrillic,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup, xorg-font-misc-cyrillic,DEPENDS,)
-	@$(call install_fixup, xorg-font-misc-cyrillic,DESCRIPTION,missing)
-
-	@cd $(XORG_FONT_MISC_CYRILLIC_DIR); \
-	for file in *.pcf.gz; do	\
-		$(call install_copy, xorg-font-misc-cyrillic, 0, 0, 0644, $$file, $(XORG_FONTDIR)/cyrillic/$$file, n); \
-	done
+	@mkdir -p $(XORG_FONTS_DIR_INSTALL)/cyrillic
 
-	@$(call install_finish, xorg-font-misc-cyrillic)
+	@find $(XORG_FONT_MISC_CYRILLIC_DIR) \
+		-name "*.pcf.gz" \
+		| \
+		while read file; do \
+		install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/cyrillic; \
+	done
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-font-misc-ethiopic.in b/rules/xorg-font-misc-ethiopic.in
index 134ba76bb..53cf67893 100644
--- a/rules/xorg-font-misc-ethiopic.in
+++ b/rules/xorg-font-misc-ethiopic.in
@@ -1,7 +1,6 @@
 config XORG_FONT_MISC_ETHIOPIC
 	bool
-	depends on XORG_FONT_INTL
-	select HOST_XORG_APP_BDFTOPCF
+	select XORG_FONTS
 	prompt "misc. Ethiopic"
 	help
 	  contains opentype ethiopic fonts.
diff --git a/rules/xorg-font-misc-ethiopic.make b/rules/xorg-font-misc-ethiopic.make
index bd041efa5..d51993adb 100644
--- a/rules/xorg-font-misc-ethiopic.make
+++ b/rules/xorg-font-misc-ethiopic.make
@@ -20,10 +20,13 @@ PACKAGES-$(PTXCONF_XORG_FONT_MISC_ETHIOPIC) += xorg-font-misc-ethiopic
 XORG_FONT_MISC_ETHIOPIC_VERSION	:= 1.0.0
 XORG_FONT_MISC_ETHIOPIC		:= font-misc-ethiopic-X11R7.0-$(XORG_FONT_MISC_ETHIOPIC_VERSION)
 XORG_FONT_MISC_ETHIOPIC_SUFFIX	:= tar.bz2
-XORG_FONT_MISC_ETHIOPIC_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font//$(XORG_FONT_MISC_ETHIOPIC).$(XORG_FONT_MISC_ETHIOPIC_SUFFIX)
+XORG_FONT_MISC_ETHIOPIC_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_MISC_ETHIOPIC).$(XORG_FONT_MISC_ETHIOPIC_SUFFIX)
 XORG_FONT_MISC_ETHIOPIC_SOURCE	:= $(SRCDIR)/$(XORG_FONT_MISC_ETHIOPIC).$(XORG_FONT_MISC_ETHIOPIC_SUFFIX)
 XORG_FONT_MISC_ETHIOPIC_DIR	:= $(BUILDDIR)/$(XORG_FONT_MISC_ETHIOPIC)
 
+ifdef PTXCONF_XORG_FONT_MISC_ETHIOPIC
+$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-misc-ethiopic.targetinstall
+endif
 
 # ----------------------------------------------------------------------------
 # Get
@@ -64,7 +67,10 @@ XORG_FONT_MISC_ETHIOPIC_ENV 	:=  $(CROSS_ENV)
 #
 # autoconf
 #
-XORG_FONT_MISC_ETHIOPIC_AUTOCONF := $(CROSS_AUTOCONF_USR)
+XORG_FONT_MISC_ETHIOPIC_AUTOCONF := \
+	$(CROSS_AUTOCONF_USR) \
+	--with-ttf-fontdir=$(XORG_FONTDIR)/truetype \
+	--with-otf-fontdir=$(XORG_FONTDIR)/opentype
 
 $(STATEDIR)/xorg-font-misc-ethiopic.prepare: $(xorg-font-misc-ethiopic_prepare_deps_default)
 	@$(call targetinfo, $@)
@@ -82,7 +88,7 @@ xorg-font-misc-ethiopic_compile: $(STATEDIR)/xorg-font-misc-ethiopic.compile
 
 $(STATEDIR)/xorg-font-misc-ethiopic.compile: $(xorg-font-misc-ethiopic_compile_deps_default)
 	@$(call targetinfo, $@)
-	cd $(XORG_FONT_MISC_ETHIOPIC_DIR) && $(XORG_FONT_MISC_ETHIOPIC_PATH) make
+	cd $(XORG_FONT_MISC_ETHIOPIC_DIR) && $(XORG_FONT_MISC_ETHIOPIC_PATH) $(MAKE)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
@@ -104,21 +110,22 @@ xorg-font-misc-ethiopic_targetinstall: $(STATEDIR)/xorg-font-misc-ethiopic.targe
 $(STATEDIR)/xorg-font-misc-ethiopic.targetinstall: $(xorg-font-misc-ethiopic_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init, xorg-font-misc-ethiopic)
-	@$(call install_fixup, xorg-font-misc-ethiopic,PACKAGE,xorg-font-misc-ethiopic)
-	@$(call install_fixup, xorg-font-misc-ethiopic,PRIORITY,optional)
-	@$(call install_fixup, xorg-font-misc-ethiopic,VERSION,$(XORG_FONT_MISC_ETHIOPIC_VERSION))
-	@$(call install_fixup, xorg-font-misc-ethiopic,SECTION,base)
-	@$(call install_fixup, xorg-font-misc-ethiopic,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup, xorg-font-misc-ethiopic,DEPENDS,)
-	@$(call install_fixup, xorg-font-misc-ethiopic,DESCRIPTION,missing)
-
-	@cd $(XORG_FONT_MISC_ETHIOPIC_DIR); \
-	for file in *.otf *.ttf; do	\
-		$(call install_copy, xorg-font-misc-ethiopic, 0, 0, 0644, $$file, $(XORG_FONTDIR)/misc/$$file, n); \
+	@mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
+	@mkdir -p $(XORG_FONTS_DIR_INSTALL)/opentype
+
+	@find $(XORG_FONT_MISC_ETHIOPIC_DIR) \
+		-name "*.ttf" \
+		| \
+		while read file; do \
+		install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
 	done
 
-	@$(call install_finish, xorg-font-misc-ethiopic)
+	@find $(XORG_FONT_MISC_ETHIOPIC_DIR) \
+		-name "*.otf" \
+		| \
+		while read file; do \
+		install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/opentype; \
+	done
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-font-misc-meltho.in b/rules/xorg-font-misc-meltho.in
index 8e804a17e..6d97cbbfb 100644
--- a/rules/xorg-font-misc-meltho.in
+++ b/rules/xorg-font-misc-meltho.in
@@ -1,7 +1,6 @@
 config XORG_FONT_MISC_MELTHO
 	bool
-	depends on XORG_FONT_INTL
-	select HOST_XORG_APP_BDFTOPCF
+	select XORG_FONTS
 	prompt "misc. Meltho"
 	help
 	  contains syriac unicode-compliant opentype fonts
diff --git a/rules/xorg-font-misc-meltho.make b/rules/xorg-font-misc-meltho.make
index 7aca56e9c..e0fec3d59 100644
--- a/rules/xorg-font-misc-meltho.make
+++ b/rules/xorg-font-misc-meltho.make
@@ -20,10 +20,13 @@ PACKAGES-$(PTXCONF_XORG_FONT_MISC_MELTHO) += xorg-font-misc-meltho
 XORG_FONT_MISC_MELTHO_VERSION	:= 1.0.0
 XORG_FONT_MISC_MELTHO		:= font-misc-meltho-X11R7.0-$(XORG_FONT_MISC_MELTHO_VERSION)
 XORG_FONT_MISC_MELTHO_SUFFIX	:= tar.bz2
-XORG_FONT_MISC_MELTHO_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font//$(XORG_FONT_MISC_MELTHO).$(XORG_FONT_MISC_MELTHO_SUFFIX)
+XORG_FONT_MISC_MELTHO_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_MISC_MELTHO).$(XORG_FONT_MISC_MELTHO_SUFFIX)
 XORG_FONT_MISC_MELTHO_SOURCE	:= $(SRCDIR)/$(XORG_FONT_MISC_MELTHO).$(XORG_FONT_MISC_MELTHO_SUFFIX)
 XORG_FONT_MISC_MELTHO_DIR	:= $(BUILDDIR)/$(XORG_FONT_MISC_MELTHO)
 
+ifdef PTXCONF_XORG_FONT_MISC_MELTHO
+$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-misc-meltho.targetinstall
+endif
 
 # ----------------------------------------------------------------------------
 # Get
@@ -64,7 +67,9 @@ XORG_FONT_MISC_MELTHO_ENV 	:=  $(CROSS_ENV)
 #
 # autoconf
 #
-XORG_FONT_MISC_MELTHO_AUTOCONF := $(CROSS_AUTOCONF_USR)
+XORG_FONT_MISC_MELTHO_AUTOCONF := \
+	$(CROSS_AUTOCONF_USR) \
+	--with-fontdir=$(XORG_FONTDIR)/opentype
 
 $(STATEDIR)/xorg-font-misc-meltho.prepare: $(xorg-font-misc-meltho_prepare_deps_default)
 	@$(call targetinfo, $@)
@@ -82,7 +87,7 @@ xorg-font-misc-meltho_compile: $(STATEDIR)/xorg-font-misc-meltho.compile
 
 $(STATEDIR)/xorg-font-misc-meltho.compile: $(xorg-font-misc-meltho_compile_deps_default)
 	@$(call targetinfo, $@)
-	cd $(XORG_FONT_MISC_MELTHO_DIR) && $(XORG_FONT_MISC_MELTHO_PATH) make
+	cd $(XORG_FONT_MISC_MELTHO_DIR) && $(XORG_FONT_MISC_MELTHO_PATH) $(MAKE)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
@@ -104,21 +109,14 @@ xorg-font-misc-meltho_targetinstall: $(STATEDIR)/xorg-font-misc-meltho.targetins
 $(STATEDIR)/xorg-font-misc-meltho.targetinstall: $(xorg-font-misc-meltho_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init, xorg-font-misc-meltho)
-	@$(call install_fixup, xorg-font-misc-meltho,PACKAGE,xorg-font-misc-meltho)
-	@$(call install_fixup, xorg-font-misc-meltho,PRIORITY,optional)
-	@$(call install_fixup, xorg-font-misc-meltho,VERSION,$(XORG_FONT_MISC_MELTHO_VERSION))
-	@$(call install_fixup, xorg-font-misc-meltho,SECTION,base)
-	@$(call install_fixup, xorg-font-misc-meltho,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup, xorg-font-misc-meltho,DEPENDS,)
-	@$(call install_fixup, xorg-font-misc-meltho,DESCRIPTION,missing)
-
-	@cd $(XORG_FONT_MISC_MELTHO_DIR); \
-	for file in *.otf; do	\
-		$(call install_copy, xorg-font-misc-meltho, 0, 0, 0644, $$file, $(XORG_FONTDIR)/misc/$$file, n); \
-	done
+	@mkdir -p $(XORG_FONTS_DIR_INSTALL)/opentype
 
-	@$(call install_finish, xorg-font-misc-meltho)
+	@find $(XORG_FONT_MISC_MELTHO_DIR) \
+		-name "*.otf" \
+		| \
+		while read file; do \
+		install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/opentype; \
+	done
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-font-misc-misc.in b/rules/xorg-font-misc-misc.in
index 9219a583d..4fd184a4b 100644
--- a/rules/xorg-font-misc-misc.in
+++ b/rules/xorg-font-misc-misc.in
@@ -1,7 +1,6 @@
 config XORG_FONT_MISC_MISC
 	bool
-	depends on XORG_FONT_BASE
-	select HOST_XORG_APP_BDFTOPCF
+	select XORG_FONTS
 	default y
 	prompt "misc misc"
 	help
diff --git a/rules/xorg-font-misc-misc.make b/rules/xorg-font-misc-misc.make
index 1400b929f..713ccf8c1 100644
--- a/rules/xorg-font-misc-misc.make
+++ b/rules/xorg-font-misc-misc.make
@@ -20,10 +20,13 @@ PACKAGES-$(PTXCONF_XORG_FONT_MISC_MISC) += xorg-font-misc-misc
 XORG_FONT_MISC_MISC_VERSION	:= 1.0.0
 XORG_FONT_MISC_MISC		:= font-misc-misc-X11R7.0-$(XORG_FONT_MISC_MISC_VERSION)
 XORG_FONT_MISC_MISC_SUFFIX	:= tar.bz2
-XORG_FONT_MISC_MISC_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font//$(XORG_FONT_MISC_MISC).$(XORG_FONT_MISC_MISC_SUFFIX)
+XORG_FONT_MISC_MISC_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_MISC_MISC).$(XORG_FONT_MISC_MISC_SUFFIX)
 XORG_FONT_MISC_MISC_SOURCE	:= $(SRCDIR)/$(XORG_FONT_MISC_MISC).$(XORG_FONT_MISC_MISC_SUFFIX)
 XORG_FONT_MISC_MISC_DIR		:= $(BUILDDIR)/$(XORG_FONT_MISC_MISC)
 
+ifdef PTXCONF_XORG_FONT_MISC_MISC
+$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-misc-misc.targetinstall
+endif
 
 # ----------------------------------------------------------------------------
 # Get
@@ -64,7 +67,9 @@ XORG_FONT_MISC_MISC_ENV 	:=  $(CROSS_ENV)
 #
 # autoconf
 #
-XORG_FONT_MISC_MISC_AUTOCONF := $(CROSS_AUTOCONF_USR)
+XORG_FONT_MISC_MISC_AUTOCONF := \
+	$(CROSS_AUTOCONF_USR) \
+	--with-fontdir=$(XORG_FONTDIR)/misc
 
 $(STATEDIR)/xorg-font-misc-misc.prepare: $(xorg-font-misc-misc_prepare_deps_default)
 	@$(call targetinfo, $@)
@@ -82,7 +87,7 @@ xorg-font-misc-misc_compile: $(STATEDIR)/xorg-font-misc-misc.compile
 
 $(STATEDIR)/xorg-font-misc-misc.compile: $(xorg-font-misc-misc_compile_deps_default)
 	@$(call targetinfo, $@)
-	cd $(XORG_FONT_MISC_MISC_DIR) && $(XORG_FONT_MISC_MISC_PATH) make
+	cd $(XORG_FONT_MISC_MISC_DIR) && $(XORG_FONT_MISC_MISC_PATH) $(MAKE)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
@@ -104,40 +109,39 @@ xorg-font-misc-misc_targetinstall: $(STATEDIR)/xorg-font-misc-misc.targetinstall
 $(STATEDIR)/xorg-font-misc-misc.targetinstall: $(xorg-font-misc-misc_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init, xorg-font-misc-misc)
-	@$(call install_fixup, xorg-font-misc-misc,PACKAGE,xorg-font-misc-misc)
-	@$(call install_fixup, xorg-font-misc-misc,PRIORITY,optional)
-	@$(call install_fixup, xorg-font-misc-misc,VERSION,$(XORG_FONT_MISC_MISC_VERSION))
-	@$(call install_fixup, xorg-font-misc-misc,SECTION,base)
-	@$(call install_fixup, xorg-font-misc-misc,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup, xorg-font-misc-misc,DEPENDS,)
-	@$(call install_fixup, xorg-font-misc-misc,DESCRIPTION,missing)
-
-	@cd $(XORG_FONT_MISC_MISC_DIR); \
-	for file in `find . -name "*.pcf.gz" -a \! -name "*ISO8859*"`; do	\
-		if [ -e $$file ]; then \
-			$(call install_copy, xorg-font-misc-misc, 0, 0, 0644, $$file, $(XORG_FONTDIR)/misc/$$file, n); \
-		fi; \
-	done;
-
-	@cd $(XORG_FONT_MISC_MISC_DIR); \
-	for file in *{ISO8859-15,ISO8859-1,ISO8859-16,ISO8859-11}.pcf.gz; do \
-		if [ -e $$file ]; then \
-			$(call install_copy, xorg-font-misc-misc, 0, 0, 0644, $$file, $(XORG_FONTDIR)/misc/$$file, n); \
-		fi; \
-	done;
+	@mkdir -p $(XORG_FONTS_DIR_INSTALL)/misc
+
+	@find $(XORG_FONT_MISC_MISC_DIR) \
+		-name "*.pcf.gz" -a \! -name "*ISO8859*" -a \! -name "*KOI*" \
+		-o -name "*ISO8859-1.pcf.gz" \
+		-o -name "*ISO8859-15.pcf.gz" \
+		| \
+		while read file; do \
+		install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/misc; \
+	done
+
+# FIXME: care about KOI fonts
 
 ifdef PTXCONF_XORG_FONT_MISC_MISC_TRANS
-	@cd $(XORG_FONT_MISC_MISC_DIR); \
-	for file in *{ISO8859-2,-ISO8859-3,ISO8859-4,ISO8859-9,ISO8859-10,ISO8859-13,ISO8859-14}.pcf.gz; do \
-		if [ -e $$file ]; then \
-			$(call install_copy, xorg-font-misc-misc, 0, 0, 0644, $$file, $(XORG_FONTDIR)/misc/$$file, n); \
-		fi; \
-	done;
+	@find $(XORG_FONT_MISC_MISC_DIR) \
+		-name "*ISO8859-2.pcf.gz" \
+		-o -name "*ISO8859-3.pcf.gz" \
+		-o -name "*ISO8859-4.pcf.gz" \
+		-o -name "*ISO8859-5.pcf.gz" \
+		-o -name "*ISO8859-6.pcf.gz" \
+		-o -name "*ISO8859-7.pcf.gz" \
+		-o -name "*ISO8859-8.pcf.gz" \
+		-o -name "*ISO8859-9.pcf.gz" \
+		-o -name "*ISO8859-10.pcf.gz" \
+		-o -name "*ISO8859-13.pcf.gz" \
+		-o -name "*ISO8859-14.pcf.gz" \
+		-o -name "*ISO8859-16.pcf.gz" \
+		| \
+		while read file; do \
+		install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/misc; \
+	done
 endif
 
-	@$(call install_finish, xorg-font-misc-misc)
-
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
diff --git a/rules/xorg-font-mutt-misc.in b/rules/xorg-font-mutt-misc.in
index fa9051429..bc356b0ed 100644
--- a/rules/xorg-font-mutt-misc.in
+++ b/rules/xorg-font-mutt-misc.in
@@ -1,6 +1,6 @@
 config XORG_FONT_MUTT_MISC
 	bool
-	depends on XORG_FONT
+	select XORG_FONTS
 	prompt "Mutt misc"
 	help
 	  FIXME
diff --git a/rules/xorg-font-mutt-misc.make b/rules/xorg-font-mutt-misc.make
index 57d628383..7005df51a 100644
--- a/rules/xorg-font-mutt-misc.make
+++ b/rules/xorg-font-mutt-misc.make
@@ -20,10 +20,13 @@ PACKAGES-$(PTXCONF_XORG_FONT_MUTT_MISC) += xorg-font-mutt-misc
 XORG_FONT_MUTT_MISC_VERSION	:= 1.0.0
 XORG_FONT_MUTT_MISC		:= font-mutt-misc-X11R7.0-$(XORG_FONT_MUTT_MISC_VERSION)
 XORG_FONT_MUTT_MISC_SUFFIX	:= tar.bz2
-XORG_FONT_MUTT_MISC_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font//$(XORG_FONT_MUTT_MISC).$(XORG_FONT_MUTT_MISC_SUFFIX)
+XORG_FONT_MUTT_MISC_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_MUTT_MISC).$(XORG_FONT_MUTT_MISC_SUFFIX)
 XORG_FONT_MUTT_MISC_SOURCE	:= $(SRCDIR)/$(XORG_FONT_MUTT_MISC).$(XORG_FONT_MUTT_MISC_SUFFIX)
 XORG_FONT_MUTT_MISC_DIR		:= $(BUILDDIR)/$(XORG_FONT_MUTT_MISC)
 
+ifdef PTXCONF_XORG_FONT_MUTT_MISC
+$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-mutt-misc.targetinstall
+endif
 
 # ----------------------------------------------------------------------------
 # Get
@@ -64,7 +67,9 @@ XORG_FONT_MUTT_MISC_ENV 	:=  $(CROSS_ENV)
 #
 # autoconf
 #
-XORG_FONT_MUTT_MISC_AUTOCONF := $(CROSS_AUTOCONF_USR)
+XORG_FONT_MUTT_MISC_AUTOCONF := \
+	$(CROSS_AUTOCONF_USR) \
+	--with-fontdir=$(XORG_FONTDIR)/misc
 
 $(STATEDIR)/xorg-font-mutt-misc.prepare: $(xorg-font-mutt-misc_prepare_deps_default)
 	@$(call targetinfo, $@)
@@ -82,7 +87,7 @@ xorg-font-mutt-misc_compile: $(STATEDIR)/xorg-font-mutt-misc.compile
 
 $(STATEDIR)/xorg-font-mutt-misc.compile: $(xorg-font-mutt-misc_compile_deps_default)
 	@$(call targetinfo, $@)
-	cd $(XORG_FONT_MUTT_MISC_DIR) && $(XORG_FONT_MUTT_MISC_PATH) make
+	cd $(XORG_FONT_MUTT_MISC_DIR) && $(XORG_FONT_MUTT_MISC_PATH) $(MAKE)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
@@ -104,21 +109,14 @@ xorg-font-mutt-misc_targetinstall: $(STATEDIR)/xorg-font-mutt-misc.targetinstall
 $(STATEDIR)/xorg-font-mutt-misc.targetinstall: $(xorg-font-mutt-misc_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init, xorg-font-mutt-misc)
-	@$(call install_fixup, xorg-font-mutt-misc,PACKAGE,xorg-font-mutt-misc)
-	@$(call install_fixup, xorg-font-mutt-misc,PRIORITY,optional)
-	@$(call install_fixup, xorg-font-mutt-misc,VERSION,$(XORG_FONT_MUTT_MISC_VERSION))
-	@$(call install_fixup, xorg-font-mutt-misc,SECTION,base)
-	@$(call install_fixup, xorg-font-mutt-misc,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup, xorg-font-mutt-misc,DEPENDS,)
-	@$(call install_fixup, xorg-font-mutt-misc,DESCRIPTION,missing)
-
-	@cd $(XORG_FONT_MUTT_MISC_DIR); \
-	for file in *.pcf.gz; do	\
-		$(call install_copy, xorg-font-mutt-misc, 0, 0, 0644, $$file, $(XORG_FONTDIR)/misc/$$file, n); \
-	done
+	@mkdir -p $(XORG_FONTS_DIR_INSTALL)/misc
 
-	@$(call install_finish, xorg-font-mutt-misc)
+	@find $(XORG_FONT_MUTT_MISC_DIR) \
+		-name "*.pcf.gz" \
+		| \
+		while read file; do \
+		install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/misc; \
+	done
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-font-scalable.in b/rules/xorg-font-scalable.in
index d7179672d..279447da8 100644
--- a/rules/xorg-font-scalable.in
+++ b/rules/xorg-font-scalable.in
@@ -1,8 +1,10 @@
-menuconfig XORG_FONT_SCALABLE
-        bool "xorg scalable fonts           "
+menu "xorg scalable fonts           "
 
+source "rules/xorg-font-adobe-utopia-type1.in"
 source "rules/xorg-font-bitstream-speedo.in"
 source "rules/xorg-font-bitstream-type1.in"
-source "rules/xorg-font-adobe-utopia-type1.in"
-source "rules/xorg-font-xfree86-type1.in"
+source "rules/xorg-font-bh-ttf.in"
 source "rules/xorg-font-ibm-type1.in"
+source "rules/xorg-font-xfree86-type1.in"
+
+endmenu
diff --git a/rules/xorg-font-schumacher-misc.in b/rules/xorg-font-schumacher-misc.in
index 83942d99d..aedfbd663 100644
--- a/rules/xorg-font-schumacher-misc.in
+++ b/rules/xorg-font-schumacher-misc.in
@@ -1,8 +1,6 @@
 config XORG_FONT_SCHUMACHER_MISC
 	bool
-	depends on XORG_FONT
-	depends on BROKEN
-	select HOST_XORG_APP_BDFTOPCF
+	select XORG_FONTS
 	prompt "Schumacher misc"
 	help
 	  FIXME
diff --git a/rules/xorg-font-schumacher-misc.make b/rules/xorg-font-schumacher-misc.make
index e5ef6751d..a4b2dfdc0 100644
--- a/rules/xorg-font-schumacher-misc.make
+++ b/rules/xorg-font-schumacher-misc.make
@@ -20,10 +20,13 @@ PACKAGES-$(PTXCONF_XORG_FONT_SCHUMACHER_MISC) += xorg-font-schumacher-misc
 XORG_FONT_SCHUMACHER_MISC_VERSION	:= 1.0.0
 XORG_FONT_SCHUMACHER_MISC		:= font-schumacher-misc-X11R7.0-$(XORG_FONT_SCHUMACHER_MISC_VERSION)
 XORG_FONT_SCHUMACHER_MISC_SUFFIX	:= tar.bz2
-XORG_FONT_SCHUMACHER_MISC_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font//$(XORG_FONT_SCHUMACHER_MISC).$(XORG_FONT_SCHUMACHER_MISC_SUFFIX)
+XORG_FONT_SCHUMACHER_MISC_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_SCHUMACHER_MISC).$(XORG_FONT_SCHUMACHER_MISC_SUFFIX)
 XORG_FONT_SCHUMACHER_MISC_SOURCE	:= $(SRCDIR)/$(XORG_FONT_SCHUMACHER_MISC).$(XORG_FONT_SCHUMACHER_MISC_SUFFIX)
 XORG_FONT_SCHUMACHER_MISC_DIR		:= $(BUILDDIR)/$(XORG_FONT_SCHUMACHER_MISC)
 
+ifdef PTXCONF_XORG_FONT_SCHUMACHER_MISC
+$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-schumacher-misc.targetinstall
+endif
 
 # ----------------------------------------------------------------------------
 # Get
@@ -82,7 +85,7 @@ xorg-font-schumacher-misc_compile: $(STATEDIR)/xorg-font-schumacher-misc.compile
 
 $(STATEDIR)/xorg-font-schumacher-misc.compile: $(xorg-font-schumacher-misc_compile_deps_default)
 	@$(call targetinfo, $@)
-	cd $(XORG_FONT_SCHUMACHER_MISC_DIR) && $(XORG_FONT_SCHUMACHER_MISC_PATH) make
+	cd $(XORG_FONT_SCHUMACHER_MISC_DIR) && $(XORG_FONT_SCHUMACHER_MISC_PATH) $(MAKE)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
@@ -104,21 +107,38 @@ xorg-font-schumacher-misc_targetinstall: $(STATEDIR)/xorg-font-schumacher-misc.t
 $(STATEDIR)/xorg-font-schumacher-misc.targetinstall: $(xorg-font-schumacher-misc_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init, xorg-font-schumacher-misc)
-	@$(call install_fixup, xorg-font-schumacher-misc,PACKAGE,xorg-font-schumacher-misc)
-	@$(call install_fixup, xorg-font-schumacher-misc,PRIORITY,optional)
-	@$(call install_fixup, xorg-font-schumacher-misc,VERSION,$(XORG_FONT_SCHUMACHER_MISC_VERSION))
-	@$(call install_fixup, xorg-font-schumacher-misc,SECTION,base)
-	@$(call install_fixup, xorg-font-schumacher-misc,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup, xorg-font-schumacher-misc,DEPENDS,)
-	@$(call install_fixup, xorg-font-schumacher-misc,DESCRIPTION,missing)
-
-	@cd $(XORG_FONT_SCHUMACHER_MISC_DIR); \
-	for file in *.pcf.gz; do	\
-		$(call install_copy, xorg-font-schumacher-misc, 0, 0, 0644, $$file, $(XORG_FONTDIR)/misc/$$file, n); \
+	@mkdir -p $(XORG_FONTS_DIR_INSTALL)/misc
+
+	@find $(XORG_FONT_SCHUMACHER_MISC_DIR) \
+		-name "*.pcf.gz" -a \! -name "*ISO8859*" -a \! -name "*KOI*" \
+		-o -name "*ISO8859-1.pcf.gz" \
+		-o -name "*ISO8859-15.pcf.gz" \
+		| \
+		while read file; do \
+		install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/misc; \
 	done
 
-	@$(call install_finish, xorg-font-schumacher-misc)
+# FIXME: care about KOI fonts
+
+ifdef PTXCONF_XORG_FONT_SCHUMACHER_MISC_TRANS
+	@find $(XORG_FONT_SCHUMACHER_MISC_DIR) \
+		-name "*ISO8859-2.pcf.gz" \
+		-o -name "*ISO8859-3.pcf.gz" \
+		-o -name "*ISO8859-4.pcf.gz" \
+		-o -name "*ISO8859-5.pcf.gz" \
+		-o -name "*ISO8859-6.pcf.gz" \
+		-o -name "*ISO8859-7.pcf.gz" \
+		-o -name "*ISO8859-8.pcf.gz" \
+		-o -name "*ISO8859-9.pcf.gz" \
+		-o -name "*ISO8859-10.pcf.gz" \
+		-o -name "*ISO8859-13.pcf.gz" \
+		-o -name "*ISO8859-14.pcf.gz" \
+		-o -name "*ISO8859-16.pcf.gz" \
+		| \
+		while read file; do \
+		install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/misc; \
+	done
+endif
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-font-screen-cyrillic.in b/rules/xorg-font-screen-cyrillic.in
index d50d17cf9..d897b3fa1 100644
--- a/rules/xorg-font-screen-cyrillic.in
+++ b/rules/xorg-font-screen-cyrillic.in
@@ -1,6 +1,6 @@
 config XORG_FONT_SCREEN_CYRILLIC
 	bool
-	depends on XORG_FONT_INTL
+	select XORG_FONTS
 	prompt "Screen cyrillic"
 	help
 	  FIXME
diff --git a/rules/xorg-font-screen-cyrillic.make b/rules/xorg-font-screen-cyrillic.make
index dd4b564a2..90a27f7d5 100644
--- a/rules/xorg-font-screen-cyrillic.make
+++ b/rules/xorg-font-screen-cyrillic.make
@@ -20,10 +20,13 @@ PACKAGES-$(PTXCONF_XORG_FONT_SCREEN_CYRILLIC) += xorg-font-screen-cyrillic
 XORG_FONT_SCREEN_CYRILLIC_VERSION	:= 1.0.0
 XORG_FONT_SCREEN_CYRILLIC		:= font-screen-cyrillic-X11R7.0-$(XORG_FONT_SCREEN_CYRILLIC_VERSION)
 XORG_FONT_SCREEN_CYRILLIC_SUFFIX	:= tar.bz2
-XORG_FONT_SCREEN_CYRILLIC_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font//$(XORG_FONT_SCREEN_CYRILLIC).$(XORG_FONT_SCREEN_CYRILLIC_SUFFIX)
+XORG_FONT_SCREEN_CYRILLIC_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_SCREEN_CYRILLIC).$(XORG_FONT_SCREEN_CYRILLIC_SUFFIX)
 XORG_FONT_SCREEN_CYRILLIC_SOURCE	:= $(SRCDIR)/$(XORG_FONT_SCREEN_CYRILLIC).$(XORG_FONT_SCREEN_CYRILLIC_SUFFIX)
 XORG_FONT_SCREEN_CYRILLIC_DIR		:= $(BUILDDIR)/$(XORG_FONT_SCREEN_CYRILLIC)
 
+ifdef PTXCONF_XORG_FONT_SCREEN_CYRILLIC
+$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-screen-cyrillic.targetinstall
+endif
 
 # ----------------------------------------------------------------------------
 # Get
@@ -64,7 +67,9 @@ XORG_FONT_SCREEN_CYRILLIC_ENV 	:=  $(CROSS_ENV)
 #
 # autoconf
 #
-XORG_FONT_SCREEN_CYRILLIC_AUTOCONF := $(CROSS_AUTOCONF_USR)
+XORG_FONT_SCREEN_CYRILLIC_AUTOCONF := \
+	$(CROSS_AUTOCONF_USR) \
+	--with-fontdir=$(XORG_FONTDIR)/cyrillic
 
 $(STATEDIR)/xorg-font-screen-cyrillic.prepare: $(xorg-font-screen-cyrillic_prepare_deps_default)
 	@$(call targetinfo, $@)
@@ -82,7 +87,7 @@ xorg-font-screen-cyrillic_compile: $(STATEDIR)/xorg-font-screen-cyrillic.compile
 
 $(STATEDIR)/xorg-font-screen-cyrillic.compile: $(xorg-font-screen-cyrillic_compile_deps_default)
 	@$(call targetinfo, $@)
-	cd $(XORG_FONT_SCREEN_CYRILLIC_DIR) && $(XORG_FONT_SCREEN_CYRILLIC_PATH) make
+	cd $(XORG_FONT_SCREEN_CYRILLIC_DIR) && $(XORG_FONT_SCREEN_CYRILLIC_PATH) $(MAKE)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
@@ -104,21 +109,14 @@ xorg-font-screen-cyrillic_targetinstall: $(STATEDIR)/xorg-font-screen-cyrillic.t
 $(STATEDIR)/xorg-font-screen-cyrillic.targetinstall: $(xorg-font-screen-cyrillic_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init, xorg-font-screen-cyrillic)
-	@$(call install_fixup, xorg-font-screen-cyrillic,PACKAGE,xorg-font-screen-cyrillic)
-	@$(call install_fixup, xorg-font-screen-cyrillic,PRIORITY,optional)
-	@$(call install_fixup, xorg-font-screen-cyrillic,VERSION,$(XORG_FONT_SCREEN_CYRILLIC_VERSION))
-	@$(call install_fixup, xorg-font-screen-cyrillic,SECTION,base)
-	@$(call install_fixup, xorg-font-screen-cyrillic,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup, xorg-font-screen-cyrillic,DEPENDS,)
-	@$(call install_fixup, xorg-font-screen-cyrillic,DESCRIPTION,missing)
-
-	@cd $(XORG_FONT_SCREEN_CYRILLIC_DIR); \
-	for file in *.pcf.gz; do	\
-		$(call install_copy, xorg-font-screen-cyrillic, 0, 0, 0644, $$file, $(XORG_FONTDIR)/cyrillic/$$file, n); \
-	done
+	@mkdir -p $(XORG_FONTS_DIR_INSTALL)/cyrillic
 
-	@$(call install_finish, xorg-font-screen-cyrillic)
+	@find $(XORG_FONT_SCREEN_CYRILLIC_DIR) \
+		-name "*.pcf.gz" \
+		| \
+		while read file; do \
+		install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/cyrillic; \
+	done
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-font-sony-misc.in b/rules/xorg-font-sony-misc.in
index 2c390bed0..c65805eb2 100644
--- a/rules/xorg-font-sony-misc.in
+++ b/rules/xorg-font-sony-misc.in
@@ -1,7 +1,6 @@
 config XORG_FONT_SONY_MISC
 	bool
-	depends on XORG_FONT
-	select HOST_XORG_APP_BDFTOPCF
+	select XORG_FONTS
 	prompt "Sony misc"
 	help
 	  FIXME
diff --git a/rules/xorg-font-sony-misc.make b/rules/xorg-font-sony-misc.make
index ef5b84d26..49e344d9b 100644
--- a/rules/xorg-font-sony-misc.make
+++ b/rules/xorg-font-sony-misc.make
@@ -20,10 +20,13 @@ PACKAGES-$(PTXCONF_XORG_FONT_SONY_MISC) += xorg-font-sony-misc
 XORG_FONT_SONY_MISC_VERSION	:= 1.0.0
 XORG_FONT_SONY_MISC		:= font-sony-misc-X11R7.0-$(XORG_FONT_SONY_MISC_VERSION)
 XORG_FONT_SONY_MISC_SUFFIX	:= tar.bz2
-XORG_FONT_SONY_MISC_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font//$(XORG_FONT_SONY_MISC).$(XORG_FONT_SONY_MISC_SUFFIX)
+XORG_FONT_SONY_MISC_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_SONY_MISC).$(XORG_FONT_SONY_MISC_SUFFIX)
 XORG_FONT_SONY_MISC_SOURCE	:= $(SRCDIR)/$(XORG_FONT_SONY_MISC).$(XORG_FONT_SONY_MISC_SUFFIX)
 XORG_FONT_SONY_MISC_DIR		:= $(BUILDDIR)/$(XORG_FONT_SONY_MISC)
 
+ifdef PTXCONF_XORG_FONT_SONY_MISC
+$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-sony-misc.targetinstall
+endif
 
 # ----------------------------------------------------------------------------
 # Get
@@ -64,7 +67,9 @@ XORG_FONT_SONY_MISC_ENV 	:=  $(CROSS_ENV)
 #
 # autoconf
 #
-XORG_FONT_SONY_MISC_AUTOCONF := $(CROSS_AUTOCONF_USR)
+XORG_FONT_SONY_MISC_AUTOCONF := \
+	$(CROSS_AUTOCONF_USR) \
+	--with-fontdir=$(XORG_FONTDIR)/misc
 
 $(STATEDIR)/xorg-font-sony-misc.prepare: $(xorg-font-sony-misc_prepare_deps_default)
 	@$(call targetinfo, $@)
@@ -82,7 +87,7 @@ xorg-font-sony-misc_compile: $(STATEDIR)/xorg-font-sony-misc.compile
 
 $(STATEDIR)/xorg-font-sony-misc.compile: $(xorg-font-sony-misc_compile_deps_default)
 	@$(call targetinfo, $@)
-	cd $(XORG_FONT_SONY_MISC_DIR) && $(XORG_FONT_SONY_MISC_PATH) make
+	cd $(XORG_FONT_SONY_MISC_DIR) && $(XORG_FONT_SONY_MISC_PATH) $(MAKE)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
@@ -104,21 +109,14 @@ xorg-font-sony-misc_targetinstall: $(STATEDIR)/xorg-font-sony-misc.targetinstall
 $(STATEDIR)/xorg-font-sony-misc.targetinstall: $(xorg-font-sony-misc_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init, xorg-font-sony-misc)
-	@$(call install_fixup, xorg-font-sony-misc,PACKAGE,xorg-font-sony-misc)
-	@$(call install_fixup, xorg-font-sony-misc,PRIORITY,optional)
-	@$(call install_fixup, xorg-font-sony-misc,VERSION,$(XORG_FONT_SONY_MISC_VERSION))
-	@$(call install_fixup, xorg-font-sony-misc,SECTION,base)
-	@$(call install_fixup, xorg-font-sony-misc,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup, xorg-font-sony-misc,DEPENDS,)
-	@$(call install_fixup, xorg-font-sony-misc,DESCRIPTION,missing)
-
-	@cd $(XORG_FONT_SONY_MISC_DIR); \
-	for file in *.pcf.gz; do	\
-		$(call install_copy, xorg-font-sony-misc, 0, 0, 0644, $$file, $(XORG_FONTDIR)/misc/$$file, n); \
-	done
+	@mkdir -p $(XORG_FONTS_DIR_INSTALL)/misc
 
-	@$(call install_finish, xorg-font-sony-misc)
+	@find $(XORG_FONT_SONY_MISC_DIR) \
+		-name "*.pcf.gz" \
+		| \
+		while read file; do \
+		install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/misc; \
+	done
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-font-sun-misc.in b/rules/xorg-font-sun-misc.in
index a28400b00..f2f354459 100644
--- a/rules/xorg-font-sun-misc.in
+++ b/rules/xorg-font-sun-misc.in
@@ -1,7 +1,6 @@
 config XORG_FONT_SUN_MISC
 	bool
-	depends on XORG_FONT
-	select HOST_XORG_APP_BDFTOPCF
+	select XORG_FONTS
 	prompt "Sun misc"
 	help
 	  FIXME
diff --git a/rules/xorg-font-sun-misc.make b/rules/xorg-font-sun-misc.make
index 6a8dc5622..8a0fe2435 100644
--- a/rules/xorg-font-sun-misc.make
+++ b/rules/xorg-font-sun-misc.make
@@ -20,10 +20,13 @@ PACKAGES-$(PTXCONF_XORG_FONT_SUN_MISC) += xorg-font-sun-misc
 XORG_FONT_SUN_MISC_VERSION	:= 1.0.0
 XORG_FONT_SUN_MISC		:= font-sun-misc-X11R7.0-$(XORG_FONT_SUN_MISC_VERSION)
 XORG_FONT_SUN_MISC_SUFFIX	:= tar.bz2
-XORG_FONT_SUN_MISC_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font//$(XORG_FONT_SUN_MISC).$(XORG_FONT_SUN_MISC_SUFFIX)
+XORG_FONT_SUN_MISC_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_SUN_MISC).$(XORG_FONT_SUN_MISC_SUFFIX)
 XORG_FONT_SUN_MISC_SOURCE	:= $(SRCDIR)/$(XORG_FONT_SUN_MISC).$(XORG_FONT_SUN_MISC_SUFFIX)
 XORG_FONT_SUN_MISC_DIR		:= $(BUILDDIR)/$(XORG_FONT_SUN_MISC)
 
+ifdef PTXCONF_XORG_FONT_SUN_MISC
+$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-sun-misc.targetinstall
+endif
 
 # ----------------------------------------------------------------------------
 # Get
@@ -64,7 +67,9 @@ XORG_FONT_SUN_MISC_ENV 	:=  $(CROSS_ENV)
 #
 # autoconf
 #
-XORG_FONT_SUN_MISC_AUTOCONF := $(CROSS_AUTOCONF_USR)
+XORG_FONT_SUN_MISC_AUTOCONF := \
+	$(CROSS_AUTOCONF_USR) \
+	--with-fontdir=$(XORG_FONTDIR)/misc
 
 $(STATEDIR)/xorg-font-sun-misc.prepare: $(xorg-font-sun-misc_prepare_deps_default)
 	@$(call targetinfo, $@)
@@ -82,7 +87,7 @@ xorg-font-sun-misc_compile: $(STATEDIR)/xorg-font-sun-misc.compile
 
 $(STATEDIR)/xorg-font-sun-misc.compile: $(xorg-font-sun-misc_compile_deps_default)
 	@$(call targetinfo, $@)
-	cd $(XORG_FONT_SUN_MISC_DIR) && $(XORG_FONT_SUN_MISC_PATH) make
+	cd $(XORG_FONT_SUN_MISC_DIR) && $(XORG_FONT_SUN_MISC_PATH) $(MAKE)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
@@ -104,21 +109,14 @@ xorg-font-sun-misc_targetinstall: $(STATEDIR)/xorg-font-sun-misc.targetinstall
 $(STATEDIR)/xorg-font-sun-misc.targetinstall: $(xorg-font-sun-misc_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init, xorg-font-sun-misc)
-	@$(call install_fixup, xorg-font-sun-misc,PACKAGE,xorg-font-sun-misc)
-	@$(call install_fixup, xorg-font-sun-misc,PRIORITY,optional)
-	@$(call install_fixup, xorg-font-sun-misc,VERSION,$(XORG_FONT_SUN_MISC_VERSION))
-	@$(call install_fixup, xorg-font-sun-misc,SECTION,base)
-	@$(call install_fixup, xorg-font-sun-misc,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup, xorg-font-sun-misc,DEPENDS,)
-	@$(call install_fixup, xorg-font-sun-misc,DESCRIPTION,missing)
-
-	@cd $(XORG_FONT_SUN_MISC_DIR); \
-	for file in *.pcf.gz; do	\
-		$(call install_copy, xorg-font-sun-misc, 0, 0, 0644, $$file, $(XORG_FONTDIR)/misc/$$file, n); \
-	done
+	@mkdir -p $(XORG_FONTS_DIR_INSTALL)/misc
 
-	@$(call install_finish, xorg-font-sun-misc)
+	@find $(XORG_FONT_SUN_MISC_DIR) \
+		-name "*.pcf.gz" \
+		| \
+		while read file; do \
+		install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/misc; \
+	done
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-font-util.make b/rules/xorg-font-util.make
index 08723cf25..eb55dab87 100644
--- a/rules/xorg-font-util.make
+++ b/rules/xorg-font-util.make
@@ -82,7 +82,7 @@ xorg-font-util_compile: $(STATEDIR)/xorg-font-util.compile
 
 $(STATEDIR)/xorg-font-util.compile: $(xorg-font-util_compile_deps_default)
 	@$(call targetinfo, $@)
-	cd $(XORG_FONT_UTIL_DIR) && $(XORG_FONT_UTIL_PATH) make
+	cd $(XORG_FONT_UTIL_DIR) && $(XORG_FONT_UTIL_PATH) $(MAKE)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
diff --git a/rules/xorg-font-winitzki-cyrillic.in b/rules/xorg-font-winitzki-cyrillic.in
index bae011f6d..6df0dc159 100644
--- a/rules/xorg-font-winitzki-cyrillic.in
+++ b/rules/xorg-font-winitzki-cyrillic.in
@@ -1,6 +1,6 @@
 config XORG_FONT_WINITZKI_CYRILLIC
 	bool
-	depends on XORG_FONT_INTL
+	select XORG_FONTS
 	prompt "Winitzki cyrillic"
 	help
 	  FIXME
diff --git a/rules/xorg-font-winitzki-cyrillic.make b/rules/xorg-font-winitzki-cyrillic.make
index 8c24b9ad6..e880d8429 100644
--- a/rules/xorg-font-winitzki-cyrillic.make
+++ b/rules/xorg-font-winitzki-cyrillic.make
@@ -20,10 +20,13 @@ PACKAGES-$(PTXCONF_XORG_FONT_WINITZKI_CYRILLIC) += xorg-font-winitzki-cyrillic
 XORG_FONT_WINITZKI_CYRILLIC_VERSION	:= 1.0.0
 XORG_FONT_WINITZKI_CYRILLIC		:= font-winitzki-cyrillic-X11R7.0-$(XORG_FONT_WINITZKI_CYRILLIC_VERSION)
 XORG_FONT_WINITZKI_CYRILLIC_SUFFIX	:= tar.bz2
-XORG_FONT_WINITZKI_CYRILLIC_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font//$(XORG_FONT_WINITZKI_CYRILLIC).$(XORG_FONT_WINITZKI_CYRILLIC_SUFFIX)
+XORG_FONT_WINITZKI_CYRILLIC_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_WINITZKI_CYRILLIC).$(XORG_FONT_WINITZKI_CYRILLIC_SUFFIX)
 XORG_FONT_WINITZKI_CYRILLIC_SOURCE	:= $(SRCDIR)/$(XORG_FONT_WINITZKI_CYRILLIC).$(XORG_FONT_WINITZKI_CYRILLIC_SUFFIX)
 XORG_FONT_WINITZKI_CYRILLIC_DIR		:= $(BUILDDIR)/$(XORG_FONT_WINITZKI_CYRILLIC)
 
+ifdef PTXCONF_XORG_FONT_WINITZKI_CYRILLIC
+$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-winitzki-cyrillic.targetinstall
+endif
 
 # ----------------------------------------------------------------------------
 # Get
@@ -64,7 +67,10 @@ XORG_FONT_WINITZKI_CYRILLIC_ENV 	:=  $(CROSS_ENV)
 #
 # autoconf
 #
-XORG_FONT_WINITZKI_CYRILLIC_AUTOCONF := $(CROSS_AUTOCONF_USR)
+XORG_FONT_WINITZKI_CYRILLIC_AUTOCONF := \
+	$(CROSS_AUTOCONF_USR) \
+	--with-fontdir=$(XORG_FONTDIR)/cyrillic
+
 
 $(STATEDIR)/xorg-font-winitzki-cyrillic.prepare: $(xorg-font-winitzki-cyrillic_prepare_deps_default)
 	@$(call targetinfo, $@)
@@ -82,7 +88,7 @@ xorg-font-winitzki-cyrillic_compile: $(STATEDIR)/xorg-font-winitzki-cyrillic.com
 
 $(STATEDIR)/xorg-font-winitzki-cyrillic.compile: $(xorg-font-winitzki-cyrillic_compile_deps_default)
 	@$(call targetinfo, $@)
-	cd $(XORG_FONT_WINITZKI_CYRILLIC_DIR) && $(XORG_FONT_WINITZKI_CYRILLIC_PATH) make
+	cd $(XORG_FONT_WINITZKI_CYRILLIC_DIR) && $(XORG_FONT_WINITZKI_CYRILLIC_PATH) $(MAKE)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
@@ -104,21 +110,14 @@ xorg-font-winitzki-cyrillic_targetinstall: $(STATEDIR)/xorg-font-winitzki-cyrill
 $(STATEDIR)/xorg-font-winitzki-cyrillic.targetinstall: $(xorg-font-winitzki-cyrillic_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init, xorg-font-winitzki-cyrillic)
-	@$(call install_fixup, xorg-font-winitzki-cyrillic,PACKAGE,xorg-font-winitzki-cyrillic)
-	@$(call install_fixup, xorg-font-winitzki-cyrillic,PRIORITY,optional)
-	@$(call install_fixup, xorg-font-winitzki-cyrillic,VERSION,$(XORG_FONT_WINITZKI_CYRILLIC_VERSION))
-	@$(call install_fixup, xorg-font-winitzki-cyrillic,SECTION,base)
-	@$(call install_fixup, xorg-font-winitzki-cyrillic,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup, xorg-font-winitzki-cyrillic,DEPENDS,)
-	@$(call install_fixup, xorg-font-winitzki-cyrillic,DESCRIPTION,missing)
-
-	@cd $(XORG_FONT_WINITZKI_CYRILLIC_DIR); \
-	for file in *.pcf.gz; do	\
-		$(call install_copy, xorg-font-winitzki-cyrillic, 0, 0, 0644, $$file, $(XORG_FONTDIR)/cyrillic/$$file, n); \
-	done
+	@mkdir -p $(XORG_FONTS_DIR_INSTALL)/cyrillic
 
-	@$(call install_finish, xorg-font-winitzki-cyrillic)
+	@find $(XORG_FONT_WINITZKI_CYRILLIC_DIR) \
+		-name "*.pcf.gz" \
+		| \
+		while read file; do \
+		install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/cyrillic; \
+	done
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-font-xfree86-type1.in b/rules/xorg-font-xfree86-type1.in
index b886e0104..e2cf145cb 100644
--- a/rules/xorg-font-xfree86-type1.in
+++ b/rules/xorg-font-xfree86-type1.in
@@ -1,6 +1,6 @@
 config XORG_FONT_XFREE86_TYPE1
 	bool
-	depends on XORG_FONT_SCALABLE
+	select XORG_FONTS
 	prompt "Xfree86 type1"
 	help
 	  scalable font of old style xfree86 cursor
diff --git a/rules/xorg-font-xfree86-type1.make b/rules/xorg-font-xfree86-type1.make
index 13a9cb0ba..e49771b13 100644
--- a/rules/xorg-font-xfree86-type1.make
+++ b/rules/xorg-font-xfree86-type1.make
@@ -20,10 +20,13 @@ PACKAGES-$(PTXCONF_XORG_FONT_XFREE86_TYPE1) += xorg-font-xfree86-type1
 XORG_FONT_XFREE86_TYPE1_VERSION	:= 1.0.0
 XORG_FONT_XFREE86_TYPE1		:= font-xfree86-type1-X11R7.0-$(XORG_FONT_XFREE86_TYPE1_VERSION)
 XORG_FONT_XFREE86_TYPE1_SUFFIX	:= tar.bz2
-XORG_FONT_XFREE86_TYPE1_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font//$(XORG_FONT_XFREE86_TYPE1).$(XORG_FONT_XFREE86_TYPE1_SUFFIX)
+XORG_FONT_XFREE86_TYPE1_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_XFREE86_TYPE1).$(XORG_FONT_XFREE86_TYPE1_SUFFIX)
 XORG_FONT_XFREE86_TYPE1_SOURCE	:= $(SRCDIR)/$(XORG_FONT_XFREE86_TYPE1).$(XORG_FONT_XFREE86_TYPE1_SUFFIX)
 XORG_FONT_XFREE86_TYPE1_DIR	:= $(BUILDDIR)/$(XORG_FONT_XFREE86_TYPE1)
 
+ifdef PTXCONF_XORG_FONT_XFREE86_TYPE1
+$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-xfree86-type1.targetinstall
+endif
 
 # ----------------------------------------------------------------------------
 # Get
@@ -64,7 +67,9 @@ XORG_FONT_XFREE86_TYPE1_ENV 	:=  $(CROSS_ENV)
 #
 # autoconf
 #
-XORG_FONT_XFREE86_TYPE1_AUTOCONF := $(CROSS_AUTOCONF_USR)
+XORG_FONT_XFREE86_TYPE1_AUTOCONF := \
+	$(CROSS_AUTOCONF_USR) \
+	--with-fontdir=$(XORG_FONTDIR)/Type1
 
 $(STATEDIR)/xorg-font-xfree86-type1.prepare: $(xorg-font-xfree86-type1_prepare_deps_default)
 	@$(call targetinfo, $@)
@@ -82,7 +87,7 @@ xorg-font-xfree86-type1_compile: $(STATEDIR)/xorg-font-xfree86-type1.compile
 
 $(STATEDIR)/xorg-font-xfree86-type1.compile: $(xorg-font-xfree86-type1_compile_deps_default)
 	@$(call targetinfo, $@)
-	cd $(XORG_FONT_XFREE86_TYPE1_DIR) && $(XORG_FONT_XFREE86_TYPE1_PATH) make
+	cd $(XORG_FONT_XFREE86_TYPE1_DIR) && $(XORG_FONT_XFREE86_TYPE1_PATH) $(MAKE)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
@@ -104,21 +109,14 @@ xorg-font-xfree86-type1_targetinstall: $(STATEDIR)/xorg-font-xfree86-type1.targe
 $(STATEDIR)/xorg-font-xfree86-type1.targetinstall: $(xorg-font-xfree86-type1_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init, xorg-font-xfree86-type1)
-	@$(call install_fixup, xorg-font-xfree86-type1,PACKAGE,xorg-font-xfree86-type1)
-	@$(call install_fixup, xorg-font-xfree86-type1,PRIORITY,optional)
-	@$(call install_fixup, xorg-font-xfree86-type1,VERSION,$(XORG_FONT_XFREE86_TYPE1_VERSION))
-	@$(call install_fixup, xorg-font-xfree86-type1,SECTION,base)
-	@$(call install_fixup, xorg-font-xfree86-type1,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup, xorg-font-xfree86-type1,DEPENDS,)
-	@$(call install_fixup, xorg-font-xfree86-type1,DESCRIPTION,missing)
-
-	@cd $(XORG_FONT_XFREE86_TYPE1_DIR); \
-	for file in *.pfa; do	\
-		$(call install_copy, xorg-font-xfree86-type1, 0, 0, 0644, $$file, $(XORG_FONTDIR)/Type1/$$file, n); \
-	done
+	@mkdir -p $(XORG_FONTS_DIR_INSTALL)/Type1
 
-	@$(call install_finish, xorg-font-xfree86-type1)
+	@find $(XORG_FONT_XFREE86_TYPE1_DIR) \
+		-name "*.pfa" \
+		| \
+		while read file; do \
+		install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/Type1; \
+	done
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-font.in b/rules/xorg-font.in
index 3e7c18ee1..67932bfac 100644
--- a/rules/xorg-font.in
+++ b/rules/xorg-font.in
@@ -2,6 +2,8 @@
 
 menu "xorg fonts            "
 
+source "rules/xorg-fonts.in"
+
 source "rules/xorg-font-util-alias.in"
 source "rules/xorg-font-base.in"
 source "rules/xorg-font-base-trans.in"
@@ -10,7 +12,6 @@ source "rules/xorg-font-100dpi-trans.in"
 source "rules/xorg-font-75dpi.in"
 source "rules/xorg-font-75dpi-trans.in"
 source "rules/xorg-font-scalable.in"
-source "rules/xorg-font-ttf.in"
 source "rules/xorg-font-intl.in"
 
 endmenu
diff --git a/rules/xorg-fonts.in b/rules/xorg-fonts.in
new file mode 100644
index 000000000..30ee9baf0
--- /dev/null
+++ b/rules/xorg-fonts.in
@@ -0,0 +1,8 @@
+config XORG_FONTS
+	bool
+#	select XORG_FONT_UTIL
+#	select XORG_FONT_ALIAS
+	select HOST_XORG_APP_MKFONTDIR
+	select HOST_XORG_APP_MKFONTSCALE
+	select HOST_XORG_APP_BDFTOPCF
+	select HOST_XORG_FONT_UTIL
diff --git a/rules/xorg-fonts.make b/rules/xorg-fonts.make
new file mode 100644
index 000000000..e08a87b8e
--- /dev/null
+++ b/rules/xorg-fonts.make
@@ -0,0 +1,141 @@
+# -*-makefile-*-
+# $Id: template 6655 2007-01-02 12:55:21Z rsc $
+#
+# Copyright (C) 2007 by Marc Kleine-Budde <mkl@pengutronix.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_XORG_FONTS) += xorg-fonts
+
+#
+# Paths and names
+#
+XORG_FONTS_VERSION	:= 1.0.0
+XORG_FONTS		:= xorg-fonts-$(XORG_FONTS_VERSION)
+XORG_FONTS_DIR		:= $(BUILDDIR)/$(XORG_FONTS)
+XORG_FONTS_DIR_INSTALL	:= $(XORG_FONTS_DIR)-install
+
+# ----------------------------------------------------------------------------
+# Get
+# ----------------------------------------------------------------------------
+
+xorg-fonts_get: $(STATEDIR)/xorg-fonts.get
+
+$(STATEDIR)/xorg-fonts.get:
+	@$(call targetinfo, $@)
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Extract
+# ----------------------------------------------------------------------------
+
+xorg-fonts_extract: $(STATEDIR)/xorg-fonts.extract
+
+$(STATEDIR)/xorg-fonts.extract: $(xorg-fonts_extract_deps_default)
+	@$(call targetinfo, $@)
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+xorg-fonts_prepare: $(STATEDIR)/xorg-fonts.prepare
+
+XORG_FONTS_PATH	:=  PATH=$(HOST_PATH)
+
+$(STATEDIR)/xorg-fonts.prepare: $(xorg-fonts_prepare_deps_default)
+	@$(call targetinfo, $@)
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Compile
+# ----------------------------------------------------------------------------
+
+xorg-fonts_compile: $(STATEDIR)/xorg-fonts.compile
+
+$(STATEDIR)/xorg-fonts.compile: $(xorg-fonts_compile_deps_default)
+	@$(call targetinfo, $@)
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+xorg-fonts_install: $(STATEDIR)/xorg-fonts.install
+
+$(STATEDIR)/xorg-fonts.install: $(xorg-fonts_install_deps_default)
+	@$(call targetinfo, $@)
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+xorg-fonts_targetinstall: $(STATEDIR)/xorg-fonts.targetinstall.post
+
+$(STATEDIR)/xorg-fonts.targetinstall: $(xorg-fonts_targetinstall_deps_default)
+	@$(call targetinfo, $@)
+
+	@if test -e $(XORG_FONTS_DIR_INSTALL); then \
+		rm -rf $(XORG_FONTS_DIR_INSTALL); \
+	fi
+	@mkdir -p $(XORG_FONTS_DIR_INSTALL)
+
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Target-Install-post
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-fonts.install
+	@$(call targetinfo, $@)
+
+	@$(XORG_FONTS_PATH); \
+	find $(XORG_FONTS_DIR_INSTALL) -mindepth 1 -type d | while read dir; do \
+		echo $$dir;\
+		case "$${dir}" in \
+			*/[Ee]ncodings)	\
+					if test -d "$${dir}/large"; then \
+						elarge="-e ./large"; \
+					fi; \
+					pushd $${dir} > /dev/null; \
+					mkfontscale -b -s -l -n -r -p $(XORG_FONTDIR)/encodings -e . $${elarge} $${dir}; \
+					popd > /dev/null ;; \
+			*/[Ss]peedo)	mkfontdir $${dir} ;; \
+			*)		mkfontscale $${dir}; \
+					mkfontdir $${dir} ;; \
+		esac; \
+	done
+
+# FIXME: add fc-cache?
+
+# 	@$(call install_init, xorg-fonts)
+# 	@$(call install_fixup, xorg-fonts,PACKAGE,xorg-fonts)
+# 	@$(call install_fixup, xorg-fonts,PRIORITY,optional)
+# 	@$(call install_fixup, xorg-fonts,VERSION,$(XORG_FONTS_VERSION))
+# 	@$(call install_fixup, xorg-fonts,SECTION,base)
+# 	@$(call install_fixup, xorg-fonts,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+# 	@$(call install_fixup, xorg-fonts,DEPENDS,)
+# 	@$(call install_fixup, xorg-fonts,DESCRIPTION,missing)
+
+# 	@$(call install_finish, xorg-fonts)
+
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+xorg-fonts_clean:
+	rm -rf $(STATEDIR)/xorg-fonts.*
+	rm -rf $(IMAGEDIR)/xorg-fonts_*
+	rm -rf $(XORG_FONTS_DIR)
+
+# vim: syntax=make
author	Marc Kleine-Budde <mkl@pengutronix.de>	2007-01-05 14:23:42 +0000
committer	Marc Kleine-Budde <mkl@pengutronix.de>	2007-01-05 14:23:42 +0000
commit	5dfe4e471fbd2bd1c55f4fb69ade42994f3fdd3c (patch)
tree	4b6313dc79e91a12cb31f06321d47bcfff0e33d9
parent	e5201bdfed55667611e3164099849cff20683c8d (diff)
download	ptxdist-5dfe4e471fbd2bd1c55f4fb69ade42994f3fdd3c.tar.gz ptxdist-5dfe4e471fbd2bd1c55f4fb69ade42994f3fdd3c.tar.xz