[MAINTAINER UPDATE]: databases/firebird - Update to 1.0.2

Disabled package building for -current because of NFS locking problems.
^^ hopefully did it okay.

PR:		ports/46926
Submitted by:	Chris Knight <chris@aims.com.au>

85 files changed, 270 insertions, 1690 deletions

diff --git a/databases/firebird-client/Makefile b/databases/firebird-client/Makefile
index c33948a765b8..b158cc63226a 100644
--- a/databases/firebird-client/Makefile
+++ b/databases/firebird-client/Makefile
@@ -6,21 +6,18 @@
 #
 
 PORTNAME=	firebird
-PORTVERSION=	1.0
-PORTREVISION=	2
+PORTVERSION=	1.0.2
 CATEGORIES=	databases
-MASTER_SITES=	http://firebird.sourceforge.net/download/ \
-		http://www.aims.com.au/chris/ \
-		${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}	\
+		http://www.aims.com.au/chris/firebird/
 MASTER_SITE_SUBDIR=firebird
-DISTFILES=	bootkit-1.0.0.796.tar.gz \
-		bootkit-freebsd-1.0.0.796.tar.gz \
+DISTFILES=	bootkit-1.0.2.908.tar.gz \
 		interbase0.9-4-v5examples.tar.gz \
-		Firebird-1.0.0.796.src.tar.gz
+		Firebird-1.0.2.908.src.tar.gz
 
 MAINTAINER=	chris@aims.com.au
 
-WRKSRC=		${WRKDIR}/firebird-1.0.0.796
+WRKSRC=		${WRKDIR}/firebird-1.0.2.908
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	%%PREFIX%%/firebird/lib
 MSG_FILE=	${PKGDIR}/pkg-message
@@ -31,20 +28,23 @@ ONLY_FOR_ARCHS=	i386
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} >= 500000
+MANUAL_PACKAGE_BUILD=	"Doesn't compile on NFS on -current"
+.endif
+
 do-extract:
 	@${MKDIR} ${WRKDIR}
 	@(								\
 	cd ${WRKDIR}; ${TAR} -zxf					\
-		 ${DISTDIR}/Firebird-1.0.0.796.src.tar.gz;		\
-	cd firebird-1.0.0.796;						\
-	${TAR} -zxf ${DISTDIR}/bootkit-1.0.0.796.tar.gz;		\
-	${TAR} -zxf ${DISTDIR}/bootkit-freebsd-1.0.0.796.tar.gz;	\
+		 ${DISTDIR}/Firebird-1.0.2.908.src.tar.gz;		\
+	cd firebird-1.0.2.908;						\
+	${TAR} -zxf ${DISTDIR}/bootkit-1.0.2.908.tar.gz;		\
 	${CP} -f msgs/msg.gbak misc/msg.gbak				\
 	)
 
 post-patch:
 	@${SED} 's|%%PREFIX%%|${PREFIX}|g' ${MSG_FILE} > ${PKGMESSAGE}
-.if ${OSVERSION} >= 500016 || ${OSVERSION} >= 430001
+.if ${OSVERSION} >= 430001 && ${OSVERSION} < 500000 || ${OSVERSION} >= 500016
 	@${REINPLACE_CMD} -e 's,\-ldescrypt,\-lcrypt,g' \
 		 ${WRKSRC}/builds/original/prefix.freebsd
 .else
@@ -53,16 +53,11 @@ post-patch:
 
 do-configure:
 	@(								\
-	cd ${WRKDIR}/firebird-1.0.0.796;				\
-	INTERBASE=${WRKDIR}/firebird-1.0.0.796/interbase; export INTERBASE; \
-	REFDBPATH=${WRKDIR}/firebird-1.0.0.796/refDatabases; export REFDBPATH; \
-	${SH} buildBootDatabases;					\
+	cd ${WRKDIR}/firebird-1.0.2.908;				\
+	INTERBASE=${WRKDIR}/firebird-1.0.2.908/interbase; export INTERBASE; \
+	REFDBPATH=${WRKDIR}/firebird-1.0.2.908/refDatabases; export REFDBPATH; \
 	NOPROMPT_SETUP=yes; export NOPROMPT_SETUP;			\
 	FIREBIRD_64_BIT_IO=yes; export FIREBIRD_64_BIT_IO;		\
-	${CAT} builds_win32/original/build_no.ksh | ${TR} -d '\r'	\
-		> builds_win32/original/build_no.ksh.fix;		\
-	${MV} -f builds_win32/original/build_no.ksh.fix			\
-		 builds_win32/original/build_no.ksh;			\
 	${SH} Configure.sh PROD FREEBSD;				\
 	)
 
@@ -70,14 +65,14 @@ do-build:
 	@(								\
 	${REINPLACE_CMD} -e 's,opt,usr,'				\
 		 ${WRKSRC}/firebird/install/linux/misc/ibmgr;		\
-	${LN} -sf ${WRKDIR}/firebird-1.0.0.796/refDatabases/jrd/isc.gdb	\
-		 ${WRKDIR}/firebird-1.0.0.796/interbase/isc4.gdb;	\
-	${LN} -sf ${WRKDIR}/firebird-1.0.0.796/refDatabases/msgs/msg.gdb \
-		 ${WRKDIR}/firebird-1.0.0.796/msg.gdb;			\
-	cd ${WRKDIR}/firebird-1.0.0.796;				\
-	INTERBASE=${WRKDIR}/firebird-1.0.0.796/interbase; export INTERBASE; \
-	REFDBPATH=${WRKDIR}/firebird-1.0.0.796/refDatabases; export REFDBPATH; \
-	${CP} ${PKGDIR}/files/buildit.sh ${WRKDIR}/firebird-1.0.0.796;	\
+	${LN} -sf ${WRKDIR}/firebird-1.0.2.908/refDatabases/jrd/isc.gdb	\
+		 ${WRKDIR}/firebird-1.0.2.908/interbase/isc4.gdb;	\
+	${LN} -sf ${WRKDIR}/firebird-1.0.2.908/refDatabases/msgs/msg.gdb \
+		 ${WRKDIR}/firebird-1.0.2.908/msg.gdb;			\
+	cd ${WRKDIR}/firebird-1.0.2.908;				\
+	INTERBASE=${WRKDIR}/firebird-1.0.2.908/interbase; export INTERBASE; \
+	REFDBPATH=${WRKDIR}/firebird-1.0.2.908/refDatabases; export REFDBPATH; \
+	${CP} ${PKGDIR}/files/buildit.sh ${WRKDIR}/firebird-1.0.2.908;	\
 	${SH} buildit.sh;						\
 	)
 
