[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (2b49b7ed001e130defaf3940d0f7c9dc8172d62c)

Treeve Jelbert scm at sourcemage.org
Sun Oct 12 14:15:00 EDT 2008


GIT changes to master grimoire by Treeve Jelbert <treeve at sourcemage.org>:

 database/firebird/BUILD            |   13 +++++++------
 database/firebird/HISTORY          |    6 ++++++
 database/firebird/PRE_BUILD        |    2 +-
 database/firebird/configs          |    6 +++---
 database/firebird/excluded         |    2 +-
 database/firebird/init.d/firebird2 |    4 ++--
 database/firebird/volatiles        |    6 +++---
 database/firebird/xinetd/firebird  |    2 +-
 database/hk_classes/DEPENDS        |    2 +-
 database/hk_classes/HISTORY        |    3 +++
 database/libdbi-drivers/DEPENDS    |    2 +-
 database/libdbi-drivers/HISTORY    |    3 +++
 database/libinterbasexx/HISTORY    |    3 +++
 database/tokyocabinet/DETAILS      |    4 ++--
 database/tokyocabinet/HISTORY      |    3 +++
 gnome2-libs/libgda2/DEPENDS        |    2 +-
 gnome2-libs/libgda2/HISTORY        |    3 +++
 gnome2-libs/libgda3/DEPENDS        |    2 +-
 gnome2-libs/libgda3/HISTORY        |    3 +++
 odbc-drivers/odbcjdbc/HISTORY      |    3 +++
 odbc-drivers/odbcjdbc/fix.diff     |   29 +++++++++--------------------
 php-pear/php-dev/DEPENDS           |    2 +-
 php-pear/php-dev/HISTORY           |    3 +++
 php-pear/php/DEPENDS               |    2 +-
 php-pear/php/HISTORY               |    3 +++
 x11-toolkits/qt-embedded/DEPENDS   |    4 ++--
 x11-toolkits/qt-embedded/HISTORY   |    3 +++
 x11-toolkits/qt-x11/DEPENDS        |    4 ++--
 x11-toolkits/qt-x11/HISTORY        |    3 +++
 x11-toolkits/qt4/DEPENDS           |    4 ++--
 x11-toolkits/qt4/HISTORY           |    3 +++
 x11/quasar/DEPENDS                 |    2 +-
 x11/quasar/HISTORY                 |    3 +++
 33 files changed, 87 insertions(+), 52 deletions(-)

New commits:
commit 894c5f3a4479c96dc5952d4df3633c27f9438a5d
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    "tokyocabinet-1.3.12"

commit 884a1b3accf40766cac4c6c4a40cef9b3d9ac8d8
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    quasar - firebird has moved

commit 65f4856f7e73cae941f9aa6f900c3b2dbef08c39
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    php - firebird has moved

commit 52fea62ea50ce4a94f38b06de79638b5b45a5eb7
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    php-dev - firebird has moved

commit c3e79f2b700b9857bbdd19bbbc1282984e097ed8
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    odbcjdbc - firebird has moved

commit ec420f1cd6bdd6eebb9f5baa431feed7627f482b
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    libgda3 - firebird has moved

commit f04d860c0531ea1be7082f1fc195c055c2f6eaff
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    libgda2 - firebird has moved

commit 65db0288acab32c35f0211233bdc9660763f0958
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    libinterbasexx - firebird has moved

commit 31fa4ea6bc9e092d4946182e563615591f1b2633
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    libdbi-drivers - firebird has moved

commit 63524fa1650effbcd7dacb030c526a71a26d8121
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    hk_classes - firebird has moved

commit 6cdb66230d0ff35434bfcdd30b1dd4e7c03f86af
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    qt-embedded - firebird has moved

commit 6b6ad38f064b101d84cc5e4ae391e33be6159910
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    qt-x11 - firebird has moved

commit 52074ea1f5fd7e9e332223b6b515cbbdc525b6fc
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    qt4 - firebird has moved

commit dd0e3308d95dc1b37c547b7b9c5e18adc3230bad
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    firebird - move to /opt/firebird

diff --git a/database/firebird/BUILD b/database/firebird/BUILD
index 7484807..52b6b17 100755
--- a/database/firebird/BUILD
+++ b/database/firebird/BUILD
@@ -1,6 +1,6 @@
   local FF DB LL                                &&
   persistent_add FB_PREFIX                      &&
-  FB_PREFIX=${INSTALL_ROOT}/usr/firebird        &&
+  FB_PREFIX=${INSTALL_ROOT}/opt/firebird        &&
   OPTS="${OPTS} ${FB_SS}"                       &&
 if [[ $$FB_VER == 2.0 ]];then
   if spell_ok icu; then
@@ -19,10 +19,10 @@ fi                                              &&
   done                                          &&
   OPTS="${OPTS} ${FB_STAT}"                     &&
   LDFLAGS="$LDFLAGS -lpthread"                  &&
-
-  ./configure 				                        \
-	--prefix=$FB_PREFIX 		                     \
-	$OPTS					                           &&
+  make_single                                   &&
+  ./configure                                    \
+	--prefix=$FB_PREFIX                      \
+	$OPTS                                   &&
 if [[ $FB_CLIENT == n ]]; then
   make                                          &&
   cd $SOURCE_DIRECTORY/gen/firebird             &&
@@ -57,4 +57,5 @@ else
   make -f Makefile.client.isql                  
 # probably need to build gbak and then restore messages and help fdb
 #  make -f Makefile.client.gbak 
-fi
+fi  &&
+make_normal
diff --git a/database/firebird/HISTORY b/database/firebird/HISTORY
index ebf9ded..003919b 100644
--- a/database/firebird/HISTORY
+++ b/database/firebird/HISTORY
@@ -1,3 +1,9 @@
+2008-10-12 Treeve Jelbert <treeve at sourcemage.org>
+	* BUILD, init.d/firebird2, volatiles, configs, excluded,
+	  xinetd/firebird:  now install to /opt/firebird
+	* BUILD: add make_single
+	* DETAILS: PATCHLEVEL=1
+
 2008-09-27 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: make 2.1 the default version
 
diff --git a/database/firebird/PRE_BUILD b/database/firebird/PRE_BUILD
index f4b4318..21f9d67 100755
--- a/database/firebird/PRE_BUILD
+++ b/database/firebird/PRE_BUILD
@@ -9,7 +9,7 @@
   cd $SOURCE_DIRECTORY                   &&
 
 # at present the build only works for everything in one directory
-# tree /usr/firebird
+# tree /opt/firebird
 
 # remove supplied ICU & editline packages
   rm -rf extern                            &&
diff --git a/database/firebird/configs b/database/firebird/configs
index 3319596..dffac13 100644
--- a/database/firebird/configs
+++ b/database/firebird/configs
@@ -1,3 +1,3 @@
-^/usr/firebird/aliases.conf$
-^/usr/firebird/firebird.conf$
-^/usr/firebird/intl/fbintl.conf$
+^/opt/firebird/aliases.conf$
+^/opt/firebird/firebird.conf$
+^/opt/firebird/intl/fbintl.conf$
diff --git a/database/firebird/excluded b/database/firebird/excluded
index ba810a4..b6c039b 100644
--- a/database/firebird/excluded
+++ b/database/firebird/excluded
@@ -1 +1 @@
-^/usr/firebird/.*fdb$
+^/opt/firebird/.*fdb$
diff --git a/database/firebird/init.d/firebird2 b/database/firebird/init.d/firebird2
index 96022a8..c24f60f 100755
--- a/database/firebird/init.d/firebird2
+++ b/database/firebird/init.d/firebird2
@@ -6,10 +6,10 @@
 # on system startup and shutdown to start the background
 # Firebird2  database Super server daemon 
 
-FB_DIR=/usr/firebird/bin
+FB_DIR=/opt/firebird/bin
 FB=fbserver
 #FB=/usr/firebird/bin/fbmgr.bin
-# as of rc2, preferred method of stoppng is to kill the pid
+# as of rc2, preferred method of stopping is to kill the pid
 RUND=/var/run/firebird
 PID=$RUND/`basename $0`.pid
 
diff --git a/database/firebird/volatiles b/database/firebird/volatiles
index 3319596..dffac13 100644
--- a/database/firebird/volatiles
+++ b/database/firebird/volatiles
@@ -1,3 +1,3 @@
-^/usr/firebird/aliases.conf$
-^/usr/firebird/firebird.conf$
-^/usr/firebird/intl/fbintl.conf$
+^/opt/firebird/aliases.conf$
+^/opt/firebird/firebird.conf$
+^/opt/firebird/intl/fbintl.conf$
diff --git a/database/firebird/xinetd/firebird b/database/firebird/xinetd/firebird
index eaee292..53d0cd5 100755
--- a/database/firebird/xinetd/firebird
+++ b/database/firebird/xinetd/firebird
@@ -13,6 +13,6 @@ service gds_db
 	user			= firebird
 	log_on_success		+= USERID
 	log_on_failure 		+= USERID
-	server			= /usr/firebird/bin/fb_inet_server
+	server			= /opt/firebird/bin/fb_inet_server
     disable         = no
 }
