From db3cb70c9ea1bbceadce9f0ead749d1fee9941eb Mon Sep 17 00:00:00 2001
From: inv <inv@opencascade.com>
Date: Wed, 4 Apr 2012 07:28:31 +0000
Subject: [PATCH 1/1] SALOME 6.5.0 preparation: update script for ftgl (2.1.2)

---
 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 +-
 config_files/{ftgl-2.1.2.sh => ftgl.sh}  | 35 ++++++++++--------------
 12 files changed, 25 insertions(+), 32 deletions(-)
 rename config_files/{ftgl-2.1.2.sh => ftgl.sh} (80%)

diff --git a/config_CentOS_5.5_64bit.xml b/config_CentOS_5.5_64bit.xml
index 36626e8..2855fe8 100755
--- a/config_CentOS_5.5_64bit.xml
+++ b/config_CentOS_5.5_64bit.xml
@@ -453,7 +453,7 @@
                     version="2.1.2" 
 		    disable="false"
 		    installdiskspace="86460,273932,478152"
-		    script="ftgl-2.1.2.sh"/>
+		    script="ftgl.sh"/>
     </product>
     <product name="freeimage"
 	     type="prerequisite"
diff --git a/config_Debian_4.0.xml b/config_Debian_4.0.xml
index f51ac0e..e648ead 100755
--- a/config_Debian_4.0.xml
+++ b/config_Debian_4.0.xml
@@ -453,7 +453,7 @@
                     version="2.1.2" 
 		    disable="false"
 		    installdiskspace="86460,273932,478152"
-		    script="ftgl-2.1.2.sh"/>
+		    script="ftgl.sh"/>
     </product>
     <product name="freeimage"
 	     type="prerequisite"
diff --git a/config_Debian_4.0_64bit.xml b/config_Debian_4.0_64bit.xml
index d728cc3..8f8a99c 100755
--- a/config_Debian_4.0_64bit.xml
+++ b/config_Debian_4.0_64bit.xml
@@ -453,7 +453,7 @@
                     version="2.1.2" 
 		    disable="false"
 		    installdiskspace="86460,273932,478152"
-		    script="ftgl-2.1.2.sh"/>
+		    script="ftgl.sh"/>
     </product>
     <product name="freeimage"
 	     type="prerequisite"
diff --git a/config_Debian_5.0_64bit.xml b/config_Debian_5.0_64bit.xml
index ac49a92..74ba246 100755
--- a/config_Debian_5.0_64bit.xml
+++ b/config_Debian_5.0_64bit.xml
@@ -453,7 +453,7 @@
                     version="2.1.2" 
 		    disable="false"
 		    installdiskspace="86460,273932,478152"
-		    script="ftgl-2.1.2.sh"/>
+		    script="ftgl.sh"/>
     </product>
     <product name="freeimage"
 	     type="prerequisite"
diff --git a/config_Debian_6.0_64bit.xml b/config_Debian_6.0_64bit.xml
index 1999675..9fed88d 100755
--- a/config_Debian_6.0_64bit.xml
+++ b/config_Debian_6.0_64bit.xml
@@ -453,7 +453,7 @@
                     version="2.1.2" 
 		    disable="false"
 		    installdiskspace="86460,273932,478152"
-		    script="ftgl-2.1.2.sh"/>
+		    script="ftgl.sh"/>
     </product>
     <product name="freeimage"
 	     type="prerequisite"
diff --git a/config_Mandriva_2008.0.xml b/config_Mandriva_2008.0.xml
index 81702fc..d5f81e0 100755
--- a/config_Mandriva_2008.0.xml
+++ b/config_Mandriva_2008.0.xml
@@ -453,7 +453,7 @@
                     version="2.1.2" 
 		    disable="false"
 		    installdiskspace="86460,273932,478152"
-		    script="ftgl-2.1.2.sh"/>
+		    script="ftgl.sh"/>
     </product>
     <product name="freeimage"
 	     type="prerequisite"
diff --git a/config_Mandriva_2008.0_64bit.xml b/config_Mandriva_2008.0_64bit.xml
index dc65fc4..28935a6 100755
--- a/config_Mandriva_2008.0_64bit.xml
+++ b/config_Mandriva_2008.0_64bit.xml
@@ -453,7 +453,7 @@
                     version="2.1.2" 
 		    disable="false"
 		    installdiskspace="86460,273932,478152"
-		    script="ftgl-2.1.2.sh"/>
+		    script="ftgl.sh"/>
     </product>
     <product name="freeimage"
 	     type="prerequisite"
diff --git a/config_Mandriva_2010.0.xml b/config_Mandriva_2010.0.xml
index 4000527..9136be0 100755
--- a/config_Mandriva_2010.0.xml
+++ b/config_Mandriva_2010.0.xml
@@ -453,7 +453,7 @@
                     version="2.1.2" 
 		    disable="false"
 		    installdiskspace="86460,273932,478152"
-		    script="ftgl-2.1.2.sh"/>
+		    script="ftgl.sh"/>
     </product>
     <product name="freeimage"
 	     type="prerequisite"
diff --git a/config_Mandriva_2010.0_64bit.xml b/config_Mandriva_2010.0_64bit.xml
index 795fc26..08ac83b 100755
--- a/config_Mandriva_2010.0_64bit.xml
+++ b/config_Mandriva_2010.0_64bit.xml
@@ -453,7 +453,7 @@
                     version="2.1.2" 
 		    disable="false"
 		    installdiskspace="86460,273932,478152"