@@ -86,13 +81,14 @@ pre-install:
 
 do-install:
 	@(								\
-	cd ${WRKDIR}/firebird-1.0.0.796;				\
-	${RM} ${WRKDIR}/firebird-1.0.0.796/interbase/isc4_tmp.gdb || ${TRUE}; \
-	${RM} ${WRKDIR}/firebird-1.0.0.796/interbase/lib/gds.so.1 || ${TRUE}; \
+	cd ${WRKDIR}/firebird-1.0.2.908;				\
+	${RM} ${WRKDIR}/firebird-1.0.2.908/interbase/isc4_tmp.gdb || ${TRUE}; \
+	${RM} ${WRKDIR}/firebird-1.0.2.908/interbase/lib/gds.so.1 || ${TRUE}; \
 	${CP} /dev/null interbase/interbase.log;			\
 	${CP} -Rp interbase ${PREFIX}/firebird;				\
 	${RM} ${PREFIX}/firebird/install;				\
 	${RM} ${PREFIX}/firebird/lib/libgds.so.1.0;			\
+	${RM} ${PREFIX}/firebird/lib/libgds_pyxis.a;			\
 	${LN} -fs gds.so ${PREFIX}/firebird/lib/libgds.so.1;		\
 	cd ${PREFIX}/firebird/examples;					\
 	${TAR} -xzf ${DISTDIR}/interbase0.9-4-v5examples.tar.gz;	\
diff --git a/databases/firebird-client/distinfo b/databases/firebird-client/distinfo
index dfdff30e23a3..349366a11efb 100644
--- a/databases/firebird-client/distinfo
+++ b/databases/firebird-client/distinfo
@@ -1,4 +1,3 @@
-MD5 (bootkit-1.0.0.796.tar.gz) = edcabe09957ed10b12e2f44eac9ae155
-MD5 (bootkit-freebsd-1.0.0.796.tar.gz) = 95bd14ec76bcf2b4ed41e3253ed58847
+MD5 (bootkit-1.0.2.908.tar.gz) = 3ce1d058d568242843fa0f92d5ae7018
 MD5 (interbase0.9-4-v5examples.tar.gz) = 17cba82bbf5066d515f2dee97bf8327a
-MD5 (Firebird-1.0.0.796.src.tar.gz) = 53bfebb4a269eb0f3c508587a843ddf8
+MD5 (Firebird-1.0.2.908.src.tar.gz) = 8ca9aac6cfe2670659d00bb2decb3456
diff --git a/databases/firebird-client/files/RELNOTES b/databases/firebird-client/files/RELNOTES
index a452990122ee..607bc697877a 100644
--- a/databases/firebird-client/files/RELNOTES
+++ b/databases/firebird-client/files/RELNOTES
@@ -1,6 +1,6 @@
-Firebird 1.0.0 FreeBSD Release Notes                    10-Nov-2002
+Firebird 1.0.2 FreeBSD Release Notes                    05-Jan-2003
 --------------------------------------
-FB-T6.2.796 Firebird Final Release
+FB-T6.2.908 Firebird Final Release
 
 Welcome to the FreeBSD Firebird port!  Users should note that there
 was a package called `firebird-1.0.tgz' released in mid-August
diff --git a/databases/firebird-client/files/patch-ad b/databases/firebird-client/files/patch-ad
deleted file mode 100644
index 4bcb2c1ce13c..000000000000
--- a/databases/firebird-client/files/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
---- setup_dirs.orig	Tue Aug  7 05:00:12 2001
-+++ setup_dirs	Fri Dec 28 16:12:49 2001
-@@ -60,7 +60,8 @@
-     DefaultAns=$2
-     echo -n "${1}"
-     Answer="$DefaultAns"
--    read Answer 
-+#    read Answer 
-+    echo ""
- }
- 
- 
diff --git a/databases/firebird-client/files/patch-ae b/databases/firebird-client/files/patch-ae
index 2b26792352f1..1e857e24cd6e 100644
--- a/databases/firebird-client/files/patch-ae
+++ b/databases/firebird-client/files/patch-ae
@@ -1,18 +1,11 @@
---- jrd/common.h.orig	Thu Dec  6 05:06:37 2001
-+++ jrd/common.h	Wed Nov 13 11:47:17 2002
-@@ -148,6 +148,7 @@
- /* FreeBSD for Intel platforms */
- #ifdef FREEBSD
- 
-+#define UNIX_64_BIT_IO
- #define FB_ALIGN(n,b) ((n + b - 1) & ~(b - 1))
- #define ALIGNMENT     4
- #define DOUBLE_ALIGN  4
-@@ -164,6 +165,7 @@
- #define QUADCONST(n) (n##LL)
- #define KILLER_SIGNALS
- #define MMAP_SUPPORTED
-+#define MAP_ANONYMOUS
- #define SIGACTION_SUPPORTED
- #define NO_NFS        /* no MTAB_OPEN or MTAB_CLOSE in isc_file.c */
+--- jrd/common.h.orig	Wed Nov 13 11:44:27 2002
++++ jrd/common.h	Sun Jan  5 16:49:05 2003
+@@ -204,7 +204,7 @@
+ #define I386  1
+ #define VAX   1
+ #define IMPLEMENTATION    isc_info_db_impl_freebsd   /* 61 */
+-#define SETPGRP         setpgrp ()
++#define SETPGRP         setpgrp (0, 0)
+ #define ATEXIT(c)       atexit(c)
  
+ #define QUADFORMAT "ll"
diff --git a/databases/firebird-client/files/patch-builds::original::boot.sfx.interbase b/databases/firebird-client/files/patch-builds::original::boot.sfx.interbase
index 62d0b483a07d..332ce0cdf136 100644
--- a/databases/firebird-client/files/patch-builds::original::boot.sfx.interbase
+++ b/databases/firebird-client/files/patch-builds::original::boot.sfx.interbase
@@ -1,6 +1,6 @@
---- builds/original/boot.sfx.interbase.orig	Tue Dec 18 01:40:08 2001
-+++ builds/original/boot.sfx.interbase	Sat Nov  9 17:44:54 2002
-@@ -68,7 +68,7 @@
+--- builds/original/boot.sfx.interbase.orig	Sun Oct 13 17:12:41 2002
++++ builds/original/boot.sfx.interbase	Fri Jan 10 10:34:43 2003
+@@ -70,7 +70,7 @@
  #added completed according to inprise tree
  #FSG  093000
  
@@ -9,25 +9,16 @@
  
  #  burp wanted to build gpre	
  #  we break this dependency
-@@ -159,14 +159,14 @@
- # 1995-June-7 David Schnepper 
- # removed pyxis 3-Aug-00 TMC
- #executables:	alice burp dudley gpre miscFiles $(INTL) isql locks \
--	$(SUPER_SERVER)  qli remote spit utilities \
--	$(SHARED_AM) $(LINKABLE_LIBS)
-+#	$(SUPER_SERVER)  qli remote spit utilities \
-+#	$(SHARED_AM) $(LINKABLE_LIBS)
- 	
- executables:    alice dudley miscFiles $(INTL) isql locks \
+@@ -169,7 +169,7 @@
  	$(SUPER_SERVER)  qli remote spit utilities \
  	$(SHARED_AM) $(LINKABLE_LIBS)
  
 -super_firebird: gds.h includes fireboot super_targets dudley superMiscFiles $(INTL) isql locks qli remote spit help msgs msgs_intl dba gfix gsec security_db extlib examples completed
-+super_firebird: gds.h includes fireboot super_targets dudley superMiscFiles $(INTL) isql locks qli remote spit help msgs msgs_intl dba gfix relay gsec security_db extlib completed
++super_firebird: gds.h includes fireboot super_targets dudley superMiscFiles $(INTL) isql locks qli remote spit help msgs msgs_intl dba gfix gsec security_db extlib completed
  
  super_targets: 	s_run_codes s_alice s_burp s_dba s_security_c super_client super_server super_utils 
  
-@@ -195,7 +195,7 @@
+@@ -199,7 +199,7 @@
  
  super_client:		force
  	$(QUIET_ECHO) "Building super/client..."
diff --git a/databases/firebird-client/files/patch-builds::original::prefix.freebsd b/databases/firebird-client/files/patch-builds::original::prefix.freebsd
index ec8d8343f61d..8a9d5319dba6 100644
--- a/databases/firebird-client/files/patch-builds::original::prefix.freebsd
+++ b/databases/firebird-client/files/patch-builds::original::prefix.freebsd
@@ -1,102 +1,11 @@
---- builds/original/prefix.freebsd.orig	Sat Jan 13 05:18:13 2001
-+++ builds/original/prefix.freebsd	Sat Nov  9 16:49:17 2002
-@@ -28,20 +28,20 @@
- 
- 
+--- builds/original/prefix.freebsd.orig	Sun Oct 13 17:12:42 2002
++++ builds/original/prefix.freebsd	Fri Jan 10 13:00:32 2003
+@@ -30,7 +30,7 @@
  PROD_DEBUG_OBJECTS=	nodebug.o
--PROD_SHRLIB_DIR=	-Lsource/jrd
-+PROD_SHRLIB_DIR=	-Lsource/jrd -Lsource/interbase/lib
+ PROD_SHRLIB_DIR=	-Lsource/jrd -Lsource/interbase/lib
  PROD_VERSION_FLAG=	-DPROD_BUILD
 -PROD_CFLAGS=            -O -m486 -fpic -DFLINTSTONE
-+PROD_CFLAGS=            -O -pipe -march=i486 -fpic -DFLINTSTONE
++PROD_CFLAGS=		-O -pipe -march=i486 -fpic -DFLINTSTONE
  
  
  DEV_DEBUG_OBJECTS=	grammar.o dbg.o dbt.o dmp.o
--DEV_SHRLIB_DIR=		-Lsource/jrd
-+DEV_SHRLIB_DIR=		-Lsource/jrd -Lsource/interbase/lib
- DEV_VERSION_FLAG=	-DDEV_BUILD
- DEV_CFLAGS=		-ggdb
- 
- DEBUG_OBJECTS=		$($(VERSION)_DEBUG_OBJECTS)
- SHRLIB_DIR=		$($(VERSION)_SHRLIB_DIR)
- VERSION_FLAG=		$($(VERSION)_VERSION_FLAG)
--CFLAGS_COMMON=		$($(VERSION)_CFLAGS)  -Isource/interbase/include -DFREEBSD -w -fwritable-strings
-+CFLAGS_COMMON=		$($(VERSION)_CFLAGS) -DFREEBSD -w -fwritable-strings -Isource/interbase/include 
- CFLAGS=			$(CFLAGS_COMMON) $(SUPER_FLAG)
- PIC_J_CFLAGS=		$(CFLAGS_COMMON) -DPIPE_IS_SHRLIB -fPIC
- SPECIAL_OBJECTS=	j
-@@ -62,21 +62,21 @@
- BIN_PATH=		interbase/bin
- BRIDGE_MISC=		head5.o allp.o
- CHMOD_VAL=		666
--CURSES_LIB=             -lncurses
-+CURSES_LIB=
- DSQL_P_OBJS=		dsql_p_objects
--FORM_OBJECTS=		form.o
--FORM_TRN_OBJECTS=	form_trn.o
-+FORM_OBJECTS=		noform.o
-+FORM_TRN_OBJECTS=
- FUNCTIONS=		functions.bin
- FUNCSHR=		source/interbase/lib/gdsf.so
- GDS_LINK=		$(GDSSHR_LINK)
--GDS_PYXIS=		gds_pyxis.a
-+GDS_PYXIS=
- GDSLIB_BACKEND=		source/interbase/lib/gds_b.a
- GDSLIB_LINK=		-Lsource/jrd -lgds_b -lc -ldescrypt
- 
- GDSSHR=			source/interbase/lib/gds.so
- LINUX_GDSSHR=		$(GDSSHR)
--GDSSHR_LINK=		$(SHRLIB_DIR) -lgds -lgds_pyxis -ldescrypt
--PIPE_GDSSHR_LINK=	$(SHRLIB_DIR) -lgds -lgds_pyxis
-+GDSSHR_LINK=		$(SHRLIB_DIR) -lgds -ldescrypt
-+PIPE_GDSSHR_LINK=	$(SHRLIB_DIR) -lgds
- HLPDIR=			source/qli/
- HOSTNAME=		`hostname | cut -d'.' -f1`
- INCLUDES=		include_so include_so_ada	
-@@ -92,7 +92,7 @@
- JRD_J_MISC_OBJECTS=	source/jrd/sun_ftn.j 
- JRD_P_MISC_OBJECTS=	source/jrd/sun_ftn.bin source/jrd/nodebug.bin
- LANG_OBJECTS=		ada.o ftn.o cob.o
--LANGUAGES=		cc cxx ada sun_ada microfocus_cob make16 gdl1 sun_ftn
-+LANGUAGES=		cc cxx ada microfocus_cob make16 gdl1 sun_ftn
- LD_LIBS=		-lc
- LD_LIBS_J=		-lc
- LD_OPTS=		-shared
-@@ -104,28 +104,28 @@
- MUISQL_LINK_OPTS=	$(MUISQL_MU_LIB) $(PIPE_GDSSHR_LINK) -lm 
- PIC_FLAGS=		$(CFLAGS) -fPIC
- PIPE=			gds.a gds_pipe
--PYXIS=			pyxis
--PYXIS_MISC_OBJS=	$(PYXIS_MISC)
--PYXIS_P_MISC_OBJS=	$(PYXIS_P_MISC)
--PYXIS_OBJECTS=		pyxis_objects
--PYXIS_MISC_OBJECTS=	$(PYXDIR)cdm.o $(PYXDIR)vt100.o $(PYXDIR)sun_ftn_pyxis.o
-+PYXIS=
-+PYXIS_MISC_OBJS=
-+PYXIS_P_MISC_OBJS=
-+PYXIS_OBJECTS=
-+PYXIS_MISC_OBJECTS=
- REG_HELP=		isc_ins_hlp.dat
- REMOTE_GDSSHR=		$(GDSSHR)
- REMOTE_GDSSHR_LINK=	$(SERVER_LINK)
- REMOTE_P_OBJS=		rem_p_objects
--SCREEN_LIBS=
--#SCREEN_LIBS=		-lncurses
-+#SCREEN_LIBS=
-+SCREEN_LIBS=		-lncurses
- SERVER_LINK=		$(GDSSHR_LINK)
- SETUP_ISC=              ISC_USER=sysdba; ISC_PASSWORD=masterkey; export ISC_USER ISC_PASSWORD;
- SPECIAL_OPT=		source/special_opt
- NETWORK_LIB=		
- SOCKET_LIB=		-lc
--THREAD_LIB=		-llthread
-+THREAD_LIB=		-pthread
- SUN_FUNCSHR=		$(FUNCSHR)
- LX_SUPER_GDSSHR=		source/interbase/lib/gds.so.1
- SUPER_CLIENT_GDSSHR=    $(LX_SUPER_GDSSHR)
- SUPER_BACKEND=		source/jrd/gds_ss.a
--SUPER_LINK=		-Lsource/jrd -lgds_ss -lc -ldescrypt -L/usr/local/lib -llthread
-+SUPER_LINK=		-pthread -Lsource/jrd -lgds_ss -ldescrypt
- SUPER_SERVER=	
- UTILITIES=		
- WAL_P_OBJS=		wal_p_objects
diff --git a/databases/firebird-client/files/patch-jrd::gds.c b/databases/firebird-client/files/patch-jrd::gds.c
deleted file mode 100644
index 523abb725403..000000000000
--- a/databases/firebird-client/files/patch-jrd::gds.c
+++ /dev/null
@@ -1,24 +0,0 @@
---- jrd/gds.c.orig	Sat Mar  2 00:15:11 2002
-+++ jrd/gds.c	Sun Jul  7 14:27:44 2002
-@@ -159,7 +159,7 @@
-    engine and this change may imply side effect I haven't known 
-    about yet. Tomas Nejedlik (tomas@nejedlik.cz)
- */
--#if (defined(LINUX) && defined(SUPERCLIENT))
-+#if ((defined(LINUX) || defined(FREEBSD)) && defined(SUPERCLIENT))
- #define V4_THREADING
- #endif
- 
-@@ -3510,9 +3510,9 @@
- #else
- 	       (MAP_ANON | 
- #endif
--#if (!defined LINUX && !defined DARWIN)
--/* In LINUX, Solaris, and Darwin there is no such thing as MAP_VARIABLE. Hence, it gives 
--   compilation error. The equivalent functionality is default, 
-+#if (!defined LINUX && !defined DARWIN && !defined FREEBSD)
-+/* In LINUX, Solaris, FreeBSD and Darwin there is no such thing as MAP_VARIABLE.
-+   Hence, it gives compilation error. The equivalent functionality is default, 
-    if you do not specify MAP_FIXED */
- 		MAP_VARIABLE | 
- #endif  /* LINUX */
diff --git a/databases/firebird-client/files/patch-jrd::isc_file.c b/databases/firebird-client/files/patch-jrd::isc_file.c
deleted file mode 100644
index 7047f182d59c..000000000000
--- a/databases/firebird-client/files/patch-jrd::isc_file.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- jrd/isc_file.c.orig	Tue Dec 18 01:40:18 2001
-+++ jrd/isc_file.c	Sat Jul  6 18:04:55 2002
-@@ -106,6 +106,12 @@
- #define MTAB_CLOSE(stream)	ib_fclose (stream)
- #endif
- 
-+#ifdef FREEBSD
-+#define MTAB			"/etc/fstab"
-+#define MTAB_OPEN(path,type)	ib_fopen (path, type)
-+#define MTAB_CLOSE(stream)	ib_fclose (stream)
-+#endif 
-+
- #ifdef DARWIN
- #define MTAB			"/etc/fstab.hd" 
- #define MTAB_OPEN(path,type)	ib_fopen (path, type)
diff --git a/databases/firebird-client/files/patch-jrd::isc_sync.c b/databases/firebird-client/files/patch-jrd::isc_sync.c
deleted file mode 100644
index 19e327a1705f..000000000000
--- a/databases/firebird-client/files/patch-jrd::isc_sync.c
+++ /dev/null
@@ -1,38 +0,0 @@
---- jrd/isc_sync.c.orig	Tue Mar  5 21:11:25 2002
-+++ jrd/isc_sync.c	Sat Jul  6 18:06:30 2002
-@@ -1467,7 +1467,7 @@
-     pthread_mutex_init (event->event_mutex, pthread_mutexattr_default);
-     pthread_cond_init (event->event_semnum, pthread_condattr_default);
- #else
--#if (defined linux || defined DARWIN)
-+#if (defined linux || defined DARWIN || defined FREEBSD)
-     pthread_mutex_init (event->event_mutex, NULL);
-     pthread_cond_init (event->event_semnum, NULL);
- #else
-@@ -1596,7 +1596,7 @@
- #ifdef HP10
-     if (micro_seconds > 0 && (ret == -1) && (errno == EAGAIN))
- #else
--#if (defined linux || defined DARWIN)
-+#if (defined linux || defined DARWIN || defined FREEBSD)
-     if (micro_seconds > 0 && (ret == ETIMEDOUT))
- #else
-     if (micro_seconds > 0 && (ret == ETIME))
-@@ -5198,7 +5198,7 @@
-  **************************************/
- int	state;
- 
--#if (!defined HP10 && !defined linux && !defined DARWIN)
-+#if (!defined HP10 && !defined linux && !defined DARWIN && !defined FREEBSD)
- 
- pthread_mutexattr_t     mattr;
- 
-@@ -5218,7 +5218,7 @@
- 	 server (until we are to implement local IPC using shared
- 	 memory in which case we need interprocess thread sync.
- */
--#if (defined linux || defined DARWIN)
-+#if (defined linux || defined DARWIN || defined FREEBSD)
- return pthread_mutex_init (mutex->mtx_mutex, NULL);
- #else
- state = pthread_mutex_init (mutex->mtx_mutex, pthread_mutexattr_default);
diff --git a/databases/firebird-client/files/patch-jrd::jrd.h b/databases/firebird-client/files/patch-jrd::jrd.h
deleted file mode 100644
index 0a280080c74a..000000000000
--- a/databases/firebird-client/files/patch-jrd::jrd.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- jrd/jrd.h.orig	Tue May 14 19:01:06 2002
-+++ jrd/jrd.h	Tue May 14 19:23:44 2002
-@@ -717,7 +717,8 @@
- #ifdef MULTI_THREAD
- #if (defined APOLLO || defined DECOSF || defined NETWARE_386 || \
- 	defined NeXT || defined SOLARIS_MT || defined WIN_NT || \
--	defined OS2_ONLY || defined HP10 || defined LINUX || defined DARWIN)
-+	defined OS2_ONLY || defined HP10 || defined LINUX || \
-+	defined DARWIN || defined FREEBSD)
- #define PLATFORM_GET_THREAD_DATA ((TDBB) THD_get_specific())
- #endif
- #endif
diff --git a/databases/firebird-client/files/patch-jrd::thd.c b/databases/firebird-client/files/patch-jrd::thd.c
deleted file mode 100644
index a09c3fe4e1c3..000000000000
--- a/databases/firebird-client/files/patch-jrd::thd.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- jrd/thd.c.orig	Thu May 24 14:11:11 2001
-+++ jrd/thd.c	Sun Jul  7 14:52:07 2002
-@@ -2605,7 +2605,7 @@
- int 		detach_state=PTHREAD_CREATE_DETACHED
- #endif
- 
--#if ( !defined HP10 && !defined linux )
-+#if ( !defined HP10 && !defined linux && !defined FREEBSD )
- 
- state = pthread_attr_init (&pattr);
- if (state)
-@@ -2628,7 +2628,7 @@
- return state;
- 
- #else
--#ifdef linux
-+#if ( defined linux || defined FREEBSD )
- if (state = pthread_create (&thread, NULL, routine, arg))
-     return state;
- return pthread_detach (thread);
diff --git a/databases/firebird-client/files/patch-jrd::thd.h b/databases/firebird-client/files/patch-jrd::thd.h
deleted file mode 100644
index b4e74ecfbe59..000000000000
--- a/databases/firebird-client/files/patch-jrd::thd.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- jrd/thd.h.orig	Sat Mar  2 00:16:31 2002
-+++ jrd/thd.h	Mon May 13 19:10:37 2002
-@@ -98,6 +98,11 @@
- #define MULTI_THREAD		1
- #endif
- 
-+#if (defined(FREEBSD) && defined(SUPERSERVER))
-+#define POSIX_THREADS		1
-+#define MULTI_THREAD		1
-+#endif
-+
- #ifdef VMS
- #ifndef GATEWAY
- #define MULTI_THREAD		1
diff --git a/databases/firebird-client/files/patch-lock::lock.h b/databases/firebird-client/files/patch-lock::lock.h
deleted file mode 100644
index fe7ad684d99e..000000000000
--- a/databases/firebird-client/files/patch-lock::lock.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- lock/lock.h.orig	Wed Jun  6 05:43:58 2001
-+++ lock/lock.h	Sat Jul  6 18:08:56 2002
-@@ -65,8 +65,10 @@
- #ifndef SOLARIS_MT
- #if !(defined(HP10) && defined(SUPERSERVER))
- #if !(defined(LINUX) && defined(SUPERSERVER))
-+#if !(defined(FREEBSD) && defined(SUPERSERVER))
- #ifndef DARWIN
- #define MANAGER_PROCESS
-+#endif
- #endif
- #endif
- #endif
diff --git a/databases/firebird-client/files/patch-porting::qli::help.c b/databases/firebird-client/files/patch-porting::qli::help.c
deleted file mode 100644
index c6dbdcae0efe..000000000000
--- a/databases/firebird-client/files/patch-porting::qli::help.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- porting/qli/help.c.orig	Tue Mar 12 00:37:07 2002
-+++ porting/qli/help.c	Fri Nov 22 17:32:40 2002
-@@ -289,7 +289,7 @@
- 		  isc_25.isc_26))
- 	continue;
-     if (++topics == 1 && banner)
--	ib_printf ("%s\n", banner, string, parent);
-+	ib_printf ("%s%s%s\n", banner, string, parent);
-     p = line + ((ptr - line + COLUMN_WIDTH - 1) / COLUMN_WIDTH) * COLUMN_WIDTH;
-     if (p + l > line + RIGHT_MARGIN)
- 	{
diff --git a/databases/firebird-client/files/patch-remote::remote.h b/databases/firebird-client/files/patch-remote::remote.h
deleted file mode 100644
index 2c3fa59fe04e..000000000000
--- a/databases/firebird-client/files/patch-remote::remote.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- remote/remote.h	2002/10/21 13:03:48	1.1
-+++ remote/remote.h	2002/10/21 13:04:15
-@@ -47,6 +47,7 @@
- #endif
- #ifndef WINDOWS_ONLY
- #include <fcntl.h>
-+#include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/ioctl.h>
- #endif /* WINDOWS_ONLY */
diff --git a/databases/firebird-client/pkg-plist b/databases/firebird-client/pkg-plist
index 4108b6237053..97eceac35721 100644
--- a/databases/firebird-client/pkg-plist
+++ b/databases/firebird-client/pkg-plist
@@ -64,10 +64,8 @@ firebird/lib/gds.a
 firebird/lib/gds.so
 firebird/lib/libgds.so
 firebird/lib/libgds.so.1
-firebird/lib/libgds_pyxis.a
 firebird/lib/libgds.a
 firebird/lib/libib_util.so
-firebird/lib/gds_pyxis.a
 firebird/help/help.gbak
 firebird/help/help.gdb
 firebird/bin/ibguard
@@ -87,7 +85,6 @@ firebird/bin/qli
 firebird/bin/gds_inet_server
 firebird/bin/gsplit
 firebird/bin/gstat
-firebird/bin/gds_relay
 firebird/bin/gsec
 firebird/bin/gbak
 firebird/misc/firebird.init.d.generic
diff --git a/databases/firebird-server/Makefile b/databases/firebird-server/Makefile
index c33948a765b8..b158cc63226a 100644
--- a/databases/firebird-server/Makefile
+++ b/databases/firebird-server/Makefile
@@ -6,21 +6,18 @@
 #
 
 PORTNAME=	firebird
-PORTVERSION=	1.0
-PORTREVISION=	2
+PORTVERSION=	1.0.2
 CATEGORIES=	databases
-MASTER_SITES=	http://firebird.sourceforge.net/download/ \
-		http://www.aims.com.au/chris/ \
-		${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}	\
+		http://www.aims.com.au/chris/firebird/
 MASTER_SITE_SUBDIR=firebird
-DISTFILES=	bootkit-1.0.0.796.tar.gz \
-		bootkit-freebsd-1.0.0.796.tar.gz \
+DISTFILES=	bootkit-1.0.2.908.tar.gz \
 		interbase0.9-4-v5examples.tar.gz \
-		Firebird-1.0.0.796.src.tar.gz
+		Firebird-1.0.2.908.src.tar.gz
 
 MAINTAINER=	chris@aims.com.au
 
-WRKSRC=		${WRKDIR}/firebird-1.0.0.796
+WRKSRC=		${WRKDIR}/firebird-1.0.2.908
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	%%PREFIX%%/firebird/lib
 MSG_FILE=	${PKGDIR}/pkg-message
@@ -31,20 +28,23 @@ ONLY_FOR_ARCHS=	i386
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} >= 500000
+MANUAL_PACKAGE_BUILD=	"Doesn't compile on NFS on -current"
+.endif
+
 do-extract:
 	@${MKDIR} ${WRKDIR}
 	@(								\
 	cd ${WRKDIR}; ${TAR} -zxf					\
-		 ${DISTDIR}/Firebird-1.0.0.796.src.tar.gz;		\
-	cd firebird-1.0.0.796;						\
-	${TAR} -zxf ${DISTDIR}/bootkit-1.0.0.796.tar.gz;		\
-	${TAR} -zxf ${DISTDIR}/bootkit-freebsd-1.0.0.796.tar.gz;	\
+		 ${DISTDIR}/Firebird-1.0.2.908.src.tar.gz;		\
+	cd firebird-1.0.2.908;						\
+	${TAR} -zxf ${DISTDIR}/bootkit-1.0.2.908.tar.gz;		\
 	${CP} -f msgs/msg.gbak misc/msg.gbak				\
 	)
 
 post-patch:
 	@${SED} 's|%%PREFIX%%|${PREFIX}|g' ${MSG_FILE} > ${PKGMESSAGE}
-.if ${OSVERSION} >= 500016 || ${OSVERSION} >= 430001
+.if ${OSVERSION} >= 430001 && ${OSVERSION} < 500000 || ${OSVERSION} >= 500016
 	@${REINPLACE_CMD} -e 's,\-ldescrypt,\-lcrypt,g' \
 		 ${WRKSRC}/builds/original/prefix.freebsd
 .else
@@ -53,16 +53,11 @@ post-patch:
 
 do-configure:
 	@(								\
-	cd ${WRKDIR}/firebird-1.0.0.796;				\
-	INTERBASE=${WRKDIR}/firebird-1.0.0.796/interbase; export INTERBASE; \
-	REFDBPATH=${WRKDIR}/firebird-1.0.0.796/refDatabases; export REFDBPATH; \
-	${SH} buildBootDatabases;					\
+	cd ${WRKDIR}/firebird-1.0.2.908;				\
+	INTERBASE=${WRKDIR}/firebird-1.0.2.908/interbase; export INTERBASE; \
+	REFDBPATH=${WRKDIR}/firebird-1.0.2.908/refDatabases; export REFDBPATH; \
 	NOPROMPT_SETUP=yes; export NOPROMPT_SETUP;			\
 	FIREBIRD_64_BIT_IO=yes; export FIREBIRD_64_BIT_IO;		\
-	${CAT} builds_win32/original/build_no.ksh | ${TR} -d '\r'	\
-		> builds_win32/original/build_no.ksh.fix;		\
-	${MV} -f builds_win32/original/build_no.ksh.fix			\
-		 builds_win32/original/build_no.ksh;			\
 	${SH} Configure.sh PROD FREEBSD;				\
 	)
 
@@ -70,14 +65,14 @@ do-build:
 	@(								\
 	${REINPLACE_CMD} -e 's,opt,usr,'				\
 		 ${WRKSRC}/firebird/install/linux/misc/ibmgr;		\
-	${LN} -sf ${WRKDIR}/firebird-1.0.0.796/refDatabases/jrd/isc.gdb	\
-		 ${WRKDIR}/firebird-1.0.0.796/interbase/isc4.gdb;	\
-	${LN} -sf ${WRKDIR}/firebird-1.0.0.796/refDatabases/msgs/msg.gdb \
-		 ${WRKDIR}/firebird-1.0.0.796/msg.gdb;			\
-	cd ${WRKDIR}/firebird-1.0.0.796;				\
-	INTERBASE=${WRKDIR}/firebird-1.0.0.796/interbase; export INTERBASE; \
-	REFDBPATH=${WRKDIR}/firebird-1.0.0.796/refDatabases; export REFDBPATH; \
-	${CP} ${PKGDIR}/files/buildit.sh ${WRKDIR}/firebird-1.0.0.796;	\
+	${LN} -sf ${WRKDIR}/firebird-1.0.2.908/refDatabases/jrd/isc.gdb	\
+		 ${WRKDIR}/firebird-1.0.2.908/interbase/isc4.gdb;	\
+	${LN} -sf ${WRKDIR}/firebird-1.0.2.908/refDatabases/msgs/msg.gdb \
+		 ${WRKDIR}/firebird-1.0.2.908/msg.gdb;			\
+	cd ${WRKDIR}/firebird-1.0.2.908;				\
+	INTERBASE=${WRKDIR}/firebird-1.0.2.908/interbase; export INTERBASE; \
+	REFDBPATH=${WRKDIR}/firebird-1.0.2.908/refDatabases; export REFDBPATH; \
+	${CP} ${PKGDIR}/files/buildit.sh ${WRKDIR}/firebird-1.0.2.908;	\
 	${SH} buildit.sh;						\
 	)
 
@@ -86,13 +81,14 @@ pre-install:
 
 do-install:
 	@(								\
-	cd ${WRKDIR}/firebird-1.0.0.796;				\
-	${RM} ${WRKDIR}/firebird-1.0.0.796/interbase/isc4_tmp.gdb || ${TRUE}; \
-	${RM} ${WRKDIR}/firebird-1.0.0.796/interbase/lib/gds.so.1 || ${TRUE}; \
+	cd ${WRKDIR}/firebird-1.0.2.908;				\
+	${RM} ${WRKDIR}/firebird-1.0.2.908/interbase/isc4_tmp.gdb || ${TRUE}; \
+	${RM} ${WRKDIR}/firebird-1.0.2.908/interbase/lib/gds.so.1 || ${TRUE}; \
 	${CP} /dev/null interbase/interbase.log;			\
 	${CP} -Rp interbase ${PREFIX}/firebird;				\
 	${RM} ${PREFIX}/firebird/install;				\
 	${RM} ${PREFIX}/firebird/lib/libgds.so.1.0;			\
+	${RM} ${PREFIX}/firebird/lib/libgds_pyxis.a;			\
 	${LN} -fs gds.so ${PREFIX}/firebird/lib/libgds.so.1;		\
 	cd ${PREFIX}/firebird/examples;					\
 	${TAR} -xzf ${DISTDIR}/interbase0.9-4-v5examples.tar.gz;	\
diff --git a/databases/firebird-server/distinfo b/databases/firebird-server/distinfo
index dfdff30e23a3..349366a11efb 100644
--- a/databases/firebird-server/distinfo
+++ b/databases/firebird-server/distinfo
@@ -1,4 +1,3 @@
-MD5 (bootkit-1.0.0.796.tar.gz) = edcabe09957ed10b12e2f44eac9ae155
-MD5 (bootkit-freebsd-1.0.0.796.tar.gz) = 95bd14ec76bcf2b4ed41e3253ed58847
+MD5 (bootkit-1.0.2.908.tar.gz) = 3ce1d058d568242843fa0f92d5ae7018
 MD5 (interbase0.9-4-v5examples.tar.gz) = 17cba82bbf5066d515f2dee97bf8327a
-MD5 (Firebird-1.0.0.796.src.tar.gz) = 53bfebb4a269eb0f3c508587a843ddf8
+MD5 (Firebird-1.0.2.908.src.tar.gz) = 8ca9aac6cfe2670659d00bb2decb3456
diff --git a/databases/firebird-server/files/RELNOTES b/databases/firebird-server/files/RELNOTES
index a452990122ee..607bc697877a 100644
--- a/databases/firebird-server/files/RELNOTES
+++ b/databases/firebird-server/files/RELNOTES
@@ -1,6 +1,6 @@
-Firebird 1.0.0 FreeBSD Release Notes                    10-Nov-2002
+Firebird 1.0.2 FreeBSD Release Notes                    05-Jan-2003
 --------------------------------------
-FB-T6.2.796 Firebird Final Release
+FB-T6.2.908 Firebird Final Release
 
 Welcome to the FreeBSD Firebird port!  Users should note that there
 was a package called `firebird-1.0.tgz' released in mid-August
diff --git a/databases/firebird-server/files/patch-ad b/databases/firebird-server/files/patch-ad
deleted file mode 100644
index 4bcb2c1ce13c..000000000000
--- a/databases/firebird-server/files/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
---- setup_dirs.orig	Tue Aug  7 05:00:12 2001
-+++ setup_dirs	Fri Dec 28 16:12:49 2001
-@@ -60,7 +60,8 @@
-     DefaultAns=$2
-     echo -n "${1}"
-     Answer="$DefaultAns"
--    read Answer 
-+#    read Answer 
-+    echo ""
- }
- 
- 
diff --git a/databases/firebird-server/files/patch-ae b/databases/firebird-server/files/patch-ae
index 2b26792352f1..1e857e24cd6e 100644
--- a/databases/firebird-server/files/patch-ae
+++ b/databases/firebird-server/files/patch-ae
@@ -1,18 +1,11 @@
---- jrd/common.h.orig	Thu Dec  6 05:06:37 2001
-+++ jrd/common.h	Wed Nov 13 11:47:17 2002
-@@ -148,6 +148,7 @@
- /* FreeBSD for Intel platforms */
- #ifdef FREEBSD
- 
-+#define UNIX_64_BIT_IO
- #define FB_ALIGN(n,b) ((n + b - 1) & ~(b - 1))
- #define ALIGNMENT     4
- #define DOUBLE_ALIGN  4
-@@ -164,6 +165,7 @@
- #define QUADCONST(n) (n##LL)
- #define KILLER_SIGNALS
- #define MMAP_SUPPORTED
-+#define MAP_ANONYMOUS
- #define SIGACTION_SUPPORTED
- #define NO_NFS        /* no MTAB_OPEN or MTAB_CLOSE in isc_file.c */
+--- jrd/common.h.orig	Wed Nov 13 11:44:27 2002
++++ jrd/common.h	Sun Jan  5 16:49:05 2003
+@@ -204,7 +204,7 @@
+ #define I386  1
+ #define VAX   1
+ #define IMPLEMENTATION    isc_info_db_impl_freebsd   /* 61 */
+-#define SETPGRP         setpgrp ()
++#define SETPGRP         setpgrp (0, 0)
+ #define ATEXIT(c)       atexit(c)
  