diff --git a/database/hk_classes/DEPENDS b/database/hk_classes/DEPENDS
index dfcd1a1..04a3aa1 100755
--- a/database/hk_classes/DEPENDS
+++ b/database/hk_classes/DEPENDS
@@ -6,7 +6,7 @@ optional_depends  ODBC-MGR               \
                   "ODBC database manager"  &&
 
 optional_depends  firebird               \
-                  "--with-firebird-dir=/usr/firebird" \
+                  "--with-firebird-dir=/opt/firebird" \
                   "--without-firebird"   \
                   "database engine"      &&
 
diff --git a/database/hk_classes/HISTORY b/database/hk_classes/HISTORY
index 0519511..64a4de3 100755
--- a/database/hk_classes/HISTORY
+++ b/database/hk_classes/HISTORY
@@ -1,3 +1,6 @@
+2008-10-12 Treeve Jelbert <treeve at sourcemage.org>
+	* DEPENDS: firebird is now in /opt/firebird
+
 2006-12-17 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 0.8.3
 
diff --git a/database/libdbi-drivers/DEPENDS b/database/libdbi-drivers/DEPENDS
index c323633..00d754c 100755
--- a/database/libdbi-drivers/DEPENDS
+++ b/database/libdbi-drivers/DEPENDS
@@ -1,6 +1,6 @@
 depends libdbi		&&
 optional_depends "firebird" \
