From nobody Wed Nov 23 02:54:18 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NH5Lf3jT0z4hLMr; Wed, 23 Nov 2022 02:54:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NH5Lf399Zz3l3k; Wed, 23 Nov 2022 02:54:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669172058; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LUiN20mzfSPSdjobkzZM6W4EU6Qx5Gs1Gx3J+6yDnp0=; b=VzZXp37ES/nh3DYH3fd2HHvoK+6pTjQ+lDik0pTmEWIJVWGu8fHK6eqDAJyXzo1E1DKxRH 4+n1MJRWGEKtqQ4EfKwGAMOktp9ie3o7XdjPYs5Zg3C0FDJi+XpATF2pXth4YjpQjmlAgC hp6I61NknybQ7IVpgKJcuOTsWIpTYSC0EiFcTk8khrg2q1LEKuK5HzU3O73GjTBNhcK4lf azxaX24i7pcnU1EXVxPaBnX1MVqdw2kpNLEO4f/t+Iu3UOSpTHBcnHHEwbFr1O3gGDWdSE wPDK9SB/5dNlLDiJezQ2cIlKq0QRTTPZk3pDNWc8LT7lH9lv0WdQ3BCIN3AmOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669172058; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LUiN20mzfSPSdjobkzZM6W4EU6Qx5Gs1Gx3J+6yDnp0=; b=MDPNP21RUfzZSrSthpU+TVXRw7gVbtDOE0obyJ3neKN5X+SROxf/JVVxddakEOTjkHrTaC wPXFtNLnd9sQjcbnHxx6hVpCFxrZBJsD2d1YPd9qR5+k6LvpIf4kWo/HNsgOrU5PMQJ5Wi WVmA8KWewxOjAgfHEuGqWcrUIfv0QbysTsjR3ir5IoeMJXv6EVMUiETZVYeJtbebGRfRoP 7VvLRTzAE2376oafLqayxoSCcJBT/mZKWQDERRvViVN/00okvGJU2gpT3LoMJtkB/kjtol F9RUejdN+F1apo5O4n8o3RrsoUVc39sh6YkcjxoqYMNXnh8JN48/SYCvhwCsAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669172058; a=rsa-sha256; cv=none; b=q2pr2A1xxF9XhG4uRvs/5UMGLJIW/LMH1bxFM4e09VWGMoJQn0dU4tN0c7382v387RGz9c Vn3z52TG9+hD1xwAWzLUMxK32SeheqbFOLr9vLg81llzy/d62bS1mgbG2eHQZYSiDj+Oe5 UmGDIgoarzg2+htYN7eRhWRQFMK56k70qQSKIwcqWY0fH297G899UDURzzPCYhE0agBLD8 pV2wAzUTwtuvIUZU22wTv96SZ/vTVSlx2f5ECqpxOaTF0o3SMWIPk8QlWOfV/OVhZXW38T GW/iltIOHKOSxwncNr/Sd+18p+RnAJeTo7ehKxzpAJMDz5cs5gxi+oN7GzNtUQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NH5Lf29M4z15lx; Wed, 23 Nov 2022 02:54:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2AN2sIuY034154; Wed, 23 Nov 2022 02:54:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AN2sI4N034153; Wed, 23 Nov 2022 02:54:18 GMT (envelope-from git) Date: Wed, 23 Nov 2022 02:54:18 GMT Message-Id: <202211230254.2AN2sI4N034153@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jose Alonso Cardenas Marquez Subject: git: fb4807899070 - main - databases:firebird40-*: Update to 4.0.2 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: acm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fb48078990706bd1af7dd8ad5b601395876ba651 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=fb48078990706bd1af7dd8ad5b601395876ba651 commit fb48078990706bd1af7dd8ad5b601395876ba651 Author: Jose Alonso Cardenas Marquez AuthorDate: 2022-11-23 02:51:31 +0000 Commit: Jose Alonso Cardenas Marquez CommitDate: 2022-11-23 02:54:05 +0000 databases:firebird40-*: Update to 4.0.2 ChangeLog at: https://firebirdsql.org/file/documentation/release_notes/html/en/4_0/rlsnotes40.html --- databases/firebird40-server/Makefile | 9 +++----- databases/firebird40-server/distinfo | 6 +++--- .../files/patch-extern_cloop_Makefile | 17 +++++++-------- .../files/patch-src_remote_SockAddr.h | 25 ---------------------- 4 files changed, 14 insertions(+), 43 deletions(-) diff --git a/databases/firebird40-server/Makefile b/databases/firebird40-server/Makefile index bfc9c04af4c5..800515207c12 100644 --- a/databases/firebird40-server/Makefile +++ b/databases/firebird40-server/Makefile @@ -1,15 +1,12 @@ PORTNAME= firebird -PORTVERSION= 4.0.0 -PORTREVISION= 4 +PORTVERSION= 4.0.2 +PORTREVISION= 0 CATEGORIES?= databases MASTER_SITES= https://github.com/FirebirdSQL/${PORTNAME}/releases/download/v${PORTVERSION}/ PKGNAMESUFFIX?= ${PORTVERSION:R:S/.//}-server -DISTNAME= ${PORTNAME:S/f/F/}-${PORTVERSION}.2496-0 +DISTNAME= ${PORTNAME:S/f/F/}-${PORTVERSION}.2816-0 DIST_SUBDIR= ${PORTNAME} -PATCH_SITES= https://github.com/FirebirdSQL/firebird/commit/ -PATCHFILES= 96931200340c8e0abcd3529b8e443d5ab62adfa5.patch:-p1 - MAINTAINER= acm@FreeBSD.org COMMENT?= Firebird-4 relational database (server) WWW= https://www.firebirdsql.org/ diff --git a/databases/firebird40-server/distinfo b/databases/firebird40-server/distinfo index f6ab8f53d3ce..4cc2b3984a4a 100644 --- a/databases/firebird40-server/distinfo +++ b/databases/firebird40-server/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1659115441 -SHA256 (firebird/Firebird-4.0.0.2496-0.tar.xz) = c155b8893e39d27c90f164d4865a7940749f47e971c7da6cf4828c980c708a57 -SIZE (firebird/Firebird-4.0.0.2496-0.tar.xz) = 30522192 +TIMESTAMP = 1669081398 +SHA256 (firebird/Firebird-4.0.2.2816-0.tar.xz) = fb28140cec1eb32ea683bdf552dd1d6b7d455db61282fcf96fae18b3103af6c6 +SIZE (firebird/Firebird-4.0.2.2816-0.tar.xz) = 30665764 SHA256 (firebird/96931200340c8e0abcd3529b8e443d5ab62adfa5.patch) = cf70a42c4d92b06ecf7a75131ed04dfbb471aba8c78eda66a3412f12b9084d58 SIZE (firebird/96931200340c8e0abcd3529b8e443d5ab62adfa5.patch) = 4011 diff --git a/databases/firebird40-server/files/patch-extern_cloop_Makefile b/databases/firebird40-server/files/patch-extern_cloop_Makefile index ccc6f08bcc04..f5ca1c8dd566 100644 --- a/databases/firebird40-server/files/patch-extern_cloop_Makefile +++ b/databases/firebird40-server/files/patch-extern_cloop_Makefile @@ -1,6 +1,6 @@ ---- extern/cloop/Makefile.orig 2020-10-12 00:02:22 UTC -+++ extern/cloop/Makefile -@@ -6,7 +6,7 @@ TARGET := release +--- extern/cloop/Makefile.orig 2022-08-10 04:04:28.000000000 -0500 ++++ extern/cloop/Makefile 2022-11-21 20:57:09.474150000 -0500 +@@ -6,7 +6,7 @@ CC := $(CC) CXX := $(CXX) @@ -9,16 +9,15 @@ SRC_DIR := src BUILD_DIR := build -@@ -27,8 +27,9 @@ SRCS_CPP := $(foreach sdir,$(SRC_DIRS),$ +@@ -27,8 +27,9 @@ OBJS_C := $(patsubst $(SRC_DIR)/%.c,$(OBJ_DIR)/%.o,$(SRCS_C)) OBJS_CPP := $(patsubst $(SRC_DIR)/%.cpp,$(OBJ_DIR)/%.o,$(SRCS_CPP)) -C_FLAGS := -ggdb -fPIC -MMD -MP -W -Wall -Wno-unused-parameter --CXX_FLAGS := $(C_FLAGS) +-CXX_FLAGS := $(C_FLAGS) -std=c++11 +COMMON_C_FLAGS := -ggdb -fPIC -MMD -MP -W -Wall -Wno-unused-parameter +C_FLAGS := $(COMMON_C_FLAGS) $(CFLAGS) $(CPPFLAGS) -+CXX_FLAGS := $(COMMON_C_FLAGS) $(CXXFLAGS) $(CPPFLAGS) - FPC_FLAGS := -Mdelphi ++CXX_FLAGS := $(COMMON_C_FLAGS) $(CXXFLAGS) $(CPPFLAGS) -std=c++11 + FPC_FLAGS := -Mdelphi -Cg - ifeq ($(TARGET),release) - + ifeq ($(shell uname),FreeBSD) diff --git a/databases/firebird40-server/files/patch-src_remote_SockAddr.h b/databases/firebird40-server/files/patch-src_remote_SockAddr.h deleted file mode 100644 index 30297137c2c5..000000000000 --- a/databases/firebird40-server/files/patch-src_remote_SockAddr.h +++ /dev/null @@ -1,25 +0,0 @@ ---- src/remote/SockAddr.h.orig 2020-10-12 00:02:22 UTC -+++ src/remote/SockAddr.h -@@ -112,11 +112,13 @@ public: - - #define AF_INET6_POSIX 10 - #define AF_INET6_WINDOWS 23 -+#define AF_INET6_BSD 28 - #define AF_INET6_DARWIN 30 - - #if AF_INET6 == AF_INET6_POSIX - #elif AF_INET6 == AF_INET6_WINDOWS - #elif AF_INET6 == AF_INET6_DARWIN -+#elif AF_INET6 == AF_INET6_BSD - #else - #error Unknown value of AF_INET6 ! - #endif -@@ -132,6 +134,7 @@ inline void SockAddr::checkAndFixFamily( - case AF_INET6_POSIX: - case AF_INET6_WINDOWS: - case AF_INET6_DARWIN: -+ case AF_INET6_BSD: - data.sock.sa_family = AF_INET6; - fb_assert(len == sizeof(sockaddr_in6)); - break; -