6 files changed, 119 insertions, 80 deletions

diff --git a/databases/firebird-devel/Makefile b/databases/firebird-devel/Makefile
index adb4c1598f6f..0923e32d3abc 100644
--- a/databases/firebird-devel/Makefile
+++ b/databases/firebird-devel/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	firebird
-PORTVERSION=	2.0.a2
+PORTVERSION=	2.0.a3
 CATEGORIES=	databases
 MASTER_SITES=	http://www.ramenzoni.com.br/~garga/firebird/ \
 		http://www.galle.com.br/~garga/firebird/ \
 		http://www.brainsoft.com.br/~garga/firebird/
 MASTER_SITE_SUBDIR=	firebird
 PKGNAMESUFFIX=	-devel
-DISTNAME=	firebird2-20050505
+DISTNAME=	firebird2-20050726
 
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	The open-source InterBase(tm) 6.0 spin-off (Classic version)
@@ -26,7 +26,9 @@ GNU_CONFIGURE=		yes
 USE_GCC=		3.4
 USE_REINPLACE=		yes
 
-CONFLICTS=	firebird-1.*
+DOCSDIR=	${PREFIX}/firebird/doc
+
+CONFLICTS=	firebird-client-1.*
 
 WRKSRC=		${WRKDIR}/firebird2
 INSTALLS_SHLIB=	yes