-                 "--with-firebird --with-firebird-dir=/usr/firebird" \
+                 "--with-firebird --with-firebird-dir=/opt/firebird" \
                  "--without-firebird" \
                  "database support"  &&
 optional_depends "postgresql" \
diff --git a/database/libdbi-drivers/HISTORY b/database/libdbi-drivers/HISTORY
index 0d0d574..116e07f 100755
--- a/database/libdbi-drivers/HISTORY
+++ b/database/libdbi-drivers/HISTORY
@@ -1,3 +1,6 @@
+2008-10-12 Treeve Jelbert <treeve at sourcemage.org>
+	* DEPENDS: firebird has moved
+
 2008-03-04 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 0.8.3-1
 
diff --git a/database/libinterbasexx/HISTORY b/database/libinterbasexx/HISTORY
index 5170af0..6e121d6 100755
--- a/database/libinterbasexx/HISTORY
+++ b/database/libinterbasexx/HISTORY
@@ -1,3 +1,6 @@
+2008-10-12 Treeve Jelbert <treeve at sourcemage.org>
+	* BUILD: firebird is now at /opt/firebird
+
 2006-10-03 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed UPDATED.
 
diff --git a/database/tokyocabinet/DETAILS b/database/tokyocabinet/DETAILS
index c2cb4f9..e87d9de 100755
--- a/database/tokyocabinet/DETAILS
+++ b/database/tokyocabinet/DETAILS
@@ -1,6 +1,6 @@
            SPELL=tokyocabinet
