changed xorg fonts install menu structure with more debian flavour for better organisation. defineble targetinstall according to codepages to minimize installation size

git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@6501 33e552b5-05e3-0310-8538-816dae2090ed

38 files changed, 143 insertions, 99 deletions

diff --git a/rules/xorg-font-adobe-100dpi.in b/rules/xorg-font-adobe-100dpi.in
index 10f13f7df..beed6a8e2 100644
--- a/rules/xorg-font-adobe-100dpi.in
+++ b/rules/xorg-font-adobe-100dpi.in
@@ -1,8 +1,15 @@
 config XORG_FONT_ADOBE_100DPI
 	bool
-	depends on XORG_FONT
+	depends on XORG_FONT_100DPI
+	select HOST_BDFTOPCF
 	select XORG_FONT_UTIL
+	default y
 	prompt "Adobe 100dpi"
 	help
-	  FIXME
+	  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
 
diff --git a/rules/xorg-font-adobe-75dpi.in b/rules/xorg-font-adobe-75dpi.in
index 9bab685c9..e0894cc90 100644
--- a/rules/xorg-font-adobe-75dpi.in
+++ b/rules/xorg-font-adobe-75dpi.in
@@ -1,7 +1,14 @@
 config XORG_FONT_ADOBE_75DPI
 	bool
-	depends on XORG_FONT
+	depends on XORG_FONT_75DPI
+	select HOST_BDFTOPCF
 	select XORG_FONT_UTIL
+	default y
 	prompt "Adobe 75dpi"
 	help
-	  FIXME
+	  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
diff --git a/rules/xorg-font-adobe-utopia-100dpi.in b/rules/xorg-font-adobe-utopia-100dpi.in
index 1b5f412d9..e5b2b56bc 100644
--- a/rules/xorg-font-adobe-utopia-100dpi.in
+++ b/rules/xorg-font-adobe-utopia-100dpi.in
@@ -1,7 +1,11 @@
 config XORG_FONT_ADOBE_UTOPIA_100DPI
 	bool
-	depends on XORG_FONT
+	depends on XORG_FONT_100DPI
+	select HOST_BDFTOPCF
 	select XORG_FONT_UTIL
 	prompt "Adobe Utopia 100dpi"
 	help
-	  FIXME
+	  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
diff --git a/rules/xorg-font-adobe-utopia-75dpi.in b/rules/xorg-font-adobe-utopia-75dpi.in
index 702ba5fe1..ac4cb1402 100644
--- a/rules/xorg-font-adobe-utopia-75dpi.in
+++ b/rules/xorg-font-adobe-utopia-75dpi.in
@@ -1,7 +1,11 @@
 config XORG_FONT_ADOBE_UTOPIA_75DPI
 	bool
-	depends on XORG_FONT
+	depends on XORG_FONT_75DPI
+	select HOST_BDFTOPCF
 	select XORG_FONT_UTIL
 	prompt "Adobe Utopia 75dpi"
 	help
-	  FIXME
+	  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
diff --git a/rules/xorg-font-adobe-utopia-type1.in b/rules/xorg-font-adobe-utopia-type1.in
index ec525b27c..2db3f4165 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
+	depends on XORG_FONT_SCALABLE
 	select XORG_FONT_UTIL
 	prompt "Adobe Utopia type1"
 	help
diff --git a/rules/xorg-font-alias.in b/rules/xorg-font-alias.in
index 6ae8d5ac3..28ce245ab 100644
--- a/rules/xorg-font-alias.in
+++ b/rules/xorg-font-alias.in
@@ -1,7 +1,9 @@
 config XORG_FONT_ALIAS
 	bool
-	depends on XORG_FONT
+	depends on XORG_FONT_UTILS_ALIAS
 	select XORG_FONT_UTIL
+	default y
 	prompt "Alias"
 	help
-	  FIXME
+	  defines alias names for fonts. This is an essential
+	  package, you migh most probably want it.
diff --git a/rules/xorg-font-arabic-misc.in b/rules/xorg-font-arabic-misc.in
index 168ba1c56..945d57d7a 100644
--- a/rules/xorg-font-arabic-misc.in
+++ b/rules/xorg-font-arabic-misc.in
@@ -1,6 +1,7 @@
 config XORG_FONT_ARABIC_MISC
 	bool
-	depends on XORG_FONT
+	depends on XORG_FONT_INTL
+	select HOST_BDFTOPCF
 	select XORG_FONT_UTIL
 	prompt "Arabic misc."
 	help
