* rules/xorg-font*.in:

	readded fu's font menu layout


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

23 files changed, 42 insertions, 23 deletions

diff --git a/rules/experimental.in b/rules/experimental.in
index 0c6c0f433..278dac4d7 100644
--- a/rules/experimental.in
+++ b/rules/experimental.in
@@ -23,3 +23,6 @@ config BROKEN
 	help
 	  If this option is checked, even packets are activated which
 	  are known to be broken.
+
+config INVISIBLE
+	bool
diff --git a/rules/xorg-font-100dpi-trans.in b/rules/xorg-font-100dpi-trans.in
index e8ceb7e3c..57238988a 100644
--- a/rules/xorg-font-100dpi-trans.in
+++ b/rules/xorg-font-100dpi-trans.in
@@ -1,5 +1,10 @@
+comment ""
+	depends on MENU_XORG_FONTS
+	depends on INVISIBLE
+
 menu "xorg 100 dpi fonts(transcoded)"
 	depends on MENU_XORG_FONTS
+	depends on XORG_FONT_100DPI
 
 config XORG_FONT_ADOBE_100DPI_TRANS
 	bool
diff --git a/rules/xorg-font-100dpi.in b/rules/xorg-font-100dpi.in
index f18feb715..d234c19fb 100644
--- a/rules/xorg-font-100dpi.in
+++ b/rules/xorg-font-100dpi.in
@@ -1,4 +1,6 @@
-menu "xorg 100 dpi fonts            "
+menuconfig XORG_FONT_100DPI
+	prompt  "xorg 100 dpi fonts            "
+	bool
 	depends on MENU_XORG_FONTS
 
 source "rules/xorg-font-adobe-100dpi.in"
@@ -6,5 +8,3 @@ source "rules/xorg-font-adobe-utopia-100dpi.in"
 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 63dae80f8..2cf0200fa 100644
--- a/rules/xorg-font-75dpi-trans.in
+++ b/rules/xorg-font-75dpi-trans.in
@@ -1,5 +1,10 @@
+comment ""
+	depends on MENU_XORG_FONTS
+	depends on INVISIBLE
+
 menu "xorg 75 dpi fonts (transcoded)"
 	depends on MENU_XORG_FONTS
+	depends on XORG_FONT_75DPI
 
 config XORG_FONT_ADOBE_75DPI_TRANS
 	bool
diff --git a/rules/xorg-font-75dpi.in b/rules/xorg-font-75dpi.in
index fc2330d4d..8b0dcdd3d 100644
--- a/rules/xorg-font-75dpi.in
+++ b/rules/xorg-font-75dpi.in
@@ -1,5 +1,7 @@
-menu "xorg 75 dpi fonts             "
+menuconfig XORG_FONT_75DPI
 	depends on MENU_XORG_FONTS
+	bool
+	prompt "xorg 75 dpi fonts             "
 
 source "rules/xorg-font-adobe-75dpi.in"
 source "rules/xorg-font-adobe-utopia-75dpi.in"
@@ -7,5 +9,3 @@ 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 b069a2a19..ae4f796ad 100644
--- a/rules/xorg-font-adobe-100dpi.in
+++ b/rules/xorg-font-adobe-100dpi.in
@@ -1,6 +1,8 @@
 config XORG_FONT_ADOBE_100DPI
 	bool
 	select XORG_FONTS
+	depends on XORG_FONT_100DPI
+	default y
 	prompt "Adobe 100dpi"
 	help
 	  xfonts-100dpi provides a set of bitmapped fonts at 
diff --git a/rules/xorg-font-adobe-75dpi.in b/rules/xorg-font-adobe-75dpi.in
index 06df1ea8e..d203d0b71 100644
--- a/rules/xorg-font-adobe-75dpi.in
+++ b/rules/xorg-font-adobe-75dpi.in
@@ -1,5 +1,7 @@
 config XORG_FONT_ADOBE_75DPI
 	bool
+	default y
+	depends on XORG_FONT_75DPI
 	select XORG_FONTS
 	prompt "Adobe 75dpi"
 	help
diff --git a/rules/xorg-font-adobe-utopia-100dpi.in b/rules/xorg-font-adobe-utopia-100dpi.in
index 938770082..d25f4556c 100644
--- a/rules/xorg-font-adobe-utopia-100dpi.in
+++ b/rules/xorg-font-adobe-utopia-100dpi.in
@@ -1,6 +1,7 @@
 config XORG_FONT_ADOBE_UTOPIA_100DPI
 	bool
 	select XORG_FONTS
+	depends on XORG_FONT_100DPI
 	prompt "Adobe Utopia 100dpi"
 	help
 	  adobe utopia fonts, containing Utopia Regular, 