-         VERSION=1.3.10
-     SOURCE_HASH=sha512:07254b9810bee2c3e501e2984c61f2f58345c52779ddbe48236895b4dfaf628902ede75b1fd8aa1850c04b28ec48238e0273d353da3ea306a5734012b3119647
+         VERSION=1.3.12
+     SOURCE_HASH=sha512:db36be3d9035b4a8fcd238ff243358f298ab1dbe84ff1bc398166a0a885ce81507d341c250cfd0167b7d134010d0670e50f7f3c03d845626657cbc39cb76d2ae
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://$SPELL.sf.net/$SOURCE
diff --git a/database/tokyocabinet/HISTORY b/database/tokyocabinet/HISTORY
index 1bd3de3..625ff02 100644
--- a/database/tokyocabinet/HISTORY
+++ b/database/tokyocabinet/HISTORY
@@ -1,3 +1,6 @@
+2008-10-12 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 1.3.12
+
 2008-09-21 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 1.3.10
 
diff --git a/gnome2-libs/libgda2/DEPENDS b/gnome2-libs/libgda2/DEPENDS
index ff5def3..a9e3e6c 100755
--- a/gnome2-libs/libgda2/DEPENDS
+++ b/gnome2-libs/libgda2/DEPENDS
@@ -29,7 +29,7 @@ optional_depends  xbase                             \
                   "Enable Xbase DB Support"         &&
 
 optional_depends  firebird                          \
-                  "--with-firebird=/usr/firebird"   \
+                  "--with-firebird=/opt/firebird"   \
                   "--without-firebird"              \
                   "Enable Firebird DB Support"      &&
 
diff --git a/gnome2-libs/libgda2/HISTORY b/gnome2-libs/libgda2/HISTORY
index 711a9e4..b1b1d5d 100644
--- a/gnome2-libs/libgda2/HISTORY
+++ b/gnome2-libs/libgda2/HISTORY
@@ -1,3 +1,6 @@
+2008-10-12 Treeve Jelbert <treeve at sourcemage.org>
+	* DEPENDS: firebird has moved
+
 2008-04-19 Robin Cook <rcook at wyrms.net>
 	* CONFLICTS: removed
 
diff --git a/gnome2-libs/libgda3/DEPENDS b/gnome2-libs/libgda3/DEPENDS
index 43b53c2..24ee772 100755
--- a/gnome2-libs/libgda3/DEPENDS
+++ b/gnome2-libs/libgda3/DEPENDS
@@ -29,7 +29,7 @@ optional_depends  xbase                                  \
                   "Enable Xbase DB Support"              &&
 
 optional_depends  firebird                               \
-                  "--with-firebird=/usr/firebird"        \
+                  "--with-firebird=/opt/firebird"        \
                   "--without-firebird"                   \
                   "Enable Firebird DB Support"           &&
 
diff --git a/gnome2-libs/libgda3/HISTORY b/gnome2-libs/libgda3/HISTORY
index dc261f6..1edcec8 100644
--- a/gnome2-libs/libgda3/HISTORY
+++ b/gnome2-libs/libgda3/HISTORY
@@ -1,3 +1,6 @@
+2008-10-12 Treeve Jelbert <treeve at sourcemage.org>
+	* DEPENDS: firebird has moved
+
 2008-04-19 Robin Cook <rcook at wyrms.net>
 	* DETAILS: updated VERSION to 3.1.4
 	* CONFLICTS: removed
