Date: Tue, 26 Apr 2005 10:40:23 GMT From: Renato Botelho <freebsd@galle.com.br> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/80345: [MAINTAINER] databases/firebird-devel: Fix build problems Message-ID: <200504261040.j3QAeNNi065687@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/80345; it has been noted by GNATS.
From: Renato Botelho <freebsd@galle.com.br>
To: bug-followup@FreeBSD.org, freebsd@galle.com.br
Cc:
Subject: Re: ports/80345: [MAINTAINER] databases/firebird-devel: Fix build problems
Date: Tue, 26 Apr 2005 07:38:07 -0300
Please, use this patch, it's just to enhance files/pkg-message.in.
===> Updating from CVS
M pkg-install
M files/patch-builds::install::arch-specific::freebsd::install.sh.in
M files/pkg-message.in
===> Generating patch
===> Viewing diff with more
Index: pkg-install
===================================================================
RCS file: /home/ncvs/ports/databases/firebird-devel/pkg-install,v
retrieving revision 1.6
diff -u -r1.6 pkg-install
--- pkg-install 23 Apr 2005 20:06:32 -0000 1.6
+++ pkg-install 26 Apr 2005 10:35:48 -0000
@@ -7,13 +7,6 @@
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 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
(
Index: files/patch-builds::install::arch-specific::freebsd::install.sh.in
===================================================================
RCS file: /home/ncvs/ports/databases/firebird-devel/files/patch-builds::install::arch-specific::freebsd::install.sh.in,v
retrieving revision 1.1
diff -u -r1.1 patch-builds::install::arch-specific::freebsd::install.sh.in
--- files/patch-builds::install::arch-specific::freebsd::install.sh.in 4 Dec 2003 17:34:20 -0000 1.1
+++ files/patch-builds::install::arch-specific::freebsd::install.sh.in 26 Apr 2005 10:35:48 -0000
@@ -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
Index: files/pkg-message.in
===================================================================
RCS file: /home/ncvs/ports/databases/firebird-devel/files/pkg-message.in,v
retrieving revision 1.1
diff -u -r1.1 pkg-message.in
--- files/pkg-message.in 11 Apr 2005 19:25:44 -0000 1.1
+++ files/pkg-message.in 26 Apr 2005 10:35:48 -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:
===> Done
Thanks
--
Renato Botelho <freebsd at galle dot com dot br>
AIM: RBGargaBR | ICQ: 54596223
GnuPG Key: http://www.galle.com.br/~renato/pubkey.asc
"Power corrupts. Absolute power is kind of neat"
-- John Lehman, Secretary of the Navy 1981-1987
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200504261040.j3QAeNNi065687>