View | Details | Raw Unified | Return to bug 35982
Collapse All | Expand All

(-)Makefile (-14 / +30 lines)
Lines 6-24 Link Here
6
#
6
#
7
7
8
PORTNAME=	firebird
8
PORTNAME=	firebird
9
PORTVERSION=	0.9
9
PORTVERSION=	1.0
10
PORTREVISION=	4
11
CATEGORIES=	databases
10
CATEGORIES=	databases
12
MASTER_SITES=	http://firebird.sourceforge.net/download/ \
11
MASTER_SITES=	http://firebird.sourceforge.net/download/ \
12
		http://www.aims.com.au/chris/ \
13
		${MASTER_SITE_SOURCEFORGE}
13
		${MASTER_SITE_SOURCEFORGE}
14
MASTER_SITE_SUBDIR=firebird
14
MASTER_SITE_SUBDIR=firebird
15
DISTFILES=	firebird-boot-kit.tar.gz \
15
DISTFILES=	bootkit-1.0.0.796.tar.gz \
16
		bootkit-freebsd-1.0.0.796.tar.gz \
16
		interbase0.9-4-v5examples.tar.gz \
17
		interbase0.9-4-v5examples.tar.gz \
17
		interbase0.9-4src.tar.gz
18
		Firebird-1.0.0.796.src.tar.gz
18
19
19
MAINTAINER=	chris@aims.com.au
20
MAINTAINER=	chris@aims.com.au
20
21
21
WRKSRC=		${WRKDIR}/interbase
22
WRKSRC=		${WRKDIR}/firebird-1.0.0.796
22
INSTALLS_SHLIB=	yes
23
INSTALLS_SHLIB=	yes
23
LDCONFIG_DIRS=	%%PREFIX%%/firebird/lib
24
LDCONFIG_DIRS=	%%PREFIX%%/firebird/lib
24
MSG_FILE=	${PKGDIR}/pkg-message
25
MSG_FILE=	${PKGDIR}/pkg-message
Lines 31-39 Link Here
31
do-extract:
32
do-extract:
32
	@${MKDIR} ${WRKDIR}
33
	@${MKDIR} ${WRKDIR}
33
	@(								\
34
	@(								\
34
	cd ${WRKDIR}; ${TAR} -xzf ${DISTDIR}/interbase0.9-4src.tar.gz;	\
35
	cd ${WRKDIR}; ${TAR} -zxf					\
35
	cd interbase; ${TAR} -xzf ${DISTDIR}/firebird-boot-kit.tar.gz;	\
36
		 ${DISTDIR}/Firebird-1.0.0.796.src.tar.gz;		\
36
	${CP} msgs/msg.gbak misc/msg.gbak				\
37
	cd firebird-1.0.0.796;						\
38
	${TAR} -zxf ${DISTDIR}/bootkit-1.0.0.796.tar.gz;		\
39
	${TAR} -zxf ${DISTDIR}/bootkit-freebsd-1.0.0.796.tar.gz;	\
40
	${CP} -f msgs/msg.gbak misc/msg.gbak				\
37
	)
41
	)
38
42
39
post-patch:
43
post-patch:
Lines 47-57 Link Here
47
51
48
do-configure:
52
do-configure:
49
	@(								\
53
	@(								\
50
	cd ${WRKDIR}/interbase;						\
54
	cd ${WRKDIR}/firebird-1.0.0.796;				\
51
	INTERBASE=${WRKDIR}/interbase/interbase; export INTERBASE;	\
55
	INTERBASE=${WRKDIR}/firebird-1.0.0.796/interbase; export INTERBASE; \
52
	REFDBPATH=${WRKDIR}/refDatabases; export REFDBPATH;		\
56
	REFDBPATH=${WRKDIR}/refDatabases; export REFDBPATH;		\
53
	${SH} buildBootDatabases;					\
57
	${SH} buildBootDatabases;					\
54
	${SH} setup_dirs.boot FREEBSD PROD ${WRKDIR}/refDatabases boot;	\
58
	NOPROMPT_SETUP=yes; export NOPROMPT_SETUP;			\
59
	FIREBIRD_64_BIT_IO=yes; export FIREBIRD_64_BIT_IO;		\
60
	${CAT} builds_win32/original/build_no.ksh | ${TR} -d '\r'	\
61
		> builds_win32/original/build_no.ksh.fix;		\
62
	${MV} -f builds_win32/original/build_no.ksh.fix			\
63
		 builds_win32/original/build_no.ksh;			\
64
	${SH} Configure.sh PROD FREEBSD;				\
55
	)
65
	)
