Firebird 2.0 MacOS Classic Intel Build

2025-01-22 16:03:03 +01:00 · 2007-03-09 10:32:58 +00:00 · 2007-03-09 10:32:58 +00:00 · 68b261513c
commit 68b261513c
parent 865122bd4e
44 changed files with 1009 additions and 52 deletions
--- a/builds/install/arch-specific/darwin/Description.plist
+++ b/builds/install/arch-specific/darwin/Description.plist
@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IFPkgDescriptionDeleteWarning</key>
+	<string></string>
+	<key>IFPkgDescriptionDescription</key>
+	<string>_FB_BUILD_SUFFIX_</string>
+	<key>IFPkgDescriptionTitle</key>
+	<string>Firebird Database</string>
+	<key>IFPkgDescriptionVersion</key>
+	<string>_SMFB_BUILD_SUFFIX_</string>
+</dict>
+</plist>
--- a/builds/install/arch-specific/darwin/FB.info
+++ b/builds/install/arch-specific/darwin/FB.info
@ -0,0 +1,16 @@
+Title Firebird Database
+Version 2.0.2
+Description Firebird 2.0.2
+DefaultLocation /tmp/install
+DeleteWarning 
+
+### Package Flags
+
+NeedsAuthorization YES
+Required YES
+Relocatable YES
+RequiresReboot NO
+UseUserMask YES
+OverwritePermissions NO
+InstallFat NO
+RootVolumeOnly NO
--- a/builds/install/arch-specific/darwin/Info.plist
+++ b/builds/install/arch-specific/darwin/Info.plist
@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleGetInfoString</key>
+	<string>_MFB_BUILD_SUFFIX_</string>
+	<key>CFBundleIdentifier</key>
+	<string>org.firebirdsql.Firebird</string>
+	<key>CFBundleName</key>
+	<string>_MFB_BUILD_SUFFIX_</string>
+	<key>CFBundleShortVersionString</key>
+	<string>_SMFB_BUILD_SUFFIX_</string>
+	<key>IFMajorVersion</key>
+	<integer>_MAJOR_VERS_</integer>
+	<key>IFMinorVersion</key>
+	<integer>_MINOR_VERS_</integer>
+	<key>IFPkgFlagAllowBackRev</key>
+	<false/>
+	<key>IFPkgFlagAuthorizationAction</key>
+	<string>AdminAuthorization</string>
+	<key>IFPkgFlagDefaultLocation</key>
+	<string>/Library/Frameworks</string>
+	<key>IFPkgFlagInstallFat</key>
+	<false/>
+	<key>IFPkgFlagIsRequired</key>
+	<true/>
+	<key>IFPkgFlagRelocatable</key>
+	<true/>
+	<key>IFPkgFlagRestartAction</key>
+	<string>NoRestart</string>
+	<key>IFPkgFlagRootVolumeOnly</key>
+	<false/>
+	<key>IFPkgFlagUpdateInstalledLanguages</key>
+	<false/>
+	<key>IFPkgFormatVersion</key>
+	<real>0.10000000149011612</real>
+</dict>
+</plist>
--- a/builds/install/arch-specific/darwin/License.txt
+++ b/builds/install/arch-specific/darwin/License.txt
@ -0,0 +1,104 @@
+INTERBASE PUBLIC LICENSE 
+Version 1.0 
+1. Definitions. 
+1.0.1. "Commercial Use" means distribution or otherwise making the Covered Code available to a third party. 
+1.1. ''Contributor'' means each entity that creates or contributes to the creation of Modifications. 
+1.2. ''Contributor Version'' means the combination of the Original Code, prior Modifications used by a Contributor, and the Modifications made by that particular Contributor. 
+1.3. ''Covered Code'' means the Original Code or Modifications or the combination of the Original Code and Modifications, in each case including portions thereof. 
+1.4. ''Electronic Distribution Mechanism'' means a mechanism generally accepted in the software development community for the electronic transfer of data. 
+1.5. ''Executable'' means Covered Code in any form other than Source Code. 
+1.6. ''Initial Developer'' means the individual or entity identified as the Initial Developer in the Source Code notice required by Exhibit A. 
+1.7. ''Larger Work'' means a work which combines Covered Code or portions thereof with code not governed by the terms of this License. 
+1.8. ''License'' means this document. 
+1.8.1. "Licensable" means having the right to grant, to the maximum extent possible, whether at the time of the initial grant or subsequently acquired, any and all of the rights conveyed herein. 
+1.9. ''Modifications'' means any addition to or deletion from the substance or structure of either the Original Code or any previous Modifications. When Covered Code is released as a series of files, a Modification is: 
+A. Any addition to or deletion from the contents of a file containing Original Code or previous Modifications. 
+B. Any new file that contains any part of the Original Code or previous Modifications. 
+1.10. ''Original Code'' means Source Code of computer software code which is described in the Source Code notice required by Exhibit A as Original Code, and which, at the time of its release under this License is not already Covered Code governed by this License. 
+1.10.1. "Patent Claims" means any patent claim(s), now owned or hereafter acquired, including without limitation, method, process, and apparatus claims, in any patent Licensable by grantor. 
+1.11. ''Source Code'' means the preferred form of the Covered Code for making modifications to it, including all modules it contains, plus any associated interface definition files, scripts used to control compilation and installation of an Executable, or source code differential comparisons against either the Original Code or another well known, available Covered Code of the Contributor's choice. The Source Code can be in a compressed or archival form, provided the appropriate decompression or de-archiving software is widely available for no charge. 
+1.12. "You'' (or "Your") means an individual or a legal entity exercising rights under, and complying with, all of the terms of, this License or a future version of this License issued under Section 6.1. For legal entities, "You'' includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, "control'' means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity.
+2. Source Code License. 
+2.1. The Initial Developer Grant. 
+The Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license, subject to third party intellectual property claims: 
+(a) under intellectual property rights (other than patent or trademark) Licensable by Initial Developer to use, reproduce, modify, display, perform, sublicense and distribute the Original Code (or portions thereof) with or without Modifications, and/or as part of a Larger Work; and 
+(b) under Patents Claims infringed by the making, using or selling of Original Code, to make, have made, use, practice, sell, and offer for sale, and/or otherwise dispose of the Original Code (or portions thereof). 
+(c) the licenses granted in this Section 2.1(a) and (b) are effective on the date Initial Developer first distributes Original Code under the terms of this License. 
+(d) Notwithstanding Section 2.1(b) above, no patent license is granted: 1) for code that You delete from the Original Code; 2) separate from the Original Code; or 3) for infringements caused by: i) the modification of the Original Code or ii) the combination of the Original Code with other software or devices. 
+2.2. Contributor Grant. 
+Subject to third party intellectual property claims, each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license 
+(a) under intellectual property rights (other than patent or trademark) Licensable by Contributor, to use, reproduce, modify, display, perform, sublicense and distribute the Modifications created by such Contributor (or portions thereof) either on an unmodified basis, with other Modifications, as Covered Code and/or as part of a Larger Work; and 
+(b) under Patent Claims infringed by the making, using, or selling of Modifications made by that Contributor either alone and/or in combination with its Contributor Version (or portions of such combination), to make, use, sell, offer for sale, have made, and/or otherwise dispose of: 1) Modifications made by that Contributor (or portions thereof); and 2) the combination of Modifications made by that Contributor with its Contributor Version (or portions of such combination). 
+(c) the licenses granted in Sections 2.2(a) and 2.2(b) are effective on the date Contributor first makes Commercial Use of the Covered Code.
+(d) Notwithstanding Section 2.2(b) above, no patent license is granted: 1) for any code that Contributor has deleted from the Contributor Version; 2) separate from the Contributor Version; 3) for infringements caused by: i) third party modifications of Contributor Version or ii) the combination of Modifications made by that Contributor with other software (except as part of the Contributor Version) or other devices; or 4) under Patent Claims infringed by Covered Code in the absence of Modifications made by that Contributor.
+3. Distribution Obligations. 
+3.1. Application of License. 
+The Modifications which You create or to which You contribute are governed by the terms of this License, including without limitation Section 2.2. The Source Code version of Covered Code may be distributed only under the terms of this License or a future version of this License released under Section 6.1, and You must include a copy of this License with every copy of the Source Code You distribute. You may not offer or impose any terms on any Source Code version that alters or restricts the applicable version of this License or the recipients' rights hereunder. However, You may include an additional document offering the additional rights described in Section 3.5. 
+3.2. Availability of Source Code. 
+Any Modification which You create or to which You contribute must be made available in Source Code form under the terms of this License either on the same media as an Executable version or via an accepted Electronic Distribution Mechanism to anyone to whom you made an Executable version available; and if made available via Electronic Distribution Mechanism, must remain available for at least twelve (12) months after the date it initially became available, or at least six (6) months after a subsequent version of that particular Modification has been made available to such recipients. You are responsible for ensuring that the Source Code version remains available even if the Electronic Distribution Mechanism is maintained by a third party. 
+3.3. Description of Modifications. 
+You must cause all Covered Code to which You contribute to contain a file documenting the changes You made to create that Covered Code and the date of any change. You must include a prominent statement that the Modification is derived, directly or indirectly, from Original Code provided by the Initial Developer and including the name of the Initial Developer in (a) the Source Code, and (b) in any notice in an Executable version or related documentation in which You describe the origin or ownership of the Covered Code. 
+3.4. Intellectual Property Matters
+(a) Third Party Claims. 
+If Contributor has knowledge that a license under a third party's intellectual property rights is required to exercise the rights granted by such Contributor under Sections 2.1 or 2.2, Contributor must include a text file with the Source Code distribution titled "LEGAL'' which describes the claim and the party making the claim in sufficient detail that a recipient will know whom to contact. If Contributor obtains such knowledge after the Modification is made available as described in Section 3.2, Contributor shall promptly modify the LEGAL file in all copies Contributor makes available thereafter and shall take other steps (such as notifying appropriate mailing lists or newsgroups) reasonably calculated to inform those who received the Covered Code that new knowledge has been obtained. 
+(b) Contributor APIs. 
+If Contributor's Modifications include an application programming interface and Contributor has knowledge of patent licenses which are reasonably necessary to implement that API, Contributor must also include this information in the LEGAL file. 
+(c) Representations. 
+Contributor represents that, except as disclosed pursuant to Section 3.4(a) above, Contributor believes that Contributor's Modifications are Contributor's original creation(s) and/or Contributor has sufficient rights to grant the rights conveyed by this License.
+3.5. Required Notices. 
+You must duplicate the notice in Exhibit A in each file of the Source Code. If it is not possible to put such notice in a particular Source Code file due to its structure, then You must include such notice in a location (such as a relevant directory) where a user would be likely to look for such a notice. If You created one or more Modification(s) You may add your name as a Contributor to the notice described in Exhibit A. You must also duplicate this License in any documentation for the Source Code where You describe recipients' rights or ownership rights relating to Covered Code. You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Code. However, You may do so only on Your own behalf, and not on behalf of the Initial Developer or any Contributor. You must make it absolutely clear than any such warranty, support, indemnity or liability obligation is offered by You alone, and You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of warranty, support, indemnity or liability terms You offer.
+3.6. Distribution of Executable Versions. 
+You may distribute Covered Code in Executable form only if the requirements of Section 3.1-3.5 have been met for that Covered Code, and if You include a notice stating that the Source Code version of the Covered Code is available under the terms of this License, including a description of how and where You have fulfilled the obligations of Section 3.2. The notice must be conspicuously included in any notice in an Executable version, related documentation or collateral in which You describe recipients' rights relating to the Covered Code. You may distribute the Executable version of Covered Code or ownership rights under a license of Your choice, which may contain terms different from this License, provided that You are in compliance with the terms of this License and that the license for the Executable version does not attempt to limit or alter the recipient's rights in the Source Code version from the rights set forth in this License. If You distribute the Executable version under a different license You must make it absolutely clear that any terms which differ from this License are offered by You alone, not by the Initial Developer or any Contributor. You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of any such terms You offer. 
+3.7. Larger Works. 
+You may create a Larger Work by combining Covered Code with other code not governed by the terms of this License and distribute the Larger Work as a single product. In such a case, You must make sure the requirements of this License are fulfilled for the Covered Code.
+4. Inability to Comply Due to Statute or Regulation. 
+If it is impossible for You to comply with any of the terms of this License with respect to some or all of the Covered Code due to statute, judicial order, or regulation then You must: (a) comply with the terms of this License to the maximum extent possible; and (b) describe the limitations and the code they affect. Such description must be included in the LEGAL file described in Section 3.4 and must be included with all distributions of the Source Code. Except to the extent prohibited by statute or regulation, such description must be sufficiently detailed for a recipient of ordinary skill to be able to understand it.
+5. Application of this License. 
+This License applies to code to which the Initial Developer has attached the notice in Exhibit A and to related Covered Code.
+6. Versions of the License. 
+6.1. New Versions. 
+Inprise Corporation (''Inprise'') may publish revised and/or new versions of the License from time to time. Each version will be given a distinguishing version number. 
+6.2. Effect of New Versions. 
+Once Covered Code has been published under a particular version of the License, You may always continue to use it under the terms of that version. You may also choose to use such Covered Code under the terms of any subsequent version of the License published by Inprise. No one other than Inprise has the right to modify the terms applicable to Covered Code created under this License. 
+6.3. Derivative Works. 
+If You create or use a modified version of this License (which you may only do in order to apply it to code which is not already Covered Code governed by this License), You must (a) rename Your license so that the phrases ''Mozilla'', ''MOZILLAPL'', ''MOZPL'', ''Netscape'', "MPL", ''NPL", "Inprise", "ISC", "InterBase", "IB'' or any confusingly similar phrase do not appear in your license (except to note that your license differs from this License) and (b) otherwise make it clear that Your version of the license contains terms which differ from the Mozilla Public License and Netscape Public License. (Filling in the name of the Initial Developer, Original Code or Contributor in the notice described in Exhibit A shall not of themselves be deemed to be modifications of this License.)
+6.4 Origin of the InterBase Public License.
+The InterBase Public License V 1.0 is based on the Mozilla Public License V 1.1 with the following changes: 
+1. The license is published by Inprise Corporation. Only Inprise Corporation can modify the terms applicable to Covered Code. 
+2. The license can be modified and used for code which is not already governed by this license. Modified versions of the license must be renamed to avoid confusion with Netscape's or Inprise Corporation's public license and must include a description of changes from the InterBase Public License.
+3. The name of the license in Exhibit A is the "InterBase Public License". 
+4. The reference to an alternative license in Exhibit A has been removed.
+5. Amendments I, II, III, V, and VI have been deleted.
+6. Exhibit A, Netscape Public License has been deleted
+7. A new amendment (II) has been added, describing the required and restricted rights to use the trademarks of Inprise Corporation.
+7. DISCLAIMER OF WARRANTY. 
+COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS'' BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+8. TERMINATION. 
+8.1. This License and the rights granted hereunder will terminate automatically if You fail to comply with terms herein and fail to cure such breach within 30 days of becoming aware of the breach. All sublicenses to the Covered Code which are properly granted shall survive any termination of this License. Provisions which, by their nature, must remain in effect beyond the termination of this License shall survive. 
+8.2. If You initiate litigation by asserting a patent infringement claim (excluding declaratory judgment actions) against Initial Developer or a Contributor (the Initial Developer or Contributor against whom You file such action is referred to as "Participant") alleging that: 
+(a) such Participant's Contributor Version directly or indirectly infringes any patent, then any and all rights granted by such Participant to You under Sections 2.1 and/or 2.2 of this License shall, upon 60 days notice from Participant terminate prospectively, unless if within 60 days after receipt of notice You either: (i) agree in writing to pay Participant a mutually agreeable reasonable royalty for Your past and future use of Modifications made by such Participant, or (ii) withdraw Your litigation claim with respect to the Contributor Version against such Participant. If within 60 days of notice, a reasonable royalty and payment arrangement are not mutually agreed upon in writing by the parties or the litigation claim is not withdrawn, the rights granted by Participant to You under Sections 2.1 and/or 2.2 automatically terminate at the expiration of the 60 day notice period specified above. 
+(b) any software, hardware, or device, other than such Participant's Contributor Version, directly or indirectly infringes any patent, then any rights granted to You by such Participant under Sections 2.1(b) and 2.2(b) are revoked effective as of the date You first made, used, sold, distributed, or had made, Modifications made by that Participant. 
+8.3. If You assert a patent infringement claim against Participant alleging that such Participant's Contributor Version directly or indirectly infringes any patent where such claim is resolved (such as by license or settlement) prior to the initiation of patent infringement litigation, then the reasonable value of the licenses granted by such Participant under Sections 2.1 or 2.2 shall be taken into account in determining the amount or value of any payment or license. 
+8.4. In the event of termination under Sections 8.1 or 8.2 above, all end user license agreements (excluding distributors and resellers) which have been validly granted by You or any distributor hereunder prior to termination shall survive termination.
+9. LIMITATION OF LIABILITY.
+UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
+10. U.S. GOVERNMENT END USERS. 
+The Covered Code is a ''commercial item,'' as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of ''commercial computer software'' and ''commercial computer software documentation,'' as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Code with only those rights set forth herein. 
+11. MISCELLANEOUS. 
+This License represents the complete agreement concerning subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. This License shall be governed by California law provisions (except to the extent applicable law, if any, provides otherwise), excluding its conflict-of-law provisions. With respect to disputes in which at least one party is a citizen of, or an entity chartered or registered to do business in the United States of America, any litigation relating to this License shall be subject to the jurisdiction of the Federal Courts of the Northern District of California, with venue lying in Santa Clara County, California, with the losing party responsible for costs, including without limitation, court costs and reasonable attorneys' fees and expenses. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any law or regulation which provides that the language of a contract shall be construed against the drafter shall not apply to this License.
+12. RESPONSIBILITY FOR CLAIMS. 
+As between Initial Developer and the Contributors, each party is responsible for claims and damages arising, directly or indirectly, out of its utilization of rights under this License and You agree to work with Initial Developer and Contributors to distribute such responsibility on an equitable basis. Nothing herein is intended or shall be deemed to constitute any admission of liability. 
+13. MULTIPLE-LICENSED CODE. 
+Initial Developer may designate portions of the Covered Code as "Multiple-Licensed". "Multiple-Licensed" means that the Initial Developer permits you to utilize portions of the Covered Code under Your choice of the IPL or the alternative licenses, if any, specified by the Initial Developer in the file described in Exhibit A.
+EXHIBIT A - InterBase Public License.
+``The contents of this file are subject to the InterBase Public License Version 1.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.Inprise.com/IPL.html 
+Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License. 
+The Original Code was created by Inprise Corporation and its predecessors. 
+Portions created by Inprise Corporation are Copyright (C) Inprise Corporation. All Rights Reserved. 
+Contributor(s): ______________________________________. 
+AMENDMENTS 
+I. Inprise and logo. This License does not grant any rights to use the trademarks "Inprise'', "InterBase," "Java" or "JavaScript" even if such marks are included in the Original Code or Modifications. 
+II. Trademark Usage. 
+II.1. Advertising Materials. All advertising materials mentioning features or use of the covered Code must display the following acknowledgement: "This product includes software developed by Inprise Corporation. "
+II.2. Endorsements. The names "Inprise," "InterBase," "ISC," and "IB" must not be used to endorse or promote Contributor Versions or Larger Works without the prior written permission of Inprise.
+II.3. Product Names. Contributor Versions and Larger Works may not be called "Inprise" or "InterBase" nor may the words "Inprise" or "InterBase" appear in their names without the prior written permission of Inprise Corporation.
--- a/builds/install/arch-specific/darwin/Makefile.in
+++ b/builds/install/arch-specific/darwin/Makefile.in
@ -1,4 +1,167 @@
 # EKU: taken from Makefile.in.firebird
