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

(-)Makefile (-5 / +11 lines)
Lines 6-20 Link Here
6
#
6
#
7
7
8
PORTNAME=	firebird
8
PORTNAME=	firebird
9
PORTVERSION=	2.0.a0
9
PORTVERSION=	2.0.a1
10
PORTREVISION=	1
11
CATEGORIES=	databases
10
CATEGORIES=	databases
12
MASTER_SITES=	http://www.aims.net.au/chris/firebird/
11
MASTER_SITES=	http://www.ramenzoni.com.br/~garga/firebird/
13
MASTER_SITE_SUBDIR=firebird
12
MASTER_SITE_SUBDIR=firebird
14
PKGNAMESUFFIX=	-devel
13
PKGNAMESUFFIX=	-devel
15
DISTNAME=	firebird2-20031110
14
DISTNAME=	firebird2-20050327
16
15
17
MAINTAINER=	ports@FreeBSD.org
16
MAINTAINER=	freebsd@galle.com.br
18
COMMENT=	The open-source InterBase(tm) 6.0 spin-off (Classic version)
17
COMMENT=	The open-source InterBase(tm) 6.0 spin-off (Classic version)
19
18
20
USE_BZIP2=	yes
19
USE_BZIP2=	yes
Lines 23-28 Link Here
23
GNU_CONFIGURE=	yes
22
GNU_CONFIGURE=	yes
24
WANT_AUTOCONF_VER=	259
23
WANT_AUTOCONF_VER=	259
25
USE_GCC=	3.4
24
USE_GCC=	3.4
25
USE_REINPLACE=	yes
26
26
27
CONFLICTS=	firebird-1.*
27
CONFLICTS=	firebird-1.*
28
NO_PACKAGE=	pkg-install not finished
28
NO_PACKAGE=	pkg-install not finished
Lines 52-57 Link Here
52
	@sleep 10
52
	@sleep 10
53
.endif
53
.endif
54
54
55
pre-configure:
56
	@${REINPLACE_CMD} "s/AUTOCONF=autoconf/AUTOCONF=autoconf259/g; \
57
	                   s/LIBTOOL=libtool/LIBTOOL=libtool13/g; \
58
	                   s/LIBTOOLIZE=libtoolize/LIBTOOLIZE=libtoolize13/g" \
59
	                  ${WRKSRC}/autogen.sh
60
55
do-configure:
61
do-configure:
56
	@(cd ${WRKSRC} && ${ENV} CC=${CC} CXX=${CXX} MAKE=${GMAKE} ./autogen.sh --prefix=${PREFIX}/firebird --with-lock-manager --with-editline)
62
	@(cd ${WRKSRC} && ${ENV} CC=${CC} CXX=${CXX} MAKE=${GMAKE} ./autogen.sh --prefix=${PREFIX}/firebird --with-lock-manager --with-editline)
