4 files changed, 66 insertions, 54 deletions

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
index 4ec98f79308e..d6067e37b624 100644
--- 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
@@ -1,18 +1,33 @@
---- 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 @@
+--- builds/install/arch-specific/freebsd/install.sh.in.orig	Fri Mar  4 22:43:39 2005
++++ builds/install/arch-specific/freebsd/install.sh.in	Mon Apr 25 19:36:50 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
+@@ -113,7 +106,6 @@
  
  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
+@@ -143,18 +135,6 @@
+ #cp $BuiltFBDir/bin/CSrestoreRootRunUser.sh $DestDir/bin
+ #cp $BuiltFBDir/bin/changeDBAPassword.sh $DestDir/bin
  
+-# 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!"
@@ -22,24 +37,40 @@
 -		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 @@
+ 
+@@ -276,32 +256,12 @@
  
  # 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
  
+ # install the samples if they don't exist
+ [ -f aliases.conf ] || install -o firebird -g firebird -m 440 aliases.conf.sample aliases.conf
+ [ -f firebird.conf ] || install -o firebird -g firebird -m 440 firebird.conf.sample firebird.conf
+ [ -f security2.fdb ] || install -o firebird -g firebird -m 660 security2.fdb.sample security2.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/firebird-devel/files/pkg-message.in b/databases/firebird-devel/files/pkg-message.in
index bffa948d78fd..bad139b9da16 100644
--- a/databases/firebird-devel/files/pkg-message.in
+++ b/databases/firebird-devel/files/pkg-message.in
@@ -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:
 
diff --git a/databases/firebird-devel/pkg-install b/databases/firebird-devel/pkg-install
index bfade7651f5f..46b2eec34708 100644
--- a/databases/firebird-devel/pkg-install
+++ b/databases/firebird-devel/pkg-install
@@ -7,13 +7,6 @@ PATH=/bin:/usr/bin:/usr/sbin
 case $2 in
 PRE-INSTALL)
 
-if [ -d $PKG_PREFIX ]; then
-	if [ -d $PKG_PREFIX.old ]; then
-		rm -rf $PKG_PREFIX.old
-	fi
-	cp -Rp $PKG_PREFIX $PKG_PREFIX.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= security2.fdb
 chmod 444 aliases.conf firebird.conf
 chmod 660 security2.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/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/firebird-devel/pkg-plist b/databases/firebird-devel/pkg-plist
index ab2af0768723..42e6bce7094c 100644
--- a/databases/firebird-devel/pkg-plist
+++ b/databases/firebird-devel/pkg-plist
@@ -91,11 +91,7 @@ lib/libib_util.so
 security2.fdb.sample
 security2.fdb
 @dirrm UDF
-@dirrm bin
 @dirrm doc/sql.extensions
 @dirrm doc
 @dirrm help
-@dirrm include
 @dirrm intl
-@dirrm lib
-@unexec rmdir %D 2>/dev/null || true