[Lunar-commits] <moonbase> sjfonts: full rewrite of module - it installed sources of fonts not fonts

[Zbigniew Luszpinski]

commit bbfce1fa9a67a2c9a1cc8964e0a439be5dfabdb2
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date:   Sun Aug 28 00:35:28 2011 +0200

    sjfonts: full rewrite of module - it installed sources of fonts not fonts
---
 fonts/sjfonts/BUILD        |   17 ++++++-----------
 fonts/sjfonts/DETAILS      |   19 ++++++++++---------
 fonts/sjfonts/POST_INSTALL |   11 +++++++++--
 fonts/sjfonts/POST_REMOVE  |    1 +
 fonts/sjfonts/PRE_BUILD    |    5 +++--
 5 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/fonts/sjfonts/BUILD b/fonts/sjfonts/BUILD
index af0425b..51d3e19 100644
--- a/fonts/sjfonts/BUILD
+++ b/fonts/sjfonts/BUILD
@@ -1,17 +1,12 @@
 (
 
-  SJFONTS=/usr/share/fonts/$MODULE
+  prepare_install &&
 
-  prepare_install              &&
+  if [ ! -d /usr/share/fonts/sjfonts ] ; then
+    mkdir -p /usr/share/fonts/sjfonts
+  fi &&
 
-  if [ ! -d $SJFONTS ] ; then
-     mkdir -p $SJFONTS
-  fi                           &&
-
-  if [ -d old.libraries ] ; then
-    rmdir old.libraries
-  fi                           &&
-
-  cp -f $SOURCE_DIRECTORY/* $SJFONTS
+  rm -rf old.libraries &&
+  cp -f * /usr/share/fonts/sjfonts
 
 ) > $C_FIFO 2>&1
diff --git a/fonts/sjfonts/DETAILS b/fonts/sjfonts/DETAILS
index c262d32..d1d57e8 100644
--- a/fonts/sjfonts/DETAILS
+++ b/fonts/sjfonts/DETAILS
@@ -1,13 +1,14 @@
           MODULE=sjfonts
-         VERSION=source-2.0.2
-          SOURCE=$MODULE-$VERSION.tar.bz2
+         VERSION=2.0.2
+          SOURCE=$MODULE.$VERSION.tar.bz2
       SOURCE_URL=$SFORGE_URL/$MODULE
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE
-      SOURCE_VFY=sha1:4030a80ee7347973cbdef5ce6bef2c7630899035
-        WEB_SITE=http://sjfonts.sourceforge.net/
-         ENTERED=20110816
-         UPDATED=20110816
-           SHORT="Some fonts released under GPL"
+      SOURCE_VFY=sha1:cc875a9ecb9f300fa8cb012f4d89b5409cb509a7
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-$VERSION
+        WEB_SITE=http://sjfonts.sourceforge.net
+         ENTERED=20110810
+         UPDATED=20110827
+           SHORT="some juicy fonts"
+
 cat << EOF
-Some fonts released under GPL.
+Some juicy fonts
 EOF
diff --git a/fonts/sjfonts/POST_INSTALL b/fonts/sjfonts/POST_INSTALL
index eb047dd..50d758d 100644
--- a/fonts/sjfonts/POST_INSTALL
+++ b/fonts/sjfonts/POST_INSTALL
@@ -1,2 +1,9 @@
-message "Running fc-cache please be patient" &&
-fc-cache -f 
+cd /usr/share/fonts/sjfonts
+rm -f fonts.scale fonts.dir fonts.cache*
+mkfontscale
+mkfontdir
+message "${MESSAGE_COLOR}Running fc-cache please be patient${DEFAULT_COLOR}"
+fc-cache -f
+if [ -x xset ]; then
+ xset fp rehash
+fi
diff --git a/fonts/sjfonts/POST_REMOVE b/fonts/sjfonts/POST_REMOVE
new file mode 100644
index 0000000..68cbd35
--- /dev/null
+++ b/fonts/sjfonts/POST_REMOVE
@@ -0,0 +1 @@
+rm -rf /usr/share/fonts/sjfonts
diff --git a/fonts/sjfonts/PRE_BUILD b/fonts/sjfonts/PRE_BUILD
index 75473a2..3973b99 100644
--- a/fonts/sjfonts/PRE_BUILD
+++ b/fonts/sjfonts/PRE_BUILD
@@ -1,3 +1,4 @@
-mk_source_dir        &&
+validate_source_dir $SOURCE_DIRECTORY   &&
+mk_source_dir $SOURCE_DIRECTORY         &&
 cd $SOURCE_DIRECTORY &&
-unpack $SOURCE       
+unpack $SOURCE