diff --git a/odbc-drivers/odbcjdbc/HISTORY b/odbc-drivers/odbcjdbc/HISTORY
index 6cfb1b5..8afcc5e 100644
--- a/odbc-drivers/odbcjdbc/HISTORY
+++ b/odbc-drivers/odbcjdbc/HISTORY
@@ -1,3 +1,6 @@
+2008-10-12 Treeve Jelbert <treeve at sourcemage.org>
+	* fix.diff: firebird has moved
+
 2006-11-03 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 2.0.0144
 	* fix.diff: don't patch makefile.environ
diff --git a/odbc-drivers/odbcjdbc/fix.diff b/odbc-drivers/odbcjdbc/fix.diff
index b5121be..abede73 100644
--- a/odbc-drivers/odbcjdbc/fix.diff
+++ b/odbc-drivers/odbcjdbc/fix.diff
@@ -1,25 +1,14 @@
 diff -uNr ODBC_V2-0-BETA/OdbcJdbc/Builds/Gcc.lin/makefile.linux ODBC_V2-0-BETA.cp/OdbcJdbc/Builds/Gcc.lin/makefile.linux
 --- ODBC_V2-0-BETA/OdbcJdbc/Builds/Gcc.lin/makefile.linux	2006-07-03 15:10:00.000000000 +0200
 +++ ODBC_V2-0-BETA.cp/OdbcJdbc/Builds/Gcc.lin/makefile.linux	2006-07-03 22:10:28.000000000 +0200
-@@ -55,8 +55,8 @@
- INCLUDEDIR      := -I/opt/interbase/include -I/usr/include/odbc $(INCLUDEDIR)
- EXTLIBDIR       := -L/opt/interbase/lib -L/usr/lib/unixODBC $(EXTLIBDIR)
- else
--INCLUDEDIR      = -I/opt/firebird/include -I/usr/include/odbc
--EXTLIBDIR       := -L/opt/firebird/lib -L/usr/lib/unixODBC $(EXTLIBDIR)
-+INCLUDEDIR      = -I/usr/firebird/include -I/usr/include/odbc
-+EXTLIBDIR       := -L/usr/firebird/lib -L/usr/lib/unixODBC $(EXTLIBDIR)
- endif
- #
- 
 @@ -75,8 +75,9 @@
- LIST_ODBCJDBCSETUPSRC	= $(addprefix $(ODBCJDBCDIR)/, $(ODBCJDBCSETUPSRC_LINUX))
- LIST_ODBCJDBCSETUPOBJ	= $(addprefix $(BUILDDIR)/, $(ODBCJDBCSETUPSRC_LINUX:.cpp=.o))
- #
--COMPFLAGS	= -g -w -D_REENTRANT -D_PTHREADS -DEXTERNAL -D$(ODBCMANAGER) $(INCLUDEDIR) -I$(FBINCDIR)
-+COMPFLAGS	= -DPIC -fPIC $(CFLAGS) -w -D_REENTRANT -D_PTHREADS -DEXTERNAL -D$(ODBCMANAGER) $(INCLUDEDIR) -I$(FBINCDIR)
- #
+ LIST_ODBCJDBCSETUPSRC	= $(addprefix $(ODBCJDBCDIR)/, $(ODBCJDBCSETUPSRC_LINUX))
+ LIST_ODBCJDBCSETUPOBJ	= $(addprefix $(BUILDDIR)/, $(ODBCJDBCSETUPSRC_LINUX:.cpp=.o))
+ #
+-COMPFLAGS	= -g -w -D_REENTRANT -D_PTHREADS -DEXTERNAL -D$(ODBCMANAGER) $(INCLUDEDIR) -I$(FBINCDIR)
++COMPFLAGS	= -DPIC -fPIC $(CFLAGS) -w -D_REENTRANT -D_PTHREADS -DEXTERNAL -D$(ODBCMANAGER) $(INCLUDEDIR) -I$(FBINCDIR)
+ #
 +
