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/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 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-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