diff options
author | William Thomson <wltjr@gentoo.org> | 2007-12-04 23:59:55 +0000 |
---|---|---|
committer | William Thomson <wltjr@gentoo.org> | 2007-12-04 23:59:55 +0000 |
commit | 001e85db7f627ae7e30f6d56cacea786395f2461 (patch) | |
tree | 4e6c4d3f90acdbd7d5b2f444581882a05ee480d7 /dev-db | |
parent | Stable for HPPA (bug #201249). (diff) | |
download | historical-001e85db7f627ae7e30f6d56cacea786395f2461.tar.gz historical-001e85db7f627ae7e30f6d56cacea786395f2461.tar.bz2 historical-001e85db7f627ae7e30f6d56cacea786395f2461.zip |
Switched from patches to sed for path changes w/ sed checks via function. Moved core from /usr/share/firebird -> /usr/lib/firebird since it contains arch specific binaries, per FHS. Renamed isql -> fbsql per bug #198388. Fixed missing path tweak for bug #198540. Removed past versions, should be all folks :)
Package-Manager: portage-2.1.4_rc4
Diffstat (limited to 'dev-db')
-rw-r--r-- | dev-db/firebird/ChangeLog | 17 | ||||
-rw-r--r-- | dev-db/firebird/Manifest | 48 | ||||
-rw-r--r-- | dev-db/firebird/files/digest-firebird-2.0.3.12981.0-r4 (renamed from dev-db/firebird/files/digest-firebird-2.0.3.12981.0-r3) | 0 | ||||
-rw-r--r-- | dev-db/firebird/files/digest-firebird-2.1.0.16780_beta2-r2 (renamed from dev-db/firebird/files/digest-firebird-2.1.0.16780_beta2-r1) | 0 | ||||
-rw-r--r-- | dev-db/firebird/files/firebird-2.1.0.16780_beta2-deps-flags-libs-paths.patch | 354 | ||||
-rw-r--r-- | dev-db/firebird/files/firebird-2.1.0.16780_beta2-deps-flags-libs.patch | 103 | ||||
-rw-r--r-- | dev-db/firebird/files/firebird.conf.d | 4 | ||||
-rw-r--r-- | dev-db/firebird/firebird-2.0.3.12981.0-r4.ebuild (renamed from dev-db/firebird/firebird-2.0.3.12981.0-r3.ebuild) | 97 | ||||
-rw-r--r-- | dev-db/firebird/firebird-2.1.0.16780_beta2-r2.ebuild (renamed from dev-db/firebird/firebird-2.1.0.16780_beta2-r1.ebuild) | 102 |
9 files changed, 311 insertions, 414 deletions
diff --git a/dev-db/firebird/ChangeLog b/dev-db/firebird/ChangeLog index 048e36e881e1..c2b6ec2c86d6 100644 --- a/dev-db/firebird/ChangeLog +++ b/dev-db/firebird/ChangeLog @@ -1,6 +1,21 @@ # ChangeLog for dev-db/firebird # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.82 2007/11/12 18:09:41 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.83 2007/12/04 23:59:54 wltjr Exp $ + +*firebird-2.1.0.16780_beta2-r2 (04 Dec 2007) +*firebird-2.0.3.12981.0-r4 (04 Dec 2007) + + 04 Dec 2007; William L. Thomson Jr. <wltjr@gentoo.org> + +files/firebird-2.1.0.16780_beta2-deps-flags-libs.patch, + -files/firebird-2.1.0.16780_beta2-deps-flags-libs-paths.patch, + +files/firebird.conf.d, -firebird-2.0.3.12981.0-r3.ebuild, + +firebird-2.0.3.12981.0-r4.ebuild, -firebird-2.1.0.16780_beta2-r1.ebuild, + +firebird-2.1.0.16780_beta2-r2.ebuild: + Switched from patches to sed for path changes w/ sed checks via function. + Moved core from /usr/share/firebird -> /usr/lib/firebird since it contains + arch specific binaries, per FHS. Renamed isql -> fbsql per bug #198388. + Fixed missing path tweak for bug #198540. Removed past versions, should be + all folks :) 12 Nov 2007; William L. Thomson Jr. <wltjr@gentoo.org> -files/firebird.conf.d, -files/firebird.init.d, -files/firebird.xinetd, diff --git a/dev-db/firebird/Manifest b/dev-db/firebird/Manifest index 1a490f7c9070..b844740d3963 100644 --- a/dev-db/firebird/Manifest +++ b/dev-db/firebird/Manifest @@ -18,10 +18,14 @@ AUX firebird-2.0.3.12981.0-paths.patch 12954 RMD160 acac734477715e2bcf5833b7fba1 MD5 ecf89f096f817130287b8f42967d0b6e files/firebird-2.0.3.12981.0-paths.patch 12954 RMD160 acac734477715e2bcf5833b7fba11be2d07455dd files/firebird-2.0.3.12981.0-paths.patch 12954 SHA256 f3d1c896094961d824cb179a6c527470953f9727501a4b8d3ab2b58250113dc7 files/firebird-2.0.3.12981.0-paths.patch 12954 -AUX firebird-2.1.0.16780_beta2-deps-flags-libs-paths.patch 17962 RMD160 28d046de85e52928da6161732c6a001d29071a34 SHA1 0974f9f245a79dfed5b3aa188a24aeacca576bc8 SHA256 8816b5f8ca4589300f2ede5b3e60b56aa637632fc0b3c5cbfadbd9339519e4da -MD5 f4755ea906b3af04402de78a6bc3981a files/firebird-2.1.0.16780_beta2-deps-flags-libs-paths.patch 17962 -RMD160 28d046de85e52928da6161732c6a001d29071a34 files/firebird-2.1.0.16780_beta2-deps-flags-libs-paths.patch 17962 -SHA256 8816b5f8ca4589300f2ede5b3e60b56aa637632fc0b3c5cbfadbd9339519e4da files/firebird-2.1.0.16780_beta2-deps-flags-libs-paths.patch 17962 +AUX firebird-2.1.0.16780_beta2-deps-flags-libs.patch 3880 RMD160 603b6557b472865c1d0a9836e959c82506c9033d SHA1 5bae5306fc658243553e0265b329b9a938fe90d5 SHA256 ee7eff4c59841b223aeb4821644c51a7430c9f88eabf28c8c02e62f306897240 +MD5 7d3925cca75dfb73653e50819c261ca4 files/firebird-2.1.0.16780_beta2-deps-flags-libs.patch 3880 +RMD160 603b6557b472865c1d0a9836e959c82506c9033d files/firebird-2.1.0.16780_beta2-deps-flags-libs.patch 3880 +SHA256 ee7eff4c59841b223aeb4821644c51a7430c9f88eabf28c8c02e62f306897240 files/firebird-2.1.0.16780_beta2-deps-flags-libs.patch 3880 +AUX firebird.conf.d 84 RMD160 87e007bf5b9a540e67dd602b8d85da7c8a8aea21 SHA1 dd16a06bfb864c31d53220bdb5f0e3c3687e292c SHA256 e2d60371eb14ebfc20eaa1fc19610499ab495f9bdaffbb3075454ffc6a324d70 +MD5 13a568c7c840d1bfc98661ef6b217740 files/firebird.conf.d 84 +RMD160 87e007bf5b9a540e67dd602b8d85da7c8a8aea21 files/firebird.conf.d 84 +SHA256 e2d60371eb14ebfc20eaa1fc19610499ab495f9bdaffbb3075454ffc6a324d70 files/firebird.conf.d 84 AUX firebird.conf.d.2 86 RMD160 4be90549bb4c29010c294a3fd102cc7d0ee91f45 SHA1 2ee70d56395b581acc48f68067e595a921bb5a8a SHA256 822ef527ca4a2717fc4572321b4b77f3c7439f281c373896a42d83273f5a86ea MD5 2f59f6abb9968712126f9c090b198218 files/firebird.conf.d.2 86 RMD160 4be90549bb4c29010c294a3fd102cc7d0ee91f45 files/firebird.conf.d.2 86 @@ -41,18 +45,18 @@ EBUILD firebird-2.0.3.12981.0-r2.ebuild 6067 RMD160 a1ec8f736e524d0ef8e4285664ef MD5 9f14ff42633e3ba75a8e898c05d112aa firebird-2.0.3.12981.0-r2.ebuild 6067 RMD160 a1ec8f736e524d0ef8e4285664efea0be96d7bc0 firebird-2.0.3.12981.0-r2.ebuild 6067 SHA256 7bfbfc0d231f29c5e6a9639f9cdce9f65fe172fc63762056a6ce48e6fbddc172 firebird-2.0.3.12981.0-r2.ebuild 6067 -EBUILD firebird-2.0.3.12981.0-r3.ebuild 6108 RMD160 32d7972ed8facc0645dc48d744981b37e3ed69b2 SHA1 07712aa26529b2563fcf7b27bc23e1e427048731 SHA256 713f74fc90d41bd25eb8e2bd025fb5dc5af48f8e137b4b5e7f168d972493550c -MD5 0a3ab5f2a573671b27dc97d075a32b74 firebird-2.0.3.12981.0-r3.ebuild 6108 -RMD160 32d7972ed8facc0645dc48d744981b37e3ed69b2 firebird-2.0.3.12981.0-r3.ebuild 6108 -SHA256 713f74fc90d41bd25eb8e2bd025fb5dc5af48f8e137b4b5e7f168d972493550c firebird-2.0.3.12981.0-r3.ebuild 6108 -EBUILD firebird-2.1.0.16780_beta2-r1.ebuild 6026 RMD160 d417106cade8b8f31ab86ac8ea65308d9a2ef426 SHA1 c79a7ad2d54af8de8a5724cfc88bb7b5cd52b8cf SHA256 91e9aa232745e2e8e3c16051cecd3e4b4c9cd636788817269e92064740094bc5 -MD5 fcb5ef9cab01408f2c336edb56f7ecbf firebird-2.1.0.16780_beta2-r1.ebuild 6026 -RMD160 d417106cade8b8f31ab86ac8ea65308d9a2ef426 firebird-2.1.0.16780_beta2-r1.ebuild 6026 -SHA256 91e9aa232745e2e8e3c16051cecd3e4b4c9cd636788817269e92064740094bc5 firebird-2.1.0.16780_beta2-r1.ebuild 6026 -MISC ChangeLog 15827 RMD160 9c43cee6da1da1a18fa1cee50d80b81645eb33d5 SHA1 81932cf016a8abf11e5e58737151c1da9122dcff SHA256 5b14a04264ff5ca0e4e552020b4ea25f4680b2c9fcf5b803bfa55d371fda042e -MD5 6a030e2225a6c44df34d84a56fc7fca8 ChangeLog 15827 -RMD160 9c43cee6da1da1a18fa1cee50d80b81645eb33d5 ChangeLog 15827 -SHA256 5b14a04264ff5ca0e4e552020b4ea25f4680b2c9fcf5b803bfa55d371fda042e ChangeLog 15827 +EBUILD firebird-2.0.3.12981.0-r4.ebuild 9805 RMD160 2f1116509e8715f301fde6920e1f91cddb9fdc44 SHA1 46207c3535e45702515183370a10b69c1cd23af8 SHA256 13d21129e438585ba2e1a16c5aed5b0d18cc4efb856c244bbeb2e3c9a86e008b +MD5 414ecbacc857e1978a7ff5a9fd03fd3b firebird-2.0.3.12981.0-r4.ebuild 9805 +RMD160 2f1116509e8715f301fde6920e1f91cddb9fdc44 firebird-2.0.3.12981.0-r4.ebuild 9805 +SHA256 13d21129e438585ba2e1a16c5aed5b0d18cc4efb856c244bbeb2e3c9a86e008b firebird-2.0.3.12981.0-r4.ebuild 9805 +EBUILD firebird-2.1.0.16780_beta2-r2.ebuild 10102 RMD160 1d337118dc7d714790ce93898d6c64622cfe8cec SHA1 3f919900a1ef94431b952b0c4e938c83b1cb8e03 SHA256 f00c9ee305af71a3ebfbc26fd43b1d1fa01281db1c57c68daed917a56c3324a3 +MD5 4b48ddc94ddc1b68965cf0a8c76e4814 firebird-2.1.0.16780_beta2-r2.ebuild 10102 +RMD160 1d337118dc7d714790ce93898d6c64622cfe8cec firebird-2.1.0.16780_beta2-r2.ebuild 10102 +SHA256 f00c9ee305af71a3ebfbc26fd43b1d1fa01281db1c57c68daed917a56c3324a3 firebird-2.1.0.16780_beta2-r2.ebuild 10102 +MISC ChangeLog 16593 RMD160 3092db256c82cb97df568e72090f1321a5de320b SHA1 0ed2ab41af6788f80901d37b2ec4f046dc7ea421 SHA256 9f0c60e2c9adfa3acea9f4ab58d40d55beb67c4adc865d8f95f0f4c1f48c618a +MD5 5102c5c7cde1a55f4ce090a53775e74b ChangeLog 16593 +RMD160 3092db256c82cb97df568e72090f1321a5de320b ChangeLog 16593 +SHA256 9f0c60e2c9adfa3acea9f4ab58d40d55beb67c4adc865d8f95f0f4c1f48c618a ChangeLog 16593 MISC metadata.xml 611 RMD160 f6ee917e095b5fdf35200713fcc5a19b676cc369 SHA1 ce284a4db1ea6aa20a3824fb0c5730385659f84c SHA256 feb96e25e1e94eda2ebdfb016e9c44de6f59374b49ba256a5187f5a76d912e63 MD5 bf38ebc9198cc6b2bfc486bc9328c943 metadata.xml 611 RMD160 f6ee917e095b5fdf35200713fcc5a19b676cc369 metadata.xml 611 @@ -60,9 +64,9 @@ SHA256 feb96e25e1e94eda2ebdfb016e9c44de6f59374b49ba256a5187f5a76d912e63 metadata MD5 693fad7757fc0c2e66f358e8703ef309 files/digest-firebird-2.0.3.12981.0-r2 506 RMD160 b0ba0f24dd612555f7ce7b7858fc6456448dbe78 files/digest-firebird-2.0.3.12981.0-r2 506 SHA256 f3d5d10532c1f6d2cc2fdd4e1a1150102f2b5ec2bf44f13b6d1b3e6c16abc29d files/digest-firebird-2.0.3.12981.0-r2 506 -MD5 693fad7757fc0c2e66f358e8703ef309 files/digest-firebird-2.0.3.12981.0-r3 506 -RMD160 b0ba0f24dd612555f7ce7b7858fc6456448dbe78 files/digest-firebird-2.0.3.12981.0-r3 506 -SHA256 f3d5d10532c1f6d2cc2fdd4e1a1150102f2b5ec2bf44f13b6d1b3e6c16abc29d files/digest-firebird-2.0.3.12981.0-r3 506 -MD5 e0a12cb514870a26e879ca8125320723 files/digest-firebird-2.1.0.16780_beta2-r1 518 -RMD160 921fd99f434236240864e3479fa05aa8b68b21eb files/digest-firebird-2.1.0.16780_beta2-r1 518 -SHA256 0f053ca3649de2329b0046f598693ebad94b81a9bfeff34a190db93778aaf01b files/digest-firebird-2.1.0.16780_beta2-r1 518 +MD5 693fad7757fc0c2e66f358e8703ef309 files/digest-firebird-2.0.3.12981.0-r4 506 +RMD160 b0ba0f24dd612555f7ce7b7858fc6456448dbe78 files/digest-firebird-2.0.3.12981.0-r4 506 +SHA256 f3d5d10532c1f6d2cc2fdd4e1a1150102f2b5ec2bf44f13b6d1b3e6c16abc29d files/digest-firebird-2.0.3.12981.0-r4 506 +MD5 e0a12cb514870a26e879ca8125320723 files/digest-firebird-2.1.0.16780_beta2-r2 518 +RMD160 921fd99f434236240864e3479fa05aa8b68b21eb files/digest-firebird-2.1.0.16780_beta2-r2 518 +SHA256 0f053ca3649de2329b0046f598693ebad94b81a9bfeff34a190db93778aaf01b files/digest-firebird-2.1.0.16780_beta2-r2 518 diff --git a/dev-db/firebird/files/digest-firebird-2.0.3.12981.0-r3 b/dev-db/firebird/files/digest-firebird-2.0.3.12981.0-r4 index 9d8d28d4fe6b..9d8d28d4fe6b 100644 --- a/dev-db/firebird/files/digest-firebird-2.0.3.12981.0-r3 +++ b/dev-db/firebird/files/digest-firebird-2.0.3.12981.0-r4 diff --git a/dev-db/firebird/files/digest-firebird-2.1.0.16780_beta2-r1 b/dev-db/firebird/files/digest-firebird-2.1.0.16780_beta2-r2 index f63a1165d43f..f63a1165d43f 100644 --- a/dev-db/firebird/files/digest-firebird-2.1.0.16780_beta2-r1 +++ b/dev-db/firebird/files/digest-firebird-2.1.0.16780_beta2-r2 diff --git a/dev-db/firebird/files/firebird-2.1.0.16780_beta2-deps-flags-libs-paths.patch b/dev-db/firebird/files/firebird-2.1.0.16780_beta2-deps-flags-libs-paths.patch deleted file mode 100644 index de9459cc797f..000000000000 --- a/dev-db/firebird/files/firebird-2.1.0.16780_beta2-deps-flags-libs-paths.patch +++ /dev/null @@ -1,354 +0,0 @@ -diff -Naur Firebird-2.1.0.16780-Beta2_orig/builds/posix/Makefile.in.firebird Firebird-2.1.0.16780-Beta2/builds/posix/Makefile.in.firebird ---- Firebird-2.1.0.16780-Beta2_orig/builds/posix/Makefile.in.firebird 2007-10-19 11:11:36.000000000 -0400 -+++ Firebird-2.1.0.16780-Beta2/builds/posix/Makefile.in.firebird 2007-10-19 11:20:01.000000000 -0400 -@@ -185,14 +185,14 @@ - # - - external_libraries: --ifeq ($(STD_ICU),false) -- $(MAKE) -f $(GEN_ROOT)/Makefile.extern.icu --endif --ifeq ($(STD_EDITLINE),false) --ifeq ($(EDITLINE_FLG),Y) -- $(MAKE) -f $(GEN_ROOT)/Makefile.extern.editline --endif --endif -+#ifeq ($(STD_ICU),false) -+# $(MAKE) -f $(GEN_ROOT)/Makefile.extern.icu -+#endif -+#ifeq ($(STD_EDITLINE),false) -+#ifeq ($(EDITLINE_FLG),Y) -+# $(MAKE) -f $(GEN_ROOT)/Makefile.extern.editline -+#endif -+#endif - - btyacc_binary: $(BTYACC) - -diff -Naur Firebird-2.1.0.16780-Beta2_orig/builds/posix/make.defaults Firebird-2.1.0.16780-Beta2/builds/posix/make.defaults ---- Firebird-2.1.0.16780-Beta2_orig/builds/posix/make.defaults 2007-10-19 11:11:36.000000000 -0400 -+++ Firebird-2.1.0.16780-Beta2/builds/posix/make.defaults 2007-10-19 12:31:50.000000000 -0400 -@@ -229,11 +229,11 @@ - LIBFBSTATIC_A = $(LIB)/libfbstatic.a - - ifeq ($(EDITLINE_FLG),Y) -- ifeq ($(STD_EDITLINE), true) -- LIBEDITLINE := -leditline -- else -- LIBEDITLINE := $(LIB)/libeditline.a -- endif -+# ifeq ($(STD_EDITLINE), true) -+ LIBEDITLINE := -ledit -+# else -+# LIBEDITLINE := $(LIB)/libeditline.a -+# endif - endif - - LIBICU_SO = $(LIB)/$(LIB_PREFIX)icuuc.$(SHRLIB_EXT) \ -diff -Naur Firebird-2.1.0.16780-Beta2_orig/builds/posix/make.rules Firebird-2.1.0.16780-Beta2/builds/posix/make.rules ---- Firebird-2.1.0.16780-Beta2_orig/builds/posix/make.rules 2007-10-19 11:11:36.000000000 -0400 -+++ Firebird-2.1.0.16780-Beta2/builds/posix/make.rules 2007-10-19 11:30:08.000000000 -0400 -@@ -33,9 +33,9 @@ - - # Please don't use compiler/platform specific flags here - nmcc 02-Nov-2002 - CFLAGS:= $(CFLAGS) -I$(SRC_ROOT)/include/gen -I$(SRC_ROOT)/include -I$(SRC_ROOT)/vulcan -DNAMESPACE=Vulcan --ifeq ($(STD_ICU),false) -- CFLAGS:= $(CFLAGS) -I$(ROOT)/extern/icu/source/common -I$(ROOT)/extern/icu/source/i18n --endif -+#ifeq ($(STD_ICU),false) -+# CFLAGS:= $(CFLAGS) -I$(ROOT)/extern/icu/source/common -I$(ROOT)/extern/icu/source/i18n -+#endif - - ifeq ($(IsProdTypeBuild),Y) - CFLAGS:= $(CFLAGS) $(PROD_FLAGS) -DPROD_BUILD -@@ -69,19 +69,19 @@ - - .SUFFIXES: .c .e .epp .cpp - --.e.c: -+.e.c: $(GPRE_CURRENT) - $(GPRE_CURRENT) $(GPRE_FLAGS) $< $@ - - --.epp.cpp: -+.epp.cpp: $(GPRE_CURRENT) - $(GPRE_CURRENT) $(GPRE_FLAGS) $< $@ - - --$(SRC_ROOT)/jrd/%.cpp:: $(SRC_ROOT)/jrd/%.epp -+$(SRC_ROOT)/jrd/%.cpp:: $(SRC_ROOT)/jrd/%.epp $(GPRE_CURRENT) - $(GPRE_CURRENT) $(JRD_GPRE_FLAGS) $< $@ - - --$(SRC_ROOT)/dsql/%.cpp:: $(SRC_ROOT)/dsql/%.epp -+$(SRC_ROOT)/dsql/%.cpp:: $(SRC_ROOT)/dsql/%.epp $(GPRE_CURRENT) - $(GPRE_CURRENT) $(DSQL_GPRE_FLAGS) $< $@ - - -diff -Naur Firebird-2.1.0.16780-Beta2_orig/builds/posix/make.shared.targets Firebird-2.1.0.16780-Beta2/builds/posix/make.shared.targets ---- Firebird-2.1.0.16780-Beta2_orig/builds/posix/make.shared.targets 2007-10-19 11:11:36.000000000 -0400 -+++ Firebird-2.1.0.16780-Beta2/builds/posix/make.shared.targets 2007-10-19 11:28:58.000000000 -0400 -@@ -49,7 +49,7 @@ - - # gpre_meta needs a special boot build since there is no database. - --$(SRC_ROOT)/gpre/gpre_meta.cpp: $(SRC_ROOT)/gpre/gpre_meta.epp -+$(SRC_ROOT)/gpre/gpre_meta.cpp: $(SRC_ROOT)/gpre/gpre_meta.epp $(GPRE_BOOT) - $(GPRE_BOOT) -lang_internal $(GPRE_FLAGS) $< $@ - - -diff -Naur Firebird-2.1.0.16780-Beta2_orig/builds/posix/prefix.linux Firebird-2.1.0.16780-Beta2/builds/posix/prefix.linux ---- Firebird-2.1.0.16780-Beta2_orig/builds/posix/prefix.linux 2007-10-19 11:11:36.000000000 -0400 -+++ Firebird-2.1.0.16780-Beta2/builds/posix/prefix.linux 2007-11-05 21:31:20.000000000 -0500 -@@ -21,11 +21,10 @@ - # -fno-builtin is used because GCC 3.0-3.2.2 had bug with builtins expansion - # you may remove it if engine is getting compiled with any other GCC version - --COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC -fmessage-length=0 --OPTIMIZE_FLAGS=-O3 -march=i586 -mcpu=i686 -fno-omit-frame-pointer -fno-builtin -+COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC - WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable - --PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE_FLAGS) -+PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) - DEV_FLAGS=-DUSE_VALGRIND -p $(COMMON_FLAGS) $(WARN_FLAGS) - #DEV_FLAGS=-p $(COMMON_FLAGS) $(WARN_FLAGS) - -diff -Naur Firebird-2.1.0.16780-Beta2_orig/configure Firebird-2.1.0.16780-Beta2/configure ---- Firebird-2.1.0.16780-Beta2_orig/configure 2007-10-19 11:11:39.000000000 -0400 -+++ Firebird-2.1.0.16780-Beta2/configure 2007-10-19 11:26:19.000000000 -0400 -@@ -3928,13 +3928,13 @@ - # not need editline in default libs, but need to test for its presence - saveLIBS=$LIBS - if test "$STD_EDITLINE" = "true"; then -- { echo "$as_me:$LINENO: checking for readline in -leditline" >&5 --echo $ECHO_N "checking for readline in -leditline... $ECHO_C" >&6; } -+ { echo "$as_me:$LINENO: checking for readline in -ledit" >&5 -+echo $ECHO_N "checking for readline in -ledit... $ECHO_C" >&6; } - if test "${ac_cv_lib_editline_readline+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-leditline $LIBS" -+LIBS="-ledit $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -diff -Naur Firebird-2.1.0.16780-Beta2_orig/src/jrd/db_alias.cpp Firebird-2.1.0.16780-Beta2/src/jrd/db_alias.cpp ---- Firebird-2.1.0.16780-Beta2_orig/src/jrd/db_alias.cpp 2007-10-19 11:11:39.000000000 -0400 -+++ Firebird-2.1.0.16780-Beta2/src/jrd/db_alias.cpp 2007-10-19 11:31:25.000000000 -0400 -@@ -28,7 +28,7 @@ - - typedef Firebird::PathName string; - --const char* ALIAS_FILE = "aliases.conf"; -+const char* ALIAS_FILE = "../../../etc/firebird/aliases.conf"; - - static void replace_dir_sep(string& s) - { -diff -Naur Firebird-2.1.0.16780-Beta2_orig/src/jrd/file_params.h Firebird-2.1.0.16780-Beta2/src/jrd/file_params.h ---- Firebird-2.1.0.16780-Beta2_orig/src/jrd/file_params.h 2007-10-19 11:11:39.000000000 -0400 -+++ Firebird-2.1.0.16780-Beta2/src/jrd/file_params.h 2007-10-19 11:35:32.000000000 -0400 -@@ -38,11 +38,11 @@ - const int EVENT_SEMAPHORES = 1; - - #ifdef NOHOSTNAME --static const char* EVENT_FILE = "isc_event1"; --static const char* LOCK_FILE = "isc_lock1.gbl"; --static const char* INIT_FILE = "isc_init1"; --static const char* GUARD_FILE = "isc_guard1"; --static const char* MONITOR_FILE = "isc_monitor1"; -+static const char* EVENT_FILE = "../../../var/run/firebird/isc_event1"; -+static const char* LOCK_FILE = "../../../var/run/firebird/isc_lock1.gbl"; -+static const char* INIT_FILE = "../../../var/run/firebird/isc_init1"; -+static const char* GUARD_FILE = "../../../var/run/firebird/isc_guard1"; -+static const char* MONITOR_FILE = "../../../var/run/firebird/isc_monitor1"; - #elif defined(VMS) - static const char* EVENT_FILE = "[000000]isc_event1.%s"; - static const char* LOCK_FILE = "[000000]isc_lock1.%s"; -@@ -56,11 +56,11 @@ - static const char* GUARD_FILE = "%s.grd"; - static const char* MONITOR_FILE = "%s.mon"; - #else --static const char* EVENT_FILE = "isc_event1.%s"; --static const char* LOCK_FILE = "isc_lock1.%s"; --static const char* INIT_FILE = "isc_init1.%s"; --static const char* GUARD_FILE = "isc_guard1.%s"; --static const char* MONITOR_FILE = "isc_monitor1.%s"; -+static const char* EVENT_FILE = "../../../var/run/firebird/isc_event1.%s"; -+static const char* LOCK_FILE = "../../../var/run/firebird/isc_lock1.%s"; -+static const char* INIT_FILE = "../../../var/run/firebird/isc_init1.%s"; -+static const char* GUARD_FILE = "../../../var/run/firebird/isc_guard1.%s"; -+static const char* MONITOR_FILE = "../../../var/run/firebird/isc_monitor1.%s"; - #endif - - #ifdef sun -@@ -91,7 +91,7 @@ - static const char* MSG_FILE = "firebird.msg"; - static const char MSG_FILE_LANG[]= "intl/%.10s.msg"; - const int LOCALE_MAX = 10; --static const char* LOGFILE = "firebird.log"; -+static const char* LOGFILE = "../../../var/log/firebird/firebird.log"; - #elif defined(WIN_NT) - static const char* WORKFILE = "c:\\temp\\"; - static const char* MSG_FILE = "firebird.msg"; -@@ -130,7 +130,7 @@ - static const char* MSG_FILE = "firebird.msg"; - static const char MSG_FILE_LANG[]= "intl/%.10s.msg"; - const int LOCALE_MAX = 10; --static const char* LOGFILE = "firebird.log"; -+static const char* LOGFILE = "../../../var/log/firebird/firebird.log"; - #endif - - #endif /* JRD_FILE_PARAMS_H */ -diff -Naur Firebird-2.1.0.16780-Beta2_orig/src/jrd/jrd_pwd.h Firebird-2.1.0.16780-Beta2/src/jrd/jrd_pwd.h ---- Firebird-2.1.0.16780-Beta2_orig/src/jrd/jrd_pwd.h 2007-10-19 11:11:39.000000000 -0400 -+++ Firebird-2.1.0.16780-Beta2/src/jrd/jrd_pwd.h 2007-10-19 11:36:14.000000000 -0400 -@@ -57,7 +57,7 @@ - #ifdef VMS - "[sysmgr]security2.fdb"; - #else -- "security2.fdb"; -+ "../../../etc/firebird/security2.fdb"; - #endif - - gds__prefix(path_buffer, USER_INFO_NAME); -diff -Naur Firebird-2.1.0.16780-Beta2_orig/src/jrd/os/config_root.h Firebird-2.1.0.16780-Beta2/src/jrd/os/config_root.h ---- Firebird-2.1.0.16780-Beta2_orig/src/jrd/os/config_root.h 2007-10-19 11:11:39.000000000 -0400 -+++ Firebird-2.1.0.16780-Beta2/src/jrd/os/config_root.h 2007-10-19 11:37:36.000000000 -0400 -@@ -33,7 +33,7 @@ - #include "../jrd/os/path_utils.h" - #include "../common/utils_proto.h" - --static const char* CONFIG_FILE = "firebird.conf"; -+static const char* CONFIG_FILE = "../../../etc/firebird/firebird.conf"; - - /** - Since the original (isc.cpp) code wasn't able to provide powerful and -diff -Naur Firebird-2.1.0.16780-Beta2_orig/src/jrd/svc.cpp Firebird-2.1.0.16780-Beta2/src/jrd/svc.cpp ---- Firebird-2.1.0.16780-Beta2_orig/src/jrd/svc.cpp 2007-10-19 11:11:39.000000000 -0400 -+++ Firebird-2.1.0.16780-Beta2/src/jrd/svc.cpp 2007-10-19 11:44:43.000000000 -0400 -@@ -445,38 +445,38 @@ - static serv_entry services[] = - { - -- { isc_action_max, "print_cache", "-svc", "bin/fb_cache_print", NULL, 0 }, -- { isc_action_max, "print_locks", "-svc", "bin/fb_lock_print", NULL, 0 }, -- { isc_action_max, "start_cache", "-svc", "bin/fb_cache_manager", NULL, 0 }, -- { isc_action_max, "analyze_database", "-svc", "bin/gstat", NULL, 0 }, -- { isc_action_max, "backup", "-svc -b", "bin/gbak", MAIN_GBAK, 0 }, -- { isc_action_max, "create", "-svc -c", "bin/gbak", MAIN_GBAK, 0 }, -- { isc_action_max, "restore", "-svc -r", "bin/gbak", MAIN_GBAK, 0 }, -- { isc_action_max, "gdef", "-svc", "bin/gdef", NULL, 0 }, -- { isc_action_max, "gsec", "-svc", "bin/gsec", NULL, 0 }, -- { isc_action_max, "disable_journal", "-svc -disable", "bin/gjrn", NULL, 0 }, -- { isc_action_max, "dump_journal", "-svc -online_dump", "bin/gjrn", NULL, 0 }, -- { isc_action_max, "enable_journal", "-svc -enable", "bin/gjrn", NULL, 0 }, -- { isc_action_max, "monitor_journal", "-svc -console", "bin/gjrn", NULL, 0 }, -+ { isc_action_max, "print_cache", "-svc", "../../../usr/bin/fb_cache_print", NULL, 0 }, -+ { isc_action_max, "print_locks", "-svc", "../../../usr/bin/fb_lock_print", NULL, 0 }, -+ { isc_action_max, "start_cache", "-svc", "../../../usr/bin/fb_cache_manager", NULL, 0 }, -+ { isc_action_max, "analyze_database", "-svc", "../../../usr/bin/gstat", NULL, 0 }, -+ { isc_action_max, "backup", "-svc -b", "../../../usr/bin/gbak", MAIN_GBAK, 0 }, -+ { isc_action_max, "create", "-svc -c", "../../../usr/bin/gbak", MAIN_GBAK, 0 }, -+ { isc_action_max, "restore", "-svc -r", "../../../usr/bin/gbak", MAIN_GBAK, 0 }, -+ { isc_action_max, "gdef", "-svc", "../../../usr/bin/gdef", NULL, 0 }, -+ { isc_action_max, "gsec", "-svc", "../../../usr/bin/gsec", NULL, 0 }, -+ { isc_action_max, "disable_journal", "-svc -disable", "../../../usr/bin/gjrn", NULL, 0 }, -+ { isc_action_max, "dump_journal", "-svc -online_dump", "../../../usr/bin/gjrn", NULL, 0 }, -+ { isc_action_max, "enable_journal", "-svc -enable", "../../../usr/bin/gjrn", NULL, 0 }, -+ { isc_action_max, "monitor_journal", "-svc -console", "../../../usr/bin/gjrn", NULL, 0 }, - { isc_action_max, "query_server", NULL, NULL, NULL, 0 }, -- { isc_action_max, "start_journal", "-svc -server", "bin/gjrn", NULL, 0 }, -- { isc_action_max, "stop_cache", "-svc -shut -cache", "bin/gfix", NULL, 0 }, -- { isc_action_max, "stop_journal", "-svc -console", "bin/gjrn", NULL, 0 }, -+ { isc_action_max, "start_journal", "-svc -server", "../../../usr/bin/gjrn", NULL, 0 }, -+ { isc_action_max, "stop_cache", "-svc -shut -cache", "../../../usr/bin/gfix", NULL, 0 }, -+ { isc_action_max, "stop_journal", "-svc -console", "../../../usr/bin/gjrn", NULL, 0 }, - { isc_action_max, "anonymous", NULL, NULL, NULL, 0 }, - - /* NEW VERSION 2 calls, the name field MUST be different from those names above - */ - { isc_action_max, "service_mgr", NULL, NULL, NULL, 0 }, -- { isc_action_svc_backup, "Backup Database", NULL, "bin/gbak", MAIN_GBAK, 0 }, -- { isc_action_svc_restore, "Restore Database", NULL, "bin/gbak", MAIN_GBAK, 0 }, -- { isc_action_svc_repair, "Repair Database", NULL, "bin/gfix", MAIN_GFIX, 0 }, -- { isc_action_svc_add_user, "Add User", NULL, "bin/gsec", MAIN_GSEC, 0 }, -- { isc_action_svc_delete_user, "Delete User", NULL, "bin/gsec", MAIN_GSEC, 0 }, -- { isc_action_svc_modify_user, "Modify User", NULL, "bin/gsec", MAIN_GSEC, 0 }, -- { isc_action_svc_display_user, "Display User", NULL, "bin/gsec", MAIN_GSEC, 0 }, -- { isc_action_svc_properties, "Database Properties", NULL, "bin/gfix", MAIN_GFIX, 0 }, -- { isc_action_svc_lock_stats, "Lock Stats", NULL, "bin/fb_lock_print", TEST_THREAD, 0 }, -- { isc_action_svc_db_stats, "Database Stats", NULL, "bin/gstat", MAIN_GSTAT, 0 }, -+ { isc_action_svc_backup, "Backup Database", NULL, "../../../usr/bin/gbak", MAIN_GBAK, 0 }, -+ { isc_action_svc_restore, "Restore Database", NULL, "../../../usr/bin/gbak", MAIN_GBAK, 0 }, -+ { isc_action_svc_repair, "Repair Database", NULL, "../../../usr/bin/gfix", MAIN_GFIX, 0 }, -+ { isc_action_svc_add_user, "Add User", NULL, "../../../usr/bin/gsec", MAIN_GSEC, 0 }, -+ { isc_action_svc_delete_user, "Delete User", NULL, "../../../usr/bin/gsec", MAIN_GSEC, 0 }, -+ { isc_action_svc_modify_user, "Modify User", NULL, "../../../usr/bin/gsec", MAIN_GSEC, 0 }, -+ { isc_action_svc_display_user, "Display User", NULL, "../../../usr/bin/gsec", MAIN_GSEC, 0 }, -+ { isc_action_svc_properties, "Database Properties", NULL, "../../../usr/bin/gfix", MAIN_GFIX, 0 }, -+ { isc_action_svc_lock_stats, "Lock Stats", NULL, "../../../usr/bin/fb_lock_print", TEST_THREAD, 0 }, -+ { isc_action_svc_db_stats, "Database Stats", NULL, "../../../usr/bin/gstat", MAIN_GSTAT, 0 }, - { isc_action_svc_get_fb_log, "Get Log File", NULL, NULL, SVC_read_fb_log, 0 }, - /* actions with no names are undocumented */ - { isc_action_svc_set_config, NULL, NULL, NULL, TEST_THREAD, 0 }, -diff -Naur Firebird-2.1.0.16780-Beta2_orig/src/utilities/fbcpl/fbdialog.cpp Firebird-2.1.0.16780-Beta2/src/utilities/fbcpl/fbdialog.cpp ---- Firebird-2.1.0.16780-Beta2_orig/src/utilities/fbcpl/fbdialog.cpp 2007-10-19 11:11:39.000000000 -0400 -+++ Firebird-2.1.0.16780-Beta2/src/utilities/fbcpl/fbdialog.cpp 2007-10-19 11:51:22.000000000 -0400 -@@ -1367,7 +1367,7 @@ - bool CFBDialog::UpdateFirebirdConf(CString option, CString value) - { - CStdioFile FbConfFile, FbConfFileNew; -- CString FirebirdConfFilename = m_Root_Path + "firebird.conf"; -+ CString FirebirdConfFilename = "../../../etc/firebird/firebird.conf"; - CString FirebirdConfNewname = FirebirdConfFilename + ".new"; - CString FirebirdConfOldname = FirebirdConfFilename + ".old"; - CString FirebirdConfLine = ""; -diff -Naur Firebird-2.1.0.16780-Beta2_orig/src/utilities/gsec/security.epp Firebird-2.1.0.16780-Beta2/src/utilities/gsec/security.epp ---- Firebird-2.1.0.16780-Beta2_orig/src/utilities/gsec/security.epp 2007-10-19 11:11:39.000000000 -0400 -+++ Firebird-2.1.0.16780-Beta2/src/utilities/gsec/security.epp 2007-10-19 11:51:56.000000000 -0400 -@@ -41,7 +41,7 @@ - #endif - #include "../common/utils_proto.h" - --DATABASE DB = STATIC FILENAME "security2.fdb"; -+DATABASE DB = STATIC FILENAME "../../../etc/firebird/security2.fdb"; - - static const char* SYSDBA_USER_NAME = "SYSDBA"; - -diff -Naur Firebird-2.1.0.16780-Beta2_orig/src/utilities/guard/guard.cpp Firebird-2.1.0.16780-Beta2/src/utilities/guard/guard.cpp ---- Firebird-2.1.0.16780-Beta2_orig/src/utilities/guard/guard.cpp 2007-10-19 11:11:39.000000000 -0400 -+++ Firebird-2.1.0.16780-Beta2/src/utilities/guard/guard.cpp 2007-10-19 11:52:29.000000000 -0400 -@@ -59,7 +59,7 @@ - const USHORT IGNORE = 3; - const USHORT NORMAL_EXIT= 0; - --const char* SUPER_SERVER_BINARY = "bin/fbserver"; -+const char* SUPER_SERVER_BINARY = "../../../usr/bin/fbserver"; - - const char* INTERBASE_USER = "interbase"; - const char* FIREBIRD_USER = "firebird"; -diff -Naur Firebird-2.1.0.16780-Beta2_orig/src/utilities/ibmgr/ibmgr.h Firebird-2.1.0.16780-Beta2/src/utilities/ibmgr/ibmgr.h ---- Firebird-2.1.0.16780-Beta2_orig/src/utilities/ibmgr/ibmgr.h 2007-10-19 11:11:39.000000000 -0400 -+++ Firebird-2.1.0.16780-Beta2/src/utilities/ibmgr/ibmgr.h 2007-10-19 11:52:56.000000000 -0400 -@@ -31,7 +31,7 @@ - static const char* FIREBIRD_USER_NAME = "firebird"; - static const char* INTERBASE_USER_NAME = "interbase"; - static const char* INTERBASE_USER_SHORT= "interbas"; --static const char* SERVER_GUARDIAN = "bin/fbguard"; -+static const char* SERVER_GUARDIAN = "../../../usr/bin/fbguard"; - - const USHORT MSG_FAC = 18; - const int MSG_LEN = 128; -diff -Naur Firebird-2.1.0.16780-Beta2_orig/src/utilities/ibmgr/srvrmgr.cpp Firebird-2.1.0.16780-Beta2/src/utilities/ibmgr/srvrmgr.cpp ---- Firebird-2.1.0.16780-Beta2_orig/src/utilities/ibmgr/srvrmgr.cpp 2007-10-19 11:11:39.000000000 -0400 -+++ Firebird-2.1.0.16780-Beta2/src/utilities/ibmgr/srvrmgr.cpp 2007-10-19 11:53:32.000000000 -0400 -@@ -272,7 +272,7 @@ - rs = "can not quit now, use shut -ign"; - break; - case MSG_STARTERR: -- rs = "check $FIREBIRD/firebird.log file for errors"; -+ rs = "check /var/log/firebird/firebird.log file for errors"; - break; - case MSG_STARTFAIL: - rs = "can not start server"; diff --git a/dev-db/firebird/files/firebird-2.1.0.16780_beta2-deps-flags-libs.patch b/dev-db/firebird/files/firebird-2.1.0.16780_beta2-deps-flags-libs.patch new file mode 100644 index 000000000000..661b95acaeba --- /dev/null +++ b/dev-db/firebird/files/firebird-2.1.0.16780_beta2-deps-flags-libs.patch @@ -0,0 +1,103 @@ +diff -Naur Firebird-2.1.0.16780-Beta2_orig/builds/posix/Makefile.in.firebird Firebird-2.1.0.16780-Beta2/builds/posix/Makefile.in.firebird +--- Firebird-2.1.0.16780-Beta2_orig/builds/posix/Makefile.in.firebird 2007-11-14 13:22:07.000000000 -0500 ++++ Firebird-2.1.0.16780-Beta2/builds/posix/Makefile.in.firebird 2007-11-14 13:43:55.000000000 -0500 +@@ -185,14 +185,7 @@ + # + + external_libraries: +-ifeq ($(STD_ICU),false) +- $(MAKE) -f $(GEN_ROOT)/Makefile.extern.icu +-endif +-ifeq ($(STD_EDITLINE),false) +-ifeq ($(EDITLINE_FLG),Y) +- $(MAKE) -f $(GEN_ROOT)/Makefile.extern.editline +-endif +-endif ++ + + btyacc_binary: $(BTYACC) + +--- Firebird-2.1.0.16780-Beta2_orig/builds/posix/make.defaults 2007-11-14 13:22:07.000000000 -0500 ++++ Firebird-2.1.0.16780-Beta2/builds/posix/make.defaults 2007-11-14 13:44:39.000000000 -0500 +@@ -229,11 +229,7 @@ + LIBFBSTATIC_A = $(LIB)/libfbstatic.a + + ifeq ($(EDITLINE_FLG),Y) +- ifeq ($(STD_EDITLINE), true) +- LIBEDITLINE := -leditline +- else +- LIBEDITLINE := $(LIB)/libeditline.a +- endif ++ LIBEDITLINE := -ledit + endif + + LIBICU_SO = $(LIB)/$(LIB_PREFIX)icuuc.$(SHRLIB_EXT) \ +diff -Naur Firebird-2.1.0.16780-Beta2_orig/builds/posix/make.rules Firebird-2.1.0.16780-Beta2/builds/posix/make.rules +--- Firebird-2.1.0.16780-Beta2_orig/builds/posix/make.rules 2007-11-14 13:22:07.000000000 -0500 ++++ Firebird-2.1.0.16780-Beta2/builds/posix/make.rules 2007-11-14 14:30:13.000000000 -0500 +@@ -33,9 +33,6 @@ + + # Please don't use compiler/platform specific flags here - nmcc 02-Nov-2002 + CFLAGS:= $(CFLAGS) -I$(SRC_ROOT)/include/gen -I$(SRC_ROOT)/include -I$(SRC_ROOT)/vulcan -DNAMESPACE=Vulcan +-ifeq ($(STD_ICU),false) +- CFLAGS:= $(CFLAGS) -I$(ROOT)/extern/icu/source/common -I$(ROOT)/extern/icu/source/i18n +-endif + + ifeq ($(IsProdTypeBuild),Y) + CFLAGS:= $(CFLAGS) $(PROD_FLAGS) -DPROD_BUILD +@@ -69,19 +66,19 @@ + + .SUFFIXES: .c .e .epp .cpp + +-.e.c: ++.e.c: $(GPRE_CURRENT) + $(GPRE_CURRENT) $(GPRE_FLAGS) $< $@ + + +-.epp.cpp: ++.epp.cpp: $(GPRE_CURRENT) + $(GPRE_CURRENT) $(GPRE_FLAGS) $< $@ + + +-$(SRC_ROOT)/jrd/%.cpp:: $(SRC_ROOT)/jrd/%.epp ++$(SRC_ROOT)/jrd/%.cpp:: $(SRC_ROOT)/jrd/%.epp $(GPRE_CURRENT) + $(GPRE_CURRENT) $(JRD_GPRE_FLAGS) $< $@ + + +-$(SRC_ROOT)/dsql/%.cpp:: $(SRC_ROOT)/dsql/%.epp ++$(SRC_ROOT)/dsql/%.cpp:: $(SRC_ROOT)/dsql/%.epp $(GPRE_CURRENT) + $(GPRE_CURRENT) $(DSQL_GPRE_FLAGS) $< $@ + + +diff -Naur Firebird-2.1.0.16780-Beta2_orig/builds/posix/make.shared.targets Firebird-2.1.0.16780-Beta2/builds/posix/make.shared.targets +--- Firebird-2.1.0.16780-Beta2_orig/builds/posix/make.shared.targets 2007-11-14 13:22:07.000000000 -0500 ++++ Firebird-2.1.0.16780-Beta2/builds/posix/make.shared.targets 2007-11-14 13:46:49.000000000 -0500 +@@ -49,7 +49,7 @@ + + # gpre_meta needs a special boot build since there is no database. + +-$(SRC_ROOT)/gpre/gpre_meta.cpp: $(SRC_ROOT)/gpre/gpre_meta.epp ++$(SRC_ROOT)/gpre/gpre_meta.cpp: $(SRC_ROOT)/gpre/gpre_meta.epp $(GPRE_BOOT) + $(GPRE_BOOT) -lang_internal $(GPRE_FLAGS) $< $@ + + +diff -Naur Firebird-2.1.0.16780-Beta2_orig/configure Firebird-2.1.0.16780-Beta2/configure +--- Firebird-2.1.0.16780-Beta2_orig/configure 2007-11-14 13:22:15.000000000 -0500 ++++ Firebird-2.1.0.16780-Beta2/configure 2007-11-14 13:48:51.000000000 -0500 +@@ -3928,13 +3928,13 @@ + # not need editline in default libs, but need to test for its presence + saveLIBS=$LIBS + if test "$STD_EDITLINE" = "true"; then +- { echo "$as_me:$LINENO: checking for readline in -leditline" >&5 +-echo $ECHO_N "checking for readline in -leditline... $ECHO_C" >&6; } ++ { echo "$as_me:$LINENO: checking for readline in -ledit" >&5 ++echo $ECHO_N "checking for readline in -ledit... $ECHO_C" >&6; } + if test "${ac_cv_lib_editline_readline+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-leditline $LIBS" ++LIBS="-ledit $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF diff --git a/dev-db/firebird/files/firebird.conf.d b/dev-db/firebird/files/firebird.conf.d new file mode 100644 index 000000000000..3c1e72a55eba --- /dev/null +++ b/dev-db/firebird/files/firebird.conf.d @@ -0,0 +1,4 @@ +ISC_USER=SYSDBA +ISC_PASSWORD=masterke +FIREBIRD=/usr/lib/firebird +FBRunUser=firebird diff --git a/dev-db/firebird/firebird-2.0.3.12981.0-r3.ebuild b/dev-db/firebird/firebird-2.0.3.12981.0-r4.ebuild index 23eec1a70849..b0ff66478d57 100644 --- a/dev-db/firebird/firebird-2.0.3.12981.0-r3.ebuild +++ b/dev-db/firebird/firebird-2.0.3.12981.0-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.0.3.12981.0-r3.ebuild,v 1.3 2007/11/09 15:21:43 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.0.3.12981.0-r4.ebuild,v 1.1 2007/12/04 23:59:54 wltjr Exp $ inherit flag-o-matic eutils autotools versionator @@ -28,7 +28,13 @@ S="${WORKDIR}/${MY_P}" pkg_setup() { enewgroup firebird 450 - enewuser firebird 450 /bin/bash /usr/share/firebird firebird + enewuser firebird 450 /bin/bash /usr/lib/firebird firebird +} + +function check_sed() { + MSG="sed of $3, required $2 lines modified $1" + einfo "${MSG}" + [[ $1 -ge $2 ]] || die "${MSG}" } src_unpack() { @@ -42,19 +48,68 @@ src_unpack() { unpack "${MY_P}.tar.bz2" + # compile time relative path hacks, ew :( mkdir -p "${WORKDIR}/../etc" \ "${WORKDIR}/usr" \ "${WORKDIR}/var/log/firebird" \ "${WORKDIR}/var/run/firebird" - cd "${WORKDIR}/usr"; ln -s "${WORKDIR}/${MY_P}/gen/firebird/bin" - cd "${WORKDIR}/../etc"; ln -s "${WORKDIR}/${MY_P}/gen/firebird" firebird + cd "${WORKDIR}/usr"; ln -s "${S}/gen/firebird/bin" + cd "${WORKDIR}/../etc"; ln -s "${S}/gen/firebird" firebird cd "${S}" - epatch "${FILESDIR}/${P}-flags.patch" epatch "${FILESDIR}/${P}-external-libs.patch" + epatch "${FILESDIR}/${P}-flags.patch" epatch "${FILESDIR}/${P}-make-deps.patch" - epatch "${FILESDIR}/${P}-paths.patch" + + einfo "Split up Firebird via relative path hacks" + # sed vs patch for portability and addtional location changes + # based on FIREBIRD=/usr/lib/firebird + check_sed "$(sed -i -e 's:"aliases.conf":"../../../etc/firebird/aliases.conf":w /dev/stdout' \ + src/jrd/db_alias.cpp | wc -l )" "1" "src/jrd/db_alias.cpp" # 1 line + check_sed "$(sed -i -e 's:"isc_event1:"../../../var/run/firebird/isc_event1:w /dev/stdout' \ + -e 's:"isc_lock1:"../../../var/run/firebird/isc_lock1:w /dev/stdout' \ + -e 's:"isc_init1:"../../../var/run/firebird/isc_init1:w /dev/stdout' \ + -e 's:"isc_config:"../../../var/run/firebird/isc_config:w /dev/stdout' \ + -e 's:"isc_guard1:"../../../var/run/firebird/isc_guard1:w /dev/stdout' \ + -e 's:"firebird.log":"../../../var/log/firebird/firebird.log":w /dev/stdout' \ + -e 's:"security2.fdb":"../../../etc/firebird/security2.fdb":w /dev/stdout' \ + src/jrd/file_params.h | wc -l)" "14" "src/jrd/file_params.h" # 14 lines + check_sed "$(sed -i -e 's:"security2.fdb":"../../../etc/firebird/security2.fdb":w /dev/stdout' \ + src/jrd/jrd_pwd.h | wc -l)" "1" "src/jrd/jrd_pwd.h" # 1 line + check_sed "$(sed -i -e 's:"firebird.conf":"../../../etc/firebird/firebird.conf":w /dev/stdout' \ + src/jrd/os/config_root.h | wc -l)" "1" "src/jrd/os/config_root.h" # 1 line + check_sed "$(sed -i -e 's:"bin/fb_cache_print":"../../../usr/bin/fb_cache_print":w /dev/stdout' \ + -e 's:"bin/fb_lock_print":"../../../usr/bin/fb_lock_print":w /dev/stdout' \ + -e 's:"bin/fb_cache_manager":"../../../usr/bin/fb_cache_manager":w /dev/stdout' \ + -e 's:"bin/gstat":"../../../usr/bin/gstat":w /dev/stdout' \ + -e 's:"bin/gbak":"../../../usr/bin/gbak":w /dev/stdout' \ + -e 's:"bin/gdef":"../../../usr/bin/gdef":w /dev/stdout' \ + -e 's:"bin/gsec":"../../../usr/bin/gsec":w /dev/stdout' \ + -e 's:"bin/gjrn":"../../../usr/bin/gjrn":w /dev/stdout' \ + -e 's:"bin/gfix":"../../../usr/bin/gfix":w /dev/stdout' \ + src/jrd/svc.cpp | wc -l)" "26" "src/jrd/svc.cpp" # 26 lines + check_sed "$(sed -i -e 's:"bin/fb_lock_mgr":"../../../usr/bin/fb_lock_mgr":w /dev/stdout' \ + src/lock/lock.cpp | wc -l)" "1" "src/lock/lock.cpp" # 1 line + check_sed "$(sed -i -e 's:m_Root_Path + "firebird.conf":"../../../etc/firebird/firebird.conf":w /dev/stdout' \ + src/utilities/fbcpl/fbdialog.cpp | wc -l)" "1" "src/utilities/fbcpl/fbdialog.cpp" # 1 line + check_sed "$(sed -i -e 's:"security2.fdb":"../../../etc/firebird/security2.fdb":w /dev/stdout' \ + src/utilities/gsec/security.epp | wc -l)" "1" "src/utilities/gsec/security.epp" # 1 line + check_sed "$(sed -i -e 's:"bin/fbserver":"../../../usr/bin/fbserver":w /dev/stdout' \ + src/utilities/guard/guard.cpp | wc -l)" "1" "src/utilities/guard/guard.cpp" # 1 line + check_sed "$(sed -i -e 's:"bin/fbguard":"../../../usr/bin/fbguard":w /dev/stdout' \ + src/utilities/ibmgr/ibmgr.h | wc -l)" "1" "src/utilities/ibmgr/ibmgr.h" # 1 line + check_sed "$(sed -i -e 's:$FIREBIRD/firebird.log:/var/log/firebird/firebird.log:w /dev/stdout' \ + src/utilities/ibmgr/srvrmgr.cpp | wc -l)" "1" "src/utilities/ibmgr/srvrmgr.cpp" # 1 line + + # Rename references to isql to fbsql + check_sed "$(sed -i -e 's:"isql :"fbsql :w /dev/stdout' \ + src/isql/isql.epp | wc -l)" "1" "src/isql/isql.epp" # 1 line + check_sed "$(sed -i -e 's:isql :fbsql :w /dev/stdout' \ + src/msgs/history.sql | wc -l)" "4" "src/msgs/history.sql" # 4 lines + check_sed "$(sed -i -e 's:isql :fbsql :w /dev/stdout' \ + -e 's:ISQL :FBSQL :w /dev/stdout' \ + src/msgs/messages.sql | wc -l)" "4" "src/msgs/messages.sql" # 4 lines find "${S}" -name \*.sh -print0 | xargs -0 chmod +x rm -rf "${S}"/extern/{editline,icu} @@ -66,7 +121,7 @@ src_compile() { filter-flags -fprefetch-loop-arrays filter-mfpmath sse - econf --prefix=/usr/share/firebird --with-editline \ + econf --prefix=/usr/lib/firebird --with-editline \ $(use_enable !xinetd superserver) \ $(use_enable debug) \ ${myconf} || die "econf failed" @@ -77,10 +132,13 @@ src_install() { cd "${S}/gen/firebird" # Seems to be ignored? -# insinto /usr/share/firebird/bin -# dobin bin/{changeRunUser,restoreRootRunUser,changeDBAPassword}.sh + insinto /usr/share/firebird/bin + dobin bin/{changeRunUser,restoreRootRunUser,changeDBAPassword}.sh rm bin/*.sh || die "Could not remove *sh files" + einfo "Renaming isql -> fbsql" + mv bin/isql bin/fbsql + insinto /usr/bin dobin bin/* @@ -91,10 +149,10 @@ src_install() { dolib.so lib/*.so* dolib.a lib/*.a* - insinto /usr/share/firebird + insinto /usr/lib/firebird doins *.msg - insinto /usr/share/firebird/help + insinto /usr/lib/firebird/help doins help/help.fdb insinto /usr/share/firebird/upgrade @@ -107,13 +165,13 @@ src_install() { insopts -m0660 -o firebird -g firebird doins security2.fdb - exeinto /usr/share/firebird/UDF + exeinto /usr/lib/firebird/UDF doexe UDF/*.so - exeinto /usr/share/firebird/intl - newexe intl/libfbintl.so fbintl + exeinto /usr/lib/firebird/intl + newexe intl/libfbintl.so fbintl.so - insinto /usr/share/firebird/intl + insinto /usr/lib/firebird/intl doins ../install/misc/fbintl.conf diropts -m 755 -o firebird -g firebird @@ -133,7 +191,7 @@ src_install() { newins "${FILESDIR}/${PN}.xinetd.2" ${PN} || die "newins xinetd file failed" else newinitd "${FILESDIR}/${PN}.init.d.2" ${PN} - newconfd "${FILESDIR}/firebird.conf.d.2" ${PN} + newconfd "${FILESDIR}/firebird.conf.d" ${PN} fperms 640 /etc/conf.d/firebird fi doenvd "${FILESDIR}/70${PN}" @@ -149,13 +207,14 @@ src_install() { pkg_postinst() { # Hack to fix ownership/perms - chown -fR firebird:firebird "${ROOT}/etc/firebird" "${ROOT}/usr/share/firebird" + chown -fR firebird:firebird "${ROOT}/etc/firebird" "${ROOT}/usr/lib/firebird" chmod 750 "${ROOT}/etc/firebird" elog elog "Firebird is no longer installed in /opt. Binaries are in" - elog "/usr/bin. The core, udfs, etc are in /usr/share/firebird. Logs" + elog "/usr/bin. The core, udfs, etc are in /usr/lib/firebird. Logs" elog "are in /var/log/firebird, and lock files in /var/run/firebird" + elog "The command line tool isql has been renamed to fbsql." elog "Please report any problems or issues to bugs.gentoo.org." elog } @@ -210,5 +269,5 @@ pkg_config() { fi einfo "If you're using UDFs, please remember to move them" - einfo "to /usr/share/firebird/UDF" + einfo "to /usr/lib/firebird/UDF" } diff --git a/dev-db/firebird/firebird-2.1.0.16780_beta2-r1.ebuild b/dev-db/firebird/firebird-2.1.0.16780_beta2-r2.ebuild index f722a64327af..7b413658a372 100644 --- a/dev-db/firebird/firebird-2.1.0.16780_beta2-r1.ebuild +++ b/dev-db/firebird/firebird-2.1.0.16780_beta2-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.1.0.16780_beta2-r1.ebuild,v 1.3 2007/11/09 15:21:43 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.1.0.16780_beta2-r2.ebuild,v 1.1 2007/12/04 23:59:54 wltjr Exp $ inherit flag-o-matic eutils autotools versionator @@ -29,7 +29,13 @@ S="${WORKDIR}/${MY_P}" pkg_setup() { enewgroup firebird 450 - enewuser firebird 450 /bin/bash /usr/share/firebird firebird + enewuser firebird 450 /bin/bash /usr/lib/firebird firebird +} + +function check_sed() { + MSG="sed of $3, required $2 lines modified $1" + einfo "${MSG}" + [[ $1 -ge $2 ]] || die "${MSG}" } src_unpack() { @@ -43,16 +49,72 @@ src_unpack() { unpack "${MY_P}.tar.bz2" + # compile time relative path hacks, ew :( mkdir -p "${WORKDIR}/../etc" \ "${WORKDIR}/usr" \ "${WORKDIR}/var/log/firebird" \ "${WORKDIR}/var/run/firebird" - cd "${WORKDIR}/usr"; ln -s "${WORKDIR}/${MY_P}/gen/firebird/bin" - cd "${WORKDIR}/../etc"; ln -s "${WORKDIR}/${MY_P}/gen/firebird" firebird + cd "${WORKDIR}/usr"; ln -s "${S}/gen/firebird/bin" + cd "${WORKDIR}/../etc"; ln -s "${S}/gen/firebird" firebird cd "${S}" - epatch "${FILESDIR}/${P}-deps-flags-libs-paths.patch" + epatch "${FILESDIR}/${P}-deps-flags-libs.patch" + + einfo "Split up Firebird via relative path hacks" + # sed vs patch for portability and addtional location changes + # based on FIREBIRD=/usr/lib/firebird + check_sed "$(sed -i -e 's:"aliases.conf":"../../../etc/firebird/aliases.conf":w /dev/stdout' \ + src/jrd/db_alias.cpp | wc -l )" "1" "src/jrd/db_alias.cpp" # 1 line + check_sed "$(sed -i -e 's:"isc_event1:"../../../var/run/firebird/isc_event1:w /dev/stdout' \ + -e 's:"isc_lock1:"../../../var/run/firebird/isc_lock1:w /dev/stdout' \ + -e 's:"isc_init1:"../../../var/run/firebird/isc_init1:w /dev/stdout' \ + -e 's:"isc_guard1:"../../../var/run/firebird/isc_guard1:w /dev/stdout' \ + -e 's:"isc_monitor1:"../../../var/run/firebird/isc_monitor1:w /dev/stdout' \ + -e 's:"firebird.log":"../../../var/log/firebird/firebird.log":w /dev/stdout' \ + -e 's:"security2.fdb":"../../../etc/firebird/security2.fdb":w /dev/stdout' \ + src/jrd/file_params.h | wc -l)" "12" "src/jrd/file_params.h" # 12 lines + check_sed "$(sed -i -e 's:"security2.fdb":"../../../etc/firebird/security2.fdb":w /dev/stdout' \ + src/jrd/jrd_pwd.h | wc -l)" "1" "src/jrd/jrd_pwd.h" # 1 line + check_sed "$(sed -i -e 's:"firebird.conf":"../../../etc/firebird/firebird.conf":w /dev/stdout' \ + src/jrd/os/config_root.h | wc -l)" "1" "src/jrd/os/config_root.h" # 1 line + check_sed "$(sed -i -e 's:"bin/fb_cache_print":"../../../usr/bin/fb_cache_print":w /dev/stdout' \ + -e 's:"bin/fb_lock_print":"../../../usr/bin/fb_lock_print":w /dev/stdout' \ + -e 's:"bin/fb_cache_manager":"../../../usr/bin/fb_cache_manager":w /dev/stdout' \ + -e 's:"bin/gstat":"../../../usr/bin/gstat":w /dev/stdout' \ + -e 's:"bin/gbak":"../../../usr/bin/gbak":w /dev/stdout' \ + -e 's:"bin/gdef":"../../../usr/bin/gdef":w /dev/stdout' \ + -e 's:"bin/gsec":"../../../usr/bin/gsec":w /dev/stdout' \ + -e 's:"bin/gjrn":"../../../usr/bin/gjrn":w /dev/stdout' \ + -e 's:"bin/gfix":"../../../usr/bin/gfix":w /dev/stdout' \ + src/jrd/svc.cpp | wc -l)" "26" "src/jrd/svc.cpp" # 26 lines + check_sed "$(sed -i -e 's:"bin/fb_lock_mgr":"../../../usr/bin/fb_lock_mgr":w /dev/stdout' \ + src/lock/lock.cpp | wc -l)" "1" "src/lock/lock.cpp" # 1 line + check_sed "$(sed -i -e 's:m_Root_Path + "firebird.conf":"../../../etc/firebird/firebird.conf":w /dev/stdout' \ + src/utilities/fbcpl/fbdialog.cpp | wc -l)" "1" "src/utilities/fbcpl/fbdialog.cpp" # 1 line + check_sed "$(sed -i -e 's:"security2.fdb":"../../../etc/firebird/security2.fdb":w /dev/stdout' \ + src/utilities/gsec/security.epp | wc -l)" "1" "src/utilities/gsec/security.epp" # 1 line + check_sed "$(sed -i -e 's:"bin/fbserver":"../../../usr/bin/fbserver":w /dev/stdout' \ + src/utilities/guard/guard.cpp | wc -l)" "1" "src/utilities/guard/guard.cpp" # 1 line + check_sed "$(sed -i -e 's:"bin/fbguard":"../../../usr/bin/fbguard":w /dev/stdout' \ + src/utilities/ibmgr/ibmgr.h | wc -l)" "1" "src/utilities/ibmgr/ibmgr.h" # 1 line + check_sed "$(sed -i -e 's:$FIREBIRD/firebird.log:/var/log/firebird/firebird.log:w /dev/stdout' \ + src/utilities/ibmgr/srvrmgr.cpp | wc -l)" "1" "src/utilities/ibmgr/srvrmgr.cpp" # 1 line + + # Rename references to isql to fbsql + check_sed "$(sed -i -e 's:"isql :"fbsql :w /dev/stdout' \ + src/isql/isql.epp | wc -l)" "1" "src/isql/isql.epp" # 1 line + check_sed "$(sed -i -e 's:isql :fbsql :w /dev/stdout' \ + src/msgs/history.sql | wc -l)" "4" "src/msgs/history.sql" # 4 lines + check_sed "$(sed -i -e 's:isql :fbsql :w /dev/stdout' \ + src/msgs/history2.sql | wc -l)" "4" "src/msgs/history2.sql" # 4 lines + check_sed "$(sed -i -e 's:isql :fbsql :w /dev/stdout' \ + -e 's:ISQL :FBSQL :w /dev/stdout' \ + src/msgs/messages.sql | wc -l)" "4" "src/msgs/messages.sql" # 4 lines + check_sed "$(sed -i -e 's:--- ISQL:--- FBSQL:w /dev/stdout' \ + -e 's:isql :fbsql :w /dev/stdout' \ + -e 's:ISQL :FBSQL :w /dev/stdout' \ + src/msgs/messages2.sql | wc -l)" "6" "src/msgs/messages2.sql" # 6 lines find "${S}" -name \*.sh -print0 | xargs -0 chmod +x rm -rf "${S}"/extern/{editline,icu} @@ -64,7 +126,7 @@ src_compile() { filter-flags -fprefetch-loop-arrays filter-mfpmath sse - econf --prefix=/usr/share/firebird --with-editline \ + econf --prefix=/usr/lib/firebird --with-editline \ $(use_enable !xinetd superserver) \ $(use_enable debug) \ ${myconf} || die "econf failed" @@ -75,10 +137,13 @@ src_install() { cd "${S}/gen/firebird" # Seems to be ignored? -# insinto /usr/share/firebird/bin -# dobin bin/{changeRunUser,restoreRootRunUser,changeDBAPassword}.sh + insinto /usr/share/firebird/bin + dobin bin/{changeRunUser,restoreRootRunUser,changeDBAPassword}.sh rm bin/*.sh || die "Could not remove *sh files" + einfo "Renaming isql -> fbsql" + mv bin/isql bin/fbsql + insinto /usr/bin dobin bin/* @@ -89,10 +154,10 @@ src_install() { dolib.so lib/*.so* dolib.a lib/*.a* - insinto /usr/share/firebird + insinto /usr/lib/firebird doins *.msg - insinto /usr/share/firebird/help + insinto /usr/lib/firebird/help doins help/help.fdb insinto /usr/share/firebird/upgrade @@ -105,13 +170,13 @@ src_install() { insopts -m0660 -o firebird -g firebird doins security2.fdb - exeinto /usr/share/firebird/UDF + exeinto /usr/lib/firebird/UDF doexe UDF/*.so - exeinto /usr/share/firebird/intl - newexe intl/libfbintl.so fbintl + exeinto /usr/lib/firebird/intl + newexe intl/libfbintl.so fbintl.so - insinto /usr/share/firebird/intl + insinto /usr/lib/firebird/intl doins ../install/misc/fbintl.conf diropts -m 755 -o firebird -g firebird @@ -131,7 +196,7 @@ src_install() { newins "${FILESDIR}/${PN}.xinetd.2" ${PN} || die "newins xinetd file failed" else newinitd "${FILESDIR}/${PN}.init.d.2" ${PN} - newconfd "${FILESDIR}/firebird.conf.d.2" ${PN} + newconfd "${FILESDIR}/firebird.conf.d" ${PN} fperms 640 /etc/conf.d/firebird fi doenvd "${FILESDIR}/70${PN}" @@ -147,13 +212,14 @@ src_install() { pkg_postinst() { # Hack to fix ownership/perms - chown -fR firebird:firebird "${ROOT}/etc/firebird" "${ROOT}/usr/share/firebird" + chown -fR firebird:firebird "${ROOT}/etc/firebird" "${ROOT}/usr/lib/firebird" chmod 750 "${ROOT}/etc/firebird" elog elog "Firebird is no longer installed in /opt. Binaries are in" - elog "/usr/bin. The core, udfs, etc are in /usr/share/firebird. Logs" + elog "/usr/bin. The core, udfs, etc are in /usr/lib/firebird. Logs" elog "are in /var/log/firebird, and lock files in /var/run/firebird" + elog "The command line tool isql has been renamed to fbsql." elog "Please report any problems or issues to bugs.gentoo.org." elog } @@ -208,5 +274,5 @@ pkg_config() { fi einfo "If you're using UDFs, please remember to move them" - einfo "to /usr/share/firebird/UDF" + einfo "to /usr/lib/firebird/UDF" } |