diff --git a/rules/xorg-font-adobe-utopia-75dpi.in b/rules/xorg-font-adobe-utopia-75dpi.in
index f9207126b..36766b494 100644
--- a/rules/xorg-font-adobe-utopia-75dpi.in
+++ b/rules/xorg-font-adobe-utopia-75dpi.in
@@ -1,6 +1,7 @@
 config XORG_FONT_ADOBE_UTOPIA_75DPI
 	bool
 	select XORG_FONTS
+	depends on XORG_FONT_75DPI
 	prompt "Adobe Utopia 75dpi"
 	help
 	  adobe utopia fonts, containing Utopia Regular, 
diff --git a/rules/xorg-font-adobe-utopia-type1.in b/rules/xorg-font-adobe-utopia-type1.in
index 2e0c840d4..bc927b972 100644
--- a/rules/xorg-font-adobe-utopia-type1.in
+++ b/rules/xorg-font-adobe-utopia-type1.in
@@ -1,6 +1,7 @@
 config XORG_FONT_ADOBE_UTOPIA_TYPE1
 	bool
 	select XORG_FONTS
+	depends on XORG_FONT_SCALEABLE
 	prompt "Adobe Utopia type1"
 	help
 	  FIXME
diff --git a/rules/xorg-font-bh-100dpi.in b/rules/xorg-font-bh-100dpi.in
index 2b6699cf4..7bbdee8c0 100644
--- a/rules/xorg-font-bh-100dpi.in
+++ b/rules/xorg-font-bh-100dpi.in
@@ -1,6 +1,7 @@
 config XORG_FONT_BH_100DPI
 	bool
 	select XORG_FONTS
+	depends on XORG_FONT_100DPI
 	prompt "BH 100dpi"
 	help
 	  This package contains BH fonts in the ISO 10646-1,
diff --git a/rules/xorg-font-bh-75dpi.in b/rules/xorg-font-bh-75dpi.in
index c831f4e48..d5dcae06b 100644
--- a/rules/xorg-font-bh-75dpi.in
+++ b/rules/xorg-font-bh-75dpi.in
@@ -1,6 +1,7 @@
 config XORG_FONT_BH_75DPI
 	bool
 	select XORG_FONTS
+	depends on XORG_FONT_75DPI
 	prompt "BH 75dpi"
 	help
 	  This package contains BH fonts in the ISO 10646-1,
diff --git a/rules/xorg-font-bh-lucidatypewriter-100dpi.in b/rules/xorg-font-bh-lucidatypewriter-100dpi.in
index c4690e0e5..b7b359d2f 100644
--- a/rules/xorg-font-bh-lucidatypewriter-100dpi.in
+++ b/rules/xorg-font-bh-lucidatypewriter-100dpi.in
@@ -1,6 +1,7 @@
 config XORG_FONT_BH_LUCIDATYPEWRITER_100DPI
 	bool
 	select XORG_FONTS
+	depends on XORG_FONT_100DPI
 	prompt "BH Lucida Typewriter 100dpi"
 	help
 	  This package contains Lucida fonts in the ISO 10646-1,
diff --git a/rules/xorg-font-bh-lucidatypewriter-75dpi.in b/rules/xorg-font-bh-lucidatypewriter-75dpi.in
index 2e01d86cd..80fafd33f 100644
--- a/rules/xorg-font-bh-lucidatypewriter-75dpi.in
+++ b/rules/xorg-font-bh-lucidatypewriter-75dpi.in
@@ -1,6 +1,7 @@
 config XORG_FONT_BH_LUCIDATYPEWRITER_75DPI
 	bool
 	select XORG_FONTS
+	depends on XORG_FONT_75DPI
 	prompt "BH Lucida Typewriter 75dpi"
 	help
 	  This package contains fonts in the ISO 10646-1,
diff --git a/rules/xorg-font-bh-ttf.in b/rules/xorg-font-bh-ttf.in
index c38350e89..82298e02b 100644
--- a/rules/xorg-font-bh-ttf.in
+++ b/rules/xorg-font-bh-ttf.in
@@ -1,6 +1,8 @@
 config XORG_FONT_BH_TTF
 	bool
 	select XORG_FONTS
+	depends on XORG_FONT_SCALEABLE
+	default y
 	prompt "BH ttf"
 	help
 	  contains truetype fonts provided by xorg
diff --git a/rules/xorg-font-bitstream-100dpi.in b/rules/xorg-font-bitstream-100dpi.in
index 260f63a9c..80af98d57 100644
--- a/rules/xorg-font-bitstream-100dpi.in
+++ b/rules/xorg-font-bitstream-100dpi.in
@@ -1,6 +1,7 @@
 config XORG_FONT_BITSTREAM_100DPI
 	bool
 	select XORG_FONTS
+	depends on XORG_FONT_100DPI
 	prompt "Bitstream 100dpi"
 	help
 	  This package contains Bitstream fonts in the ISO 10646-1,
