split XOrg font base package into 2 files, to reduce size of std installation

git-svn-id: svn://svn.openwrt.org/openwrt/packages@8956 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
blogic 2007-09-22 18:52:10 +00:00
parent c7aa42313b
commit e91872ae63
5 changed files with 188 additions and 10 deletions

View File

@ -1,18 +1,126 @@
#
# Copyright (C) 2007 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
# blogic@openwrt.org
include $(TOPDIR)/rules.mk
PKG_BASE_NAME:=font
PKG_BASE_NAME:=font-base
PKG_NAME:=font-misc-misc-X11R7.0
PKG_RELEASE:=1
PKG_VERSION:=1.0.0
_DEPEND:=
PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/font
PKG_SOURCE:=font-misc-misc-X11R7.0-1.0.0.tar.bz2
PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/fonts/font-misc-misc-X11R7.0-1.0.0/
include ../common.mk
include $(INCLUDE_DIR)/package.mk
ifeq ("$(PKG_NAME)","font-util-X11R7.1")
define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR)/
define Package/font-misc-misc/Default
SECTION:=xorg-fonts
CATEGORY:=Xorg
SUBMENU:=fonts
endef
endif
$(eval $(call BuildPackage,$(PKG_NAME)))
define Package/font-base
$(call Package/font-misc-misc/Default)
DEPENDS:=+xorg-server-X11R7.2 +font-util-X11R7.1 @TARGET_x86
TITLE:=font-base
URL:=http://xorg.freedesktop.org/
endef
define Package/font-misc-misc
$(call Package/font-misc-misc/Default)
DEPENDS:=font-base
TITLE:=font-misc-misc
URL:=http://xorg.freedesktop.org/
endef
CONFIGURE_ARGS_XTRA+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201
define Build/Compile
UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR)
DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
find $(PKG_INSTALL_DIR) -name fonts.dir | \
xargs rm
endef
define Build/Configure
(cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \
if [ -x $(CONFIGURE_CMD) ]; then \
$(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \
$(CONFIGURE_VARS) \
$(CONFIGURE_CMD) \
$(CONFIGURE_ARGS_XTRA) \
$(CONFIGURE_ARGS) ;\
fi \
)
endef
define Build/InstallDev
DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
endef
define Package/font-base/install
$(INSTALL_DIR) $(1)/usr/lib/X11/fonts/misc/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/X11/fonts/misc/6x13* $(1)/usr/lib/X11/fonts/misc/
$(CP) files/fonts.dir.font-base $(1)/usr/lib/X11/fonts/misc/
endef
define Package/font-misc-misc/install
$(INSTALL_DIR) $(1)/usr/lib/X11/fonts/misc/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/X11/fonts/misc/* $(1)/usr/lib/X11/fonts/misc/
rm $(1)/usr/lib/X11/fonts/misc/6x13*
$(CP) files/fonts.dir.font-misc-misc $(1)/usr/lib/X11/fonts/misc/
endef
define Package/font-base/postinst
#!/bin/sh
FILE_NEW=`find $${IPKG_INSTROOT} -name fonts.dir.font-base`
FILE_OLD=`dirname $${FILE_NEW}`/fonts.dir
echo found $${FILE}
if [ ! -z $${FILE_NEW} ]; then
if [ -f $${FILE_OLD} ]; then
sed -i "1d" $${FILE_OLD}
cat $${FILE_NEW} >> $${FILE_OLD}
rm -rf $${FILE_NEW}
mv $${FILE_OLD} $${FILE_OLD}.tmp
else
mv $${FILE_NEW} $${FILE_OLD}.tmp
fi
(echo `wc -l $${FILE_OLD}.tmp | awk '{print($$1)}'`; cat $${FILE_OLD}.tmp) > $${FILE_OLD}
rm $${FILE_OLD}.tmp
fi
endef
define Package/font-misc-misc/postinst
#!/bin/sh
FILE_NEW=`find $${IPKG_INSTROOT} -name fonts.dir.font-misc-misc`
FILE_OLD=`dirname $${FILE_NEW}`/fonts.dir
echo found $${FILE}
if [ ! -z $${FILE_NEW} ]; then
if [ -f $${FILE_OLD} ]; then
sed -i "1d" $${FILE_OLD}
cat $${FILE_NEW} >> $${FILE_OLD}
rm -rf $${FILE_NEW}
mv $${FILE_OLD} $${FILE_OLD}.tmp
else
mv $${FILE_NEW} $${FILE_OLD}.tmp
fi
(echo `wc -l $${FILE_OLD}.tmp | awk '{print($$1)}'`; cat $${FILE_OLD}.tmp) > $${FILE_OLD}
rm $${FILE_OLD}.tmp
fi
endef
$(eval $(call BuildPackage,font-misc-misc))
$(eval $(call BuildPackage,font-base))

View File

@ -0,0 +1,9 @@
6x13-ISO8859-1.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-1
6x13-ISO8859-15.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-15
6x13.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso10646-1
6x13B-ISO8859-1.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-1
6x13B-ISO8859-15.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-15
6x13B.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso10646-1
6x13O-ISO8859-1.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-1
6x13O-ISO8859-15.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-15
6x13O.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso10646-1

View File

@ -0,0 +1,62 @@
10x20-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-1
10x20-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-15
10x20.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso10646-1
12x13ja.pcf.gz -misc-fixed-medium-r-normal-ja-13-120-75-75-c-120-iso10646-1
18x18ja.pcf.gz -misc-fixed-medium-r-normal-ja-18-120-100-100-c-180-iso10646-1
18x18ko.pcf.gz -misc-fixed-medium-r-normal-ko-18-120-100-100-c-180-iso10646-1
4x6-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-1
4x6-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-15
4x6.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso10646-1
5x7-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-1
5x7-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-15
5x7.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso10646-1
5x8-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-1
5x8-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-15
5x8.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso10646-1
6x10-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-1
6x10-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-15
6x10.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso10646-1
6x12-ISO8859-1.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-1
6x12-ISO8859-15.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-15
6x12.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso10646-1
6x9-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-1
6x9-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-15
6x9.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso10646-1
7x13-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-1
7x13-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-15
7x13.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso10646-1
7x13B-ISO8859-1.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-1
7x13B-ISO8859-15.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-15
7x13B.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso10646-1
7x13O-ISO8859-1.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-1
7x13O-ISO8859-15.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-15
7x13O.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso10646-1
7x14-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-1
7x14-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-15
7x14.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso10646-1
7x14B-ISO8859-1.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-1
7x14B-ISO8859-15.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-15
7x14B.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso10646-1
8x13-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-1
8x13-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-15
8x13.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso10646-1
8x13B-ISO8859-1.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-1
8x13B-ISO8859-15.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-15
8x13B.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso10646-1
8x13O-ISO8859-1.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-1
8x13O-ISO8859-15.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-15
8x13O.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso10646-1
9x15-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-1
9x15-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-15
9x15.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso10646-1
9x15B-ISO8859-1.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-1
9x15B-ISO8859-15.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-15
9x15B.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso10646-1
9x18-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-1
9x18-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-15
9x18.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso10646-1
9x18B-ISO8859-1.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-1
9x18B-ISO8859-15.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-15
9x18B.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso10646-1
k14.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-140-jisx0208.1983-0
nil2.pcf.gz -misc-nil-medium-r-normal--2-20-75-75-c-10-misc-fontspecific

View File

@ -1,5 +1,4 @@
encodings-X11R7.2-1.0.2|
font-misc-misc-X11R7.0-1.0.0|
font-xfree86-type1-X11R7.0-1.0.0|
font-cursor-misc-X11R7.0-1.0.0|
font-daewoo-misc-X11R7.0-1.0.0|

View File

@ -21,7 +21,7 @@ define Package/xorg-server-X11R7.2-essentials
URL:=http://xorg.freedesktop.org/
DEPENDS:=+xorg-server-X11R7.2 \
+font-alias-X11R7.0 \
+font-misc-misc-X11R7.0 \
+font-base \
+font-cursor-misc-X11R7.0 \
+xf86-input-mouse-X11R7.2 \
+xf86-video-vesa-X11R7.2 \