+ #define QUADFORMAT "ll"
diff --git a/databases/firebird-server/files/patch-builds::original::boot.sfx.interbase b/databases/firebird-server/files/patch-builds::original::boot.sfx.interbase
index 62d0b483a07d..332ce0cdf136 100644
--- a/databases/firebird-server/files/patch-builds::original::boot.sfx.interbase
+++ b/databases/firebird-server/files/patch-builds::original::boot.sfx.interbase
@@ -1,6 +1,6 @@
---- builds/original/boot.sfx.interbase.orig	Tue Dec 18 01:40:08 2001
-+++ builds/original/boot.sfx.interbase	Sat Nov  9 17:44:54 2002
-@@ -68,7 +68,7 @@
+--- builds/original/boot.sfx.interbase.orig	Sun Oct 13 17:12:41 2002
++++ builds/original/boot.sfx.interbase	Fri Jan 10 10:34:43 2003
+@@ -70,7 +70,7 @@
  #added completed according to inprise tree
  #FSG  093000
  
@@ -9,25 +9,16 @@
  
  #  burp wanted to build gpre	
  #  we break this dependency
-@@ -159,14 +159,14 @@
- # 1995-June-7 David Schnepper 
- # removed pyxis 3-Aug-00 TMC
- #executables:	alice burp dudley gpre miscFiles $(INTL) isql locks \
--	$(SUPER_SERVER)  qli remote spit utilities \
--	$(SHARED_AM) $(LINKABLE_LIBS)
-+#	$(SUPER_SERVER)  qli remote spit utilities \
-+#	$(SHARED_AM) $(LINKABLE_LIBS)
- 	
- executables:    alice dudley miscFiles $(INTL) isql locks \
+@@ -169,7 +169,7 @@
  	$(SUPER_SERVER)  qli remote spit utilities \
  	$(SHARED_AM) $(LINKABLE_LIBS)
  
 -super_firebird: gds.h includes fireboot super_targets dudley superMiscFiles $(INTL) isql locks qli remote spit help msgs msgs_intl dba gfix gsec security_db extlib examples completed
-+super_firebird: gds.h includes fireboot super_targets dudley superMiscFiles $(INTL) isql locks qli remote spit help msgs msgs_intl dba gfix relay gsec security_db extlib completed
++super_firebird: gds.h includes fireboot super_targets dudley superMiscFiles $(INTL) isql locks qli remote spit help msgs msgs_intl dba gfix gsec security_db extlib completed
  
  super_targets: 	s_run_codes s_alice s_burp s_dba s_security_c super_client super_server super_utils 
  
-@@ -195,7 +195,7 @@
+@@ -199,7 +199,7 @@
  
  super_client:		force
  	$(QUIET_ECHO) "Building super/client..."
diff --git a/databases/firebird-server/files/patch-builds::original::prefix.freebsd b/databases/firebird-server/files/patch-builds::original::prefix.freebsd
index ec8d8343f61d..8a9d5319dba6 100644
--- a/databases/firebird-server/files/patch-builds::original::prefix.freebsd
+++ b/databases/firebird-server/files/patch-builds::original::prefix.freebsd
@@ -1,102 +1,11 @@
---- builds/original/prefix.freebsd.orig	Sat Jan 13 05:18:13 2001
-+++ builds/original/prefix.freebsd	Sat Nov  9 16:49:17 2002
-@@ -28,20 +28,20 @@
- 
- 
+--- builds/original/prefix.freebsd.orig	Sun Oct 13 17:12:42 2002
++++ builds/original/prefix.freebsd	Fri Jan 10 13:00:32 2003
+@@ -30,7 +30,7 @@
  PROD_DEBUG_OBJECTS=	nodebug.o
--PROD_SHRLIB_DIR=	-Lsource/jrd
-+PROD_SHRLIB_DIR=	-Lsource/jrd -Lsource/interbase/lib
+ PROD_SHRLIB_DIR=	-Lsource/jrd -Lsource/interbase/lib
  PROD_VERSION_FLAG=	-DPROD_BUILD
 -PROD_CFLAGS=            -O -m486 -fpic -DFLINTSTONE
-+PROD_CFLAGS=            -O -pipe -march=i486 -fpic -DFLINTSTONE
++PROD_CFLAGS=		-O -pipe -march=i486 -fpic -DFLINTSTONE
  
  
  DEV_DEBUG_OBJECTS=	grammar.o dbg.o dbt.o dmp.o
--DEV_SHRLIB_DIR=		-Lsource/jrd
-+DEV_SHRLIB_DIR=		-Lsource/jrd -Lsource/interbase/lib
- DEV_VERSION_FLAG=	-DDEV_BUILD
- DEV_CFLAGS=		-ggdb
- 
- DEBUG_OBJECTS=		$($(VERSION)_DEBUG_OBJECTS)
- SHRLIB_DIR=		$($(VERSION)_SHRLIB_DIR)
- VERSION_FLAG=		$($(VERSION)_VERSION_FLAG)
--CFLAGS_COMMON=		$($(VERSION)_CFLAGS)  -Isource/interbase/include -DFREEBSD -w -fwritable-strings
-+CFLAGS_COMMON=		$($(VERSION)_CFLAGS) -DFREEBSD -w -fwritable-strings -Isource/interbase/include 
- CFLAGS=			$(CFLAGS_COMMON) $(SUPER_FLAG)
- PIC_J_CFLAGS=		$(CFLAGS_COMMON) -DPIPE_IS_SHRLIB -fPIC
- SPECIAL_OBJECTS=	j
-@@ -62,21 +62,21 @@
- BIN_PATH=		interbase/bin
- BRIDGE_MISC=		head5.o allp.o
- CHMOD_VAL=		666
--CURSES_LIB=             -lncurses
-+CURSES_LIB=
- DSQL_P_OBJS=		dsql_p_objects
--FORM_OBJECTS=		form.o
--FORM_TRN_OBJECTS=	form_trn.o
-+FORM_OBJECTS=		noform.o
-+FORM_TRN_OBJECTS=
- FUNCTIONS=		functions.bin
- FUNCSHR=		source/interbase/lib/gdsf.so
- GDS_LINK=		$(GDSSHR_LINK)
--GDS_PYXIS=		gds_pyxis.a
-+GDS_PYXIS=
- GDSLIB_BACKEND=		source/interbase/lib/gds_b.a
- GDSLIB_LINK=		-Lsource/jrd -lgds_b -lc -ldescrypt
- 
- GDSSHR=			source/interbase/lib/gds.so
- LINUX_GDSSHR=		$(GDSSHR)
--GDSSHR_LINK=		$(SHRLIB_DIR) -lgds -lgds_pyxis -ldescrypt
--PIPE_GDSSHR_LINK=	$(SHRLIB_DIR) -lgds -lgds_pyxis
-+GDSSHR_LINK=		$(SHRLIB_DIR) -lgds -ldescrypt
-+PIPE_GDSSHR_LINK=	$(SHRLIB_DIR) -lgds
- HLPDIR=			source/qli/
- HOSTNAME=		`hostname | cut -d'.' -f1`
- INCLUDES=		include_so include_so_ada	
-@@ -92,7 +92,7 @@
- JRD_J_MISC_OBJECTS=	source/jrd/sun_ftn.j 
- JRD_P_MISC_OBJECTS=	source/jrd/sun_ftn.bin source/jrd/nodebug.bin
- LANG_OBJECTS=		ada.o ftn.o cob.o
--LANGUAGES=		cc cxx ada sun_ada microfocus_cob make16 gdl1 sun_ftn
-+LANGUAGES=		cc cxx ada microfocus_cob make16 gdl1 sun_ftn
- LD_LIBS=		-lc
- LD_LIBS_J=		-lc
- LD_OPTS=		-shared
-@@ -104,28 +104,28 @@
- MUISQL_LINK_OPTS=	$(MUISQL_MU_LIB) $(PIPE_GDSSHR_LINK) -lm 
- PIC_FLAGS=		$(CFLAGS) -fPIC
- PIPE=			gds.a gds_pipe
--PYXIS=			pyxis
--PYXIS_MISC_OBJS=	$(PYXIS_MISC)
--PYXIS_P_MISC_OBJS=	$(PYXIS_P_MISC)
--PYXIS_OBJECTS=		pyxis_objects
--PYXIS_MISC_OBJECTS=	$(PYXDIR)cdm.o $(PYXDIR)vt100.o $(PYXDIR)sun_ftn_pyxis.o
-+PYXIS=
-+PYXIS_MISC_OBJS=
-+PYXIS_P_MISC_OBJS=
-+PYXIS_OBJECTS=
-+PYXIS_MISC_OBJECTS=
- REG_HELP=		isc_ins_hlp.dat
- REMOTE_GDSSHR=		$(GDSSHR)
- REMOTE_GDSSHR_LINK=	$(SERVER_LINK)
- REMOTE_P_OBJS=		rem_p_objects
--SCREEN_LIBS=
--#SCREEN_LIBS=		-lncurses
-+#SCREEN_LIBS=
-+SCREEN_LIBS=		-lncurses
- SERVER_LINK=		$(GDSSHR_LINK)
- SETUP_ISC=              ISC_USER=sysdba; ISC_PASSWORD=masterkey; export ISC_USER ISC_PASSWORD;
- SPECIAL_OPT=		source/special_opt
- NETWORK_LIB=		
- SOCKET_LIB=		-lc
--THREAD_LIB=		-llthread
-+THREAD_LIB=		-pthread
- SUN_FUNCSHR=		$(FUNCSHR)
- LX_SUPER_GDSSHR=		source/interbase/lib/gds.so.1
- SUPER_CLIENT_GDSSHR=    $(LX_SUPER_GDSSHR)
- SUPER_BACKEND=		source/jrd/gds_ss.a
--SUPER_LINK=		-Lsource/jrd -lgds_ss -lc -ldescrypt -L/usr/local/lib -llthread
-+SUPER_LINK=		-pthread -Lsource/jrd -lgds_ss -ldescrypt
- SUPER_SERVER=	
- UTILITIES=		
- WAL_P_OBJS=		wal_p_objects
diff --git a/databases/firebird-server/files/patch-jrd::gds.c b/databases/firebird-server/files/patch-jrd::gds.c
deleted file mode 100644
index 523abb725403..000000000000
--- a/databases/firebird-server/files/patch-jrd::gds.c
+++ /dev/null
@@ -1,24 +0,0 @@
---- jrd/gds.c.orig	Sat Mar  2 00:15:11 2002
-+++ jrd/gds.c	Sun Jul  7 14:27:44 2002
-@@ -159,7 +159,7 @@
-    engine and this change may imply side effect I haven't known 
-    about yet. Tomas Nejedlik (tomas@nejedlik.cz)
- */
--#if (defined(LINUX) && defined(SUPERCLIENT))
-+#if ((defined(LINUX) || defined(FREEBSD)) && defined(SUPERCLIENT))
- #define V4_THREADING
- #endif
- 
-@@ -3510,9 +3510,9 @@
- #else
- 	       (MAP_ANON | 
- #endif
--#if (!defined LINUX && !defined DARWIN)
--/* In LINUX, Solaris, and Darwin there is no such thing as MAP_VARIABLE. Hence, it gives 
--   compilation error. The equivalent functionality is default, 
-+#if (!defined LINUX && !defined DARWIN && !defined FREEBSD)
-+/* In LINUX, Solaris, FreeBSD and Darwin there is no such thing as MAP_VARIABLE.
-+   Hence, it gives compilation error. The equivalent functionality is default, 
-    if you do not specify MAP_FIXED */
- 		MAP_VARIABLE | 
- #endif  /* LINUX */
diff --git a/databases/firebird-server/files/patch-jrd::isc_file.c b/databases/firebird-server/files/patch-jrd::isc_file.c
deleted file mode 100644
index 7047f182d59c..000000000000
--- a/databases/firebird-server/files/patch-jrd::isc_file.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- jrd/isc_file.c.orig	Tue Dec 18 01:40:18 2001
-+++ jrd/isc_file.c	Sat Jul  6 18:04:55 2002
-@@ -106,6 +106,12 @@
- #define MTAB_CLOSE(stream)	ib_fclose (stream)
- #endif
- 
-+#ifdef FREEBSD
-+#define MTAB			"/etc/fstab"
-+#define MTAB_OPEN(path,type)	ib_fopen (path, type)
-+#define MTAB_CLOSE(stream)	ib_fclose (stream)
-+#endif 
-+
- #ifdef DARWIN
- #define MTAB			"/etc/fstab.hd" 
- #define MTAB_OPEN(path,type)	ib_fopen (path, type)
diff --git a/databases/firebird-server/files/patch-jrd::isc_sync.c b/databases/firebird-server/files/patch-jrd::isc_sync.c
deleted file mode 100644
index 19e327a1705f..000000000000
--- a/databases/firebird-server/files/patch-jrd::isc_sync.c
+++ /dev/null
@@ -1,38 +0,0 @@
---- jrd/isc_sync.c.orig	Tue Mar  5 21:11:25 2002
-+++ jrd/isc_sync.c	Sat Jul  6 18:06:30 2002
-@@ -1467,7 +1467,7 @@
-     pthread_mutex_init (event->event_mutex, pthread_mutexattr_default);
-     pthread_cond_init (event->event_semnum, pthread_condattr_default);
- #else
--#if (defined linux || defined DARWIN)
-+#if (defined linux || defined DARWIN || defined FREEBSD)
-     pthread_mutex_init (event->event_mutex, NULL);
-     pthread_cond_init (event->event_semnum, NULL);
- #else
-@@ -1596,7 +1596,7 @@
- #ifdef HP10
-     if (micro_seconds > 0 && (ret == -1) && (errno == EAGAIN))
- #else
--#if (defined linux || defined DARWIN)
-+#if (defined linux || defined DARWIN || defined FREEBSD)
-     if (micro_seconds > 0 && (ret == ETIMEDOUT))
- #else
-     if (micro_seconds > 0 && (ret == ETIME))
-@@ -5198,7 +5198,7 @@
-  **************************************/
- int	state;
- 
--#if (!defined HP10 && !defined linux && !defined DARWIN)
-+#if (!defined HP10 && !defined linux && !defined DARWIN && !defined FREEBSD)
- 
- pthread_mutexattr_t     mattr;
- 
-@@ -5218,7 +5218,7 @@
- 	 server (until we are to implement local IPC using shared
- 	 memory in which case we need interprocess thread sync.
- */
--#if (defined linux || defined DARWIN)
-+#if (defined linux || defined DARWIN || defined FREEBSD)
- return pthread_mutex_init (mutex->mtx_mutex, NULL);
- #else
- state = pthread_mutex_init (mutex->mtx_mutex, pthread_mutexattr_default);
diff --git a/databases/firebird-server/files/patch-jrd::jrd.h b/databases/firebird-server/files/patch-jrd::jrd.h
deleted file mode 100644
index 0a280080c74a..000000000000
--- a/databases/firebird-server/files/patch-jrd::jrd.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- jrd/jrd.h.orig	Tue May 14 19:01:06 2002
-+++ jrd/jrd.h	Tue May 14 19:23:44 2002
-@@ -717,7 +717,8 @@
- #ifdef MULTI_THREAD
- #if (defined APOLLO || defined DECOSF || defined NETWARE_386 || \
- 	defined NeXT || defined SOLARIS_MT || defined WIN_NT || \
--	defined OS2_ONLY || defined HP10 || defined LINUX || defined DARWIN)
-+	defined OS2_ONLY || defined HP10 || defined LINUX || \
-+	defined DARWIN || defined FREEBSD)
- #define PLATFORM_GET_THREAD_DATA ((TDBB) THD_get_specific())
- #endif
- #endif
diff --git a/databases/firebird-server/files/patch-jrd::thd.c b/databases/firebird-server/files/patch-jrd::thd.c
deleted file mode 100644
index a09c3fe4e1c3..000000000000
--- a/databases/firebird-server/files/patch-jrd::thd.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- jrd/thd.c.orig	Thu May 24 14:11:11 2001
-+++ jrd/thd.c	Sun Jul  7 14:52:07 2002
-@@ -2605,7 +2605,7 @@
- int 		detach_state=PTHREAD_CREATE_DETACHED
- #endif
- 
--#if ( !defined HP10 && !defined linux )
-+#if ( !defined HP10 && !defined linux && !defined FREEBSD )
- 
- state = pthread_attr_init (&pattr);
- if (state)
-@@ -2628,7 +2628,7 @@
- return state;
- 
- #else
--#ifdef linux
-+#if ( defined linux || defined FREEBSD )
- if (state = pthread_create (&thread, NULL, routine, arg))
-     return state;
- return pthread_detach (thread);
diff --git a/databases/firebird-server/files/patch-jrd::thd.h b/databases/firebird-server/files/patch-jrd::thd.h
deleted file mode 100644
index b4e74ecfbe59..000000000000
--- a/databases/firebird-server/files/patch-jrd::thd.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- jrd/thd.h.orig	Sat Mar  2 00:16:31 2002
-+++ jrd/thd.h	Mon May 13 19:10:37 2002
-@@ -98,6 +98,11 @@
- #define MULTI_THREAD		1
- #endif
- 
-+#if (defined(FREEBSD) && defined(SUPERSERVER))
-+#define POSIX_THREADS		1
-+#define MULTI_THREAD		1
-+#endif
-+
- #ifdef VMS
- #ifndef GATEWAY
- #define MULTI_THREAD		1
diff --git a/databases/firebird-server/files/patch-lock::lock.h b/databases/firebird-server/files/patch-lock::lock.h
deleted file mode 100644
index fe7ad684d99e..000000000000
--- a/databases/firebird-server/files/patch-lock::lock.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- lock/lock.h.orig	Wed Jun  6 05:43:58 2001
-+++ lock/lock.h	Sat Jul  6 18:08:56 2002
-@@ -65,8 +65,10 @@
- #ifndef SOLARIS_MT
- #if !(defined(HP10) && defined(SUPERSERVER))
- #if !(defined(LINUX) && defined(SUPERSERVER))
-+#if !(defined(FREEBSD) && defined(SUPERSERVER))
- #ifndef DARWIN
- #define MANAGER_PROCESS
-+#endif
- #endif
- #endif
- #endif
diff --git a/databases/firebird-server/files/patch-porting::qli::help.c b/databases/firebird-server/files/patch-porting::qli::help.c
deleted file mode 100644
index c6dbdcae0efe..000000000000
--- a/databases/firebird-server/files/patch-porting::qli::help.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- porting/qli/help.c.orig	Tue Mar 12 00:37:07 2002
-+++ porting/qli/help.c	Fri Nov 22 17:32:40 2002
-@@ -289,7 +289,7 @@
- 		  isc_25.isc_26))
- 	continue;
-     if (++topics == 1 && banner)
--	ib_printf ("%s\n", banner, string, parent);
-+	ib_printf ("%s%s%s\n", banner, string, parent);
-     p = line + ((ptr - line + COLUMN_WIDTH - 1) / COLUMN_WIDTH) * COLUMN_WIDTH;
-     if (p + l > line + RIGHT_MARGIN)
- 	{
diff --git a/databases/firebird-server/files/patch-remote::remote.h b/databases/firebird-server/files/patch-remote::remote.h
deleted file mode 100644
index 2c3fa59fe04e..000000000000
--- a/databases/firebird-server/files/patch-remote::remote.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- remote/remote.h	2002/10/21 13:03:48	1.1
-+++ remote/remote.h	2002/10/21 13:04:15
-@@ -47,6 +47,7 @@
- #endif
- #ifndef WINDOWS_ONLY
- #include <fcntl.h>
-+#include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/ioctl.h>
- #endif /* WINDOWS_ONLY */
diff --git a/databases/firebird-server/pkg-plist b/databases/firebird-server/pkg-plist
index 4108b6237053..97eceac35721 100644
--- a/databases/firebird-server/pkg-plist
+++ b/databases/firebird-server/pkg-plist
@@ -64,10 +64,8 @@ firebird/lib/gds.a
 firebird/lib/gds.so
 firebird/lib/libgds.so
 firebird/lib/libgds.so.1
-firebird/lib/libgds_pyxis.a
 firebird/lib/libgds.a
 firebird/lib/libib_util.so
-firebird/lib/gds_pyxis.a
 firebird/help/help.gbak
 firebird/help/help.gdb
 firebird/bin/ibguard
@@ -87,7 +85,6 @@ firebird/bin/qli
 firebird/bin/gds_inet_server
 firebird/bin/gsplit
 firebird/bin/gstat
-firebird/bin/gds_relay
 firebird/bin/gsec
 firebird/bin/gbak
 firebird/misc/firebird.init.d.generic
diff --git a/databases/firebird/Makefile b/databases/firebird/Makefile
index c33948a765b8..b158cc63226a 100644
--- a/databases/firebird/Makefile
+++ b/databases/firebird/Makefile
@@ -6,21 +6,18 @@
 #
 
 PORTNAME=	firebird
-PORTVERSION=	1.0
-PORTREVISION=	2
+PORTVERSION=	1.0.2
 CATEGORIES=	databases
-MASTER_SITES=	http://firebird.sourceforge.net/download/ \
-		http://www.aims.com.au/chris/ \
-		${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}	\
+		http://www.aims.com.au/chris/firebird/
 MASTER_SITE_SUBDIR=firebird
-DISTFILES=	bootkit-1.0.0.796.tar.gz \
-		bootkit-freebsd-1.0.0.796.tar.gz \
+DISTFILES=	bootkit-1.0.2.908.tar.gz \
 		interbase0.9-4-v5examples.tar.gz \
-		Firebird-1.0.0.796.src.tar.gz
+		Firebird-1.0.2.908.src.tar.gz
 
 MAINTAINER=	chris@aims.com.au
 
-WRKSRC=		${WRKDIR}/firebird-1.0.0.796
+WRKSRC=		${WRKDIR}/firebird-1.0.2.908
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	%%PREFIX%%/firebird/lib
 MSG_FILE=	${PKGDIR}/pkg-message
@@ -31,20 +28,23 @@ ONLY_FOR_ARCHS=	i386
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} >= 500000
+MANUAL_PACKAGE_BUILD=	"Doesn't compile on NFS on -current"
+.endif
+
 do-extract:
 	@${MKDIR} ${WRKDIR}
 	@(								\
 	cd ${WRKDIR}; ${TAR} -zxf					\
-		 ${DISTDIR}/Firebird-1.0.0.796.src.tar.gz;		\
-	cd firebird-1.0.0.796;						\
-	${TAR} -zxf ${DISTDIR}/bootkit-1.0.0.796.tar.gz;		\
-	${TAR} -zxf ${DISTDIR}/bootkit-freebsd-1.0.0.796.tar.gz;	\
+		 ${DISTDIR}/Firebird-1.0.2.908.src.tar.gz;		\
+	cd firebird-1.0.2.908;						\
+	${TAR} -zxf ${DISTDIR}/bootkit-1.0.2.908.tar.gz;		\
 	${CP} -f msgs/msg.gbak misc/msg.gbak				\
 	)
 
 post-patch:
 	@${SED} 's|%%PREFIX%%|${PREFIX}|g' ${MSG_FILE} > ${PKGMESSAGE}
