ports/80358: [MAINTAINER] databases/firebird: Don't change conf file automaticly

[Renato Botelho]

>Number:         80358
>Category:       ports
>Synopsis:       [MAINTAINER] databases/firebird: Don't change conf file automaticly
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Apr 26 10:40:24 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Renato Botelho
>Release:        FreeBSD 5.3-RELEASE-p9 i386
>Organization:
Galle Folheados - http://www.galle.com.br
>Environment:
System: FreeBSD data.galle.com.br 5.3-RELEASE-p9 FreeBSD 5.3-RELEASE-p9 #9: Fri Apr 15 07:52:00 BRST 2005
>Description:
- Don't copy ${PREFIX}/firebird to ${PREFIX}/firebird.old
- Don't change /etc/services and /etc/inetd.conf automaticly
- Don't restart inetd
- Add messages on pkg-message to explain how to start program

Added file(s):
- files/patch-src::install::arch-specific::freebsd::install.sh.in

Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:

--- firebird-1.5.2.patch begins here ---
Index: pkg-install
===================================================================
RCS file: /home/ncvs/ports/databases/firebird/pkg-install,v
retrieving revision 1.9
diff -u -r1.9 pkg-install
--- pkg-install	16 Jan 2004 18:37:14 -0000	1.9
+++ pkg-install	26 Apr 2005 10:38:24 -0000
@@ -7,13 +7,6 @@
 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 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
 	(
Index: pkg-message
===================================================================
RCS file: /home/ncvs/ports/databases/firebird/pkg-message,v
retrieving revision 1.4
diff -u -r1.4 pkg-message
--- pkg-message	13 Jan 2004 16:11:10 -0000	1.4
+++ pkg-message	26 Apr 2005 10:38:24 -0000
@@ -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:
 
Index: files/patch-src::install::arch-specific::freebsd::install.sh.in
===================================================================
RCS file: files/patch-src::install::arch-specific::freebsd::install.sh.in
diff -N files/patch-src::install::arch-specific::freebsd::install.sh.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-src::install::arch-specific::freebsd::install.sh.in	26 Apr 2005 10:38:24 -0000
@@ -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
--- firebird-1.5.2.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: