Attachment 39841 Details for Bug 62716 – file.diff

[patch] file.diff

file.diff (text/plain), 6.58 KB, created by Chris Knight on 2004-02-12 00:40:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Knight

Created: 2004-02-12 00:40:07 UTC

Size: 6.58 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/ports/databases/firebird/Makefile,v
>retrieving revision 1.26
>diff -u -r1.26 Makefile
>--- Makefile	4 Feb 2004 05:19:01 -0000	1.26
>+++ Makefile	11 Feb 2004 23:58:31 -0000
>@@ -6,17 +6,17 @@
> #
> 
> PORTNAME=	firebird
>-PORTVERSION=	1.5.r8
>-PORTREVISION=	1
>+PORTVERSION=	1.5.r9
> CATEGORIES=	databases
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}	\
> 		http://www.aims.net.au/chris/firebird/
> MASTER_SITE_SUBDIR=firebird
>-DISTNAME=	firebird15-rc8
>+DISTNAME=	Firebird-1.5.0.4288.src
> 
> MAINTAINER=	chris@e-easy.com.au
> COMMENT=	The open-source InterBase(tm) 6.0 spin-off (Classic version)
> 
>+USE_BISON=	yes
> USE_BZIP2=	yes
> USE_GMAKE=	yes
> USE_LIBTOOL=	yes
>@@ -29,7 +29,7 @@
> 
> CONFLICTS=	firebird-devel-*
> 
>-WRKSRC=		${WRKDIR}/firebird15
>+WRKSRC=		${WRKDIR}/firebird15-rc9
> INSTALLS_SHLIB=	yes
> LDCONFIG_DIRS=	%%PREFIX%%/firebird/lib
> MSG_FILE=	${PKGDIR}/pkg-message
>Index: distinfo
>===================================================================
>RCS file: /home/ncvs/ports/databases/firebird/distinfo,v
>retrieving revision 1.5
>diff -u -r1.5 distinfo
>--- distinfo	13 Jan 2004 16:11:10 -0000	1.5
>+++ distinfo	11 Feb 2004 23:59:11 -0000
>@@ -1 +1,2 @@
>-MD5 (firebird15-rc8.tar.bz2) = cb775b56c0b3067994ec78f15a9e757d
>+MD5 (Firebird-1.5.0.4288.src.tar.bz2) = 76c5f04c853452e28e8b1d301c94845f
>+SIZE (Firebird-1.5.0.4288.src.tar.bz2) = 4293102
>Index: files/RELNOTES
>===================================================================
>RCS file: /home/ncvs/ports/databases/firebird/files/RELNOTES,v
>retrieving revision 1.6
>diff -u -r1.6 RELNOTES
>--- files/RELNOTES	13 Jan 2004 16:11:11 -0000	1.6
>+++ files/RELNOTES	11 Feb 2004 23:57:06 -0000
>@@ -1,6 +1,6 @@
>-Firebird 1.5.0 FreeBSD Release Notes                    11-Jan-2004
>+Firebird 1.5.0 FreeBSD Release Notes                    12-Feb-2004
> --------------------------------------
>-FB-V1.5.0.4201 Firebird 1.5 Release Candidate 8
>+FB-V1.5.0.4288 Firebird 1.5 Release Candidate 9
> 
>     Welcome to the FreeBSD Firebird port!
> 
>@@ -58,12 +58,12 @@
> where is is the current value plus 48. If this doesn't resolve the issue,
> try adding 48 again. 
> 
>-    Please note that RC8 has changed the libgds.so symlink to point to
>+    Please note that as of RC8, the libgds.so symlink now points to
> libfbembed.so. This has been done to resolve compatability issues with
> older versions of Firebird. The FreeBSD port of RC7 had libgds.so
> pointing to libfbclient.so. libfbclient.so is a remote access-only
> shared library with threaded support, which requires target applications
>-to link with a threaded library such as libc_r.so, libkse.so or libthr.so.
>+to link with a threaded library such as libc_r.so, libpthread.so or libthr.so.
> 
>     Super Server support in Firebird 1.5 for FreeBSD is not currently
> available due to the Firebird code using POSIX threads APIs not available
>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
>--- files/patch-src::install::arch-specific::freebsd::install.sh.in	16 Jan 2004 18:37:14 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,92 +0,0 @@
>---- src/install/arch-specific/freebsd/install.sh.in.orig	Thu Nov  6 23:23:29 2003
>-+++ src/install/arch-specific/freebsd/install.sh.in	Tue Jan 13 17:36:16 2004
>-@@ -59,7 +59,7 @@
>- 	if [ -d $InstallPrefix/firebird.old ]; then
>- 		rm -rf $InstallPrefix/firebird.old
>- 	fi
>--	mv $InstallFirebirdPrefix $InstallPrefix/firebird.old
>-+	cp -Rp $InstallFirebirdPrefix $InstallPrefix/firebird.old
>- fi
>- 
>- if [ `id -u` -ne 0 ]; then
>-@@ -162,7 +162,7 @@
>- #cp -r $BuiltFBDir/doc $DestDir 
>- 
>- cp $BuiltFBDir/firebird.msg $DestDir/firebird.msg 
>--cp $BuiltFBDir/security.fdb $DestDir/security.fdb 
>-+cp $BuiltFBDir/security.fdb $DestDir/security.fdb.sample
>- 
>- 
>- #cp $BuiltFBDir/include/gds.f $DestDir/include 
>-@@ -190,19 +190,19 @@
>- cp $BuildRootDir/doc/WhatsNew $DestDir/WhatsNew
>- cp $BuildRootDir/doc/README.user $DestDir/README
>- 
>--cp $BuiltFBDir/misc/firebird.conf $DestDir/firebird.conf
>-+cp $BuiltFBDir/misc/firebird.conf $DestDir/firebird.conf.sample
>- 
>--echo "#" >> $DestDir/aliases.conf
>--echo "# List of known database aliases" >> $DestDir/aliases.conf
>--echo "# ------------------------------" >> $DestDir/aliases.conf
>--echo "#" >> $DestDir/aliases.conf
>--echo "# Examples:" >> $DestDir/aliases.conf
>--echo "#" >> $DestDir/aliases.conf
>--echo "# employee = /$FBRootDir/examples/employee.fdb" >> $DestDir/aliases.conf
>--echo "#" >> $DestDir/aliases.conf
>-+echo "#" >> $DestDir/aliases.conf.sample
>-+echo "# List of known database aliases" >> $DestDir/aliases.conf.sample
>-+echo "# ------------------------------" >> $DestDir/aliases.conf.sample
>-+echo "#" >> $DestDir/aliases.conf.sample
>-+echo "# Examples:" >> $DestDir/aliases.conf.sample
>-+echo "#" >> $DestDir/aliases.conf.sample
>-+echo "# employee = $DestDir/examples/employee.fdb" >> $DestDir/aliases.conf.sample
>-+echo "#" >> $DestDir/aliases.conf.sample
>-     
>- 
>--chown -R firebird:firebird $InstallFirebirdPrefix
>-+chown -R $fbUID:$fbGID $InstallFirebirdPrefix
>- chmod -R o= $InstallFirebirdPrefix
>- 
>- # Now fix up the mess.
>-@@ -235,8 +235,8 @@
>- chmod -R a=rx $InstallFirebirdPrefix/lib/*
>- 
>- cd $InstallFirebirdPrefix/lib
>--ln -sf libfbclient.so libgds.so
>--ln -sf libfbclient.so.1 libgds.so.1
>-+ln -sf libfbembed.so libgds.so
>-+ln -sf libfbembed.so.1 libgds.so.1
>- 
>- cd $InstallFirebirdPrefix/bin
>- for i in `ls`
>-@@ -265,19 +265,25 @@
>- 	FileName=$i.`hostname`
>- 	touch $FileName
>- 	chmod ug=rw,o= $FileName
>--	chown firebird:firebird $FileName
>-+	chown $fbUID:$fbGID $FileName
>- done
>- 
>--touch firebird.log aliases.conf firebird.conf
>--chown firebird:firebird firebird.log
>-+touch firebird.log
>-+chown $fbUID:$fbGID firebird.log
>- chmod ug=rw,o= firebird.log
>--chmod a=r firebird.msg aliases.conf firebird.conf README
>-+chmod a=r firebird.msg README
>-+chown root:wheel *.sample
>-+chmod ug=r,o= *.sample
>- 
>- # make databases writable by firebird only
>- # local database connections are not a good idea
>- 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 $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

Actions: View | Diff

Attachments on bug 62716: 39841