Add Firebird 2.0.0 (RC4)

23 files changed, 292 insertions, 411 deletions

diff --git a/databases/firebird20-server/Makefile b/databases/firebird20-server/Makefile
index 11662b78d616..e43e14ed379d 100644
--- a/databases/firebird20-server/Makefile
+++ b/databases/firebird20-server/Makefile
@@ -1,27 +1,30 @@
-# New ports collection makefile for:	Firebird
-# Date created:		20 December 2000
-# Whom:			Geoffrey C. Speicher <geoff@sea-incorporated.com>
+# New ports collection makefile for:	firebird2-server
+# Date created:		15 August 2006
+# Whom:			Sergey Skvortsov <skv@protey.ru>
 #
 # $FreeBSD$
 #
 
 PORTNAME?=	firebird
-PORTVERSION=	1.5.3
+PORTVERSION=	2.0.0
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=firebird
 PKGNAMESUFFIX?=	-server
-DISTNAME=	firebird-1.5.3.4870
+DISTNAME=	Firebird-2.0.0.12724-ReleaseCandidate4
 
 MAINTAINER=	skv@FreeBSD.org
-COMMENT?=	The open-source InterBase(tm) 6.0 spin-off (Classic version)
+COMMENT?=	Firebird-2 relational database (server)
+
+UNIQUENAME?=	${PORTNAME}2
 
 USE_BISON=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	autoconf:259 aclocal:19 libtool:15
