- Update to 2.0-alpha3

3 files changed, 50 insertions, 25 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 d6067e37b624..54823e8859f7 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,5 +1,5 @@
---- 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
+--- builds/install/arch-specific/freebsd/install.sh.in.orig	Fri May 27 19:14:45 2005
++++ builds/install/arch-specific/freebsd/install.sh.in	Mon Aug  8 15:50:33 2005
 @@ -55,13 +55,6 @@
  InstallFirebirdPrefix=@prefix@
  InstallPrefix=${InstallFirebirdPrefix%/firebird}
@@ -14,7 +14,7 @@
  if [ `id -u` -ne 0 ]; then
  	echo; echo "You must be root to run this step!"; echo; echo
  	exit 1
-@@ -113,7 +106,6 @@
+@@ -113,13 +106,12 @@
  
  mkdir -p $DestDir 
  mkdir $DestDir/bin 
@@ -22,6 +22,14 @@
  mkdir $DestDir/help 
  mkdir $DestDir/include 
  mkdir $DestDir/intl 
+ mkdir $DestDir/lib
+-mkdir $DestDir/doc 
+-mkdir $DestDir/doc/sql.extensions 
++#mkdir $DestDir/doc 
++#mkdir $DestDir/doc/sql.extensions 
+ mkdir $DestDir/UDF 
+ #mkdir $DestDir/misc
+ 
 @@ -143,18 +135,6 @@
  #cp $BuiltFBDir/bin/CSrestoreRootRunUser.sh $DestDir/bin
  #cp $BuiltFBDir/bin/changeDBAPassword.sh $DestDir/bin
@@ -41,6 +49,34 @@
  copyIfExists $BuiltFBDir/help/help.gbak $DestDir/help 
  cp $BuiltFBDir/help/help.fdb $DestDir/help 
  
+@@ -184,8 +164,8 @@
+ 	    
+ # Note that this copies files from outside the build tree.
+ #cp $BuildRootDir/doc/*.pdf $DestDir/doc
+-cp $BuildRootDir/doc/README.* $DestDir/doc
+-cp $BuildRootDir/doc/sql.extensions/* $DestDir/doc/sql.extensions
++#cp $BuildRootDir/doc/README.* $DestDir/doc
++#cp $BuildRootDir/doc/sql.extensions/* $DestDir/doc/sql.extensions
+ cp $BuildRootDir/doc/WhatsNew $DestDir/WhatsNew
+ cp $BuildRootDir/doc/README.user $DestDir/README
+ 
+@@ -219,11 +199,11 @@
+ chown -R root:wheel $InstallFirebirdPrefix/lib
+ 
+ # make the following read-only
+-chmod -R a=r $InstallFirebirdPrefix/WhatsNew
+-for i in `find $InstallFirebirdPrefix/doc -type f -print`
+-do
+-	chmod a=r $i
+-done
++#chmod -R a=r $InstallFirebirdPrefix/WhatsNew
++#for i in `find $InstallFirebirdPrefix/doc -type f -print`
++#do
++#	chmod a=r $i
++#done
+ #chmod -R a=r $InstallFirebirdPrefix/examples/*
+ chmod -R a=r $InstallFirebirdPrefix/include/*
+ chmod -R a=r $InstallFirebirdPrefix/intl/*
 @@ -276,32 +256,12 @@
  
  # make databases writable by firebird only
diff --git a/databases/firebird-devel/files/patch-builds::posix::prefix.freebsd b/databases/firebird-devel/files/patch-builds::posix::prefix.freebsd
new file mode 100644
index 000000000000..b327c257885a
--- /dev/null
+++ b/databases/firebird-devel/files/patch-builds::posix::prefix.freebsd
@@ -0,0 +1,11 @@
+--- builds/posix/prefix.freebsd.orig	Mon Aug  8 12:08:47 2005
++++ builds/posix/prefix.freebsd	Mon Aug  8 12:10:25 2005
+@@ -20,6 +20,8 @@
+ 
+ OS_ServerFiles=inet_server.cpp
+ 
++LINK_OPTS+=-Wl,-rpath,../gen/firebird/lib
++
+ PROD_FLAGS=-O -fno-builtin -DNDEBUG -DFREEBSD -pipe -MMD -fPIC
+ DEV_FLAGS=-ggdb -DFREEBSD -pipe -MMD -p -fPIC -Wall
+ EMBED_UTIL_TARGETS=gstat gds_drop gds_relay gsec nbackup fb_lock_print
diff --git a/databases/firebird-devel/files/patch-configure.in b/databases/firebird-devel/files/patch-configure.in
deleted file mode 100644
index 0ae18532bc3b..000000000000
--- a/databases/firebird-devel/files/patch-configure.in
+++ /dev/null
@@ -1,22 +0,0 @@
---- configure.in.orig	Thu Nov  6 20:31:56 2003
-+++ configure.in	Thu Nov 13 11:45:26 2003
-@@ -510,6 +510,19 @@
- 	AC_DEFINE(HAVE_POSIX_THREADS)
-     ;;
- 
-+  FREEBSD)
-+    dnl the AC_CHECK_TYPES for socklen_t doesn't include sys/socket.h
-+    dnl so test for socklen_t with sys/socket.h included
-+    AC_MSG_CHECKING(if sys/socket.h defines socklen_t)
-+    AC_TRY_COMPILE([#include <sys/types.h>
-+       #include <sys/socket.h>],
-+    [socklen_t s;],
-+    [AC_DEFINE(HAVE_SOCKLEN_T) AC_MSG_RESULT(yes)],
-+    [AC_MSG_RESULT(no)])
-+    dnl define HAVE_POSIX_THREADS for FreeBSD 4.x support
-+    AC_DEFINE(HAVE_POSIX_THREADS)
-+    ;;
-+
-   SOLARIS|solx86)
-     dnl kkuznetsov: Solaris always check for -lnsl
-     AC_CHECK_LIB(nsl, gethostname, XE_APPEND(-lnsl,LIBS))