# we do this here, so that things are not tracked, as these files are
# constantly modified in normal use
-local FF FileName DB &&
+local FF FileName DB LCK &&
# log file
mkdir -p $INSTALL_ROOT/var/log/ &&
diff --git a/database/firebird/HISTORY b/database/firebird/HISTORY
index b361d74..6cd81ab 100644
--- a/database/firebird/HISTORY
+++ b/database/firebird/HISTORY
@@ -1,3 +1,12 @@
+2006-10-29 Treeve Jelbert <treeve AT pi.be>
+ * PRE_BUILD, PREPARE, DEPENDS, DETAILS:
+ make version 2.0 the default, adjust all relevant tests
+ * volatiles; add firebird.conf
+ add ${INSTALL_ROOT} to all entries
+ * FINAL: create lock files in /var/lock/firebird and use symlinks
+ * BUILD, PRE_INSTALL: more work for library only build
+ * CONFIGURE: activate client only install
+
2006-10-26 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* INSTALL: use TRACK_ROOT not INSTALL_ROOT when linking #9163
diff --git a/database/firebird/INSTALL b/database/firebird/INSTALL
index 9df3de6..e7d5bcd 100755
--- a/database/firebird/INSTALL
+++ b/database/firebird/INSTALL
@@ -1,7 +1,7 @@
-if [ $FB_CLIENT == n ]; then
+#if [ $FB_CLIENT == n ]; then
# install prebuilt tree
cp -ra $SOURCE_DIRECTORY/gen/buildroot/* /
-else
- message only install client library
+#else
+# message only install client library, header files and message database
-fi
+#fi
diff --git a/database/firebird/PREPARE b/database/firebird/PREPARE
index 318c183..633a749 100755
--- a/database/firebird/PREPARE
+++ b/database/firebird/PREPARE
@@ -7,12 +7,13 @@ cat <<EOF
After installing firebird, you should change the default password for the
SYSDBA user
by means of the script /usr/firebird/bin/changeDBAPassword.sh
EOF
-config_query_list FB_VER "which version to build?" stable devel
+config_query_list FB_VERX "which version to build?" new old
# warn of major changes
if spell_ok firebird;then
+ local FB_PREV
FB_PREV=`installed_version firebird | cut -d. -f-2`
- if [ $FB_PREV = 1.5 ] && [ $FB_VER != stable ];then
+ if [ $FB_PREV = 1.5 ] && [ $FB_VERX != old ];then
cat <<EOF
Firebird 2 includes ODS changes. So, backup anything you want to
keep, using gbak,
before uninstalling a previous Firebird version
diff --git a/database/firebird/PRE_BUILD b/database/firebird/PRE_BUILD
index ca88d64..61137ff 100755
--- a/database/firebird/PRE_BUILD
+++ b/database/firebird/PRE_BUILD
@@ -9,12 +9,12 @@ # remove supplied ICU & editline package
rm -rf extern &&
# fix for gcc4 and smgl issues
local PATCH &&
- case "$FB_VER" in
- devel)
- PATCH=fb2.patch.bz2
+ case "$FB_VERX" in
+ old)
+ PATCH=fb15.patch.bz2
;;
*)
- PATCH=fb15.patch.bz2
+ PATCH=fb2.patch.bz2
;;
esac &&
#apply patches
diff --git a/database/firebird/PRE_INSTALL b/database/firebird/PRE_INSTALL
index f65fb42..899d373 100755
--- a/database/firebird/PRE_INSTALL
+++ b/database/firebird/PRE_INSTALL
@@ -1,4 +1,6 @@
default_pre_install &&
+if [ $FB_CLIENT == n ]; then
+
local FF &&
cd $SOURCE_DIRECTORY/gen/buildroot/$FB_PREFIX &&
@@ -9,3 +11,4 @@ # preserve some existing files
rm $FF
fi
done
+fi
diff --git a/database/firebird/volatiles b/database/firebird/volatiles
index 3913611..58bd88e 100644
--- a/database/firebird/volatiles
+++ b/database/firebird/volatiles
@@ -1,3 +1,4 @@
-/usr/firebird/security2.fdb
-/usr/firebird/security.fdb
-/usr/firebird/aliases.conf
+${INSTALL_ROOT}/usr/firebird/security2.fdb
+${INSTALL_ROOT}/usr/firebird/security.fdb
+${INSTALL_ROOT}/usr/firebird/aliases.conf
+${INSTALL_ROOT}/usr/firebird/firebird.conf
[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (280e200e3cb49625363709b43d67972a5d6b4c3b),
Treeve Jelbert, 11/06/2006