- #LINKFLAGS	= -rdynamic -export-dynamic -shared 
- LINKFLAGS	= -shared
- EXTLIBS		= $(EXTLIBDIR) -lcrypt -ldl
+ #LINKFLAGS	= -rdynamic -export-dynamic -shared 
+ LINKFLAGS	= -shared
+ EXTLIBS		= $(EXTLIBDIR) -lcrypt -ldl
diff --git a/php-pear/php-dev/DEPENDS b/php-pear/php-dev/DEPENDS
index 246329f..68ecad7 100755
--- a/php-pear/php-dev/DEPENDS
+++ b/php-pear/php-dev/DEPENDS
@@ -84,7 +84,7 @@ optional_depends  gettext                    \
                   "for GNU gettext support"  &&
 
 optional_depends firebird                      \
-                 '--with-pdo-firebird=/usr/firebird' \
+                 '--with-pdo-firebird=/opt/firebird' \
                  '--without-pdo-firebird'          \
                  'for native Firebird support' &&
 
diff --git a/php-pear/php-dev/HISTORY b/php-pear/php-dev/HISTORY
index 2c02559..39732ca 100644
--- a/php-pear/php-dev/HISTORY
+++ b/php-pear/php-dev/HISTORY
@@ -1,3 +1,6 @@
+2008-10-12 Treeve Jelbert <treeve at sourcemage.org>
+	* DEPENDS: firebird has moved
+
 2008-03-18 Eric Sandall <sandalle at sourcemage.org>
 	* DEPENDS: Switch X11-LIBS to the one and only xorg-libs
 	  No need to check if using modular X as that's all that's available now
diff --git a/php-pear/php/DEPENDS b/php-pear/php/DEPENDS
index 03e2cb0..1e2426c 100755
--- a/php-pear/php/DEPENDS
+++ b/php-pear/php/DEPENDS
@@ -72,7 +72,7 @@ optional_depends gettext \
                  "for GNU gettext support" &&
 
 optional_depends firebird \
-                 "--with-pdo-firebird=${INSTALL_ROOT}/usr/firebird" "--without-pdo-firebird" \
+                 "--with-pdo-firebird=${INSTALL_ROOT}/opt/firebird" "--without-pdo-firebird" \
                  "for native Firebird support" &&
 
 optional_depends unixodbc \
diff --git a/php-pear/php/HISTORY b/php-pear/php/HISTORY
index df6bc80..80e741a 100644
--- a/php-pear/php/HISTORY
+++ b/php-pear/php/HISTORY
@@ -27,6 +27,9 @@
 	* DETAILS: changed the SOURCE_URL for the suhosin patch
 	* PRE_BUILD: chmod 0755; changed SPOOL_DIRECTORY for SOURCE_CACHE
 
+2008-10-12 Treeve Jelbert <treeve at sourcemage.org>
+	* DEPENDS: firebird has moved
+
 2008-05-03 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 5.2.6, SECURITY_PATCH=7 [Bug 14506]
 
diff --git a/x11-toolkits/qt-embedded/DEPENDS b/x11-toolkits/qt-embedded/DEPENDS
index 4a291a3..2110aaa 100755
--- a/x11-toolkits/qt-embedded/DEPENDS
+++ b/x11-toolkits/qt-embedded/DEPENDS
@@ -32,8 +32,8 @@ optional_depends  stlport                \
                   "for stlport support"  &&
 
 optional_depends  firebird                                      \
-                  "-plugin-sql-ibase  -I/usr/firebird/include   \
-                   -L/usr/firebird/lib"                         \
+                  "-plugin-sql-ibase  -I/opt/firebird/include   \
+                   -L/opt/firebird/lib"                         \
                   ""                                            \
                   "for firebird database support"               &&
 
