From 19af3c6c49b2b6748bc08e33c1614a0d3d96ab46 Mon Sep 17 00:00:00 2001
From: inv <inv@opencascade.com>
Date: Tue, 3 Apr 2012 16:49:27 +0000
Subject: [PATCH] SALOME 6.5.0 preparation: update script for freetype (2.3.7)

---
 config_CentOS_5.5_64bit.xml                   |  2 +-
 config_Debian_4.0.xml                         |  2 +-
 config_Debian_4.0_64bit.xml                   |  2 +-
 config_Debian_5.0_64bit.xml                   |  2 +-
 config_Debian_6.0_64bit.xml                   |  2 +-
 config_Mandriva_2008.0.xml                    |  2 +-
 config_Mandriva_2008.0_64bit.xml              |  2 +-
 config_Mandriva_2010.0.xml                    |  2 +-
 config_Mandriva_2010.0_64bit.xml              |  2 +-
 config_Red_Hat_Enterprise_WS_4_64bit.xml      |  2 +-
 config_Scientific_SL_5.1_64bit.xml            |  2 +-
 .../{freetype-2.3.7.sh => freetype.sh}        | 25 +++++++++++--------
 12 files changed, 26 insertions(+), 21 deletions(-)
 rename config_files/{freetype-2.3.7.sh => freetype.sh} (83%)

diff --git a/config_CentOS_5.5_64bit.xml b/config_CentOS_5.5_64bit.xml
index 36f0802..55d5aff 100755
--- a/config_CentOS_5.5_64bit.xml
+++ b/config_CentOS_5.5_64bit.xml
@@ -444,7 +444,7 @@
                     version="2.3.7" 
 		    disable="false"
 		    installdiskspace="86460,273932,478152"
-		    script="freetype-2.3.7.sh"/>
+		    script="freetype.sh"/>
     </product>
     <product name="ftgl"
 	     type="prerequisite"
diff --git a/config_Debian_4.0.xml b/config_Debian_4.0.xml
index ae42fa6..076be29 100755
--- a/config_Debian_4.0.xml
+++ b/config_Debian_4.0.xml
@@ -444,7 +444,7 @@
                     version="2.3.7" 
 		    disable="false"
 		    installdiskspace="86460,273932,478152"
-		    script="freetype-2.3.7.sh"/>
+		    script="freetype.sh"/>
     </product>
     <product name="ftgl"
 	     type="prerequisite"
diff --git a/config_Debian_4.0_64bit.xml b/config_Debian_4.0_64bit.xml
index 6a2904e..05f0c7d 100755
--- a/config_Debian_4.0_64bit.xml
+++ b/config_Debian_4.0_64bit.xml
@@ -444,7 +444,7 @@
                     version="2.3.7" 
 		    disable="false"
 		    installdiskspace="86460,273932,478152"
-		    script="freetype-2.3.7.sh"/>
+		    script="freetype.sh"/>
     </product>
     <product name="ftgl"
 	     type="prerequisite"
diff --git a/config_Debian_5.0_64bit.xml b/config_Debian_5.0_64bit.xml
index 21133f7..455ebdb 100755
--- a/config_Debian_5.0_64bit.xml
+++ b/config_Debian_5.0_64bit.xml
@@ -444,7 +444,7 @@
                     version="2.3.7" 
 		    disable="false"
 		    installdiskspace="86460,273932,478152"
-		    script="freetype-2.3.7.sh"/>
+		    script="freetype.sh"/>
     </product>
     <product name="ftgl"
 	     type="prerequisite"
diff --git a/config_Debian_6.0_64bit.xml b/config_Debian_6.0_64bit.xml
index be01137..2411c1b 100755
--- a/config_Debian_6.0_64bit.xml
+++ b/config_Debian_6.0_64bit.xml
@@ -444,7 +444,7 @@
                     version="2.3.7" 
 		    disable="false"
 		    installdiskspace="86460,273932,478152"
-		    script="freetype-2.3.7.sh"/>
+		    script="freetype.sh"/>
     </product>
     <product name="ftgl"
 	     type="prerequisite"
diff --git a/config_Mandriva_2008.0.xml b/config_Mandriva_2008.0.xml
index ffd5efa..f90277f 100755
--- a/config_Mandriva_2008.0.xml
+++ b/config_Mandriva_2008.0.xml
@@ -444,7 +444,7 @@
                     version="2.3.7" 
 		    disable="false"
 		    installdiskspace="86460,273932,478152"
-		    script="freetype-2.3.7.sh"/>
+		    script="freetype.sh"/>
     </product>
     <product name="ftgl"
 	     type="prerequisite"
diff --git a/config_Mandriva_2008.0_64bit.xml b/config_Mandriva_2008.0_64bit.xml
index 7330761..8808657 100755
--- a/config_Mandriva_2008.0_64bit.xml
+++ b/config_Mandriva_2008.0_64bit.xml
@@ -444,7 +444,7 @@
                     version="2.3.7" 
 		    disable="false"
 		    installdiskspace="86460,273932,478152"