-.if ${OSVERSION} >= 500016 || ${OSVERSION} >= 430001
+.if ${OSVERSION} >= 430001 && ${OSVERSION} < 500000 || ${OSVERSION} >= 500016
 	@${REINPLACE_CMD} -e 's,\-ldescrypt,\-lcrypt,g' \
 		 ${WRKSRC}/builds/original/prefix.freebsd
 .else
@@ -53,16 +53,11 @@ post-patch:
 
 do-configure:
 	@(								\
-	cd ${WRKDIR}/firebird-1.0.0.796;				\
-	INTERBASE=${WRKDIR}/firebird-1.0.0.796/interbase; export INTERBASE; \
-	REFDBPATH=${WRKDIR}/firebird-1.0.0.796/refDatabases; export REFDBPATH; \
-	${SH} buildBootDatabases;					\
+	cd ${WRKDIR}/firebird-1.0.2.908;				\
+	INTERBASE=${WRKDIR}/firebird-1.0.2.908/interbase; export INTERBASE; \
+	REFDBPATH=${WRKDIR}/firebird-1.0.2.908/refDatabases; export REFDBPATH; \
 	NOPROMPT_SETUP=yes; export NOPROMPT_SETUP;			\
 	FIREBIRD_64_BIT_IO=yes; export FIREBIRD_64_BIT_IO;		\
-	${CAT} builds_win32/original/build_no.ksh | ${TR} -d '\r'	\
-		> builds_win32/original/build_no.ksh.fix;		\
-	${MV} -f builds_win32/original/build_no.ksh.fix			\
-		 builds_win32/original/build_no.ksh;			\
 	${SH} Configure.sh PROD FREEBSD;				\
 	)
 
@@ -70,14 +65,14 @@ do-build:
 	@(								\
 	${REINPLACE_CMD} -e 's,opt,usr,'				\
 		 ${WRKSRC}/firebird/install/linux/misc/ibmgr;		\
-	${LN} -sf ${WRKDIR}/firebird-1.0.0.796/refDatabases/jrd/isc.gdb	\
-		 ${WRKDIR}/firebird-1.0.0.796/interbase/isc4.gdb;	\
-	${LN} -sf ${WRKDIR}/firebird-1.0.0.796/refDatabases/msgs/msg.gdb \
-		 ${WRKDIR}/firebird-1.0.0.796/msg.gdb;			\
-	cd ${WRKDIR}/firebird-1.0.0.796;				\
-	INTERBASE=${WRKDIR}/firebird-1.0.0.796/interbase; export INTERBASE; \
-	REFDBPATH=${WRKDIR}/firebird-1.0.0.796/refDatabases; export REFDBPATH; \
-	${CP} ${PKGDIR}/files/buildit.sh ${WRKDIR}/firebird-1.0.0.796;	\
+	${LN} -sf ${WRKDIR}/firebird-1.0.2.908/refDatabases/jrd/isc.gdb	\
+		 ${WRKDIR}/firebird-1.0.2.908/interbase/isc4.gdb;	\
+	${LN} -sf ${WRKDIR}/firebird-1.0.2.908/refDatabases/msgs/msg.gdb \
+		 ${WRKDIR}/firebird-1.0.2.908/msg.gdb;			\
+	cd ${WRKDIR}/firebird-1.0.2.908;				\
+	INTERBASE=${WRKDIR}/firebird-1.0.2.908/interbase; export INTERBASE; \
+	REFDBPATH=${WRKDIR}/firebird-1.0.2.908/refDatabases; export REFDBPATH; \
+	${CP} ${PKGDIR}/files/buildit.sh ${WRKDIR}/firebird-1.0.2.908;	\
 	${SH} buildit.sh;						\
 	)
 
