Update to 1.5.3

* move "intl/" and "UDF/" from "/var/db/firebird"
  into "libexec/firebird/"

* add support for amd64 (UNSTABLE)

16 files changed, 231 insertions, 59 deletions

diff --git a/databases/firebird-server/Makefile b/databases/firebird-server/Makefile
index 9cda1aff1f70..11662b78d616 100644
--- a/databases/firebird-server/Makefile
+++ b/databases/firebird-server/Makefile
@@ -6,27 +6,27 @@
 #
 
 PORTNAME?=	firebird
-PORTVERSION=	1.5.2
-PORTREVISION?=	4
+PORTVERSION=	1.5.3
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=firebird
 PKGNAMESUFFIX?=	-server
-DISTNAME=	firebird-1.5.2.4731
+DISTNAME=	firebird-1.5.3.4870
 
 MAINTAINER=	skv@FreeBSD.org
 COMMENT?=	The open-source InterBase(tm) 6.0 spin-off (Classic version)
 
-USE_REINPLACE=	yes
 USE_BISON=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	autoconf:259 libtool:15
+USE_AUTOTOOLS=	autoconf:259 aclocal:19 libtool:15
+ACLOCAL_ARGS=	--acdir=${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal
 USE_GCC=	3.4+
 
 LOCALSTATEDIR=	/var/db/firebird
 CONFDIR=	${PREFIX}/etc/firebird
+LIBEXECDIR=	${PREFIX}/libexec/firebird
 PLIST_SUB=	FIREBIRD_VERSION=${PORTVERSION} \
 		LOCALSTATEDIR="var/db/firebird" CONFDIR="etc/firebird"
 
@@ -36,7 +36,7 @@ LD=	${CC}
 # Don't strip binary files
 STRIP=
 
-ONLY_FOR_ARCHS=	i386
+ONLY_FOR_ARCHS=	i386 amd64
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
@@ -95,7 +95,7 @@ pre-everything::
 	@${ECHO_MSG} "Cancel this installation now and backup your databases"
 	@${ECHO_MSG} "if you have not already done so."
 .if !defined(BATCH)
-	@sleep 10
+	@sleep 2
 .endif
 .endif
 
@@ -124,6 +124,7 @@ do-configure:
 	@(cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${MAKE_ENV} MAKE=${GMAKE}	\
 	${AUTOTOOLS_VARS} ./autogen.sh --localstatedir=${LOCALSTATEDIR} \
 		--prefix=${LOCALSTATEDIR} --exec-prefix=${PREFIX} \
+		--libexecdir=${LIBEXECDIR} \
 		--sysconfdir=${CONFDIR} --datadir=${DATADIR} ${AUTOGENARGS})
 
 post-configure:
@@ -141,12 +142,12 @@ do-install:
 	@${MKDIR} ${CONFDIR}
 	${INSTALL_DATA} ${WRKDIR}/aliases.conf ${CONFDIR}/aliases.conf.sample
 
-	${MKDIR} ${LOCALSTATEDIR}/UDF ${LOCALSTATEDIR}/help ${LOCALSTATEDIR}/intl
+	${MKDIR} ${LIBEXECDIR}/udf ${LOCALSTATEDIR}/help ${LIBEXECDIR}/intl
 
 	${CHOWN} -R firebird:firebird ${LOCALSTATEDIR}
 
-	${INSTALL_FB} -m 0550 ${UDF_SO:S!^!${WRKSRC}/gen/firebird/UDF/!} ${LOCALSTATEDIR}/UDF
-	${INSTALL_FB} -m 0440 ${UDF_SQL:S!^!${WRKSRC}/!} ${LOCALSTATEDIR}/UDF
+	${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 \
@@ -158,7 +159,7 @@ do-install:
 	${INSTALL_FB} -m 0440 ${WRKSRC}/gen/firebird/help/help.fdb \
 		${LOCALSTATEDIR}/help
 
-	${INSTALL_FB} -m 0550 ${WRKSRC}/gen/firebird/intl/libfbintl.so ${LOCALSTATEDIR}/intl/fbintl
+	${INSTALL_FB} -m 0555 ${WRKSRC}/gen/firebird/intl/libfbintl.so ${LIBEXECDIR}/intl/fbintl
 
 	${INSTALL_DATA} ${FILESDIR}/RELNOTES ${LOCALSTATEDIR}
 .else
@@ -166,11 +167,13 @@ do-install:
 	${INSTALL_PROGRAM} ${CLIENT_BIN:S!^!${WRKSRC}/gen/firebird/bin/!} \
 		${PREFIX}/bin
 
+	${SED} -e "s=%%PREFIX%%=${PREFIX}=g" ${WRKSRC}/gen/firebird/misc/firebird.conf > ${WRKDIR}/firebird.conf
+
 	@${MKDIR} ${CONFDIR}
 .if !exists(${CONFDIR}/firebird.conf)
-	${INSTALL_DATA} ${WRKSRC}/gen/firebird/misc/firebird.conf ${CONFDIR}
+	${INSTALL_DATA} ${WRKDIR}/firebird.conf ${CONFDIR}
 .endif
-	${INSTALL_DATA} ${WRKSRC}/gen/firebird/misc/firebird.conf ${CONFDIR}/firebird.conf.sample
+	${INSTALL_DATA} ${WRKDIR}/firebird.conf ${CONFDIR}/firebird.conf.sample
 
 	${INSTALL_DATA} ${WRKSRC}/gen/firebird/lib/libib_util.so \
 		${WRKSRC}/gen/firebird/lib/libfbclient.so.${PORTVERSION} \
diff --git a/databases/firebird-server/distinfo b/databases/firebird-server/distinfo
index f767adb0bf20..ca162a069ca5 100644
--- a/databases/firebird-server/distinfo
+++ b/databases/firebird-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (firebird-1.5.2.4731.tar.bz2) = fea53ed5213cff4bd96513fb1a6c0ca2
-SHA256 (firebird-1.5.2.4731.tar.bz2) = a04a52746a4f8ffd4d98ae2f15fc4b4ed7d55b9ddaa8937108c29d37a6c117e9
-SIZE (firebird-1.5.2.4731.tar.bz2) = 4764015
+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
diff --git a/databases/firebird-server/files/RELNOTES b/databases/firebird-server/files/RELNOTES
index 2685519c686e..87a8c5de91bf 100644
--- a/databases/firebird-server/files/RELNOTES
+++ b/databases/firebird-server/files/RELNOTES
@@ -1,6 +1,6 @@
-Firebird 1.5.2 FreeBSD Release Notes
+Firebird 1.5.3 FreeBSD Release Notes
 --------------------------------------
-FB-V1.5.2.4731 Firebird 1.5 Release
+FB-V1.5.3.4870 Firebird 1.5 Release
 
     Welcome to the FreeBSD Firebird port!
 
diff --git a/databases/firebird-server/files/patch-amd64 b/databases/firebird-server/files/patch-amd64
new file mode 100644
index 000000000000..1f4d465389b3
--- /dev/null
+++ b/databases/firebird-server/files/patch-amd64
@@ -0,0 +1,76 @@
+--- 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/firebird-server/files/patch-builds%make.new%config%config.h.in b/databases/firebird-server/files/patch-builds%make.new%config%config.h.in
index b3073379ba55..1ad510c8f674 100644
--- a/databases/firebird-server/files/patch-builds%make.new%config%config.h.in
+++ b/databases/firebird-server/files/patch-builds%make.new%config%config.h.in
@@ -1,11 +1,20 @@
 --- builds/make.new/config/config.h.in.orig	Sun Jul  6 05:07:48 2003
-+++ builds/make.new/config/config.h.in	Wed Jul 27 13:07:37 2005
-@@ -190,5 +190,8 @@
++++ 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/firebird-server/files/patch-builds%posix%make.defaults b/databases/firebird-server/files/patch-builds%posix%make.defaults
new file mode 100644
index 000000000000..f7d4bc6362f3
--- /dev/null
+++ b/databases/firebird-server/files/patch-builds%posix%make.defaults
@@ -0,0 +1,11 @@
+--- 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 @@
+ CHMOD=			chmod
+ CHMOD_6=		chmod 666
+ CHMOD_7=		chmod 777
+-CHMOD_S7=		chmod 06777
++CHMOD_S7=		chmod 04555
+ MV=			mv -f
+ TOUCH=			touch
+ CP=			cp
diff --git a/databases/firebird-server/files/patch-configure.in b/databases/firebird-server/files/patch-configure.in
index 562421312eb3..ce1a65467bb9 100644
--- a/databases/firebird-server/files/patch-configure.in
+++ b/databases/firebird-server/files/patch-configure.in
@@ -1,12 +1,30 @@
---- configure.in.orig	Thu Dec  9 17:43:18 2004
-+++ configure.in	Wed Jul 27 13:06:06 2005
-@@ -605,6 +605,9 @@
+--- 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 @@
  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_CONFIG_COMMANDS(,,[
  dnl ### GEN ### directories for preprocessed cpp, databases and output
diff --git a/databases/firebird-server/files/patch-src%common%config%config.cpp b/databases/firebird-server/files/patch-src%common%config%config.cpp
new file mode 100644
index 000000000000..34645c66ca09
--- /dev/null
+++ b/databases/firebird-server/files/patch-src%common%config%config.cpp
@@ -0,0 +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 @@
+ 	{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,		"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
diff --git a/databases/firebird-server/files/patch-src%install%misc%firebird.conf b/databases/firebird-server/files/patch-src%install%misc%firebird.conf
new file mode 100644
index 000000000000..4f8f1b416285
--- /dev/null
+++ b/databases/firebird-server/files/patch-src%install%misc%firebird.conf
@@ -0,0 +1,20 @@
+--- 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
+@@ -60,7 +60,7 @@
+ #
+ # Type: string
+ #
+-#RootDirectory =
++#RootDirectory = /var/db/firebird
+ 
+ 
+ # ----------------------------
+@@ -126,7 +126,7 @@
+ #
+ # Type: string (special format)
+ #
+-#UdfAccess = Restrict UDF
++UdfAccess = Restrict %%PREFIX%%/libexec/firebird/udf
+ 
+ 
+ # ----------------------------
diff --git a/databases/firebird-server/files/patch-src%jrd%gds.cpp b/databases/firebird-server/files/patch-src%jrd%gds.cpp
index a68b98955e5f..b1c47c40439a 100644
--- a/databases/firebird-server/files/patch-src%jrd%gds.cpp
+++ b/databases/firebird-server/files/patch-src%jrd%gds.cpp
@@ -1,11 +1,11 @@
---- src/jrd/gds.cpp.orig	Mon Nov 22 08:11:11 2004
-+++ src/jrd/gds.cpp	Wed Jul 27 13:10:40 2005
-@@ -1733,7 +1733,7 @@
- 	if (ib_prefix_msg == NULL) {
- 		if (!(ib_prefix_msg = getenv(FB_MSG_ENV))) {
- 			ib_prefix_msg = ib_prefix_msg_val;
--			gds__prefix(ib_prefix_msg, "");
-+			strlcpy(ib_prefix_msg_val, FB_MSG_PREFIX, MAXPATHLEN);
+--- 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) 
+ 		{
+-			msgPrefix = prefix;
++			msgPrefix = FB_MSG_PREFIX;
  		}
- 		else {
- 			strcat(ib_prefix_msg_val, ib_prefix_msg);
+ 		copyTo(msgPrefix, ib_prefix_msg_val, sizeof(ib_prefix_msg_val));
+ 		ib_prefix_msg = ib_prefix_msg_val;
diff --git a/databases/firebird-server/files/patch-src%jrd%plugin_manager.cpp b/databases/firebird-server/files/patch-src%jrd%plugin_manager.cpp
new file mode 100644
index 000000000000..808568121478
--- /dev/null
+++ b/databases/firebird-server/files/patch-src%jrd%plugin_manager.cpp
@@ -0,0 +1,24 @@
+--- 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 @@
+ 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;
+ 	
+ 	for(pathItr = searchPaths.begin(); pathItr != searchPaths.end(); ++pathItr)
+@@ -114,9 +112,7 @@
+ 
+ PluginManager::Module *PluginManager::loadPluginModule(const Firebird::string& 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;
+ 	
diff --git a/databases/firebird-server/files/patch-src%jrd%svc.cpp b/databases/firebird-server/files/patch-src%jrd%svc.cpp
new file mode 100644
index 000000000000..42b12339bc36
--- /dev/null
+++ b/databases/firebird-server/files/patch-src%jrd%svc.cpp
@@ -0,0 +1,12 @@
+--- 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 @@
+ 
+ #ifndef SUPERSERVER
+ 	if (serv->serv_executable) {
+-		gds__prefix(service_path, serv->serv_executable);
++		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/firebird-server/files/patch-src::extern::editline::makelist b/databases/firebird-server/files/patch-src::extern::editline::makelist
deleted file mode 100644
index 870f3cfdaece..000000000000
--- a/databases/firebird-server/files/patch-src::extern::editline::makelist
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/extern/editline/makelist.orig	Mon May 24 04:24:25 2004
-+++ src/extern/editline/makelist	Fri Jul 23 17:09:43 2004
-@@ -145,7 +145,7 @@
- #
- -fh)
-     cat $FILES | $AWK '/el_action_t/ { print $3 }' | \
--    sort | tr '[a-z]' '[A-Z]' | $AWK '
-+    sort | tr '[:lower:]' '[:upper:]' | $AWK '
- 	BEGIN {
- 	    printf("/* Automatically generated file, do not edit */\n");
- 	    printf("#ifndef _h_fcns_c\n#define _h_fcns_c\n");
diff --git a/databases/firebird-server/files/pkg-message.in b/databases/firebird-server/files/pkg-message.in
index 88db39950b58..fabc059d6a02 100644
--- a/databases/firebird-server/files/pkg-message.in
+++ b/databases/firebird-server/files/pkg-message.in
@@ -2,7 +2,7 @@
 ---------------------------------------------------------
 Firebird is now installed.
 
-To start the server add the following line to /etc/services:
+Before start the server ensure that the following line exists in /etc/services:
 
 gds_db		3050/tcp  #InterBase Database Remote Protocol
 
diff --git a/databases/firebird-server/pkg-descr b/databases/firebird-server/pkg-descr
index dbeba43f543f..ba570031da86 100644
--- a/databases/firebird-server/pkg-descr
+++ b/databases/firebird-server/pkg-descr
@@ -1,10 +1,8 @@
-The open-source InterBase(tm) 6.0 spin-off (Classic server version)
-
-InterBase is a world-class DBMS with a history too rich to detail
-here.  Once selling for several thousands of dollars per license,
-some very big players use it worldwide.  Inprise has open-sourced
-InterBase 6.0, and a lively bunch of folks has charged themselves
-with seeing that it lives on through the Firebird project.
+Firebird is a relational database offering many ANSI SQL-99 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.
 
 For more information on Firebird and InterBase, see:
 
diff --git a/databases/firebird-server/pkg-plist b/databases/firebird-server/pkg-plist
index 8e200a428ccb..0667577533bd 100644
--- a/databases/firebird-server/pkg-plist
+++ b/databases/firebird-server/pkg-plist
@@ -5,6 +5,11 @@ bin/gdef
 bin/gfix
 bin/gsec
 bin/gstat
+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
@@ -12,22 +17,18 @@ sbin/gds_drop
 %%CONFDIR%%/aliases.conf.sample
 @exec [ -f %B/aliases.conf ] || cp %B/%f %B/aliases.conf
 @dirrmtry %%CONFDIR%%
+@dirrm libexec/firebird/intl
+@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
-%%LOCALSTATEDIR%%/UDF/fbudf.so
-%%LOCALSTATEDIR%%/UDF/fbudf.sql
-%%LOCALSTATEDIR%%/UDF/ib_udf.so
-%%LOCALSTATEDIR%%/UDF/ib_udf.sql
 %%LOCALSTATEDIR%%/help/help.fdb
-%%LOCALSTATEDIR%%/intl/fbintl
 @unexec [ -s %D/%%LOCALSTATEDIR%%/firebird.log ] || rm -f %D/%%LOCALSTATEDIR%%/firebird.log
 @unexec rm -f %D/%%LOCALSTATEDIR%%/isc_event1.`hostname`
 @unexec rm -f %D/%%LOCALSTATEDIR%%/isc_init1.`hostname`
 @unexec rm -f %D/%%LOCALSTATEDIR%%/isc_lock1.`hostname`
-@dirrm %%LOCALSTATEDIR%%/UDF
 @dirrm %%LOCALSTATEDIR%%/help
-@dirrm %%LOCALSTATEDIR%%/intl
 @dirrmtry %%LOCALSTATEDIR%%