56
66
57
do-build:
67
do-build:
Lines 60-74 Link Here
60
	'[ -d ${LDCONFIG_RUNLIST} ] && ${LDCONFIG} -m ${LDCONFIG_RUNLIST}'; \
70
	'[ -d ${LDCONFIG_RUNLIST} ] && ${LDCONFIG} -m ${LDCONFIG_RUNLIST}'; \
61
	) > ${WRKDIR}/000.${PORTNAME}.sh
71
	) > ${WRKDIR}/000.${PORTNAME}.sh
62
	@(								\
72
	@(								\
63
	cd ${WRKDIR}/interbase;						\
73
	${LN} -sf ${WRKDIR}/refDatabases/jrd/isc.gdb			\
64
	INTERBASE=${WRKDIR}/interbase/interbase; export INTERBASE;	\
74
		 ${WRKDIR}/firebird-1.0.0.796/interbase/isc4.gdb;	\
75
	${LN} -sf ${WRKDIR}/refDatabases/msgs/msg.gdb			\
76
		 ${WRKDIR}/firebird-1.0.0.796/msg.gdb;			\
77
	cd ${WRKDIR}/firebird-1.0.0.796;				\
78
	INTERBASE=${WRKDIR}/firebird-1.0.0.796/interbase; export INTERBASE; \
65
	REFDBPATH=${WRKDIR}/refDatabases; export REFDBPATH;		\
79
	REFDBPATH=${WRKDIR}/refDatabases; export REFDBPATH;		\
66
	${SH} boot.freebsd;						\
80
	${SH} boot.freebsd;						\
67
	)
81
	)
