From owner-svn-ports-head@freebsd.org Thu Aug 18 14:02:49 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7C539BBE798; Thu, 18 Aug 2016 14:02:49 +0000 (UTC) (envelope-from pawel@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 51E051233; Thu, 18 Aug 2016 14:02:49 +0000 (UTC) (envelope-from pawel@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7IE2mrx003288; Thu, 18 Aug 2016 14:02:48 GMT (envelope-from pawel@FreeBSD.org) Received: (from pawel@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7IE2lcN003278; Thu, 18 Aug 2016 14:02:47 GMT (envelope-from pawel@FreeBSD.org) Message-Id: <201608181402.u7IE2lcN003278@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pawel set sender to pawel@FreeBSD.org using -f From: Pawel Pekala Date: Thu, 18 Aug 2016 14:02:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r420404 - in head/databases/firebird25-server: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Aug 2016 14:02:49 -0000 Author: pawel Date: Thu Aug 18 14:02:47 2016 New Revision: 420404 URL: https://svnweb.freebsd.org/changeset/ports/420404 Log: - Update to version 2.5.6 [1] - Add CPE and libedit support [1] - Use @preunexec instead of the deprecated @unexec in pkg-plist [1] - Regenerate patches with make makepatch PR: 211387 [1] Submitted by: luca.pizzamiglio@gmail.com [1] Added: head/databases/firebird25-server/files/patch-builds_install_misc_firebird.conf.in - copied, changed from r420403, head/databases/firebird25-server/files/patch-builds-install-misc_firebird.conf.in head/databases/firebird25-server/files/patch-builds_posix_empty.vers - copied, changed from r420403, head/databases/firebird25-server/files/patch-builds-posix_empty.vers head/databases/firebird25-server/files/patch-builds_posix_firebird.vers - copied, changed from r420403, head/databases/firebird25-server/files/patch-builds-posix_firebird.vers head/databases/firebird25-server/files/patch-src_jrd_isc__sync.cpp - copied, changed from r420403, head/databases/firebird25-server/files/patch-src-jrd_isc_sync.cpp Deleted: head/databases/firebird25-server/files/patch-builds-install-misc_firebird.conf.in head/databases/firebird25-server/files/patch-builds-posix_empty.vers head/databases/firebird25-server/files/patch-builds-posix_firebird.vers head/databases/firebird25-server/files/patch-src-jrd_isc_sync.cpp Modified: head/databases/firebird25-server/Makefile head/databases/firebird25-server/distinfo head/databases/firebird25-server/files/patch-builds_posix_make.defaults head/databases/firebird25-server/files/patch-builds_posix_make.rules head/databases/firebird25-server/files/patch-src-common-classes-FpeControl.h head/databases/firebird25-server/pkg-plist Modified: head/databases/firebird25-server/Makefile ============================================================================== --- head/databases/firebird25-server/Makefile Thu Aug 18 13:26:08 2016 (r420403) +++ head/databases/firebird25-server/Makefile Thu Aug 18 14:02:47 2016 (r420404) @@ -2,12 +2,11 @@ # $FreeBSD$ PORTNAME= firebird -PORTVERSION= 2.5.4 -PORTREVISION= 7 +PORTVERSION= 2.5.6 CATEGORIES?= databases MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:S/.0//}-Release/ PKGNAMESUFFIX?= ${PORTVERSION:R:S/.//}-server -DISTNAME= ${PORTNAME:S/f/F/}-${PORTVERSION}.26856-0 +DISTNAME= ${PORTNAME:S/f/F/}-${PORTVERSION}.27020-0 DIST_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org @@ -24,7 +23,7 @@ LICENSE_PERMS_IPL= dist-mirror dist-sell LIB_DEPENDS= libicuuc.so:devel/icu -USES= gmake pkgconfig tar:bzip2 +USES= cpe gmake pkgconfig tar:bzip2 GNU_CONFIGURE= yes MAKE_JOBS_UNSAFE= yes @@ -90,7 +89,7 @@ UDF_SQL= src/extlib/ib_udf2.sql src/extl PKGINSTALL?= ${PKGDIR}/pkg-install-server .else # Client part stuff -LIB_DEPENDS+= libedit.so.0:devel/libedit +USES+= libedit LDFLAGS+= -L${LOCALBASE}/lib # to link in lncurses pulled in by libedit CONFIGURE_ARGS+= --with-system-editline Modified: head/databases/firebird25-server/distinfo ============================================================================== --- head/databases/firebird25-server/distinfo Thu Aug 18 13:26:08 2016 (r420403) +++ head/databases/firebird25-server/distinfo Thu Aug 18 14:02:47 2016 (r420404) @@ -1,2 +1,3 @@ -SHA256 (firebird/Firebird-2.5.4.26856-0.tar.bz2) = 4e775dcf218640d3af507a816aef0060f52a295b9ee5f66ec66f0b0564da18d3 -SIZE (firebird/Firebird-2.5.4.26856-0.tar.bz2) = 13744859 +TIMESTAMP = 1468845026 +SHA256 (firebird/Firebird-2.5.6.27020-0.tar.bz2) = 8e416f2f9a8f1fce2aa872925ca2016010878265ec56fe0a32a73e0080378826 +SIZE (firebird/Firebird-2.5.6.27020-0.tar.bz2) = 13610463 Copied and modified: head/databases/firebird25-server/files/patch-builds_install_misc_firebird.conf.in (from r420403, head/databases/firebird25-server/files/patch-builds-install-misc_firebird.conf.in) ============================================================================== --- head/databases/firebird25-server/files/patch-builds-install-misc_firebird.conf.in Thu Aug 18 13:26:08 2016 (r420403, copy source) +++ head/databases/firebird25-server/files/patch-builds_install_misc_firebird.conf.in Thu Aug 18 14:02:47 2016 (r420404) @@ -1,5 +1,5 @@ ---- builds/install/misc/firebird.conf.in Tue Aug 15 22:38:52 2006 -+++ builds/install/misc/firebird.conf.in Tue Aug 15 22:39:24 2006 +--- builds/install/misc/firebird.conf.in.orig 2016-06-30 09:34:53 UTC ++++ builds/install/misc/firebird.conf.in @@ -60,7 +60,7 @@ # # Type: string @@ -9,7 +9,7 @@ # ---------------------------- -@@ -125,7 +125,7 @@ +@@ -137,7 +137,7 @@ # # Type: string (special format) # Copied and modified: head/databases/firebird25-server/files/patch-builds_posix_empty.vers (from r420403, head/databases/firebird25-server/files/patch-builds-posix_empty.vers) ============================================================================== --- head/databases/firebird25-server/files/patch-builds-posix_empty.vers Thu Aug 18 13:26:08 2016 (r420403, copy source) +++ head/databases/firebird25-server/files/patch-builds_posix_empty.vers Thu Aug 18 14:02:47 2016 (r420404) @@ -1,5 +1,5 @@ ---- builds/posix/empty.vers 2013-03-23 02:37:17.000000000 -0500 -+++ builds/posix/empty.vers 2013-03-23 02:37:33.000000000 -0500 +--- builds/posix/empty.vers.orig 2016-06-30 09:34:53 UTC ++++ builds/posix/empty.vers @@ -27,6 +27,8 @@ { global: Copied and modified: head/databases/firebird25-server/files/patch-builds_posix_firebird.vers (from r420403, head/databases/firebird25-server/files/patch-builds-posix_firebird.vers) ============================================================================== --- head/databases/firebird25-server/files/patch-builds-posix_firebird.vers Thu Aug 18 13:26:08 2016 (r420403, copy source) +++ head/databases/firebird25-server/files/patch-builds_posix_firebird.vers Thu Aug 18 14:02:47 2016 (r420404) @@ -1,5 +1,5 @@ ---- builds/posix/firebird.vers 2013-10-02 18:30:51.000000000 -0500 -+++ builds/posix/firebird.vers 2013-10-02 18:31:25.000000000 -0500 +--- builds/posix/firebird.vers.orig 2016-06-30 09:34:53 UTC ++++ builds/posix/firebird.vers @@ -25,6 +25,8 @@ { Modified: head/databases/firebird25-server/files/patch-builds_posix_make.defaults ============================================================================== --- head/databases/firebird25-server/files/patch-builds_posix_make.defaults Thu Aug 18 13:26:08 2016 (r420403) +++ head/databases/firebird25-server/files/patch-builds_posix_make.defaults Thu Aug 18 14:02:47 2016 (r420404) @@ -1,4 +1,4 @@ ---- builds/posix/make.defaults.orig 2015-03-27 13:46:38 UTC +--- builds/posix/make.defaults.orig 2016-06-30 09:34:53 UTC +++ builds/posix/make.defaults @@ -126,7 +126,7 @@ RM_R= rm -rf CHMOD= chmod Modified: head/databases/firebird25-server/files/patch-builds_posix_make.rules ============================================================================== --- head/databases/firebird25-server/files/patch-builds_posix_make.rules Thu Aug 18 13:26:08 2016 (r420403) +++ head/databases/firebird25-server/files/patch-builds_posix_make.rules Thu Aug 18 14:02:47 2016 (r420404) @@ -1,4 +1,4 @@ ---- builds/posix/make.rules.orig 2015-03-27 13:46:38 UTC +--- builds/posix/make.rules.orig 2016-06-30 09:34:53 UTC +++ builds/posix/make.rules @@ -37,6 +37,8 @@ WFLAGS:=$(CPPFLAGS) -I$(SRC_ROOT)/includ Modified: head/databases/firebird25-server/files/patch-src-common-classes-FpeControl.h ============================================================================== --- head/databases/firebird25-server/files/patch-src-common-classes-FpeControl.h Thu Aug 18 13:26:08 2016 (r420403) +++ head/databases/firebird25-server/files/patch-src-common-classes-FpeControl.h Thu Aug 18 14:02:47 2016 (r420404) @@ -1,6 +1,6 @@ ---- src/common/classes/FpeControl.h.orig 2015-03-27 14:47:01.000000000 +0100 -+++ src/common/classes/FpeControl.h 2016-04-02 19:45:10.096583000 +0200 -@@ -223,13 +223,13 @@ +--- 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 Copied and modified: head/databases/firebird25-server/files/patch-src_jrd_isc__sync.cpp (from r420403, head/databases/firebird25-server/files/patch-src-jrd_isc_sync.cpp) ============================================================================== --- head/databases/firebird25-server/files/patch-src-jrd_isc_sync.cpp Thu Aug 18 13:26:08 2016 (r420403, copy source) +++ head/databases/firebird25-server/files/patch-src_jrd_isc__sync.cpp Thu Aug 18 14:02:47 2016 (r420404) @@ -1,8 +1,8 @@ ---- src/jrd/isc_sync.cpp 2011-08-30 08:48:04.000000000 -0500 -+++ src/jrd/isc_sync.cpp 2011-10-19 15:00:50.000000000 -0500 -@@ -320,7 +320,7 @@ +--- 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 = 8; + const static int N_FILES = 128; const static int N_SETS = 256; -#if defined(DEV_BUILD) +#if defined(DEV_BUILD) || defined(FREEBSD) Modified: head/databases/firebird25-server/pkg-plist ============================================================================== --- head/databases/firebird25-server/pkg-plist Thu Aug 18 13:26:08 2016 (r420403) +++ head/databases/firebird25-server/pkg-plist Thu Aug 18 14:02:47 2016 (r420404) @@ -27,7 +27,7 @@ libexec/firebird/intl/fbintl.conf @group firebird @sample /%%LOCALSTATEDIR%%/security2.fdb.sample /%%LOCALSTATEDIR%%/help/help.fdb -@unexec [ -s /%%LOCALSTATEDIR%%/firebird.log ] || rm -f /%%LOCALSTATEDIR%%/firebird.log +@preunexec [ -s /%%LOCALSTATEDIR%%/firebird.log ] || rm -f /%%LOCALSTATEDIR%%/firebird.log @rmtry /%%LOCALSTATEDIR%%/isc_event1.`hostname` @rmtry /%%LOCALSTATEDIR%%/isc_init1.`hostname` @rmtry /%%LOCALSTATEDIR%%/isc_lock1.`hostname`