git: 0688cb94de1f - main - databases/firebird25-*: update to 2.5.9

[Jose Alonso Cardenas Marquez]

The branch main has been updated by acm:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0688cb94de1f5c5898c9d2d0a7e34b9a32055561

commit 0688cb94de1f5c5898c9d2d0a7e34b9a32055561
Author:     Jose Alonso Cardenas Marquez <acm at FreeBSD.org>
AuthorDate: 2021-05-22 18:24:30 +0000
Commit:     Jose Alonso Cardenas Marquez <acm at FreeBSD.org>
CommitDate: 2021-05-22 18:33:03 +0000

    databases/firebird25-*: update to 2.5.9
    
    - Fix core dump on newest versions of FreeBSD [1]
    - Drop uneccesary patch files
    
    ChangeLog at:   https://firebirdsql.org/file/documentation/release_notes/html/en/2_5/rlsnotes25.html
    PR:             254206 254849
    Reported by:    pi jbeich
    Obtained from:  https://lists.freebsd.org/pipermail/freebsd-ports/2021-March/120469.html [1]
---
 databases/firebird25-server/Makefile                   |  7 +++----
 databases/firebird25-server/distinfo                   |  6 +++---
 .../files/patch-src-common-classes-FpeControl.h        | 18 ------------------
 .../files/patch-src-common-classes_alloc.h             | 11 +++++++++++
 .../files/patch-src_jrd_isc__sync.cpp                  | 11 -----------
 5 files changed, 17 insertions(+), 36 deletions(-)

diff --git a/databases/firebird25-server/Makefile b/databases/firebird25-server/Makefile
index 6402007b06ef..0edc57a1d941 100644
--- a/databases/firebird25-server/Makefile
+++ b/databases/firebird25-server/Makefile
@@ -1,10 +1,9 @@
 PORTNAME=	firebird
-PORTVERSION=	2.5.8
-PORTREVISION=	8
+PORTVERSION=	2.5.9
 CATEGORIES?=	databases
-MASTER_SITES=	https://github.com/FirebirdSQL/${PORTNAME}/releases/download/R2_5_8/
+MASTER_SITES=	https://github.com/FirebirdSQL/${PORTNAME}/releases/download/R2_5_9/
 PKGNAMESUFFIX?=	${PORTVERSION:R:S/.//}-server
-DISTNAME=	${PORTNAME:S/f/F/}-${PORTVERSION}.27089-0
+DISTNAME=	${PORTNAME:S/f/F/}-${PORTVERSION}.27139-0
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	acm at FreeBSD.org
diff --git a/databases/firebird25-server/distinfo b/databases/firebird25-server/distinfo
index abd2f217b436..6bb3962962fb 100644
--- a/databases/firebird25-server/distinfo
+++ b/databases/firebird25-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1524662189
-SHA256 (firebird/Firebird-2.5.8.27089-0.tar.bz2) = d87d774736edb1eacc242c68831edb3575c28cc61378491f42f8932bf9975678
-SIZE (firebird/Firebird-2.5.8.27089-0.tar.bz2) = 13401870
+TIMESTAMP = 1621470414
+SHA256 (firebird/Firebird-2.5.9.27139-0.tar.bz2) = 46ee37b14b44f3e45cd286b739f92e9366643f52bef51a131cc973a6980d9481
+SIZE (firebird/Firebird-2.5.9.27139-0.tar.bz2) = 13567295
diff --git a/databases/firebird25-server/files/patch-src-common-classes-FpeControl.h b/databases/firebird25-server/files/patch-src-common-classes-FpeControl.h
deleted file mode 100644
index 1f1dbc887be8..000000000000
--- a/databases/firebird25-server/files/patch-src-common-classes-FpeControl.h
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/common/classes/FpeControl.h.orig	2016-06-30 09:34:54 UTC
-+++ src/common/classes/FpeControl.h
-@@ -223,13 +223,13 @@ inline bool isinf(double x)
- 	return (!_finite (x) && !isnan(x));
- }
- #else
--#ifndef isinf
-+#if !defined(isinf) && !defined(__FreeBSD__)
- template <typename F>
- inline bool isinf(F x)
- {
- 	return !isnan(x) && isnan(x - x);
- }
--#endif // isinf
-+#endif // isinf || FreeBSD
- #endif // WIN_NT
- 
- #endif //CLASSES_FPE_CONTROL_H
diff --git a/databases/firebird25-server/files/patch-src-common-classes_alloc.h b/databases/firebird25-server/files/patch-src-common-classes_alloc.h
new file mode 100644
index 000000000000..7257d8ae10d3
--- /dev/null
+++ b/databases/firebird25-server/files/patch-src-common-classes_alloc.h
@@ -0,0 +1,11 @@
+--- src/common/classes/alloc.h	2021-05-19 19:28:30.698498000 -0500
++++ src/common/classes/alloc.h	2021-05-19 19:29:17.345552000 -0500
+@@ -92,7 +92,7 @@
+ const int MAX_TREE_DEPTH = 4;
+ 
+ // Alignment for all memory blocks. Sizes of memory blocks in headers are measured in this units
+-const size_t ALLOC_ALIGNMENT = FB_ALIGNMENT;
++#define ALLOC_ALIGNMENT 16
+ 
+ static inline size_t MEM_ALIGN(size_t value)
+ {
diff --git a/databases/firebird25-server/files/patch-src_jrd_isc__sync.cpp b/databases/firebird25-server/files/patch-src_jrd_isc__sync.cpp
deleted file mode 100644
index 0a557cea343d..000000000000
--- a/databases/firebird25-server/files/patch-src_jrd_isc__sync.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/jrd/isc_sync.cpp.orig	2016-06-30 09:34:54 UTC
-+++ src/jrd/isc_sync.cpp
-@@ -677,7 +677,7 @@ namespace {
- 	public:
- 		const static int N_FILES = 128;
- 		const static int N_SETS = 256;
--#if defined(DEV_BUILD)
-+#if defined(DEV_BUILD) || defined(FREEBSD)
- 		const static int SEM_PER_SET = 4;	// force multiple sets allocation
- #else
- 		const static int SEM_PER_SET = 31;	// hard limit for some old systems, might set to 32