* xorg-font*:

	new font stuff


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

1 files changed, 50 insertions, 48 deletions

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, $@)