@@ -86,13 +81,14 @@ pre-install:
 
 do-install:
 	@(								\
-	cd ${WRKDIR}/firebird-1.0.0.796;				\
-	${RM} ${WRKDIR}/firebird-1.0.0.796/interbase/isc4_tmp.gdb || ${TRUE}; \
-	${RM} ${WRKDIR}/firebird-1.0.0.796/interbase/lib/gds.so.1 || ${TRUE}; \
+	cd ${WRKDIR}/firebird-1.0.2.908;				\
+	${RM} ${WRKDIR}/firebird-1.0.2.908/interbase/isc4_tmp.gdb || ${TRUE}; \
+	${RM} ${WRKDIR}/firebird-1.0.2.908/interbase/lib/gds.so.1 || ${TRUE}; \
 	${CP} /dev/null interbase/interbase.log;			\
 	${CP} -Rp interbase ${PREFIX}/firebird;				\
 	${RM} ${PREFIX}/firebird/install;				\
 	${RM} ${PREFIX}/firebird/lib/libgds.so.1.0;			\
+	${RM} ${PREFIX}/firebird/lib/libgds_pyxis.a;			\
 	${LN} -fs gds.so ${PREFIX}/firebird/lib/libgds.so.1;		\
 	cd ${PREFIX}/firebird/examples;					\
 	${TAR} -xzf ${DISTDIR}/interbase0.9-4-v5examples.tar.gz;	\
diff --git a/databases/firebird/distinfo b/databases/firebird/distinfo
index dfdff30e23a3..349366a11efb 100644
--- a/databases/firebird/distinfo
+++ b/databases/firebird/distinfo
@@ -1,4 +1,3 @@
-MD5 (bootkit-1.0.0.796.tar.gz) = edcabe09957ed10b12e2f44eac9ae155
-MD5 (bootkit-freebsd-1.0.0.796.tar.gz) = 95bd14ec76bcf2b4ed41e3253ed58847
+MD5 (bootkit-1.0.2.908.tar.gz) = 3ce1d058d568242843fa0f92d5ae7018
 MD5 (interbase0.9-4-v5examples.tar.gz) = 17cba82bbf5066d515f2dee97bf8327a
-MD5 (Firebird-1.0.0.796.src.tar.gz) = 53bfebb4a269eb0f3c508587a843ddf8
+MD5 (Firebird-1.0.2.908.src.tar.gz) = 8ca9aac6cfe2670659d00bb2decb3456
diff --git a/databases/firebird/files/RELNOTES b/databases/firebird/files/RELNOTES
index a452990122ee..607bc697877a 100644
--- a/databases/firebird/files/RELNOTES
+++ b/databases/firebird/files/RELNOTES
@@ -1,6 +1,6 @@
-Firebird 1.0.0 FreeBSD Release Notes                    10-Nov-2002
+Firebird 1.0.2 FreeBSD Release Notes                    05-Jan-2003
 --------------------------------------
-FB-T6.2.796 Firebird Final Release
+FB-T6.2.908 Firebird Final Release
 
 Welcome to the FreeBSD Firebird port!  Users should note that there
 was a package called `firebird-1.0.tgz' released in mid-August
diff --git a/databases/firebird/files/patch-ad b/databases/firebird/files/patch-ad
deleted file mode 100644
index 4bcb2c1ce13c..000000000000
--- a/databases/firebird/files/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
---- setup_dirs.orig	Tue Aug  7 05:00:12 2001
-+++ setup_dirs	Fri Dec 28 16:12:49 2001
-@@ -60,7 +60,8 @@
-     DefaultAns=$2
-     echo -n "${1}"
-     Answer="$DefaultAns"
--    read Answer 
-+#    read Answer 
-+    echo ""
- }
- 
- 
diff --git a/databases/firebird/files/patch-ae b/databases/firebird/files/patch-ae
index 2b26792352f1..1e857e24cd6e 100644
--- a/databases/firebird/files/patch-ae
+++ b/databases/firebird/files/patch-ae
@@ -1,18 +1,11 @@
---- jrd/common.h.orig	Thu Dec  6 05:06:37 2001
-+++ jrd/common.h	Wed Nov 13 11:47:17 2002
-@@ -148,6 +148,7 @@
- /* FreeBSD for Intel platforms */
- #ifdef FREEBSD
- 
-+#define UNIX_64_BIT_IO
- #define FB_ALIGN(n,b) ((n + b - 1) & ~(b - 1))
- #define ALIGNMENT     4
- #define DOUBLE_ALIGN  4
-@@ -164,6 +165,7 @@
- #define QUADCONST(n) (n##LL)
- #define KILLER_SIGNALS
- #define MMAP_SUPPORTED
-+#define MAP_ANONYMOUS
- #define SIGACTION_SUPPORTED
- #define NO_NFS        /* no MTAB_OPEN or MTAB_CLOSE in isc_file.c */
+--- jrd/common.h.orig	Wed Nov 13 11:44:27 2002
++++ jrd/common.h	Sun Jan  5 16:49:05 2003
+@@ -204,7 +204,7 @@
+ #define I386  1
+ #define VAX   1
+ #define IMPLEMENTATION    isc_info_db_impl_freebsd   /* 61 */
+-#define SETPGRP         setpgrp ()
++#define SETPGRP         setpgrp (0, 0)
+ #define ATEXIT(c)       atexit(c)
  
+ #define QUADFORMAT "ll"
diff --git a/databases/firebird/files/patch-builds::original::boot.sfx.interbase b/databases/firebird/files/patch-builds::original::boot.sfx.interbase
index 62d0b483a07d..332ce0cdf136 100644
--- a/databases/firebird/files/patch-builds::original::boot.sfx.interbase
+++ b/databases/firebird/files/patch-builds::original::boot.sfx.interbase
@@ -1,6 +1,6 @@
---- builds/original/boot.sfx.interbase.orig	Tue Dec 18 01:40:08 2001
-+++ builds/original/boot.sfx.interbase	Sat Nov  9 17:44:54 2002
-@@ -68,7 +68,7 @@
+--- builds/original/boot.sfx.interbase.orig	Sun Oct 13 17:12:41 2002
++++ builds/original/boot.sfx.interbase	Fri Jan 10 10:34:43 2003
+@@ -70,7 +70,7 @@
  #added completed according to inprise tree
  #FSG  093000
  
@@ -9,25 +9,16 @@
  
  #  burp wanted to build gpre	
  #  we break this dependency
-@@ -159,14 +159,14 @@
- # 1995-June-7 David Schnepper 
- # removed pyxis 3-Aug-00 TMC
- #executables:	alice burp dudley gpre miscFiles $(INTL) isql locks \
--	$(SUPER_SERVER)  qli remote spit utilities \
--	$(SHARED_AM) $(LINKABLE_LIBS)
-+#	$(SUPER_SERVER)  qli remote spit utilities \
-+#	$(SHARED_AM) $(LINKABLE_LIBS)
- 	
- executables:    alice dudley miscFiles $(INTL) isql locks \
+@@ -169,7 +169,7 @@
  	$(SUPER_SERVER)  qli remote spit utilities \
  	$(SHARED_AM) $(LINKABLE_LIBS)
  
 -super_firebird: gds.h includes fireboot super_targets dudley superMiscFiles $(INTL) isql locks qli remote spit help msgs msgs_intl dba gfix gsec security_db extlib examples completed
-+super_firebird: gds.h includes fireboot super_targets dudley superMiscFiles $(INTL) isql locks qli remote spit help msgs msgs_intl dba gfix relay gsec security_db extlib completed
++super_firebird: gds.h includes fireboot super_targets dudley superMiscFiles $(INTL) isql locks qli remote spit help msgs msgs_intl dba gfix gsec security_db extlib completed
  
  super_targets: 	s_run_codes s_alice s_burp s_dba s_security_c super_client super_server super_utils 
  
-@@ -195,7 +195,7 @@
+@@ -199,7 +199,7 @@
  
  super_client:		force
  	$(QUIET_ECHO) "Building super/client..."
diff --git a/databases/firebird/files/patch-builds::original::prefix.freebsd b/databases/firebird/files/patch-builds::original::prefix.freebsd
index ec8d8343f61d..8a9d5319dba6 100644
--- a/databases/firebird/files/patch-builds::original::prefix.freebsd
+++ b/databases/firebird/files/patch-builds::original::prefix.freebsd
@@ -1,102 +1,11 @@
---- builds/original/prefix.freebsd.orig	Sat Jan 13 05:18:13 2001
-+++ builds/original/prefix.freebsd	Sat Nov  9 16:49:17 2002
-@@ -28,20 +28,20 @@
- 
- 
+--- builds/original/prefix.freebsd.orig	Sun Oct 13 17:12:42 2002
++++ builds/original/prefix.freebsd	Fri Jan 10 13:00:32 2003
+@@ -30,7 +30,7 @@
  PROD_DEBUG_OBJECTS=	nodebug.o
--PROD_SHRLIB_DIR=	-Lsource/jrd
-+PROD_SHRLIB_DIR=	-Lsource/jrd -Lsource/interbase/lib
+ PROD_SHRLIB_DIR=	-Lsource/jrd -Lsource/interbase/lib
  PROD_VERSION_FLAG=	-DPROD_BUILD
 -PROD_CFLAGS=            -O -m486 -fpic -DFLINTSTONE
-+PROD_CFLAGS=            -O -pipe -march=i486 -fpic -DFLINTSTONE
++PROD_CFLAGS=		-O -pipe -march=i486 -fpic -DFLINTSTONE
  
  
  DEV_DEBUG_OBJECTS=	grammar.o dbg.o dbt.o dmp.o
--DEV_SHRLIB_DIR=		-Lsource/jrd
-+DEV_SHRLIB_DIR=		-Lsource/jrd -Lsource/interbase/lib
- DEV_VERSION_FLAG=	-DDEV_BUILD
- DEV_CFLAGS=		-ggdb
- 
- DEBUG_OBJECTS=		$($(VERSION)_DEBUG_OBJECTS)
- SHRLIB_DIR=		$($(VERSION)_SHRLIB_DIR)
- VERSION_FLAG=		$($(VERSION)_VERSION_FLAG)
--CFLAGS_COMMON=		$($(VERSION)_CFLAGS)  -Isource/interbase/include -DFREEBSD -w -fwritable-strings
-+CFLAGS_COMMON=		$($(VERSION)_CFLAGS) -DFREEBSD -w -fwritable-strings -Isource/interbase/include 
- CFLAGS=			$(CFLAGS_COMMON) $(SUPER_FLAG)
- PIC_J_CFLAGS=		$(CFLAGS_COMMON) -DPIPE_IS_SHRLIB -fPIC
- SPECIAL_OBJECTS=	j
-@@ -62,21 +62,21 @@
- BIN_PATH=		interbase/bin
- BRIDGE_MISC=		head5.o allp.o
- CHMOD_VAL=		666
--CURSES_LIB=             -lncurses
-+CURSES_LIB=
- DSQL_P_OBJS=		dsql_p_objects
--FORM_OBJECTS=		form.o
--FORM_TRN_OBJECTS=	form_trn.o
-+FORM_OBJECTS=		noform.o
-+FORM_TRN_OBJECTS=
- FUNCTIONS=		functions.bin
- FUNCSHR=		source/interbase/lib/gdsf.so
- GDS_LINK=		$(GDSSHR_LINK)
--GDS_PYXIS=		gds_pyxis.a
-+GDS_PYXIS=
- GDSLIB_BACKEND=		source/interbase/lib/gds_b.a
- GDSLIB_LINK=		-Lsource/jrd -lgds_b -lc -ldescrypt
- 
- GDSSHR=			source/interbase/lib/gds.so
- LINUX_GDSSHR=		$(GDSSHR)
--GDSSHR_LINK=		$(SHRLIB_DIR) -lgds -lgds_pyxis -ldescrypt
--PIPE_GDSSHR_LINK=	$(SHRLIB_DIR) -lgds -lgds_pyxis
-+GDSSHR_LINK=		$(SHRLIB_DIR) -lgds -ldescrypt
-+PIPE_GDSSHR_LINK=	$(SHRLIB_DIR) -lgds
- HLPDIR=			source/qli/
- HOSTNAME=		`hostname | cut -d'.' -f1`
- INCLUDES=		include_so include_so_ada	
-@@ -92,7 +92,7 @@
- JRD_J_MISC_OBJECTS=	source/jrd/sun_ftn.j 
- JRD_P_MISC_OBJECTS=	source/jrd/sun_ftn.bin source/jrd/nodebug.bin
- LANG_OBJECTS=		ada.o ftn.o cob.o
--LANGUAGES=		cc cxx ada sun_ada microfocus_cob make16 gdl1 sun_ftn
-+LANGUAGES=		cc cxx ada microfocus_cob make16 gdl1 sun_ftn
- LD_LIBS=		-lc
- LD_LIBS_J=		-lc
- LD_OPTS=		-shared
-@@ -104,28 +104,28 @@
- MUISQL_LINK_OPTS=	$(MUISQL_MU_LIB) $(PIPE_GDSSHR_LINK) -lm 
- PIC_FLAGS=		$(CFLAGS) -fPIC
- PIPE=			gds.a gds_pipe
--PYXIS=			pyxis
--PYXIS_MISC_OBJS=	$(PYXIS_MISC)
--PYXIS_P_MISC_OBJS=	$(PYXIS_P_MISC)
--PYXIS_OBJECTS=		pyxis_objects
--PYXIS_MISC_OBJECTS=	$(PYXDIR)cdm.o $(PYXDIR)vt100.o $(PYXDIR)sun_ftn_pyxis.o
-+PYXIS=
-+PYXIS_MISC_OBJS=
-+PYXIS_P_MISC_OBJS=
-+PYXIS_OBJECTS=
-+PYXIS_MISC_OBJECTS=
- REG_HELP=		isc_ins_hlp.dat
- REMOTE_GDSSHR=		$(GDSSHR)
- REMOTE_GDSSHR_LINK=	$(SERVER_LINK)
- REMOTE_P_OBJS=		rem_p_objects
--SCREEN_LIBS=
--#SCREEN_LIBS=		-lncurses
-+#SCREEN_LIBS=
-+SCREEN_LIBS=		-lncurses
- SERVER_LINK=		$(GDSSHR_LINK)
- SETUP_ISC=              ISC_USER=sysdba; ISC_PASSWORD=masterkey; export ISC_USER ISC_PASSWORD;
- SPECIAL_OPT=		source/special_opt
- NETWORK_LIB=		
- SOCKET_LIB=		-lc
--THREAD_LIB=		-llthread
-+THREAD_LIB=		-pthread
- SUN_FUNCSHR=		$(FUNCSHR)
- LX_SUPER_GDSSHR=		source/interbase/lib/gds.so.1
- SUPER_CLIENT_GDSSHR=    $(LX_SUPER_GDSSHR)
- SUPER_BACKEND=		source/jrd/gds_ss.a
--SUPER_LINK=		-Lsource/jrd -lgds_ss -lc -ldescrypt -L/usr/local/lib -llthread
-+SUPER_LINK=		-pthread -Lsource/jrd -lgds_ss -ldescrypt
- SUPER_SERVER=	
- UTILITIES=		
- WAL_P_OBJS=		wal_p_objects
diff --git a/databases/firebird/files/patch-jrd::gds.c b/databases/firebird/files/patch-jrd::gds.c
deleted file mode 100644
index 523abb725403..000000000000
--- a/databases/firebird/files/patch-jrd::gds.c
+++ /dev/null
@@ -1,24 +0,0 @@
---- jrd/gds.c.orig	Sat Mar  2 00:15:11 2002
-+++ jrd/gds.c	Sun Jul  7 14:27:44 2002
-@@ -159,7 +159,7 @@
-    engine and this change may imply side effect I haven't known 
-    about yet. Tomas Nejedlik (tomas@nejedlik.cz)
- */
--#if (defined(LINUX) && defined(SUPERCLIENT))
-+#if ((defined(LINUX) || defined(FREEBSD)) && defined(SUPERCLIENT))
- #define V4_THREADING
- #endif
- 
-@@ -3510,9 +3510,9 @@
- #else
- 	       (MAP_ANON | 
- #endif
--#if (!defined LINUX && !defined DARWIN)
--/* In LINUX, Solaris, and Darwin there is no such thing as MAP_VARIABLE. Hence, it gives 
--   compilation error. The equivalent functionality is default, 
-+#if (!defined LINUX && !defined DARWIN && !defined FREEBSD)
-+/* In LINUX, Solaris, FreeBSD and Darwin there is no such thing as MAP_VARIABLE.
-+   Hence, it gives compilation error. The equivalent functionality is default, 
-    if you do not specify MAP_FIXED */
- 		MAP_VARIABLE | 
- #endif  /* LINUX */
diff --git a/databases/firebird/files/patch-jrd::isc_file.c b/databases/firebird/files/patch-jrd::isc_file.c
deleted file mode 100644
index 7047f182d59c..000000000000
--- a/databases/firebird/files/patch-jrd::isc_file.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- jrd/isc_file.c.orig	Tue Dec 18 01:40:18 2001
-+++ jrd/isc_file.c	Sat Jul  6 18:04:55 2002
-@@ -106,6 +106,12 @@
- #define MTAB_CLOSE(stream)	ib_fclose (stream)
- #endif
- 
-+#ifdef FREEBSD
-+#define MTAB			"/etc/fstab"
-+#define MTAB_OPEN(path,type)	ib_fopen (path, type)
-+#define MTAB_CLOSE(stream)	ib_fclose (stream)
-+#endif 
-+
- #ifdef DARWIN
- #define MTAB			"/etc/fstab.hd" 
- #define MTAB_OPEN(path,type)	ib_fopen (path, type)
diff --git a/databases/firebird/files/patch-jrd::isc_sync.c b/databases/firebird/files/patch-jrd::isc_sync.c
deleted file mode 100644
index 19e327a1705f..000000000000
--- a/databases/firebird/files/patch-jrd::isc_sync.c
+++ /dev/null
@@ -1,38 +0,0 @@
---- jrd/isc_sync.c.orig	Tue Mar  5 21:11:25 2002
-+++ jrd/isc_sync.c	Sat Jul  6 18:06:30 2002
-@@ -1467,7 +1467,7 @@
-     pthread_mutex_init (event->event_mutex, pthread_mutexattr_default);
-     pthread_cond_init (event->event_semnum, pthread_condattr_default);
- #else
--#if (defined linux || defined DARWIN)
-+#if (defined linux || defined DARWIN || defined FREEBSD)
-     pthread_mutex_init (event->event_mutex, NULL);
-     pthread_cond_init (event->event_semnum, NULL);
- #else
-@@ -1596,7 +1596,7 @@
- #ifdef HP10
-     if (micro_seconds > 0 && (ret == -1) && (errno == EAGAIN))
- #else
--#if (defined linux || defined DARWIN)
-+#if (defined linux || defined DARWIN || defined FREEBSD)
-     if (micro_seconds > 0 && (ret == ETIMEDOUT))
- #else
-     if (micro_seconds > 0 && (ret == ETIME))
-@@ -5198,7 +5198,7 @@
-  **************************************/
- int	state;
- 
--#if (!defined HP10 && !defined linux && !defined DARWIN)
-+#if (!defined HP10 && !defined linux && !defined DARWIN && !defined FREEBSD)
- 
- pthread_mutexattr_t     mattr;
- 
-@@ -5218,7 +5218,7 @@
- 	 server (until we are to implement local IPC using shared
- 	 memory in which case we need interprocess thread sync.
- */
--#if (defined linux || defined DARWIN)
-+#if (defined linux || defined DARWIN || defined FREEBSD)
- return pthread_mutex_init (mutex->mtx_mutex, NULL);
- #else
- state = pthread_mutex_init (mutex->mtx_mutex, pthread_mutexattr_default);
diff --git a/databases/firebird/files/patch-jrd::jrd.h b/databases/firebird/files/patch-jrd::jrd.h
deleted file mode 100644
index 0a280080c74a..000000000000
--- a/databases/firebird/files/patch-jrd::jrd.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- jrd/jrd.h.orig	Tue May 14 19:01:06 2002
-+++ jrd/jrd.h	Tue May 14 19:23:44 2002
-@@ -717,7 +717,8 @@
- #ifdef MULTI_THREAD
- #if (defined APOLLO || defined DECOSF || defined NETWARE_386 || \
- 	defined NeXT || defined SOLARIS_MT || defined WIN_NT || \
--	defined OS2_ONLY || defined HP10 || defined LINUX || defined DARWIN)
-+	defined OS2_ONLY || defined HP10 || defined LINUX || \
-+	defined DARWIN || defined FREEBSD)
- #define PLATFORM_GET_THREAD_DATA ((TDBB) THD_get_specific())
- #endif
- #endif
diff --git a/databases/firebird/files/patch-jrd::thd.c b/databases/firebird/files/patch-jrd::thd.c
deleted file mode 100644
index a09c3fe4e1c3..000000000000
--- a/databases/firebird/files/patch-jrd::thd.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- jrd/thd.c.orig	Thu May 24 14:11:11 2001
-+++ jrd/thd.c	Sun Jul  7 14:52:07 2002
-@@ -2605,7 +2605,7 @@
- int 		detach_state=PTHREAD_CREATE_DETACHED
- #endif
- 
--#if ( !defined HP10 && !defined linux )
-+#if ( !defined HP10 && !defined linux && !defined FREEBSD )
- 
- state = pthread_attr_init (&pattr);
- if (state)
-@@ -2628,7 +2628,7 @@
- return state;
- 
- #else
--#ifdef linux
-+#if ( defined linux || defined FREEBSD )
- if (state = pthread_create (&thread, NULL, routine, arg))
-     return state;
- return pthread_detach (thread);
diff --git a/databases/firebird/files/patch-jrd::thd.h b/databases/firebird/files/patch-jrd::thd.h
deleted file mode 100644
index b4e74ecfbe59..000000000000
--- a/databases/firebird/files/patch-jrd::thd.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- jrd/thd.h.orig	Sat Mar  2 00:16:31 2002
-+++ jrd/thd.h	Mon May 13 19:10:37 2002
-@@ -98,6 +98,11 @@
- #define MULTI_THREAD		1
- #endif
- 
-+#if (defined(FREEBSD) && defined(SUPERSERVER))
-+#define POSIX_THREADS		1
-+#define MULTI_THREAD		1
-+#endif
-+
- #ifdef VMS
- #ifndef GATEWAY
- #define MULTI_THREAD		1
diff --git a/databases/firebird/files/patch-lock::lock.h b/databases/firebird/files/patch-lock::lock.h
deleted file mode 100644
index fe7ad684d99e..000000000000
--- a/databases/firebird/files/patch-lock::lock.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- lock/lock.h.orig	Wed Jun  6 05:43:58 2001
-+++ lock/lock.h	Sat Jul  6 18:08:56 2002
-@@ -65,8 +65,10 @@
- #ifndef SOLARIS_MT
- #if !(defined(HP10) && defined(SUPERSERVER))
- #if !(defined(LINUX) && defined(SUPERSERVER))
-+#if !(defined(FREEBSD) && defined(SUPERSERVER))
- #ifndef DARWIN
- #define MANAGER_PROCESS
-+#endif
- #endif
- #endif
- #endif
diff --git a/databases/firebird/files/patch-porting::qli::help.c b/databases/firebird/files/patch-porting::qli::help.c
deleted file mode 100644
index c6dbdcae0efe..000000000000
--- a/databases/firebird/files/patch-porting::qli::help.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- porting/qli/help.c.orig	Tue Mar 12 00:37:07 2002
-+++ porting/qli/help.c	Fri Nov 22 17:32:40 2002
-@@ -289,7 +289,7 @@
- 		  isc_25.isc_26))
- 	continue;
-     if (++topics == 1 && banner)
--	ib_printf ("%s\n", banner, string, parent);
-+	ib_printf ("%s%s%s\n", banner, string, parent);
-     p = line + ((ptr - line + COLUMN_WIDTH - 1) / COLUMN_WIDTH) * COLUMN_WIDTH;
-     if (p + l > line + RIGHT_MARGIN)
- 	{
diff --git a/databases/firebird/files/patch-remote::remote.h b/databases/firebird/files/patch-remote::remote.h
deleted file mode 100644
index 2c3fa59fe04e..000000000000
--- a/databases/firebird/files/patch-remote::remote.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- remote/remote.h	2002/10/21 13:03:48	1.1
-+++ remote/remote.h	2002/10/21 13:04:15
-@@ -47,6 +47,7 @@
- #endif
- #ifndef WINDOWS_ONLY
- #include <fcntl.h>
-+#include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/ioctl.h>
- #endif /* WINDOWS_ONLY */
diff --git a/databases/firebird/pkg-plist b/databases/firebird/pkg-plist
index 4108b6237053..97eceac35721 100644
--- a/databases/firebird/pkg-plist
+++ b/databases/firebird/pkg-plist
@@ -64,10 +64,8 @@ firebird/lib/gds.a
 firebird/lib/gds.so
 firebird/lib/libgds.so
 firebird/lib/libgds.so.1
-firebird/lib/libgds_pyxis.a
 firebird/lib/libgds.a
 firebird/lib/libib_util.so
-firebird/lib/gds_pyxis.a
 firebird/help/help.gbak
 firebird/help/help.gdb
 firebird/bin/ibguard
@@ -87,7 +85,6 @@ firebird/bin/qli
 firebird/bin/gds_inet_server
 firebird/bin/gsplit
 firebird/bin/gstat
-firebird/bin/gds_relay
 firebird/bin/gsec
 firebird/bin/gbak
 firebird/misc/firebird.init.d.generic
diff --git a/databases/firebird2-server/Makefile b/databases/firebird2-server/Makefile
index c33948a765b8..b158cc63226a 100644
--- a/databases/firebird2-server/Makefile
+++ b/databases/firebird2-server/Makefile
@@ -6,21 +6,18 @@
 #
 
 PORTNAME=	firebird
-PORTVERSION=	1.0
-PORTREVISION=	2
+PORTVERSION=	1.0.2
 CATEGORIES=	databases
-MASTER_SITES=	http://firebird.sourceforge.net/download/ \
-		http://www.aims.com.au/chris/ \
-		${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}	\
+		http://www.aims.com.au/chris/firebird/
 MASTER_SITE_SUBDIR=firebird
-DISTFILES=	bootkit-1.0.0.796.tar.gz \
-		bootkit-freebsd-1.0.0.796.tar.gz \
+DISTFILES=	bootkit-1.0.2.908.tar.gz \
 		interbase0.9-4-v5examples.tar.gz \
-		Firebird-1.0.0.796.src.tar.gz
+		Firebird-1.0.2.908.src.tar.gz
 
 MAINTAINER=	chris@aims.com.au
 
-WRKSRC=		${WRKDIR}/firebird-1.0.0.796
+WRKSRC=		${WRKDIR}/firebird-1.0.2.908
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	%%PREFIX%%/firebird/lib
 MSG_FILE=	${PKGDIR}/pkg-message
@@ -31,20 +28,23 @@ ONLY_FOR_ARCHS=	i386
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} >= 500000
+MANUAL_PACKAGE_BUILD=	"Doesn't compile on NFS on -current"
+.endif
+
 do-extract:
 	@${MKDIR} ${WRKDIR}
 	@(								\
 	cd ${WRKDIR}; ${TAR} -zxf					\
-		 ${DISTDIR}/Firebird-1.0.0.796.src.tar.gz;		\
-	cd firebird-1.0.0.796;						\
-	${TAR} -zxf ${DISTDIR}/bootkit-1.0.0.796.tar.gz;		\
-	${TAR} -zxf ${DISTDIR}/bootkit-freebsd-1.0.0.796.tar.gz;	\
+		 ${DISTDIR}/Firebird-1.0.2.908.src.tar.gz;		\
+	cd firebird-1.0.2.908;						\
+	${TAR} -zxf ${DISTDIR}/bootkit-1.0.2.908.tar.gz;		\
 	${CP} -f msgs/msg.gbak misc/msg.gbak				\
 	)
 
 post-patch:
 	@${SED} 's|%%PREFIX%%|${PREFIX}|g' ${MSG_FILE} > ${PKGMESSAGE}
-.if ${OSVERSION} >= 500016 || ${OSVERSION} >= 430001
+.if ${OSVERSION} >= 430001 && ${OSVERSION} < 500000 || ${OSVERSION} >= 500016
 	@${REINPLACE_CMD} -e 's,\-ldescrypt,\-lcrypt,g' \
 		 ${WRKSRC}/builds/original/prefix.freebsd
 .else
@@ -53,16 +53,11 @@ post-patch:
 
 do-configure:
 	@(								\
-	cd ${WRKDIR}/firebird-1.0.0.796;				\
-	INTERBASE=${WRKDIR}/firebird-1.0.0.796/interbase; export INTERBASE; \
-	REFDBPATH=${WRKDIR}/firebird-1.0.0.796/refDatabases; export REFDBPATH; \
-	${SH} buildBootDatabases;					\
+	cd ${WRKDIR}/firebird-1.0.2.908;				\
+	INTERBASE=${WRKDIR}/firebird-1.0.2.908/interbase; export INTERBASE; \
+	REFDBPATH=${WRKDIR}/firebird-1.0.2.908/refDatabases; export REFDBPATH; \
 	NOPROMPT_SETUP=yes; export NOPROMPT_SETUP;			\
 	FIREBIRD_64_BIT_IO=yes; export FIREBIRD_64_BIT_IO;		\
-	${CAT} builds_win32/original/build_no.ksh | ${TR} -d '\r'	\
-		> builds_win32/original/build_no.ksh.fix;		\
-	${MV} -f builds_win32/original/build_no.ksh.fix			\
-		 builds_win32/original/build_no.ksh;			\
 	${SH} Configure.sh PROD FREEBSD;				\
 	)
 
@@ -70,14 +65,14 @@ do-build:
 	@(								\
 	${REINPLACE_CMD} -e 's,opt,usr,'				\
 		 ${WRKSRC}/firebird/install/linux/misc/ibmgr;		\
-	${LN} -sf ${WRKDIR}/firebird-1.0.0.796/refDatabases/jrd/isc.gdb	\
-		 ${WRKDIR}/firebird-1.0.0.796/interbase/isc4.gdb;	\
-	${LN} -sf ${WRKDIR}/firebird-1.0.0.796/refDatabases/msgs/msg.gdb \
-		 ${WRKDIR}/firebird-1.0.0.796/msg.gdb;			\
-	cd ${WRKDIR}/firebird-1.0.0.796;				\
-	INTERBASE=${WRKDIR}/firebird-1.0.0.796/interbase; export INTERBASE; \
-	REFDBPATH=${WRKDIR}/firebird-1.0.0.796/refDatabases; export REFDBPATH; \
-	${CP} ${PKGDIR}/files/buildit.sh ${WRKDIR}/firebird-1.0.0.796;	\
+	${LN} -sf ${WRKDIR}/firebird-1.0.2.908/refDatabases/jrd/isc.gdb	\
+		 ${WRKDIR}/firebird-1.0.2.908/interbase/isc4.gdb;	\
+	${LN} -sf ${WRKDIR}/firebird-1.0.2.908/refDatabases/msgs/msg.gdb \
+		 ${WRKDIR}/firebird-1.0.2.908/msg.gdb;			\
+	cd ${WRKDIR}/firebird-1.0.2.908;				\
+	INTERBASE=${WRKDIR}/firebird-1.0.2.908/interbase; export INTERBASE; \
+	REFDBPATH=${WRKDIR}/firebird-1.0.2.908/refDatabases; export REFDBPATH; \
+	${CP} ${PKGDIR}/files/buildit.sh ${WRKDIR}/firebird-1.0.2.908;	\
 	${SH} buildit.sh;						\
 	)
 
@@ -86,13 +81,14 @@ pre-install:
 
 do-install:
 	@(								\
-	cd ${WRKDIR}/firebird-1.0.0.796;				\
-	${RM} ${WRKDIR}/firebird-1.0.0.796/interbase/isc4_tmp.gdb || ${TRUE}; \
-	${RM} ${WRKDIR}/firebird-1.0.0.796/interbase/lib/gds.so.1 || ${TRUE}; \
+	cd ${WRKDIR}/firebird-1.0.2.908;				\
+	${RM} ${WRKDIR}/firebird-1.0.2.908/interbase/isc4_tmp.gdb || ${TRUE}; \
+	${RM} ${WRKDIR}/firebird-1.0.2.908/interbase/lib/gds.so.1 || ${TRUE}; \
 	${CP} /dev/null interbase/interbase.log;			\
 	${CP} -Rp interbase ${PREFIX}/firebird;				\
 	${RM} ${PREFIX}/firebird/install;				\
 	${RM} ${PREFIX}/firebird/lib/libgds.so.1.0;			\
+	${RM} ${PREFIX}/firebird/lib/libgds_pyxis.a;			\
 	${LN} -fs gds.so ${PREFIX}/firebird/lib/libgds.so.1;		\
 	cd ${PREFIX}/firebird/examples;					\
 	${TAR} -xzf ${DISTDIR}/interbase0.9-4-v5examples.tar.gz;	\
diff --git a/databases/firebird2-server/distinfo b/databases/firebird2-server/distinfo
index dfdff30e23a3..349366a11efb 100644
--- a/databases/firebird2-server/distinfo
+++ b/databases/firebird2-server/distinfo
@@ -1,4 +1,3 @@
-MD5 (bootkit-1.0.0.796.tar.gz) = edcabe09957ed10b12e2f44eac9ae155
-MD5 (bootkit-freebsd-1.0.0.796.tar.gz) = 95bd14ec76bcf2b4ed41e3253ed58847
+MD5 (bootkit-1.0.2.908.tar.gz) = 3ce1d058d568242843fa0f92d5ae7018
 MD5 (interbase0.9-4-v5examples.tar.gz) = 17cba82bbf5066d515f2dee97bf8327a
-MD5 (Firebird-1.0.0.796.src.tar.gz) = 53bfebb4a269eb0f3c508587a843ddf8
+MD5 (Firebird-1.0.2.908.src.tar.gz) = 8ca9aac6cfe2670659d00bb2decb3456
diff --git a/databases/firebird2-server/files/RELNOTES b/databases/firebird2-server/files/RELNOTES
index a452990122ee..607bc697877a 100644
--- a/databases/firebird2-server/files/RELNOTES
+++ b/databases/firebird2-server/files/RELNOTES
@@ -1,6 +1,6 @@
-Firebird 1.0.0 FreeBSD Release Notes                    10-Nov-2002
+Firebird 1.0.2 FreeBSD Release Notes                    05-Jan-2003
 --------------------------------------
-FB-T6.2.796 Firebird Final Release
+FB-T6.2.908 Firebird Final Release
 
 Welcome to the FreeBSD Firebird port!  Users should note that there
 was a package called `firebird-1.0.tgz' released in mid-August
diff --git a/databases/firebird2-server/files/patch-ad b/databases/firebird2-server/files/patch-ad
deleted file mode 100644
index 4bcb2c1ce13c..000000000000
--- a/databases/firebird2-server/files/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
---- setup_dirs.orig	Tue Aug  7 05:00:12 2001
-+++ setup_dirs	Fri Dec 28 16:12:49 2001
-@@ -60,7 +60,8 @@
-     DefaultAns=$2
-     echo -n "${1}"
-     Answer="$DefaultAns"
--    read Answer 
-+#    read Answer 
-+    echo ""
- }
- 
- 
diff --git a/databases/firebird2-server/files/patch-ae b/databases/firebird2-server/files/patch-ae
index 2b26792352f1..1e857e24cd6e 100644
--- a/databases/firebird2-server/files/patch-ae
+++ b/databases/firebird2-server/files/patch-ae
@@ -1,18 +1,11 @@
---- jrd/common.h.orig	Thu Dec  6 05:06:37 2001
-+++ jrd/common.h	Wed Nov 13 11:47:17 2002
-@@ -148,6 +148,7 @@
- /* FreeBSD for Intel platforms */
- #ifdef FREEBSD
- 
-+#define UNIX_64_BIT_IO
- #define FB_ALIGN(n,b) ((n + b - 1) & ~(b - 1))
- #define ALIGNMENT     4
- #define DOUBLE_ALIGN  4
-@@ -164,6 +165,7 @@
- #define QUADCONST(n) (n##LL)
- #define KILLER_SIGNALS
- #define MMAP_SUPPORTED
-+#define MAP_ANONYMOUS
- #define SIGACTION_SUPPORTED
- #define NO_NFS        /* no MTAB_OPEN or MTAB_CLOSE in isc_file.c */
+--- jrd/common.h.orig	Wed Nov 13 11:44:27 2002
++++ jrd/common.h	Sun Jan  5 16:49:05 2003
+@@ -204,7 +204,7 @@
+ #define I386  1
+ #define VAX   1
+ #define IMPLEMENTATION    isc_info_db_impl_freebsd   /* 61 */
+-#define SETPGRP         setpgrp ()
++#define SETPGRP         setpgrp (0, 0)
+ #define ATEXIT(c)       atexit(c)
  
+ #define QUADFORMAT "ll"
diff --git a/databases/firebird2-server/files/patch-builds::original::boot.sfx.interbase b/databases/firebird2-server/files/patch-builds::original::boot.sfx.interbase
index 62d0b483a07d..332ce0cdf136 100644
--- a/databases/firebird2-server/files/patch-builds::original::boot.sfx.interbase
+++ b/databases/firebird2-server/files/patch-builds::original::boot.sfx.interbase
@@ -1,6 +1,6 @@
---- builds/original/boot.sfx.interbase.orig	Tue Dec 18 01:40:08 2001
-+++ builds/original/boot.sfx.interbase	Sat Nov  9 17:44:54 2002
-@@ -68,7 +68,7 @@
+--- builds/original/boot.sfx.interbase.orig	Sun Oct 13 17:12:41 2002
++++ builds/original/boot.sfx.interbase	Fri Jan 10 10:34:43 2003
+@@ -70,7 +70,7 @@
  #added completed according to inprise tree
  #FSG  093000
  
@@ -9,25 +9,16 @@
  
  #  burp wanted to build gpre	
  #  we break this dependency
-@@ -159,14 +159,14 @@
- # 1995-June-7 David Schnepper 
- # removed pyxis 3-Aug-00 TMC
- #executables:	alice burp dudley gpre miscFiles $(INTL) isql locks \
--	$(SUPER_SERVER)  qli remote spit utilities \
--	$(SHARED_AM) $(LINKABLE_LIBS)
-+#	$(SUPER_SERVER)  qli remote spit utilities \
-+#	$(SHARED_AM) $(LINKABLE_LIBS)
- 	
- executables:    alice dudley miscFiles $(INTL) isql locks \
+@@ -169,7 +169,7 @@
  	$(SUPER_SERVER)  qli remote spit utilities \
  	$(SHARED_AM) $(LINKABLE_LIBS)
  
 -super_firebird: gds.h includes fireboot super_targets dudley superMiscFiles $(INTL) isql locks qli remote spit help msgs msgs_intl dba gfix gsec security_db extlib examples completed
-+super_firebird: gds.h includes fireboot super_targets dudley superMiscFiles $(INTL) isql locks qli remote spit help msgs msgs_intl dba gfix relay gsec security_db extlib completed
++super_firebird: gds.h includes fireboot super_targets dudley superMiscFiles $(INTL) isql locks qli remote spit help msgs msgs_intl dba gfix gsec security_db extlib completed
  
  super_targets: 	s_run_codes s_alice s_burp s_dba s_security_c super_client super_server super_utils 
  
-@@ -195,7 +195,7 @@
+@@ -199,7 +199,7 @@
  
  super_client:		force
  	$(QUIET_ECHO) "Building super/client..."
diff --git a/databases/firebird2-server/files/patch-builds::original::prefix.freebsd b/databases/firebird2-server/files/patch-builds::original::prefix.freebsd
index ec8d8343f61d..8a9d5319dba6 100644
--- a/databases/firebird2-server/files/patch-builds::original::prefix.freebsd
+++ b/databases/firebird2-server/files/patch-builds::original::prefix.freebsd
@@ -1,102 +1,11 @@
---- builds/original/prefix.freebsd.orig	Sat Jan 13 05:18:13 2001
-+++ builds/original/prefix.freebsd	Sat Nov  9 16:49:17 2002
-@@ -28,20 +28,20 @@
- 
- 
+--- builds/original/prefix.freebsd.orig	Sun Oct 13 17:12:42 2002
++++ builds/original/prefix.freebsd	Fri Jan 10 13:00:32 2003
+@@ -30,7 +30,7 @@
  PROD_DEBUG_OBJECTS=	nodebug.o
--PROD_SHRLIB_DIR=	-Lsource/jrd
-+PROD_SHRLIB_DIR=	-Lsource/jrd -Lsource/interbase/lib
+ PROD_SHRLIB_DIR=	-Lsource/jrd -Lsource/interbase/lib
  PROD_VERSION_FLAG=	-DPROD_BUILD
 -PROD_CFLAGS=            -O -m486 -fpic -DFLINTSTONE
-+PROD_CFLAGS=            -O -pipe -march=i486 -fpic -DFLINTSTONE
++PROD_CFLAGS=		-O -pipe -march=i486 -fpic -DFLINTSTONE
  
  
  DEV_DEBUG_OBJECTS=	grammar.o dbg.o dbt.o dmp.o