diff --git a/rules/xorg-font-bitstream-75dpi.in b/rules/xorg-font-bitstream-75dpi.in
index f54725045..4cc55b4b4 100644
--- a/rules/xorg-font-bitstream-75dpi.in
+++ b/rules/xorg-font-bitstream-75dpi.in
@@ -1,6 +1,7 @@
 config XORG_FONT_BITSTREAM_75DPI
 	bool
 	select XORG_FONTS
+	depends on XORG_FONT_75DPI
 	prompt "Bitstream 75dpi"
 	help
 	  This package contains Bitstream fonts in the ISO 10646-1,
diff --git a/rules/xorg-font-bitstream-speedo.in b/rules/xorg-font-bitstream-speedo.in
index 522ef9e14..cbbc0b404 100644
--- a/rules/xorg-font-bitstream-speedo.in
+++ b/rules/xorg-font-bitstream-speedo.in
@@ -1,6 +1,7 @@
 config XORG_FONT_BITSTREAM_SPEEDO
 	bool
 	select XORG_FONTS
+	depends on XORG_FONT_SCALEABLE
 	prompt "Bitstream speedo"
 	help
 	  This package contains the Speedo version of Bitstream 
diff --git a/rules/xorg-font-bitstream-type1.in b/rules/xorg-font-bitstream-type1.in
index 59d33abc1..febbb39be 100644
--- a/rules/xorg-font-bitstream-type1.in
+++ b/rules/xorg-font-bitstream-type1.in
@@ -1,6 +1,8 @@
 config XORG_FONT_BITSTREAM_TYPE1
 	bool
 	select XORG_FONTS
+	depends on XORG_FONT_SCALEABLE
+	default y
 	prompt "Bitstream type1"
 	help
 	  This package contains the type1 version of Bitstream 
diff --git a/rules/xorg-font-ibm-type1.in b/rules/xorg-font-ibm-type1.in
index 080f0fbf3..38447dbb6 100644
--- a/rules/xorg-font-ibm-type1.in
+++ b/rules/xorg-font-ibm-type1.in
@@ -1,6 +1,7 @@
 config XORG_FONT_IBM_TYPE1
 	bool
 	select XORG_FONTS
+	depends on XORG_FONT_SCALEABLE
 	prompt "IBM type1"
 	help
 	  scalable IBM type1 fonts, as used on OS/2 systems. 
diff --git a/rules/xorg-font-scalable.in b/rules/xorg-font-scalable.in
index b9376ea85..23dde5b42 100644
--- a/rules/xorg-font-scalable.in
+++ b/rules/xorg-font-scalable.in
@@ -1,5 +1,7 @@
-menu "xorg scalable fonts           "
+menuconfig XORG_FONT_SCALEABLE
 	depends on MENU_XORG_FONTS
+	bool
+	prompt "xorg scalable fonts           "
 
 source "rules/xorg-font-adobe-utopia-type1.in"
 source "rules/xorg-font-bitstream-speedo.in"
@@ -7,5 +9,3 @@ source "rules/xorg-font-bitstream-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-util.make b/rules/xorg-font-util.make
index eb55dab87..044b8a709 100644
--- a/rules/xorg-font-util.make
+++ b/rules/xorg-font-util.make
@@ -104,20 +104,6 @@ xorg-font-util_targetinstall: $(STATEDIR)/xorg-font-util.targetinstall
 
 $(STATEDIR)/xorg-font-util.targetinstall: $(xorg-font-util_targetinstall_deps_default)
 	@$(call targetinfo, $@)
-
-	@$(call install_init, xorg-font-util)
-	@$(call install_fixup, xorg-font-util,PACKAGE,xorg-font-util)
-	@$(call install_fixup, xorg-font-util,PRIORITY,optional)
-	@$(call install_fixup, xorg-font-util,VERSION,$(XORG_FONT_UTIL_VERSION))
-	@$(call install_fixup, xorg-font-util,SECTION,base)
-	@$(call install_fixup, xorg-font-util,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup, xorg-font-util,DEPENDS,)
-	@$(call install_fixup, xorg-font-util,DESCRIPTION,missing)
-
-#FIXME
-
-	@$(call install_finish, xorg-font-util)
-
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
diff --git a/rules/xorg-font-xfree86-type1.in b/rules/xorg-font-xfree86-type1.in
index e2cf145cb..230d64e87 100644
--- a/rules/xorg-font-xfree86-type1.in
+++ b/rules/xorg-font-xfree86-type1.in
@@ -1,6 +1,7 @@
 config XORG_FONT_XFREE86_TYPE1
 	bool
 	select XORG_FONTS
+	depends on XORG_FONT_SCALEABLE
 	prompt "Xfree86 type1"
 	help
 	  scalable font of old style xfree86 cursor