Update repo copy to firebird-devel

PR:		32553
Submitted by:	maintainer

12 files changed, 77 insertions, 47 deletions

diff --git a/databases/firebird-devel/Makefile b/databases/firebird-devel/Makefile
index 0fffe53812ff..961ed0d458ba 100644
--- a/databases/firebird-devel/Makefile
+++ b/databases/firebird-devel/Makefile
@@ -1,20 +1,19 @@
-# New ports collection makefile for:	Firebird
-# Date created:		20 December 2000
-# Whom:			Geoffrey C. Speicher <geoff@sea-incorporated.com>
+# New ports collection makefile for:	Firebird-devel
+# Date created:		03 December 2001
+# Whom:			Chris Knight <chris@aims.com.au>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	firebird
-PORTVERSION=	0.9
-PORTREVISION=	4
+PORTVERSION=	1.0.r1
 CATEGORIES=	databases
-MASTER_SITES=	http://firebird.sourceforge.net/download/ \
-		${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+		http://www.aims.com.au/chris/
 MASTER_SITE_SUBDIR=firebird
-DISTFILES=	firebird-boot-kit.tar.gz \
+DISTFILES=	bootkit-RC1.tar.gz \
 		interbase0.9-4-v5examples.tar.gz \
-		interbase0.9-4src.tar.gz
+		Firebird-1.0.0-RC1-FreeBSD.tar.gz
 
 MAINTAINER=	chris@aims.com.au
 
@@ -31,8 +30,9 @@ ONLY_FOR_ARCHS=	i386
 do-extract:
 	@${MKDIR} ${WRKDIR}
 	@(								\
-	cd ${WRKDIR}; ${TAR} -xzf ${DISTDIR}/interbase0.9-4src.tar.gz;	\
-	cd interbase; ${TAR} -xzf ${DISTDIR}/firebird-boot-kit.tar.gz;	\
+	cd ${WRKDIR}; ${TAR} -zxf					\
+		 ${DISTDIR}/Firebird-1.0.0-RC1-FreeBSD.tar.gz;		\
+	cd interbase; ${TAR} -zxf ${DISTDIR}/bootkit-RC1.tar.gz;	\
 	${CP} msgs/msg.gbak misc/msg.gbak				\
 	)
 
@@ -51,7 +51,12 @@ do-configure:
 	INTERBASE=${WRKDIR}/interbase/interbase; export INTERBASE;	\
 	REFDBPATH=${WRKDIR}/refDatabases; export REFDBPATH;		\
 	${SH} buildBootDatabases;					\
-	${SH} setup_dirs.boot FREEBSD PROD ${WRKDIR}/refDatabases boot;	\
+	${CAT} builds_win32/original/build_no.ksh | ${TR} -d '\r'	\
+		> builds_win32/original/build_no.ksh.fix;		\
+	${MV} builds_win32/original/build_no.ksh.fix			\
+		 builds_win32/original/build_no.ksh;			\
+	${SH} setup_dirs boot FREEBSD PROD ${WRKDIR}/refDatabases boot;	\
+	${TOUCH} ${WRKDIR}/interbase/dsql/parse.c			\
 	)
 
 do-build:
@@ -60,6 +65,8 @@ do-build:
 	'[ -d ${LDCONFIG_RUNLIST} ] && ${LDCONFIG} -m ${LDCONFIG_RUNLIST}'; \
 	) > ${WRKDIR}/000.${PORTNAME}.sh
 	@(								\
+	${LN} -sf ${WRKDIR}/refDatabases/jrd/isc.gdb			\
+		 ${WRKDIR}/interbase/interbase/isc4.gdb;		\
 	cd ${WRKDIR}/interbase;						\
 	INTERBASE=${WRKDIR}/interbase/interbase; export INTERBASE;	\
 	REFDBPATH=${WRKDIR}/refDatabases; export REFDBPATH;		\
@@ -69,6 +76,7 @@ do-build:
 do-install:
 	@(								\
 	cd ${WRKDIR}/interbase;						\
+	${RM} ${WRKDIR}/interbase/interbase/isc4_tmp.gdb;		\
 	${CP} -Rp interbase ${PREFIX}/firebird;				\
 	${RM} ${PREFIX}/firebird/install;				\
 	${RM} ${PREFIX}/firebird/lib/libgds.so.1.0;			\
diff --git a/databases/firebird-devel/distinfo b/databases/firebird-devel/distinfo
index 67c42987376e..3b84f86d2217 100644
--- a/databases/firebird-devel/distinfo
+++ b/databases/firebird-devel/distinfo
@@ -1,3 +1,4 @@
-MD5 (firebird-boot-kit.tar.gz) = 2e18d75539bc4c3d40a1a71509309f64
+MD5 (bootkit-RC1.tar.gz) = 0b4b1a8e5b3b017f946f3ab17650b933
+MD5 (Firebird-1.0.0-RC1-FreeBSD.tar.gz) = c47405a85022b71d4f7b981a76ce6f17
 MD5 (interbase0.9-4-v5examples.tar.gz) = 17cba82bbf5066d515f2dee97bf8327a
-MD5 (interbase0.9-4src.tar.gz) = d098277ed160e2b6a49d91e1fdb3a652
+MD5 (/usr/ports/distfiles/bootkit-RC1.tar.gz) = 02a878aabc1cdb165833622a20fdcc19
diff --git a/databases/firebird-devel/files/RELNOTES b/databases/firebird-devel/files/RELNOTES
index d2fd1d4fc88d..78b29d6a2a54 100644
--- a/databases/firebird-devel/files/RELNOTES
+++ b/databases/firebird-devel/files/RELNOTES
@@ -1,6 +1,6 @@
-Firebird 0.9_4 FreeBSD Release Notes                       13-Jan-2001
-------------------------------------
-FB-T0.9.4.34 Firebird Test1
+Firebird 1.0-RC1 FreeBSD Release Notes                     06-Dec-2001
+--------------------------------------
+FB-T6.2.567 Firebird Release Candidate 1
 
 Welcome to the FreeBSD Firebird port!  Users should note that there
 was a package called `firebird-1.0.tgz' released in mid-August
@@ -75,5 +75,5 @@ and InterBase can be found at the following:
 	http://www.interbase2000.org/
 	http://www.firebirdsql.org/
 
-Geoff Speicher
-<geoff@sea-incorporated.com>
+Chris Knight
+<chris@aims.com.au>
diff --git a/databases/firebird-devel/files/patch-aa b/databases/firebird-devel/files/patch-aa
index f2db9a68750d..98de380d7370 100644
--- a/databases/firebird-devel/files/patch-aa
+++ b/databases/firebird-devel/files/patch-aa
@@ -7,5 +7,5 @@
 -    read Answer
 +#    read Answer
  }
- 
+
  #--------------------------------------------------------------------
diff --git a/databases/firebird-devel/files/patch-ab b/databases/firebird-devel/files/patch-ab
index f054a4b23007..dfe6a02248b2 100644
--- a/databases/firebird-devel/files/patch-ab
+++ b/databases/firebird-devel/files/patch-ab
@@ -4,8 +4,8 @@
     DefaultAns=$2
     echo -n "${1}"
     Answer="$DefaultAns"
--   read Answer 
-+#   read Answer 
+-   read Answer
++#   read Answer
  }
- 
- 
+
+
diff --git a/databases/firebird-devel/files/patch-ad b/databases/firebird-devel/files/patch-ad
index 7ce937566bc3..477491a3d8fa 100644
--- a/databases/firebird-devel/files/patch-ad
+++ b/databases/firebird-devel/files/patch-ad
@@ -1,13 +1,12 @@
---- jrd/enc.c.orig	Fri Aug  4 06:50:03 2000
-+++ jrd/enc.c	Sun Nov 18 19:17:19 2001
-@@ -31,6 +31,10 @@
-  *
-  **************************************/
-
-+#ifdef FREEBSD
-+crypt_set_format("des");
-+#endif
-+
- return CRYPT_FUNC( string, salt);
+--- setup_dirs.orig	Tue Aug  7 05:00:12 2001
++++ setup_dirs	Sat Nov 17 21:13:32 2001
+@@ -60,7 +60,8 @@
+     DefaultAns=$2
+     echo -n "${1}"
+     Answer="$DefaultAns"
+-    read Answer
++#    read Answer
++    echo ""
  }
- #endif
+
+
diff --git a/databases/firebird-devel/files/patch-ae b/databases/firebird-devel/files/patch-ae
new file mode 100644
index 000000000000..12f66c37082b
--- /dev/null
+++ b/databases/firebird-devel/files/patch-ae
@@ -0,0 +1,10 @@
+--- jrd/common.h.orig	Sat Nov 17 20:07:00 2001
++++ jrd/common.h	Sun Nov 18 18:54:26 2001
+@@ -137,6 +137,7 @@
+ /* FreeBSD for Intel platforms */
+ #ifdef FREEBSD
+
++#define UNIX_64_BIT_IO
+ #define FB_ALIGN(n,b) ((n + b - 1) & ~(b - 1))
+ #define ALIGNMENT     4
+ #define DOUBLE_ALIGN  4
diff --git a/databases/firebird-devel/files/patch-af b/databases/firebird-devel/files/patch-af
new file mode 100644
index 000000000000..7ce937566bc3
--- /dev/null
+++ b/databases/firebird-devel/files/patch-af
@@ -0,0 +1,13 @@
+--- jrd/enc.c.orig	Fri Aug  4 06:50:03 2000
++++ jrd/enc.c	Sun Nov 18 19:17:19 2001
+@@ -31,6 +31,10 @@
+  *
+  **************************************/
+
++#ifdef FREEBSD
++crypt_set_format("des");
++#endif
++
+ return CRYPT_FUNC( string, salt);
+ }
+ #endif
diff --git a/databases/firebird-devel/pkg-descr b/databases/firebird-devel/pkg-descr
index b080060395eb..c0ac8b0093af 100644
--- a/databases/firebird-devel/pkg-descr
+++ b/databases/firebird-devel/pkg-descr
@@ -10,14 +10,13 @@ Note that as of Firebird 0.9_4, the locksmith back door has
 been closed.
 
 For more information on Firebird and InterBase, see:
+
+http://sourceforge.net/projects/firebird/
 http://www.ibphoenix.com/
 http://www.interbase2000.org/
 http://www.interbase.com/
 http://www.firebirdsql.org/
 
-and of course the firebird page itself:
-WWW: http://sourceforge.net/projects/firebird/
-
 For more information on the locksmith back door, see:
 
 https://www.kb.cert.org/vuls/id/247371
diff --git a/databases/firebird-devel/pkg-install b/databases/firebird-devel/pkg-install
index c6b00320cd7e..af43f63a3943 100644
--- a/databases/firebird-devel/pkg-install
+++ b/databases/firebird-devel/pkg-install
@@ -29,7 +29,7 @@ if 0;
 if( \$> ) {
 	print "\nYou must be root to run this step!\n\n";
 	exit 1;
-} 
+}
 
 if( getpwnam( "firebird" ) ) {
 	( \$null, \$null, \$fbUID ) = getpwnam( "firebird" );
@@ -78,7 +78,7 @@ chmod -R o=r $PKG_PREFIX/firebird
 
 # Now fix up the mess.
 
-# fix up directories 
+# fix up directories
 for i in `find $PKG_PREFIX/firebird -print`
   do
     FileName=$i
@@ -99,7 +99,7 @@ ln -sf ib_util.so libib_util.so
 cd $PKG_PREFIX/firebird/bin
 
 # all users can run everything.
-chmod o=rx * 
+chmod o=rx *
 
 # SUID is needed for running server programs.
 
@@ -113,7 +113,7 @@ for i in gds_lock_mgr gds_drop gds_inet_server
 
 cd $PKG_PREFIX/firebird
 
-for i in isc_init1 isc_lock1 isc_event1 
+for i in isc_init1 isc_lock1 isc_event1
   do
     FileName=$i.`hostname`
     touch $FileName
diff --git a/databases/firebird-devel/scripts/createuser b/databases/firebird-devel/scripts/createuser
index b61d47fd84bd..eba7ce1b887d 100644
--- a/databases/firebird-devel/scripts/createuser
+++ b/databases/firebird-devel/scripts/createuser
@@ -8,7 +8,7 @@ if 0;
 if( $> ) {
 	print "\nYou must be root to run this step!\n\n";
 	exit 1;
-} 
+}
 
 if( getpwnam( "firebird" ) ) {
 	( $null, $null, $fbUID ) = getpwnam( "firebird" );
diff --git a/databases/firebird-devel/scripts/post-install b/databases/firebird-devel/scripts/post-install
index c2515fde278c..68b4ccadb907 100644
--- a/databases/firebird-devel/scripts/post-install
+++ b/databases/firebird-devel/scripts/post-install
@@ -7,7 +7,7 @@ chmod -R o=r $PREFIX/firebird
 
 # Now fix up the mess.
 
-# fix up directories 
+# fix up directories
 for i in `find $PREFIX/firebird -print`
   do
     FileName=$i
@@ -28,7 +28,7 @@ ln -sf ib_util.so libib_util.so
 cd $PREFIX/firebird/bin
 
 # all users can run everything.
-chmod o=rx * 
+chmod o=rx *
 
 # SUID is needed for running server programs.
 
@@ -42,7 +42,7 @@ for i in gds_lock_mgr gds_drop gds_inet_server
 
 cd $PREFIX/firebird
 
-for i in isc_init1 isc_lock1 isc_event1 
+for i in isc_init1 isc_lock1 isc_event1
   do
     FileName=$i.`hostname`
     touch $FileName