-ACLOCAL_ARGS=	--acdir=${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal
+ACLOCAL_ARGS=	--acdir=${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal \
+		-I ${WRKSRC}/m4
 USE_GCC=	3.4+
 
 LOCALSTATEDIR=	/var/db/firebird
@@ -37,14 +40,15 @@ LD=	${CC}
 STRIP=
 
 ONLY_FOR_ARCHS=	i386 amd64
+CONFLICTS=	firebird-client-1* firebird-server-1*
 
-WRKSRC=		${WRKDIR}/${DISTNAME}
+WRKSRC=		${WRKDIR}/${DISTNAME:C/^F/f/}
 
 INSTALL_FB=	${INSTALL} ${COPY} -g firebird
 
 .if !defined(CLIENT_ONLY)
 # Server part stuff
-LIB_DEPENDS+=	fbembed.1:${PORTSDIR}/databases/firebird-client
+LIB_DEPENDS+=	fbembed.2:${PORTSDIR}/databases/firebird2-client
 
 AUTOGENARGS=	--with-lock-manager
 
@@ -55,13 +59,13 @@ SUB_FILES=	pkg-install pkg-message aliases.conf
 SUB_LIST+=	LOCALSTATEDIR=${LOCALSTATEDIR}
 
 SUID_BIN=	fb_inet_server fb_lock_mgr gds_drop
-UTIL_BIN=	fb_lock_print gbak gdef gfix gsec gstat
-UDF_SO=		ib_udf.so fbudf.so
-UDF_SQL=	src/extlib/ib_udf.sql src/extlib/fbudf/fbudf.sql
-
-CONFLICTS=	firebird-devel-[0-9]*
+UTIL_BIN=	fb_lock_print gbak gdef gfix gsec gstat nbackup
+UDF_SO=		ib_udf.so
+UDF_SQL=	src/extlib/ib_udf2.sql
 .else
 # Client part stuff
+LIB_DEPENDS=	icuuc.34:${PORTSDIR}/devel/icu
+
 AUTOGENARGS=	--with-editline
 
 ALL_TARGET=	firebird_basic libfbembed embed_isql embed_gpre \
@@ -69,10 +73,15 @@ ALL_TARGET=	firebird_basic libfbembed embed_isql embed_gpre \
 #ALL_TARGET=	firebird_basic libfbembed libfbclient \
 #		client_gpre client_gdef client_isql client_qli extlib
 
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 CLIENT_BIN=	gpre isql qli
 
-CONFIGURE_ENV+=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}"
+CFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+
+CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	*
@@ -81,17 +90,19 @@ PORTDOCS=	*
 
 MAKE_ENV+=	CC=${CC} CXX=${CXX} FIREBIRD_TMP="${WRKDIR}" FIREBIRD_LOCK="${WRKDIR}"
 
+post-extract:
+	@${RM} -rf ${WRKSRC}/extern/icu
+
+post-patch:
+	@${MKDIR} ${WRKSRC}/m4
+	${CP} ${FILESDIR}/*.m4 ${WRKSRC}/m4
+
 .include <bsd.port.pre.mk>
 
 .if !defined(CLIENT_ONLY)
 pre-everything::
-	@${ECHO_MSG} "NOTE: If the work directory is on an NFS mount, you will"
-	@${ECHO_MSG} "require NFS client locking support for the build to"
-	@${ECHO_MSG} "succeed. Currently this is only available on FreeBSD 5.0"
-	@${ECHO_MSG} "or greater."
-	@${ECHO_MSG}
 	@${ECHO_MSG} "WARNING: The on-disk structure of the databases has"
-	@${ECHO_MSG} "changed since version 1.0.x."
+	@${ECHO_MSG} "changed since version 1.x."
 	@${ECHO_MSG} "Cancel this installation now and backup your databases"
 	@${ECHO_MSG} "if you have not already done so."
 .if !defined(BATCH)
@@ -100,16 +111,18 @@ pre-everything::
 .endif
 
 .if !defined(CLIENT_ONLY)
-pre-install:
+pre-su-install:
 	@${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
 
-post-install:
+post-su-install:
 	@${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PORTNAME} POST-INSTALL
 	@${CAT} ${PKGMESSAGE}
 .endif
 
 .ifndef WITHOUT_IPC_CLEANUP
 pre-build:
+	@if [ `${ID} -u` -eq 0 ]; then \
+	${ECHO_MSG} "==> Please do not build ${PORTNAME} as 'root' because this may cause conflicts with SysV semaphores of running services."; exit 1; fi
 	[ -f ${WRKDIR}/ipcs.pre.build ] || /usr/bin/ipcs -s | ${TAIL} -n +3 | \
 		${GREP} -F `${ID} -un` | ${CAT} > ${WRKDIR}/ipcs.pre.build
 
@@ -125,7 +138,9 @@ do-configure:
 	${AUTOTOOLS_VARS} ./autogen.sh --localstatedir=${LOCALSTATEDIR} \
 		--prefix=${LOCALSTATEDIR} --exec-prefix=${PREFIX} \
 		--libexecdir=${LIBEXECDIR} \
-		--sysconfdir=${CONFDIR} --datadir=${DATADIR} ${AUTOGENARGS})
+		--sysconfdir=${CONFDIR} --datadir=${DATADIR} \
+		--with-icu-config=${LOCALBASE}/bin/icu-config \
+		${AUTOGENARGS})
 
 post-configure:
 	@${REINPLACE_CMD} -e 's|__attribute__ ((__unused__));||' \
@@ -137,10 +152,13 @@ do-install:
 	${INSTALL_PROGRAM} ${UTIL_BIN:S!^!${WRKSRC}/gen/firebird/bin/!} ${PREFIX}/bin
 
 	${INSTALL_PROGRAM} -o firebird -g firebird -m 6550 \
-		${SUID_BIN:S!^!${WRKSRC}/gen/firebird/bin/!} ${PREFIX}/sbin
+		${SUID_BIN:S!^!${WRKSRC}/gen/firebird/bin/!} ${PREFIX}/bin
 
 	@${MKDIR} ${CONFDIR}
 	${INSTALL_DATA} ${WRKDIR}/aliases.conf ${CONFDIR}/aliases.conf.sample
+.if !exists(${CONFDIR}/aliases.conf)
+	${INSTALL_DATA} ${WRKDIR}/aliases.conf ${CONFDIR}/aliases.conf
+.endif
 
 	${MKDIR} ${LIBEXECDIR}/udf ${LOCALSTATEDIR}/help ${LIBEXECDIR}/intl
 
@@ -149,19 +167,17 @@ do-install:
 	${INSTALL_FB} -m 0555 ${UDF_SO:S!^!${WRKSRC}/gen/firebird/UDF/!} ${LIBEXECDIR}/udf
 	${INSTALL_FB} -m 0444 ${UDF_SQL:S!^!${WRKSRC}/!} ${LIBEXECDIR}/udf
 
-.if !exists(${LOCALSTATEDIR}/security.fdb)
-	${INSTALL_FB} -m 0660 -o firebird ${WRKSRC}/gen/firebird/security.fdb \
-		${LOCALSTATEDIR}/security.fdb
+.if !exists(${LOCALSTATEDIR}/security2.fdb)
+	${INSTALL_FB} -m 0660 -o firebird ${WRKSRC}/gen/firebird/security2.fdb \
+		${LOCALSTATEDIR}/security2.fdb
 .endif
-	${INSTALL_FB} -m 0660 -o firebird ${WRKSRC}/gen/firebird/security.fdb \
-		${LOCALSTATEDIR}/security.fdb.sample
+	${INSTALL_FB} -m 0660 -o firebird ${WRKSRC}/gen/firebird/security2.fdb \
+		${LOCALSTATEDIR}/security2.fdb.sample
 
 	${INSTALL_FB} -m 0440 ${WRKSRC}/gen/firebird/help/help.fdb \
 		${LOCALSTATEDIR}/help
 
 	${INSTALL_FB} -m 0555 ${WRKSRC}/gen/firebird/intl/libfbintl.so ${LIBEXECDIR}/intl/fbintl
-
-	${INSTALL_DATA} ${FILESDIR}/RELNOTES ${LOCALSTATEDIR}
 .else
 # defined CLIENT_ONLY
 	${INSTALL_PROGRAM} ${CLIENT_BIN:S!^!${WRKSRC}/gen/firebird/bin/!} \
@@ -180,13 +196,14 @@ do-install:
 		${WRKSRC}/gen/firebird/lib/libfbembed.so.${PORTVERSION} \
 		${PREFIX}/lib
 
-	${LN} -fs libfbclient.so.${PORTVERSION} ${PREFIX}/lib/libfbclient.so.1
-	${LN} -fs libfbclient.so.1 ${PREFIX}/lib/libfbclient.so
+	${LN} -fs libfbclient.so.${PORTVERSION} ${PREFIX}/lib/libfbclient.so.2
+	${LN} -fs libfbclient.so.${PORTVERSION} ${PREFIX}/lib/libfbclient.so
 
-	${LN} -fs libfbembed.so.${PORTVERSION} ${PREFIX}/lib/libfbembed.so.1
-	${LN} -fs libfbembed.so.1 ${PREFIX}/lib/libfbembed.so
-	${LN} -fs libfbembed.so.1 ${PREFIX}/lib/libgds.so.1
-	${LN} -fs libfbembed.so.1 ${PREFIX}/lib/libgds.so
+	${LN} -fs libfbembed.so.${PORTVERSION} ${PREFIX}/lib/libfbembed.so.2
+	${LN} -fs libfbembed.so.${PORTVERSION} ${PREFIX}/lib/libfbembed.so
+
+	${LN} -fs libfbclient.so.${PORTVERSION} ${PREFIX}/lib/libgds.so.2
+	${LN} -fs libfbclient.so.${PORTVERSION} ${PREFIX}/lib/libgds.so
 
 	@${MKDIR} ${PREFIX}/include
 	${INSTALL_DATA} ${WRKSRC}/gen/firebird/include/*.h ${PREFIX}/include
@@ -200,10 +217,6 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/README.user ${DOCSDIR}/README
 	${INSTALL_DATA} ${WRKSRC}/doc/sql.extensions/README.* ${DOCSDIR}/sql.extensions
 .endif
-
-	@${ECHO_MSG} "===>   Installing examples for ${PKGNAME}"
-	@${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/gen/firebird/examples/v5/* ${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/databases/firebird20-server/distinfo b/databases/firebird20-server/distinfo
index ca162a069ca5..e23ebea85b9a 100644
--- a/databases/firebird20-server/distinfo
+++ b/databases/firebird20-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (firebird-1.5.3.4870.tar.bz2) = 559d005ab6622274f9448687f930393c
-SHA256 (firebird-1.5.3.4870.tar.bz2) = 16880405d6e321a70e80c6e6fb4ed8429a692c43b8a7b59a676cf7d2162d2023
-SIZE (firebird-1.5.3.4870.tar.bz2) = 5055973
+MD5 (Firebird-2.0.0.12724-ReleaseCandidate4.tar.bz2) = c955612c692484b3da84e8c3e518afe6
+SHA256 (Firebird-2.0.0.12724-ReleaseCandidate4.tar.bz2) = 16c88b35de8c85ea39e2289876dab9e15e6a7a8be3ce14ca492ca63873221da1
+SIZE (Firebird-2.0.0.12724-ReleaseCandidate4.tar.bz2) = 12471842
diff --git a/databases/firebird20-server/files/RELNOTES b/databases/firebird20-server/files/RELNOTES
deleted file mode 100644
index 87a8c5de91bf..000000000000
--- a/databases/firebird20-server/files/RELNOTES
+++ /dev/null
@@ -1,108 +0,0 @@
-Firebird 1.5.3 FreeBSD Release Notes
---------------------------------------
-FB-V1.5.3.4870 Firebird 1.5 Release
-
-    Welcome to the FreeBSD Firebird port!
-
-    Firebird is installed SUID with owner and group `firebird'.
-This does affect where you can and cannot create databases when
-connecting remotely, as well as which existing databases you can
-access.  If you want a database to be available remotely, be sure
-it's readable and writeable to group firebird.
-
-    There may be times when you manage to get your system into a
-state where using any of the Firebird utilites (isql, gbak, gsec,
-etc.) gives you the message "semget failed".  One surefire way to
-do this is to build and install the port.  :)  If this happens,
-make sure that the lock manager is not running and its semaphores
-have been removed.  The former can be accomplished with 'ps ax
-|grep fb' and 'kill'; the latter with 'ipcs -s' and 'ipcrm -s'.
-
-    For example, after building and installing the port, you will
-probably go through something like this:
-
-# isql /var/db/firebird/security.fdb
-Statement failed, SQLCODE = -902
-
-operating system directive semget failed
--No such file or directory
-
-# ipcs -s
-Semaphores:
-T     ID     KEY        MODE       OWNER    GROUP
-s 1310720  252034728 --rw-rw-rw-     root    wheel
-
-# ipcrm -s 1310720
-
-and you should be in business.
-
-    Once this is done, you should be able to connect normally to
-databases.  Your first connection will restart the lock manager.
-
-    There may be times, however, when you still get "semget failed"
-even though the lock manager is not running and the semaphores have
-been cleaned up.  There seems to be a conflict with this release
-and the PostgreSQL 7 release as installed from the ports collection.
-If you're having trouble with Firebird and you're running PostgreSQL,
-try stopping PostgreSQL:
-
-	/usr/local/etc/rc.d/pgsql.sh stop
-
-and see if that helps. Alternatively, increase the value of SEMMNS
-by 48 in your kernel configuration file. This can be found by getting
-the current value with 'sysctl -a | grep semmns'. You can either add
-this to your kernel config, or add the following line to /boot/loader.conf:
-
-	kern.ipc.semmns=X
-
-where is is the current value plus 48. If this doesn't resolve the issue,
-try adding 48 again. 
-
-    Please note that as of RC8, the libgds.so symlink now points to
-libfbembed.so. This has been done to resolve compatability issues with
-older versions of Firebird. The FreeBSD port of RC7 had libgds.so
-pointing to libfbclient.so. libfbclient.so is a remote access-only
-shared library with threaded support, which requires target applications
-to link with a threaded library such as libc_r.so, libpthread.so or libthr.so.
-
-    Super Server support in Firebird 1.5 for FreeBSD is not currently
-available due to the Firebird code using POSIX threads APIs not available
-in FreeBSD 4.x or not yet complete in FreeBSD 5.x. This issue will become
-more important once the scalability issues of Super Server have been
-resolved.
-
-    This installation has already inserted the necessary line to
-/etc/inetd.conf so that you can connect to Firebird across the network.
-However you may need to add the remote host to /etc/hosts.equiv. For
-example, to allow the local machine to make connections to Firebird
-using TCP, the following command needs running:
-
-	echo localhost >> /etc/hosts.equiv
-
-Please note that adding machines to /etc/hosts.equiv can reduce the
-security of your system. If in doubt, try connecting to Firebird with
-a username and password already defined in security.fdb. For example:
-
-gsec
-> add myuser -pass mypass
-> quit
-isql -u myuser -p mypass localhost:/usr/local/share/firebird/examples/employee.fdb
-
-This should reduce the need for hosts defined in /etc/hosts.equiv.
-
-    Complete documentation for InterBase(tm) is available (free of
-charge) from http://www.interbase.com/ in PDF format.  While
-InterBase and Firebird are two distinct entities, all InterBase
-documentation is pertinent to Firebird.  More information on Firebird
-and InterBase can be found at the following:
-
-	http://sourceforge.net/projects/firebird/
-	http://www.ibphoenix.com/
-	http://www.interbase2000.org/
-	http://www.firebirdsql.org/
-
-    Please also see the doc directory in the Firebird package for
-documentation specific to Firebird.
-
-Chris Knight
-<chris@e-easy.com.au>
diff --git a/databases/firebird20-server/files/aliases.conf.in b/databases/firebird20-server/files/aliases.conf.in
index 92b5b620c07a..ded23bfd70cb 100644
--- a/databases/firebird20-server/files/aliases.conf.in
+++ b/databases/firebird20-server/files/aliases.conf.in
@@ -5,5 +5,5 @@
 # Examples:
 #
 # employee = %%EXAMPLESDIR%%/employee.fdb
-# security = /var/db/firebird/security.fdb
+# security = /var/db/firebird/security2.fdb
 #
diff --git a/databases/firebird20-server/files/icu.m4 b/databases/firebird20-server/files/icu.m4
new file mode 100644
index 000000000000..37d0f8a08c40
--- /dev/null
+++ b/databases/firebird20-server/files/icu.m4
@@ -0,0 +1,46 @@
+dnl AM_PATH_ICU([MINIMUM-VERSION])
+dnl Adds support for ICU
+AC_DEFUN([AM_PATH_ICU],
+[
+  rast_lib_icu_major="$1"
+  rast_lib_icu_minor="$2"
+  rast_lib_icu_version="$1.$2"
+
+  AC_ARG_WITH(icu-config,
+  AC_HELP_STRING([--with-icu-config=PATH],[path to icu-config]),
+  [
+      AC_MSG_RESULT(using $withval for icu-config)
+      ICU_CONFIG="$withval"
+  ], [
+      AC_PATH_PROG(ICU_CONFIG, icu-config, no)
+  ])
+  HAVE_ICU="no"
+  if test "$ICU_CONFIG" != "no"; then
+    AC_MSG_CHECKING([ICU version])    
+    ICU_VERSION="`$ICU_CONFIG --version`"
+    if test $? -eq 0; then
+      changequote(<<, >>)
+      ICU_MAJOR=`expr "$ICU_VERSION" : '\(.*\)\..*'`
+      ICU_MINOR=`expr "$ICU_VERSION" : '.*\.\(.*\)'`
+      changequote([, ])
+      if expr "$ICU_MAJOR" '>' "$rast_lib_icu_major" > /dev/null ||
+         ( expr "$ICU_MAJOR" '=' "$rast_lib_icu_major" > /dev/null &&
+           expr "$ICU_MINOR" '>=' "$rast_lib_icu_minor" > /dev/null ); then
+        AC_MSG_RESULT([$ICU_VERSION])
+
+        ICU_CPPFLAGS=`$ICU_CONFIG --cppflags`
+        ICU_LIBS=`$ICU_CONFIG --ldflags-libsonly`
+        ICU_LDFLAGS=`$ICU_CONFIG --ldflags-searchpath`
+        AC_SUBST(ICU_CPPFLAGS)
+        AC_SUBST(ICU_LIBS)
+        AC_SUBST(ICU_LDFLAGS)
+        HAVE_ICU="yes"
+      else
+        AC_MSG_WARN([$ICU_VERSION is too old; $rast_lib_icu_version is required])
+      fi
+    else
+      AC_MSG_WARN([icu-config --version failed])
+    fi
+  fi
+  AC_SUBST(HAVE_ICU)
+])
diff --git a/databases/firebird20-server/files/patch-amd64 b/databases/firebird20-server/files/patch-amd64
deleted file mode 100644
index 1f4d465389b3..000000000000
--- a/databases/firebird20-server/files/patch-amd64
+++ /dev/null
@@ -1,76 +0,0 @@
---- src/jrd/common.h.orig	Mon Jan 23 20:52:45 2006
-+++ src/jrd/common.h	Mon Jan 23 20:54:36 2006
-@@ -273,8 +273,14 @@
- 
- #define UNIX  1
- #define IEEE  1
-+
-+#ifdef AMD64
-+#define IMPLEMENTATION  isc_info_db_impl_freebsd_amd64 /* 67  next higher unique n
-+umber, See you later  */
-+#else
- #define I386  1
- #define IMPLEMENTATION    isc_info_db_impl_freebsd   /* 61 */
-+#endif
- 
- #define QUADFORMAT "ll"
- #define QUADCONST(n) (n##LL)
---- src/jrd/ibase.h.orig	Mon Jan 23 20:51:38 2006
-+++ src/jrd/ibase.h	Mon Jan 23 20:52:08 2006
-@@ -1577,6 +1577,8 @@
- 	isc_info_db_impl_linux_sparc = 65,
- 	isc_info_db_impl_linux_amd64 = 66,
- 
-+	isc_info_db_impl_freebsd_amd64 = 67,
-+
- 	isc_info_db_impl_last_value   /* Leave this LAST! */
-     };
- 
---- src/jrd/pag.cpp.orig	Sat Mar 26 07:07:11 2005
-+++ src/jrd/pag.cpp	Mon Jan 23 21:27:49 2006
-@@ -143,8 +143,9 @@
- static const int CLASS_NETBSD_I386 = 22;  // NetBSD/i386
- static const int CLASS_DARWIN_PPC = 23;   // Darwin/PowerPC
- static const int CLASS_LINUX_AMD64 = 24;  // LINUX on AMD64 systems
-+static const int CLASS_FREEBSD_AMD64 = 25;// FreeBSD/amd64
- 
--static const int CLASS_MAX10 = CLASS_LINUX_AMD64;
-+static const int CLASS_MAX10 = CLASS_FREEBSD_AMD64;
- 
- // ARCHITECTURE COMPATIBILITY CLASSES
- 
-@@ -188,7 +189,8 @@
- 	archIntel86, // CLASS_FREEBSD_I386
-     archIntel86, // CLASS_NETBSD_I386
- 	archUnknown, // CLASS_DARWIN_PPC
--	archUnknown  // CLASS_LINUX_AMD64
-+	archUnknown, // CLASS_LINUX_AMD64
-+	archUnknown  // CLASS_FREEBSD_AMD64
- };
- 
- #ifdef sun
-@@ -239,7 +241,12 @@
- #endif
- 
- #ifdef FREEBSD
-+#ifdef i386
- #define CLASS           CLASS_FREEBSD_I386
-+#endif
-+#ifdef AMD64
-+#define CLASS           CLASS_FREEBSD_AMD64
-+#endif
- #endif
- 
- #ifdef NETBSD
---- src/jrd/utl.cpp.orig	Mon Jan 23 20:56:00 2006
-+++ src/jrd/utl.cpp	Mon Jan 23 20:56:37 2006
-@@ -255,7 +255,8 @@
-     "Firebird/Darwin/PowerPC",	/* 63 */
-     "Firebird/SINIX-Z",	/* 64 */
-     "Firebird/linux Sparc",	/* 65 */
--    "Firebird/linux AMD64"	/* 66 */
-+    "Firebird/linux AMD64",	/* 66 */
-+    "Firebird/FreeBSD/amd64"	/* 67 */
- };
- 
- 
diff --git a/databases/firebird20-server/files/patch-src%install%misc%firebird.conf b/databases/firebird20-server/files/patch-builds%install%misc%firebird.conf
index 4f8f1b416285..d0105af83cf6 100644
--- a/databases/firebird20-server/files/patch-src%install%misc%firebird.conf
+++ b/databases/firebird20-server/files/patch-builds%install%misc%firebird.conf
@@ -1,5 +1,5 @@
---- src/install/misc/firebird.conf.orig	Fri Sep 30 17:13:47 2005
-+++ src/install/misc/firebird.conf	Wed Mar 15 17:03:43 2006
+--- builds/install/misc/firebird.conf.orig	Tue Aug 15 22:38:52 2006
++++ builds/install/misc/firebird.conf	Tue Aug 15 22:39:24 2006
 @@ -60,7 +60,7 @@
  #
  # Type: string