-		    script="freetype-2.3.7.sh"/>
+		    script="freetype.sh"/>
     </product>
     <product name="ftgl"
 	     type="prerequisite"
diff --git a/config_Mandriva_2010.0.xml b/config_Mandriva_2010.0.xml
index bf8db0d..7337041 100755
--- a/config_Mandriva_2010.0.xml
+++ b/config_Mandriva_2010.0.xml
@@ -444,7 +444,7 @@
                     version="2.3.7" 
 		    disable="false"
 		    installdiskspace="86460,273932,478152"
-		    script="freetype-2.3.7.sh"/>
+		    script="freetype.sh"/>
     </product>
     <product name="ftgl"
 	     type="prerequisite"
diff --git a/config_Mandriva_2010.0_64bit.xml b/config_Mandriva_2010.0_64bit.xml
index fa3e771..101a5fd 100755
--- a/config_Mandriva_2010.0_64bit.xml
+++ b/config_Mandriva_2010.0_64bit.xml
@@ -444,7 +444,7 @@
                     version="2.3.7" 
 		    disable="false"
 		    installdiskspace="86460,273932,478152"
-		    script="freetype-2.3.7.sh"/>
+		    script="freetype.sh"/>
     </product>
     <product name="ftgl"
 	     type="prerequisite"
diff --git a/config_Red_Hat_Enterprise_WS_4_64bit.xml b/config_Red_Hat_Enterprise_WS_4_64bit.xml
index e677ef0..9e177cf 100755
--- a/config_Red_Hat_Enterprise_WS_4_64bit.xml
+++ b/config_Red_Hat_Enterprise_WS_4_64bit.xml
@@ -444,7 +444,7 @@
                     version="2.3.7" 
 		    disable="false"
 		    installdiskspace="86460,273932,478152"
-		    script="freetype-2.3.7.sh"/>
+		    script="freetype.sh"/>
     </product>
     <product name="ftgl"
 	     type="prerequisite"
diff --git a/config_Scientific_SL_5.1_64bit.xml b/config_Scientific_SL_5.1_64bit.xml
index 8ccd440..fa08bb3 100755
--- a/config_Scientific_SL_5.1_64bit.xml
+++ b/config_Scientific_SL_5.1_64bit.xml
@@ -444,7 +444,7 @@
                     version="2.3.7" 
 		    disable="false"
 		    installdiskspace="86460,273932,478152"
-		    script="freetype-2.3.7.sh"/>
+		    script="freetype.sh"/>
     </product>
     <product name="ftgl"
 	     type="prerequisite"
diff --git a/config_files/freetype-2.3.7.sh b/config_files/freetype.sh
similarity index 83%
rename from config_files/freetype-2.3.7.sh
rename to config_files/freetype.sh
index 9993c87..b852bc5 100755
--- a/config_files/freetype-2.3.7.sh
+++ b/config_files/freetype.sh
@@ -1,28 +1,33 @@
 #!/bin/bash -noprofile
 
 ####################################################################################
-#  File      : freetype-2.3.7.sh
+#  File      : freetype.sh
 #  Created   : Thu Dec 18 12:01:00 2002
 #  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
 #  Project   : SALOME
 #  Module    : Installation Wizard
-#  Copyright : 2002-2008 CEA
+#  Copyright : 2002-2012 CEA
 #
 #  This script is the part of the SALOME installation procedure.
 #
 ####################################################################################
 
-FREETYPE_REF_VERSION="2.3.7"
+#
+# freetype version
+#
+FREETYPE_VERSION=2.3.7
 
 check_version()
 {
 # check existance of freetype and its version
-if [ -n ${FREETYPEDIR} ]; then
-  return 0
-fi
-ver=`${PRODUCT_SRC_DIR}/configure --version | grep "FreeType configure" | awk '{ print $3}'`
-if [ "$ver" == "${FREETYPE_REF_VERSION}" ] ; then
-    return 0
+if [ "${FREETYPEDIR}" != "" ] && [ -f ${FREETYPEDIR}/include/freetype2/freetype/freetype.h ] ; then
+    ver_major=`grep "#define FREETYPE_MAJOR" ${FREETYPEDIR}/include/freetype2/freetype/freetype.h | awk '{print $3}'`
+    ver_minor=`grep "#define FREETYPE_MINOR" ${FREETYPEDIR}/include/freetype2/freetype/freetype.h | awk '{print $3}'`
+    ver_maint=`grep "#define FREETYPE_PATCH" ${FREETYPEDIR}/include/freetype2/freetype/freetype.h | awk '{print $3}'`
+    ver="$ver_major.$ver_minor.$ver_maint"
+    if [ "$ver" == "${FREETYPE_VERSION}" ] ; then
+        return 0
+    fi
 fi
 return 1
 }
@@ -132,7 +137,7 @@ export INSTALL_PRODUCTS=$7;
 shift
 REMOVE_SRC_TMP=$8;
 test $# == 10 && shift && SINGLE_DIR=$9
-export PRODUCT="freetype-${FREETYPE_REF_VERSION}"
+export PRODUCT="freetype-${FREETYPE_VERSION}"
 export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT}_SRC
-- 
2.39.2