1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-19 19:59:43 +00:00

- 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]
This commit is contained in:
Pawel Pekala 2016-08-18 14:02:47 +00:00
parent 7a6099c1ec
commit 7afb587cfc
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=420404
11 changed files with 33 additions and 33 deletions

View File

@ -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 pkg-mirror pkg-sell auto-accept
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/extlib/fbudf/fbudf.sql
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

View File

@ -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

View File

@ -1,11 +0,0 @@
--- builds/posix/empty.vers 2013-03-23 02:37:17.000000000 -0500
+++ builds/posix/empty.vers 2013-03-23 02:37:33.000000000 -0500
@@ -27,6 +27,8 @@
{
global:
main;
+ __progname;
+ environ;
local:
*;

View File

@ -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)
#

View File

@ -0,0 +1,11 @@
--- builds/posix/empty.vers.orig 2016-06-30 09:34:53 UTC
+++ builds/posix/empty.vers
@@ -27,6 +27,8 @@
{
global:
main;
+ __progname;
+ environ;
local:
*;

View File

@ -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 @@
{

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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)

View File

@ -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`