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

11 files changed, 33 insertions, 33 deletions

diff --git a/databases/firebird25-server/Makefile b/databases/firebird25-server/Makefile
index d3d49534106e..aba3397e23e7 100644
--- a/databases/firebird25-server/Makefile
+++ b/databases/firebird25-server/Makefile
@@ -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
diff --git a/databases/firebird25-server/distinfo b/databases/firebird25-server/distinfo
index 2628ab0bf49e..5a495dc6af72 100644
--- a/databases/firebird25-server/distinfo
+++ b/databases/firebird25-server/distinfo
@@ -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
diff --git a/databases/firebird25-server/files/patch-builds-posix_empty.vers b/databases/firebird25-server/files/patch-builds-posix_empty.vers
deleted file mode 100644
index 204bd00acf21..000000000000
--- a/databases/firebird25-server/files/patch-builds-posix_empty.vers
+++ /dev/null
@@ -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:
- 	*;
diff --git a/databases/firebird25-server/files/patch-builds-install-misc_firebird.conf.in b/databases/firebird25-server/files/patch-builds_install_misc_firebird.conf.in
index 267509f7ec70..f80094d2063a 100644
--- a/databases/firebird25-server/files/patch-builds-install-misc_firebird.conf.in
+++ b/databases/firebird25-server/files/patch-builds_install_misc_firebird.conf.in
@@ -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)
  #
diff --git a/databases/firebird25-server/files/patch-builds_posix_empty.vers b/databases/firebird25-server/files/patch-builds_posix_empty.vers
new file mode 100644
index 000000000000..7e0dc6cdce58
--- /dev/null
+++ b/databases/firebird25-server/files/patch-builds_posix_empty.vers
@@ -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:
+ 	*;
diff --git a/databases/firebird25-server/files/patch-builds-posix_firebird.vers b/databases/firebird25-server/files/patch-builds_posix_firebird.vers
index 106689f5e08b..e2d64ee58b14 100644
--- a/databases/firebird25-server/files/patch-builds-posix_firebird.vers
+++ b/databases/firebird25-server/files/patch-builds_posix_firebird.vers
@@ -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 @@
  
  {
diff --git a/databases/firebird25-server/files/patch-builds_posix_make.defaults b/databases/firebird25-server/files/patch-builds_posix_make.defaults
index 9731eb9ceb4a..0b20f83f1c51 100644
--- a/databases/firebird25-server/files/patch-builds_posix_make.defaults
+++ b/databases/firebird25-server/files/patch-builds_posix_make.defaults
@@ -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
diff --git a/databases/firebird25-server/files/patch-builds_posix_make.rules b/databases/firebird25-server/files/patch-builds_posix_make.rules
index 979a901d39c3..13bce7ec4bfb 100644
--- a/databases/firebird25-server/files/patch-builds_posix_make.rules
+++ b/databases/firebird25-server/files/patch-builds_posix_make.rules
@@ -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
  
diff --git a/databases/firebird25-server/files/patch-src-common-classes-FpeControl.h b/databases/firebird25-server/files/patch-src-common-classes-FpeControl.h
index 2633764dbe64..1f1dbc887be8 100644
--- a/databases/firebird25-server/files/patch-src-common-classes-FpeControl.h
+++ b/databases/firebird25-server/files/patch-src-common-classes-FpeControl.h
@@ -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
diff --git a/databases/firebird25-server/files/patch-src-jrd_isc_sync.cpp b/databases/firebird25-server/files/patch-src_jrd_isc__sync.cpp
index 90764cb81ec7..0a557cea343d 100644
--- a/databases/firebird25-server/files/patch-src-jrd_isc_sync.cpp
+++ b/databases/firebird25-server/files/patch-src_jrd_isc__sync.cpp
@@ -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)
diff --git a/databases/firebird25-server/pkg-plist b/databases/firebird25-server/pkg-plist
index 081ba526b821..20b48f72c9ed 100644
--- a/databases/firebird25-server/pkg-plist
+++ b/databases/firebird25-server/pkg-plist
@@ -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`