- Update to 2.0.a0.

- Previous maintainer is now tha actual maintainer again.
- No package at the moment.

PR:		59001
Submitted by:	chris@e-easy.com.au

25 files changed, 277 insertions, 1599 deletions

diff --git a/databases/firebird-devel/Makefile b/databases/firebird-devel/Makefile
index e8725cb51752..0a36ab14ce3a 100644
--- a/databases/firebird-devel/Makefile
+++ b/databases/firebird-devel/Makefile
@@ -1,99 +1,67 @@
 # New ports collection makefile for:	Firebird-devel
 # Date created:		03 December 2001
-# Whom:			Chris Knight <chris@aims.com.au>
+# Whom:			Chris Knight <chris@e-easy.com.au>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	firebird
-PORTVERSION=	1.0.r2
+PORTVERSION=	2.0.a0
 CATEGORIES=	databases
-MASTER_SITES=	http://www.aims.com.au/chris/
+MASTER_SITES=	http://www.aims.net.au/chris/firebird/
 MASTER_SITE_SUBDIR=firebird
-DISTFILES=	bootkit-RC2.tar.gz \
-		interbase0.9-4-v5examples.tar.gz \
-		Firebird-1.0.0-RC2-FreeBSD.tar.gz
+PKGNAMESUFFIX=	-devel
+DISTNAME=	firebird2-20031110
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	chris@e-easy.com.au
 COMMENT=	The open-source InterBase(tm) 6.0 spin-off (Classic version)
 
-FORBIDDEN=	Local Stack Overflow, see http://packetstormsecurity.nl/0305-exploits/dsr-adv001.txt
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+USE_LIBTOOL=	yes
+GNU_CONFIGURE=	yes
+WANT_AUTOCONF_VER=	257
+USE_GCC=	3.3
 
-WRKSRC=		${WRKDIR}/interbase
+CONFLICTS=	firebird-1.*
+NO_PACKAGE=	pkg-install not finished
+
+WRKSRC=		${WRKDIR}/firebird2
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	%%PREFIX%%/firebird/lib
 MSG_FILE=	${PKGDIR}/pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 USE_REINPLACE=	yes
-USE_PERL5=	yes
 
 ONLY_FOR_ARCHS=	i386
 
 .include <bsd.port.pre.mk>
 
-do-extract:
-	@${MKDIR} ${WRKDIR}
-	@(								\
-	cd ${WRKDIR}; ${TAR} -zxf					\
-		 ${DISTDIR}/Firebird-1.0.0-RC2-FreeBSD.tar.gz;		\
-	cd interbase; ${TAR} -zxf ${DISTDIR}/bootkit-RC2.tar.gz;	\
-	${CP} ${FILESDIR}/boot.freebsd ${WRKDIR}/interbase/;		\
-	${CP} ${FILESDIR}/make.freebsd ${WRKDIR}/interbase/;		\
-	${CP} ${FILESDIR}/buildBootDatabases ${WRKDIR}/interbase/;	\
-	${CP} msgs/msg.gbak misc/msg.gbak				\
-	)
-
-post-patch:
-	@${SED} 's|%%PREFIX%%|${PREFIX}|g' ${MSG_FILE} > ${PKGMESSAGE}
-.if ${OSVERSION} >= 500016 || ${OSVERSION} >= 430001
-	@${REINPLACE_CMD} -e 's,\-ldescrypt,\-lcrypt,g' \
-		 ${WRKSRC}/builds/original/prefix.freebsd
-.else
-	@${REINPLACE_CMD} -e 's,^crypt_set_format.*,,' ${WRKSRC}/jrd/enc.c
+pre-everything::
+	@${ECHO_MSG} "NOTE: If the work directory is on an NFS mount, you will"
+	@${ECHO_MSG} "require NFS client locking support for the build to"
+	@${ECHO_MSG} "succeed. Currently this is only available on FreeBSD 5.0"
+	@${ECHO_MSG} "or greater."
+	@${ECHO_MSG}
+	@${ECHO_MSG} "WARNING: The on-disk structure of the databases has"
+	@${ECHO_MSG} "changed since version 1.0.x."
+	@${ECHO_MSG} "Cancel this installation now and backup your databases"
+	@${ECHO_MSG} "if you have not already done so."
+.if !defined(BATCH)
+	@sleep 10
 .endif
 
+patch-libtool:
+	@${DO_NADA}
+
 do-configure:
-	@(								\
-	cd ${WRKDIR}/interbase;						\
-	INTERBASE=${WRKDIR}/interbase/interbase; export INTERBASE;	\
-	REFDBPATH=${WRKDIR}/refDatabases; export REFDBPATH;		\
-	${SH} buildBootDatabases;					\
-	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} builds_win32/original/build_no.ksh.fix			\
-		 builds_win32/original/build_no.ksh;			\
-	${SH} Configure.sh PROD FREEBSD;				\
-	)
+	@(cd ${WRKSRC} && ${ENV} CC=${CC} CXX=${CXX} MAKE=${GMAKE} ./autogen.sh --prefix=${PREFIX}/firebird --with-lock-manager --with-editline)
 
 do-build:
 	@(								\
-	 ${ECHO_CMD} '#!/bin/sh'; ${ECHO_CMD}				\
-	'[ -d ${LDCONFIG_RUNLIST} ] && ${LDCONFIG} -m ${LDCONFIG_RUNLIST}'; \
-	) > ${WRKDIR}/000.${PORTNAME}.sh
-	@(								\
-	${LN} -sf ${WRKDIR}/refDatabases/jrd/isc.gdb			\
-		 ${WRKDIR}/interbase/interbase/isc4.gdb;		\
-	cd ${WRKDIR}/interbase;						\
-	INTERBASE=${WRKDIR}/interbase/interbase; export INTERBASE;	\
-	REFDBPATH=${WRKDIR}/refDatabases; export REFDBPATH;		\
-	${SH} boot.freebsd;						\
-	)
-
-do-install:
-	@(								\
-	cd ${WRKDIR}/interbase;						\
-	${RM} ${WRKDIR}/interbase/interbase/isc4_tmp.gdb;		\
-	${CP} /dev/null interbase/interbase.log;			\
-	${CP} -Rp interbase ${PREFIX}/firebird;				\
-	${RM} ${PREFIX}/firebird/install;				\
-	${RM} ${PREFIX}/firebird/lib/libgds.so.1.0;			\
-	${LN} -fs gds.so ${PREFIX}/firebird/lib/libgds.so.1;		\
-	cd ${PREFIX}/firebird/examples;					\
-	${TAR} -xzf ${DISTDIR}/interbase0.9-4-v5examples.tar.gz;	\
-	${CP} ${FILESDIR}/RELNOTES ${PREFIX}/firebird/;			\
-	${INSTALL_SCRIPT} ${WRKDIR}/000.${PORTNAME}.sh ${PREFIX}/etc/rc.d/ \
+	${SED} 's|%%PREFIX%%|${PREFIX}|g' ${MSG_FILE} > ${PKGMESSAGE};	\
+	cd ${WRKSRC};							\
+	${ENV} CC=${CC} CXX=${CXX} ${GMAKE} all;			\
 	)
 
 .include <bsd.port.post.mk>
diff --git a/databases/firebird-devel/distinfo b/databases/firebird-devel/distinfo
index 2e891c17ff85..e208de79a36e 100644
--- a/databases/firebird-devel/distinfo
+++ b/databases/firebird-devel/distinfo
@@ -1,3 +1 @@
-MD5 (bootkit-RC2.tar.gz) = a8defbe09458ea048773017c89fb09e1
-MD5 (interbase0.9-4-v5examples.tar.gz) = 17cba82bbf5066d515f2dee97bf8327a
-MD5 (Firebird-1.0.0-RC2-FreeBSD.tar.gz) = 153592d4ea088336a7ed18796bc952b3
+MD5 (firebird2-20031110.tar.bz2) = fa8cc0819e0a74278719953cf013bcb1
diff --git a/databases/firebird-devel/files/boot.freebsd b/databases/firebird-devel/files/boot.freebsd
deleted file mode 100644
index df80d2884076..000000000000
--- a/databases/firebird-devel/files/boot.freebsd
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /bin/sh
-#
-# $Id: boot.freebsd,v 1.1 2000/09/29 16:24:25 tom Exp tom $
-#
-# Contributor(s):
-#
-# Tom Coleman TMC Systems <tcoleman@autowares.com>
-# Geoff Speicher <geoff@sea-incorporated.com>
-#
-CWD=`pwd`;export CWD
-INTERBASE=$CWD/interbase
-LD_LIBRARY_PATH=$INTERBASE/lib
-PATH=$PATH:$INTERBASE/bin:.
-echo INTERBASE=$INTERBASE
-echo LD_LIBRARY_PATH=$LD_LIBRARY_PATH
-export LD_LIBRARY_PATH
-if [ -z "$REFDBPATH" ];then
-	echo "REFDBPATH not defined"
-	REFDBPATH=`dirname $CWD`/refDatabases; export REFDBPATH
-fi
-echo "REFDBPATH="$REFDBPATH
-if [ "$1" = "SUPER" ]; then
-	echo "Building SUPER"
-	make -f make.freebsd super_firebird
-else
-	echo "Building CLASSIC"
-	if [ "$#" -gt 0 ]; then
-		make -f make.freebsd $1
-	else
-		make -f make.freebsd
-	fi
-fi
diff --git a/databases/firebird-devel/files/buildBootDatabases b/databases/firebird-devel/files/buildBootDatabases
deleted file mode 100644
index 155f866b0830..000000000000
--- a/databases/firebird-devel/files/buildBootDatabases
+++ /dev/null
@@ -1,120 +0,0 @@
-#!/bin/sh
-#
-# $Id: buildBootDatabases,v 1.1 2000/09/29 16:26:39 tom Exp tom $
-#
-# Contributor(s):
-#
-# Reed Mideke <rfm@cruzers.com>
-# Tom Coleman TMC Systems <tcoleman@autowares.com>
-#
-printUsage() {
-   echo "usage is : 'buildBootDatabases'"
-   echo "      or : 'buildBootDatabases <destDir>'"
-   echo ""
-   echo "usually as:"
-   echo "sh builds/original/buildBootDatabases"
-   echo "from the main interbase source directory"
-   echo "where defaults are srcDir=. and destDir=../refDatabases"
-   echo ""
-}
-
-checkVariables() {
-     echo ""
-     echo ""
-     echo ""
-     echo "- Firebird - Reference database build ------------------------"
-     echo ""
-     echo "Parameters :"
-     echo ""
-     echo "Source code dir root                   : $IBSrc"
-     echo "Dest root dir where to build ref db's  : $IBRefDir"
-     echo ""
-     echo "If you wish to have different values please set them before running"
-     echo "this script"
-     echo "usage is : 'buildBootDatabases'"
-     echo "      or : 'buildBootDatabases <destDir>'"
-     echo ""
-     echo "--------------------------------------------------------------"
-     echo ""
-     AskQuestion "Press return to continue"
-}
-
-#--------------------------------------------------------------------
-# Ask the user a question.
-
-Answer=""
-
-AskQuestion() {
-    Test=$1
-    DefaultAns=$2
-    echo -n "${1}"
-    Answer="$DefaultAns"
-#    read Answer
-}
-
-#--------------------------------------------------------------------
-# Build the databases needed for a standard interbase build
-
-buildStdDatabases() {
-    echo "- building std databases"
-
-# boot make will create this if it does not exist
-#   (cd jrd; touch metadata.gdb)
-
-# boot make will create this if it does not exist
-#   touch msgs/msg.gdb
-
-# boot make will create this if it does not exist
-#   touch qli/help.gdb
-
-    touch pyxis/forms.gdb
-
-    touch utilities/rebuild.gdb
-}
-
-#------------------------------------------------------------------------
-
-createRefDir() {
-    if [ -d $IBRefDir ] 
-      then
-         echo "** Warning ** - The reference directory $IBRefDir already exists"
-         AskQuestion "Press return to delete it and continue or ^C to abort"
-
-         rm -rf $IBRefDir
-    fi
- 
-    mkdir -p $IBRefDir
-}
-
-
-#== Main Program ==================================================
-
-
-# Check parameters 
-
-if [ $# = 0 ] 
-  then
-     export IBSrc=`pwd`
-     export IBRefDir=../refDatabases
-
-elif [ $# = 1 ]
-  then
-     export IBSrc=`pwd`
-     export IBRefDir=$1
-
-else
-  printUsage
-  exit
-fi
-
-
-checkVariables
-
-
-createRefDir
-
-cd $IBRefDir
-
-mkdir -p msgs qli jrd utilities example4 example5 examples pyxis
-
-buildStdDatabases
diff --git a/databases/firebird-devel/files/make.freebsd b/databases/firebird-devel/files/make.freebsd
deleted file mode 100644
index a9256ee98322..000000000000
--- a/databases/firebird-devel/files/make.freebsd
+++ /dev/null
@@ -1,851 +0,0 @@
-# The contents of this file are subject to the Interbase Public
-# License Version 1.0 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy
-# of the License at http://www.Inprise.com/IPL.html
-#
-# Software distributed under the License is distributed on an
-# "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express
-# or implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code was created by Inprise Corporation
-# and its predecessors. Portions created by Inprise Corporation are
-# Copyright (C) Inprise Corporation.
-#
-# All Rights Reserved.
-# Contributor(s):
-#
-# Tom Coleman TMC Systems <tcoleman@autowares.com>
-#
-# Start of file prefix.freebsd:	PROD	$(PLATFORM)
-#
-#$Id: prefix.freebsd,v 1.2 2000/10/08 15:36:25 gspeicher Exp $
-
-.SUFFIXES: .c .e
-.e.c:
-	$(GPRE) $(GPRE_FLAGS) $<
-.SUFFIXES: .bin .o .c
-.c.o:
-	$(CC) -c $(CFLAGS) $(VERSION_FLAG) $<
-.c.bin:
-	$(CC) -c $(PIC_FLAGS) $(VERSION_FLAG) -o $*.bin $<
-
-METADATA=$(REFDBPATH)/jrd/metadata.gdb
-MESSAGES=$(REFDBPATH)/msgs/msg.gdb
-HELP=$(REFDBPATH)/qli/help.gdb
-ISC=$(REFDBPATH)/jrd/isc.gdb
-
-PROD_DEBUG_OBJECTS=	nodebug.o
-PROD_SHRLIB_DIR=	-Lsource/jrd
-PROD_VERSION_FLAG=	-DPROD_BUILD
-PROD_CFLAGS=            -O -m486 -fpic -DFLINTSTONE
-
-
-DEV_DEBUG_OBJECTS=	grammar.o dbg.o dbt.o dmp.o
-DEV_SHRLIB_DIR=		-Lsource/jrd
-DEV_VERSION_FLAG=	-DDEV_BUILD
-DEV_CFLAGS=		-ggdb
-
-DEBUG_OBJECTS=		$(PROD_DEBUG_OBJECTS)
-SHRLIB_DIR=		$(PROD_SHRLIB_DIR)
-VERSION_FLAG=		$(PROD_VERSION_FLAG)
-CFLAGS_COMMON=		$(PROD_CFLAGS)  -Isource/interbase/include -DFREEBSD -w -fwritable-strings
-CFLAGS=			$(CFLAGS_COMMON) 
-PIC_J_CFLAGS=		$(CFLAGS_COMMON) -DPIPE_IS_SHRLIB -fPIC
-SPECIAL_OBJECTS=	j
-UDF_LINK_CMD=		gcc
-UDF_CFLAGS=         	-fPIC -mieee-fp
-UDF_LFLAGS=         	-shared
-UDF_SHRLIBS=        	-lgds -lm -lc -mieee-fp -ldescrypt
-
-#NOTE: PIC_J_CFLAGS is special CFLAGS used to build PIPD_IS_SHRLIB modules
-#      to workaround the Solaris threading problems with signals
-
-
-#NOTE: -Xt is ANSI C transition mode (default)
-#      -DBDS_COMP is for BSD Compatibility package and is used in <sys/ioctl.h>
-
-ACCESS_METHOD=		gdslib.freebsd pipe
-BACKEND_BRIDGE_MISC=	head5.o allp.o
-BIN_PATH=		interbase/bin
-BRIDGE_MISC=		head5.o allp.o
-CHMOD_VAL=		666
-CURSES_LIB=             -lncurses
-DSQL_P_OBJS=		dsql_p_objects
-FORM_OBJECTS=		form.o
-FORM_TRN_OBJECTS=	form_trn.o
-FUNCTIONS=		functions.bin
-FUNCSHR=		source/interbase/lib/gdsf.so
-GDS_LINK=		$(GDSSHR_LINK)
-GDS_PYXIS=		gds_pyxis.a
-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
-HLPDIR=			source/qli/
-HOSTNAME=		`hostname | cut -d'.' -f1`
-INCLUDES=		include_so include_so_ada	
-INTL=			intl
-
-INTL_CFLAGS=		$(CFLAGS)
-INTL_LD_LINE=		ld -G -o gdsintl 
-INTL_PIC_FLAGS=		$(PIC_FLAGS)
-INTL_TARGET=		intl_shr_objs
-IO_OBJECTS=		unix.o
-IO_P_OBJECTS=		unix.bin
-JRD_MISC_OBJECTS=	source/jrd/sun_ftn.o
-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
-LD_LIBS=		-lc
-LD_LIBS_J=		-lc
-LD_OPTS=		-shared
-LOCK_JRD_MISC=		source/jrd/thd.o
-LOCK_MANAGER=		manager
-MARION_DB=		-d source/marion.gdb
-MUISQL=			muisql
-MUISQL_MU_LIB=		-L /usr/gds.$(HOSTNAME)/qa_tools/lib -lmu
-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
-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
-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
-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 -llthread
-SUPER_SERVER=	
-UTILITIES=		
-WAL_P_OBJS=		wal_p_objects
-
-
-SUPER_SERVER_DEST=	source/interbase/bin/ibserver
-INET_SERVER_DEST=	source/interbase/bin/gds_inet_server
-DNET_SERVER_DEST=	source/interbase/bin/gds_dnet_server
-AMBX_SERVER_DEST=	source/interbase/bin/gds_server
-INET_LIB_DEST=		source/interbase/lib/gds_inet_server.a
-DNET_LIB_DEST=		source/interbase/lib/gds_dnet_server.a
-
-SH=			sh -c
-RM=			rm -f
-CHMOD=			chmod
-CHMOD_6=		chmod 666
-CHMOD_7=		chmod 777
-CHMOD_S7=		chmod 06777
-MV=			mv -f
-TOUCH=			touch
-CP=			cp
-ECHO=			echo
-QUIET_ECHO=		@echo
-CD=			cd
-CAT=			cat
-AR=			ar r
-EXPAND_DBNAME=		@echo No need to expand...
-COMPRESS_DBNAME=	@echo No need to compress...
-SED=			sed
-
-ARCH_EXT=		.a
-EXEC_EXT=
-SHRLIB_EXT=		.so
-
-V3PRINTER=		source/lock/printv3.o
-
-# Forces library build for FreeBSD
-PYXIS_LIBRARY= libpyxis.a
-
-#   End of file prefix.freebsd:	PROD	$(PLATFORM)
-# The contents of this file are subject to the Interbase Public
-# License Version 1.0 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy
-# of the License at http://www.Inprise.com/IPL.html
-#
-# Software distributed under the License is distributed on an
-# "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express
-# or implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code was created by Inprise Corporation
-# and its predecessors. Portions created by Inprise Corporation are
-# Copyright (C) Inprise Corporation.
-#
-# All Rights Reserved.
-# Contributor(s): ______________________________________.
-
-EXTERNAL_OBJECTS=	$(CSI_OBJS) dsql_objects lock.o $(PYXIS_OBJECTS) rem_objects $(INTL) wal_objects
-EXTERNAL_P_OBJECTS=	$(CSI_P_OBJS) dsql_p_objects lock.bin $(PYXIS_P_OBJS) rem_p_objects $(INTL_P_OBJS) wal_p_objects
-
-INCLUDE_DEST=	source/interbase/include/
-
-GPRE=		source/interbase/bin/gpre
-GBAK=		source/interbase/bin/gbak
-GDEF=		source/interbase/bin/gdef
-GFIX=		source/interbase/bin/gfix
-HELP_GDB=	source/interbase/help/help.gdb
-HELP_GBAK=	source/interbase/help/help.gbak
-ISC_GDB=	source/interbase/isc4.gdb
-ISC_GBAK=	source/interbase/bin/isc4.gbak
-JRN_GBAK=	source/interbase/bin/journal.gbak
-CMP=		cmp
-
-CODES=source/jrd/codes
-
-firebird:	gds.h includes fireboot run_codes executables help msgs msgs_intl extlib
-
-#  burp wanted to build gpre	
-#  we break this dependency
-#  1) build burp (gbak)
-#  2) use gbak to create the message databases
-#  3) build the message files
-#  4) build gpre
-
-fireboot:	burp boot_dbs msgs gpre
-
-boot_dbs:	$(GBAK) $(METADATA) $(MESSAGES) $(HELP) $(ISC)
-
-$(METADATA):	misc/metadata.gbak 
-	$(GBAK) -c misc/metadata.gbak $(METADATA)
-
-$(ISC):	misc/isc4.gbak 
-	$(GBAK) -c misc/isc4.gbak $(ISC)
-
-$(MESSAGES):	misc/msg.gbak
-	$(GBAK) -c misc/msg.gbak $(MESSAGES)
-
-$(HELP):	misc/help.gbak
-	$(GBAK) -c misc/help.gbak $(HELP)
-
-all_example_dbs:	example_dbs v4_dbs v5_dbs
- 
-example_dbs:
-	$(ECHO) "- building example dbs"
-	$(CD) $(REFDBPATH)/examples; \
-	$(RM) *.gdb; \
-	$(INTERBASE)/bin/gdef $(CWD)/examples/atlas.gdl; \
-	$(INTERBASE)/bin/gdef $(CWD)/examples/emp.gdl; \
-	$(INTERBASE)/bin/gdef $(CWD)/examples/slides.gdl; \
-	$(INTERBASE)/bin/gdef $(CWD)/examples/nc_guide.gdl; \
-	$(INTERBASE)/bin/gdef $(CWD)/examples/c_guide.gdl; \
-	$(INTERBASE)/bin/gdef $(CWD)/examples/stocks.gdl
-	touch example_dbs
- 
-v4_dbs:
-	$(ECHO) "- copying example files"
-	$(CP) example4/*.sql $(REFDBPATH)/example4
-	$(CP) example4/empbuild.e $(REFDBPATH)/example4
-	$(CP) example4/intlbld.e $(REFDBPATH)/example4
-	$(ECHO) "- building examples4"
-	$(CD) $(REFDBPATH)/example4; \
-	$(RM) *.gdb; \
-	$(SED) -e s/employee.gdb/empbuild.gdb/g $(CWD)/example4/empbld.sql >empbuild.sql; \
-	$(SED) -e s/' year'/' proj_year'/g -e s/\(year/\(proj_year/g -e s/\(YEAR/\(PROJ_YEAR/g -e s/' DATE'/' TIMESTAMP'/g $(CWD)/example4/empddl.sql >empddl.sql; \
-	isql -i empbuild.sql; \
-	$(SED) -e s/' year'/' proj_year'/g -e s/\(year/\(proj_year/g -e s/\(YEAR/\(PROJ_YEAR/g -e s/' DATE'/' TIMESTAMP'/g $(CWD)/example4/intlddl.sql >intlddl.sql; \
-	isql -i intlbld.sql
-	touch v4_dbs
- 
-#	The following were not used but the source files exist
-#	(cd examples; $IBBin/gdef $IBSrc/examples/cs_load.gdl)
-#	(cd examples; $IBBin/gdef $IBSrc/examples/sources.gdl)
-#	(cd examples; $IBBin/gdef $IBSrc/examples/udf_trig.gdl)
- 
-v5_dbs:
-	echo "- building examples5"
-	$(CP) example5/*.sql $(REFDBPATH)/example5
-	$(CD) $(REFDBPATH)/example5; \
-	$(RM) *.gdb; \
-	$(SED) -e s/employee.gdb/empbuild.gdb/g $(CWD)/example5/empbld.sql >empbuild.sql; \
-	$(SED) -e s/' year'/' proj_year'/g -e s/' YEAR'/' PROJ_YEAR'/g -e s/' DATE'/' TIMESTAMP'/g $(CWD)/example5/empddl.sql >empddl.sql; \
-	isql -i empbuild.sql; \
-	$(SED) -e s/' year'/' proj_year'/g -e s/' YEAR'/' PROJ_YEAR'/g -e s/' DATE'/' TIMESTAMP'/g $(CWD)/example5/intlddl.sql >intlddl.sql; \
-	isql -i intlbld.sql
-	touch v5_dbs
- 
-# Run the codes program, thus generating codes.h, iberror.h, etc
-# compare and copy the file only if the files are different
-run_codes:	$(CODES)
-	$(SH) '$(CD) source/jrd; $(CODES)'
-
-$(CODES):	jrd/codes.c
-	echo "creating codes"
-	$(SH) '$(CD) source/jrd; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="$(SYSTEM)" codes'
-
-# NOTE: "journals" removed from "executables" as it currently doesn't
-#	build and isn't used for V4 anyway.
-# 1995-June-7 David Schnepper 
-# removed burp and gpre 081800 TMC
-#executables:	alice burp dudley gpre install $(INTL) isql locks
-executables:	alice dudley install $(INTL) isql locks \
-	$(SUPER_SERVER) pyxis qli remote spit utilities \
-	$(SHARED_AM) $(LINKABLE_LIBS)
-	
-super_firebird:	gds.h includes fireboot super_targets dudley install $(INTL) isql locks qli remote spit help msgs msgs_intl dba gfix gsec security_db extlib
-
-super_targets: 	s_run_codes s_alice s_burp s_dba s_security_c super_client super_server super_utils 
-
-alice gfix:	gpre force
-	$(QUIET_ECHO) "Building GFIX..."
-	$(SH) '$(CD) source/alice; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" alice'
-
-#burp gbak:	gpre msgs force  #TMC
-burp gbak $(GBAK):	pyxis
-	$(QUIET_ECHO) "Building GBAK..."
-	$(SH) '$(CD) source/burp; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" burp'
-
-burplib.a:	burp
-	$(QUIET_ECHO) "Building interbase/lib/gbaklib.a..."
-	$(SH) '$(CD) source/burp; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" libgbaklib.a'
-
-central_server gds_cserver:	$(ACCESS_METHOD) force
-	$(QUIET_ECHO) "Building GDS_CSERVER..."
-	$(SH) '$(CD) source/csv; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" central_server'
-
-super_client:		force
-	$(QUIET_ECHO) "Building super/client..."
-	$(SH) '$(CD) source/super/client; $(MAKE) CFLAGS="$(CFLAGS) -DSUPERCLIENT" SYSTEM="builds" super_client'
-
-csu gcsu:	$(ACCESS_METHOD) force
-	$(QUIET_ECHO) "Building GCSU..."
-	$(SH) '$(CD) source/csv; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" csu'
-
-csvs:		central_server csu
-
-gds_archive:	$(ACCESS_METHOD) gpre force
-	$(QUIET_ECHO) "Building GDS_ARCHIVE..."
-	$(SH) '$(CD) source/journal; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" gds_archive'
-
-dba gstat:	gpre force
-	$(QUIET_ECHO) "Building GSTAT..."
-	$(SH) '$(CD) source/utilities; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" dba'
-
-dnet_server gds_dnet_server:	$(DNET_SERVER_LIB) $(ACCESS_METHOD) force
-	$(QUIET_ECHO) "Building GDS_DNET_SERVER..."
-	$(SH) '$(CD) source/remote; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" dnet_server'
-
-dnet_server.a gds_dnet_server.a:	force
-	$(QUIET_ECHO) "Building GDS_DNET_SERVER.A..."
-	$(SH) '$(CD) source/remote; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" dnet_server.a'
-
-drop gds_drop:	$(ACCESS_METHOD) force
-	$(QUIET_ECHO) "Building GDS_DROP..."
-	$(SH) '$(CD) source/utilities; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" drop'
-
-driver:	$(ACCESS_METHOD) force
-	$(QUIET_ECHO) "Building DRIVER..."
-	$(SH) '$(CD) source/wal; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" driver'
-
-dudley gdef:	gpre msgs force
-	$(QUIET_ECHO) "Building GDEF..."
-	$(SH) '$(CD) source/dudley; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" dudley'
-
-extlib:	force
-	$(QUIET_ECHO) "Building EXTLIB..."
-	$(SH) '$(CD) source/extlib; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" ib_util'
-	$(SH) '$(CD) source/extlib; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" ib_udf'
-
-examples:	all_example_dbs v5_examples v4_examples force
-	$(QUIET_ECHO) "Building examples directory..."
-	$(SH) '$(CD) source/examples; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" examples'
-
-fred:		gpre force
-	$(QUIET_ECHO) "Building FRED..."
-	$(SH) '$(CD) source/pyxis; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" fred'
-
-gds.h:		force
-	$(QUIET_ECHO) "Building GDS.H..."
-	$(SH) '$(CD) source/jrd; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" gds.h'
-
-codes.h:	force
-	$(QUIET_ECHO) "Building CODES.H..."
-	$(SH) '$(CD) source/jrd; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" codes.h'
-
-gds_server:	$(ACCESS_METHOD) force
-	$(QUIET_ECHO) "Building GDS_SERVER..."
-	$(SH) '$(CD) source/remote; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" gds_server'
-
-gdslib.aix gdslib.aix_ppc:	$(GPRE) $(EXTERNAL_OBJECTS) force
-	$(QUIET_ECHO) "Building GDSSHR..."
-	$(SH) '$(CD) source/jrd; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" gdsshr.a'
-
-gdslib.apollo:	$(GPRE) $(EXTERNAL_OBJECTS) pyxislib force
-	$(QUIET_ECHO) "Building GDSLIB..."
-	$(SH) '$(CD) source/jrd; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" gdslib'
-
-gdslib.decosf gdslib.sgi gdslib.epson :	\
-	$(GPRE) $(EXTERNAL_OBJECTS) $(GDS_PYXIS) force
-	$(QUIET_ECHO) "Building GDSLIB..."
-	$(SH) '$(CD) source/jrd; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" gds.so.o'
-
-gdslib.linux:	\
-	$(GPRE) $(EXTERNAL_OBJECTS) $(GDS_PYXIS) force
-	$(QUIET_ECHO) "Building GDSLIB..."
-	$(SH) '$(CD) source/jrd; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" gds.so.linux'
-
-gdslib.freebsd:	\
-	$(GPRE) $(EXTERNAL_OBJECTS) $(GDS_PYXIS) force
-	$(QUIET_ECHO) "Building GDSLIB..."
-	$(SH) '$(CD) source/jrd; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" gds.so.linux'
-
-gdslib.sco_ev:	\
-	$(GPRE) $(EXTERNAL_OBJECTS) $(GDS_PYXIS) force
-	$(QUIET_ECHO) "Building GDSLIB..."
-	$(SH) '$(CD) source/jrd; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" gds.so.O'
-
-gdslib.dg gdslib.m88k gdslib.unixware gdslib.ncr3000 gdslib.dg_x86:	\
-	$(GPRE) $(EXTERNAL_P_OBJECTS) $(GDS_PYXIS) force
-	$(QUIET_ECHO) "Building GDSLIB..."
-	$(SH) '$(CD) source/jrd; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" gds.so.0'
-
-gdslib.solaris:	\
-	$(GPRE) $(EXTERNAL_P_OBJECTS) $(GDS_PYXIS) force
-	$(QUIET_ECHO) "Building GDSLIB..."
-	$(SH) '$(CD) source/jrd; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" gds.so.solaris'
-
-gdslib.hp:	$(GPRE) $(EXTERNAL_P_OBJECTS) $(GDS_PYXIS) force
-	$(QUIET_ECHO) "Building GDSLIB..."
-	$(SH) '$(CD) source/jrd; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" gds.sl'
-
-gdslib.imp:	$(GPRE) $(EXTERNAL_P_OBJECTS) force
-	$(QUIET_ECHO) "Building GDSLIB..."
-	$(SH) '$(CD) source/jrd; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" gds_s.a'
-
-gdslib.sco:	$(GPRE) $(EXTERNAL_P_OBJECTS) gds_pyxis.a force
-	$(QUIET_ECHO) "Building GDSLIB..."
-	$(SH) '$(CD) source/jrd; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" gds_s.a'
-
-gdslib.sunos4:	$(GPRE) $(EXTERNAL_P_OBJECTS) gds_pyxis.a force
-	$(QUIET_ECHO) "Building GDSLIB..."
-	$(SH) '$(CD) source/jrd; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" gdslib.so.1.0'
-
-gds_pipe:	$(PIPE_LIBRARY) gds_b.a $(GPRE) force
-	$(QUIET_ECHO) "Building GDS_PIPE..."
-	$(SH) '$(CD) source/jrd; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" gds_pipe'
-
-gds_b.a:	force
-	$(QUIET_ECHO) "Building GDS_B.A..."
-	$(SH) '$(CD) source/jrd; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" gds_b.a'
-
-gds_pipe.a:	force
-	$(QUIET_ECHO) "Building GDS_PIPE.A..."
-	$(SH) '$(CD) source/jrd; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" gds_pipe.a'
-
-gds.a:		force
-	$(QUIET_ECHO) "Building GDS.A..."
-	$(SH) '$(CD) source/jrd; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" gds.a'
-
-gds.a.solaris:		force
-	$(QUIET_ECHO) "Building GDS.A.SOLARIS..."
-	$(SH) '$(CD) source/jrd; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" gds.a.solaris'
-
-gpre:		security_c $(ACCESS_METHOD) force
-	$(QUIET_ECHO) "Building GPRE..."
-	$(SH) '$(CD) source/gpre; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" gpre'
-
-security_c: force
-	$(QUIET_ECHO) "Building security.c ..."
-	$(SH) '$(CD) source/utilities; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" security.c'
-
-# Run the codes program (for SUPERSERVER hierarchy), 
-# thus generating codes.h, iberror.h, etc
-s_run_codes:	$(CODES) force
-	$(QUIET_ECHO) "Running codes in super ..."
-	$(SH) '$(CD) source/super/jrd; $(CODES)'
-
-s_security_c: force
-	$(QUIET_ECHO) "Building security.c ..."
-	$(SH) '$(CD) source/super/utilities; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" security.c'
-
-s_alice: force
-	$(QUIET_ECHO) "Building met.c ..."
-	$(SH) '$(CD) source/super/alice; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" met.c'
-
-s_burp:	force
-	$(QUIET_ECHO) "Building restore.c and backup.c ..."
-	$(SH) '$(CD) source/super/burp; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" restore.c'
-	$(SH) '$(CD) source/super/burp; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" backup.c'
-
-s_dba:	force
-	$(QUIET_ECHO) "Building dba.e ..."
-	$(SH) '$(CD) source/super/utilities; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" dba.c'
-
-gsec:	gpre force
-	$(QUIET_ECHO) "Building GSEC..."
-	$(SH) '$(CD) source/utilities; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" gsec'
-
-$(GPRE):
-	$(QUIET_ECHO) "Building bootstrap version of GPRE..."
-# 
-# gpre_boot needs more work than I've got time for, so we'll build the big one
-#
-#	$(SH) '$(CD) source/gpre; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" gpre_boot'
-	$(SH) '$(CD) source/gpre; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" gpre'
-
-help:		gbak force
-	$(QUIET_ECHO) "Building the QLI help database..."
-	$(SETUP_ISC_REMOTE) $(GBAK) $(DBALOGIN) $(HLPDIR)master_help_db $(HELP_GBAK)
-	-$(RM) $(HELP_GDB)
-	$(SETUP_ISC_LOCAL) \
-	$(GBAK) $(DBALOGIN) -r $(HELP_GBAK) $(HELP_GDB)
-
-include_generic:	force
-	$(QUIET_ECHO) "Building the include directory..."
-	$(CAT) source/jrd/ibase.h source/jrd/gdsold.h > $(INCLUDE_DEST)gds.h
-	$(CP) source/extlib/ib_util.h $(INCLUDE_DEST)ib_util.h
-	$(CP) source/jrd/gds.hxx $(INCLUDE_DEST)gds.hxx
-	$(CP) source/jrd/perf.h $(INCLUDE_DEST)perf.h
-	$(CP) source/jrd/ibase.h $(INCLUDE_DEST)ibase.h
-	$(SH) '$(CMP) source/jrd/iberror.h $(INCLUDE_DEST)iberror.h; if [ $$? != 0 ]; then $(CP) source/jrd/iberror.h $(INCLUDE_DEST)iberror.h; fi'
-
-include_apollo:	include_generic
-	$(CP) $(INCLUDE_DEST)gds.h $(INCLUDE_DEST)gds.ins.c
-	$(ECHO) "sm gds_apollo.f $(INCLUDE_DEST)gds.ins.ftn" >> sm_include
-	$(ECHO) "sm gds.pas $(INCLUDE_DEST)gds.ins.pas" >> sm_include
-	$(ECHO) "sm interbase.a $(INCLUDE_DEST)interbase.a" >> sm_include
-	$(ECHO) "sm interbase_alsys.a $(INCLUDE_DEST)interbase.ada" >> sm_include
-	$(ECHO) "sm perf.pas $(INCLUDE_DEST)perf.pas" >> sm_include
-
-
-include_aix:	include_generic
-	$(ECHO) "sm gds_aix.f $(INCLUDE_DEST)gds.f" >> sm_include
-
-include_dg:	include_generic
-	$(ECHO) "sm gds_sun.f $(INCLUDE_DEST)gds.f" >> sm_include
-
-include_dg_x86:	include_generic
-	$(ECHO) "sm gds_sun.f $(INCLUDE_DEST)gds.f" >> sm_include
-
-include_hp:	include_generic
-	$(ECHO) "sm gds_hp.f $(INCLUDE_DEST)gds.f" >> sm_include
-
-include_hp_ada:	include_generic
-	$(ECHO) "sm interbase_hp.a $(INCLUDE_DEST)interbase.ada" >> sm_include
-
-include_sco:	include_generic
-	$(ECHO) "sm interbase_sco.a $(INCLUDE_DEST)interbase.ada" >> sm_include
-
-include_sgi:	include_generic
-	$(ECHO) "sm gds_sun.f $(INCLUDE_DEST)gds.f" >> sm_include
-
-include_so:	include_generic
-	$(CP) source/jrd/gds_sun.f $(INCLUDE_DEST)gds.f
- 
-include_so_ada:	include_generic
-#	$(ECHO) "sm interbase_sol.a $(INCLUDE_DEST)interbase.a" >> sm_include
-
-include_sun4:	include_generic
-	$(ECHO) "sm gds_sun.f $(INCLUDE_DEST)gds.f" >> sm_include
-	$(ECHO) "sm interbase_sun.a $(INCLUDE_DEST)interbase.a" >> sm_include
-
-includes:	include_generic $(INCLUDES) force
-#	$(BIN_PATH)/marion $(MARION_DB) -c jrd -x -v -z < sm_include
-#	-$(RM) sm_include
-
-inet_server gds_inet_server:	$(INET_LIBRARY) $(ACCESS_METHOD) force
-	$(QUIET_ECHO) "Building GDS_INET_SERVER..."
-	$(SH) '$(CD) source/remote; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" inet_server'
-
-inet_server.a gds_inet_server.a:	force
-	$(QUIET_ECHO) "Building GDS_INET_SERVER.A..."
-	$(SH) '$(CD) source/remote; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" inet_server.a'
-
-install:	force
-	$(QUIET_ECHO) "Building miscellaneous install files..."
-	$(CP) source/builds/install source/interbase
-	-$(CP) source/builds/servers.isc source/interbase
-	$(CP) source/builds/inetd.conf.isc source/interbase
-	$(CP) source/builds/original/services.isc source/interbase
-	-$(CP) source/builds/sys.conf.isc source/interbase
-
-intl:		force
-	$(QUIET_ECHO) "Building INTL..."
-	$(SH) '$(CD) source/intl; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" intl'
-
-iscinstall:	$(ACCESS_METHOD) force
-	$(QUIET_ECHO) "Building ISCINSTALL..."
-	$(SH) '$(CD) source/register; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" iscinstall'
-
-isql:		gpre msgs force
-	$(QUIET_ECHO) "Building ISQL..."
-	$(SH) '$(CD) source/isql; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" all'
-
-isqllib.a:	isql
-	$(QUIET_ECHO) "Building interbase/lib/isqllib.a..."
-	$(SH) '$(CD) source/isql; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" libisqllib.a'
-
-gjrn:	$(ACCESS_METHOD) gpre force
-	$(QUIET_ECHO) "Building GJRN..."
-	$(SH) '$(CD) source/journal; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" gjrn'
-
-journals:	gjrn gds_archive gdef gfix gbak force
-	$(QUIET_ECHO) "Building journal database backup file..."
-	$(SH) '$(CD) source/journal; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" journal.db'
-	-$(RM) $(JRN_GBAK)
-	$(COMPRESS_JRN)
-	$(SETUP_ISC_LOCAL) \
-	$(GDEF) -z -r source/journal.gdl
-	$(GFIX) -w sync journal.gdb
-	$(GBAK) -z journal.gdb $(JRN_GBAK)
-	$(CHMOD_6) $(JRN_GBAK)
-	-$(RM) source/journal.gdl source/journal.gdb
-
-locks:		lock_print $(LOCK_MANAGER) force
-	$(QUIET_ECHO) "Building template of IPC configuration file..."
-	-$(CP) source/lock/config_params source/interbase/isc_config
-
-lock_print gds_lock_print:	$(ACCESS_METHOD) force
-	$(QUIET_ECHO) "Building GDS_LOCK_PRINT..."
-	$(SH) '$(CD) source/lock; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" lock_print'
-
-manager gds_lock_manager:	$(ACCESS_METHOD) drop force
-	$(QUIET_ECHO) "Building GDS_LOCK_MANAGER..."
-	$(SH) '$(CD) source/lock; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" manager'
-
-msgs:		$(ACCESS_METHOD) $(LOCK_MANAGER) force
-	$(QUIET_ECHO) "Building message file(s)..."
-	$(SH) '$(CD) source/msgs; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" check_messages'
-	$(SH) '$(CD) source/msgs; check_messages -d $(MSGSDIR)master_msg_db -l'
-	$(SH) '$(CD) source/msgs; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" interbase.msg'
-	$(SH) '$(CD) source/jrd; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" includes.msg'
-
-msgs_intl:	$(ACCESS_METHOD) force
-	$(QUIET_ECHO) "Building international message file(s)..."
-	$(SH) '$(CD) source/msgs; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" locales.msg'
-
-pipe:		$(EXTERNAL_OBJECTS) $(PIPE)
-
-pyxis:		force
-	$(QUIET_ECHO) "Building PYXIS..."
-	$(SH) '$(CD) source/pyxis; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" objects'
-
-qli:		gpre msgs force
-	$(QUIET_ECHO) "Building QLI..."
-	$(SH) '$(CD) source/qli; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" qli'
-
-qlilib.a:	qli
-	$(QUIET_ECHO) "Building interbase/lib/qlilib.a..."
-	$(SH) '$(CD) source/qli; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" libqlilib.a'
-
-register:	gpre force
-	$(QUIET_ECHO) "Building REGISTER..."
-	$(SH) '$(CD) source/register; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" register'
-
-relay gds_relay:	force
-	$(QUIET_ECHO) "Building GDS_RELAY..."
-	$(SH) '$(CD) source/utilities; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" relay'
-
-remote:		inet_server $(DNET_SERVER) $(AMBX_SERVER)
-
-spit:	force
-	$(QUIET_ECHO) "Building GSPLIT..."
-	$(SH) '$(CD) source/burp; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" spit'
-
-super_server:		force
-	$(QUIET_ECHO) "Building super_server... "
-#	$(SH) '$(CD) source/super/remote; $(MAKE) SYSTEM="builds" super_server'
-	$(SH) '$(CD) source/super/remote; $(MAKE) CFLAGS_COMMON="$(CFLAGS_COMMON)" SYSTEM="builds" super_server'
-
-super_utils:		force
-	$(QUIET_ECHO) "Building super server utlities... "
-	$(SH) '$(CD) source/utilities; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" super_server_targets'
-
-utilities:	dba relay gsec security_db $(UTILITIES)
-
-security_db:	force
-	$(QUIET_ECHO) "Building the ISC security database..."
-	-$(RM) $(ISC_GBAK) isc4.gdb
-	$(SETUP_ISC_LOCAL) \
-	source/interbase/bin/isql -z -i source/utilities/isc4.sql; \
-	source/interbase/bin/gdef -z source/utilities/isc4.gdl; \
-	source/interbase/bin/gsec -da isc4.gdb -add sysdba -pw masterkey; \
-	$(GBAK) -z isc4.gdb $(ISC_GBAK)
-	-$(MV) interbase/isc4.gdb interbase/isc4_tmp.gdb
-	-$(MV) isc4.gdb $(ISC_GDB)
-	$(CHMOD_6) $(ISC_GBAK) $(ISC_GDB)
-	-$(RM) isc4.gdb
-
-#
-# The V4 intlbld crashes attempting to create a Dialect 3 database
-# The sed hack creates it using DIALECT 1
-#
-v4_examples:	v4_dbs
-	$(QUIET_ECHO) "Building V4 examples directory..."
-	$(CD) source/example4; \
-	$(SED) -e s/' year'/' proj_year'/g $(REFDBPATH)/example4/empbuild.e >empbuild.e; \
-	$(SED) -e s/' year'/' proj_year'/g $(REFDBPATH)/example4/intlbld.e >tmpbld.e; \
-	$(ECHO) '/EXEC SQL SET SQL DIALECT 1;/d' > sedf; \
-	$(ECHO) '/EXEC SQL INCLUDE SQLCA;/a\' >> sedf; \
-	$(ECHO) 'EXEC SQL SET SQL DIALECT 1;' >> sedf; \
-	$(SED) -f sedf tmpbld.e > intlbld.e; \
-	$(CP) $(REFDBPATH)/example4/empddl.sql .; \
-	$(SED) -e s/\(year/\(proj_year/g $(REFDBPATH)/example4/empdml.sql >empdml.sql; \
-	$(CP) $(REFDBPATH)/example4/intlddl.sql .; \
-	$(SED) -e s/\(year/\(proj_year/g $(REFDBPATH)/example4/intldml.sql >intldml.sql; \
-	$(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" v4_examples
-
-v5_examples:	v5_dbs
-	$(QUIET_ECHO) "Building V5 examples directory..."
-	$(CP) $(REFDBPATH)/example5/empddl.sql example5
-	$(CP) $(REFDBPATH)/example5/intlddl.sql example5
-	$(CD) source/example5; \
-	$(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" v5_examples
-
-wal_print:	$(ACCESS_METHOD) force
-	$(QUIET_ECHO) "Building GDS_WAL_PRINT..."
-	$(SH) '$(CD) source/wal; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" wal_print'
-
-wal_writer:	$(ACCESS_METHOD) force
-	$(QUIET_ECHO) "Building GDS_WAL_WRITER..."
-	$(SH) '$(CD) source/wal; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" wal_writer'
-
-csi_objects:
-	$(QUIET_ECHO) "Building CSI OBJECTS..."
-	$(SH) '$(CD) source/csv; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" $(@F)'
-dsql_objects:
-	$(QUIET_ECHO) "Building DSQL OBJECTS..."
-	$(SH) '$(CD) source/dsql; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" $(@F)'
-lock.o:
-	$(QUIET_ECHO) "Building LOCK.O..."
-	$(SH) '$(CD) source/lock; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" $(@F)'
-pyxis_objects:
-	$(QUIET_ECHO) "Building PYXIS OBJECTS..."
-	$(SH) '$(CD) source/pyxis; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" $(@F)'
-pyxlib.o:
-	$(QUIET_ECHO) "Building PYXLIB.O..."
-	$(SH) '$(CD) source/pyxis; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" $(@F)'
-rem_objects:
-	$(QUIET_ECHO) "Building REMOTE OBJECTS..."
-	$(SH) '$(CD) source/remote; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" $(@F)'
-wal_objects:
-	$(QUIET_ECHO) "Building WAL OBJECTS..."
-	$(SH) '$(CD) source/wal; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" $(@F)'
-
-dsqllib:
-	$(QUIET_ECHO) "Building DSQLLIB..."
-	$(SH) '$(CD) source/dsql; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" $(@F)'
-pyxislib:
-	$(QUIET_ECHO) "Building PYXISLIB..."
-	$(SH) '$(CD) source/pyxis; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" $(@F)'
-
-csi_p_objs:
-	$(QUIET_ECHO) "Building CSI PIC OBJECTS..."
-	$(SH) '$(CD) source/csv; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" $(@F)'
-dsql_p_objects:
-	$(QUIET_ECHO) "Building DSQL PIC OBJECTS..."
-	$(SH) '$(CD) source/dsql; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" $(@F)'
-gds_pyxis.a:
-	$(QUIET_ECHO) "Building GDS_PYXIS.A..."
-	$(SH) '$(CD) source/pyxis; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" libpyxis.a'
-lock.bin:
-	$(QUIET_ECHO) "Building LOCK.BIN..."
-	$(SH) '$(CD) source/lock; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" $(@F)'
-pyx_p_objects:
-	$(QUIET_ECHO) "Building PYXIS PIC OBJECTS..."
-	$(SH) '$(CD) source/pyxis; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" $(@F)'
-wal_p_objects:
-	$(QUIET_ECHO) "Building WAL PIC OBJECTS..."
-	$(SH) '$(CD) source/wal; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" $(@F)'
-rem_p_objects:
-	$(QUIET_ECHO) "Building REMOTE PIC OBJECTS..."
-	$(SH) '$(CD) source/remote; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="builds" $(@F)'
-
-
-# Note:	So far this target is only available on Solaris
-makedepend:
-	$(QUIET_ECHO) "Building component dependency files..."
-	$(RM) \
-	source/alice/depends.mak \
-	source/burp/depends.mak \
-	source/csv/depends.mak \
-	source/dsql/depends.mak \
-	source/dudley/depends.mak \
-	source/gpre/depends.mak \
-	source/intl/depends.mak \
-	source/lock/depends.mak \
-	source/isql/depends.mak \
-	source/journal/depends.mak \
-	source/jrd/depends.mak \
-	source/msgs/depends.mak \
-	source/qli/depends.mak \
-	source/remote/depends.mak \
-	source/utilities/depends.mak \
-	source/wal/depends.mak 
-	$(SH) '$(CD) source/alice; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak' 
-	$(SH) '$(CD) source/burp; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak' 
-	$(SH) '$(CD) source/csv; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak' 
-	$(SH) '$(CD) source/dsql; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak' 
-	$(SH) '$(CD) source/dudley; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak' 
-	$(SH) '$(CD) source/gpre; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak' 
-	$(SH) '$(CD) source/intl; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak' 
-	$(SH) '$(CD) source/lock; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak' 
-	$(SH) '$(CD) source/isql; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak' 
-	$(SH) '$(CD) source/journal; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak' 
-	$(SH) '$(CD) source/jrd; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak' 
-	$(SH) '$(CD) source/msgs; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak' 
-	$(SH) '$(CD) source/qli; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak' 
-	$(SH) '$(CD) source/remote; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak' 
-	$(SH) '$(CD) source/utilities; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak' 
-	$(SH) '$(CD) source/wal; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak' 
-	
-clean:	clean_executables
-	-$(RM) \
-	source/burp/gbaklib.a \
-	source/super/client/gds.so.0 \
-	source/examples/refresh \
-	source/jrd/gdsshr.a source/jrd/gdslib source/jrd/gds.sl \
-	source/jrd/gds_s.a source/jrd/gdsf_s.a \
-	source/jrd/gds.so.0 \
-	source/jrd/gdslib.so.1.0 source/jrd/gdslib.so.0.1 \
-	source/jrd/gdsflib.so.0.0 \
-	source/jrd/gds_b.a source/jrd/gds.a source/jrd/gds.a.solaris \
-	source/jrd/gds_pipe.a \
-	source/jrd/gdsmt.so.0 \
-	source/super/jrd/gds_ss.a source/super/client/gdsmt.so.1 \
-	source/super/client/gds.sl.1 \
-	source/pyxis/libpyxis.a \
-	source/qli/qlilib.a \
-	source/remote/inet_server.a source/remote/dnet_server.a
-
-clean_executables:
-	-$(RM) \
-	source/alice/alice \
-	source/burp/burp \
-	source/csv/central_server source/csv/csu \
-	source/dudley/dudley \
-	source/gpre/gpre \
-	source/intl/intl \
-	source/journal/gjrn source/journal/gds_archive \
-	source/jrd/codes \
-	source/lock/lock_print source/lock/manager \
-	source/jrd/gds_pipe \
-	source/msgs/build_file source/msgs/check_messages \
-	source/pyxis/fred \
-	source/qli/qli \
-	source/register/iscinstall \
-	source/remote/inet_server source/remote/dnet_server \
-	source/remote/gds_server \
-	source/super/remote/super_server \
-	source/utilities/dba source/utilities/drop source/utilities/gsec \
-	source/utilities/relay \
-	source/utilities/ibmgr source/utilities/ibguard \
-	source/wal/wal_writer
-
-force:
diff --git a/databases/firebird-devel/files/patch-ad b/databases/firebird-devel/files/patch-ad
deleted file mode 100644
index 4bcb2c1ce13c..000000000000
--- a/databases/firebird-devel/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-devel/files/patch-ae b/databases/firebird-devel/files/patch-ae
deleted file mode 100644
index 12f66c37082b..000000000000
--- a/databases/firebird-devel/files/patch-ae
+++ /dev/null
@@ -1,10 +0,0 @@
---- jrd/common.h.orig	Sat Nov 17 20:07:00 2001
-+++ jrd/common.h	Sun Nov 18 18:54:26 2001
-@@ -137,6 +137,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
diff --git a/databases/firebird-devel/files/patch-af b/databases/firebird-devel/files/patch-af
deleted file mode 100644
index 7ce937566bc3..000000000000
--- a/databases/firebird-devel/files/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
---- jrd/enc.c.orig	Fri Aug  4 06:50:03 2000
-+++ jrd/enc.c	Sun Nov 18 19:17:19 2001
-@@ -31,6 +31,10 @@
-  *
-  **************************************/
-
-+#ifdef FREEBSD
-+crypt_set_format("des");
-+#endif
-+
- return CRYPT_FUNC( string, salt);
- }
- #endif
diff --git a/databases/firebird-devel/files/patch-ag b/databases/firebird-devel/files/patch-ag
deleted file mode 100644
index a4768621e878..000000000000
--- a/databases/firebird-devel/files/patch-ag
+++ /dev/null
@@ -1,11 +0,0 @@
---- Configure.sh.orig	Tue Nov 20 05:00:25 2001
-+++ Configure.sh	Fri Dec 28 19:11:50 2001
-@@ -515,7 +515,7 @@
- BuildBootFlg="No"
- BuildHostType=""
- BuildBuildType="PROD"
--MasterSourceDir="`pwd`/refDatabases"
-+MasterSourceDir="$REFDBPATH"
- BuildIOsize=32
- 
- export BuildHostType
diff --git a/databases/firebird-devel/files/patch-ah b/databases/firebird-devel/files/patch-ah
deleted file mode 100644
index 7b0be011e898..000000000000
--- a/databases/firebird-devel/files/patch-ah
+++ /dev/null
@@ -1,14 +0,0 @@
---- porting/dsql/parse.c.orig	Wed Jan 30 16:53:19 2002
-+++ porting/dsql/parse.c	Wed Jan 30 17:38:08 2002
-@@ -4704,9 +4704,8 @@
- #endif	/* ANSI-C/C++ */
- #endif	/* ! YYPARSE_PARAM */
- 
--int
--dsql_yyparse (YYPARSE_PARAM_ARG)
--    YYPARSE_PARAM_DECL
-+int dsql_yyparse(USHORT client_dialect, USHORT db_dialect,
-+		USHORT parser_version, BOOLEAN *stmt_ambiguous)
- {
-     register int yym, yyn, yystate;
- #if YYDEBUG
diff --git a/databases/firebird-devel/files/patch-autogen.sh b/databases/firebird-devel/files/patch-autogen.sh
new file mode 100644
index 000000000000..509fba8c7bae
--- /dev/null
+++ b/databases/firebird-devel/files/patch-autogen.sh
@@ -0,0 +1,43 @@
+--- autogen.sh.orig	Sat Nov  1 14:50:38 2003
++++ autogen.sh	Mon Nov 10 16:24:17 2003
+@@ -8,7 +8,7 @@
+ SRCDIR=`dirname $0`
+ DIE=0
+ 
+-VER=`autoconf --version|grep '^[Aa]utoconf'|sed 's/^[^0-9]*//'`
++VER=`autoconf257 --version|grep '^[Aa]utoconf'|sed 's/^[^0-9]*//'`
+ case "$VER" in
+  0* | 1\.* | 2\.[0-9] | 2\.[0-9][a-z]* | \
+  2\.[1-4][0-9] | 2\.5[0-6][a-z]* )
+@@ -20,7 +20,7 @@
+   ;;
+ esac
+ 
+-VER=`libtool --version|grep ' libtool)'|sed 's/.*) \([0-9][0-9.]*\) .*/\1/'`
++VER=`libtool13 --version|grep ' libtool)'|sed 's/.*) \([0-9][0-9.]*\) .*/\1/'`
+ case "$VER" in
+  0* | 1\.[0-2] | 1\.[0-2][a-z]* | \
+  1\.3\.[0-2] | 1\.3\.[0-2][a-z]* )
+@@ -50,18 +50,18 @@
+ 
+ # Generate configure from configure.in
+ echo "Running libtoolize ..."
+-LIBTOOL_M4=`libtoolize --copy --force --dry-run|grep 'You should add the contents of'|sed "s,^[^/]*\(/[^']*\).*$,\1,"`
++LIBTOOL_M4=`libtoolize13 --copy --force --dry-run|grep 'You should add the contents of'|sed "s,^[^/]*\(/[^']*\).*$,\1,"`
+ if test "x$LIBTOOL_M4" != "x"; then
+  rm -f aclocal.m4
+  cp $LIBTOOL_M4 aclocal.m4
+ fi
+-libtoolize --copy --force || exit 1
++libtoolize13 --copy --force || exit 1
+ 
+ echo "Running autoheader ..."
+-autoheader || exit 1
++autoheader257 || exit 1
+ 
+ echo "Running autoconf ..."
+-autoconf || exit 1
++autoconf257 || exit 1
+ 
+ # If NOCONFIGURE is set, skip the call to configure
+ if test "x$NOCONFIGURE" = "x"; then
diff --git a/databases/firebird-devel/files/patch-builds::install::arch-specific::freebsd::install.sh.in b/databases/firebird-devel/files/patch-builds::install::arch-specific::freebsd::install.sh.in
new file mode 100644
index 000000000000..4ec98f79308e
--- /dev/null
+++ b/databases/firebird-devel/files/patch-builds::install::arch-specific::freebsd::install.sh.in
@@ -0,0 +1,45 @@
+--- builds/install/arch-specific/freebsd/install.sh.in.orig	Thu Nov 13 15:55:52 2003
++++ builds/install/arch-specific/freebsd/install.sh.in	Thu Nov 13 17:05:29 2003
+@@ -113,7 +113,7 @@
+ 
+ mkdir -p $DestDir 
+ mkdir $DestDir/bin 
+-mkdir $DestDir/examples 
++#mkdir $DestDir/examples 
+ mkdir $DestDir/help 
+ mkdir $DestDir/include 
+ mkdir $DestDir/intl 
+@@ -145,15 +145,15 @@
+ 
+ # Copy examples only if we have them
+ 
+-exampleFiles=`find $BuiltFBDir/examples/v5 -type f -print`
+-if [ -z "$exampleFiles" ]; then
+-	echo "Example files have not been built!"
+-else
+-	for i in $exampleFiles
+-	do
+-		cp $i $DestDir/examples
+-	done
+-fi
++#exampleFiles=`find $BuiltFBDir/examples/v5 -type f -print`
++#if [ -z "$exampleFiles" ]; then
++#	echo "Example files have not been built!"
++#else
++#	for i in $exampleFiles
++#	do
++#		cp $i $DestDir/examples
++#	done
++#fi
+ 
+ copyIfExists $BuiltFBDir/help/help.gbak $DestDir/help 
+ cp $BuiltFBDir/help/help.fdb $DestDir/help 
+@@ -275,7 +275,7 @@
+ 
+ # make databases writable by firebird only
+ # local database connections are not a good idea
+-chmod ug=rw,o= examples/*.fdb
++#chmod ug=rw,o= examples/*.fdb
+ chmod ug=rw,o= help/*.fdb
+ chmod ug=rw,o= security.fdb
+ 
diff --git a/databases/firebird-devel/files/patch-configure.in b/databases/firebird-devel/files/patch-configure.in
new file mode 100644
index 000000000000..0ae18532bc3b
--- /dev/null
+++ b/databases/firebird-devel/files/patch-configure.in
@@ -0,0 +1,22 @@
+--- configure.in.orig	Thu Nov  6 20:31:56 2003
++++ configure.in	Thu Nov 13 11:45:26 2003
+@@ -510,6 +510,19 @@
+ 	AC_DEFINE(HAVE_POSIX_THREADS)
+     ;;
+ 
++  FREEBSD)
++    dnl the AC_CHECK_TYPES for socklen_t doesn't include sys/socket.h
++    dnl so test for socklen_t with sys/socket.h included
++    AC_MSG_CHECKING(if sys/socket.h defines socklen_t)
++    AC_TRY_COMPILE([#include <sys/types.h>
++       #include <sys/socket.h>],
++    [socklen_t s;],
++    [AC_DEFINE(HAVE_SOCKLEN_T) AC_MSG_RESULT(yes)],
++    [AC_MSG_RESULT(no)])
++    dnl define HAVE_POSIX_THREADS for FreeBSD 4.x support
++    AC_DEFINE(HAVE_POSIX_THREADS)
++    ;;
++
+   SOLARIS|solx86)
+     dnl kkuznetsov: Solaris always check for -lnsl
+     AC_CHECK_LIB(nsl, gethostname, XE_APPEND(-lnsl,LIBS))
diff --git a/databases/firebird-devel/files/patch-porting::qli::help.c b/databases/firebird-devel/files/patch-porting::qli::help.c
deleted file mode 100644
index e330a8974ea6..000000000000
--- a/databases/firebird-devel/files/patch-porting::qli::help.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- porting/qli/help.c.orig	Wed Jan 30 14:30:54 2002
-+++ porting/qli/help.c	Fri Nov 22 19:36:28 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-devel/files/patch-src::common::classes::locks.h b/databases/firebird-devel/files/patch-src::common::classes::locks.h
new file mode 100644
index 000000000000..e2948dd4bbd2
--- /dev/null
+++ b/databases/firebird-devel/files/patch-src::common::classes::locks.h
@@ -0,0 +1,49 @@
+--- src/common/classes/locks.h.orig	Sun Aug 17 14:56:47 2003
++++ src/common/classes/locks.h	Wed Nov 12 11:12:25 2003
+@@ -77,7 +77,7 @@
+ 
+ /* Process-local spinlock. Used to manage memory heaps in threaded environment. */
+ // Pthreads version of the class
+-#ifndef SOLARIS
++#if !defined(SOLARIS) && !defined(DARWIN) && !defined(FREEBSD)
+ class Spinlock {
+ private:
+ 	pthread_spinlock_t spinlock;
+@@ -100,6 +100,7 @@
+ 	}
+ };
+ #else
++#ifdef SOLARIS
+ // Who knows why Solaris 2.6 have not THIS funny spins?
+ //The next code is not comlpeted but let me compile //Konstantin
+ class Spinlock {
+@@ -123,6 +124,29 @@
+ 			system_call_failed::raise();
+ 	}
+ };
++#else  // DARWIN and FREEBSD
++class Spinlock {
++private:
++	pthread_mutex_t mlock;
++public:
++	Spinlock() {
++		if (pthread_mutex_init(&mlock, 0))
++			system_call_failed::raise();
++	}
++	~Spinlock() {
++		if (pthread_mutex_destroy(&mlock))
++			system_call_failed::raise();
++	}
++	void enter() {
++		if (pthread_mutex_lock(&mlock))
++			system_call_failed::raise();
++	}
++	void leave() {
++		if (pthread_mutex_unlock(&mlock))
++			system_call_failed::raise();
++	}
++};
++#endif
+ 
+ #endif
+ #endif
diff --git a/databases/firebird-devel/pkg-descr b/databases/firebird-devel/pkg-descr
index c0ac8b0093af..7d4f34da338d 100644
--- a/databases/firebird-devel/pkg-descr
+++ b/databases/firebird-devel/pkg-descr
@@ -11,12 +11,12 @@ been closed.
 
 For more information on Firebird and InterBase, see:
 
-http://sourceforge.net/projects/firebird/
-http://www.ibphoenix.com/
-http://www.interbase2000.org/
-http://www.interbase.com/
-http://www.firebirdsql.org/
+WWW: http://sourceforge.net/projects/firebird/
+WWW: http://www.ibphoenix.com/
+WWW: http://www.interbase2000.org/
+WWW: http://www.interbase.com/
+WWW: http://www.firebirdsql.org/
 
 For more information on the locksmith back door, see:
 
-https://www.kb.cert.org/vuls/id/247371
+WWW: https://www.kb.cert.org/vuls/id/247371
diff --git a/databases/firebird-devel/pkg-install b/databases/firebird-devel/pkg-install
deleted file mode 100644
index af43f63a3943..000000000000
--- a/databases/firebird-devel/pkg-install
+++ /dev/null
@@ -1,159 +0,0 @@
-#!/bin/sh
-
-# Created in haste by smashing together various
-# files from the port scripts.
-
-if [ "$2" = "PRE-INSTALL" ]; then
-if [ -d $PKG_PREFIX/firebird ]; then
-	if [ -d $PKG_PREFIX/firebird.old ]; then
-		rm -rf $PKG_PREFIX/firebird.old
-	fi
-	mv $PKG_PREFIX/firebird $PKG_PREFIX/firebird.old
-fi
-
-if [ -L /usr/interbase ]; then
-	rm -f /usr/interbase
-fi
-
-if [ -d /usr/interbase ]; then
-	mv /usr/interbase /usr/interbase.old
-fi
-
-ln -fs $PKG_PREFIX/firebird /usr/interbase
-
-perl <<EOF
-eval '(exit \$?0)' && eval 'exec /usr/bin/perl -S \$0 \${1+"\$@"}'
-& eval 'exec /usr/bin/perl -S \$0 \$argv:q'
-if 0;
-
-if( \$> ) {
-	print "\nYou must be root to run this step!\n\n";
-	exit 1;
-}
-
-if( getpwnam( "firebird" ) ) {
-	( \$null, \$null, \$fbUID ) = getpwnam( "firebird" );
-} else {
-	\$fbUID = 90;
-	while( getpwuid( \$fbUID ) ) {
-		\$fbUID++;
-	}
-}
-
-if( getgrnam( "firebird" ) ) {
-	( \$null, \$null, \$fbGID ) = getgrnam( "firebird" );
-} else {
-	\$fbGID = 90;
-	while( getgrgid( \$fbGID ) ) {
-		\$fbGID++;
-	}
-	&append_file( "/etc/group", "firebird:*:\$fbGID:" );
-}
-
-print "firebird user using uid \$fbUID\n";
-print "firebird user using gid \$fbGID\n";
-
-system( "/usr/bin/chpass -a \"firebird:*:\$fbUID:\$fbGID\:\:0:0:Firebird pseudo-user:\$ENV{'PKG_PREFIX'}/firebird:/bin/sh\"" );
-
-sub append_file {
-	local(\$file,@list) = @_;
-	local(\$LOCK_EX) = 2;
-	local(\$LOCK_NB) = 4;
-	local(\$LOCK_UN) = 8;
-
-	open(F, ">> \$file") || die "\$file: \$!\n";
-	while( ! flock( F, \$LOCK_EX | \$LOCK_NB ) ) {
-		exit 1;
-	}
-	print F join( "\n", @list) . "\n";
-	close F;
-	flock( F, \$LOCK_UN );
-}
-EOF
-elif [ "$2" = "POST-INSTALL" ]; then
-chown -R firebird:firebird $PKG_PREFIX/firebird
-
-# Turn everybody to read only.
-chmod -R o=r $PKG_PREFIX/firebird
-
-# Now fix up the mess.
-
-# fix up directories
-for i in `find $PKG_PREFIX/firebird -print`
-  do
-    FileName=$i
-    if [ -d $FileName ]
-       then
-         chmod o=rx $FileName
-     fi
-  done
-
-# make lib ldconfig-compatible
-chown -R root:wheel $PKG_PREFIX/firebird/lib
-chmod -R g-w $PKG_PREFIX/firebird/lib
-
-# Fix UDF load problem
-cd $PKG_PREFIX/firebird/lib
-ln -sf ib_util.so libib_util.so
-
-cd $PKG_PREFIX/firebird/bin
-
-# all users can run everything.
-chmod o=rx *
-
-# SUID is needed for running server programs.
-
-for i in gds_lock_mgr gds_drop gds_inet_server
-  do
-    chmod ug+s $i
-  done
-
-
-# Lock files
-
-cd $PKG_PREFIX/firebird
-
-for i in isc_init1 isc_lock1 isc_event1
-  do
-    FileName=$i.`hostname`
-    touch $FileName
-    chmod uga=rw $FileName
-    chown firebird:firebird $FileName
-  done
-
-
-touch interbase.log
-chmod ugo=rw interbase.log
-
-# make databases writable by all
-chmod ugo=rw examples/v5/*.gdb
-chmod ugo=rw help/*.gdb
-chmod ugo=rw isc4.gdb
-
-# remove any existing gds service
-cp /etc/services /etc/services.old
-cp /etc/inetd.conf /etc/inetd.conf.old
-cat /etc/services |grep -v gds_db >/etc/services.new
-cat /etc/inetd.conf |grep -v gds_db >/etc/inetd.conf.new
-mv /etc/services.new /etc/services
-mv /etc/inetd.conf.new /etc/inetd.conf
-
-# add the gds service and restart inetd
-cat >>/etc/services <<EOF
-gds_db		 3050/tcp  #InterBase Database Remote Protocol
-EOF
-cat >>/etc/inetd.conf <<EOF
-gds_db	stream	tcp	nowait	firebird	/usr/interbase/bin/gds_inet_server  gds_inet_server
-EOF
-if [ -f /var/run/inetd.pid ]; then
-	kill -HUP `cat /var/run/inetd.pid`
-fi
-
-# shared lib startup script
-if [ -d $PKG_PREFIX/etc/rc.d ]; then
-	(
-	echo "#!/bin/sh"; echo "[ -d $PKG_PREFIX/firebird/lib ] && /sbin/ldconfig -m $PKG_PREFIX/firebird/lib"
-	) > $PKG_PREFIX/etc/rc.d/000.firebird.sh
-fi
-
-fi
diff --git a/databases/firebird-devel/pkg-message b/databases/firebird-devel/pkg-message
index f15892a06aaa..6f312bfec254 100644
--- a/databases/firebird-devel/pkg-message
+++ b/databases/firebird-devel/pkg-message
@@ -1,14 +1,19 @@
 
 ---------------------------------------------------------
-Firebird is now installed.  There is a symbolic link from
-/usr/interbase -> %%PREFIX%%/firebird.  Firebird needs this
-link for proper operation.
+Firebird is now installed.  A symbolic link from
+/usr/interbase -> %%PREFIX%%/firebird may be needed
+for compatibility with existing  programs that use
+Firebird.
+
+The symbolic link can be created with:
+
+% ln -s %%PREFIX%%/firebird /usr/interbase
 
 It is STRONGLY recommended that you change the SYSDBA
 password with:
 
-$ cd /usr/interbase
-$ gsec -user SYSDBA -pass masterkey
+% cd %%PREFIX%%/firebird
+% gsec -user SYSDBA -pass masterkey
 GSEC> modify SYSDBA -pw newpassword
 GSEC> quit
 
diff --git a/databases/firebird-devel/pkg-plist b/databases/firebird-devel/pkg-plist
index 10f152fcbc82..24d16ae63079 100644
--- a/databases/firebird-devel/pkg-plist
+++ b/databases/firebird-devel/pkg-plist
@@ -1,106 +1,73 @@
 etc/rc.d/000.firebird.sh
-firebird/intl/gdsintl
-firebird/examples/v5/ib_udf.sql
-firebird/examples/v5/README
-firebird/examples/v5/align.h
-firebird/examples/v5/api1.c
-firebird/examples/v5/api10.c
-firebird/examples/v5/api11.c
-firebird/examples/v5/api12.c
-firebird/examples/v5/api13.c
-firebird/examples/v5/api14.e
-firebird/examples/v5/api15.c
-firebird/examples/v5/api16.c
-firebird/examples/v5/api16t.c
-firebird/examples/v5/api2.c
-firebird/examples/v5/api3.c
-firebird/examples/v5/api4.c
-firebird/examples/v5/api5.c
-firebird/examples/v5/api6.c
-firebird/examples/v5/api7.c
-firebird/examples/v5/api8.c
-firebird/examples/v5/api9.c
-firebird/examples/v5/api9f.c
-firebird/examples/v5/apifull.c
-firebird/examples/v5/employe2.sql
-firebird/examples/v5/dyn1.e
-firebird/examples/v5/dyn2.e
-firebird/examples/v5/dyn3.e
-firebird/examples/v5/dyn4.e
-firebird/examples/v5/dyn5.e
-firebird/examples/v5/dynfull.e
-firebird/examples/v5/employee.gbk
-firebird/examples/v5/employee.gdb
-firebird/examples/v5/example.h
-firebird/examples/v5/api9f.sql
-firebird/examples/v5/intlemp.gbk
-firebird/examples/v5/intlemp.gdb
-firebird/examples/v5/stat1.e
-firebird/examples/v5/stat10.e
-firebird/examples/v5/stat11.e
-firebird/examples/v5/stat12.e
-firebird/examples/v5/stat12t.e
-firebird/examples/v5/stat2.e
-firebird/examples/v5/stat3.e
-firebird/examples/v5/stat4.e
-firebird/examples/v5/stat5.e
-firebird/examples/v5/stat6.e
-firebird/examples/v5/stat7.e
-firebird/examples/v5/stat8.e
-firebird/examples/v5/stat9.e
-firebird/examples/v5/udf.sql
-firebird/examples/v5/udflib.c
-firebird/examples/v5/makefile
-firebird/include/perf.h
-firebird/include/ib_util.h
-firebird/include/gds.hxx
-firebird/include/gds.h
-firebird/include/ibase.h
-firebird/include/iberror.h
-firebird/include/gds.f
-firebird/UDF/ib_udf
-firebird/lib/ib_util.so
-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/isc4.gbak
-firebird/bin/gpre
-firebird/bin/gds_pipe
+firebird/README
+firebird/UDF/fbudf.so
+firebird/UDF/fbudf.sql
+firebird/UDF/ib_udf.so
+firebird/UDF/ib_udf.sql
+firebird/WhatsNew
+firebird/aliases.conf
+firebird/bin/fb_inet_server
+firebird/bin/fb_lock_mgr
+firebird/bin/fb_lock_print
+firebird/bin/gbak
+firebird/bin/gdef
 firebird/bin/gds_drop
-firebird/bin/gds_lock_mgr
 firebird/bin/gfix
-firebird/bin/gdef
-firebird/bin/isql
-firebird/bin/gds_lock_print
-firebird/bin/qli
-firebird/bin/gds_inet_server
+firebird/bin/gpre
+firebird/bin/gsec
 firebird/bin/gsplit
 firebird/bin/gstat
-firebird/bin/gds_relay
-firebird/bin/gsec
-firebird/bin/gbak
-firebird/services.isc
-firebird/isc_config
-firebird/isc4.gdb
-firebird/interbase.msg
-firebird/interbase.log
-firebird/inetd.conf.isc
-firebird/RELNOTES
-@dirrm firebird
-@dirrm firebird/intl
-@dirrm firebird/examples/v3
-@dirrm firebird/examples/v4
-@dirrm firebird/examples/v5
-@dirrm firebird/examples
-@dirrm firebird/include
+firebird/bin/isql
+firebird/bin/qli
+firebird/doc/README.NTSecurity
+firebird/doc/README.build.mingw.html
+firebird/doc/README.build.msvc.html
+firebird/doc/README.coding.style
+firebird/doc/README.instsvc
+firebird/doc/README.makefiles
+firebird/doc/README.user
+firebird/doc/README.user.embedded
+firebird/doc/README.user.troubleshooting
+firebird/doc/sql.extensions/README.aggregate_tracking
+firebird/doc/sql.extensions/README.case
+firebird/doc/sql.extensions/README.coalesce
+firebird/doc/sql.extensions/README.context_variables
+firebird/doc/sql.extensions/README.data_types
+firebird/doc/sql.extensions/README.exception_handling
+firebird/doc/sql.extensions/README.execute_statement
+firebird/doc/sql.extensions/README.explicit_locks
+firebird/doc/sql.extensions/README.nullif
+firebird/doc/sql.extensions/README.order_by_expressions_nulls
+firebird/doc/sql.extensions/README.savepoints
+firebird/doc/sql.extensions/README.universal_triggers
+firebird/firebird.conf
+@unexec rm -f %D/firebird/firebird.log
+firebird/firebird.msg
+firebird/help/help.fdb
+firebird/include/blr.h
+firebird/include/gds.h
+firebird/include/ib_util.h
+firebird/include/ibase.h
+firebird/include/iberror.h
+firebird/include/perf.h
+firebird/intl/fbintl
+@unexec rm -f %D/firebird/isc_event1.`hostname`
+@unexec rm -f %D/firebird/isc_init1.`hostname`
+@unexec rm -f %D/firebird/isc_lock1.`hostname`
+firebird/lib/libfbclient.so
+firebird/lib/libfbclient.so.2
+firebird/lib/libfbclient.so.2.0.0
+firebird/lib/libfbembed.so
+firebird/lib/libfbembed.so.2
+firebird/lib/libfbembed.so.2.0.0
+firebird/lib/libib_util.so
+firebird/security.fdb
 @dirrm firebird/UDF
-@dirrm firebird/lib
-@dirrm firebird/help
 @dirrm firebird/bin
+@dirrm firebird/doc/sql.extensions
+@dirrm firebird/doc
+@dirrm firebird/help
+@dirrm firebird/include
+@dirrm firebird/intl
+@dirrm firebird/lib
+@dirrm firebird
diff --git a/databases/firebird-devel/scripts/addservice b/databases/firebird-devel/scripts/addservice
deleted file mode 100644
index df9aea5e91de..000000000000
--- a/databases/firebird-devel/scripts/addservice
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-cat >>/etc/services <<EOF
-gds_db		 3050/tcp  #InterBase Database Remote Protocol
-EOF
-cat >>/etc/inetd.conf <<EOF
-gds_db	stream	tcp	nowait	firebird	/usr/interbase/bin/gds_inet_server  gds_inet_server
-EOF
-kill -HUP `cat /var/run/inetd.pid`
diff --git a/databases/firebird-devel/scripts/createuser b/databases/firebird-devel/scripts/createuser
deleted file mode 100644
index eba7ce1b887d..000000000000
--- a/databases/firebird-devel/scripts/createuser
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/usr/bin/perl
-#
-
-eval '(exit $?0)' && eval 'exec /usr/bin/perl -S $0 ${1+"$@"}'
-& eval 'exec /usr/bin/perl -S $0 $argv:q'
-if 0;
-
-if( $> ) {
-	print "\nYou must be root to run this step!\n\n";
-	exit 1;
-}
-
-if( getpwnam( "firebird" ) ) {
-	( $null, $null, $fbUID ) = getpwnam( "firebird" );
-} else {
-	$fbUID = 90;
-	while( getpwuid( $fbUID ) ) {
-		$fbUID++;
-	}
-}
-
-if( getgrnam( "firebird" ) ) {
-	( $null, $null, $fbGID ) = getgrnam( "firebird" );
-} else {
-	$fbGID = 90;
-	while( getgrgid( $fbGID ) ) {
-		$fbGID++;
-	}
-	&append_file( "/etc/group", "firebird:*:$fbGID:" );
-}
-
-print "firebird user using uid $fbUID\n";
-print "firebird user using gid $fbGID\n";
-
-system( "/usr/bin/chpass -a \"firebird:*:$fbUID:$fbGID\:\:0:0:Firebird pseudo-user:$ENV{'PREFIX'}/firebird:/bin/sh\"" );
-
-sub append_file {
-	local($file,@list) = @_;
-	local($LOCK_EX) = 2;
-	local($LOCK_NB) = 4;
-	local($LOCK_UN) = 8;
-
-	open(F, ">> $file") || die "$file: $!\n";
-	while( ! flock( F, $LOCK_EX | $LOCK_NB ) ) {
-		exit 1;
-	}
-	print F join( "\n", @list) . "\n";
-	close F;
-	flock( F, $LOCK_UN );
-}
diff --git a/databases/firebird-devel/scripts/post-install b/databases/firebird-devel/scripts/post-install
deleted file mode 100644
index 68b4ccadb907..000000000000
--- a/databases/firebird-devel/scripts/post-install
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/bin/sh
-
-chown -R firebird:firebird $PREFIX/firebird
-
-# Turn everybody to read only.
-chmod -R o=r $PREFIX/firebird
-
-# Now fix up the mess.
-
-# fix up directories
-for i in `find $PREFIX/firebird -print`
-  do
-    FileName=$i
-    if [ -d $FileName ]
-       then
-         chmod o=rx $FileName
-     fi
-  done
-
-# make lib ldconfig-compatible
-chown -R root:wheel $PREFIX/firebird/lib
-chmod -R g-w $PREFIX/firebird/lib
-
-# Fix UDF load problem
-cd $PREFIX/firebird/lib
-ln -sf ib_util.so libib_util.so
-
-cd $PREFIX/firebird/bin
-
-# all users can run everything.
-chmod o=rx *
-
-# SUID is needed for running server programs.
-
-for i in gds_lock_mgr gds_drop gds_inet_server
-  do
-    chmod ug+s $i
-  done
-
-
-# Lock files
-
-cd $PREFIX/firebird
-
-for i in isc_init1 isc_lock1 isc_event1
-  do
-    FileName=$i.`hostname`
-    touch $FileName
-    chmod uga=rw $FileName
-    chown firebird:firebird $FileName
-  done
-
-
-touch interbase.log
-chmod ugo=rw interbase.log
-
-# make databases writable by all
-chmod ugo=rw examples/v5/*.gdb
-chmod ugo=rw help/*.gdb
-chmod ugo=rw isc4.gdb
-
-# remove any existing gds service
-sh $SCRIPTDIR/rmservice
-
-# add the gds service and restart inetd
-sh $SCRIPTDIR/addservice
-if [ -f /var/run/inetd.pid ]; then
-	kill -HUP `cat /var/run/inetd.pid`
-fi
-
-sed "s|%%PREFIX%%|$PREFIX|" $SCRIPTDIR/../pkg-message
-
-cat <<EOF
-
-==========================================================
-!! NOTE !!
-
-As there are some oddities to the Firebird build process,
-it is likely you WILL NOT BE ABLE TO USE IT until you
-remove the semaphore created during the build process.
-Please read $PREFIX/firebird/RELNOTES for more information.
-==========================================================
-
-EOF
diff --git a/databases/firebird-devel/scripts/pre-build b/databases/firebird-devel/scripts/pre-build
deleted file mode 100644
index 6605df7770fd..000000000000
--- a/databases/firebird-devel/scripts/pre-build
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-GDS_LOCK_MGR=`ps ax |grep gds_lock_mgr |grep -v grep`;
-
-if [ "$GDS_LOCK_MGR" != "" ]; then
-	echo "It appears you have a gds_lock_manager already running.";
-	echo;
-	echo "You must cease all InterBase operations to build this port.";
-	echo "Make sure nobody is connected to any databases, then use";
-	echo "'gds_drop -a' and manually verify (with ipcs) that the";
-	echo "semaphores were removed.";
-	exit 1;
-fi
-exit 0
-
diff --git a/databases/firebird-devel/scripts/pre-install b/databases/firebird-devel/scripts/pre-install
deleted file mode 100644
index a6e1b37a9008..000000000000
--- a/databases/firebird-devel/scripts/pre-install
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-if [ -d $PREFIX/firebird ]; then
-	if [ -d $PREFIX/firebird.old ]; then
-		rm -rf $PREFIX/firebird.old
-	fi
-	mv $PREFIX/firebird $PREFIX/firebird.old
-fi
-
-if [ -L /usr/interbase ]; then
-	rm -f /usr/interbase
-fi
-
-if [ -d /usr/interbase ]; then
-	mv /usr/interbase /usr/interbase.old
-fi
-
-ln -fs $PREFIX/firebird /usr/interbase
-
-perl $SCRIPTDIR/createuser
diff --git a/databases/firebird-devel/scripts/rmservice b/databases/firebird-devel/scripts/rmservice
deleted file mode 100644
index 58adfc17419d..000000000000
--- a/databases/firebird-devel/scripts/rmservice
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-cp /etc/services /etc/services.old
-cp /etc/inetd.conf /etc/inetd.conf.old
-cat /etc/services |grep -v gds_db >/etc/services.new
-cat /etc/inetd.conf |grep -v gds_db >/etc/inetd.conf.new
-mv /etc/services.new /etc/services
-mv /etc/inetd.conf.new /etc/inetd.conf