From owner-dev-commits-ports-all@freebsd.org Mon Jun 28 01:54:08 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1C1E164CE1F; Mon, 28 Jun 2021 01:54:08 +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 4GCrHz71CYz3k1W; Mon, 28 Jun 2021 01:54:07 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 CEE911CCBC; Mon, 28 Jun 2021 01:54:07 +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 15S1s7Ba008028; Mon, 28 Jun 2021 01:54:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15S1s7eQ008027; Mon, 28 Jun 2021 01:54:07 GMT (envelope-from git) Date: Mon, 28 Jun 2021 01:54:07 GMT Message-Id: <202106280154.15S1s7eQ008027@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: 675e5f2f84da - main - databases/firebird40-[client|server]: Clean up 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: 675e5f2f84da9f77a4484c062d52cd4efccedb5d Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jun 2021 01:54:08 -0000 The branch main has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=675e5f2f84da9f77a4484c062d52cd4efccedb5d commit 675e5f2f84da9f77a4484c062d52cd4efccedb5d Author: Jose Alonso Cardenas Marquez AuthorDate: 2021-06-28 01:51:16 +0000 Commit: Jose Alonso Cardenas Marquez CommitDate: 2021-06-28 01:51:16 +0000 databases/firebird40-[client|server]: Clean up - Change library version to 4 - Remove obsolete option from CONFIGURE_ARGS - Fix pkg-plist.client --- databases/firebird40-server/Makefile | 6 +++--- databases/firebird40-server/files/patch-builds_posix_make.defaults | 2 +- databases/firebird40-server/pkg-plist.client | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/databases/firebird40-server/Makefile b/databases/firebird40-server/Makefile index 7a2b35a41f38..58458196a63d 100644 --- a/databases/firebird40-server/Makefile +++ b/databases/firebird40-server/Makefile @@ -43,8 +43,8 @@ CONFIGURE_ARGS= --prefix=${LOCALSTATEDIR} \ --with-fbtzdata=${LIBEXECDIR}/tzdata \ --with-fbsbin=${PREFIX}/sbin \ --with-fbsecure-db=${LOCALSTATEDIR} \ - --with-fbsample-db=${EXAMPLESDIR} \ - --with-fbudf=${LIBEXECDIR}/UDF + --with-fbsample-db=${EXAMPLESDIR} + CONFIGURE_ENV+= PTHREAD_LIBS="-lpthread" \ ac_cv_header_atomic_ops_h="no" \ ac_cv_lib_atomic_ops_main="no" @@ -176,7 +176,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/gen/Release/firebird/lib/libfbclient.so.${PORTVERSION} \ ${STAGEDIR}${PREFIX}/lib - ${LN} -fs libfbclient.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libfbclient.so.3 + ${LN} -fs libfbclient.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libfbclient.so.4 ${LN} -fs libfbclient.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libfbclient.so @${MKDIR} ${STAGEDIR}${PREFIX}/include/firebird diff --git a/databases/firebird40-server/files/patch-builds_posix_make.defaults b/databases/firebird40-server/files/patch-builds_posix_make.defaults index b30b259a6848..2959d2fa028d 100644 --- a/databases/firebird40-server/files/patch-builds_posix_make.defaults +++ b/databases/firebird40-server/files/patch-builds_posix_make.defaults @@ -23,7 +23,7 @@ LibraryFileName=libfbclient LibraryFullName=$(LibraryFileName).${SHRLIB_EXT}.${FirebirdVersion} -LibrarySoName=$(LibraryFileName).${SHRLIB_EXT}.2 -+LibrarySoName=$(LibraryFileName).${SHRLIB_EXT}.3 ++LibrarySoName=$(LibraryFileName).${SHRLIB_EXT}.4 LibraryBaseName=$(LibraryFileName).${SHRLIB_EXT} LIBFIREBIRD_FULLNAME = $(LIB)/$(LibraryFullName) diff --git a/databases/firebird40-server/pkg-plist.client b/databases/firebird40-server/pkg-plist.client index 543e6b40637a..83fe7fc4b3ac 100644 --- a/databases/firebird40-server/pkg-plist.client +++ b/databases/firebird40-server/pkg-plist.client @@ -44,6 +44,6 @@ include/ibase.h include/iberror.h include/perf.h lib/libfbclient.so -lib/libfbclient.so.3 +lib/libfbclient.so.4 lib/libfbclient.so.%%FIREBIRD_VERSION%% %%DATADIR%%/firebird.msg