diff --git a/rules/xorg-font-bh-100dpi.in b/rules/xorg-font-bh-100dpi.in
index 68a4d7394..a12c26d69 100644
--- a/rules/xorg-font-bh-100dpi.in
+++ b/rules/xorg-font-bh-100dpi.in
@@ -1,8 +1,10 @@
 config XORG_FONT_BH_100DPI
 	bool
-	depends on XORG_FONT
-	depends on BROKEN
+	depends on XORG_FONT_100DPI
+	select HOST_BDFTOPCF
+	select HOST_UCSTOANY
 	select XORG_FONT_UTIL
 	prompt "BH 100dpi"
 	help
-	  FIXME
+	  This package contains BH fonts in the ISO 10646-1,
+	  ISO 8859-1 and ISO 8859-15 encodings
diff --git a/rules/xorg-font-bh-75dpi.in b/rules/xorg-font-bh-75dpi.in
index 7a05bd075..f970ba161 100644
--- a/rules/xorg-font-bh-75dpi.in
+++ b/rules/xorg-font-bh-75dpi.in
@@ -1,8 +1,10 @@
 config XORG_FONT_BH_75DPI
 	bool
-	depends on XORG_FONT
-	depends on BROKEN
+	depends on XORG_FONT_75DPI
+	select HOST_BDFTOPCF
+	select HOST_UCSTOANY
 	select XORG_FONT_UTIL
 	prompt "BH 75dpi"
 	help
-	  FIXME
+	  This package contains BH fonts in the ISO 10646-1,
+          ISO 8859-1 and ISO 8859-15 encodings
diff --git a/rules/xorg-font-bh-lucidatypewriter-100dpi.in b/rules/xorg-font-bh-lucidatypewriter-100dpi.in
index b15738db9..8d1877bb4 100644
--- a/rules/xorg-font-bh-lucidatypewriter-100dpi.in
+++ b/rules/xorg-font-bh-lucidatypewriter-100dpi.in
@@ -1,7 +1,10 @@
-config XORG_FONT_BH_LUCIDATYPEDRITER_100DPI
+config XORG_FONT_BH_LUCIDATYPEWRITER_100DPI
 	bool
-	depends on XORG_FONT
+	depends on XORG_FONT_100DPI
+	select HOST_BDFTOPCF
+	select HOST_UCSTOANY
 	select XORG_FONT_UTIL
 	prompt "BH Lucida Typewriter 100dpi"
 	help
-	  FIXME
+	  This package contains Lucida fonts in the ISO 10646-1,
+	  ISO 8859-1 and ISO 8859-15 encodings
diff --git a/rules/xorg-font-bh-lucidatypewriter-75dpi.in b/rules/xorg-font-bh-lucidatypewriter-75dpi.in
index 12caf2b6e..c9d21001b 100644
--- a/rules/xorg-font-bh-lucidatypewriter-75dpi.in
+++ b/rules/xorg-font-bh-lucidatypewriter-75dpi.in
@@ -1,8 +1,10 @@
 config XORG_FONT_BH_LUCIDATYPEWRITER_75DPI
 	bool
-	depends on XORG_FONT
+	depends on XORG_FONT_75DPI
+	select HOST_BDFTOPCF
+	select HOST_UCSTOANY
 	select XORG_FONT_UTIL
-	depends on BROKEN
 	prompt "BH Lucida Typewriter 75dpi"
 	help
-	  FIXME
+	  This package contains fonts in the ISO 10646-1,
+	  ISO 8859-1 and ISO 8859-15 encodings.
diff --git a/rules/xorg-font-bh-ttf.in b/rules/xorg-font-bh-ttf.in
index 19d95a773..691a475d5 100644
--- a/rules/xorg-font-bh-ttf.in
+++ b/rules/xorg-font-bh-ttf.in
@@ -1,7 +1,8 @@
 config XORG_FONT_BH_TTF
 	bool
-	depends on XORG_FONT
+	depends on XORG_FONT_TTF
 	select XORG_FONT_UTIL
+	default y
 	prompt "BH ttf"
 	help
-	  FIXME
+	  contains truetype fonts provided by xorg
diff --git a/rules/xorg-font-bitstream-100dpi.in b/rules/xorg-font-bitstream-100dpi.in
index bd8e4a459..9621d8bc6 100644
--- a/rules/xorg-font-bitstream-100dpi.in
+++ b/rules/xorg-font-bitstream-100dpi.in
@@ -1,7 +1,8 @@
 config XORG_FONT_BITSTREAM_100DPI
 	bool
