ebuild clean up

10 files changed, 7 insertions, 465 deletions

diff --git a/dev-db/firebird/ChangeLog b/dev-db/firebird/ChangeLog
index 161cf771ec28..414f122b53d3 100644
--- a/dev-db/firebird/ChangeLog
+++ b/dev-db/firebird/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/firebird
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.23 2004/09/13 11:23:35 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.24 2004/09/13 19:08:17 carlo Exp $
+
+  13 Sep 2004; Carsten Lohrke <carlo@gentoo.org>
+  -files/firebird-1.0-gentoo.patch, -files/firebird-1.0.3-gentoo.patch,
+  -firebird-1.0-r1.ebuild, -firebird-1.0.3.ebuild, -firebird-1.5.0.ebuild:
+  ebuild clean up
 
   13 Sep 2004; Karol Wojtaszek <sekretarz@gentoo.org>
   +files/firebird-1.5.1-gcc34.patch, firebird-1.5.1.ebuild:
diff --git a/dev-db/firebird/Manifest b/dev-db/firebird/Manifest
index af8e6497d872..c3d29249ba89 100644
--- a/dev-db/firebird/Manifest
+++ b/dev-db/firebird/Manifest
@@ -1,18 +1,10 @@
 MD5 a937e33e83997615b610b3624c9ffce2 firebird-1.5.1.ebuild 6380
-MD5 1fdb8d9812bacc51f0d86c613f8b076b firebird-1.5.0.ebuild 6069
-MD5 a518634730159985cac474656e6bd14c firebird-1.0-r1.ebuild 1386
-MD5 6a010949bc9473eb92865d074a4799f8 ChangeLog 3472
-MD5 1d54302ca7041f24c22270b53dd9b095 firebird-1.0.3.ebuild 2608
-MD5 d795330e017a7f1afb99a0bbf69eaeb3 files/firebird-1.0.3-gentoo.patch 1661
+MD5 399f2bdef67c27381deb0dd8692ebe40 ChangeLog 3683
 MD5 c5f5e6bae2cae891269931331e69f1ca files/firebird.conf.d 80
 MD5 19238be258dea758cf3f082df5ae813a files/firebird.init.d 697
 MD5 d3278f869be37481ddde143f5ee98c4a files/70firebird-1.5.0 50
 MD5 b0d6de21d0e14d41983d440d5675e9d5 files/firebird.xinetd 206
-MD5 d76a09a887248deb2d4d466f06515730 files/firebird-1.0-gentoo.patch 2549
 MD5 5b28cc81eff2c59fbee652dc2c6ed483 files/firebird-1.5.0.xinetd 425
 MD5 228f9ea2d6f609009a96bc5592142e19 files/firebird-1.5.1-gcc34.patch 5735
-MD5 00a05e4f04f632436d491144b0bd8853 files/digest-firebird-1.0-r1 150
 MD5 a71afe7683db444d9647fc136eaeb1c1 files/70firebird 77
-MD5 10d808d19eb3949349b591c3d525b74a files/digest-firebird-1.0.3 150
-MD5 977b78810d680e76baafbefde76323cf files/digest-firebird-1.5.0 73
 MD5 606e690fe61535cc02d7314616e263fb files/digest-firebird-1.5.1 73