@@ -71,6 +73,12 @@ do-build:
 	)
 
 post-install:
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}/sql.extensions
+	${INSTALL_DATA} ${WRKSRC}/doc/README.* ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/sql.extensions/* \
+		${DOCSDIR}/sql.extensions
+.endif
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/databases/firebird-devel/distinfo b/databases/firebird-devel/distinfo
index 89cad2ec9fbf..8c1a72b7ec4c 100644
--- a/databases/firebird-devel/distinfo
+++ b/databases/firebird-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (firebird2-20050505.tar.bz2) = 26a666ffb3a0499e6bd8e1a87ebc4ad5
-SIZE (firebird2-20050505.tar.bz2) = 4341875
+MD5 (firebird2-20050726.tar.bz2) = e95d68eef0e8faee73a9a6111debb723
+SIZE (firebird2-20050726.tar.bz2) = 11774960
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))
diff --git a/databases/firebird-devel/pkg-plist b/databases/firebird-devel/pkg-plist
index ba380b170a15..e8de4cbbe6db 100644
--- a/databases/firebird-devel/pkg-plist
+++ b/databases/firebird-devel/pkg-plist
@@ -6,8 +6,9 @@ firebird/UDF/fbudf.sql
 firebird/UDF/ib_udf.so
 firebird/UDF/ib_udf.sql
 firebird/WhatsNew
-firebird/aliases.conf
+@unexec if cmp -s %D/firebird/aliases.conf %D/firebird/aliases.conf.sample; then rm -f %D/firebird/aliases.conf; fi
 firebird/aliases.conf.sample
+@exec [ -f %B/aliases.conf ] || cp %B/%f %B/aliases.conf
 firebird/bin/fb_inet_server
 firebird/bin/fb_lock_mgr
 firebird/bin/fb_lock_print
@@ -21,54 +22,61 @@ firebird/bin/gsplit
 firebird/bin/gstat
 firebird/bin/isql
 firebird/bin/qli
-firebird/doc/README.NTSecurity
-firebird/doc/README.Optimizer.txt
-firebird/doc/README.Win32LibraryInstallation.txt
-firebird/doc/README.build.mingw.html
-firebird/doc/README.build.msvc.html
-firebird/doc/README.coding.style
-firebird/doc/README.instsvc
-firebird/doc/README.isql_enhancements.txt
-firebird/doc/README.makefiles
-firebird/doc/README.performance_monitoring
-firebird/doc/README.sha1
-firebird/doc/README.user
-firebird/doc/README.user.embedded
-firebird/doc/README.user.troubleshooting
-firebird/doc/README.xnet
-firebird/doc/sql.extensions/README.PSQL_stack_trace.txt
-firebird/doc/sql.extensions/README.aggregate_tracking
-firebird/doc/sql.extensions/README.case
-firebird/doc/sql.extensions/README.coalesce
-firebird/doc/sql.extensions/README.context_variables
-firebird/doc/sql.extensions/README.context_variables2
-firebird/doc/sql.extensions/README.cursors
-firebird/doc/sql.extensions/README.data_type_results_of_aggregations.txt
-firebird/doc/sql.extensions/README.data_types
-firebird/doc/sql.extensions/README.ddl.txt
-firebird/doc/sql.extensions/README.default_parameters
-firebird/doc/sql.extensions/README.derived_tables.txt
-firebird/doc/sql.extensions/README.distinct
-firebird/doc/sql.extensions/README.exception_handling
-firebird/doc/sql.extensions/README.execute_block
-firebird/doc/sql.extensions/README.execute_statement
-firebird/doc/sql.extensions/README.explicit_locks
-firebird/doc/sql.extensions/README.expression_indices
-firebird/doc/sql.extensions/README.iif
-firebird/doc/sql.extensions/README.keywords
-firebird/doc/sql.extensions/README.leave_labels
-firebird/doc/sql.extensions/README.null_value
-firebird/doc/sql.extensions/README.nullif
-firebird/doc/sql.extensions/README.order_by_expressions_nulls
-firebird/doc/sql.extensions/README.plan
-firebird/doc/sql.extensions/README.rows
-firebird/doc/sql.extensions/README.savepoints
-firebird/doc/sql.extensions/README.select_expressions
-firebird/doc/sql.extensions/README.sequence_generators
-firebird/doc/sql.extensions/README.universal_triggers
-firebird/doc/sql.extensions/README.view_updates
-firebird/firebird.conf
+%%PORTDOCS%%%%DOCSDIR%%/README.NTSecurity
+%%PORTDOCS%%%%DOCSDIR%%/README.Optimizer.txt
+%%PORTDOCS%%%%DOCSDIR%%/README.Win32LibraryInstallation.txt
+%%PORTDOCS%%%%DOCSDIR%%/README.build.mingw.html
+%%PORTDOCS%%%%DOCSDIR%%/README.build.msvc.html
+%%PORTDOCS%%%%DOCSDIR%%/README.coding.style
+%%PORTDOCS%%%%DOCSDIR%%/README.intl
+%%PORTDOCS%%%%DOCSDIR%%/README.instsvc
+%%PORTDOCS%%%%DOCSDIR%%/README.isql_enhancements.txt
+%%PORTDOCS%%%%DOCSDIR%%/README.makefiles
+%%PORTDOCS%%%%DOCSDIR%%/README.performance_monitoring
+%%PORTDOCS%%%%DOCSDIR%%/README.sha1
+%%PORTDOCS%%%%DOCSDIR%%/README.user
+%%PORTDOCS%%%%DOCSDIR%%/README.user.embedded
+%%PORTDOCS%%%%DOCSDIR%%/README.user.troubleshooting
+%%PORTDOCS%%%%DOCSDIR%%/README.xnet
+%%PORTDOCS%%%%DOCSDIR%%/sql.extensions/README.PSQL_stack_trace.txt
+%%PORTDOCS%%%%DOCSDIR%%/sql.extensions/README.aggregate_tracking
+%%PORTDOCS%%%%DOCSDIR%%/sql.extensions/README.case
+%%PORTDOCS%%%%DOCSDIR%%/sql.extensions/README.coalesce
+%%PORTDOCS%%%%DOCSDIR%%/sql.extensions/README.context_variables
+%%PORTDOCS%%%%DOCSDIR%%/sql.extensions/README.context_variables2
+%%PORTDOCS%%%%DOCSDIR%%/sql.extensions/README.cursors
+%%PORTDOCS%%%%DOCSDIR%%/sql.extensions/README.data_type_results_of_aggregations.txt
+%%PORTDOCS%%%%DOCSDIR%%/sql.extensions/README.data_types
+%%PORTDOCS%%%%DOCSDIR%%/sql.extensions/README.ddl.txt
+%%PORTDOCS%%%%DOCSDIR%%/sql.extensions/README.default_parameters
+%%PORTDOCS%%%%DOCSDIR%%/sql.extensions/README.derived_tables.txt
+%%PORTDOCS%%%%DOCSDIR%%/sql.extensions/README.distinct
+%%PORTDOCS%%%%DOCSDIR%%/sql.extensions/README.exception_handling
+%%PORTDOCS%%%%DOCSDIR%%/sql.extensions/README.execute_block
+%%PORTDOCS%%%%DOCSDIR%%/sql.extensions/README.execute_statement
+%%PORTDOCS%%%%DOCSDIR%%/sql.extensions/README.explicit_locks
+%%PORTDOCS%%%%DOCSDIR%%/sql.extensions/README.expression_indices
+%%PORTDOCS%%%%DOCSDIR%%/sql.extensions/README.iif
+%%PORTDOCS%%%%DOCSDIR%%/sql.extensions/README.keywords
+%%PORTDOCS%%%%DOCSDIR%%/sql.extensions/README.leave_labels
+%%PORTDOCS%%%%DOCSDIR%%/sql.extensions/README.length
+%%PORTDOCS%%%%DOCSDIR%%/sql.extensions/README.null_value
+%%PORTDOCS%%%%DOCSDIR%%/sql.extensions/README.nullif
+%%PORTDOCS%%%%DOCSDIR%%/sql.extensions/README.order_by_expressions_nulls
+%%PORTDOCS%%%%DOCSDIR%%/sql.extensions/README.plan
+%%PORTDOCS%%%%DOCSDIR%%/sql.extensions/README.returning
+%%PORTDOCS%%%%DOCSDIR%%/sql.extensions/README.rows
+%%PORTDOCS%%%%DOCSDIR%%/sql.extensions/README.savepoints
+%%PORTDOCS%%%%DOCSDIR%%/sql.extensions/README.select_expressions
+%%PORTDOCS%%%%DOCSDIR%%/sql.extensions/README.sequence_generators
+%%PORTDOCS%%%%DOCSDIR%%/sql.extensions/README.trim
+%%PORTDOCS%%%%DOCSDIR%%/sql.extensions/README.universal_triggers
+%%PORTDOCS%%%%DOCSDIR%%/sql.extensions/README.view_updates
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/sql.extensions
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@unexec if cmp -s %D/firebird/firebird.conf %D/firebird/firebird.conf.sample; then rm -f %D/firebird/firebird.conf; fi
 firebird/firebird.conf.sample
+@exec [ -f %B/firebird.conf ] || cp %B/%f %B/firebird.conf
 @unexec rm -f %D/firebird/firebird.log
 firebird/firebird.msg
 firebird/help/help.fdb
@@ -92,8 +100,6 @@ firebird/security2.fdb.sample
 firebird/security2.fdb
 @dirrm firebird/UDF
 @dirrm firebird/bin
-@dirrm firebird/doc/sql.extensions
-@dirrm firebird/doc
 @dirrm firebird/help
 @dirrm firebird/include
 @dirrm firebird/intl