-	depends on XORG_FONT
+	depends on XORG_FONT_100DPI
 	select XORG_FONT_UTIL
 	prompt "Bitstream 100dpi"
 	help
-	  FIXME
+	  This package contains Bitstream fonts in the ISO 10646-1,
+	  ISO 8859-1 and ISO 8859-15 encodings
diff --git a/rules/xorg-font-bitstream-75dpi.in b/rules/xorg-font-bitstream-75dpi.in
index df2386f8b..2f9d8a32b 100644
--- a/rules/xorg-font-bitstream-75dpi.in
+++ b/rules/xorg-font-bitstream-75dpi.in
@@ -1,7 +1,8 @@
 config XORG_FONT_BITSTREAM_75DPI
 	bool
-	depends on XORG_FONT
+	depends on XORG_FONT_75DPI
 	select XORG_FONT_UTIL
 	prompt "Bitstream 75dpi"
 	help
-	  FIXME
+	  This package contains Bitstream fonts in the ISO 10646-1,
+	  ISO 8859-1 and ISO 8859-15 encodings
diff --git a/rules/xorg-font-bitstream-speedo.in b/rules/xorg-font-bitstream-speedo.in
index 4a2ba71a4..5d00c7076 100644
--- a/rules/xorg-font-bitstream-speedo.in
+++ b/rules/xorg-font-bitstream-speedo.in
@@ -1,7 +1,9 @@
 config XORG_FONT_BITSTREAM_SPEEDO
 	bool
-	depends on XORG_FONT
+	depends on XORG_FONT_SCALABLE
 	select XORG_FONT_UTIL
 	prompt "Bitstream speedo"
 	help
-	  FIXME
+	  This package contains the Speedo version of Bitstream 
+	  Courier and Charter. Speedo fonts are vectorbased 
+	  and can hence be used in need of big font size. 
diff --git a/rules/xorg-font-bitstream-type1.in b/rules/xorg-font-bitstream-type1.in
index 69c928a62..9aa4b8e10 100644
--- a/rules/xorg-font-bitstream-type1.in
+++ b/rules/xorg-font-bitstream-type1.in
@@ -1,7 +1,10 @@
 config XORG_FONT_BITSTREAM_TYPE1
 	bool
-	depends on XORG_FONT
+	depends on XORG_FONT_SCALABLE
 	select XORG_FONT_UTIL
+	default y
 	prompt "Bitstream type1"
 	help
-	  FIXME
+	  This package contains the type1 version of Bitstream 
+	  Courier and Charter. Type1 fonts have XLFD and are
+	  scalable. They are needed for ghostscript.
diff --git a/rules/xorg-font-cronyx-cyrillic.in b/rules/xorg-font-cronyx-cyrillic.in
index 5b4ccef31..3eaa293d2 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
+	depends on XORG_FONT_INTL
 	select XORG_FONT_UTIL
 	prompt "Cronyx cyrillic"
 	help
diff --git a/rules/xorg-font-cursor-misc.in b/rules/xorg-font-cursor-misc.in
index 503467717..c21b15488 100644
--- a/rules/xorg-font-cursor-misc.in
+++ b/rules/xorg-font-cursor-misc.in
@@ -1,7 +1,9 @@
 config XORG_FONT_CURSOR_MISC
 	bool
-	depends on XORG_FONT
+	depends on XORG_FONT_BASE
+	select HOST_BDFTOPCF
 	select XORG_FONT_UTIL
+	default y
 	prompt "Cursor misc"
 	help
-	  FIXME
+	  essential font package, you migh most probably want it.
diff --git a/rules/xorg-font-daewoo-misc.in b/rules/xorg-font-daewoo-misc.in
index 8120ecaa1..640349d9b 100644
--- a/rules/xorg-font-daewoo-misc.in
+++ b/rules/xorg-font-daewoo-misc.in
@@ -1,6 +1,7 @@
 config XORG_FONT_DAEWOO_MISC
 	bool
-	depends on XORG_FONT
+	depends on XORG_FONT_BASE
+	select HOST_BDFTOPCF
 	select XORG_FONT_UTIL
 	prompt "Daewoo misc"
 	help