--DEV_SHRLIB_DIR=		-Lsource/jrd
-+DEV_SHRLIB_DIR=		-Lsource/jrd -Lsource/interbase/lib
- DEV_VERSION_FLAG=	-DDEV_BUILD
- DEV_CFLAGS=		-ggdb
- 
- DEBUG_OBJECTS=		$($(VERSION)_DEBUG_OBJECTS)
- SHRLIB_DIR=		$($(VERSION)_SHRLIB_DIR)
- VERSION_FLAG=		$($(VERSION)_VERSION_FLAG)
--CFLAGS_COMMON=		$($(VERSION)_CFLAGS)  -Isource/interbase/include -DFREEBSD -w -fwritable-strings
-+CFLAGS_COMMON=		$($(VERSION)_CFLAGS) -DFREEBSD -w -fwritable-strings -Isource/interbase/include 
- CFLAGS=			$(CFLAGS_COMMON) $(SUPER_FLAG)
- PIC_J_CFLAGS=		$(CFLAGS_COMMON) -DPIPE_IS_SHRLIB -fPIC
- SPECIAL_OBJECTS=	j
-@@ -62,21 +62,21 @@
- BIN_PATH=		interbase/bin
- BRIDGE_MISC=		head5.o allp.o
- CHMOD_VAL=		666
--CURSES_LIB=             -lncurses
-+CURSES_LIB=
- DSQL_P_OBJS=		dsql_p_objects
--FORM_OBJECTS=		form.o
--FORM_TRN_OBJECTS=	form_trn.o
-+FORM_OBJECTS=		noform.o
-+FORM_TRN_OBJECTS=
- FUNCTIONS=		functions.bin
- FUNCSHR=		source/interbase/lib/gdsf.so
- GDS_LINK=		$(GDSSHR_LINK)
--GDS_PYXIS=		gds_pyxis.a
-+GDS_PYXIS=
- GDSLIB_BACKEND=		source/interbase/lib/gds_b.a
- GDSLIB_LINK=		-Lsource/jrd -lgds_b -lc -ldescrypt
- 
- GDSSHR=			source/interbase/lib/gds.so
- LINUX_GDSSHR=		$(GDSSHR)
--GDSSHR_LINK=		$(SHRLIB_DIR) -lgds -lgds_pyxis -ldescrypt
--PIPE_GDSSHR_LINK=	$(SHRLIB_DIR) -lgds -lgds_pyxis
-+GDSSHR_LINK=		$(SHRLIB_DIR) -lgds -ldescrypt
-+PIPE_GDSSHR_LINK=	$(SHRLIB_DIR) -lgds
- HLPDIR=			source/qli/
- HOSTNAME=		`hostname | cut -d'.' -f1`
- INCLUDES=		include_so include_so_ada	
-@@ -92,7 +92,7 @@
- JRD_J_MISC_OBJECTS=	source/jrd/sun_ftn.j 
- JRD_P_MISC_OBJECTS=	source/jrd/sun_ftn.bin source/jrd/nodebug.bin
- LANG_OBJECTS=		ada.o ftn.o cob.o
--LANGUAGES=		cc cxx ada sun_ada microfocus_cob make16 gdl1 sun_ftn
-+LANGUAGES=		cc cxx ada microfocus_cob make16 gdl1 sun_ftn
- LD_LIBS=		-lc
- LD_LIBS_J=		-lc
- LD_OPTS=		-shared
-@@ -104,28 +104,28 @@
- MUISQL_LINK_OPTS=	$(MUISQL_MU_LIB) $(PIPE_GDSSHR_LINK) -lm 
- PIC_FLAGS=		$(CFLAGS) -fPIC
- PIPE=			gds.a gds_pipe
--PYXIS=			pyxis
--PYXIS_MISC_OBJS=	$(PYXIS_MISC)
--PYXIS_P_MISC_OBJS=	$(PYXIS_P_MISC)
--PYXIS_OBJECTS=		pyxis_objects
--PYXIS_MISC_OBJECTS=	$(PYXDIR)cdm.o $(PYXDIR)vt100.o $(PYXDIR)sun_ftn_pyxis.o
-+PYXIS=
-+PYXIS_MISC_OBJS=
-+PYXIS_P_MISC_OBJS=
-+PYXIS_OBJECTS=
-+PYXIS_MISC_OBJECTS=
- REG_HELP=		isc_ins_hlp.dat
- REMOTE_GDSSHR=		$(GDSSHR)
- REMOTE_GDSSHR_LINK=	$(SERVER_LINK)
- REMOTE_P_OBJS=		rem_p_objects
--SCREEN_LIBS=
--#SCREEN_LIBS=		-lncurses
-+#SCREEN_LIBS=
-+SCREEN_LIBS=		-lncurses
- SERVER_LINK=		$(GDSSHR_LINK)
- SETUP_ISC=              ISC_USER=sysdba; ISC_PASSWORD=masterkey; export ISC_USER ISC_PASSWORD;
- SPECIAL_OPT=		source/special_opt
- NETWORK_LIB=		
- SOCKET_LIB=		-lc
--THREAD_LIB=		-llthread
-+THREAD_LIB=		-pthread
- SUN_FUNCSHR=		$(FUNCSHR)
- LX_SUPER_GDSSHR=		source/interbase/lib/gds.so.1
- SUPER_CLIENT_GDSSHR=    $(LX_SUPER_GDSSHR)
- SUPER_BACKEND=		source/jrd/gds_ss.a
--SUPER_LINK=		-Lsource/jrd -lgds_ss -lc -ldescrypt -L/usr/local/lib -llthread
-+SUPER_LINK=		-pthread -Lsource/jrd -lgds_ss -ldescrypt
- SUPER_SERVER=	
- UTILITIES=		
- WAL_P_OBJS=		wal_p_objects
diff --git a/databases/firebird2-server/files/patch-jrd::gds.c b/databases/firebird2-server/files/patch-jrd::gds.c
deleted file mode 100644
index 523abb725403..000000000000
--- a/databases/firebird2-server/files/patch-jrd::gds.c
+++ /dev/null
@@ -1,24 +0,0 @@
---- jrd/gds.c.orig	Sat Mar  2 00:15:11 2002
-+++ jrd/gds.c	Sun Jul  7 14:27:44 2002
-@@ -159,7 +159,7 @@
-    engine and this change may imply side effect I haven't known 
-    about yet. Tomas Nejedlik (tomas@nejedlik.cz)
- */
--#if (defined(LINUX) && defined(SUPERCLIENT))
-+#if ((defined(LINUX) || defined(FREEBSD)) && defined(SUPERCLIENT))
- #define V4_THREADING
- #endif
- 
-@@ -3510,9 +3510,9 @@
- #else
- 	       (MAP_ANON | 
- #endif
--#if (!defined LINUX && !defined DARWIN)
--/* In LINUX, Solaris, and Darwin there is no such thing as MAP_VARIABLE. Hence, it gives 
--   compilation error. The equivalent functionality is default, 
-+#if (!defined LINUX && !defined DARWIN && !defined FREEBSD)
-+/* In LINUX, Solaris, FreeBSD and Darwin there is no such thing as MAP_VARIABLE.
-+   Hence, it gives compilation error. The equivalent functionality is default, 
-    if you do not specify MAP_FIXED */
- 		MAP_VARIABLE | 
- #endif  /* LINUX */
diff --git a/databases/firebird2-server/files/patch-jrd::isc_file.c b/databases/firebird2-server/files/patch-jrd::isc_file.c
deleted file mode 100644
index 7047f182d59c..000000000000
--- a/databases/firebird2-server/files/patch-jrd::isc_file.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- jrd/isc_file.c.orig	Tue Dec 18 01:40:18 2001
-+++ jrd/isc_file.c	Sat Jul  6 18:04:55 2002
-@@ -106,6 +106,12 @@
- #define MTAB_CLOSE(stream)	ib_fclose (stream)
- #endif
- 
-+#ifdef FREEBSD
-+#define MTAB			"/etc/fstab"
-+#define MTAB_OPEN(path,type)	ib_fopen (path, type)
-+#define MTAB_CLOSE(stream)	ib_fclose (stream)
-+#endif 
-+
- #ifdef DARWIN
- #define MTAB			"/etc/fstab.hd" 
- #define MTAB_OPEN(path,type)	ib_fopen (path, type)
diff --git a/databases/firebird2-server/files/patch-jrd::isc_sync.c b/databases/firebird2-server/files/patch-jrd::isc_sync.c
deleted file mode 100644
index 19e327a1705f..000000000000
--- a/databases/firebird2-server/files/patch-jrd::isc_sync.c
+++ /dev/null
@@ -1,38 +0,0 @@
---- jrd/isc_sync.c.orig	Tue Mar  5 21:11:25 2002
-+++ jrd/isc_sync.c	Sat Jul  6 18:06:30 2002
-@@ -1467,7 +1467,7 @@
-     pthread_mutex_init (event->event_mutex, pthread_mutexattr_default);
-     pthread_cond_init (event->event_semnum, pthread_condattr_default);
- #else
--#if (defined linux || defined DARWIN)
-+#if (defined linux || defined DARWIN || defined FREEBSD)
-     pthread_mutex_init (event->event_mutex, NULL);
-     pthread_cond_init (event->event_semnum, NULL);
- #else
-@@ -1596,7 +1596,7 @@
- #ifdef HP10
-     if (micro_seconds > 0 && (ret == -1) && (errno == EAGAIN))
- #else
--#if (defined linux || defined DARWIN)
-+#if (defined linux || defined DARWIN || defined FREEBSD)
-     if (micro_seconds > 0 && (ret == ETIMEDOUT))
- #else
-     if (micro_seconds > 0 && (ret == ETIME))
-@@ -5198,7 +5198,7 @@
-  **************************************/
- int	state;
- 
--#if (!defined HP10 && !defined linux && !defined DARWIN)
-+#if (!defined HP10 && !defined linux && !defined DARWIN && !defined FREEBSD)
- 
- pthread_mutexattr_t     mattr;
- 
-@@ -5218,7 +5218,7 @@
- 	 server (until we are to implement local IPC using shared
- 	 memory in which case we need interprocess thread sync.
- */
--#if (defined linux || defined DARWIN)
-+#if (defined linux || defined DARWIN || defined FREEBSD)
- return pthread_mutex_init (mutex->mtx_mutex, NULL);
- #else
- state = pthread_mutex_init (mutex->mtx_mutex, pthread_mutexattr_default);
diff --git a/databases/firebird2-server/files/patch-jrd::jrd.h b/databases/firebird2-server/files/patch-jrd::jrd.h
deleted file mode 100644
index 0a280080c74a..000000000000
--- a/databases/firebird2-server/files/patch-jrd::jrd.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- jrd/jrd.h.orig	Tue May 14 19:01:06 2002
-+++ jrd/jrd.h	Tue May 14 19:23:44 2002
-@@ -717,7 +717,8 @@
- #ifdef MULTI_THREAD
- #if (defined APOLLO || defined DECOSF || defined NETWARE_386 || \
- 	defined NeXT || defined SOLARIS_MT || defined WIN_NT || \
--	defined OS2_ONLY || defined HP10 || defined LINUX || defined DARWIN)
-+	defined OS2_ONLY || defined HP10 || defined LINUX || \
-+	defined DARWIN || defined FREEBSD)
- #define PLATFORM_GET_THREAD_DATA ((TDBB) THD_get_specific())
- #endif
- #endif
diff --git a/databases/firebird2-server/files/patch-jrd::thd.c b/databases/firebird2-server/files/patch-jrd::thd.c
deleted file mode 100644
index a09c3fe4e1c3..000000000000
--- a/databases/firebird2-server/files/patch-jrd::thd.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- jrd/thd.c.orig	Thu May 24 14:11:11 2001
-+++ jrd/thd.c	Sun Jul  7 14:52:07 2002
-@@ -2605,7 +2605,7 @@
- int 		detach_state=PTHREAD_CREATE_DETACHED
- #endif
- 
--#if ( !defined HP10 && !defined linux )
-+#if ( !defined HP10 && !defined linux && !defined FREEBSD )
- 
- state = pthread_attr_init (&pattr);
- if (state)
-@@ -2628,7 +2628,7 @@
- return state;
- 
- #else
--#ifdef linux
-+#if ( defined linux || defined FREEBSD )
- if (state = pthread_create (&thread, NULL, routine, arg))
-     return state;
- return pthread_detach (thread);
diff --git a/databases/firebird2-server/files/patch-jrd::thd.h b/databases/firebird2-server/files/patch-jrd::thd.h
deleted file mode 100644
index b4e74ecfbe59..000000000000
--- a/databases/firebird2-server/files/patch-jrd::thd.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- jrd/thd.h.orig	Sat Mar  2 00:16:31 2002
-+++ jrd/thd.h	Mon May 13 19:10:37 2002
-@@ -98,6 +98,11 @@
- #define MULTI_THREAD		1
- #endif
- 
-+#if (defined(FREEBSD) && defined(SUPERSERVER))
-+#define POSIX_THREADS		1
-+#define MULTI_THREAD		1
-+#endif
-+
- #ifdef VMS
- #ifndef GATEWAY
- #define MULTI_THREAD		1
diff --git a/databases/firebird2-server/files/patch-lock::lock.h b/databases/firebird2-server/files/patch-lock::lock.h
deleted file mode 100644
index fe7ad684d99e..000000000000
--- a/databases/firebird2-server/files/patch-lock::lock.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- lock/lock.h.orig	Wed Jun  6 05:43:58 2001
-+++ lock/lock.h	Sat Jul  6 18:08:56 2002
-@@ -65,8 +65,10 @@
- #ifndef SOLARIS_MT
- #if !(defined(HP10) && defined(SUPERSERVER))
- #if !(defined(LINUX) && defined(SUPERSERVER))
-+#if !(defined(FREEBSD) && defined(SUPERSERVER))
- #ifndef DARWIN
- #define MANAGER_PROCESS
-+#endif
- #endif
- #endif
- #endif
diff --git a/databases/firebird2-server/files/patch-porting::qli::help.c b/databases/firebird2-server/files/patch-porting::qli::help.c
deleted file mode 100644
index c6dbdcae0efe..000000000000
--- a/databases/firebird2-server/files/patch-porting::qli::help.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- porting/qli/help.c.orig	Tue Mar 12 00:37:07 2002
-+++ porting/qli/help.c	Fri Nov 22 17:32:40 2002
-@@ -289,7 +289,7 @@
- 		  isc_25.isc_26))
- 	continue;
-     if (++topics == 1 && banner)
--	ib_printf ("%s\n", banner, string, parent);
-+	ib_printf ("%s%s%s\n", banner, string, parent);
-     p = line + ((ptr - line + COLUMN_WIDTH - 1) / COLUMN_WIDTH) * COLUMN_WIDTH;
-     if (p + l > line + RIGHT_MARGIN)
- 	{
diff --git a/databases/firebird2-server/files/patch-remote::remote.h b/databases/firebird2-server/files/patch-remote::remote.h
deleted file mode 100644
index 2c3fa59fe04e..000000000000
--- a/databases/firebird2-server/files/patch-remote::remote.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- remote/remote.h	2002/10/21 13:03:48	1.1
-+++ remote/remote.h	2002/10/21 13:04:15
-@@ -47,6 +47,7 @@
- #endif
- #ifndef WINDOWS_ONLY
- #include <fcntl.h>
-+#include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/ioctl.h>
- #endif /* WINDOWS_ONLY */
diff --git a/databases/firebird2-server/pkg-plist b/databases/firebird2-server/pkg-plist
index 4108b6237053..97eceac35721 100644
--- a/databases/firebird2-server/pkg-plist
+++ b/databases/firebird2-server/pkg-plist
@@ -64,10 +64,8 @@ firebird/lib/gds.a
 firebird/lib/gds.so
 firebird/lib/libgds.so
 firebird/lib/libgds.so.1
-firebird/lib/libgds_pyxis.a
 firebird/lib/libgds.a
 firebird/lib/libib_util.so
-firebird/lib/gds_pyxis.a
 firebird/help/help.gbak
 firebird/help/help.gdb
 firebird/bin/ibguard
@@ -87,7 +85,6 @@ firebird/bin/qli
 firebird/bin/gds_inet_server
 firebird/bin/gsplit
 firebird/bin/gstat
-firebird/bin/gds_relay
 firebird/bin/gsec
 firebird/bin/gbak
 firebird/misc/firebird.init.d.generic
diff --git a/databases/firebird20-server/Makefile b/databases/firebird20-server/Makefile
index c33948a765b8..b158cc63226a 100644
--- a/databases/firebird20-server/Makefile
+++ b/databases/firebird20-server/Makefile
@@ -6,21 +6,18 @@
 #
 
 PORTNAME=	firebird
-PORTVERSION=	1.0
-PORTREVISION=	2
+PORTVERSION=	1.0.2
 CATEGORIES=	databases
-MASTER_SITES=	http://firebird.sourceforge.net/download/ \
-		http://www.aims.com.au/chris/ \
-		${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}	\
+		http://www.aims.com.au/chris/firebird/
 MASTER_SITE_SUBDIR=firebird
-DISTFILES=	bootkit-1.0.0.796.tar.gz \
-		bootkit-freebsd-1.0.0.796.tar.gz \
+DISTFILES=	bootkit-1.0.2.908.tar.gz \
 		interbase0.9-4-v5examples.tar.gz \
-		Firebird-1.0.0.796.src.tar.gz
+		Firebird-1.0.2.908.src.tar.gz
 
 MAINTAINER=	chris@aims.com.au
 
-WRKSRC=		${WRKDIR}/firebird-1.0.0.796
+WRKSRC=		${WRKDIR}/firebird-1.0.2.908
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	%%PREFIX%%/firebird/lib
 MSG_FILE=	${PKGDIR}/pkg-message
@@ -31,20 +28,23 @@ ONLY_FOR_ARCHS=	i386
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} >= 500000
+MANUAL_PACKAGE_BUILD=	"Doesn't compile on NFS on -current"
+.endif
+
 do-extract:
 	@${MKDIR} ${WRKDIR}
 	@(								\
 	cd ${WRKDIR}; ${TAR} -zxf					\
-		 ${DISTDIR}/Firebird-1.0.0.796.src.tar.gz;		\
-	cd firebird-1.0.0.796;						\
-	${TAR} -zxf ${DISTDIR}/bootkit-1.0.0.796.tar.gz;		\
-	${TAR} -zxf ${DISTDIR}/bootkit-freebsd-1.0.0.796.tar.gz;	\
+		 ${DISTDIR}/Firebird-1.0.2.908.src.tar.gz;		\
+	cd firebird-1.0.2.908;						\
+	${TAR} -zxf ${DISTDIR}/bootkit-1.0.2.908.tar.gz;		\
 	${CP} -f msgs/msg.gbak misc/msg.gbak				\
 	)
 
 post-patch:
 	@${SED} 's|%%PREFIX%%|${PREFIX}|g' ${MSG_FILE} > ${PKGMESSAGE}
-.if ${OSVERSION} >= 500016 || ${OSVERSION} >= 430001
+.if ${OSVERSION} >= 430001 && ${OSVERSION} < 500000 || ${OSVERSION} >= 500016
 	@${REINPLACE_CMD} -e 's,\-ldescrypt,\-lcrypt,g' \
 		 ${WRKSRC}/builds/original/prefix.freebsd
 .else
@@ -53,16 +53,11 @@ post-patch:
 
 do-configure:
 	@(								\
-	cd ${WRKDIR}/firebird-1.0.0.796;				\
-	INTERBASE=${WRKDIR}/firebird-1.0.0.796/interbase; export INTERBASE; \
-	REFDBPATH=${WRKDIR}/firebird-1.0.0.796/refDatabases; export REFDBPATH; \
-	${SH} buildBootDatabases;					\
+	cd ${WRKDIR}/firebird-1.0.2.908;				\
+	INTERBASE=${WRKDIR}/firebird-1.0.2.908/interbase; export INTERBASE; \
+	REFDBPATH=${WRKDIR}/firebird-1.0.2.908/refDatabases; export REFDBPATH; \
 	NOPROMPT_SETUP=yes; export NOPROMPT_SETUP;			\
 	FIREBIRD_64_BIT_IO=yes; export FIREBIRD_64_BIT_IO;		\
-	${CAT} builds_win32/original/build_no.ksh | ${TR} -d '\r'	\
-		> builds_win32/original/build_no.ksh.fix;		\
-	${MV} -f builds_win32/original/build_no.ksh.fix			\
-		 builds_win32/original/build_no.ksh;			\
 	${SH} Configure.sh PROD FREEBSD;				\
 	)
 
@@ -70,14 +65,14 @@ do-build:
 	@(								\
 	${REINPLACE_CMD} -e 's,opt,usr,'				\
 		 ${WRKSRC}/firebird/install/linux/misc/ibmgr;		\
-	${LN} -sf ${WRKDIR}/firebird-1.0.0.796/refDatabases/jrd/isc.gdb	\
-		 ${WRKDIR}/firebird-1.0.0.796/interbase/isc4.gdb;	\
-	${LN} -sf ${WRKDIR}/firebird-1.0.0.796/refDatabases/msgs/msg.gdb \
-		 ${WRKDIR}/firebird-1.0.0.796/msg.gdb;			\
-	cd ${WRKDIR}/firebird-1.0.0.796;				\
-	INTERBASE=${WRKDIR}/firebird-1.0.0.796/interbase; export INTERBASE; \
-	REFDBPATH=${WRKDIR}/firebird-1.0.0.796/refDatabases; export REFDBPATH; \
-	${CP} ${PKGDIR}/files/buildit.sh ${WRKDIR}/firebird-1.0.0.796;	\
+	${LN} -sf ${WRKDIR}/firebird-1.0.2.908/refDatabases/jrd/isc.gdb	\
+		 ${WRKDIR}/firebird-1.0.2.908/interbase/isc4.gdb;	\
+	${LN} -sf ${WRKDIR}/firebird-1.0.2.908/refDatabases/msgs/msg.gdb \
+		 ${WRKDIR}/firebird-1.0.2.908/msg.gdb;			\
+	cd ${WRKDIR}/firebird-1.0.2.908;				\
+	INTERBASE=${WRKDIR}/firebird-1.0.2.908/interbase; export INTERBASE; \
+	REFDBPATH=${WRKDIR}/firebird-1.0.2.908/refDatabases; export REFDBPATH; \
+	${CP} ${PKGDIR}/files/buildit.sh ${WRKDIR}/firebird-1.0.2.908;	\
 	${SH} buildit.sh;						\
 	)
 