+ROOT=..
+
+include     $(ROOT)/gen/make.defaults
+include		$(ROOT)/gen/make.platform
+include     $(ROOT)/gen/make.rules
+include     $(ROOT)/gen/make.shared.variables
+
+@SET_MAKE@
+
+DIR = $(ROOT)/gen/firebird/installer_scratch
+
+export BLOCKSIZE
+
+
+all: package
+
+FB_INST_VERS:=$(shell cpp -DDARWIN -I.  ../builds/install/arch-specific/darwin/buildsuffix.c | tail -1 | sed -e 's/" "//g' -e 's/"//g' -e 's/Firebird[ ]*//' -e 's/Release Candidate/RC/' -e 's/ /-/g')
+FB_VER_SUFFIX:=$(shell cpp -DDARWIN -I.  ../builds/install/arch-specific/darwin/buildsuffix.c | tail -1 | sed -e 's/" "//g' -e 's/"//g')
+FB_VER_SUFFIX_SM:=$(shell cpp -DDARWIN -I.  ../builds/install/arch-specific/darwin/buildsuffix.c | tail -1 | sed -e 's/" "//g' -e 's/"//g' -e 's/Firebird[ ]*//' -e 's/Release Candidate/RC/')
+FB_VER_SUFFIX_M:=$(shell cpp -DDARWIN -I.  ../builds/install/arch-specific/darwin/buildsuffix.c | tail -1 | sed -e 's/" "//g' -e 's/"//g' -e 's/Release Candidate/RC/')
+FB_MAJOR_VERS:=$(shell cpp -DDARWIN -I.  ../builds/install/arch-specific/darwin/majorvers.c | tail -1 | sed -e 's/" "//g' -e 's/"//g')
+FB_MINOR_VERS:=$(shell cpp -DDARWIN -I.  ../builds/install/arch-specific/darwin/minorvers.c | tail -1 | sed -e 's/" "//g' -e 's/"//g')
+FB_PLATFORM:=$(shell uname -p)
+
+package packages dist: package_@FIREBIRD_ARCH_TYPE@
+#package packages dist: package_classic
+
+package_classic package_embedded: INST_NM=Firebird-CS-$(FB_INST_VERS).$(FB_MINOR_VERS)-$(FB_PLATFORM)
+package_classic package_embedded: BLOCKSIZE=1048576
+package_classic package_embedded:
+	-rm -rf $(DIR)
+	mkdir -p $(DIR)/t
+	mv $(ROOT)/gen/firebird/frameworks/FirebirdCS.framework \
+			$(DIR)/t/Firebird.framework
+	sh -c 'cd $(DIR)/t; pax -w -f ../Archive.pax .; mkbom . ../Archive.bom'
+	gzip $(DIR)/Archive.pax
+	mv $(DIR)/t/Firebird.framework \
+		$(ROOT)/gen/firebird/frameworks/FirebirdCS.framework
+	mkdir -p $(DIR)/$(INST_NM).pkg/Contents/Resources
+	mv $(DIR)/Archive.* $(DIR)/$(INST_NM).pkg/Contents
+	cp ../builds/install/arch-specific/darwin/PkgInfo $(DIR)/$(INST_NM).pkg/Contents
+	sed -e 's/_FB_BUILD_SUFFIX_/$(FB_VER_SUFFIX)/g' \
+			-e 's/_SMFB_BUILD_SUFFIX_/$(FB_VER_SUFFIX_SM)/g' \
+			-e 's/_MFB_BUILD_SUFFIX_/$(FB_VER_SUFFIX_M)/g' \
+			-e 's/_MAJOR_VERS_/$(FB_MAJOR_VERS)/g' \
+			-e 's/_MINOR_VERS_/$(FB_MINOR_VERS)/g' \
+			../builds/install/arch-specific/darwin/Info.plist \
+			> $(DIR)/$(INST_NM).pkg/Contents/Info.plist
+	sed -e 's/_FB_BUILD_SUFFIX_/$(FB_VER_SUFFIX)/g' \
+			-e 's/_SMFB_BUILD_SUFFIX_/$(FB_VER_SUFFIX_SM)/g' \
+			-e 's/_MFB_BUILD_SUFFIX_/$(FB_VER_SUFFIX_M)/g' \
+			-e 's/_MAJOR_VERS_/$(FB_MAJOR_VERS)/g' \
+			-e 's/_MINOR_VERS_/$(FB_MINOR_VERS)/g' \
+			../builds/install/arch-specific/darwin/Description.plist \
+			> $(DIR)/$(INST_NM).pkg/Contents/Resources/Description.plist
+	cp -r ../builds/install/arch-specific/darwin/Firebird.startupitem \
+			$(DIR)/$(INST_NM).pkg/Contents/Resources/StartupItem
+	rm -rf `find $(DIR)/$(INST_NM).pkg/Contents/Resources/StartupItem -name CVS`
+	cp ../builds/install/arch-specific/darwin/installer_background.pdf \
+			$(DIR)/$(INST_NM).pkg/Contents/Resources/background.pdf
+	cp ../builds/install/arch-specific/darwin/install-script \
+			$(DIR)/$(INST_NM).pkg/Contents/Resources/postinstall
+	cp ../builds/install/arch-specific/darwin/install-script \
+			$(DIR)/$(INST_NM).pkg/Contents/Resources/postupgrade
+	cp ../builds/install/arch-specific/darwin/preinstall-script \
+			$(DIR)/$(INST_NM).pkg/Contents/Resources/preinstall
+	cp ../builds/install/arch-specific/darwin/preupgrade-script \
+			$(DIR)/$(INST_NM).pkg/Contents/Resources/preupgrade
+	chmod a+rx $(DIR)/$(INST_NM).pkg/Contents/Resources/pre*
+	chmod a+rx $(DIR)/$(INST_NM).pkg/Contents/Resources/post*
+	cp ../builds/install/arch-specific/darwin/*.txt \
+			$(DIR)/$(INST_NM).pkg/Contents/Resources
+	ln -s ../Archive.bom $(DIR)/$(INST_NM).pkg/Contents/Resources/$(INST_NM).bom
+	ln -s ../Archive.pax.gz \
+				$(DIR)/$(INST_NM).pkg/Contents/Resources/$(INST_NM).pax.gz
+	echo "NumFiles 0" > \
+			$(DIR)/$(INST_NM).pkg/Contents/Resources/$(INST_NM).sizes
+	echo -n "InstalledSize " >> \
+			$(DIR)/$(INST_NM).pkg/Contents/Resources/$(INST_NM).sizes
+	du -c $(ROOT)/gen/firebird/frameworks/FirebirdCS.framework \
+			| tail -1 | sed -e 's/[\t ]*total//' \
+			>> $(DIR)/$(INST_NM).pkg/Contents/Resources/$(INST_NM).sizes
+	echo "CompressedSize 0" >> \
+			$(DIR)/$(INST_NM).pkg/Contents/Resources/$(INST_NM).sizes
+	-rm -rf $(ROOT)/gen/firebird/$(INST_NM).pkg
+	mv $(DIR)/$(INST_NM).pkg $(ROOT)/gen/firebird
+	rm -rf $(DIR)
+
+# cpp -DDARWIN -I. install/arch-specific/darwin/fullvers.c | tail -1 | sed -e 's/" "//g' -e 's/"//g'
+	
+package_super package_server: INST_NM=Firebird-SS-$(FB_INST_VERS)
+package_super package_server: BLOCKSIZE=1048576
+package_super package_server:
+	-rm -rf $(DIR)
+	mkdir -p $(DIR)/t
+	mv $(ROOT)/gen/firebird/frameworks/FirebirdSS.framework \
+			$(DIR)/t/Firebird.framework
+	sh -c 'cd $(DIR)/t; pax -w -f ../Archive.pax .; mkbom . ../Archive.bom'
+	gzip $(DIR)/Archive.pax
+	mv $(DIR)/t/Firebird.framework \
+		$(ROOT)/gen/firebird/frameworks/FirebirdSS.framework
+	mkdir -p $(DIR)/$(INST_NM).pkg/Contents/Resources
+	mv $(DIR)/Archive.* $(DIR)/$(INST_NM).pkg/Contents
+	cp install/arch-specific/darwin/PkgInfo $(DIR)/$(INST_NM).pkg/Contents
+	sed -e 's/_FB_BUILD_SUFFIX_/$(FB_VER_SUFFIX)/g' \
+			-e 's/_SMFB_BUILD_SUFFIX_/$(FB_VER_SUFFIX_SM)/g' \
+			-e 's/_MFB_BUILD_SUFFIX_/$(FB_VER_SUFFIX_M)/g' \
+			-e 's/_MAJOR_VERS_/$(FB_MAJOR_VERS)/g' \
+			-e 's/_MINOR_VERS_/$(FB_MINOR_VERS)/g' \
+			install/arch-specific/darwin/Info.plist \
+			> $(DIR)/$(INST_NM).pkg/Contents/Info.plist
+	sed -e 's/_FB_BUILD_SUFFIX_/$(FB_VER_SUFFIX)/g' \
+			-e 's/_SMFB_BUILD_SUFFIX_/$(FB_VER_SUFFIX_SM)/g' \
+			-e 's/_MFB_BUILD_SUFFIX_/$(FB_VER_SUFFIX_M)/g' \
+			-e 's/_MAJOR_VERS_/$(FB_MAJOR_VERS)/g' \
+			-e 's/_MINOR_VERS_/$(FB_MINOR_VERS)/g' \
+			install/arch-specific/darwin/Description.plist \
+			> $(DIR)/$(INST_NM).pkg/Contents/Resources/Description.plist
+	cp install/arch-specific/darwin/installer_background.pdf \
+			$(DIR)/$(INST_NM).pkg/Contents/Resources/background.pdf
+	cp install/arch-specific/darwin/install-script \
+			$(DIR)/$(INST_NM).pkg/Contents/Resources/postinstall
+	cp -r install/arch-specific/darwin/Firebird.startupitem \
+			$(DIR)/$(INST_NM).pkg/Contents/Resources/StartupItem
+	rm -rf `find $(DIR)/$(INST_NM).pkg/Contents/Resources/StartupItem -name CVS`
+	cp install/arch-specific/darwin/install-script \
+			$(DIR)/$(INST_NM).pkg/Contents/Resources/postupgrade
+	cp install/arch-specific/darwin/preinstall-script \
+			$(DIR)/$(INST_NM).pkg/Contents/Resources/preinstall
+	cp install/arch-specific/darwin/preupgrade-script \
+			$(DIR)/$(INST_NM).pkg/Contents/Resources/preupgrade
+	chmod a+rx $(DIR)/$(INST_NM).pkg/Contents/Resources/pre*
+	chmod a+rx $(DIR)/$(INST_NM).pkg/Contents/Resources/post*
+	cp install/arch-specific/darwin/*.txt \
+			$(DIR)/$(INST_NM).pkg/Contents/Resources
+	ln -s ../Archive.bom $(DIR)/$(INST_NM).pkg/Contents/Resources/$(INST_NM).bom
+	ln -s ../Archive.pax.gz \
+				$(DIR)/$(INST_NM).pkg/Contents/Resources/$(INST_NM).pax.gz
+	echo "NumFiles 0" > \
+			$(DIR)/$(INST_NM).pkg/Contents/Resources/$(INST_NM).sizes
+	echo -n "InstalledSize " >> \
+			$(DIR)/$(INST_NM).pkg/Contents/Resources/$(INST_NM).sizes
+	du -c $(ROOT)/gen/firebird/frameworks/FirebirdSS.framework \
+			| tail -1 | sed -e 's/[\t ]*total//' \
+			>> $(DIR)/$(INST_NM).pkg/Contents/Resources/$(INST_NM).sizes
+	echo "CompressedSize 0" >> \
+			$(DIR)/$(INST_NM).pkg/Contents/Resources/$(INST_NM).sizes
+	-rm -rf $(ROOT)/gen/firebird/$(INST_NM).pkg
+	mv $(DIR)/$(INST_NM).pkg $(ROOT)/gen/firebird
+	rm -rf $(DIR)
+
+# cpp -DDARWIN -I. install/arch-specific/darwin/fullvers.c | tail -1 | sed -e 's/" "//g' -e 's/"//g'
+	
+
+install: install_@FIREBIRD_ARCH_TYPE@
+	
+install_super install_server:
+	installer -verbose -dumplog -pkg \
+			`pwd`/$(ROOT)/gen/firebird/Firebird-SS-$(FB_INST_VERS).pkg -target /
+
+install_embedded install_classic:
+	installer -verbose -dumplog -pkg \
+			`pwd`/$(ROOT)/gen/firebird/Firebird-CS-$(FB_INST_VERS).pkg -target /

 darwin_installer_common: force
 	$(QUIET_ECHO) "Building Firebird Installer..."
--- a/builds/install/arch-specific/darwin/PkgInfo
+++ b/builds/install/arch-specific/darwin/PkgInfo
@ -0,0 +1 @@
+pmkrpkg1
--- a/builds/install/arch-specific/darwin/Readme.txt
+++ b/builds/install/arch-specific/darwin/Readme.txt
@ -0,0 +1,7 @@
+The Firebird install process will create a new user: firebird. This is for added security. Please don't delete this user unless you know what you are doing. The installer installs the Firebird framework in /Library/Frameworks. The default installs one super-user database user: "sysdba", password "masterkey". You should change that password using gsec according to the documentation.
+
+All the standard command line executables are installed in /Library/Frameworks/Firebird.framework/Resources/bin. If you are interested in helping with the Firebird Project please contact us via the Firebird website at www.firebirdsql.org.
+
+Please note that every MacOS X user you want to have access to your database MUST have read/write permissions on the .fdb file.
+
+The release notes can be found in the doc directory  Generic documentation for Firebird can be found on the IBPhoenix web site at www.ibphoenix.com, as well as at the Firebird website. There is also a  yahoo group named "ib-support" if you have any problems with firebird.
--- a/builds/install/arch-specific/darwin/Welcome.txt
+++ b/builds/install/arch-specific/darwin/Welcome.txt
@ -0,0 +1,5 @@
+Thank you for choosing the Firebird relational database engine.
+
+Firebird is a relational database offering many ANSI SQL-92 features that runs on Linux, Windows, and a variety of Unix platforms. Firebird offers excellent concurrency, high performance, and powerful language support for stored procedures and triggers. It has been used in production systems, under a variety of names since 1981. 
+
+Firebird is a commercially independent project of C and C++ programmers, technical advisors and supporters developing and enhancing a multi-platform relational database management system based on the source code released by Inprise Corp (now known as Borland Software Corp) under the InterBase Public License v.1.0 on 25 July, 2000.
--- a/builds/install/arch-specific/darwin/buildsuffix.c
+++ b/builds/install/arch-specific/darwin/buildsuffix.c
@ -0,0 +1,2 @@
+#include "../../../../src/jrd/license.h"
+FB_BUILD_SUFFIX
--- a/builds/install/arch-specific/darwin/fullvers.c
+++ b/builds/install/arch-specific/darwin/fullvers.c
@ -0,0 +1,2 @@
+#include "jrd/license.h"
+FB_VERSION
--- a/builds/install/arch-specific/darwin/install-script
+++ b/builds/install/arch-specific/darwin/install-script
@ -0,0 +1,234 @@
+#!/bin/sh
+#
+# $Id: install-script,v 1.2 2007-03-09 10:32:41 paulbeach Exp $
+#
+# Script args:
+# $0: full path to script
+# $1: full path to top level package dir, no trailing slash
+# $2: full path to installed location
+# $3:  ????? Path to install Volume????
+# $4:  ?????
+
+FB_FW="$2/Firebird.framework"
+FB_RES="$FB_FW/Versions/A/Resources"
+INST_RES="$FB_RES/installer_files"
+
+# Install and start sysv semaphores
+if test `uname -r | sed -e 's/\.[0-9]*//g'` -lt 6; then
+	if [ -e "SysV Semaphores" ]; then
+		mkdir -p /Library/StartupItems
+		if [ ! -e "/Library/StartupItems/SysV Semaphores" ]; then
+			cp -r "$INST_RES/SysV Semaphores" /Library/StartupItems
+			"/Library/StartupItems/SysV Semaphores/SysV Semaphores" start
+		fi
+	fi
+fi
+
+# Setup our services entry, our user account, and our group
+#
+#
+# Start with the service entry
+if niutil -list . /services/gds_db 2&>1 /dev/null ; then
+	echo -n
+else
+	niutil -create . /services/gds_db
+	niutil -createprop . /services/gds_db port 3050
+	niutil -createprop . /services/gds_db protocol tcp tcp
+fi
+
+# Now for the group.  If the firebird group already exists, remember the
+#  id if we need it to create the firebird user
+if niutil -list . /groups/firebird 2&>1 /dev/null; then
+	NEW_GID=`niutil -readprop . /groups/firebird gid`
+else
+	NEW_GID=`nigrep gid . /groups | grep ":  gid " | awk '{ print $4 + 1 } ' | sort -n | tail -1`
+	niutil -create . /groups/firebird
+	niutil -createprop . /groups/firebird passwd "*"
+	niutil -createprop . /groups/firebird gid $NEW_GID
+	niutil -createprop . /groups/firebird users firebird
+fi
+
+# Now create the firebird user
+if niutil -list . /users/firebird 2&>1 /dev/null; then
+	echo -n
+else
+	NEW_UID=`nigrep uid . /users | grep ":  uid " | awk '{ print $4 + 1 } ' | sort -n | tail -1`
+	niutil -create . /users/firebird
+	niutil -createprop . /users/firebird uid $NEW_UID
+	niutil -createprop . /users/firebird home /Library/Frameworks/Firebird.framework
+	niutil -createprop . /users/firebird passwd "*"
+	niutil -createprop . /users/firebird expire 0
+	niutil -createprop . /users/firebird shell /bin/tcsh
+	niutil -createprop . /users/firebird change 0
+	niutil -createprop . /users/firebird gid $NEW_GID
+	niutil -createprop . /users/firebird realname "Firebird SQL Database"
+fi
+
+# set the permissions correctly
+if [ -f "$FB_FW/Versions/A/Resources/.SuperServer" ]; then
+	echo -n
+#else
+	$FB_FW/Resources/bin/fbmgr.bin -shut -user sysdba -password masterkey
+	rm -rf /System/Library/StartupItems/Firebird
+fi
+
+# Shutdown any existing servers
+if [ -x /sbin/service ]; then
+	service firebird stop
+fi
+
+# Install the framework
+# mkdir -p /Library/Frameworks
+# cp -r Firebird.framework $FB_FW
+#ln -s ../../bin $FB_FW/Versions/A/Resources/English.lproj/var/bin; \
+#ln -s Versions/Current/Headers $FB_FW/Headers
+#ln -s Versions/Current/Resources $FB_FW/Resources
+#ln -s Versions/Current/Firebird $FB_FW/Firebird
+#ln -s A $FB_FW/Versions/Current
+chown -R firebird "$FB_FW"
+chgrp -R firebird "$FB_FW"
+
+# set the permissions correctly
+if [ -f "$FB_FW/Versions/A/Resources/.SuperServer" ]; then
+    chmod 777 "$FB_FW/Resources/English.lproj/var"
+    chmod 777 "$FB_FW/Resources/English.lproj/var/security2.fdb"
+    chmod 777 "$FB_FW/Resources/English.lproj/var/help/help.fdb"
+else
+    chmod 777 "$FB_FW/Resources/English.lproj/var"
+    chmod 777 "$FB_FW/Resources/English.lproj/var/security2.fdb"
+    chmod 777 "$FB_FW/Resources/English.lproj/var/help/help.fdb"
+
+#	 chmod a+s "$FB_FW/Resources/bin/gds_drop"
+    chmod a+s "$FB_FW/Resources/bin/fb_lock_mgr"
+    chmod a+s "$FB_FW/Resources/bin/fb_inet_server"
+
+#	 chown root "$FB_FW/Resources/bin/gds_drop"
+    chown root "$FB_FW/Resources/bin/fb_lock_mgr"
+    chown root "$FB_FW/Resources/bin/fb_inet_server"
+fi
+
+# Install the startup item
+if [ -f "$FB_FW/Versions/A/Resources/.SuperServer" ]; then
+	if [ -e "$INST_RES/Firebird.startup" ]; then
+#		mkdir -p /Library/StartupItems
+		rm -rf /System/Library/StartupItems/Firebird
+		cp -r "$INST_RES/Firebird.startup" /System/Library/StartupItems/Firebird
+	fi
+else
+	rm -rf /System/Library/StartupItems/Firebird
+fi
+
+
+# Install FBConsole
+#if [ -e FBConsole.app ]; then
+#	mkdir -p /Applications
+#	cp -r FBConsole.app /Applications
+#fi
+
+#
+# Add gds_db to the services file, if available
+#
+HUPNEEDED='n'	# Relevant to Classic only
+if [ -f /etc/services ]; then
+    grep -s gds_db /etc/services  > /dev/null 2>&1
+    if test $? != 0 ; then
+		HUPNEEDED='y'
+    	cat /etc/services > /etc/.interbase.temp.install.services
+    	echo "gds_db      3050/tcp                 # Firebird Database Protocol" >> /etc/.interbase.temp.install.services
+		cp /etc/services /etc/services.fbsave
+		mv /etc/.interbase.temp.install.services /etc/services
+    fi
+fi
+
+if [ -f /etc/inetd.conf ]; then
+	cp /etc/inetd.conf /etc/inetd.conf.fbsave
+fi
+
+# Remove all traces of CS first
+if [ -f /etc/inetd.conf ]; then
+	grep -s gds_db /etc/inetd.conf  > /dev/null 2>&1
+	if test $? != 0 ; then
+		cat /etc/inetd.conf | grep -v gds_db > /etc/.interbase.temp.install.inetd.conf
+		mv /etc/.interbase.temp.install.inetd.conf /etc/inetd.conf
+		HUPNEEDED='y'
+	fi
+fi
+
+if [ -f /etc/xinetd.d/firebird ]; then
+	rm /etc/xinetd.d/firebird
+	HUPNEEDED='y'
+fi
+
+# Install ourselves in the correct place
+if [ -f "$FB_FW/Versions/A/Resources/.SuperServer" ]; then
+	cp -r $1/Contents/Resources/StartupItem /System/Library/StartupItems/Firebird
+else
+	if [ -f /var/run/xinetd.pid -a -d /etc/xinetd.d ]; then
+		cat > /etc/xinetd.d/firebird <<EOF
+service gds_db
+{
+        disable		= no
+        socket_type     = stream
+        wait            = no
+        user            = firebird
+EOF
+		echo "server          = $FB_RES/bin/fb_inet_server" >> /etc/xinetd.d/firebird
+		cat >> /etc/xinetd.d/firebird << EOF
+        groups          = yes
+}
+EOF
+	    HUPNEEDED='y'
+	else
+		if [ -f /etc/inetd.conf ]; then
+            echo "gds_db stream  tcp     nowait  root $FB_FW/Resources/bin/fb_inet_server fb_inet_server" > /etc/.fb.inetd.conf.entry
+	    	cat /etc/inetd.conf /etc/.fb.inetd.conf.entry > /etc/.interbase.temp.install.inetd.conf
+	    	mv /etc/.interbase.temp.install.inetd.conf /etc/inetd.conf
+            rm -f /etc/.fb.inetd.conf.entry
+	    	HUPNEEDED='y'
+		fi
+	fi
+fi
+
+
+# Make sure the hosts.equiv files are set correctly
+cp /etc/hosts.equiv /etc/hosts.equiv.fbsave
+if grep -x "localhost" /etc/hosts.equiv > /dev/null; then                
+	echo -n
+else     
+    echo "localhost" >> /etc/hosts.equiv                
+fi    
+if grep -x "localhost.localdomain" /etc/hosts.equiv > /dev/null; then    
+	echo -n
+else     
+    echo "localhost.localdomain" >> /etc/hosts.equiv    
+fi    
+
+
+# Install the saved security database, if any
+if test -f /tmp/fb-security-database-update.fdb; then
+	mv -f /tmp/fb-security-database-update.fdb "$FB_RES/English.lproj/var/security2.fdb"
+	rm -f /tmp/fb-security-database-update.fdb
+fi
+
+
+# Tell inetd/xinetd to reload their configuration files.
+if [ "$HUPNEEDED" = 'y' ]
+then
+    #INETPID=`ps -axe | grep inetd | awk '{print $1}'`
+	if [ -f /var/run/inetd.pid ]
+	then
+    	kill -HUP `cat /var/run/inetd.pid`
+	fi
+	if [ -f /var/run/xinetd.pid ]
+	then
+    	kill -HUP `cat /var/run/xinetd.pid`
+	fi
+fi
+
+
+###
+# And last but not least, start the server
+if [ -f "$FB_FW/Versions/A/Resources/.SuperServer" ]; then
+	#echo Starting Firebird Database Server
+	/System/Library/StartupItems/Firebird/Firebird start
+fi
--- a/builds/install/arch-specific/darwin/installer_background.pdf
+++ b/builds/install/arch-specific/darwin/installer_background.pdf
@ -0,0 +1,2 @@
+%PDF-1.3
1 0 obj
<<
/Type /Catalog
/Pages 2 0 R /Metadata 3 0 R 
>>
endobj
4 0 obj
<<
/Creator (Adobe Photoshop Elements 2.0)
/CreationDate (D:20031112003155-08'00')
/ModDate (D:20031112003155-08'00')
/Producer (Adobe Photoshop Elements for Macintosh)
>>
endobj
5 0 obj
<<
/Type /Page
/Parent 2 0 R 
/MediaBox [ 0 0 618 416 ]
/Resources 
<<
/XObject <<
/Im0 6 0 R 
>>
/ProcSet [ /PDF /ImageC ]
>>
/Contents 7 0 R /PieceInfo <<
/AdobePhotoshop <<
/LastModified (D:20031112003155-08'00')
/Private <<
/RoundTrip 1 /ExportCrispy false /SaveTransparency false /ImageResources 8 0 R /XObject <<
/Im0 6 0 R  >>
/StandardImageFileData 9 0 R >>
>>
>>
/LastModified (D:20031112003155-08'00')
>>
endobj
8 0 obj
<<
/Filter /FlateDecode
/Size 13636
/Length 10 0 R >>
stream
+H‰ìWTW
--- a/builds/install/arch-specific/darwin/installer_background.psd
+++ b/builds/install/arch-specific/darwin/installer_background.psd
--- a/builds/install/arch-specific/darwin/majorvers.c
+++ b/builds/install/arch-specific/darwin/majorvers.c
@ -0,0 +1,2 @@
+#include "../../../../src/jrd/license.h"
+FB_MAJOR_VER
--- a/builds/install/arch-specific/darwin/minorvers.c
+++ b/builds/install/arch-specific/darwin/minorvers.c
@ -0,0 +1,2 @@
+#include "../../../../src/jrd/license.h"
+FB_MINOR_VER
--- a/builds/install/arch-specific/darwin/preinstall-script
+++ b/builds/install/arch-specific/darwin/preinstall-script
@ -0,0 +1,9 @@
+#!/bin/sh
+#
+# Script args:
+# $0: full path to script
+# $1: full path to top level package dir, no trailing slash
+# $2: full path to installed location
+# $3:  ????? Path to install Volume????
+# $4:  ?????
+exit 0
--- a/builds/install/arch-specific/darwin/preupgrade-script
+++ b/builds/install/arch-specific/darwin/preupgrade-script
@ -0,0 +1,27 @@
+#!/bin/sh
+#
+# Script args:
+# $0: full path to script
+# $1: full path to top level package dir, no trailing slash
+# $2: full path to installed location
+# $3:  ????? Path to install Volume????
+# $4:  ?????
+
+
+if test -f "$2/Firebird.framework/Versions/A/Resources/English.lproj/var/isc4.gdb"; then
+	mv -f "$2/Firebird.framework/Versions/A/Resources/English.lproj/var/isc4.gdb" /tmp/fb-security-database-update.fdb
+fi
+if test -f "$2/Firebird.framework/Versions/A/Resources/English.lproj/var/isc4.fdb"; then
+	mv -f "$2/Firebird.framework/Versions/A/Resources/English.lproj/var/isc4.fdb" /tmp/fb-security-database-update.fdb
+fi
+if test -f "$2/Firebird.framework/Versions/A/Resources/English.lproj/var/security.fdb"; then
+	mv -f "$2/Firebird.framework/Versions/A/Resources/English.lproj/var/security.fdb" /tmp/fb-security-database-update.fdb
+fi
+
+
+if [ -f /Library/StartupItems/Firebird/Firebird ]; then
+	/Library/StartupItems/Firebird/Firebird stop
+fi
+rm -rf "$2/Firebird.framework"
+rm -rf /Library/StartupItems/Firebird
+exit 0
--- a/builds/posix/Makefile.in.client.fbudf
+++ b/builds/posix/Makefile.in.client.fbudf
@ -63,7 +63,7 @@ Dependencies = $(AllObjects:.o=.d)
 all: lib_fbudf


