5 files changed, 92 insertions, 1 deletions
diff --git a/mk/image.mk b/mk/image.mk
index a2a6bb176..04506f0cd 100644
--- a/mk/image.mk
+++ b/mk/image.mk
@@ -13,7 +13,6 @@ image-prepare-post:
 	rng=/dev/arandom; test -e $$rng || rng=/dev/urandom; \
 	    dd if=$$rng bs=512 count=1 >>${TARGET_DIR}/etc/.rnd 2>/dev/null; \
 	    chmod 600 ${TARGET_DIR}/etc/.rnd
-	# Sanity checks
 	@cd ${TARGET_DIR}; ls=; ln=; li=; x=1; md5sum $$(find . -type f) | \
 	    sed -e "s/*//" | \
 	    while read sum name; do \
@@ -47,6 +46,11 @@ image-prepare-post:
 	done
 	chmod 4511 ${TARGET_DIR}/bin/busybox
 	chmod 1777 ${TARGET_DIR}/tmp
+	@if [ -d ${TARGET_DIR}/usr/share/fonts/X11 ];then \
+		for i in $$(ls ${TARGET_DIR}/usr/share/fonts/X11/);do \
+			mkfontdir ${TARGET_DIR}/usr/share/fonts/X11/$${i}; \
+		done; \
+	fi
 
 INITRAMFS=		${ADK_TARGET}-${ADK_LIBC}-${FS}
 ROOTFSSQUASHFS=		${ADK_TARGET}-${ADK_LIBC}-${FS}.img
diff --git a/package/Config.in b/package/Config.in
index 0185c0d1e..74294c5ec 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -572,9 +572,12 @@ source "package/evilwm/Config.in"
 source "package/font-util/Config.in"
 source "package/rxvt-unicode/Config.in"
 source "package/xauth/Config.in"
+source "package/xlsfonts/Config.in"
 endmenu
 
 menu "X Fonts"
+source "package/font-adobe-75dpi/Config.in"
+source "package/font-adobe-100dpi/Config.in"
 source "package/font-bitstream-75dpi/Config.in"
 source "package/font-bitstream-100dpi/Config.in"
 source "package/font-misc-misc/Config.in"
diff --git a/package/font-adobe-100dpi/Makefile b/package/font-adobe-100dpi/Makefile
new file mode 100644
index 000000000..08d05d0d2
--- /dev/null
+++ b/package/font-adobe-100dpi/Makefile
@@ -0,0 +1,28 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		font-adobe-100dpi
+PKG_VERSION:=		1.0.1
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		93bd04e2fb348a0c48e13ab3933f2381
+PKG_DESCR:=		X fonts
+PKG_SECTION:=		x11
+PKG_URL:=		http://www.x.org/
+PKG_SITES:=		${MASTER_SITE_XORG}
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,FONT_ADOBE_100DPI,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIGURE_STYLE:=	gnu
+BUILD_STYLE:=		auto
+INSTALL_STYLE:=		auto
+
+post-install:
+	$(INSTALL_DIR) $(IDIR_FONT_ADOBE_100DPI)/usr/share/fonts/X11/100dpi
+	$(CP) ${WRKINST}/usr/share/fonts/X11/100dpi/* \
+		$(IDIR_FONT_ADOBE_100DPI)/usr/share/fonts/X11/100dpi
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/font-adobe-75dpi/Makefile b/package/font-adobe-75dpi/Makefile
new file mode 100644
index 000000000..f39871761
--- /dev/null
+++ b/package/font-adobe-75dpi/Makefile
@@ -0,0 +1,28 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		font-adobe-75dpi
+PKG_VERSION:=		1.0.1
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		d22283daba10129643800d73f5496aab
+PKG_DESCR:=		X fonts
+PKG_SECTION:=		x11
+PKG_URL:=		http://www.x.org/
+PKG_SITES:=		${MASTER_SITE_XORG}
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,FONT_ADOBE_75DPI,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIGURE_STYLE:=	gnu
+BUILD_STYLE:=		auto
+INSTALL_STYLE:=		auto
+
+post-install:
+	$(INSTALL_DIR) $(IDIR_FONT_ADOBE_75DPI)/usr/share/fonts/X11/75dpi
+	$(CP) ${WRKINST}/usr/share/fonts/X11/75dpi/* \
+		$(IDIR_FONT_ADOBE_75DPI)/usr/share/fonts/X11/75dpi
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xlsfonts/Makefile b/package/xlsfonts/Makefile
new file mode 100644
index 000000000..c85687366
--- /dev/null
+++ b/package/xlsfonts/Makefile
@@ -0,0 +1,28 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include ${TOPDIR}/rules.mk
+
+PKG_NAME:=		xlsfonts
+PKG_VERSION:=		1.0.2
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		7a6bee1512ccdef52fc519a86684891e
+PKG_DESCR:=		List X11 fonts
+PKG_SECTION:=		libs
+PKG_URL:=		http://www.x.org/
+PKG_SITES:=		http://xorg.freedesktop.org/releases/individual/app/
+
+include ${TOPDIR}/mk/package.mk
+
+$(eval $(call PKG_template,XLSFONTS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+CONFIGURE_STYLE:=	gnu
+BUILD_STYLE:=		auto
+INSTALL_STYLE:=		auto
+
+post-install:
+	${INSTALL_DIR} ${IDIR_XLSFONTS}/usr/bin
+	${CP} ${WRKINST}/usr/bin/xlsfonts \
+		${IDIR_XLSFONTS}/usr/bin
+
+include ${TOPDIR}/mk/pkg-bottom.mk