diff --git a/rules/xorg-font-dec-misc.in b/rules/xorg-font-dec-misc.in
index c846176ad..ee4b7532f 100644
--- a/rules/xorg-font-dec-misc.in
+++ b/rules/xorg-font-dec-misc.in
@@ -1,6 +1,7 @@
 config XORG_FONT_DEC_MISC
 	bool
-	depends on XORG_FONT
+	depends on XORG_FONT_BASE
+	select HOST_BDFTOPCF
 	select XORG_FONT_UTIL
 	prompt "DEC misc"
 	help
diff --git a/rules/xorg-font-encodings.in b/rules/xorg-font-encodings.in
index afb58b2b7..b3d66d102 100644
--- a/rules/xorg-font-encodings.in
+++ b/rules/xorg-font-encodings.in
@@ -1,7 +1,14 @@
 config XORG_FONT_ENCODINGS
 	bool
-	depends on XORG_FONT
+	depends on XORG_FONT_BASE
 	select XORG_FONT_UTIL
 	prompt "encodings"
 	help
-	  FIXME
+	  contains encoding files used by fontenc layer to 
+	  re-encode fonts other than iso10646-1, iso8859-1,
+	  -2, -3, -4, -5, -6, -7, -9, -10, -15, 
+	  koi8-r, -ru, -u, uni, -e, microsoft-symbol and 
+	  apple-roman.
+	  You might most probbably want this if you intend
+	  to use i.E. asian language.
+	  For more details see xorg documentation.
diff --git a/rules/xorg-font-encodings.make b/rules/xorg-font-encodings.make
index 410056608..eb224f0c5 100644
--- a/rules/xorg-font-encodings.make
+++ b/rules/xorg-font-encodings.make
@@ -114,7 +114,12 @@ $(STATEDIR)/xorg-font-encodings.targetinstall: $(xorg-font-encodings_targetinsta
 	@$(call install_fixup, xorg-font-encodings,DEPENDS,)
 	@$(call install_fixup, xorg-font-encodings,DESCRIPTION,missing)
 
-#FIXME
+	@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
+
+	@$(call install_copy, xorg-font-encodings, 0, 0, 0644, $(XORG_FONT_ENCODINGS_DIR)/encodings.dir, $(XORG_FONTDIR)/encodings/encodings.dir, n)
 
 	@$(call install_finish, xorg-font-encodings)
 
diff --git a/rules/xorg-font-ibm-type1.in b/rules/xorg-font-ibm-type1.in
index 333b4a6c7..7cb4aced0 100644
--- a/rules/xorg-font-ibm-type1.in
+++ b/rules/xorg-font-ibm-type1.in
@@ -1,7 +1,7 @@
 config XORG_FONT_IBM_TYPE1
 	bool
-	depends on XORG_FONT
+	depends on XORG_FONT_SCALABLE
 	select XORG_FONT_UTIL
 	prompt "IBM type1"
 	help
-	  FIXME
+	  scalable IBM type1 fonts, as used on OS/2 systems. 
diff --git a/rules/xorg-font-isas-misc.in b/rules/xorg-font-isas-misc.in
index edf425c6a..b3c5f5044 100644
--- a/rules/xorg-font-isas-misc.in
+++ b/rules/xorg-font-isas-misc.in
@@ -1,6 +1,7 @@
 config XORG_FONT_ISAS_MISC
 	bool
-	depends on XORG_FONT
+	depends on XORG_FONT_BASE
+	select HOST_BDFTOPCF
 	select XORG_FONT_UTIL
 	prompt "Isas misc"
 	help
diff --git a/rules/xorg-font-jis-misc.in b/rules/xorg-font-jis-misc.in
index d2b765070..29aebcbaf 100644
--- a/rules/xorg-font-jis-misc.in
+++ b/rules/xorg-font-jis-misc.in
@@ -1,6 +1,7 @@
 config XORG_FONT_JIS_MISC
 	bool
-	depends on XORG_FONT
+	depends on XORG_FONT_BASE
+	select HOST_BDFTOPCF
 	select XORG_FONT_UTIL
 	prompt "Jis misc"
 	help
diff --git a/rules/xorg-font-micro-misc.in b/rules/xorg-font-micro-misc.in
index bd8c9dd6c..794b13ee7 100644
--- a/rules/xorg-font-micro-misc.in
+++ b/rules/xorg-font-micro-misc.in
@@ -1,6 +1,7 @@
 config XORG_FONT_MICRO_MISC
 	bool
-	depends on XORG_FONT
+	depends on XORG_FONT_BASE
+	select HOST_BDFTOPCF
 	select XORG_FONT_UTIL
 	prompt "micro misc"
 	help
diff --git a/rules/xorg-font-misc-cyrillic.in b/rules/xorg-font-misc-cyrillic.in
index 00cf36252..39b27dce7 100644
--- a/rules/xorg-font-misc-cyrillic.in
+++ b/rules/xorg-font-misc-cyrillic.in
@@ -1,6 +1,7 @@
 config XORG_FONT_MISC_CYRILLIC
 	bool
-	depends on XORG_FONT
+	depends on XORG_FONT_INTL
+	select HOST_BDFTOPCF
 	select XORG_FONT_UTIL
 	prompt "misc cyrillic"
 	help
diff --git a/rules/xorg-font-misc-ethiopic.in b/rules/xorg-font-misc-ethiopic.in
index 9db756fb3..93deba35a 100644
--- a/rules/xorg-font-misc-ethiopic.in
+++ b/rules/xorg-font-misc-ethiopic.in
@@ -1,7 +1,8 @@
 config XORG_FONT_MISC_ETHIOPIC
 	bool
-	depends on XORG_FONT
+	depends on XORG_FONT_INTL
+	select HOST_BDFTOPCF
 	select XORG_FONT_UTIL
 	prompt "misc. Ethiopic"
 	help
-	  FIXME
+	  contains opentype ethiopic fonts.
diff --git a/rules/xorg-font-misc-meltho.in b/rules/xorg-font-misc-meltho.in
index a743216f4..1f979b6ff 100644
--- a/rules/xorg-font-misc-meltho.in
+++ b/rules/xorg-font-misc-meltho.in
@@ -1,7 +1,8 @@
 config XORG_FONT_MISC_MELTHO
 	bool
-	depends on XORG_FONT
+	depends on XORG_FONT_INTL
+	select HOST_BDFTOPCF
 	select XORG_FONT_UTIL
 	prompt "misc. Meltho"
 	help
-	  FIXME
+	  contains syriac unicode-compliant opentype fonts
diff --git a/rules/xorg-font-misc-misc.in b/rules/xorg-font-misc-misc.in
index 7684303c7..5366745bf 100644
--- a/rules/xorg-font-misc-misc.in
+++ b/rules/xorg-font-misc-misc.in
@@ -1,7 +1,12 @@
 config XORG_FONT_MISC_MISC
 	bool
-	depends on XORG_FONT
+	depends on XORG_FONT_BASE
+	select HOST_BDFTOPCF
 	select XORG_FONT_UTIL
+	default y
 	prompt "misc misc"
 	help
-	  FIXME
+	  These are most fundamental fonts in misc section.
+	  You might most probably want it.
+	  This package contains fonts in the ISO 10646-1,
+	  ISO 8859-1 and ISO 8859-15 encodings
diff --git a/rules/xorg-font-schumacher-misc.in b/rules/xorg-font-schumacher-misc.in
index e6636add4..63b44bd52 100644
--- a/rules/xorg-font-schumacher-misc.in
+++ b/rules/xorg-font-schumacher-misc.in
@@ -2,6 +2,7 @@ config XORG_FONT_SCHUMACHER_MISC
 	bool
 	depends on XORG_FONT
 	depends on BROKEN
+	select HOST_BDFTOPCF
 	select XORG_FONT_UTIL
 	prompt "Schumacher misc"
 	help
diff --git a/rules/xorg-font-screen-cyrillic.in b/rules/xorg-font-screen-cyrillic.in
index b11e79a78..58ccfe1b2 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
+	depends on XORG_FONT_INTL
 	select XORG_FONT_UTIL
 	prompt "Screen cyrillic"
 	help
diff --git a/rules/xorg-font-sony-misc.in b/rules/xorg-font-sony-misc.in
index fdcda6ade..394eb7b73 100644
--- a/rules/xorg-font-sony-misc.in
+++ b/rules/xorg-font-sony-misc.in
@@ -1,6 +1,7 @@
 config XORG_FONT_SONY_MISC
 	bool
 	depends on XORG_FONT
+	select HOST_BDFTOPCF
 	select XORG_FONT_UTIL
 	prompt "Sony misc"
 	help
diff --git a/rules/xorg-font-sun-misc.in b/rules/xorg-font-sun-misc.in
index f2f92dd80..633e730ff 100644
--- a/rules/xorg-font-sun-misc.in
+++ b/rules/xorg-font-sun-misc.in
@@ -1,6 +1,7 @@
 config XORG_FONT_SUN_MISC
 	bool
 	depends on XORG_FONT
+	select HOST_BDFTOPCF
 	select XORG_FONT_UTIL
 	prompt "Sun misc"
 	help
diff --git a/rules/xorg-font-util.in b/rules/xorg-font-util.in
index d452a31f0..07c4c33db 100644
--- a/rules/xorg-font-util.in
+++ b/rules/xorg-font-util.in
@@ -1,6 +1,6 @@
 config XORG_FONT_UTIL
 	bool
-	depends on XORG_FONT
+	depends on XORG_FONT_UTILS_ALIAS
 	prompt "Util"
 	help
 	  FIXME
diff --git a/rules/xorg-font-winitzki-cyrillic.in b/rules/xorg-font-winitzki-cyrillic.in
index dbbce99ee..56dab176d 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
+	depends on XORG_FONT_INTL
 	select XORG_FONT_UTIL
 	prompt "Winitzki cyrillic"
 	help
diff --git a/rules/xorg-font-xfree86-type1.in b/rules/xorg-font-xfree86-type1.in
index d80950e9c..480a14343 100644
--- a/rules/xorg-font-xfree86-type1.in
+++ b/rules/xorg-font-xfree86-type1.in
@@ -1,7 +1,7 @@
 config XORG_FONT_XFREE86_TYPE1
 	bool
-	depends on XORG_FONT
+	depends on XORG_FONT_SCALABLE
 	select XORG_FONT_UTIL
 	prompt "Xfree86 type1"
 	help
-	  FIXME
+	  scalable font of old style xfree86 cursor
diff --git a/rules/xorg-font.in b/rules/xorg-font.in
index 772968c24..3e7c18ee1 100644
--- a/rules/xorg-font.in
+++ b/rules/xorg-font.in
@@ -1,44 +1,16 @@
 # xorg proto configuration
 
-menuconfig XORG_FONT                
-        bool "xorg fonts            "
-
-source "rules/xorg-font-adobe-100dpi.in"
-source "rules/xorg-font-adobe-75dpi.in"
-source "rules/xorg-font-adobe-utopia-100dpi.in"
-source "rules/xorg-font-adobe-utopia-75dpi.in"
-source "rules/xorg-font-adobe-utopia-type1.in"
-source "rules/xorg-font-alias.in"
-source "rules/xorg-font-arabic-misc.in"
-source "rules/xorg-font-bh-100dpi.in"
-source "rules/xorg-font-bh-75dpi.in"
-source "rules/xorg-font-bh-lucidatypewriter-100dpi.in"
-source "rules/xorg-font-bh-lucidatypewriter-75dpi.in"
-source "rules/xorg-font-bh-ttf.in"
-source "rules/xorg-font-bitstream-100dpi.in"
-source "rules/xorg-font-bitstream-75dpi.in"
-source "rules/xorg-font-bitstream-speedo.in"
-source "rules/xorg-font-bitstream-type1.in"
-source "rules/xorg-font-cronyx-cyrillic.in"
-source "rules/xorg-font-cursor-misc.in"
-source "rules/xorg-font-daewoo-misc.in"
-source "rules/xorg-font-dec-misc.in"
-source "rules/xorg-font-encodings.in"
-source "rules/xorg-font-ibm-type1.in"
-source "rules/xorg-font-isas-misc.in"
-source "rules/xorg-font-jis-misc.in"
-source "rules/xorg-font-micro-misc.in"
-source "rules/xorg-font-misc-cyrillic.in"
-source "rules/xorg-font-misc-ethiopic.in"
-source "rules/xorg-font-misc-meltho.in"
-source "rules/xorg-font-misc-misc.in"
-source "rules/xorg-font-mutt-misc.in"
-source "rules/xorg-font-schumacher-misc.in"
-source "rules/xorg-font-screen-cyrillic.in"
-source "rules/xorg-font-sony-misc.in"
-source "rules/xorg-font-sun-misc.in"
-source "rules/xorg-font-util.in"
-source "rules/xorg-font-winitzki-cyrillic.in"
-source "rules/xorg-font-xfree86-type1.in"
+menu "xorg fonts            "
 
+source "rules/xorg-font-util-alias.in"
+source "rules/xorg-font-base.in"
+source "rules/xorg-font-base-trans.in"
+source "rules/xorg-font-100dpi.in"
+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