-# The libraires in this directory could do with a bit more work, since they
+# The libraries in this directory could do with a bit more work, since they
 # the previous code (presumably by John) that does the ar crv stuff, might
 # work still, even if the .o files have directory prefixes on them.
 # And the udf stuff doesn't want to do .$(SHRLIB_EXT).X.X.X extensions in UDF directory
@ -82,6 +82,10 @@ $(UDF)/fbudf.$(SHRLIB_EXT):	$(AllObjects)
 ifeq ($(PLATFORM),win32)
 	$(LIB_LINK) $(LIB_LINK_OPTIONS) $(LIB_LINK_SONAME)fbudf.$(SHRLIB_EXT) \
 -o $@ $^ @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
+endif
+ifeq ($(PLATFORM),DARWIN)
+	$(LIB_LINK) $(LIB_BUNDLE_OPTIONS) \
+-L$(LIB) -lm -o $@ $^ @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
 else
 	$(LIB_LINK) $(LIB_LINK_OPTIONS) $(LIB_LINK_SONAME)fbudf.$(SHRLIB_EXT) \
 $(LIB_LINK_RPATH)$(FirebirdInstallPrefix)/lib -L$(LIB) -lm -o $@ $^ @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
--- a/builds/posix/Makefile.in.embed.fbudf
+++ b/builds/posix/Makefile.in.embed.fbudf
@ -27,7 +27,7 @@
 #  Contributor(s):
 # 
 #