57
63
(-)distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
MD5 (firebird2-20031110.tar.bz2) = fa8cc0819e0a74278719953cf013bcb1
1
MD5 (firebird2-20050327.tar.bz2) = 93996c74033f0efa180527e69f45196a
2
SIZE (firebird2-20031110.tar.bz2) = 3682236
2
SIZE (firebird2-20050327.tar.bz2) = 4321529
(-)pkg-plist (-2 / +29 lines)
Lines 6-11 Link Here
6
firebird/UDF/ib_udf.sql
6
firebird/UDF/ib_udf.sql
7
firebird/WhatsNew
7
firebird/WhatsNew
8
firebird/aliases.conf
8
firebird/aliases.conf
9
firebird/aliases.conf.sample
9
firebird/bin/fb_inet_server
10
firebird/bin/fb_inet_server
10
firebird/bin/fb_lock_mgr
11
firebird/bin/fb_lock_mgr
11
firebird/bin/fb_lock_print
12
firebird/bin/fb_lock_print
Lines 20-51 Link Here
20
firebird/bin/isql
21
firebird/bin/isql
21
firebird/bin/qli
22
firebird/bin/qli
22
firebird/doc/README.NTSecurity
23
firebird/doc/README.NTSecurity
24
firebird/doc/README.Optimizer.txt
25
firebird/doc/README.Win32LibraryInstallation.txt
23
firebird/doc/README.build.mingw.html
26
firebird/doc/README.build.mingw.html
24
firebird/doc/README.build.msvc.html
27
firebird/doc/README.build.msvc.html
25
firebird/doc/README.coding.style
28
firebird/doc/README.coding.style
26
firebird/doc/README.instsvc
29
firebird/doc/README.instsvc
30
firebird/doc/README.isql_enhancements.txt
27
firebird/doc/README.makefiles
31
firebird/doc/README.makefiles
32
firebird/doc/README.performance_monitoring
33
firebird/doc/README.sha1
28
firebird/doc/README.user
34
firebird/doc/README.user
29
firebird/doc/README.user.embedded
35
firebird/doc/README.user.embedded
30
firebird/doc/README.user.troubleshooting
36
firebird/doc/README.user.troubleshooting
37
firebird/doc/README.xnet
38
firebird/doc/sql.extensions/README.PSQL_stack_trace.txt
31
firebird/doc/sql.extensions/README.aggregate_tracking
39
firebird/doc/sql.extensions/README.aggregate_tracking
32
firebird/doc/sql.extensions/README.case
40
firebird/doc/sql.extensions/README.case
33
firebird/doc/sql.extensions/README.coalesce
41
firebird/doc/sql.extensions/README.coalesce
34
firebird/doc/sql.extensions/README.context_variables
42
firebird/doc/sql.extensions/README.context_variables
43
firebird/doc/sql.extensions/README.context_variables2
44
firebird/doc/sql.extensions/README.cursors
45
firebird/doc/sql.extensions/README.data_type_results_of_aggregations.txt
35
firebird/doc/sql.extensions/README.data_types
46
firebird/doc/sql.extensions/README.data_types
47
firebird/doc/sql.extensions/README.ddl.txt
48
firebird/doc/sql.extensions/README.default_parameters
49
firebird/doc/sql.extensions/README.derived_tables.txt
50
firebird/doc/sql.extensions/README.distinct
36
firebird/doc/sql.extensions/README.exception_handling
51
firebird/doc/sql.extensions/README.exception_handling
52
firebird/doc/sql.extensions/README.execute_block
37
firebird/doc/sql.extensions/README.execute_statement
53
firebird/doc/sql.extensions/README.execute_statement
38
firebird/doc/sql.extensions/README.explicit_locks
54
firebird/doc/sql.extensions/README.explicit_locks
55
firebird/doc/sql.extensions/README.expression_indices
56
firebird/doc/sql.extensions/README.iif
57
firebird/doc/sql.extensions/README.keywords
58
firebird/doc/sql.extensions/README.leave_labels
59
firebird/doc/sql.extensions/README.null_value
39
firebird/doc/sql.extensions/README.nullif
60
firebird/doc/sql.extensions/README.nullif
40
firebird/doc/sql.extensions/README.order_by_expressions_nulls
61
firebird/doc/sql.extensions/README.order_by_expressions_nulls
62
firebird/doc/sql.extensions/README.plan
63
firebird/doc/sql.extensions/README.rows
41
firebird/doc/sql.extensions/README.savepoints
64
firebird/doc/sql.extensions/README.savepoints
65
firebird/doc/sql.extensions/README.select_expressions
66
firebird/doc/sql.extensions/README.sequence_generators
42
firebird/doc/sql.extensions/README.universal_triggers
67
firebird/doc/sql.extensions/README.universal_triggers
68
firebird/doc/sql.extensions/README.view_updates
43
firebird/firebird.conf
69
firebird/firebird.conf
70
firebird/firebird.conf.sample
44
@unexec rm -f %D/firebird/firebird.log
71
@unexec rm -f %D/firebird/firebird.log
45
firebird/firebird.msg
72
firebird/firebird.msg
46
firebird/help/help.fdb
73
firebird/help/help.fdb
47
firebird/include/blr.h
74
firebird/include/blr.h
48
firebird/include/gds.h
49
firebird/include/ib_util.h
75
firebird/include/ib_util.h
50
firebird/include/ibase.h
76
firebird/include/ibase.h
51
firebird/include/iberror.h
77
firebird/include/iberror.h
Lines 61-67 Link Here
61
firebird/lib/libfbembed.so.2
87
firebird/lib/libfbembed.so.2
62
firebird/lib/libfbembed.so.2.0.0
88
firebird/lib/libfbembed.so.2.0.0
63
firebird/lib/libib_util.so
89
firebird/lib/libib_util.so
64
firebird/security.fdb
90
firebird/security2.fdb.sample
91
firebird/security2.fdb
65
@dirrm firebird/UDF
92
@dirrm firebird/UDF
66
@dirrm firebird/bin
93
@dirrm firebird/bin
67
@dirrm firebird/doc/sql.extensions
94
@dirrm firebird/doc/sql.extensions
(-)files/patch-autogen.sh (-43 lines)
Removed Link Here
1
--- autogen.sh.orig	Sat Nov  1 14:50:38 2003
2
+++ autogen.sh	Mon Nov 10 16:24:17 2003
3
@@ -8,7 +8,7 @@
4
 SRCDIR=`dirname $0`