diff --git a/dev-db/firebird/files/digest-firebird-1.0-r1 b/dev-db/firebird/files/digest-firebird-1.0-r1
deleted file mode 100644
index 1b637ba09fdb..000000000000
--- a/dev-db/firebird/files/digest-firebird-1.0-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 281f10057da7e255a49e296bbc3d9c70 FirebirdCS-1.0.0.796-0.tar.gz 2642252
-MD5 53bfebb4a269eb0f3c508587a843ddf8 Firebird-1.0.0.796.src.tar.gz 6760598
diff --git a/dev-db/firebird/files/digest-firebird-1.0.3 b/dev-db/firebird/files/digest-firebird-1.0.3
deleted file mode 100644
index e30a3fbfd283..000000000000
--- a/dev-db/firebird/files/digest-firebird-1.0.3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 b12e48e95e6b208b56c0f2835dcaf74b FirebirdCS-1.0.3.972-0.tar.gz 2618227
-MD5 f90c2e43e4ad19b58b4de2d16d18710e Firebird-1.0.3.972.src.tar.gz 6956659
diff --git a/dev-db/firebird/files/digest-firebird-1.5.0 b/dev-db/firebird/files/digest-firebird-1.5.0
deleted file mode 100644
index e2584a358901..000000000000
--- a/dev-db/firebird/files/digest-firebird-1.5.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c088ccf4d149ecc1fa03ee27e9043701 firebird-1.5.0.4290.tar.bz2 4364535
diff --git a/dev-db/firebird/files/firebird-1.0-gentoo.patch b/dev-db/firebird/files/firebird-1.0-gentoo.patch
deleted file mode 100644
index dd50f414e7f2..000000000000
--- a/dev-db/firebird/files/firebird-1.0-gentoo.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff -u -r firebird-1.0.0.796_orig/builds/original/build_kit firebird-1.0.0.796/builds/original/build_kit
---- firebird-1.0.0.796_orig/builds/original/build_kit	2001-08-06 17:34:57.000000000 +0200
-+++ firebird-1.0.0.796/builds/original/build_kit	2002-03-22 09:24:24.000000000 +0100
-@@ -67,7 +67,7 @@
- 
- #
- 
--LD_LIBRARY_PATH=$CURDIR/jrd:$CURDIR/interbase/lib
-+LD_LIBRARY_PATH=$CURDIR/jrd:$CURDIR/interbase/lib:$INTERBASE/lib
- SHLIB_PATH=$CURDIR/jrd
- 
- export LD_LIBRARY_PATH
-diff -u -r firebird-1.0.0.796_orig/builds/original/prefix.linux firebird-1.0.0.796/builds/original/prefix.linux
---- firebird-1.0.0.796_orig/builds/original/prefix.linux	2002-03-08 12:42:26.000000000 +0100
-+++ firebird-1.0.0.796/builds/original/prefix.linux	2002-03-22 09:24:24.000000000 +0100
-@@ -33,7 +33,7 @@
- PROD_DEBUG_OBJECTS=	nodebug.o
- PROD_SHRLIB_DIR=	-Lsource/jrd -Lsource/interbase/lib
- PROD_VERSION_FLAG=	-DPROD_BUILD
--PROD_CFLAGS=            -O3 -m486 -fpic -DFLINTSTONE
-+PROD_CFLAGS=        $(GENTOO_CFLAGS) -fpic -DFLINTSTONE
- 
- 
- DEV_DEBUG_OBJECTS=	grammar.o dbg.o dbt.o dmp.o
-diff -u -r firebird-1.0.0.796_orig/jrd/misc.c firebird-1.0.0.796/jrd/misc.c
---- firebird-1.0.0.796_orig/jrd/misc.c	2000-08-03 22:50:58.000000000 +0200
-+++ firebird-1.0.0.796/jrd/misc.c	2002-03-22 09:24:24.000000000 +0100
-@@ -73,16 +73,16 @@
-    pop the arguments off the call stack and put
-    them into the passed buffer */
- 
--while (arg_type = va_arg (ptr, SCHAR))
-+while (arg_type = va_arg (ptr, int))
-     switch (arg_type)
- 	{
- 	case dtype_byte: /* byte */
--	    ch = va_arg (ptr, SCHAR);
-+	    ch = va_arg (ptr, int);
- 	    STUFF (p, ch);
- 	    break;
- 
- 	case dtype_short: /* short value */
--	    sh = va_arg (ptr, USHORT);
-+	    sh = va_arg (ptr, int);
- 	    STUFF_SHORT (p, sh);
- 	    break;
- 
-@@ -97,7 +97,7 @@
- 	    break;
- 
- 	case dtype_varying: /* short value followed by a value with that many bytes */
--	    sh = va_arg (ptr, USHORT);
-+	    sh = va_arg (ptr, int);
- 	    STUFF_SHORT (p, sh);
- 	    q = va_arg (ptr, UCHAR*);
- 	    STUFF_BYTES (p, q, sh);
-diff -u -r firebird-1.0.0.796_orig/qli/help.e firebird-1.0.0.796/qli/help.e
---- firebird-1.0.0.796_orig/qli/help.e	2000-08-03 22:53:52.000000000 +0200
-+++ firebird-1.0.0.796/qli/help.e	2002-03-22 10:04:29.000000000 +0100
-@@ -160,7 +160,7 @@
-     if (!(l = p - X.TOPIC))
- 	continue;
-     if (++topics == 1 && banner)
--	ib_printf ("%s\n", banner, string, parent);
-+	ib_printf ("%s\n", banner);
-     p = line + ((ptr - line + COLUMN_WIDTH - 1) / COLUMN_WIDTH) * COLUMN_WIDTH;
-     if (p + l > line + RIGHT_MARGIN)
- 	{
diff --git a/dev-db/firebird/files/firebird-1.0.3-gentoo.patch b/dev-db/firebird/files/firebird-1.0.3-gentoo.patch
deleted file mode 100644
index c9e1515e1378..000000000000
--- a/dev-db/firebird/files/firebird-1.0.3-gentoo.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -urN interbase_old/builds/original/build_kit interbase/builds/original/build_kit
---- interbase_old/builds/original/build_kit	2001-08-06 18:34:57.000000000 +0300
-+++ interbase/builds/original/build_kit	2003-06-10 16:56:46.000000000 +0300
-@@ -67,7 +67,7 @@
- 
- #
- 
--LD_LIBRARY_PATH=$CURDIR/jrd:$CURDIR/interbase/lib
-+LD_LIBRARY_PATH=$CURDIR/jrd:$CURDIR/interbase/lib:$INTERBASE/lib
- SHLIB_PATH=$CURDIR/jrd
- 
- export LD_LIBRARY_PATH
-diff -urN interbase_old/builds/original/prefix.linux interbase/builds/original/prefix.linux
---- interbase_old/builds/original/prefix.linux	2003-05-30 12:56:17.000000000 +0300
-+++ interbase/builds/original/prefix.linux	2003-06-10 16:58:09.000000000 +0300
-@@ -33,7 +33,7 @@
- PROD_DEBUG_OBJECTS=	nodebug.o
- PROD_SHRLIB_DIR=	-Lsource/jrd -Lsource/interbase/lib
- PROD_VERSION_FLAG=	-DPROD_BUILD
--PROD_CFLAGS=            -O3 -march=i486 -fpic -DFLINTSTONE
-+PROD_CFLAGS=           $(GENTOO_CFLAGS) -fpic -DFLINTSTONE
- 
- 
- DEV_DEBUG_OBJECTS=	grammar.o dbg.o dbt.o dmp.o
-diff -urN interbase_old/jrd/val.c interbase/jrd/val.c
---- interbase_old/jrd/val.c.orig	2003-10-29 12:41:56.173403352 +0000
-+++ interbase/jrd/val.c	2003-10-29 12:42:19.547849896 +0000
-@@ -100,8 +100,8 @@
-    If other attachments are already made locally or through the same multi-
-    client server, validate gives up with the message:
- 
--   "Lock timeout during wait transaction
--   -- Object "database_filename.gdb" is in use"
-+   Lock timeout during wait transaction
-+   -- Object "database_filename.gdb" is in use
- 
-    If other processes or servers are attached to the database, validate 
-    waits for the exclusive lock on the database (i.e. waits for every 
diff --git a/dev-db/firebird/firebird-1.0-r1.ebuild b/dev-db/firebird/firebird-1.0-r1.ebuild
deleted file mode 100644
index 763a7f40131f..000000000000
--- a/dev-db/firebird/firebird-1.0-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-1.0-r1.ebuild,v 1.11 2004/06/29 15:34:12 agriffis Exp $
-
-S=${WORKDIR}/${PN}-1.0.0.796
-DESCRIPTION="A relational database offering many ANSI SQL-92 features"
-SRC_URI="mirror://sourceforge/${PN}/FirebirdCS-1.0.0.796-0.tar.gz
-	mirror://sourceforge/${PN}/Firebird-1.0.0.796.src.tar.gz"
-HOMEPAGE="http://firebird.sourceforge.net/"
-SLOT="0"
-LICENSE="MPL-1.1"
-KEYWORDS="x86"
-IUSE=""
-DEPEND="app-shells/bash
-	app-arch/zip
-	>=sys-devel/gcc-2.95.3-r5"
-
-src_unpack() {
-	unpack FirebirdCS-1.0.0.796-0.tar.gz
-	cd ${WORKDIR}
-	unpack Firebird-1.0.0.796.src.tar.gz
-	cd ${WORKDIR}/FirebirdCS-1.0.0.796-0
-	tar xzf buildroot.tar.gz
-
-	cd ${S}
-	patch -p1 < ${FILESDIR}/${P}-gentoo.patch
-}
-
-src_compile() {
-	export INTERBASE="${WORKDIR}/FirebirdCS-1.0.0.796-0/opt/interbase/"
-	export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$INTERBASE/lib"
-	export FIREBIRD_64_BIT_IO="1"
-	export NOPROMPT_SETUP="1"
-	export GENTOO_CFLAGS=$CFLAGS
-	./Configure.sh PROD || die
-	cd ${S}/interbase/lib
-	ln -s gds.so libgds.so
-	cd ${S}
-	source Configure_SetupEnv.sh
-	make LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$INTERBASE/lib" firebird || die
-	make classictarfile || die
-}
-
-src_install () {
-	dodoc README
-	cd ${D}
-	tar xzpf ${S}/FirebirdCS-1.0.0.796-0.64IO/buildroot.tar.gz
-}
diff --git a/dev-db/firebird/firebird-1.0.3.ebuild b/dev-db/firebird/firebird-1.0.3.ebuild
deleted file mode 100644
index 49bf74ccc429..000000000000
--- a/dev-db/firebird/firebird-1.0.3.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-1.0.3.ebuild,v 1.9 2004/06/29 15:34:12 agriffis Exp $
-
-S=${WORKDIR}/interbase
-DESCRIPTION="A relational database offering many ANSI SQL-92 features"
-SRC_URI="mirror://sourceforge/${PN}/FirebirdCS-1.0.3.972-0.tar.gz
-	mirror://sourceforge/${PN}/Firebird-1.0.3.972.src.tar.gz"
-HOMEPAGE="http://firebird.sourceforge.net/"
-SLOT="0"
-LICENSE="MPL-1.1"
-KEYWORDS="x86"
-IUSE=""
-DEPEND="app-shells/bash
-	app-arch/zip
-	>=sys-devel/gcc-2.95.3-r5"
-RESTRICT="nouserpriv"
-
-inherit flag-o-matic
-
-# fix bug #33584
-strip-flags "-funroll-loops"
-
-src_unpack() {
-	unpack FirebirdCS-1.0.3.972-0.tar.gz
-	cd ${WORKDIR}
-	unpack Firebird-1.0.3.972.src.tar.gz
-	cd ${WORKDIR}/FirebirdCS-1.0.3.972-0
-	tar xzf buildroot.tar.gz
-
-	cd ${S}
-	patch -p1 < ${FILESDIR}/${P}-gentoo.patch
-}
-
-src_compile() {
-	export INTERBASE="${WORKDIR}/FirebirdCS-1.0.3.972-0/opt/interbase/"
-	export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$INTERBASE/lib"
-	export FIREBIRD_64_BIT_IO="1"
-	export NOPROMPT_SETUP="1"
-	export GENTOO_CFLAGS=$CFLAGS
-	./Configure.sh PROD || die
-	cd ${S}/interbase/lib
-	ln -s gds.so libgds.so
-	cd ${S}
-	source Configure_SetupEnv.sh
-	make LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$INTERBASE/lib" firebird || die
-	make classictarfile || die
-}
-
-src_install () {
-	dodoc README
-	cd ${D}
-	tar xzpf ${S}/FirebirdCS-1.0.3.972-0.64IO/buildroot.tar.gz
-	insinto /etc/xinetd.d ; newins ${FILESDIR}/firebird.xinetd firebird
-	insinto /etc/env.d ; doins ${FILESDIR}/70firebird
-
-	# kill lingering gds_lock_mgr processes - bug #15071
-	kill `ps aux | grep gds_lock_mgr | grep '/var/tmp/portage' | awk '{print $2}'`
-	# move isc4.gdb and isc_config to /etc/firebird and have them
-	# protected by CONFIG_PTROTECT
-	dodir /etc/firebird
-	mv ${D}/opt/interbase/{isc4.gdb,isc_config} ${D}/etc/firebird
-	dosym /etc/firebird/isc4.gdb /opt/interbase/isc4.gdb
-	dosym /etc/firebird/isc_config /opt/interbase/isc_config
-
-	# check for old isc4.gdb from old 1.0 firebird installation. We need it
-	# so it installation won't overwrite original
-	if [ ! -L /opt/interbase/isc4.gdb ]
-	then
-	  cp /opt/interbase/isc4.gdb ${D}/etc/firebird/isc4.gdb
-	fi
-}
-
-pkg_postinst() {
-	einfo
-	einfo "If not done already, please execute the command"
-	einfo "\"ebuild /var/db/pkg/dev-db/${PF}/${PF}.ebuild config\"	"
-	einfo "to add gds_db to /etc/services"
-	einfo
-}
-
-pkg_config() {
-	echo -e "#\n#Service added for gds_db (firebird)\n#" >> /etc/services
-	echo "gds_db		3050/tcp" >> /etc/services
-
-	einfo "added gds_db to /etc/services"
-}
diff --git a/dev-db/firebird/firebird-1.5.0.ebuild b/dev-db/firebird/firebird-1.5.0.ebuild
deleted file mode 100644
index 85f623fe557f..000000000000
--- a/dev-db/firebird/firebird-1.5.0.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-1.5.0.ebuild,v 1.9 2004/06/29 15:34:12 agriffis Exp $
-
-inherit flag-o-matic eutils
-
-extra_ver="4290"
-DESCRIPTION="A relational database offering many ANSI SQL-92 features"
-HOMEPAGE="http://firebird.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.${extra_ver}.tar.bz2"
-
-LICENSE="Interbase-1.0"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="inetd"
-RESTRICT="nouserpriv"
-
-DEPEND="virtual/libc
-	inetd? ( virtual/inetd )"
-
-S=${WORKDIR}/${P}.${extra_ver}
-
-pkg_setup() {
-	enewgroup firebird 450
-	enewuser firebird 450 /bin/bash /opt/firebird firebird
-}
-
-src_compile() {
-	# fix bug #33584
-	strip-flags -funroll-loops
-
-	local myconf
-
-	myconf="${myconf} --prefix=/opt/firebird"
-	myconf="${myconf} --with-editline"
-	use inetd || myconf="${myconf} --enable-superserver"
-	./autogen.sh ${myconf} || die "couldn't run autogen.sh"
-	make || die "error during make"
-}
-
-src_install() {
-	cd ${S}/gen
-	make -f Makefile.install tarfile || or die "Can't create buildroot tar file"
-	cd ${D}
-	tar zxpf ${S}/gen/Firebird?S-*/buildroot.tar.gz
-
-	dodoc ${D}/opt/firebird/{README,WhatsNew,doc/*}
-	docinto examples
-	dodoc ${D}/opt/firebird/examples/*
-	docinto sql.extensions
-	dodoc ${D}/opt/firebird/doc/sql.extensions/*
-
-	rm -r ${D}/opt/firebird/{README,WhatsNew,doc,misc}
-	rm -r ${D}/opt/firebird/examples
-
-	if use inetd ; then
-		insinto /etc/xinetd.d ; newins ${FILESDIR}/${P}.xinetd firebird
-	else
-		exeinto /etc/init.d ; newexe ${FILESDIR}/${PN}.init.d firebird
-		insinto /etc/conf.d ; newins ${FILESDIR}/firebird.conf.d firebird
-		fperms 640 /etc/conf.d/firebird
-	fi
-	insinto /etc/env.d ; newins ${FILESDIR}/70${P} 70firebird
-
-	# Following is adapted from postinstall.sh
-
-	# make sure everything is owned by firebird
-	chown -R firebird:firebird ${D}/opt/firebird
-
-	# make sure permissions are set
-	chmod -R o= ${D}/opt/firebird
-
-	# fix directories
-	find ${D}/opt/firebird -print -type d | xargs chmod o=rx
-
-	# set permissions for /bin
-	cd ${D}/opt/firebird/bin
-	chmod ug=rx,o= *
-	chmod a=rx isql
-	chmod a=rx qli
-
-	use inetd && chmod ug=rxs,o= ${D}/opt/firebird/bin/{fb_lock_mgr,gds_drop,fb_inet_server}
-	chmod u=rw,go=r ${D}/opt/firebird/{aliases.conf,firebird.conf}
-	chmod ug=rw,o= ${D}/opt/firebird/{security.fdb,help/help.fdb}
-
-	for i in include lib UDF intl; do chmod a=r ${D}/opt/firebird/${i}/*; done
-	chmod ug=rx,o= ${D}/opt/firebird/{intl/fbintl,UDF/fbudf.so,UDF/ib_udf.so}
-
-	# create links for back compatibility
-	dosym /opt/firebird/lib/libfbclient.so /usr/lib/libgds.so
-	dosym /opt/firebird/lib/libfbclient.so /usr/lib/libgds.so.0
-
-	# move and link config files to /etc/firebird so they'll be protected
-	dodir /etc/firebird
-	mv ${D}/opt/firebird/{security.fdb,aliases.conf,firebird.conf} ${D}/etc/firebird
-	dosym /etc/firebird/security.fdb /opt/firebird/security.fdb
-	dosym /etc/firebird/aliases.conf /opt/firebird/aliases.conf
-	dosym /etc/firebird/firebird.conf /opt/firebird/firebird.conf
-}
-
-pkg_postinst() {
-	einfo
-	einfo "1. If haven't done so already, please run:"
-	einfo
-	einfo "   \"ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config\""
-	einfo
-	einfo "   to create lockfiles, set permissions and more"
-	einfo
-	einfo "2. Firebird now runs with it's own user. Please remember to"
-	einfo "   set permissions to firebird:firebird on databases you "
-	einfo "   already have (if any)."
-	einfo
-
-	if ! use inetd
-	then
-		einfo "3. You've built the stand alone deamon version,"
-		einfo "   SuperServer. If you were using pre 1.5.0 ebuilds"
-		einfo "   you're probably have one installed via xinetd. please"
-		einfo "   remember to disable it (usually in /etc/xinetd.d/firebird),"
-		einfo "   since the current one has it's own init script under"
-		einfo "   /etc/init.d"
-	fi
-}
-
-pkg_config() {
-	cd /opt/firebird
-
-	# Create Lock files
-	for i in isc_init1 isc_lock1 isc_event1
-	do
-		FileName=$i.`hostname`
-		touch $FileName
-		chown firebird:firebird $FileName
-		chmod ug=rw,o= $FileName
-	done
-
-	# Create log
-	if [ ! -h firebird.log ]
-	then
-		if [ -f firebird.log ]
-		then
-			mv firebird.log /var/log
-		else
-			touch /var/log/firebird.log
-			chown firebird:firebird /var/log/firebird.log
-			chmod ug=rw,o= /var/log/firebird.log
-		fi
-
-		# symlink the log to /var/log
-		ln -s /var/log/firebird.log firebird.log
-	fi
-
-	# add gds_db to /etc/services
-	if [ -z "`grep gds_db  /etc/services`" ]
-	then
-		echo -e "#\n#Service added for gds_db (firebird)\n#" >> /etc/services
-		echo "gds_db		3050/tcp" >> /etc/services
-		einfo "added gds_db to /etc/services"
-	fi
-
-	# if found /etc/isc4.gdb from previous install, backup, and restore as
-	# /etc/security.fdb
-	if [ -f /etc/firebird/isc4.gdb ]
-	then
-		# if we have scurity.fdb already, back it 1st
-		if [ -f /etc/firebird/security.fdb ]
-		then
-			cp /etc/firebird/security.fdb /etc/firebird/security.fdb.old
-		fi
-		gbak -B /etc/firebird/isc4.gdb /etc/firebird/isc4.gbk
-		gbak -R /etc/firebird/isc4.gbk /etc/firebird/security.fdb
-		mv /etc/firebird/isc4.gdb /etc/firebird/isc4.gdb.old
-		rm /etc/firebird/isc4.gbk
-
-		# make sure they are readable only to firebird
-		chown firebird:firebird /etc/firebird/{isc4.*,security.*}
-		chmod 660 /etc/firebird/{isc4.*,security.*}
-
-		einfo
-		einfo "Converted old isc4.gdb to security.fdb, isc4.gdb has been "
-		einfo "renamed to isc4.gdb.old. if you had previous security.fdb, "
-		einfo "it's backed to security.fdb.old (all under /etc/firebird)."
-		einfo
-	fi
-
-	# we need to enable local access to the server
-	if [ ! -f /etc/hosts.equiv ]
-	then
-		touch /etc/hosts.equiv
-		chown root.root /etc/hosts.equiv
-		chmod u=rw,go=r /etc/hosts.equiv
-	fi
-
-	if [ -z "`grep 'localhost$' /etc/hosts.equiv`" ]
-	then
-		echo "localhost" >> /etc/hosts.equiv
-		einfo "Added localhost to /etc/hosts.equiv"
-	fi
-
-	HS_NAME=`hostname`
-	if [ -z "`grep ${HS_NAME} /etc/hosts.equiv`" ]
-	then
-		echo "${HS_NAME}" >> /etc/hosts.equiv
-		einfo "Added ${HS_NAME} to /etc/hosts.equiv"
-	fi
-
-	einfo "If you're using UDFs, please remember to move them"
-	einfo "to /opt/firebird/UDF"
-}