-#  $Id: Makefile.in.embed.fbudf,v 1.4 2006-03-06 17:49:47 alexpeshkoff Exp $
+#  $Id: Makefile.in.embed.fbudf,v 1.5 2007-03-09 10:32:47 paulbeach Exp $
 #
 ROOT=..
 ObjModuleType=superclient
@ -69,6 +69,10 @@ lib_fbudf: $(UDF)/fbudf.$(SHRLIB_EXT)
 $(UDF)/fbudf.$(SHRLIB_EXT):	$(FBUDF_Objects) $(FBUTIL_Objects)
 ifeq ($(PLATFORM),win32)
 	$(LIB_LINK) $(LIB_LINK_OPTIONS) $(LIB_LINK_SONAME)fbudf.$(SHRLIB_EXT) -L$(LIB) -lfbembed -o $@ $^
+endif
+ifeq ($(PLATFORM),DARWIN)
+	$(LIB_LINK) $(LIB_BUNDLE_OPTIONS) \
+-lm -o $@ $^
 else
 	$(LIB_LINK) $(LIB_LINK_OPTIONS) $(LIB_LINK_SONAME)fbudf.$(SHRLIB_EXT) \
 $(LIB_LINK_RPATH)$(FirebirdInstallPrefix)/lib -lm -o $@ $^