-		    script="ftgl-2.1.2.sh"/>
+		    script="ftgl.sh"/>
     </product>
     <product name="freeimage"
 	     type="prerequisite"
diff --git a/config_Red_Hat_Enterprise_WS_4_64bit.xml b/config_Red_Hat_Enterprise_WS_4_64bit.xml
index ba884ba..3cc6cfa 100755
--- a/config_Red_Hat_Enterprise_WS_4_64bit.xml
+++ b/config_Red_Hat_Enterprise_WS_4_64bit.xml
@@ -453,7 +453,7 @@
                     version="2.1.2" 
 		    disable="false"
 		    installdiskspace="86460,273932,478152"
-		    script="ftgl-2.1.2.sh"/>
+		    script="ftgl.sh"/>
     </product>
     <product name="freeimage"
 	     type="prerequisite"
diff --git a/config_Scientific_SL_5.1_64bit.xml b/config_Scientific_SL_5.1_64bit.xml
index 0e7f149..4367064 100755
--- a/config_Scientific_SL_5.1_64bit.xml
+++ b/config_Scientific_SL_5.1_64bit.xml
@@ -453,7 +453,7 @@
                     version="2.1.2" 
 		    disable="false"
 		    installdiskspace="86460,273932,478152"
-		    script="ftgl-2.1.2.sh"/>
+		    script="ftgl.sh"/>
     </product>
     <product name="freeimage"
 	     type="prerequisite"
diff --git a/config_files/ftgl-2.1.2.sh b/config_files/ftgl.sh
similarity index 80%
rename from config_files/ftgl-2.1.2.sh
rename to config_files/ftgl.sh
index 093c5c4..fe32a74 100755
--- a/config_files/ftgl-2.1.2.sh
+++ b/config_files/ftgl.sh
@@ -1,30 +1,26 @@
 #!/bin/bash -noprofile
 
 ####################################################################################
-#  File      : ftgl-2.1.2.sh
+#  File      : ftgl.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.
 #
 ####################################################################################
 
-FTGL_REF_VERSION="2.1.2"
+#
+# ftgl version
+#
+FTGL_VERSION=2.1.2
 
 check_version()
 {
-# check existance of FTGL and its version
-if [ -n ${FTGLDIR} ]; then
-  return 0
-fi
-ver=`${PRODUCT_SRC_DIR}/configure --version | grep "FTGL configure" | awk '{ print $3}'`
-if [ "$ver" == "${FTGL_REF_VERSION}" ] ; then
-    return 0
-fi
-return 1
+# no way to check version
+return 0
 }
 
 print_env_bin()
@@ -86,12 +82,12 @@ FTGL_CONFIGURE_OPTIONS="${FTGL_CONFIGURE_OPTIONS} --with-freetype-prefix=${FREET
 FTGL_CONFIGURE_OPTIONS="${FTGL_CONFIGURE_OPTIONS} --with-gl-inc=/usr/include"
 
 if test `uname -m` = "x86_64" ; then
-FTGL_CONFIGURE_OPTIONS="${FTGL_CONFIGURE_OPTIONS} --with-gl-lib=/usr/lib64"
+    FTGL_CONFIGURE_OPTIONS="${FTGL_CONFIGURE_OPTIONS} --with-gl-lib=/usr/lib64"
 else
-FTGL_CONFIGURE_OPTIONS="${FTGL_CONFIGURE_OPTIONS} --with-gl-lib=/usr/lib"
+    FTGL_CONFIGURE_OPTIONS="${FTGL_CONFIGURE_OPTIONS} --with-gl-lib=/usr/lib"
 fi
 
-#congigure
+# congigure
 check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure ${FTGL_CONFIGURE_OPTIONS}
 
 # compile
@@ -123,16 +119,13 @@ check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR}
 
 ### modifing la files
 cd ${PRODUCT_DIR}/lib
-sed -e 's%\(.*\)\([[:space:]].*libfreetype.la\)\(.*\)%\1 -lfreetype\3%g' \
-    -e "s%^libdir='\(.*\)'%libdir='${PRODUCT_DIR}/lib'%g" libftgl.la > libftgl.la.new
-mv -f libftgl.la.new libftgl.la
+sed -i "s%\(.*\)\([[:space:]].*libfreetype.la\)\(.*\)%\1 -lfreetype\3%g;s%^libdir='\(.*\)'%libdir='${PRODUCT_DIR}/lib'%g" libftgl.la
 
 tmp=""
 if [ -n "${FREETYPEDIR}" ]; then
     tmp="-L${FREETYPEDIR}/lib"
 fi
-sed -e "s%\(.*\)\([[:space:]].*-L.*/freetype-[0-9]\.[0-9]\.[0-9]/lib[[:space:]]\)\(.*\)%\1 $tmp \3%g" libftgl.la > libftgl.la.new
-mv -f libftgl.la.new libftgl.la
+sed -i "s%\(.*\)\([[:space:]].*-L.*/freetype-[0-9]\.[0-9]\.[0-9]/lib[[:space:]]\)\(.*\)%\1 $tmp \3%g" libftgl.la
 
 # to generate environment script for sources
 try_preinstalled
@@ -148,7 +141,7 @@ export INSTALL_PRODUCTS=$7;
 shift
 REMOVE_SRC_TMP=$8;
 test $# == 10 && shift && SINGLE_DIR=$9
-export PRODUCT="ftgl-${FTGL_REF_VERSION}"
+export PRODUCT="ftgl-${FTGL_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