From: Schantl Stefan <Stevee@ipfire.org>
Date: Mon, 25 Oct 2010 14:29:54 +0000 (+0200)
Subject: xorg-x11-fonts: Add new font - unicode.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=65055062817b2ac7e066121fc7a6b6842974686e;p=ipfire-3.x.git

xorg-x11-fonts: Add new font - unicode.
---

diff --git a/pkgs/core/xorg-x11-fonts/xorg-x11-fonts.nm b/pkgs/core/xorg-x11-fonts/xorg-x11-fonts.nm
index 84d0fe481..8024954dd 100644
--- a/pkgs/core/xorg-x11-fonts/xorg-x11-fonts.nm
+++ b/pkgs/core/xorg-x11-fonts/xorg-x11-fonts.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
 
 PKG_NAME       = xorg-x11-fonts
 PKG_VER        = 7.2
-PKG_REL        = 0
+PKG_REL        = 1
 
 PKG_MAINTAINER = Stefan Schantl <stefan.schantl@ipfire.org>
 PKG_GROUP      = X/Fonts
@@ -79,10 +79,11 @@ SRC_PACKAGES = \
 	font-xfree86-type1-1.0.2
 
 PKG_OBJECTS += $(foreach package,$(SRC_PACKAGES),$(package).tar.bz2)
+PKG_OBJECTS += unifont-5.1.20080820.pcf.gz
 
 define STAGE_PREPARE
-	for object in $(PKG_OBJECTS); do \
-		cd $(DIR_SRC) && $(DO_EXTRACT) $(DIR_DL)/$${object}; \
+	for object in $(SRC_PACKAGES); do \
+		cd $(DIR_SRC) && $(DO_EXTRACT) $(DIR_DL)/$${object}.tar.bz2; \
 	done
 endef
 
@@ -110,6 +111,11 @@ define MACRO_INSTALL
 
 endef
 
-STAGE_INSTALL = $(foreach package,$(SRC_PACKAGES),$(call MACRO_INSTALL,$(package)))
+define STAGE_INSTALL
+	$(foreach package,$(SRC_PACKAGES),$(call MACRO_INSTALL,$(package)))
+
+	# Install unifont
+	cp -vf $(DIR_SRC)/cache/unifont-5.1.20080820.pcf.gz $(BUILDROOT)/usr/share/X11/fonts/misc/
+endef