--- a/builds/posix/Makefile.in.embed.gbak
+++ b/builds/posix/Makefile.in.embed.gbak
@ -56,6 +56,9 @@ GSPLIT_Files=	spit.cpp
 GSPLIT_Sources = $(addprefix burp/, $(GSPLIT_Files)) $(GSPLIT_Other_Sources)
 GSPLIT_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(GSPLIT_Sources))))

+ifeq ($(PLATFORM),DARWIN)
+LINK_LIBS+=$(ICU_LIBS)
+endif

 AllObjects = $(GBAK_Objects) $(GSPLIT_Objects) $(CLUMPLETS_Objects)
 Dependencies = $(AllObjects:.o=.d) 
@ -68,14 +71,14 @@ all: gbak gsplit
 gbak : $(LIBFBEMBED_SO) $(GBAK)

 $(GBAK):	$(GBAK_Objects) $(CLUMPLETS_Objects) $(FBCOMMON_Objects) $(FBCLASSES_Objects)
-	$(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbembed $(LINK_LIBS)
+	$(LD) $(LINK_OPTS) $^ -o $@ $(FBEMBED_LINK) $(LINK_LIBS)



 gsplit : $(LIBFBEMBED_SO) $(GSPLIT)

 $(GSPLIT):	$(GSPLIT_Objects)
-	$(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbembed $(LINK_LIBS)
+	$(LD) $(LINK_OPTS) $^ -o $@ $(FBEMBED_LINK) $(LINK_LIBS)

 include $(ROOT)/gen/make.shared.targets

--- a/builds/posix/Makefile.in.embed.gdef
+++ b/builds/posix/Makefile.in.embed.gdef
@ -52,6 +52,9 @@ GDEF_Files=	exe.epp extract.epp \
 GDEF_Sources = $(addprefix dudley/, $(GDEF_Files)) $(GDEF_Other_Sources)
 GDEF_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(GDEF_Sources))))

+ifeq ($(PLATFORM),DARWIN)
+LINK_LIBS+=$(ICU_LIBS)
+endif
 AllObjects = $(GDEF_Objects) $(CLUMPLETS_Objects)
 Dependencies = $(AllObjects:.o=.d)

@ -63,7 +66,7 @@ all:	gdef
 gdef:   $(GDEF)

 $(GDEF): $(GDEF_Objects) $(CLUMPLETS_Objects) $(FBCOMMON_Objects) $(FBCLASSES_Objects)
-	$(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbembed $(LINK_LIBS)
+	$(LD) $(LINK_OPTS) $^ -o $@ $(FBEMBED_LINK) $(LINK_LIBS)



--- a/builds/posix/Makefile.in.embed.gfix
+++ b/builds/posix/Makefile.in.embed.gfix
@ -55,6 +55,9 @@ GFIX_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(GFIX_Sources)))

 AllObjects = $(GFIX_Objects) $(CLUMPLETS_Objects)

+ifeq ($(PLATFORM),DARWIN)
+LINK_LIBS+=$(ICU_LIBS)
+endif
 Dependencies = $(AllObjects:.o=.d) 


@ -64,7 +67,7 @@ Dependencies = $(AllObjects:.o=.d)
 gfix : $(LIBFBEMBED_SO) $(GFIX)

 $(GFIX):	$(GFIX_Objects) $(CLUMPLETS_Objects) $(FBCOMMON_Objects) $(FBCLASSES_Objects)
-	$(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbembed $(LINK_LIBS)
+	$(LD) $(LINK_OPTS) $^ -o $@ $(FBEMBED_LINK) $(LINK_LIBS)


 include $(ROOT)/gen/make.shared.targets
--- a/builds/posix/Makefile.in.embed.gpre
+++ b/builds/posix/Makefile.in.embed.gpre
@ -48,6 +48,9 @@ GPRE_Files = gpre_meta.epp \
 GPRE_Sources = $(addprefix gpre/, $(GPRE_Files)) $(GPRE_Other_Sources)
 GPRE_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(GPRE_Sources))))

+ifeq ($(PLATFORM),DARWIN)
+LINK_LIBS+=$(ICU_LIBS)
+endif
 AllObjects = $(GPRE_Objects) $(CLUMPLETS_Objects)
 Dependencies = $(AllObjects:.o=.d) 

@ -58,7 +61,7 @@ Dependencies = $(AllObjects:.o=.d)
 gpre : $(LIBFBEMBED_SO) $(GPRE)

 $(GPRE):	$(GPRE_Objects) $(CLUMPLETS_Objects) $(FBCOMMON_Objects) $(FBCLASSES_Objects)
-	$(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbembed $(LINK_LIBS)
+	$(LD) $(LINK_OPTS) $^ -o $@ $(FBEMBED_LINK) $(LINK_LIBS)


 include $(ROOT)/gen/make.shared.targets
--- a/builds/posix/Makefile.in.embed.isql
+++ b/builds/posix/Makefile.in.embed.isql
@ -48,6 +48,9 @@ ISQL_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(ISQL_Sources)))

 AllObjects = $(ISQL_Objects) $(CLUMPLETS_Objects)

+ifeq ($(PLATFORM),DARWIN)
+LINK_LIBS+=$(ICU_LIBS)
+endif
 Dependencies = $(AllObjects:.o=.d) 


@ -58,7 +61,7 @@ Dependencies = $(AllObjects:.o=.d)
 isql : $(LIBFBEMBED_SO) $(ISQL)

 $(ISQL):	$(ISQL_Objects) $(CLUMPLETS_Objects) $(FBCOMMON_Objects) $(FBCLASSES_Objects)
-	$(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbembed $(LINK_LIBS)
+	$(LD) $(LINK_OPTS) $^ -o $@ $(FBEMBED_LINK) $(LINK_LIBS)


 include $(ROOT)/gen/make.shared.targets
--- a/builds/posix/Makefile.in.embed.qli
+++ b/builds/posix/Makefile.in.embed.qli
@ -48,6 +48,9 @@ QLI_Files=	all.cpp command.cpp compile.cpp dtr.cpp err.cpp eval.cpp \
 QLI_Sources = $(addprefix qli/, $(QLI_Files)) $(QLI_Other_Sources)
 QLI_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(QLI_Sources))))

+ifeq ($(PLATFORM),DARWIN)
+LINK_LIBS+=$(ICU_LIBS)
+endif
 AllObjects = $(QLI_Objects) $(CLUMPLETS_Objects)
 Dependencies = $(AllObjects:.o=.d)

@ -61,7 +64,7 @@ all:	qli
 qli : create_yachts $(LIBFBEMBED_SO) $(QLI)

 $(QLI): $(QLI_Objects) $(CLUMPLETS_Objects) $(FBCOMMON_Objects) $(FBCLASSES_Objects)
-	$(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbembed $(LINK_LIBS)
+	$(LD) $(LINK_OPTS) $^ -o $@ $(FBEMBED_LINK) $(LINK_LIBS)

 # EKU: At this point yachts.lnk is a link to empty.fdb, but gpre will fail
 #      with it. metadata.fdb is what is needed here.
--- a/builds/posix/Makefile.in.embed.util
+++ b/builds/posix/Makefile.in.embed.util
@ -74,8 +74,7 @@ DROP_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(DROP_Sources)))

 GSEC_Other_Sources = jrd/enc.cpp jrd/sha.cpp jrd/guid.cpp \
 jrd/isc_file.cpp common/config/config.cpp common/config/config_file.cpp \
-jrd/os/posix/path_utils.cpp jrd/os/posix/config_root.cpp jrd/os/posix/fbsyslog.cpp \
-common/config/dir_list.cpp
+common/config/dir_list.cpp $(OS_SPECIFIC_Sources)

 GSEC_Files =  gsec.cpp security.cpp call_service.cpp
 GSEC_Sources = $(addprefix utilities/gsec/, $(GSEC_Files)) $(GSEC_Other_Sources)
@ -108,6 +107,9 @@ RELAY_Files =  relay.cpp
 RELAY_Sources = $(addprefix utilities/, $(RELAY_Files))
 RELAY_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(RELAY_Sources))))

+ifeq ($(PLATFORM),DARWIN)
+LINK_LIBS+=$(ICU_LIBS)
+endif

 AllObjects = $(CREATEDB_Object) $(DROP_Object) \
 			 $(GSEC_Objects) $(GSTAT_Object) $(IBGUARD_Objects) \
@ -138,47 +140,47 @@ $(CREATE_DB):	$(CREATEDB_Objects) $(LIBFBSTATIC_A) $(COMMON_Objects)
 nbackup: $(LIBFBEMBED_SO) $(NBACKUP)

 $(NBACKUP):	$(NBACKUP_Objects) $(CLUMPLETS_Objects) $(COMMON_Objects)