68
82
69
do-install:
83
do-install:
70
	@(								\
84
	@(								\
71
	cd ${WRKDIR}/interbase;						\
85
	cd ${WRKDIR}/firebird-1.0.0.796;				\
86
	${RM} ${WRKDIR}/firebird-1.0.0.796/interbase/isc4_tmp.gdb;	\
87
	${CP} /dev/null interbase/interbase.log;			\
72
	${CP} -Rp interbase ${PREFIX}/firebird;				\
88
	${CP} -Rp interbase ${PREFIX}/firebird;				\
73
	${RM} ${PREFIX}/firebird/install;				\
89
	${RM} ${PREFIX}/firebird/install;				\
74
	${RM} ${PREFIX}/firebird/lib/libgds.so.1.0;			\
90
	${RM} ${PREFIX}/firebird/lib/libgds.so.1.0;			\
(-)distinfo (-2 / +3 lines)
Lines 1-3 Link Here
1
MD5 (firebird-boot-kit.tar.gz) = 2e18d75539bc4c3d40a1a71509309f64
1
MD5 (bootkit-1.0.0.796.tar.gz) = edcabe09957ed10b12e2f44eac9ae155
2
MD5 (bootkit-freebsd-1.0.0.796.tar.gz) = 95bd14ec76bcf2b4ed41e3253ed58847
2
MD5 (interbase0.9-4-v5examples.tar.gz) = 17cba82bbf5066d515f2dee97bf8327a
3
MD5 (interbase0.9-4-v5examples.tar.gz) = 17cba82bbf5066d515f2dee97bf8327a
3
MD5 (interbase0.9-4src.tar.gz) = d098277ed160e2b6a49d91e1fdb3a652
4
MD5 (Firebird-1.0.0.796.src.tar.gz) = 53bfebb4a269eb0f3c508587a843ddf8
(-)pkg-descr (-3 / +2 lines)
Lines 10-22 Link Here
10
been closed.
10
been closed.
11
11
12
For more information on Firebird and InterBase, see:
12
For more information on Firebird and InterBase, see:
13
14
http://sourceforge.net/projects/firebird/
13
http://www.ibphoenix.com/
15
http://www.ibphoenix.com/
14
http://www.interbase2000.org/
16
http://www.interbase2000.org/
15
http://www.interbase.com/
17
http://www.interbase.com/
16
http://www.firebirdsql.org/
18
http://www.firebirdsql.org/
17
18
and of course the firebird page itself:
19
WWW: http://sourceforge.net/projects/firebird/
20
19
21
For more information on the locksmith back door, see:
20
For more information on the locksmith back door, see:
22
21
(-)pkg-install (-4 / +4 lines)
Lines 29-35 Link Here
29
if( \$> ) {
29
if( \$> ) {
30
	print "\nYou must be root to run this step!\n\n";
30
	print "\nYou must be root to run this step!\n\n";
31
	exit 1;
31
	exit 1;
32
} 
32
}
33
33
34
if( getpwnam( "firebird" ) ) {
34
if( getpwnam( "firebird" ) ) {
35
	( \$null, \$null, \$fbUID ) = getpwnam( "firebird" );
35
	( \$null, \$null, \$fbUID ) = getpwnam( "firebird" );
Lines 78-84 Link Here
78
78
79
# Now fix up the mess.
79
# Now fix up the mess.
80
80
81
# fix up directories 
81
# fix up directories
82
for i in `find $PKG_PREFIX/firebird -print`
82
for i in `find $PKG_PREFIX/firebird -print`
83
  do
83
  do
84
    FileName=$i
84
    FileName=$i
Lines 99-105 Link Here
99
cd $PKG_PREFIX/firebird/bin
99
cd $PKG_PREFIX/firebird/bin
100
100
101
# all users can run everything.
101
# all users can run everything.
102
chmod o=rx * 
102
chmod o=rx *
103
103
104
# SUID is needed for running server programs.
104
# SUID is needed for running server programs.
105
105
Lines 113-119 Link Here
113
113
114
cd $PKG_PREFIX/firebird
114
cd $PKG_PREFIX/firebird
115
115
116
for i in isc_init1 isc_lock1 isc_event1 
116
for i in isc_init1 isc_lock1 isc_event1
117
  do
117
  do
118
    FileName=$i.`hostname`
118
    FileName=$i.`hostname`
119
    touch $FileName
119
    touch $FileName
(-)files/RELNOTES (-5 / +5 lines)
Lines 1-6 Link Here
1
Firebird 0.9_4 FreeBSD Release Notes                       13-Jan-2001
1
Firebird 1.0.0 FreeBSD Release Notes                    13-Mar-2002
2
------------------------------------
2
--------------------------------------
3
FB-T0.9.4.34 Firebird Test1
3
FB-T6.2.796 Firebird Final Release
4
4
5
Welcome to the FreeBSD Firebird port!  Users should note that there
5
Welcome to the FreeBSD Firebird port!  Users should note that there
6
was a package called `firebird-1.0.tgz' released in mid-August
6
was a package called `firebird-1.0.tgz' released in mid-August
Lines 75-79 Link Here
75
	http://www.interbase2000.org/
75
	http://www.interbase2000.org/
76
	http://www.firebirdsql.org/
76
	http://www.firebirdsql.org/
77
77
78
Geoff Speicher
78
Chris Knight
79
<geoff@sea-incorporated.com>
79
<chris@aims.com.au>
(-)files/patch-aa (-11 lines)
Removed Link Here
1
--- buildBootDatabases.orig	Tue Oct 10 23:00:39 2000
2
+++ buildBootDatabases	Tue Oct 10 23:00:46 2000
3
@@ -49,7 +49,7 @@
4
     DefaultAns=$2
5
     echo -n "${1}"
6
     Answer="$DefaultAns"
7
-    read Answer
8
+#    read Answer
9
 }
10
 
11
 #--------------------------------------------------------------------
(-)files/patch-ab (-11 lines)
Removed Link Here
1
--- setup_dirs.boot.orig	Tue Oct 10 23:00:07 2000
2
+++ setup_dirs.boot	Tue Oct 10 23:00:22 2000
3
@@ -49,7 +49,7 @@
4
    DefaultAns=$2
5
    echo -n "${1}"
6
    Answer="$DefaultAns"
7
-   read Answer 
8
+#   read Answer 
9
 }
10
 
11
 
(-)files/patch-ac (-58 lines)
Removed Link Here
1
--- builds/original/prefix.freebsd	2000/10/08 15:36:25	1.2
2
+++ builds/original/prefix.freebsd	2001/01/11 19:17:58
3
@@ -28,7 +28,7 @@
4
 
5
 
6
 PROD_DEBUG_OBJECTS=	nodebug.o
7
-PROD_SHRLIB_DIR=	
8
+PROD_SHRLIB_DIR=	-Lsource/jrd
9
 PROD_VERSION_FLAG=	-DPROD_BUILD
10
 PROD_CFLAGS=            -O -m486 -fpic -DFLINTSTONE
11
 
12
@@ -48,7 +48,7 @@
13
 UDF_LINK_CMD=		gcc
14
 UDF_CFLAGS=         	-fPIC -mieee-fp
15
 UDF_LFLAGS=         	-shared
16
-UDF_SHRLIBS=        	-L/usr/local/lib -lgds -lm -lc -mieee-fp -ldescrypt
17
+UDF_SHRLIBS=        	$(SHRLIB_DIR) -lgds -lm -lc -mieee-fp -ldescrypt
18
 
19
 #NOTE: PIC_J_CFLAGS is special CFLAGS used to build PIPD_IS_SHRLIB modules
20
 #      to workaround the Solaris threading problems with signals
21
@@ -69,16 +69,14 @@
22
 FUNCTIONS=		functions.bin
23
 FUNCSHR=		source/interbase/lib/gdsf.so
24
 GDS_LINK=		$(GDSSHR_LINK)
25
-#GDS_PYXIS=
26
 GDS_PYXIS=		gds_pyxis.a
27
 GDSLIB_BACKEND=		source/interbase/lib/gds_b.a
28
 GDSLIB_LINK=		-Lsource/jrd -lgds_b -lc -ldescrypt
29
 
30
 GDSSHR=			source/interbase/lib/gds.so
31
 LINUX_GDSSHR=		$(GDSSHR)
32
-GDSSHR_LINK=		$(SHRLIB_DIR) -L/usr/local/lib -lgds -lgds_pyxis -ldescrypt
33
-PIPE_GDSSHR_LINK=	$(SHRLIB_DIR) -L/usr/local/lib -lgds -lgds_pyxis
34
-#PIPE_GDSSHR_LINK=	$(SHRLIB_DIR) -lgds -lgds_pyxis
35
+GDSSHR_LINK=		$(SHRLIB_DIR) -lgds -lgds_pyxis -ldescrypt
36
+PIPE_GDSSHR_LINK=	$(SHRLIB_DIR) -lgds -lgds_pyxis
37
 HLPDIR=			source/qli/
38
 HOSTNAME=		`hostname | cut -d'.' -f1`
39
 INCLUDES=		include_so include_so_ada	
40
@@ -106,11 +104,6 @@
41
 MUISQL_LINK_OPTS=	$(MUISQL_MU_LIB) $(PIPE_GDSSHR_LINK) -lm 
42
 PIC_FLAGS=		$(CFLAGS) -fPIC
43
 PIPE=			gds.a gds_pipe
44
-#PYXIS=
45
-#PYXIS_MISC_OBJS=
46
-#PYXIS_P_MISC_OBJS=
47
-#PYXIS_OBJECTS=
48
-#PYXIS_MISC_OBJECTS=
49
 PYXIS=			pyxis
50
 PYXIS_MISC_OBJS=	$(PYXIS_MISC)
51
 PYXIS_P_MISC_OBJS=	$(PYXIS_P_MISC)
52
@@ -167,5 +160,8 @@
53
 SHRLIB_EXT=		.so
54
 
55
 V3PRINTER=		source/lock/printv3.o
56
+
57
+# Forces library build for FreeBSD
58
+PYXIS_LIBRARY= libpyxis.a
(-)files/patch-ad (-12 / +11 lines)
Lines 1-13 Link Here
1
--- jrd/enc.c.orig	Fri Aug  4 06:50:03 2000
1
--- setup_dirs.orig	Tue Aug  7 05:00:12 2001
2
+++ jrd/enc.c	Sun Nov 18 19:17:19 2001
2
+++ setup_dirs	Fri Dec 28 16:12:49 2001
3
@@ -31,6 +31,10 @@
3
@@ -60,7 +60,8 @@
4
  *
4
     DefaultAns=$2
5
  **************************************/
5
     echo -n "${1}"
6
6
     Answer="$DefaultAns"
7
+#ifdef FREEBSD
7
-    read Answer 
8
+crypt_set_format("des");
8
+#    read Answer 
9
+#endif
9
+    echo ""
10
+
11
 return CRYPT_FUNC( string, salt);
12
 }
10
 }
13
 #endif
11
 
12
 
(-)files/patch-ae (+10 lines)
Added Link Here
1
--- jrd/common.h.orig	Sat Nov 17 20:07:00 2001
2
+++ jrd/common.h	Sun Nov 18 18:54:26 2001
3
@@ -137,6 +137,7 @@
4
 /* FreeBSD for Intel platforms */
5
 #ifdef FREEBSD
6
7
+#define UNIX_64_BIT_IO
8
 #define FB_ALIGN(n,b) ((n + b - 1) & ~(b - 1))
9
 #define ALIGNMENT     4
10
 #define DOUBLE_ALIGN  4
(-)files/patch-af (+13 lines)
Added Link Here
1
--- jrd/enc.c.orig	Fri Aug  4 06:50:03 2000
2
+++ jrd/enc.c	Sun Nov 18 19:17:19 2001
3
@@ -31,6 +31,10 @@
4
  *
5
  **************************************/
6
7
+#ifdef FREEBSD
8
+crypt_set_format("des");
9
+#endif
10
+
11
 return CRYPT_FUNC( string, salt);
12
 }
13
 #endif
(-)files/patch-ag (+11 lines)
Added Link Here
1
--- Configure.sh.orig	Tue Nov 20 05:00:25 2001
2
+++ Configure.sh	Fri Dec 28 19:11:50 2001
3
@@ -515,7 +515,7 @@
4
 BuildBootFlg="No"
