xorg-lib-Xfont: drop package for target

This package is no longer required to be
present on the target.  We need to keep
the host package as a build dependency, tho.

Signed-off-by: Björn Esser <b.esser@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

3 files changed, 11 insertions, 141 deletions

diff --git a/rules/host-xorg-lib-Xfont.make b/rules/host-xorg-lib-Xfont.make
index f7a4176a3..a0407b2b3 100644
--- a/rules/host-xorg-lib-Xfont.make
+++ b/rules/host-xorg-lib-Xfont.make
@@ -15,19 +15,27 @@ HOST_PACKAGES-$(PTXCONF_HOST_XORG_LIB_XFONT) += host-xorg-lib-xfont
 #
 # Paths and names
 #
-HOST_XORG_LIB_XFONT_DIR		= $(HOST_BUILDDIR)/$(XORG_LIB_XFONT)
+HOST_XORG_LIB_XFONT_VERSION	:= 1.5.4
+HOST_XORG_LIB_XFONT_MD5		:= 16eaf156edd79b68038b6a7c44aa9e9b
+HOST_XORG_LIB_XFONT		:= libXfont-$(HOST_XORG_LIB_XFONT_VERSION)
+HOST_XORG_LIB_XFONT_SUFFIX	:= tar.bz2
+HOST_XORG_LIB_XFONT_URL		:= $(call ptx/mirror, XORG, individual/lib/$(HOST_XORG_LIB_XFONT).$(HOST_XORG_LIB_XFONT_SUFFIX))
+HOST_XORG_LIB_XFONT_SOURCE	:= $(SRCDIR)/$(HOST_XORG_LIB_XFONT).$(HOST_XORG_LIB_XFONT_SUFFIX)
+HOST_XORG_LIB_XFONT_DIR		:= $(HOST_BUILDDIR)/$(HOST_XORG_LIB_XFONT)
+HOST_XORG_LIB_XFONT_LICENSE	:= MIT
 
 # ----------------------------------------------------------------------------
 # Prepare
 # ----------------------------------------------------------------------------
 
 HOST_XORG_LIB_XFONT_PATH	:= PATH=$(HOST_PATH)
-HOST_XORG_LIB_XFONT_ENV 	:= $(HOST_ENV)
+HOST_XORG_LIB_XFONT_ENV		:= $(HOST_ENV)
 
 #
 # autoconf
 #
-HOST_XORG_LIB_XFONT_AUTOCONF := \
+HOST_XORG_LIB_XFONT_CONF_TOOL	:= autoconf
+HOST_XORG_LIB_XFONT_CONF_OPT	:= \
 	$(HOST_AUTOCONF) \
 	--disable-static \
 	--disable-freetype \