-	$(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbembed $(LINK_LIBS)
+	$(LD) $(LINK_OPTS) $^ -o $@ $(FBEMBED_LINK) $(LINK_LIBS)

 fb_lock_print: $(LIBFBEMBED_SO) $(LOCKPRINT)

 $(LOCKPRINT):	$(LOCKPRINT_Objects) $(COMMON_Objects)
-	$(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbembed $(LINK_LIBS)
+	$(LD) $(LINK_OPTS) $^ -o $@ $(FBEMBED_LINK) $(LINK_LIBS)


 gstat : $(LIBFBEMBED_SO) $(GSTAT)

 $(GSTAT):	$(GSTAT_Objects) $(CLUMPLETS_Objects) $(COMMON_Objects)
-	$(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbembed $(LINK_LIBS)
+	$(LD) $(LINK_OPTS) $^ -o $@ $(FBEMBED_LINK) $(LINK_LIBS)



 gds_drop: $(GDS_DROP)

 $(GDS_DROP):	$(DROP_Objects) $(FBCOMMON_Objects) $(FBCLASSES_Objects)
-	$(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbembed $(LINK_LIBS)
+	$(LD) $(LINK_OPTS) $^ -o $@ $(FBEMBED_LINK) $(LINK_LIBS)


 gds_relay: $(GDS_RELAY)

 $(GDS_RELAY):	$(RELAY_Objects) $(LIBFBEMBED_SO)
-	$(LD) $(LINK_OPTS) $(RELAY_Objects) -o $@ -L$(LIB) -lfbembed $(LINK_LIBS)
+	$(LD) $(LINK_OPTS) $(RELAY_Objects) -o $@ $(FBEMBED_LINK) $(LINK_LIBS)


 gsec: $(GSEC)

 $(GSEC):	$(GSEC_Objects) $(CLUMPLETS_Objects) $(COMMON_Objects)
-	$(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbembed $(LINK_LIBS)
+	$(LD) $(LINK_OPTS) $^ -o $@ $(FBEMBED_LINK) $(LINK_LIBS)

 ibguard: $(IBGUARD)

 $(IBGUARD):	$(IBGUARD_Objects) $(LIBFBEMBED_SO)  
-	$(LD) $(LINK_OPTS) $(IBGUARD_Objects) -o $@ -L$(LIB) -lfbembed $(LINK_LIBS)
+	$(LD) $(LINK_OPTS) $(IBGUARD_Objects) -o $@ $(FBEMBED_LINK) $(LINK_LIBS)

 ibmgr_bin: $(IBMGR_BIN)

 $(IBMGR_BIN):	$(IBMGR_Objects) $(LIBFBEMBED_SO)  
-	$(LD) $(LINK_OPTS) $(IBMGR_Objects) -o $@ -L$(LIB) -lfbembed $(LINK_LIBS)
+	$(LD) $(LINK_OPTS) $(IBMGR_Objects) -o $@ $(FBEMBED_LINK) $(LINK_LIBS)


 # This one needs a bit of work.
@ -186,7 +188,7 @@ $(IBMGR_BIN):	$(IBMGR_Objects) $(LIBFBEMBED_SO)
 rebuild: $(GDS_REBUILD)

 $(GDS_REBUILD):	$(REBUILD_Objects) $(LIBFBEMBED_SO)  
-	$(LD) $(LINK_OPTS) $(REBUILD_Objects) -o $@ -L$(LIB) -lfbembed $(LINK_LIBS)
+	$(LD) $(LINK_OPTS) $(REBUILD_Objects) -o $@ $(FBEMBED_LINK) $(LINK_LIBS)

 include $(ROOT)/gen/make.shared.targets

--- a/builds/posix/Makefile.in.examples
+++ b/builds/posix/Makefile.in.examples
@ -27,7 +27,7 @@
 #  Contributor(s):
 # 
 #
-#  $Id: Makefile.in.examples,v 1.8 2005-12-18 17:56:43 alexpeshkoff Exp $
+#  $Id: Makefile.in.examples,v 1.9 2007-03-09 10:32:48 paulbeach Exp $
 #
 ROOT=../..
 ObjModuleType=std
@ -48,9 +48,13 @@ include     $(ROOT)/gen/make.shared.variables
 PATH := ./:$(BIN):$(PATH)
 export PATH

+ifeq ($(PLATFORM),DARWIN)
+DYLD_LIBRARY_PATH := $(GEN_ROOT)/firebird/lib
+export DYLD_LIBRARY_PATH
+else
 LD_LIBRARY_PATH := $(GEN_ROOT)/firebird/lib
 export LD_LIBRARY_PATH
-
+endif
 GPRE_FLAGS=	-r -m -z -n

 EXAMPLES_DEST=	$(GEN_ROOT)/examples
--- a/builds/posix/Makefile.in.extlib
+++ b/builds/posix/Makefile.in.extlib
@ -27,7 +27,7 @@
 #  Contributor(s):
 # 
 #
-#  $Id: Makefile.in.extlib,v 1.20 2005-05-27 22:16:02 asfernandes Exp $
+#  $Id: Makefile.in.extlib,v 1.21 2007-03-09 10:32:48 paulbeach Exp $
 #
 ROOT=..
 ObjModuleType=std
@ -78,17 +78,25 @@ all: lib_ib_udf lib_ib_util
 lib_ib_udf: $(UDF)/ib_udf.$(SHRLIB_EXT)

 $(UDF)/ib_udf.$(SHRLIB_EXT):	$(UDF_Objects) $(UTIL_Objects)
+ifeq ($(PLATFORM),DARWIN)
+	$(LIB_LINK) $(LIB_BUNDLE_OPTIONS) \
+-o $@ $^ @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
+else
 	$(LIB_LINK) $(LIB_LINK_OPTIONS) $(LIB_LINK_SONAME)ib_udf.$(SHRLIB_EXT) \
 $(LIB_LINK_RPATH)$(FirebirdInstallPrefix)/lib -o $@ $^ @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
-
+endif
 # ib_util

 lib_ib_util: $(LIBIBUTIL_SO)

 $(LIBIBUTIL_SO):	$(UTIL_Objects)
+ifeq ($(PLATFORM),DARWIN)
+	$(LIB_LINK) $(LIB_LINK_OPTIONS) $(LIB_LINK_RPATH)$(IbUtilLibraryName) $(LIB_LINK_SONAME) \
+-o $@ $^ @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
+else
 	$(LIB_LINK) $(LIB_LINK_OPTIONS) $(LIB_LINK_SONAME)$(IbUtilLibraryName) \
 $(LIB_LINK_RPATH)$(FirebirdInstallPrefix)/lib -o $@ $^ @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
-
+endif

 include $(ROOT)/gen/make.shared.targets

--- a/builds/posix/Makefile.in.firebird
+++ b/builds/posix/Makefile.in.firebird
@ -139,7 +139,7 @@ export LD_LIBRARY_PATH
 # either _classic or _super.


-firebird : firebird_@FIREBIRD_ARCH_TYPE@
+firebird : firebird_@FIREBIRD_ARCH_TYPE@ $(PLATFORM_POSTBUILD_TARGET)

 firebird_classic firebird_embedded: firebird_basic classic_targets
 firebird_super firebird_server: firebird_basic super_targets
@ -333,7 +333,7 @@ otherfiles: misc_files
 .PHONY: libfbembed inet_server embed_gfix embed_gbak embed_isql 
 .PHONY: embed_gpre embed_util

-classic_targets: libfbembed inet_server embed_gfix embed_gbak embed_isql \
+classic_targets: $(PLAT_CLASSIC_PRE_TARGET) libfbembed inet_server embed_gfix embed_gbak embed_isql \
 	embed_gpre embed_util embed_gdef embed_qli embed_fbudf libfbclient

 libfbembed:
@ -584,4 +584,5 @@ clean_gpre_gen:
 	

 #___________________________________________________________________________
-# 
+# Extra platform specific targets
+@POSTFIX_INCLUDE@ 
--- a/builds/posix/Makefile.in.inet_server
+++ b/builds/posix/Makefile.in.inet_server
@ -27,7 +27,7 @@
 #  Contributor(s):
 # 
 #
-#  $Id: Makefile.in.inet_server,v 1.14 2004-04-30 23:02:06 brodsom Exp $
+#  $Id: Makefile.in.inet_server,v 1.15 2007-03-09 10:32:48 paulbeach Exp $
 #
 ROOT=..
 ObjModuleType=std
@ -43,6 +43,9 @@ SERVER_Files = server_stub.cpp
 SERVER_Sources = $(addprefix remote/, $(SERVER_Files))
 SERVER_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(SERVER_Sources))))

+ifeq ($(PLATFORM),DARWIN)
+LINK_LIBS+=$(ICU_LIBS)
+endif
 AllObjects = $(SERVER_Objects)
 Dependencies = $(AllObjects:.o=.d) 

@ -53,7 +56,7 @@ Dependencies = $(AllObjects:.o=.d)
 fb_inet_server : $(LIBFBEMBED_SO) $(FB_CLASSIC_SERVER)

 $(FB_CLASSIC_SERVER):	$(SERVER_Objects)
-	$(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbembed $(LIB_GUI) $(LINK_LIBS)
+	$(LD) $(LINK_OPTS) $^ -o $@ $(FBEMBED_LINK) $(LIB_GUI) $(LINK_LIBS)

 include $(ROOT)/gen/make.shared.targets

--- a/builds/posix/Makefile.in.intl
+++ b/builds/posix/Makefile.in.intl
@ -76,9 +76,13 @@ all : libfbintl
 libfbintl : $(LIBFBINTL_SO)

 $(LIBFBINTL_SO):	$(INTL_Objects) $(FBCOMMON_Objects) $(FBCLASSES_Objects)
+ifeq ($(PLATFORM),DARWIN)
+	$(LIB_LINK) $(LIB_BUNDLE_OPTIONS) \
+-o $@ $^ $(SO_LINK_LIBS) @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
+else
 	$(LIB_LINK) $(LINK_FBINTL_SYMBOLS) $(LIB_LINK_OPTIONS) $(LIB_LINK_SONAME)libintl.$(SHRLIB_EXT).1 \
 $(LIB_LINK_RPATH)$(FirebirdInstallPrefix)/lib -o $@ $^ -L$(LIB) $(ICU_LIBS) $(SO_LINK_LIBS) @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
-
+endif

 include $(ROOT)/gen/make.shared.targets

--- a/builds/posix/Makefile.in.libfbclient
+++ b/builds/posix/Makefile.in.libfbclient
@ -115,10 +115,15 @@ $(LIBFBCLIENT_SONAME):	$(LIBFBCLIENT_SOBASENAME)
 endif

 $(LIBFBCLIENT_SO):	$(FBCLIENT_Objects)
+ifeq ($(PLATFORM),DARWIN)
+	$(LIB_LINK) $(LINK_FIREBIRD_SYMBOLS) $(LIB_LINK_OPTIONS) $(LIB_LINK_IMPLIB) \
+$(LIB_CLIENT_LINK_OPTIONS) $(LIB_LINK_SONAME) \
+-o $@ $^ $(SO_LINK_LIBS) @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
+else
 	$(LIB_LINK) $(LINK_FIREBIRD_SYMBOLS) $(LIB_LINK_OPTIONS) $(LIB_LINK_IMPLIB) \
 $(LIB_LINK_SONAME)$(ClientLibraryNameMajor) $(LIB_LINK_RPATH)$(FirebirdInstallPrefix)/lib \
 -o $@ $^ $(SO_LINK_LIBS) @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ -lsupc++
-
+endif

 AllObjects = $(FBCLIENT_Objects)
 Dependencies = $(AllObjects:.o=.d)
--- a/builds/posix/Makefile.in.libfbembed
+++ b/builds/posix/Makefile.in.libfbembed
@ -62,9 +62,14 @@ Dependencies = $(AllObjects:.o=.d)
 libfbembed : $(LIBFBEMBED_SONAME)

 $(LIBFBEMBED_SO): $(LIBFBEMBED_Objects) $(SERVER_Objects) $(COMMON_Objects)
+ifeq ($(PLATFORM),DARWIN)
+	$(LIB_LINK) $(LINK_FIREBIRD_SYMBOLS) $(LIB_LINK_OPTIONS) \
+$(LIB_EMBED_LINK_OPTIONS) $(LIB_LINK_SONAME) \
+-o $@ $^ -L$(LIB) $(LIB_GUI) $(SO_LINK_LIBS) $(ICU_LIBS)
+else
 	$(LIB_LINK) $(LINK_FIREBIRD_SYMBOLS) $(LIB_LINK_OPTIONS) $(LIB_LINK_SONAME)$(SharedLibrarySoName) \
 $(LIB_LINK_RPATH)$(FirebirdInstallPrefix)/lib -o $@ $^ -L$(LIB) $(LIB_GUI) $(SO_LINK_LIBS) $(ICU_LIBS)
-
+endif
 $(LIBFBEMBED_SOBASENAME): $(LIBFBEMBED_SO)
 	(cd $(LIB) && $(LN) -f $(SharedLibraryName) $(SharedLibrarySoName) )

--- a/builds/posix/make.defaults
+++ b/builds/posix/make.defaults
@ -80,7 +80,11 @@ IsProdTypeBuild = @PROD_BUILD_FLG@
                           # release with debug and optimization


+ifeq ($(PLATFORM),DARWIN)
+FirebirdInstallPrefix =
+else
 FirebirdInstallPrefix = @prefix@
+endif
 CpuType=@CPU_TYPE@

 PLATFORM=@PLATFORM@
@ -232,6 +236,7 @@ LIB_LINK_OPTIONS = $(LDFLAGS) -shared
 LIB_LINK_RPATH = -Wl,-rpath,
 LIB_LINK_SONAME = -Wl,-soname,
 LIB_LINK_MAPFILE= -Wl,--version-script,
+FBEMBED_LINK= -L$(LIB) -lfbembed

 LINK_FIREBIRD_SYMBOLS = $(LIB_LINK_MAPFILE)$(ROOT)/builds/posix/firebird.vers
 LINK_FBINTL_SYMBOLS = $(LIB_LINK_MAPFILE)$(ROOT)/builds/posix/fbintl.vers
--- a/builds/posix/make.rules
+++ b/builds/posix/make.rules
@ -42,6 +42,19 @@ endif

 CXXFLAGS:= $(CXXFLAGS) $(CFLAGS)

+ifeq ($(PLATFORM),DARWIN)
+LIB_LINK = g++
+else
+LIB_LINK= @CC@
+endif
+STATICLIB_LINK= ar cruvs
+EXE_LINK = @CXX@
+STATICEXE_LINK = @CXX@
+
+LINK_LIBS = @LIBS@ @EDITLINE_A@
+ICU_LIBS = -licuuc -licudata -licui18n
+STATICLINK_LIBS = @LIBS@ @EDITLINE_A@
+SO_LINK_LIBS = @LIBS@
 # Here we have definitions for using the preprocessor.

 # The GPRE_FLAGS is overwritten in Makefile.in.jrd Makefile.in.gpre and
--- a/builds/posix/postfix.darwin
+++ b/builds/posix/postfix.darwin
@ -0,0 +1,150 @@
+# The contents of this file are subject to the Interbase Public
+# License Version 1.0 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy
+# of the License at http://www.Inprise.com/IPL.html
+#
+# Software distributed under the License is distributed on an
+# "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express
+# or implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code was created by Inprise Corporation
+# and its predecessors. Portions created by Inprise Corporation are
+#
+# Copyright (C) 2000 Inprise Corporation
+# All Rights Reserved.
+# Contributor(s): ______________________________________.
+# Start of file prefix.darwin:	$(VERSION)	DARWIN
+#$Id: postfix.darwin,v 1.2 2007-03-09 10:32:48 paulbeach Exp $
+# 2 Oct 2002, Nickolay Samofatov - Major Cleanup
+
+
+darwin_setup_framework: FB_FW = ../gen/firebird/Firebird.framework
+darwin_setup_framework:
+	-$(RM) -rf $(FB_FW) ../gen/firebird/Firebird.framework
+	mkdir -p $(FB_FW)/Versions/A/Resources/English.lproj/var
+	mkdir -p $(FB_FW)/Versions/A/Libraries
+	ln -s Versions/Current/Firebird $(FB_FW)/Firebird
+	ln -s Versions/Current/Headers $(FB_FW)/Headers
+	ln -s Versions/Current/Resources $(FB_FW)/Resources
+	ln -s Versions/Current/Libraries $(FB_FW)/Libraries
+	ln -s A $(FB_FW)/Versions/Current
+	ln -s ../../../include $(FB_FW)/Versions/A/Headers
+	ln -s ../../../lib/libfbembed.dylib $(FB_FW)/Versions/A/Firebird
+	ln -s ../../../lib $(FB_FW)/Versions/A/Libraries
+	ln -s ../../../../../../firebird.msg \
+			$(FB_FW)/Resources/English.lproj/var/firebird.msg
+	ln -s ../../../../../../bin $(FB_FW)/Resources/English.lproj/var/bin
+	ln -s ../../../../../../UDF $(FB_FW)/Resources/English.lproj/var/UDF
+	ln -s ../../../../../../intl $(FB_FW)/Resources/English.lproj/var/intl
+	ln -s ../../../../../../security2.fdb \
+				$(FB_FW)/Resources/English.lproj/var/security2.fdb
+	ln -s ../../../../../../help $(FB_FW)/Resources/English.lproj/var/help
+#sed "s/__VERSION__/`$(VERS_UTIL)`/g" source/firebird/bellardo/darwin/FrameworkInfo.plist > source/interbase/Firebird.framework/Resources/Info.plist
+
+darwin_finish_cs_framework: FB_FW = ../gen/firebird/frameworks/FirebirdCS.framework
+#darwin_finish_cs_framework: extlib
+darwin_finish_cs_framework:
+	-$(RM) -rf $(FB_FW)
+	mkdir -p $(FB_FW)/Versions/A/Resources/English.lproj/var
+	mkdir -p $(FB_FW)/Versions/A/Libraries
+	ln -s Versions/Current/Firebird $(FB_FW)/Firebird
+	ln -s Versions/Current/Headers $(FB_FW)/Headers
+	ln -s Versions/Current/Resources $(FB_FW)/Resources
+	ln -s Versions/Current/Libraries $(FB_FW)/Libraries
+	ln -s A $(FB_FW)/Versions/Current
+	cp -r ../gen/firebird/include $(FB_FW)/Versions/A/Headers
+	cp ../gen/firebird/lib/libfbembed.dylib $(FB_FW)/Versions/A/Firebird
+	cp ../gen/firebird/lib/libicudata.dylib $(FB_FW)/Versions/A/Libraries/libicudata.dylib
+	cp ../gen/firebird/lib/libicui18n.dylib $(FB_FW)/Versions/A/Libraries/libicui18n.dylib
+	cp ../gen/firebird/lib/libicuuc.dylib $(FB_FW)/Versions/A/Libraries/libicuuc.dylib
+	cp ../gen/firebird/lib/libib_util.dylib $(FB_FW)/Versions/A/Libraries/libib_util.dylib
+	cp ../gen/firebird/firebird.msg \
+			$(FB_FW)/Resources/English.lproj/var/firebird.msg
+	cp -r ../gen/firebird/UDF $(FB_FW)/Resources/English.lproj/var/UDF
+	mkdir -p $(FB_FW)/Resources/English.lproj/var/intl
+	cp -r ../gen/firebird/intl/libfbintl.dylib \
+		$(FB_FW)/Resources/English.lproj/var/intl/fbintl.dylib
+	cp ../builds/install/misc/fbintl.conf \
+		$(FB_FW)/Resources/English.lproj/var/intl/fbintl.conf
+	chmod a+rx $(FB_FW)/Resources/English.lproj/var/intl/fbintl.dylib
+	cp -r ../gen/firebird/help $(FB_FW)/Resources/English.lproj/var/help
+	cp ../gen/firebird/security2.fdb $(FB_FW)/Resources/English.lproj/var
+	mkdir -p $(FB_FW)/Resources/doc
+	ln -s ../../doc $(FB_FW)/Resources/English.lproj/var/doc
+	cp -r ../doc $(FB_FW)/Resources
+	cp ../gen/firebird/security2.fdb $(FB_FW)/Resources/English.lproj/var
+	mkdir -p $(FB_FW)/Resources/bin
+	ln -s ../../bin $(FB_FW)/Resources/English.lproj/var/bin
+	cp ../gen/firebird/bin/fb_inet_server $(FB_FW)/Resources/bin
+	cp ../gen/firebird/bin/gfix $(FB_FW)/Resources/bin
+	cp ../gen/firebird/bin/gbak $(FB_FW)/Resources/bin
+	cp ../gen/firebird/bin/isql $(FB_FW)/Resources/bin
+	cp ../gen/firebird/bin/gpre $(FB_FW)/Resources/bin
+	cp ../gen/firebird/bin/gdef $(FB_FW)/Resources/bin
+	cp ../gen/firebird/bin/qli $(FB_FW)/Resources/bin
+	cp ../gen/firebird/bin/fb_lock_mgr $(FB_FW)/Resources/bin
+	cp ../gen/firebird/bin/fb_lock_print $(FB_FW)/Resources/bin
+	cp ../gen/firebird/bin/gds_drop $(FB_FW)/Resources/bin
+	cp ../gen/firebird/bin/gds_relay $(FB_FW)/Resources/bin
+	cp ../gen/firebird/bin/gsec $(FB_FW)/Resources/bin
+	cp ../gen/firebird/bin/gstat $(FB_FW)/Resources/bin
+	cp ../gen/firebird/bin/nbackup $(FB_FW)/Resources/bin
+	#cp -r ../gen/firebird/examples $(FB_FW)/Resources/examples
+	cp ../src/extlib/ib_udf.sql $(FB_FW)/Resources/examples
+	cp ../builds/install/arch-specific/darwin/FrameworkInfo.plist \
+			$(FB_FW)/Resources/Info.plist
+	cp ../gen/firebird/misc/firebird.conf $(FB_FW)/Resources/English.lproj/var
+	#sed "s/__VERSION__/`$(VERS_UTIL)`/g" source/firebird/bellardo/darwin/FrameworkInfo.plist > source/interbase/Firebird.framework/Resources/Info.plist
+
+darwin_finish_ss_framework: FB_FW = ../gen/firebird/frameworks/FirebirdSS.framework
+darwin_finish_ss_framework: extlib
+	-$(RM) -rf $(FB_FW)
+	mkdir -p $(FB_FW)/Versions/A/Resources/English.lproj/var
+	ln -s Versions/Current/Firebird $(FB_FW)/Firebird
+	ln -s Versions/Current/Headers $(FB_FW)/Headers
+	ln -s Versions/Current/Resources $(FB_FW)/Resources
+	ln -s A $(FB_FW)/Versions/Current
+	cp -r ../gen/firebird/include $(FB_FW)/Versions/A/Headers
+	cp ../gen/firebird/lib/libfbclient.dylib $(FB_FW)/Versions/A/Firebird
+	cp ../gen/firebird/firebird.msg \
+			$(FB_FW)/Resources/English.lproj/var/firebird.msg
+	cp -r ../gen/firebird/UDF $(FB_FW)/Resources/English.lproj/var/UDF
+	mkdir -p $(FB_FW)/Resources/English.lproj/var/intl
+	cp -r ../gen/firebird/intl/libfbintl.dylib \
+		$(FB_FW)/Resources/English.lproj/var/intl/fbintl.dylib
+	cp ../builds/install/misc/fbintl.conf \
+		$(FB_FW)/Resources/English.lproj/var/intl/fbintl.conf
+	chmod a+rx $(FB_FW)/Resources/English.lproj/var/intl/fbintl.dylib
+	cp -r ../gen/firebird/help $(FB_FW)/Resources/English.lproj/var/help
+	cp ../gen/firebird/security.fdb $(FB_FW)/Resources/English.lproj/var
+	mkdir -p $(FB_FW)/Resources/bin
+	touch $(FB_FW)/Resources/.SuperServer
+	ln -s ../../bin $(FB_FW)/Resources/English.lproj/var/bin
+	cp ../gen/firebird/bin/fbserver $(FB_FW)/Resources/bin
+	cp ../gen/firebird/bin/fbguard $(FB_FW)/Resources/bin
+	cp ../gen/firebird/bin/fbmgr.bin $(FB_FW)/Resources/bin
+	cp ../gen/firebird/bin/gfix $(FB_FW)/Resources/bin
+	cp ../gen/firebird/bin/gbak $(FB_FW)/Resources/bin
+	cp ../gen/firebird/bin/isql $(FB_FW)/Resources/bin
+	cp ../gen/firebird/bin/gpre $(FB_FW)/Resources/bin
+	cp ../gen/firebird/bin/fb_lock_print $(FB_FW)/Resources/bin
+	cp ../gen/firebird/bin/gds_drop $(FB_FW)/Resources/bin
+	cp ../gen/firebird/bin/gds_relay $(FB_FW)/Resources/bin
+	cp ../gen/firebird/bin/gsec $(FB_FW)/Resources/bin
+	cp ../gen/firebird/bin/gstat $(FB_FW)/Resources/bin
+	cp ../gen/firebird/bin/qli $(FB_FW)/Resources/bin
+	cp ../gen/firebird/bin/gdef $(FB_FW)/Resources/bin
+	#cp -r ../gen/firebird/examples/v5 $(FB_FW)/Resources/examples
+	cp ../src/extlib/ib_udf.sql $(FB_FW)/Resources/examples
+	cp install/arch-specific/darwin/FrameworkInfo.plist \
+			$(FB_FW)/Resources/Info.plist
+	cp install/misc/firebird.conf $(FB_FW)/Resources/English.lproj/var
+	#sed "s/__VERSION__/`$(VERS_UTIL)`/g" source/firebird/bellardo/darwin/FrameworkInfo.plist > source/interbase/Firebird.framework/Resources/Info.plist
+
+darwin_postbuild_target: package
+	@echo
+	@echo Build Successful!!
+	@echo
+	@echo You can find the installer packages in gen/firebird, and the raw
+	@echo frameworks in gen/firebird/frameworks
--- a/builds/posix/prefix.darwin
+++ b/builds/posix/prefix.darwin
@ -15,17 +15,37 @@
 # All Rights Reserved.
 # Contributor(s): ______________________________________.
 # Start of file prefix.darwin:	$(VERSION)	@PLATFORM@
-#
+#$Id: prefix.darwin,v 1.18 2007-03-09 10:32:48 paulbeach Exp $
 # 2 Oct 2002, Nickolay Samofatov - Major Cleanup

+DYLD_LIBRARY_PATH=$(FIREBIRD)/lib
+export DYLD_LIBRARY_PATH
+
 OS_ServerFiles=inet_server.cpp

-COMMON_FLAGS=-DDARWIN -DFB_SETOPT_FLAGS=SO_NOSIGPIPE -pipe -MMD -fPIC
-
-PROD_FLAGS=-O3 -DNDEBUG $(COMMON_FLAGS)
-DEV_FLAGS=-ggdb -p -Wall $(COMMON_FLAGS)
-
+PROD_FLAGS=-O3 -DNDEBUG -DDARWIN -pipe -MMD -p -fPIC -fno-common
+DEV_FLAGS=-ggdb -DDARWIN -pipe -MMD -p -fPIC -fno-common -Wall
 EMBED_UTIL_TARGETS=gstat gds_drop gds_relay gsec nbackup fb_lock_print
 CLIENT_UTIL_TARGETS=gds_drop gds_relay gstat gsec fbguard fbmgr_bin nbackup fb_lock_print

 Physical_IO_Module=os/posix/unix.cpp
+PLATFORM_PATH=os/darwin
+
+LINK_OPTS:=
+LIB_BUNDLE_OPTIONS:=$(LD_FLAGS) -bundle -flat_namespace -undefined suppress
+LIB_LINK_OPTIONS:=$(LD_FLAGS) -dynamiclib  -flat_namespace
+LIB_LINK_SONAME:=-current_version 2.0.0 -compatibility_version 2.0.0 -seg1addr 0x30000000
+LIB_LINK_MAPFILE:=-unexported_symbols_list
+
+LIB_LINK_RPATH:=-install_name /Firebird.framework/Versions/A/Libraries/
+LIB_EMBED_LINK_OPTIONS:= -install_name Firebird.framework/Versions/A/Firebird
+LIB_CLIENT_LINK_OPTIONS:= -install_name Firebird.framework/Versions/A/Firebird
+FBEMBED_LINK:=-F../gen/firebird -framework Firebird -L$(LIB) -lfbembed
+
+PLAT_CLASSIC_PRE_TARGET=darwin_setup_framework
+PLAT_CLASSIC_POST_TARGET=darwin_finish_cs_framework
+
+#PLAT_SUPER_PRE_TARGET=darwin_setup_framework
+#PLAT_SUPER_POST_TRAGET=darwin_finish_ss_framework
+
+PLATFORM_POSTBUILD_TARGET=darwin_postbuild_target
--- a/configure.in
+++ b/configure.in
@ -45,9 +45,10 @@ case "$target" in
    MAKEFILE_PREFIX=darwin
    PLATFORM=DARWIN
    AC_DEFINE(DARWIN, 1, [Define this if OS is DARWIN])
+	XE_APPEND(-framework CoreFoundation,LIBS)
    LOCK_MANAGER_FLG=Y
-    EDITLINE_FLG=N
-    SHRLIB_EXT=so
+    EDITLINE_FLG=Y
+    SHRLIB_EXT=dylib
    ;;

  amd64-*-freebsd*)
@ -779,6 +780,7 @@ mkdir -p temp/boot/isql
 mkdir -p temp/boot/jrd
 mkdir -p temp/boot/jrd/os/posix
 mkdir -p temp/boot/jrd/os/win32
+mkdir -p temp/boot/jrd/os/darwin
 mkdir -p temp/boot/lock
 mkdir -p temp/boot/misc
 mkdir -p temp/boot/msgs
@ -786,6 +788,7 @@ mkdir -p temp/boot/qli
 mkdir -p temp/boot/remote
 mkdir -p temp/boot/remote/os/win32
 mkdir -p temp/boot/remote/os/sun
+mkdir -p temp/boot/remote/os/darwin
 mkdir -p temp/boot/utilities/common
 mkdir -p temp/boot/utilities/gsec
 mkdir -p temp/boot/utilities/gstat
@ -813,6 +816,7 @@ mkdir -p temp/std/isql
 mkdir -p temp/std/jrd
 mkdir -p temp/std/jrd/os/posix
 mkdir -p temp/std/jrd/os/win32
+mkdir -p temp/std/jrd/os/darwin
 mkdir -p temp/std/lock
 mkdir -p temp/std/misc
 mkdir -p temp/std/msgs
@ -820,6 +824,7 @@ mkdir -p temp/std/qli
 mkdir -p temp/std/remote
 mkdir -p temp/std/remote/os/win32
 mkdir -p temp/std/remote/os/sun
+mkdir -p temp/std/remote/os/darwin
 mkdir -p temp/std/utilities/common
 mkdir -p temp/std/utilities/gsec
 mkdir -p temp/std/utilities/gstat
@ -848,6 +853,7 @@ mkdir -p temp/superclient/isql
 mkdir -p temp/superclient/jrd
 mkdir -p temp/superclient/jrd/os/posix
 mkdir -p temp/superclient/jrd/os/win32
+mkdir -p temp/superclient/jrd/os/darwin
 mkdir -p temp/superclient/lock
 mkdir -p temp/superclient/misc
 mkdir -p temp/superclient/msgs
@ -855,6 +861,7 @@ mkdir -p temp/superclient/qli
 mkdir -p temp/superclient/remote
 mkdir -p temp/superclient/remote/os/win32
 mkdir -p temp/superclient/remote/os/sun
+mkdir -p temp/superclient/remote/os/darwin
 mkdir -p temp/superclient/utilities/common
 mkdir -p temp/superclient/utilities/gsec
 mkdir -p temp/superclient/utilities/gstat
@ -882,6 +889,7 @@ mkdir -p temp/superserver/isql
 mkdir -p temp/superserver/jrd
 mkdir -p temp/superserver/jrd/os/posix
 mkdir -p temp/superserver/jrd/os/win32
+mkdir -p temp/superserver/jrd/os/darwin
 mkdir -p temp/superserver/lock
 mkdir -p temp/superserver/misc
 mkdir -p temp/superserver/msgs
@ -889,6 +897,7 @@ mkdir -p temp/superserver/qli
 mkdir -p temp/superserver/remote
 mkdir -p temp/superserver/remote/os/win32
 mkdir -p temp/superserver/remote/os/sun
+mkdir -p temp/superserver/remote/os/darwin
 mkdir -p temp/superserver/utilities/common
 mkdir -p temp/superserver/utilities/gsec
 mkdir -p temp/superserver/utilities/gstat
@ -984,13 +993,24 @@ case "$PLATFORM" in
      ],[chmod a+x gen/install/Pre* gen/install/Post* 2>/dev/null])
    ;;