5
 BuildHostType=""
6
 BuildBuildType="PROD"
7
-MasterSourceDir="`pwd`/refDatabases"
8
+MasterSourceDir="$REFDBPATH"
9
 BuildIOsize=32
10
 
11
 export BuildHostType
(-)scripts/createuser (-1 / +1 lines)
Lines 8-14 Link Here
8
if( $> ) {
8
if( $> ) {
9
	print "\nYou must be root to run this step!\n\n";
9
	print "\nYou must be root to run this step!\n\n";
10
	exit 1;
10
	exit 1;
11
} 
11
}
12
12
13
if( getpwnam( "firebird" ) ) {
13
if( getpwnam( "firebird" ) ) {
14
	( $null, $null, $fbUID ) = getpwnam( "firebird" );
14
	( $null, $null, $fbUID ) = getpwnam( "firebird" );
(-)scripts/post-install (-3 / +3 lines)
Lines 7-13 Link Here
7
7
8
# Now fix up the mess.
8
# Now fix up the mess.
9
9
10
# fix up directories 
10
# fix up directories
11
for i in `find $PREFIX/firebird -print`
11
for i in `find $PREFIX/firebird -print`
12
  do
12
  do
13
    FileName=$i
13
    FileName=$i
Lines 28-34 Link Here
28
cd $PREFIX/firebird/bin
28
cd $PREFIX/firebird/bin
29
29
30
# all users can run everything.
30
# all users can run everything.
31
chmod o=rx * 
31
chmod o=rx *
32
32
33
# SUID is needed for running server programs.
33
# SUID is needed for running server programs.
34
34
Lines 42-48 Link Here
42
42
43
cd $PREFIX/firebird
43
cd $PREFIX/firebird
44
44
45
for i in isc_init1 isc_lock1 isc_event1 
45
for i in isc_init1 isc_lock1 isc_event1
46
  do
46
  do
47
    FileName=$i.`hostname`
47
    FileName=$i.`hostname`
48
    touch $FileName
48
    touch $FileName

Return to bug 35982