diff --git a/x11-toolkits/qt-embedded/HISTORY b/x11-toolkits/qt-embedded/HISTORY
index a119e09..288cf7b 100644
--- a/x11-toolkits/qt-embedded/HISTORY
+++ b/x11-toolkits/qt-embedded/HISTORY
@@ -1,3 +1,6 @@
+2008-10-12 Treeve Jelbert <treeve at sourcemage.org>
+	* DEPENDS: firebird has moved
+
 2007-06-17 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 3.3.8
 
diff --git a/x11-toolkits/qt-x11/DEPENDS b/x11-toolkits/qt-x11/DEPENDS
index fab57b6..9b92b7e 100755
--- a/x11-toolkits/qt-x11/DEPENDS
+++ b/x11-toolkits/qt-x11/DEPENDS
@@ -28,8 +28,8 @@ optional_depends  stlport                \
                   "for stlport support"  &&
 
 optional_depends  firebird                                      \
-                  "-plugin-sql-ibase  -I/usr/firebird/include   \
-                   -L/usr/firebird/lib -lfbclient"              \
+                  "-plugin-sql-ibase  -I/opt/firebird/include   \
+                   -L/opt/firebird/lib -lfbclient"              \
                   ""                                            \
                   "for firebird database support"               &&
 
diff --git a/x11-toolkits/qt-x11/HISTORY b/x11-toolkits/qt-x11/HISTORY
index 7f90e66..951c517 100644
--- a/x11-toolkits/qt-x11/HISTORY
+++ b/x11-toolkits/qt-x11/HISTORY
@@ -1,3 +1,6 @@
+2008-10-12 Treeve Jelbert <treeve at sourcemage.org>
+	DEPENDS: firebird has moved
+
 2008-03-18 Eric Sandall <sandalle at sourcemage.org>
 	* DEPENDS: Switch X11-LIBS to the one and only xorg-libs
 
diff --git a/x11-toolkits/qt4/DEPENDS b/x11-toolkits/qt4/DEPENDS
index 6908256..70aee6e 100755
--- a/x11-toolkits/qt4/DEPENDS
+++ b/x11-toolkits/qt4/DEPENDS
@@ -45,8 +45,8 @@ optional_depends  stlport                \
                   'for stlport support'  &&
 
 optional_depends  firebird                                                \
-                  "-plugin-sql-ibase  -I$INSTALL_ROOT/usr/firebird/include  \
-                   -L$INSTALL_ROOT/usr/firebird/lib"                      \
+                  "-plugin-sql-ibase  -I$INSTALL_ROOT/opt/firebird/include  \
+                   -L$INSTALL_ROOT/opt/firebird/lib"                      \
                   '-no-sql-ibase'                                         \
                   'for firebird database support'                         &&
 
diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index a65e703..53cbca3 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,6 @@
+2008-10-12 Treeve Jelbert <treeve at sourcemage.org>
+	* DEPENDS:  firebird is now in /opt/firebird
+
 2008-10-09 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
 	* DEPENDS: changed gstreamer to gst-plugins-base #14682
 
diff --git a/x11/quasar/DEPENDS b/x11/quasar/DEPENDS
index eb16b15..35caa6c 100755
--- a/x11/quasar/DEPENDS
+++ b/x11/quasar/DEPENDS
@@ -3,6 +3,6 @@ depends tk      &&
 depends tcl     &&
 depends qt-x11  &&
 depends icu     &&
-optional_depends firebird  "--with-firebird=/usr/firebird" "" "database" &&
+optional_depends firebird  "--with-firebird=/opt/firebird" "" "database" &&
 optional_depends postgresql "--with-postgresql" "" "database"
 
diff --git a/x11/quasar/HISTORY b/x11/quasar/HISTORY
index 71f3ddc..e9d642d 100644
--- a/x11/quasar/HISTORY
+++ b/x11/quasar/HISTORY
@@ -1,3 +1,6 @@
+2008-10-12 Treeve Jelbert <treeve at sourcemage.org>
+	* DEPENDS: firebird has moved
+
 2006-10-03 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed UPDATED.
 



More information about the SM-Commit mailing list