@@ -9,7 +9,7 @@
  
  
  # ----------------------------
-@@ -126,7 +126,7 @@
+@@ -125,7 +125,7 @@
  #
  # Type: string (special format)
  #
diff --git a/databases/firebird20-server/files/patch-builds%make.new%config%config.h.in b/databases/firebird20-server/files/patch-builds%make.new%config%config.h.in
deleted file mode 100644
index 1ad510c8f674..000000000000
--- a/databases/firebird20-server/files/patch-builds%make.new%config%config.h.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- builds/make.new/config/config.h.in.orig	Sun Jul  6 05:07:48 2003
-+++ builds/make.new/config/config.h.in	Thu Mar 16 19:15:02 2006
-@@ -172,6 +172,7 @@
- #undef PowerPC
- #undef sparc
- #undef i386
-+#undef AMD64
- #undef mips
- #undef alpha
- 
-@@ -190,5 +191,9 @@
- #undef SINIXZ
- 
- #define FB_PREFIX "/usr/local/firebird"
-+#define FB_EXEC_PREFIX	"/usr/local"
-+#define FB_CONF_PREFIX	"/usr/local/etc/firebird"
-+#define FB_MSG_PREFIX	"/usr/local/libdata/firebird"
-+#define FB_LIBEXEC_PREFIX	"/usr/local/libexec/firebird"
- 
- #endif
diff --git a/databases/firebird20-server/files/patch-builds%posix%Makefile.in.firebird b/databases/firebird20-server/files/patch-builds%posix%Makefile.in.firebird
new file mode 100644
index 000000000000..31a0b95ec4f7
--- /dev/null
+++ b/databases/firebird20-server/files/patch-builds%posix%Makefile.in.firebird
@@ -0,0 +1,35 @@
+--- builds/posix/Makefile.in.firebird.orig	Sun Dec 18 20:56:17 2005
++++ builds/posix/Makefile.in.firebird	Wed Sep 13 20:31:13 2006
+@@ -186,7 +186,6 @@
+ # 
+ 
+ external_libraries:
+-	$(MAKE) -f $(GEN_ROOT)/Makefile.extern.icu
+ ifeq ($(EDITLINE_FLG),Y)
+ 	$(MAKE) -f $(GEN_ROOT)/Makefile.extern.editline
+ endif
+@@ -515,12 +514,12 @@
+ #___________________________________________________________________________
+ # 
+ .PHONY: clean clean_objects clean_dependancies clean_extern_objects clean_build \
+-		clean_gpre_gen clean_icu clean_dbs clean_examples clean_makefiles \
++		clean_gpre_gen clean_dbs clean_examples clean_makefiles \
+ 		clean_editline clean_all
+ 
+ 
+ clean: clean_objects clean_dependancies clean_extern_objects clean_build \
+-		clean_gpre_gen clean_icu clean_dbs clean_examples
++		clean_gpre_gen clean_dbs clean_examples
+ 
+ ifeq ($(EDITLINE_FLG),Y)
+ clean: clean_editline
+@@ -542,9 +541,6 @@
+ 
+ clean_editline:
+ 	-make -C $(ROOT)/extern/editline clean
+-
+-clean_icu:
+-	-make -C $(ROOT)/extern/icu/source clean
+ 
+ clean_objects:
+ 	$(RM) `find $(TMP_ROOT)/ -type f -name '*.o' -print`
diff --git a/databases/firebird20-server/files/patch-builds%posix%make.defaults b/databases/firebird20-server/files/patch-builds%posix%make.defaults
index f7d4bc6362f3..bef124859a91 100644
--- a/databases/firebird20-server/files/patch-builds%posix%make.defaults
+++ b/databases/firebird20-server/files/patch-builds%posix%make.defaults
@@ -1,6 +1,6 @@
---- builds/posix/make.defaults.orig	Thu Mar 16 19:49:57 2006
-+++ builds/posix/make.defaults	Thu Mar 16 19:51:18 2006
-@@ -94,7 +94,7 @@
+--- builds/posix/make.defaults.orig	Wed Dec 28 09:58:28 2005
++++ builds/posix/make.defaults	Wed Aug 16 16:26:16 2006
+@@ -102,7 +102,7 @@
  CHMOD=			chmod
  CHMOD_6=		chmod 666
  CHMOD_7=		chmod 777