+  DARWIN)
+    ;;
 esac
+if test -f ${MAKE_SRC_DIR}/postfix.${MAKEFILE_PREFIX};then
+	POSTFIX_FILE=gen/make.platform.postfix:${MAKE_SRC_DIR}/postfix.${MAKEFILE_PREFIX}
+	POSTFIX_INCLUDE='include $(ROOT)/gen/make.platform.postfix'
+else
+	POSTFIX_FILE=
+	POSTFIX_INCLUDE=
+fi
+AC_SUBST(POSTFIX_INCLUDE)


 AC_CONFIG_FILES(
 gen/make.rules:${MAKE_SRC_DIR}/make.rules
 gen/make.defaults:${MAKE_SRC_DIR}/make.defaults
 gen/make.platform:${MAKE_SRC_DIR}/prefix.${MAKEFILE_PREFIX}
+${POSTFIX_FILE}
 gen/make.shared.variables:${MAKE_SRC_DIR}/make.shared.variables
 gen/make.shared.targets:${MAKE_SRC_DIR}/make.shared.targets
 gen/Makefile:${MAKE_SRC_DIR}/Makefile.in.firebird
--- a/src/jrd/common.h
+++ b/src/jrd/common.h
@ -270,11 +270,16 @@ static inline int sinixz_sigaction(int sig, const struct sinixz_sigaction *act,
 //#define DOUBLE_ALIGN    4
 //#define BSD_UNIX
 #define UNIX
-#define IMPLEMENTATION  63
+#ifdef powerpc 
+#define IMPLEMENTATION isc_info_db_impl_darwin_ppc /* 63 */
+#endif
+#ifdef i386
+#define I386
+#define IMPLEMENTATION isc_info_db_imp_darwin_x86 /* 70 */
+#endif
 #define IEEE
 #define QUADCONST(n) (n##LL)
 #define QUADFORMAT "q"
-#define MAP_ANONYMOUS
 #define MAP_ANNON

 #define MEMMOVE(from, to, length)		memmove ((void *)to, (void *)from, (size_t)length)
--- a/src/jrd/inf_pub.h
+++ b/src/jrd/inf_pub.h
@ -185,7 +185,7 @@ enum  info_db_implementations

 	isc_info_db_impl_freebsd = 61,
 	isc_info_db_impl_netbsd = 62,
-	isc_info_db_impl_darwin = 63,
+	isc_info_db_impl_darwin_ppc = 63,
 	isc_info_db_impl_sinixz = 64,

 	isc_info_db_impl_linux_sparc = 65,
@ -196,6 +196,7 @@ enum  info_db_implementations
 	isc_info_db_impl_winnt_amd64 = 68,

 	isc_info_db_impl_linux_ppc = 69,
+	isc_info_db_impl_darwin_x86 = 70,

 	isc_info_db_impl_last_value   /* Leave this LAST! */
 };
--- a/src/jrd/isc_file.cpp
+++ b/src/jrd/isc_file.cpp
@ -110,6 +110,14 @@ const char INET_FLAG		= ':';
 #define GETWD(buf)		fb_getcwd(buf)
 #endif /* SUPERSERVER */

+#ifdef DARWIN
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_MOUNT_H
+#include <sys/mount.h>
+#endif
+#endif /*DARWIN*/

 /* Unix/NFS specific stuff */
 #ifndef NO_NFS
@ -164,7 +172,6 @@ const char* MTAB		= "/etc/mtab";
 #endif /* NO_NFS */

 #ifdef hpux
-/* RITTER - added HP11 to the pre-processor condition below */
 #if !(defined HP10 || defined HP11)
 #include <cluster.h>
 #endif
@ -213,10 +220,20 @@ namespace {

 	class Mnt {
 	private:
+#ifdef DARWIN
+	struct statfs * mnt_info;
+	int mnt_cnt;
+	int mnt_i;
+#else
 		osMtab mtab;
+#endif /*DARWIN*/
 	public:
 /*		Mnt() : AutoMemory(), mtab(), node(getPool()), 
 				mount(getPool()), path(getPool()) { } */
+#ifdef DARWIN
+		Mnt();
+		bool ok() const {return this->mnt_cnt > 0;}
+#else
 		bool ok() const { return mtab.ok(); }
 		bool get();
 		tstring node,  /* remote server name */
@ -332,7 +349,6 @@ bool ISC_analyze_nfs(tstring& expanded_filename, tstring& node_name)
 		expanded_filename.replace(0, len, max_path);
 		node_name = max_node;
 	}
-// RITTER - added HP11 to the pre-processor condition below
 #if defined(hpux) && (!(defined HP10 || defined HP11))
 	else
 	{
@ -1711,6 +1727,36 @@ bool Mnt::get()
 }
 #endif //Solaris

+#ifdef DARWIN
+#define GET_MOUNTS
+Mnt::Mnt() : mnt_i(0)
+{
+	this->mnt_info = NULL;
+	this->mnt_cnt = getmntinfo(&this->mnt_info, MNT_NOWAIT);
+}
+
+bool Mnt::get()
+{
+	if (this->mnt_i >= this->mnt_cnt) {
+		return false;
+	}
+
+	const char * start = this->mnt_info[this->mnt_i].f_mntfromname;
+	const char * iflag = strchr(this->mnt_info[this->mnt_i].f_mntfromname, ':');
+
+	if (iflag) {
+		node = tstring(start, size_t(iflag - start));
+		path = tstring(++iflag);
+	}
+	else {
+		node.erase();
+		path.erase();
+	}
+	mount = this->mnt_info[this->mnt_i].f_mntonname;
+	this->mnt_i++;
+	return true;
+}
+#endif /*DARWIN*/
 #ifndef GET_MOUNTS
 bool Mnt::get()
 {
--- a/src/jrd/license.h
+++ b/src/jrd/license.h
@ -19,7 +19,7 @@
 *
 * All Rights Reserved.
 * Contributor(s): ______________________________________.
- * $Id: license.h,v 1.31 2003-10-03 01:47:25 brodsom Exp $
+ * $Id: license.h,v 1.32 2007-03-09 10:32:58 paulbeach Exp $
 * Revision 1.5  2000/12/08 16:18:21  fsg
 * Preliminary changes to get IB_BUILD_NO automatically
 * increased on commits.
@ -133,8 +133,13 @@
 #endif

 #ifdef DARWIN
+#ifdef i386
+#define FB_PLATFORM	"UI"	/* Darwin/Intel */
+#endif
+#ifdef powerpc
 #define FB_PLATFORM     "UP"	/* Darwin/PowerPC */
 #endif
+#endif

 #ifndef FB_VERSION
 #define FB_VERSION      FB_PLATFORM "-" FB_BUILD_TYPE FB_MAJOR_VER "." FB_MINOR_VER "." FB_REV_NO "." FB_BUILD_NO " " FB_BUILD_SUFFIX
--- a/src/jrd/pag.cpp
+++ b/src/jrd/pag.cpp
@ -148,9 +148,9 @@ static const int CLASS_LINUX_AMD64 = 24;  // LINUX on AMD64 systems
 static const int CLASS_FREEBSD_AMD64 = 25;// FreeBSD/amd64
 static const int CLASS_WINDOWS_AMD64 = 26;// Windows/amd64
 static const int CLASS_LINUX_PPC = 27;    // LINUX/PowerPC
-
+static const int CLASS_DARWIN_I386 = 28;	//Darwin/Intel
 static const int CLASS_MAX10 = CLASS_LINUX_AMD64;	// This should not be changed, no new ports with ODS10
-static const int CLASS_MAX = CLASS_LINUX_PPC;
+static const int CLASS_MAX = CLASS_DARWIN_I386;

 // ARCHITECTURE COMPATIBILITY CLASSES

@ -233,7 +233,8 @@ static ArchitectureType archMatrix[CLASS_MAX + 1] = {
 	archLittleEndian, // CLASS_LINUX_AMD64
 	archLittleEndian, // CLASS_FREEBSD_AMD64
 	archLittleEndian, // CLASS_WINDOWS_AMD64
-	archBigEndian     // CLASS_LINUX_PPC
+	archBigEndian,    // CLASS_LINUX_PPC
+	archLittleEndian  // CLASS_DARWIN_I386
 };

 #ifdef sun
@ -303,9 +304,13 @@ const SSHORT CLASS		= CLASS_NETBSD_I386;
 #endif

 #ifdef DARWIN
+#ifdef i386
+const SSHORT CLASS		= CLASS_DARWIN_I386;
+#endif
+#ifdef powerpc
 const SSHORT CLASS		= CLASS_DARWIN_PPC;
 #endif
-
+#endif
 static const char* const SCRATCH = "fb_table_";

 // CVC: Since nobody checks the result from this function (strange!), I changed
--- a/src/jrd/utl.cpp
+++ b/src/jrd/utl.cpp
@ -236,7 +236,8 @@ static const TEXT* const impl_implementation[] = {
    "Firebird/linux AMD64",	/* 66 */
    "Firebird/FreeBSD/amd64",	/* 67 */
    "Firebird/x86-64/Windows NT",   /* 68 */
-    "Firebird/linux PowerPC"	/* 69 */
+    "Firebird/linux PowerPC",	/* 69 */
+	"Firebird/Darwin/Intel"	/* 70 */
 };