5
 DIE=0
6
 
7
-VER=`autoconf --version|grep '^[Aa]utoconf'|sed 's/^[^0-9]*//'`
8
+VER=`autoconf259 --version|grep '^[Aa]utoconf'|sed 's/^[^0-9]*//'`
9
 case "$VER" in
10
  0* | 1\.* | 2\.[0-9] | 2\.[0-9][a-z]* | \
11
  2\.[1-4][0-9] | 2\.5[0-6][a-z]* )
12
@@ -20,7 +20,7 @@
13
   ;;
14
 esac
15
 
16
-VER=`libtool --version|grep ' libtool)'|sed 's/.*) \([0-9][0-9.]*\) .*/\1/'`
17
+VER=`libtool13 --version|grep ' libtool)'|sed 's/.*) \([0-9][0-9.]*\) .*/\1/'`
18
 case "$VER" in
19
  0* | 1\.[0-2] | 1\.[0-2][a-z]* | \
20
  1\.3\.[0-2] | 1\.3\.[0-2][a-z]* )
21
@@ -50,18 +50,18 @@
22
 
23
 # Generate configure from configure.in
24
 echo "Running libtoolize ..."
25
-LIBTOOL_M4=`libtoolize --copy --force --dry-run|grep 'You should add the contents of'|sed "s,^[^/]*\(/[^']*\).*$,\1,"`
26
+LIBTOOL_M4=`libtoolize13 --copy --force --dry-run|grep 'You should add the contents of'|sed "s,^[^/]*\(/[^']*\).*$,\1,"`
27
 if test "x$LIBTOOL_M4" != "x"; then
28
  rm -f aclocal.m4
29
  cp $LIBTOOL_M4 aclocal.m4
30
 fi
31
-libtoolize --copy --force || exit 1
32
+libtoolize13 --copy --force || exit 1
33
 
34
 echo "Running autoheader ..."
35
-autoheader || exit 1
36
+autoheader259 || exit 1
37
 
38
 echo "Running autoconf ..."
39
-autoconf || exit 1
40
+autoconf259 || exit 1
41
 
42
 # If NOCONFIGURE is set, skip the call to configure
43
 if test "x$NOCONFIGURE" = "x"; then
(-)files/patch-src::common::classes::locks.h (-49 lines)
Removed Link Here
1
--- src/common/classes/locks.h.orig	Sun Aug 17 14:56:47 2003
2
+++ src/common/classes/locks.h	Wed Nov 12 11:12:25 2003
3
@@ -77,7 +77,7 @@
4
 
5
 /* Process-local spinlock. Used to manage memory heaps in threaded environment. */
6
 // Pthreads version of the class
7
-#ifndef SOLARIS
8
+#if !defined(SOLARIS) && !defined(DARWIN) && !defined(FREEBSD)
9
 class Spinlock {
10
 private:
11
 	pthread_spinlock_t spinlock;
12
@@ -100,6 +100,7 @@
13
 	}
14
 };
15
 #else
16
+#ifdef SOLARIS
17
 // Who knows why Solaris 2.6 have not THIS funny spins?
18
 //The next code is not comlpeted but let me compile //Konstantin
19
 class Spinlock {
20
@@ -123,6 +124,29 @@
21
 			system_call_failed::raise();
22
 	}
23
 };
24
+#else  // DARWIN and FREEBSD
25
+class Spinlock {
26
+private:
27
+	pthread_mutex_t mlock;
28
+public:
29
+	Spinlock() {
30
+		if (pthread_mutex_init(&mlock, 0))
31
+			system_call_failed::raise();
32
+	}
33
+	~Spinlock() {
34
+		if (pthread_mutex_destroy(&mlock))
35
+			system_call_failed::raise();
36
+	}
37
+	void enter() {
38
+		if (pthread_mutex_lock(&mlock))
39
+			system_call_failed::raise();
40
+	}
41
+	void leave() {
42
+		if (pthread_mutex_unlock(&mlock))
43
+			system_call_failed::raise();
44
+	}
45
+};
46
+#endif
47
 
48
 #endif
49
 #endif

Return to bug 79310