@@ -9,3 +9,13 @@
  MV=			mv -f
  TOUCH=			touch
  CP=			cp
+@@ -180,9 +180,6 @@
+ 
+ LIBFBSTATIC_A = $(LIB)/libfbstatic.a
+ LIBEDITLINE_A = $(LIB)/libeditline.a
+-LIBICU_SO = $(LIB)/$(LIB_PREFIX)icuuc.$(SHRLIB_EXT) \
+-			$(LIB)/$(LIB_PREFIX)icudata.$(SHRLIB_EXT) \
+-			$(LIB)/$(LIB_PREFIX)icui18n.$(SHRLIB_EXT)
+ 
+ # Shared library name for usage inside of the UDF
+ IbUtilLibraryName = $(LIB_PREFIX)ib_util.$(SHRLIB_EXT)
diff --git a/databases/firebird20-server/files/patch-builds%posix%make.rules b/databases/firebird20-server/files/patch-builds%posix%make.rules
new file mode 100644
index 000000000000..4131aff1f052
--- /dev/null
+++ b/databases/firebird20-server/files/patch-builds%posix%make.rules
@@ -0,0 +1,20 @@
+--- builds/posix/make.rules.orig	Wed Dec 28 09:58:28 2005
++++ builds/posix/make.rules	Thu Sep 14 17:29:08 2006
+@@ -33,7 +33,7 @@
+ 
+ 
+ # 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 -I$(ROOT)/extern/icu/source/common -I$(ROOT)/extern/icu/source/i18n -DNAMESPACE=Vulcan
++CFLAGS:= $(CFLAGS) -I$(SRC_ROOT)/include/gen -I$(SRC_ROOT)/include -I$(SRC_ROOT)/vulcan @ICU_CPPFLAGS@ -DNAMESPACE=Vulcan
+ 
+ ifeq ($(IsProdTypeBuild),Y)
+   CFLAGS:= $(CFLAGS) $(PROD_FLAGS) -DPROD_BUILD
+@@ -75,7 +75,7 @@
+ STATICEXE_LINK = @CXX@
+ 
+ LINK_LIBS = @LIBS@ @EDITLINE_A@
+-ICU_LIBS = -licuuc -licudata -licui18n
++ICU_LIBS = @ICU_LIBS@ @ICU_LDFLAGS@
+ STATICLINK_LIBS = @LIBS@ @EDITLINE_A@
+ SO_LINK_LIBS = @LIBS@
+ 
diff --git a/databases/firebird20-server/files/patch-configure.in b/databases/firebird20-server/files/patch-configure.in
index ce1a65467bb9..4e09407641e4 100644
--- a/databases/firebird20-server/files/patch-configure.in
+++ b/databases/firebird20-server/files/patch-configure.in
@@ -1,30 +1,45 @@
---- configure.in.orig	Wed Dec 14 10:29:08 2005
-+++ configure.in	Thu Mar 16 18:38:55 2006
-@@ -49,6 +49,16 @@
-     SHRLIB_EXT=dylib
-     ;;
- 
-+  amd64-*-freebsd*)
-+    MAKEFILE_PREFIX=freebsd 
-+    PLATFORM=FREEBSD
-+    AC_DEFINE(FREEBSD)
-+    AC_DEFINE(AMD64)
-+    LOCK_MANAGER_FLG=Y
-+    EDITLINE_FLG=N
-+    SHRLIB_EXT=so
-+    ;;
-+
-   *-*-freebsd*)
-     MAKEFILE_PREFIX=freebsd 
-     PLATFORM=FREEBSD
-@@ -612,6 +622,10 @@
+--- configure.in.orig	Tue Apr 25 21:07:23 2006
++++ configure.in	Thu Sep 14 19:30:42 2006
+@@ -423,9 +423,10 @@
+ AC_CHECK_LIB(curses, main)
+ dnl AC_CHECK_LIB(termcap, main)
+ if test "$EDITLINE_FLG" = "Y"; then
+-  AC_SUBST(EDITLINE_A, -leditline)
++  AC_SUBST(EDITLINE_A, "-ledit -lreadline")
+ fi
+ AC_CHECK_LIB(stdc++, main,,, $LIBS)
++AM_PATH_ICU(3, 4)
+ 
+ 
+ dnl Check for functions
+@@ -696,6 +697,10 @@
  AC_SUBST(NEW_FIREBIRD_DIR)
  