@@ -86,13 +81,14 @@ pre-install:
 
 do-install:
 	@(								\
-	cd ${WRKDIR}/firebird-1.0.0.796;				\
-	${RM} ${WRKDIR}/firebird-1.0.0.796/interbase/isc4_tmp.gdb || ${TRUE}; \
-	${RM} ${WRKDIR}/firebird-1.0.0.796/interbase/lib/gds.so.1 || ${TRUE}; \
+	cd ${WRKDIR}/firebird-1.0.2.908;				\
+	${RM} ${WRKDIR}/firebird-1.0.2.908/interbase/isc4_tmp.gdb || ${TRUE}; \
+	${RM} ${WRKDIR}/firebird-1.0.2.908/interbase/lib/gds.so.1 || ${TRUE}; \
 	${CP} /dev/null interbase/interbase.log;			\
 	${CP} -Rp interbase ${PREFIX}/firebird;				\
 	${RM} ${PREFIX}/firebird/install;				\
 	${RM} ${PREFIX}/firebird/lib/libgds.so.1.0;			\
+	${RM} ${PREFIX}/firebird/lib/libgds_pyxis.a;			\
 	${LN} -fs gds.so ${PREFIX}/firebird/lib/libgds.so.1;		\
 	cd ${PREFIX}/firebird/examples;					\
 	${TAR} -xzf ${DISTDIR}/interbase0.9-4-v5examples.tar.gz;	\
diff --git a/databases/firebird20-server/distinfo b/databases/firebird20-server/distinfo
index dfdff30e23a3..349366a11efb 100644
--- a/databases/firebird20-server/distinfo
+++ b/databases/firebird20-server/distinfo
@@ -1,4 +1,3 @@
-MD5 (bootkit-1.0.0.796.tar.gz) = edcabe09957ed10b12e2f44eac9ae155
-MD5 (bootkit-freebsd-1.0.0.796.tar.gz) = 95bd14ec76bcf2b4ed41e3253ed58847
+MD5 (bootkit-1.0.2.908.tar.gz) = 3ce1d058d568242843fa0f92d5ae7018
 MD5 (interbase0.9-4-v5examples.tar.gz) = 17cba82bbf5066d515f2dee97bf8327a
-MD5 (Firebird-1.0.0.796.src.tar.gz) = 53bfebb4a269eb0f3c508587a843ddf8
+MD5 (Firebird-1.0.2.908.src.tar.gz) = 8ca9aac6cfe2670659d00bb2decb3456
diff --git a/databases/firebird20-server/files/RELNOTES b/databases/firebird20-server/files/RELNOTES
index a452990122ee..607bc697877a 100644
--- a/databases/firebird20-server/files/RELNOTES
+++ b/databases/firebird20-server/files/RELNOTES
@@ -1,6 +1,6 @@
-Firebird 1.0.0 FreeBSD Release Notes                    10-Nov-2002
+Firebird 1.0.2 FreeBSD Release Notes                    05-Jan-2003
 --------------------------------------
-FB-T6.2.796 Firebird Final Release
+FB-T6.2.908 Firebird Final Release
 
 Welcome to the FreeBSD Firebird port!  Users should note that there
 was a package called `firebird-1.0.tgz' released in mid-August
diff --git a/databases/firebird20-server/files/patch-ad b/databases/firebird20-server/files/patch-ad
deleted file mode 100644
index 4bcb2c1ce13c..000000000000
--- a/databases/firebird20-server/files/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
---- setup_dirs.orig	Tue Aug  7 05:00:12 2001
-+++ setup_dirs	Fri Dec 28 16:12:49 2001
-@@ -60,7 +60,8 @@
-     DefaultAns=$2
-     echo -n "${1}"
-     Answer="$DefaultAns"
--    read Answer 
-+#    read Answer 
-+    echo ""
- }
- 
- 
diff --git a/databases/firebird20-server/files/patch-ae b/databases/firebird20-server/files/patch-ae
index 2b26792352f1..1e857e24cd6e 100644
--- a/databases/firebird20-server/files/patch-ae
+++ b/databases/firebird20-server/files/patch-ae
@@ -1,18 +1,11 @@
---- jrd/common.h.orig	Thu Dec  6 05:06:37 2001
-+++ jrd/common.h	Wed Nov 13 11:47:17 2002
-@@ -148,6 +148,7 @@
- /* FreeBSD for Intel platforms */
- #ifdef FREEBSD
- 
-+#define UNIX_64_BIT_IO
- #define FB_ALIGN(n,b) ((n + b - 1) & ~(b - 1))
- #define ALIGNMENT     4
- #define DOUBLE_ALIGN  4
-@@ -164,6 +165,7 @@
- #define QUADCONST(n) (n##LL)
- #define KILLER_SIGNALS
- #define MMAP_SUPPORTED
-+#define MAP_ANONYMOUS
- #define SIGACTION_SUPPORTED
- #define NO_NFS        /* no MTAB_OPEN or MTAB_CLOSE in isc_file.c */
+--- jrd/common.h.orig	Wed Nov 13 11:44:27 2002
++++ jrd/common.h	Sun Jan  5 16:49:05 2003
+@@ -204,7 +204,7 @@
+ #define I386  1
+ #define VAX   1
+ #define IMPLEMENTATION    isc_info_db_impl_freebsd   /* 61 */
+-#define SETPGRP         setpgrp ()
++#define SETPGRP         setpgrp (0, 0)
+ #define ATEXIT(c)       atexit(c)
  
+ #define QUADFORMAT "ll"
diff --git a/databases/firebird20-server/files/patch-builds::original::boot.sfx.interbase b/databases/firebird20-server/files/patch-builds::original::boot.sfx.interbase
index 62d0b483a07d..332ce0cdf136 100644
--- a/databases/firebird20-server/files/patch-builds::original::boot.sfx.interbase
+++ b/databases/firebird20-server/files/patch-builds::original::boot.sfx.interbase
@@ -1,6 +1,6 @@
---- builds/original/boot.sfx.interbase.orig	Tue Dec 18 01:40:08 2001
-+++ builds/original/boot.sfx.interbase	Sat Nov  9 17:44:54 2002
-@@ -68,7 +68,7 @@
+--- builds/original/boot.sfx.interbase.orig	Sun Oct 13 17:12:41 2002
++++ builds/original/boot.sfx.interbase	Fri Jan 10 10:34:43 2003
+@@ -70,7 +70,7 @@
  #added completed according to inprise tree
  #FSG  093000
  
@@ -9,25 +9,16 @@
  
  #  burp wanted to build gpre	
  #  we break this dependency
-@@ -159,14 +159,14 @@
- # 1995-June-7 David Schnepper 
- # removed pyxis 3-Aug-00 TMC
- #executables:	alice burp dudley gpre miscFiles $(INTL) isql locks \
--	$(SUPER_SERVER)  qli remote spit utilities \
--	$(SHARED_AM) $(LINKABLE_LIBS)
-+#	$(SUPER_SERVER)  qli remote spit utilities \
-+#	$(SHARED_AM) $(LINKABLE_LIBS)
- 	
- executables:    alice dudley miscFiles $(INTL) isql locks \
+@@ -169,7 +169,7 @@
  	$(SUPER_SERVER)  qli remote spit utilities \
  	$(SHARED_AM) $(LINKABLE_LIBS)
  
 -super_firebird: gds.h includes fireboot super_targets dudley superMiscFiles $(INTL) isql locks qli remote spit help msgs msgs_intl dba gfix gsec security_db extlib examples completed
-+super_firebird: gds.h includes fireboot super_targets dudley superMiscFiles $(INTL) isql locks qli remote spit help msgs msgs_intl dba gfix relay gsec security_db extlib completed
++super_firebird: gds.h includes fireboot super_targets dudley superMiscFiles $(INTL) isql locks qli remote spit help msgs msgs_intl dba gfix gsec security_db extlib completed
  
  super_targets: 	s_run_codes s_alice s_burp s_dba s_security_c super_client super_server super_utils 
  
-@@ -195,7 +195,7 @@
+@@ -199,7 +199,7 @@
  
  super_client:		force
  	$(QUIET_ECHO) "Building super/client..."
diff --git a/databases/firebird20-server/files/patch-builds::original::prefix.freebsd b/databases/firebird20-server/files/patch-builds::original::prefix.freebsd
index ec8d8343f61d..8a9d5319dba6 100644
--- a/databases/firebird20-server/files/patch-builds::original::prefix.freebsd
+++ b/databases/firebird20-server/files/patch-builds::original::prefix.freebsd
@@ -1,102 +1,11 @@
---- builds/original/prefix.freebsd.orig	Sat Jan 13 05:18:13 2001
-+++ builds/original/prefix.freebsd	Sat Nov  9 16:49:17 2002
-@@ -28,20 +28,20 @@
- 
- 
+--- builds/original/prefix.freebsd.orig	Sun Oct 13 17:12:42 2002
++++ builds/original/prefix.freebsd	Fri Jan 10 13:00:32 2003
+@@ -30,7 +30,7 @@
  PROD_DEBUG_OBJECTS=	nodebug.o
--PROD_SHRLIB_DIR=	-Lsource/jrd
-+PROD_SHRLIB_DIR=	-Lsource/jrd -Lsource/interbase/lib
+ PROD_SHRLIB_DIR=	-Lsource/jrd -Lsource/interbase/lib
  PROD_VERSION_FLAG=	-DPROD_BUILD
 -PROD_CFLAGS=            -O -m486 -fpic -DFLINTSTONE
-+PROD_CFLAGS=            -O -pipe -march=i486 -fpic -DFLINTSTONE
++PROD_CFLAGS=		-O -pipe -march=i486 -fpic -DFLINTSTONE
  
  
  DEV_DEBUG_OBJECTS=	grammar.o dbg.o dbt.o dmp.o
--DEV_SHRLIB_DIR=		-Lsource/jrd
-+DEV_SHRLIB_DIR=		-Lsource/jrd -Lsource/interbase/lib
- DEV_VERSION_FLAG=	-DDEV_BUILD
- DEV_CFLAGS=		-ggdb
- 
- DEBUG_OBJECTS=		$($(VERSION)_DEBUG_OBJECTS)
- SHRLIB_DIR=		$($(VERSION)_SHRLIB_DIR)
- VERSION_FLAG=		$($(VERSION)_VERSION_FLAG)
--CFLAGS_COMMON=		$($(VERSION)_CFLAGS)  -Isource/interbase/include -DFREEBSD -w -fwritable-strings
-+CFLAGS_COMMON=		$($(VERSION)_CFLAGS) -DFREEBSD -w -fwritable-strings -Isource/interbase/include 
- CFLAGS=			$(CFLAGS_COMMON) $(SUPER_FLAG)
- PIC_J_CFLAGS=		$(CFLAGS_COMMON) -DPIPE_IS_SHRLIB -fPIC
- SPECIAL_OBJECTS=	j
-@@ -62,21 +62,21 @@
- BIN_PATH=		interbase/bin
- BRIDGE_MISC=		head5.o allp.o
- CHMOD_VAL=		666
--CURSES_LIB=             -lncurses
-+CURSES_LIB=
- DSQL_P_OBJS=		dsql_p_objects
--FORM_OBJECTS=		form.o
--FORM_TRN_OBJECTS=	form_trn.o
-+FORM_OBJECTS=		noform.o
-+FORM_TRN_OBJECTS=
- FUNCTIONS=		functions.bin
- FUNCSHR=		source/interbase/lib/gdsf.so
- GDS_LINK=		$(GDSSHR_LINK)
--GDS_PYXIS=		gds_pyxis.a
-+GDS_PYXIS=
- GDSLIB_BACKEND=		source/interbase/lib/gds_b.a
- GDSLIB_LINK=		-Lsource/jrd -lgds_b -lc -ldescrypt
- 
- GDSSHR=			source/interbase/lib/gds.so
- LINUX_GDSSHR=		$(GDSSHR)
--GDSSHR_LINK=		$(SHRLIB_DIR) -lgds -lgds_pyxis -ldescrypt
--PIPE_GDSSHR_LINK=	$(SHRLIB_DIR) -lgds -lgds_pyxis
-+GDSSHR_LINK=		$(SHRLIB_DIR) -lgds -ldescrypt
-+PIPE_GDSSHR_LINK=	$(SHRLIB_DIR) -lgds
- HLPDIR=			source/qli/
- HOSTNAME=		`hostname | cut -d'.' -f1`
- INCLUDES=		include_so include_so_ada	
-@@ -92,7 +92,7 @@
- JRD_J_MISC_OBJECTS=	source/jrd/sun_ftn.j 
- JRD_P_MISC_OBJECTS=	source/jrd/sun_ftn.bin source/jrd/nodebug.bin
- LANG_OBJECTS=		ada.o ftn.o cob.o
--LANGUAGES=		cc cxx ada sun_ada microfocus_cob make16 gdl1 sun_ftn
-+LANGUAGES=		cc cxx ada microfocus_cob make16 gdl1 sun_ftn
- LD_LIBS=		-lc
- LD_LIBS_J=		-lc
- LD_OPTS=		-shared
-@@ -104,28 +104,28 @@
- MUISQL_LINK_OPTS=	$(MUISQL_MU_LIB) $(PIPE_GDSSHR_LINK) -lm 
- PIC_FLAGS=		$(CFLAGS) -fPIC
- PIPE=			gds.a gds_pipe
--PYXIS=			pyxis
--PYXIS_MISC_OBJS=	$(PYXIS_MISC)
--PYXIS_P_MISC_OBJS=	$(PYXIS_P_MISC)
--PYXIS_OBJECTS=		pyxis_objects
--PYXIS_MISC_OBJECTS=	$(PYXDIR)cdm.o $(PYXDIR)vt100.o $(PYXDIR)sun_ftn_pyxis.o
-+PYXIS=
-+PYXIS_MISC_OBJS=
-+PYXIS_P_MISC_OBJS=
-+PYXIS_OBJECTS=
-+PYXIS_MISC_OBJECTS=
- REG_HELP=		isc_ins_hlp.dat
- REMOTE_GDSSHR=		$(GDSSHR)
- REMOTE_GDSSHR_LINK=	$(SERVER_LINK)
- REMOTE_P_OBJS=		rem_p_objects
--SCREEN_LIBS=
--#SCREEN_LIBS=		-lncurses
-+#SCREEN_LIBS=
-+SCREEN_LIBS=		-lncurses
- SERVER_LINK=		$(GDSSHR_LINK)
- SETUP_ISC=              ISC_USER=sysdba; ISC_PASSWORD=masterkey; export ISC_USER ISC_PASSWORD;
- SPECIAL_OPT=		source/special_opt
- NETWORK_LIB=		
- SOCKET_LIB=		-lc
--THREAD_LIB=		-llthread
-+THREAD_LIB=		-pthread
- SUN_FUNCSHR=		$(FUNCSHR)
- LX_SUPER_GDSSHR=		source/interbase/lib/gds.so.1
- SUPER_CLIENT_GDSSHR=    $(LX_SUPER_GDSSHR)
- SUPER_BACKEND=		source/jrd/gds_ss.a
--SUPER_LINK=		-Lsource/jrd -lgds_ss -lc -ldescrypt -L/usr/local/lib -llthread
-+SUPER_LINK=		-pthread -Lsource/jrd -lgds_ss -ldescrypt
- SUPER_SERVER=	
- UTILITIES=		
- WAL_P_OBJS=		wal_p_objects
diff --git a/databases/firebird20-server/files/patch-jrd::gds.c b/databases/firebird20-server/files/patch-jrd::gds.c
deleted file mode 100644
index 523abb725403..000000000000
--- a/databases/firebird20-server/files/patch-jrd::gds.c
+++ /dev/null
@@ -1,24 +0,0 @@
---- jrd/gds.c.orig	Sat Mar  2 00:15:11 2002
-+++ jrd/gds.c	Sun Jul  7 14:27:44 2002
-@@ -159,7 +159,7 @@
-    engine and this change may imply side effect I haven't known 
-    about yet. Tomas Nejedlik (tomas@nejedlik.cz)
- */
--#if (defined(LINUX) && defined(SUPERCLIENT))
-+#if ((defined(LINUX) || defined(FREEBSD)) && defined(SUPERCLIENT))
- #define V4_THREADING
- #endif
- 
-@@ -3510,9 +3510,9 @@
- #else
- 	       (MAP_ANON | 
- #endif
--#if (!defined LINUX && !defined DARWIN)
--/* In LINUX, Solaris, and Darwin there is no such thing as MAP_VARIABLE. Hence, it gives 
--   compilation error. The equivalent functionality is default, 
-+#if (!defined LINUX && !defined DARWIN && !defined FREEBSD)
-+/* In LINUX, Solaris, FreeBSD and Darwin there is no such thing as MAP_VARIABLE.
-+   Hence, it gives compilation error. The equivalent functionality is default, 
-    if you do not specify MAP_FIXED */
- 		MAP_VARIABLE | 
- #endif  /* LINUX */
diff --git a/databases/firebird20-server/files/patch-jrd::isc_file.c b/databases/firebird20-server/files/patch-jrd::isc_file.c
deleted file mode 100644
index 7047f182d59c..000000000000
--- a/databases/firebird20-server/files/patch-jrd::isc_file.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- jrd/isc_file.c.orig	Tue Dec 18 01:40:18 2001
-+++ jrd/isc_file.c	Sat Jul  6 18:04:55 2002
-@@ -106,6 +106,12 @@
- #define MTAB_CLOSE(stream)	ib_fclose (stream)
- #endif
- 
-+#ifdef FREEBSD
-+#define MTAB			"/etc/fstab"
-+#define MTAB_OPEN(path,type)	ib_fopen (path, type)
-+#define MTAB_CLOSE(stream)	ib_fclose (stream)
-+#endif 
-+
- #ifdef DARWIN
- #define MTAB			"/etc/fstab.hd" 
- #define MTAB_OPEN(path,type)	ib_fopen (path, type)
diff --git a/databases/firebird20-server/files/patch-jrd::isc_sync.c b/databases/firebird20-server/files/patch-jrd::isc_sync.c
deleted file mode 100644
index 19e327a1705f..000000000000
--- a/databases/firebird20-server/files/patch-jrd::isc_sync.c
+++ /dev/null
@@ -1,38 +0,0 @@
---- jrd/isc_sync.c.orig	Tue Mar  5 21:11:25 2002
-+++ jrd/isc_sync.c	Sat Jul  6 18:06:30 2002
-@@ -1467,7 +1467,7 @@
-     pthread_mutex_init (event->event_mutex, pthread_mutexattr_default);
-     pthread_cond_init (event->event_semnum, pthread_condattr_default);
- #else
--#if (defined linux || defined DARWIN)
-+#if (defined linux || defined DARWIN || defined FREEBSD)
-     pthread_mutex_init (event->event_mutex, NULL);
-     pthread_cond_init (event->event_semnum, NULL);
- #else
-@@ -1596,7 +1596,7 @@
- #ifdef HP10
-     if (micro_seconds > 0 && (ret == -1) && (errno == EAGAIN))
- #else
--#if (defined linux || defined DARWIN)
-+#if (defined linux || defined DARWIN || defined FREEBSD)
-     if (micro_seconds > 0 && (ret == ETIMEDOUT))
- #else
-     if (micro_seconds > 0 && (ret == ETIME))
-@@ -5198,7 +5198,7 @@
-  **************************************/
- int	state;
- 
--#if (!defined HP10 && !defined linux && !defined DARWIN)
-+#if (!defined HP10 && !defined linux && !defined DARWIN && !defined FREEBSD)
- 
- pthread_mutexattr_t     mattr;
- 
-@@ -5218,7 +5218,7 @@
- 	 server (until we are to implement local IPC using shared
- 	 memory in which case we need interprocess thread sync.
- */
--#if (defined linux || defined DARWIN)
-+#if (defined linux || defined DARWIN || defined FREEBSD)
- return pthread_mutex_init (mutex->mtx_mutex, NULL);
- #else
- state = pthread_mutex_init (mutex->mtx_mutex, pthread_mutexattr_default);
diff --git a/databases/firebird20-server/files/patch-jrd::jrd.h b/databases/firebird20-server/files/patch-jrd::jrd.h
deleted file mode 100644
index 0a280080c74a..000000000000
--- a/databases/firebird20-server/files/patch-jrd::jrd.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- jrd/jrd.h.orig	Tue May 14 19:01:06 2002
-+++ jrd/jrd.h	Tue May 14 19:23:44 2002
-@@ -717,7 +717,8 @@
- #ifdef MULTI_THREAD
- #if (defined APOLLO || defined DECOSF || defined NETWARE_386 || \
- 	defined NeXT || defined SOLARIS_MT || defined WIN_NT || \
--	defined OS2_ONLY || defined HP10 || defined LINUX || defined DARWIN)
-+	defined OS2_ONLY || defined HP10 || defined LINUX || \
-+	defined DARWIN || defined FREEBSD)
- #define PLATFORM_GET_THREAD_DATA ((TDBB) THD_get_specific())
- #endif
- #endif
diff --git a/databases/firebird20-server/files/patch-jrd::thd.c b/databases/firebird20-server/files/patch-jrd::thd.c
deleted file mode 100644
index a09c3fe4e1c3..000000000000
--- a/databases/firebird20-server/files/patch-jrd::thd.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- jrd/thd.c.orig	Thu May 24 14:11:11 2001
-+++ jrd/thd.c	Sun Jul  7 14:52:07 2002
-@@ -2605,7 +2605,7 @@
- int 		detach_state=PTHREAD_CREATE_DETACHED
- #endif
- 
--#if ( !defined HP10 && !defined linux )
-+#if ( !defined HP10 && !defined linux && !defined FREEBSD )
- 
- state = pthread_attr_init (&pattr);
- if (state)
-@@ -2628,7 +2628,7 @@
- return state;
- 
- #else
--#ifdef linux
-+#if ( defined linux || defined FREEBSD )
- if (state = pthread_create (&thread, NULL, routine, arg))
-     return state;
- return pthread_detach (thread);
diff --git a/databases/firebird20-server/files/patch-jrd::thd.h b/databases/firebird20-server/files/patch-jrd::thd.h
deleted file mode 100644
index b4e74ecfbe59..000000000000
--- a/databases/firebird20-server/files/patch-jrd::thd.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- jrd/thd.h.orig	Sat Mar  2 00:16:31 2002
-+++ jrd/thd.h	Mon May 13 19:10:37 2002
-@@ -98,6 +98,11 @@
- #define MULTI_THREAD		1
- #endif
- 
-+#if (defined(FREEBSD) && defined(SUPERSERVER))
-+#define POSIX_THREADS		1
-+#define MULTI_THREAD		1
-+#endif
-+
- #ifdef VMS
- #ifndef GATEWAY
- #define MULTI_THREAD		1
diff --git a/databases/firebird20-server/files/patch-lock::lock.h b/databases/firebird20-server/files/patch-lock::lock.h
deleted file mode 100644
index fe7ad684d99e..000000000000
--- a/databases/firebird20-server/files/patch-lock::lock.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- lock/lock.h.orig	Wed Jun  6 05:43:58 2001
-+++ lock/lock.h	Sat Jul  6 18:08:56 2002
-@@ -65,8 +65,10 @@
- #ifndef SOLARIS_MT
- #if !(defined(HP10) && defined(SUPERSERVER))
- #if !(defined(LINUX) && defined(SUPERSERVER))
-+#if !(defined(FREEBSD) && defined(SUPERSERVER))
- #ifndef DARWIN
- #define MANAGER_PROCESS
-+#endif
- #endif
- #endif
- #endif
diff --git a/databases/firebird20-server/files/patch-porting::qli::help.c b/databases/firebird20-server/files/patch-porting::qli::help.c
deleted file mode 100644
index c6dbdcae0efe..000000000000
--- a/databases/firebird20-server/files/patch-porting::qli::help.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- porting/qli/help.c.orig	Tue Mar 12 00:37:07 2002
-+++ porting/qli/help.c	Fri Nov 22 17:32:40 2002
-@@ -289,7 +289,7 @@
- 		  isc_25.isc_26))
- 	continue;
-     if (++topics == 1 && banner)
--	ib_printf ("%s\n", banner, string, parent);
-+	ib_printf ("%s%s%s\n", banner, string, parent);
-     p = line + ((ptr - line + COLUMN_WIDTH - 1) / COLUMN_WIDTH) * COLUMN_WIDTH;
-     if (p + l > line + RIGHT_MARGIN)
- 	{
diff --git a/databases/firebird20-server/files/patch-remote::remote.h b/databases/firebird20-server/files/patch-remote::remote.h
deleted file mode 100644
index 2c3fa59fe04e..000000000000
--- a/databases/firebird20-server/files/patch-remote::remote.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- remote/remote.h	2002/10/21 13:03:48	1.1
-+++ remote/remote.h	2002/10/21 13:04:15
-@@ -47,6 +47,7 @@
- #endif
- #ifndef WINDOWS_ONLY
- #include <fcntl.h>
-+#include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/ioctl.h>
- #endif /* WINDOWS_ONLY */
diff --git a/databases/firebird20-server/pkg-plist b/databases/firebird20-server/pkg-plist
index 4108b6237053..97eceac35721 100644
--- a/databases/firebird20-server/pkg-plist
+++ b/databases/firebird20-server/pkg-plist
@@ -64,10 +64,8 @@ firebird/lib/gds.a
 firebird/lib/gds.so
 firebird/lib/libgds.so
 firebird/lib/libgds.so.1
-firebird/lib/libgds_pyxis.a
 firebird/lib/libgds.a
 firebird/lib/libib_util.so
-firebird/lib/gds_pyxis.a
 firebird/help/help.gbak
 firebird/help/help.gdb
 firebird/bin/ibguard
@@ -87,7 +85,6 @@ firebird/bin/qli
 firebird/bin/gds_inet_server
 firebird/bin/gsplit
 firebird/bin/gstat
-firebird/bin/gds_relay
 firebird/bin/gsec
 firebird/bin/gbak
 firebird/misc/firebird.init.d.generic