From 835ac7afb162fbdbd402247fd92c7ed2ab9c4d36 Mon Sep 17 00:00:00 2001
From: Stefan Fiedler <stefan.fiedler@students.jku.at>
Date: Mon, 9 Oct 2006 17:53:38 +0000
Subject: [PATCH] Stefan Fiedler: 	replace xorg Cron job with postinstall
 scripts 	NOT TESTED yet

[2006092913071523974] (https://www.rocklinux.net/submaster)



git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@7944 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 package/x11/fontconfig/fontconfig.conf           |  3 +++
 .../fontconfig/x11-30-fontconfig-postinstall.sh  |  6 ++++++
 package/xorg/mkfontdir/mkfontdir.conf            |  8 ++++++++
 .../mkfontdir/x11-20-mkfontdir-postinstall.sh    | 16 ++++++++++++++++
 package/xorg/mkfontscale/mkfontscale.conf        |  8 ++++++++
 .../x11-10-mkfontscale-postinstall.sh            | 16 ++++++++++++++++
 package/xorg/xorg-server/xorg-server.conf        |  4 ----
 package/xorg/xorg-server/xorg.cron               | 16 ----------------
 8 files changed, 57 insertions(+), 20 deletions(-)
 create mode 100644 package/x11/fontconfig/x11-30-fontconfig-postinstall.sh
 create mode 100644 package/xorg/mkfontdir/x11-20-mkfontdir-postinstall.sh
 create mode 100644 package/xorg/mkfontscale/x11-10-mkfontscale-postinstall.sh
 delete mode 100644 package/xorg/xorg-server/xorg.cron

diff --git a/package/x11/fontconfig/fontconfig.conf b/package/x11/fontconfig/fontconfig.conf
index a4287568f..85184317c 100644
--- a/package/x11/fontconfig/fontconfig.conf
+++ b/package/x11/fontconfig/fontconfig.conf
@@ -2,6 +2,9 @@ fontconfig_postmake ()
 {
 	echo "Copying default example configs ..."
 	cp -fv $confdir/local.conf.data $root/etc/fonts/local.conf
+
+	echo "Installing fontconfig postinstall Script ..."
+	cp -fv $confdir/x11-30-fontconfig-postinstall.sh $root/etc/postinstall/
 }
 
 hook_add postmake 5 fontconfig_postmake
diff --git a/package/x11/fontconfig/x11-30-fontconfig-postinstall.sh b/package/x11/fontconfig/x11-30-fontconfig-postinstall.sh
new file mode 100644
index 000000000..0881fec33
--- /dev/null
+++ b/package/x11/fontconfig/x11-30-fontconfig-postinstall.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+if [ "`which fc-cache`" ] ; then
+	echo "Running fc-cache ..."
+	fc-cache -v
+fi
diff --git a/package/xorg/mkfontdir/mkfontdir.conf b/package/xorg/mkfontdir/mkfontdir.conf
index 85e50a316..5abd4a721 100644
--- a/package/xorg/mkfontdir/mkfontdir.conf
+++ b/package/xorg/mkfontdir/mkfontdir.conf
@@ -1 +1,9 @@
 . "$base/package/xorg/xorg_config.sh"
+
+mkfontdir_postmake()
+{
+	echo "Installing mkfontdir postinstall Script ..."
+	cp -fv $confdir/x11-20-mkfontdir-postinstall.sh $root/etc/postinstall/
+}
+
+hook_add postmake 7 "mkfontdir_postmake"
diff --git a/package/xorg/mkfontdir/x11-20-mkfontdir-postinstall.sh b/package/xorg/mkfontdir/x11-20-mkfontdir-postinstall.sh
new file mode 100644
index 000000000..523871142
--- /dev/null
+++ b/package/xorg/mkfontdir/x11-20-mkfontdir-postinstall.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+# mkfontscale has to be run before mkfontdir.
+
+print_status=1
+if any_touched '/usr/X11R7/lib/X11/fonts/' ; then
+	for dir in /usr/X11R7/lib/X11/fonts/* ; do
+		[ -d $dir ] || continue
+		[ $print_status = 1 ] && \
+			{ echo "Running mkfontdir ..." ; print_status=0 ; }
+		echo -n "$dir "
+		mkfontdir $dir
+	done
+	[ $print_status = 0 ] && echo
+fi
+unset dir print_status
diff --git a/package/xorg/mkfontscale/mkfontscale.conf b/package/xorg/mkfontscale/mkfontscale.conf
index 85e50a316..7826af327 100644
--- a/package/xorg/mkfontscale/mkfontscale.conf
+++ b/package/xorg/mkfontscale/mkfontscale.conf
@@ -1 +1,9 @@
 . "$base/package/xorg/xorg_config.sh"
+
+mkfontscale_postmake()
+{
+	echo "Installing mkfontscale postinstall Script ..."
+	cp -fv $confdir/x11-10-mkfontscale-postinstall.sh $root/etc/postinstall/
+}
+
+hook_add postmake 7 "mkfontscale_postmake"
diff --git a/package/xorg/mkfontscale/x11-10-mkfontscale-postinstall.sh b/package/xorg/mkfontscale/x11-10-mkfontscale-postinstall.sh
new file mode 100644
index 000000000..5912c1aad
--- /dev/null
+++ b/package/xorg/mkfontscale/x11-10-mkfontscale-postinstall.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+# mkfontscale has to be run before mkfontdir.
+
+print_status=1
+if any_touched '/usr/X11R7/lib/X11/fonts/' ; then
+	for dir in /usr/X11R7/lib/X11/fonts/* ; do
+		[ -d $dir ] || continue
+		[ $print_status = 1 ] && \
+			{ echo "Running mkfontscale ..." ; print_status=0 ; }
+		echo -n "$dir "
+		mkfontscale $dir
+	done
+	[ $print_status = 0 ] && echo
+fi
+unset dir print_status
diff --git a/package/xorg/xorg-server/xorg-server.conf b/package/xorg/xorg-server/xorg-server.conf
index 8c224a38b..9d8202b05 100644
--- a/package/xorg/xorg-server/xorg-server.conf
+++ b/package/xorg/xorg-server/xorg-server.conf
@@ -16,10 +16,6 @@ xorg_server_postmake ()
 	echo "Installing the xdm start script (multiplexer) ..."
 	cp $confdir/startxdm.sh $root/usr/X11R7/bin/startxdm
 	chmod +x $root/usr/X11R7/bin/startxdm
-
-	echo "Installing X-Windows Cron Script ..."
-	cp -fv $confdir/xorg.cron $root/etc/cron.daily/80-xorg
-	chmod +x $root/etc/cron.daily/80-xorg
 }
 
 hook_add preconf 5 "tar $taropt $archdir/MesaLib-$mesa_ver.tar.bz2"
diff --git a/package/xorg/xorg-server/xorg.cron b/package/xorg/xorg-server/xorg.cron
deleted file mode 100644
index 06490c7af..000000000
--- a/package/xorg/xorg-server/xorg.cron
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-echo "Running mkfontscale / mkfontdir ..."
-for dir in /usr/X11R7/lib/X11/fonts/* ; do
-	[ -d $dir ] || continue
-	echo -n "$dir "
-	mkfontscale $dir
-	mkfontdir $dir
-done ; unset dir
-echo
-
-if [ "`which fc-cache`" ] ; then
-	echo "Running fc-cache ..."
-	fc-cache -v
-fi
-