- AC_DEFINE_UNQUOTED(FB_PREFIX, $(if test "x$prefix" = "xNONE" ; then echo \"$ac_default_prefix\"; else echo \"$prefix\"; fi))
-+AC_DEFINE_UNQUOTED(FB_EXEC_PREFIX, "$exec_prefix")
-+AC_DEFINE_UNQUOTED(FB_CONF_PREFIX, "$sysconfdir")
-+AC_DEFINE_UNQUOTED(FB_MSG_PREFIX, "$datadir")
-+AC_DEFINE_UNQUOTED(FB_LIBEXEC_PREFIX, "$libexecdir")
+ AC_DEFINE_UNQUOTED(FB_PREFIX, $(if test "x$prefix" = "xNONE" ; then echo \"$ac_default_prefix\"; else echo \"$prefix\"; fi), [Installation path prefix])
++AC_DEFINE_UNQUOTED(FB_EXEC_PREFIX, "$exec_prefix", [Executables path prefix])
++AC_DEFINE_UNQUOTED(FB_CONF_PREFIX, "$sysconfdir", [Single-machine data path prefix])
++AC_DEFINE_UNQUOTED(FB_MSG_PREFIX, "$datadir", [Architecture-independent data path prefix])
++AC_DEFINE_UNQUOTED(FB_LIBEXEC_PREFIX, "$libexecdir", [Program executables path prefix])
  
  AC_CONFIG_COMMANDS(,,[
- dnl ### GEN ### directories for preprocessed cpp, databases and output
+ dnl # rebuild version header if needed
+@@ -1004,19 +1009,11 @@
+ gen/Makefile.install:builds/install/arch-specific/${INSTALL_PREFIX}/Makefile.in
+ Makefile:Makefile.in
+ gen/Makefile.extern.editline:${MAKE_SRC_DIR}/Makefile.in.extern.editline
+-gen/Makefile.extern.icu:${MAKE_SRC_DIR}/Makefile.in.extern.icu
+ )
+ 
+ 
+ 
+-if test "$PROD_BUILD_FLG" = N; then
+-  DEBUG_ICU=--enable-debug
+-fi
+-
+ AC_OUTPUT
+-(cd extern/icu/source
+-chmod +x runConfigureICU configure install-sh
+-./runConfigureICU "$ICU_PLATFORM" "$DEBUG_ICU" --prefix=`pwd`/..)
+ 
+ 
+ dnl Print out the build configuration (the most interesting thing)
diff --git a/databases/firebird20-server/files/patch-src%common%config%config.cpp b/databases/firebird20-server/files/patch-src%common%config%config.cpp
index 34645c66ca09..b05adf508983 100644
--- a/databases/firebird20-server/files/patch-src%common%config%config.cpp
+++ b/databases/firebird20-server/files/patch-src%common%config%config.cpp
@@ -1,11 +1,11 @@
---- src/common/config/config.cpp.orig	Wed Mar 15 14:17:53 2006
-+++ src/common/config/config.cpp	Wed Mar 15 14:18:30 2006
-@@ -106,7 +106,7 @@
+--- src/common/config/config.cpp.orig	Tue Aug 15 22:53:43 2006
++++ src/common/config/config.cpp	Tue Aug 15 22:54:38 2006
+@@ -111,7 +111,7 @@
  	{TYPE_STRING,		"RemoteBindAddress",		(ConfigValue) 0},
  	{TYPE_STRING,		"ExternalFileAccess",		(ConfigValue) "None"},	// location(s) of external files for tables
  	{TYPE_STRING,		"DatabaseAccess",			(ConfigValue) "Full"},	// location(s) of databases
 -	{TYPE_STRING,		"UdfAccess",				(ConfigValue) "Restrict UDF"},	// location(s) of UDFs
-+	{TYPE_STRING,		"UdfAccess",				(ConfigValue) "Restrict " FB_LIBEXEC_PREFIX "/udf"},	// location(s) of UDFs
++	{TYPE_STRING,		"UdfAccess",				(ConfigValue) "Restrict " FB_LIBEXEC_PREFIX "/UDF"},	// location(s) of UDFs
  	{TYPE_STRING,		"TempDirectories",			(ConfigValue) 0},
- 	{TYPE_BOOLEAN,		"BugcheckAbort",			(ConfigValue) false},	// whether to abort() engine when internal error is found
- 	{TYPE_BOOLEAN,		"OldColumnNaming",			(ConfigValue) false}	// if true use old column naming rules
+ #ifdef DEV_BUILD
+  	{TYPE_BOOLEAN,		"BugcheckAbort",			(ConfigValue) true},	// whether to abort() engine when internal error is found
diff --git a/databases/firebird20-server/files/patch-src%jrd%db_alias.cpp b/databases/firebird20-server/files/patch-src%jrd%db_alias.cpp
index 8c0e56b144da..27f7d6dc114d 100644
--- a/databases/firebird20-server/files/patch-src%jrd%db_alias.cpp
+++ b/databases/firebird20-server/files/patch-src%jrd%db_alias.cpp
@@ -1,13 +1,13 @@
---- src/jrd/db_alias.cpp.orig	Mon Aug 18 01:16:41 2003
-+++ src/jrd/db_alias.cpp	Mon Jul 25 15:07:45 2005
-@@ -37,8 +37,8 @@
+--- src/jrd/db_alias.cpp.orig	Tue Aug 15 23:07:31 2006
++++ src/jrd/db_alias.cpp	Tue Aug 15 23:10:08 2006
+@@ -33,8 +33,8 @@
  
- bool ResolveDatabaseAlias(const char* alias, char* database)
+ bool ResolveDatabaseAlias(const string& alias, string& database)
  {
--	TEXT alias_filename[MAXPATHLEN];
--	gds__prefix(alias_filename, const_cast<char*>(ALIAS_FILE));
-+	TEXT alias_filename[MAXPATHLEN] = FB_CONF_PREFIX "/";
-+	strlcat(alias_filename, ALIAS_FILE, MAXPATHLEN);
+-	string alias_filename;
+-	Firebird::Prefix(alias_filename, ALIAS_FILE);
++	string alias_filename = string(FB_CONF_PREFIX)
++		+ PathUtils::dir_sep + ALIAS_FILE;
  	ConfigFile aliasConfig(false);
- 	aliasConfig.setConfigFile(alias_filename);
+ 	aliasConfig.setConfigFilePath(alias_filename);
  
diff --git a/databases/firebird20-server/files/patch-src%jrd%gds.cpp b/databases/firebird20-server/files/patch-src%jrd%gds.cpp
index b1c47c40439a..f22bc183629e 100644
--- a/databases/firebird20-server/files/patch-src%jrd%gds.cpp
+++ b/databases/firebird20-server/files/patch-src%jrd%gds.cpp
@@ -1,11 +1,11 @@
---- src/jrd/gds.cpp.orig	Mon Jan 23 15:04:44 2006
-+++ src/jrd/gds.cpp	Mon Jan 23 15:07:20 2006
-@@ -3697,7 +3697,7 @@
- 		Firebird::string msgPrefix(getenv(FB_MSG_ENV) ? getenv(FB_MSG_ENV) : "");
- 		if (msgPrefix.length() == 0) 
+--- src/jrd/gds.cpp.orig	Tue Aug 15 22:49:37 2006
++++ src/jrd/gds.cpp	Tue Aug 15 22:50:14 2006
+@@ -3734,7 +3734,7 @@
+ 		Firebird::PathName msgPrefix;
+ 		if (!fb_utils::readenv(FB_MSG_ENV, msgPrefix))
  		{
 -			msgPrefix = prefix;
 +			msgPrefix = FB_MSG_PREFIX;
  		}
- 		copyTo(msgPrefix, ib_prefix_msg_val, sizeof(ib_prefix_msg_val));
+ 		msgPrefix.copyTo(ib_prefix_msg_val, sizeof(ib_prefix_msg_val));
  		ib_prefix_msg = ib_prefix_msg_val;
diff --git a/databases/firebird20-server/files/patch-src%jrd%os%config_root.h b/databases/firebird20-server/files/patch-src%jrd%os%config_root.h
new file mode 100644
index 000000000000..976da187b36a
--- /dev/null
+++ b/databases/firebird20-server/files/patch-src%jrd%os%config_root.h
@@ -0,0 +1,11 @@
+--- src/jrd/os/config_root.h.orig	Tue Aug 15 22:57:33 2006
++++ src/jrd/os/config_root.h	Tue Aug 15 22:57:53 2006
+@@ -76,7 +76,7 @@
+ 	{
+ 		GetRoot();
+ 		install_dir = root_dir;
+-		config_file = root_dir + string(CONFIG_FILE);
++		config_file = string(FB_CONF_PREFIX) + PathUtils::dir_sep + string(CONFIG_FILE);
+ 	}
+ 
+ 
diff --git a/databases/firebird20-server/files/patch-src%jrd%os%posix%config_root.cpp b/databases/firebird20-server/files/patch-src%jrd%os%posix%config_root.cpp
deleted file mode 100644
index 3af960c1599e..000000000000
--- a/databases/firebird20-server/files/patch-src%jrd%os%posix%config_root.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/jrd/os/posix/config_root.cpp.orig	Mon Jul 25 15:19:18 2005
-+++ src/jrd/os/posix/config_root.cpp	Mon Jul 25 15:19:49 2005
-@@ -152,6 +152,6 @@
- 
- const char *ConfigRoot::getConfigFile() const
- {
--	static string file = root_dir + string(CONFIG_FILE);
-+	static string file = string(FB_CONF_PREFIX) + PathUtils::dir_sep + string(CONFIG_FILE);
- 	return file.c_str();
- }
diff --git a/databases/firebird20-server/files/patch-src%jrd%plugin_manager.cpp b/databases/firebird20-server/files/patch-src%jrd%plugin_manager.cpp
index 808568121478..7a2ffab72408 100644
--- a/databases/firebird20-server/files/patch-src%jrd%plugin_manager.cpp
+++ b/databases/firebird20-server/files/patch-src%jrd%plugin_manager.cpp
@@ -1,24 +1,20 @@
---- src/jrd/plugin_manager.cpp.orig	Wed Mar 15 14:25:42 2006
-+++ src/jrd/plugin_manager.cpp	Wed Mar 15 14:39:12 2006
-@@ -47,9 +47,7 @@
+--- src/jrd/plugin_manager.cpp.orig	Tue Aug 15 23:11:04 2006
++++ src/jrd/plugin_manager.cpp	Tue Aug 15 23:12:01 2006
+@@ -64,7 +64,7 @@
  void PluginManager::loadAllPlugins()
  {
- 	Firebird::list<Path>::iterator pathItr;
--	char fb_lib_path[MAXPATHLEN];
--	gds__prefix(fb_lib_path, "");
--	Firebird::string fbLibPath(fb_lib_path);
-+	Firebird::string fbLibPath(FB_LIBEXEC_PREFIX);
- 	Firebird::string checkDir;
+ 	Firebird::PathName checkDir;
+-	const Firebird::PathName fbLibPath = Config::getRootDirectory();
++	const Firebird::PathName fbLibPath = FB_LIBEXEC_PREFIX;
  	
- 	for(pathItr = searchPaths.begin(); pathItr != searchPaths.end(); ++pathItr)
-@@ -114,9 +112,7 @@
- 
- PluginManager::Module *PluginManager::loadPluginModule(const Firebird::string& name)
+ 	for (spIterator pathItr = searchPaths.begin(); pathItr != searchPaths.end(); ++pathItr)
+ 	{
+@@ -131,7 +131,7 @@
+ PluginManager::Module *PluginManager::loadPluginModule(const Firebird::PathName& name)
  {
--	char fb_lib_path[MAXPATHLEN];
--	gds__prefix(fb_lib_path, "");
--	Firebird::string fbLibPath(fb_lib_path);
-+	Firebird::string fbLibPath(FB_LIBEXEC_PREFIX);
- 	Firebird::string checkPath;
- 	Firebird::list<Path>::iterator itr;
+ 	Firebird::PathName checkPath;
+-	const Firebird::PathName fbLibPath = Config::getRootDirectory();
++	const Firebird::PathName fbLibPath = FB_LIBEXEC_PREFIX;
  	
+ 	// Check to see if the module name was specified as a relative path
+ 	//	from one of our search paths.  This only makes sense if the name
diff --git a/databases/firebird20-server/files/patch-src%jrd%svc.cpp b/databases/firebird20-server/files/patch-src%jrd%svc.cpp
index 42b12339bc36..ed93b6d68d13 100644
--- a/databases/firebird20-server/files/patch-src%jrd%svc.cpp
+++ b/databases/firebird20-server/files/patch-src%jrd%svc.cpp
@@ -1,12 +1,13 @@
---- src/jrd/svc.cpp.orig	Tue Jan 24 17:11:48 2006
-+++ src/jrd/svc.cpp	Tue Jan 24 17:27:22 2006
-@@ -1902,7 +1902,8 @@
+--- src/jrd/svc.cpp.orig	Tue Aug 15 23:06:16 2006
++++ src/jrd/svc.cpp	Tue Aug 15 23:06:50 2006
+@@ -1742,8 +1742,8 @@
+ 	TEXT service_path[MAXPATHLEN];
  
- #ifndef SUPERSERVER
  	if (serv->serv_executable) {
 -		gds__prefix(service_path, serv->serv_executable);
+-		service->svc_flags = SVC_forked;
 +		strlcpy(service_path, FB_EXEC_PREFIX "/", MAXPATHLEN);
 +		strlcat(service_path, serv->serv_executable, MAXPATHLEN);
- 		service->svc_flags = SVC_forked;
  		service_fork(service_path, service);
  	}
+ 
diff --git a/databases/firebird20-server/files/patch-src%lock%lock.cpp b/databases/firebird20-server/files/patch-src%lock%lock.cpp
index 7f550183e379..279324733739 100644
--- a/databases/firebird20-server/files/patch-src%lock%lock.cpp
+++ b/databases/firebird20-server/files/patch-src%lock%lock.cpp
@@ -1,15 +1,16 @@
---- src/lock/lock.cpp.orig	Mon Mar 29 08:35:49 2004
-+++ src/lock/lock.cpp	Wed Jul 27 14:01:51 2005
-@@ -2800,7 +2800,11 @@
+--- src/lock/lock.cpp.orig	Fri Feb  3 16:13:23 2006
++++ src/lock/lock.cpp	Wed Aug 16 12:41:32 2006
+@@ -2708,7 +2708,12 @@
  #ifdef DEBUG_MANAGER
  	gds__prefix(string, DEBUG_MANAGER);
  #else
 -	gds__prefix(string, LOCK_MANAGER);
 +	if (! getenv("FIREBIRD")) {
-+		strlcpy(string, FB_EXEC_PREFIX "/s" LOCK_MANAGER, MAXPATHLEN);
-+	}else	{
++		strlcpy(string, FB_EXEC_PREFIX "/", MAXPATHLEN);
++		strlcat(string, LOCK_MANAGER, MAXPATHLEN);
++	} else	{
 +		gds__prefix(string, LOCK_MANAGER);
 +	}
  #endif
  	if (statistics(string, &stat_buf) == -1) {
- 		sprintf (errorstring, "can't start lock manager: %s", string);
+ 		// bug() fills the vector with this address, it must be static.
diff --git a/databases/firebird20-server/pkg-descr b/databases/firebird20-server/pkg-descr
index ba570031da86..ed76025f94b8 100644
--- a/databases/firebird20-server/pkg-descr
+++ b/databases/firebird20-server/pkg-descr
@@ -4,10 +4,9 @@ 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.
 
-For more information on Firebird and InterBase, see:
+Firebird is completely free of any registration, licensing or deployment
+fees.  It may be deployed freely for use with any third-party software,
+whether commercial or not.
 
 WWW: http://sourceforge.net/projects/firebird/
-WWW: http://www.ibphoenix.com/
-WWW: http://www.interbase2000.org/
-WWW: http://www.interbase.com/
 WWW: http://www.firebirdsql.org/
diff --git a/databases/firebird20-server/pkg-plist b/databases/firebird20-server/pkg-plist
index 0667577533bd..0f09cdcc03b2 100644
--- a/databases/firebird20-server/pkg-plist
+++ b/databases/firebird20-server/pkg-plist
@@ -1,18 +1,17 @@
 @comment $FreeBSD$
+bin/fb_inet_server
+bin/fb_lock_mgr
 bin/fb_lock_print
 bin/gbak
 bin/gdef
+bin/gds_drop
 bin/gfix
 bin/gsec
 bin/gstat
+bin/nbackup
 libexec/firebird/intl/fbintl
-libexec/firebird/udf/fbudf.so
-libexec/firebird/udf/fbudf.sql
 libexec/firebird/udf/ib_udf.so
-libexec/firebird/udf/ib_udf.sql
-sbin/fb_inet_server
-sbin/fb_lock_mgr
-sbin/gds_drop
+libexec/firebird/udf/ib_udf2.sql
 @unexec (cmp -s %D/%%CONFDIR%%/aliases.conf %D/%%CONFDIR%%/aliases.conf.sample && rm -f %D/%%CONFDIR%%/aliases.conf) || true
 %%CONFDIR%%/aliases.conf.sample
 @exec [ -f %B/aliases.conf ] || cp %B/%f %B/aliases.conf
@@ -21,10 +20,9 @@ sbin/gds_drop
 @dirrm libexec/firebird/udf
 @dirrm libexec/firebird
 @cwd /
-@unexec (cmp -s %D/%%LOCALSTATEDIR%%/security.fdb %D/%%LOCALSTATEDIR%%/security.fdb.sample && rm -f %D/%%LOCALSTATEDIR%%/security.fdb) || true
-%%LOCALSTATEDIR%%/security.fdb.sample
-@exec [ -f %D/%%LOCALSTATEDIR%%/security.fdb ] || cp %D/%F %D/%%LOCALSTATEDIR%%/security.fdb
-%%LOCALSTATEDIR%%/RELNOTES
+@unexec (cmp -s %D/%%LOCALSTATEDIR%%/security2.fdb %D/%%LOCALSTATEDIR%%/security2.fdb.sample && rm -f %D/%%LOCALSTATEDIR%%/security2.fdb) || true
+%%LOCALSTATEDIR%%/security2.fdb.sample
+@exec [ -f %D/%%LOCALSTATEDIR%%/security2.fdb ] || cp %D/%F %D/%%LOCALSTATEDIR%%/security2.fdb
 %%LOCALSTATEDIR%%/help/help.fdb
 @unexec [ -s %D/%%LOCALSTATEDIR%%/firebird.log ] || rm -f %D/%%LOCALSTATEDIR%%/firebird.log
 @unexec rm -f %D/%%LOCALSTATEDIR%%/isc_event1.`hostname`
diff --git a/databases/firebird20-server/pkg-plist.client b/databases/firebird20-server/pkg-plist.client
index 8b61d85d22d4..71995b46b9f3 100644
--- a/databases/firebird20-server/pkg-plist.client
+++ b/databases/firebird20-server/pkg-plist.client
@@ -3,19 +3,18 @@ bin/gpre
 bin/isql
 bin/qli
 include/blr.h
-include/gds.h
 include/ib_util.h
 include/ibase.h
 include/iberror.h
 include/perf.h
 lib/libfbclient.so
-lib/libfbclient.so.1
+lib/libfbclient.so.2
 lib/libfbclient.so.%%FIREBIRD_VERSION%%
 lib/libfbembed.so
-lib/libfbembed.so.1
+lib/libfbembed.so.2
 lib/libfbembed.so.%%FIREBIRD_VERSION%%
 lib/libgds.so
-lib/libgds.so.1
+lib/libgds.so.2
 lib/libib_util.so
 @unexec if cmp -s %D/%%CONFDIR%%/firebird.conf %D/%%CONFDIR%%/firebird.conf.sample; then rm -f %D/%%CONFDIR%%/firebird.conf; fi
 %%CONFDIR%%/firebird.conf.sample
@@ -24,53 +23,4 @@ lib/libib_util.so
 %%DATADIR%%/de_DE.msg
 %%DATADIR%%/firebird.msg
 %%DATADIR%%/fr_FR.msg
-%%DATADIR%%/ja_JP.msg
 @dirrm %%DATADIR%%
-%%EXAMPLESDIR%%/align.h
-%%EXAMPLESDIR%%/api1.c
-%%EXAMPLESDIR%%/api10.c
-%%EXAMPLESDIR%%/api11.c
-%%EXAMPLESDIR%%/api12.c
-%%EXAMPLESDIR%%/api13.c
-%%EXAMPLESDIR%%/api14.e
-%%EXAMPLESDIR%%/api15.c
-%%EXAMPLESDIR%%/api16.c
-%%EXAMPLESDIR%%/api16t.c
-%%EXAMPLESDIR%%/api2.c
-%%EXAMPLESDIR%%/api3.c
-%%EXAMPLESDIR%%/api4.c
-%%EXAMPLESDIR%%/api5.c
-%%EXAMPLESDIR%%/api6.c
-%%EXAMPLESDIR%%/api7.c
-%%EXAMPLESDIR%%/api8.c
-%%EXAMPLESDIR%%/api9.c
-%%EXAMPLESDIR%%/api9f.c
-%%EXAMPLESDIR%%/api9f.sql
-%%EXAMPLESDIR%%/apifull.c
-%%EXAMPLESDIR%%/dyn1.e
-%%EXAMPLESDIR%%/dyn2.e
-%%EXAMPLESDIR%%/dyn3.e
-%%EXAMPLESDIR%%/dyn4.e
-%%EXAMPLESDIR%%/dyn5.e
-%%EXAMPLESDIR%%/dynfull.e
-%%EXAMPLESDIR%%/employe2.sql
-%%EXAMPLESDIR%%/employee.fdb
-%%EXAMPLESDIR%%/employee.gbk
-%%EXAMPLESDIR%%/example.h
-%%EXAMPLESDIR%%/readme
-%%EXAMPLESDIR%%/stat1.e
-%%EXAMPLESDIR%%/stat10.e
-%%EXAMPLESDIR%%/stat11.e
-%%EXAMPLESDIR%%/stat12.e
-%%EXAMPLESDIR%%/stat12t.e
-%%EXAMPLESDIR%%/stat2.e
-%%EXAMPLESDIR%%/stat3.e
-%%EXAMPLESDIR%%/stat4.e
-%%EXAMPLESDIR%%/stat5.e
-%%EXAMPLESDIR%%/stat6.e
-%%EXAMPLESDIR%%/stat7.e
-%%EXAMPLESDIR%%/stat8.e
-%%EXAMPLESDIR%%/stat9.e
-%%EXAMPLESDIR%%/udf.sql
-%%EXAMPLESDIR%%/udflib.c
-@dirrm %%EXAMPLESDIR%%