diff --git a/rules/xorg-lib-Xfont.in b/rules/xorg-lib-Xfont.in
deleted file mode 100644
index 0267ca7f2..000000000
--- a/rules/xorg-lib-Xfont.in
+++ /dev/null
@@ -1,71 +0,0 @@
-## SECTION=multimedia_xorg_lib
-
-# These are always required:
-# Requires: xproto fontsproto
-# Requires.private: fontenc
-# Libs.private: -lz -lm
-
-menuconfig XORG_LIB_XFONT
-	tristate
-	select LIBC_M
-	select XORGPROTO
-	select XORG_LIB_FONTENC
-	select XORG_LIB_XTRANS
-	select ZLIB			if XORG_LIB_XFONT_BUILTIN_FONTS
-	select FREETYPE			if XORG_LIB_XFONT_FREETYPE
-	# disabling builtins is currently broken
-	select XORG_LIB_XFONT_BUILTIN_FONTS
-	default y if XORG_LIB_X11
-	prompt "libXfont                      "
-	help
-	  X font Library. At least one file based font support must be enabled
-	  to make the xorg server (part dix) happy.
-
-config XORG_LIB_XFONT_FREETYPE
-	depends on XORG_LIB_XFONT
-	select FREETYPE
-	bool
-	prompt "Use freetype as rendering library"
-	help
-	  This will enable freetype 2.x library.
-
-config XORG_LIB_XFONT_FONTSERVER
-	depends on XORG_LIB_XFONT
-	bool
-	prompt "Support font server connections"
-	help
-	  This will support connections to font server.
-	  FIXME: xorg server fails when font server connections are disabled.
-
-config XORG_LIB_XFONT_PCF_FONTS
-	depends on XORG_LIB_XFONT
-	bool
-	prompt "Support pcf format fonts"
-	help
-	  Enable pcf format fonts in this X server.
-
-config XORG_LIB_XFONT_BDF_FONTS
-	depends on XORG_LIB_XFONT
-	bool
-	default y
-	prompt "Support bdf format fonts"
-	help
-	  Enable bdf format fonts in this X server.
-
-config XORG_LIB_XFONT_SNF_FONTS
-	depends on XORG_LIB_XFONT
-	bool
-	prompt "Support snf format fonts"
-	help
-	  Enable snf format fonts in this X server.
-
-config XORG_LIB_XFONT_BUILTIN_FONTS
-	depends on XORG_LIB_XFONT
-	bool
-	prompt "Support builtin fonts"
-	default y
-	help
-	  Builtins (gzipped pcf format in .text segment). Enable this font type
-	  if you don't have any fonts on you target nor a font server in your
-	  network.
-	  FIXME: xorg server fails to build when this entry is disabled.
diff --git a/rules/xorg-lib-Xfont.make b/rules/xorg-lib-Xfont.make
deleted file mode 100644
index 8c3fe5f5a..000000000
--- a/rules/xorg-lib-Xfont.make
+++ /dev/null
@@ -1,67 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2006 by Erwin Rol
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_XORG_LIB_XFONT) += xorg-lib-xfont
-
-#
-# Paths and names
-#
-XORG_LIB_XFONT_VERSION	:= 1.5.0
-XORG_LIB_XFONT_MD5	:= 664629bfa7cdf8b984155019fd395dcb
-XORG_LIB_XFONT		:= libXfont-$(XORG_LIB_XFONT_VERSION)
-XORG_LIB_XFONT_SUFFIX	:= tar.bz2
-XORG_LIB_XFONT_URL	:= $(call ptx/mirror, XORG, individual/lib/$(XORG_LIB_XFONT).$(XORG_LIB_XFONT_SUFFIX))
-XORG_LIB_XFONT_SOURCE	:= $(SRCDIR)/$(XORG_LIB_XFONT).$(XORG_LIB_XFONT_SUFFIX)
-XORG_LIB_XFONT_DIR	:= $(BUILDDIR)/$(XORG_LIB_XFONT)
-XORG_LIB_XFONT_LICENSE	:= MIT
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-#
-# autoconf
-#
-XORG_LIB_XFONT_CONF_TOOL	:= autoconf
-XORG_LIB_XFONT_CONF_OPT		:= \
-	$(CROSS_AUTOCONF_USR) \
-	--disable-devel-docs \
-	--$(call ptx/endis, PTXCONF_XORG_LIB_XFONT_FREETYPE)-freetype \
-	--$(call ptx/endis, PTXCONF_XORG_LIB_XFONT_BUILTIN_FONTS)-builtins \
-	--$(call ptx/endis, PTXCONF_XORG_LIB_XFONT_PCF_FONTS)-pcfformat \
-	--$(call ptx/endis, PTXCONF_XORG_LIB_XFONT_BDF_FONTS)-bdfformat \
-	--$(call ptx/endis, PTXCONF_XORG_LIB_XFONT_SNF_FONTS)-snfformat \
-	--$(call ptx/endis, PTXCONF_XORG_LIB_XFONT_FONTSERVER)-fc \
-	$(XORG_OPTIONS_TRANS) \
-	--without-xmlto \
-	--without-fop \
-	--without-bzip2
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/xorg-lib-xfont.targetinstall:
-	@$(call targetinfo)
-
-	@$(call install_init, xorg-lib-xfont)
-	@$(call install_fixup, xorg-lib-xfont,PRIORITY,optional)
-	@$(call install_fixup, xorg-lib-xfont,SECTION,base)
-	@$(call install_fixup, xorg-lib-xfont,AUTHOR,"Erwin Rol <ero@pengutronix.de>")
-	@$(call install_fixup, xorg-lib-xfont,DESCRIPTION,missing)
-
-	@$(call install_lib, xorg-lib-xfont, 0, 0, 0644, libXfont)
-
-	@$(call install_finish, xorg-lib-xfont)
-
-	@$(call touch)
-
-# vim: syntax=make