- Don't be too smart and don't change /etc/services and /etc/inetd.conf

  It fix problem with extra files on pointyhat
- Add message for usr how to run

PR:		ports/80358
Submitted by:	maintainer

3 files changed, 57 insertions, 30 deletions

diff --git a/databases/firebird20-server/files/patch-src::install::arch-specific::freebsd::install.sh.in b/databases/firebird20-server/files/patch-src::install::arch-specific::freebsd::install.sh.in
new file mode 100644
index 000000000000..03df0f2e369c
--- /dev/null
+++ b/databases/firebird20-server/files/patch-src::install::arch-specific::freebsd::install.sh.in
@@ -0,0 +1,42 @@
+--- src/install/arch-specific/freebsd/install.sh.in.orig	Tue Apr 26 07:14:26 2005
++++ src/install/arch-specific/freebsd/install.sh.in	Tue Apr 26 07:15:05 2005
+@@ -55,13 +55,6 @@
+ InstallFirebirdPrefix=@prefix@
+ InstallPrefix=${InstallFirebirdPrefix%/firebird}
+ 
+-if [ -d $InstallFirebirdPrefix ]; then
+-	if [ -d $InstallPrefix/firebird.old ]; then
+-		rm -rf $InstallPrefix/firebird.old
+-	fi
+-	cp -Rp $InstallFirebirdPrefix $InstallPrefix/firebird.old
+-fi
+-
+ if [ `id -u` -ne 0 ]; then
+ 	echo; echo "You must be root to run this step!"; echo; echo
+ 	exit 1
+@@ -284,25 +277,6 @@
+ [ -f aliases.conf ] || install -o $fbUID -g $fbGID -m 444 aliases.conf.sample aliases.conf
+ [ -f firebird.conf ] || install -o $fbUID -g $fbGID -m 444 firebird.conf.sample firebird.conf
+ [ -f security.fdb ] || install -o $fbUID -g $fbGID -m 660 security.fdb.sample security.fdb
+-
+-# 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	$InstallFirebirdPrefix/bin/fb_inet_server  fb_inet_server
+-EOF
+-if [ -f /var/run/inetd.pid ]; then
+-        kill -HUP `cat /var/run/inetd.pid`
+-fi
+ 
+ # shared lib startup script
+ if [ -d $InstallPrefix/etc/rc.d ]; then
diff --git a/databases/firebird20-server/pkg-install b/databases/firebird20-server/pkg-install
index 099f93a67d7c..e716ae8fa917 100644
--- a/databases/firebird20-server/pkg-install
+++ b/databases/firebird20-server/pkg-install
@@ -7,13 +7,6 @@ PATH=/bin:/usr/bin:/usr/sbin
 case $2 in
 PRE-INSTALL)
 
-if [ -d $PKG_PREFIX/firebird ]; then
-	if [ -d $PKG_PREFIX/firebird.old ]; then
-		rm -rf $PKG_PREFIX/firebird.old
-	fi
-	cp -Rp $PKG_PREFIX/firebird $PKG_PREFIX/firebird.old
-fi
-
 if [ `id -u` -ne 0 ]; then
 	echo; echo "You must be root to run this step!"; echo; echo
   exit 1
@@ -140,25 +133,6 @@ chmod ug=rw,o= security.fdb
 chmod 444 aliases.conf firebird.conf
 chmod 660 security.fdb
 
-# 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	$PKG_PREFIX/firebird/bin/fb_inet_server  fb_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
 	(
diff --git a/databases/firebird20-server/pkg-message b/databases/firebird20-server/pkg-message
index 3a3f40ae3ec4..39f76cf85d33 100644
--- a/databases/firebird20-server/pkg-message
+++ b/databases/firebird20-server/pkg-message
@@ -1,9 +1,20 @@
 
 ---------------------------------------------------------
-Firebird is now installed.  A symbolic link from
-/usr/interbase -> %%PREFIX%%/firebird may be needed
-for compatibility with existing programs that use
-Firebird.
+Firebird is now installed.
+
+To start the server add the following line to /etc/services:
+
+gds_db		3050/tcp  #InterBase Database Remote Protocol
+
+And add the following line to /etc/inetd.conf
+
+gds_db	stream	tcp	nowait	firebird	%%PREFIX%%/bin/fb_inet_server  fb_inet_server
+
+And finally restart inetd.
+
+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: