Update to Firebird-2.0.0.12748

6 files changed, 46 insertions, 24 deletions

diff --git a/databases/firebird2-server/Makefile b/databases/firebird2-server/Makefile
index fb3c9539f21..3ad760e1ae5 100644
--- a/databases/firebird2-server/Makefile
+++ b/databases/firebird2-server/Makefile
@@ -7,12 +7,12 @@
 
 PORTNAME?=	firebird
 PORTVERSION=	2.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=firebird
 PKGNAMESUFFIX?=	-server
-DISTNAME=	Firebird-2.0.0.12745-ReleaseCandidate5
+DISTNAME=	Firebird-2.0.0.12748
 
 MAINTAINER=	skv@FreeBSD.org
 COMMENT?=	Firebird-2 relational database (server)
@@ -54,14 +54,15 @@ LIB_DEPENDS+=	fbembed.2:${PORTSDIR}/databases/firebird2-client
 AUTOGENARGS=	--with-lock-manager
 
 ALL_TARGET=	firebird_boot ref_databases msgs libfbembed intl otherfiles \
-		inet_server extlib embed_gfix embed_gbak embed_gdef embed_util
+		inet_server extlib embed_gfix embed_gbak embed_gdef embed_util \
+		embed_fbudf
 
 SUB_FILES=	pkg-install pkg-message aliases.conf
 
 SUID_BIN=	fb_inet_server fb_lock_mgr gds_drop
 UTIL_BIN=	fb_lock_print gbak gdef gfix gsec gstat nbackup
-UDF_SO=		ib_udf.so
-UDF_SQL=	src/extlib/ib_udf2.sql
+UDF_SO=		ib_udf.so fbudf.so
+UDF_SQL=	src/extlib/ib_udf2.sql src/extlib/fbudf/fbudf.sql
 .else
 # Client part stuff
 LIB_DEPENDS=	icuuc:${PORTSDIR}/devel/icu
@@ -85,6 +86,9 @@ CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	*
+FB_DOCS_FILES=	WhatsNew README.* Firebird* ReleaseNotes.pdf ambiguity.txt \
+                ods11-index-structure.html
+FB_DOCS_DIRS=	sql.extensions license upgrade
 .endif
 .endif
 
@@ -180,6 +184,7 @@ do-install:
 		${LOCALSTATEDIR}/help
 
 	${INSTALL_FB} -m 0555 ${WRKSRC}/gen/firebird/intl/libfbintl.so ${LIBEXECDIR}/intl/fbintl
+	${INSTALL_FB} -m 0444 ${WRKSRC}/gen/firebird/misc/fbintl.conf ${LIBEXECDIR}/intl/
 .else
 # defined CLIENT_ONLY
 	${INSTALL_PROGRAM} ${CLIENT_BIN:S!^!${WRKSRC}/gen/firebird/bin/!} \
@@ -214,10 +219,13 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/gen/firebird/*.msg ${DATADIR}
 
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}/sql.extensions
-	${INSTALL_DATA} ${WRKSRC}/doc/WhatsNew ${WRKSRC}/doc/README.* ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/README.user ${DOCSDIR}/README
-	${INSTALL_DATA} ${WRKSRC}/doc/sql.extensions/README.* ${DOCSDIR}/sql.extensions
+	@${ECHO_MSG} "===>   Installing documentation for ${PKGNAME}"
+	@${MKDIR} ${FB_DOCS_DIRS:S!^!${DOCSDIR}/!}
+	@${INSTALL_DATA} ${FB_DOCS_FILES:S!^!${WRKSRC}/doc/!} ${DOCSDIR}
+	@${LN} -sf ${DOCSDIR}/README.user ${DOCSDIR}/README
+	@${INSTALL_DATA} ${WRKSRC}/doc/sql.extensions/* ${DOCSDIR}/sql.extensions
+	@${INSTALL_DATA} ${WRKSRC}/doc/license/* ${DOCSDIR}/license
+	@${INSTALL_DATA} ${WRKSRC}/src/misc/upgrade/v2/* ${DOCSDIR}/upgrade
 .endif
 .endif
 
diff --git a/databases/firebird2-server/distinfo b/databases/firebird2-server/distinfo
index 15324ea9280..cb55ddc572e 100644
--- a/databases/firebird2-server/distinfo
+++ b/databases/firebird2-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (Firebird-2.0.0.12745-ReleaseCandidate5.tar.bz2) = 8b11728a19172b6c4c2539261a5f0f8f
-SHA256 (Firebird-2.0.0.12745-ReleaseCandidate5.tar.bz2) = a8dc69bc4badc98eae6a29b308e6cce132b680e4a5d5aad21026eff54722ca1b
-SIZE (Firebird-2.0.0.12745-ReleaseCandidate5.tar.bz2) = 12474082
+MD5 (Firebird-2.0.0.12748.tar.bz2) = 51a299465766023db85a73cb7763d16c
+SHA256 (Firebird-2.0.0.12748.tar.bz2) = 2f0bba35a7d7ab712f3c53052202198aff10c8af2172339b307a04a251114f89
+SIZE (Firebird-2.0.0.12748.tar.bz2) = 12486774
diff --git a/databases/firebird2-server/pkg-plist b/databases/firebird2-server/pkg-plist
index 0f09cdcc03b..096c66efee8 100644
--- a/databases/firebird2-server/pkg-plist
+++ b/databases/firebird2-server/pkg-plist
@@ -10,6 +10,9 @@ bin/gsec
 bin/gstat
 bin/nbackup
 libexec/firebird/intl/fbintl
+libexec/firebird/intl/fbintl.conf
+libexec/firebird/udf/fbudf.so
+libexec/firebird/udf/fbudf.sql
 libexec/firebird/udf/ib_udf.so
 libexec/firebird/udf/ib_udf2.sql
 @unexec (cmp -s %D/%%CONFDIR%%/aliases.conf %D/%%CONFDIR%%/aliases.conf.sample && rm -f %D/%%CONFDIR%%/aliases.conf) || true
diff --git a/databases/firebird20-server/Makefile b/databases/firebird20-server/Makefile
index fb3c9539f21..3ad760e1ae5 100644
--- a/databases/firebird20-server/Makefile
+++ b/databases/firebird20-server/Makefile
@@ -7,12 +7,12 @@
 
 PORTNAME?=	firebird
 PORTVERSION=	2.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=firebird
 PKGNAMESUFFIX?=	-server
-DISTNAME=	Firebird-2.0.0.12745-ReleaseCandidate5
+DISTNAME=	Firebird-2.0.0.12748
 
 MAINTAINER=	skv@FreeBSD.org
 COMMENT?=	Firebird-2 relational database (server)
@@ -54,14 +54,15 @@ LIB_DEPENDS+=	fbembed.2:${PORTSDIR}/databases/firebird2-client
 AUTOGENARGS=	--with-lock-manager
 
 ALL_TARGET=	firebird_boot ref_databases msgs libfbembed intl otherfiles \
-		inet_server extlib embed_gfix embed_gbak embed_gdef embed_util
+		inet_server extlib embed_gfix embed_gbak embed_gdef embed_util \
+		embed_fbudf
 
 SUB_FILES=	pkg-install pkg-message aliases.conf
 
 SUID_BIN=	fb_inet_server fb_lock_mgr gds_drop
 UTIL_BIN=	fb_lock_print gbak gdef gfix gsec gstat nbackup
-UDF_SO=		ib_udf.so
-UDF_SQL=	src/extlib/ib_udf2.sql
+UDF_SO=		ib_udf.so fbudf.so
+UDF_SQL=	src/extlib/ib_udf2.sql src/extlib/fbudf/fbudf.sql
 .else
 # Client part stuff
 LIB_DEPENDS=	icuuc:${PORTSDIR}/devel/icu
@@ -85,6 +86,9 @@ CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	*
+FB_DOCS_FILES=	WhatsNew README.* Firebird* ReleaseNotes.pdf ambiguity.txt \
+                ods11-index-structure.html
+FB_DOCS_DIRS=	sql.extensions license upgrade
 .endif
 .endif
 
@@ -180,6 +184,7 @@ do-install:
 		${LOCALSTATEDIR}/help
 
 	${INSTALL_FB} -m 0555 ${WRKSRC}/gen/firebird/intl/libfbintl.so ${LIBEXECDIR}/intl/fbintl
+	${INSTALL_FB} -m 0444 ${WRKSRC}/gen/firebird/misc/fbintl.conf ${LIBEXECDIR}/intl/
 .else
 # defined CLIENT_ONLY
 	${INSTALL_PROGRAM} ${CLIENT_BIN:S!^!${WRKSRC}/gen/firebird/bin/!} \
@@ -214,10 +219,13 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/gen/firebird/*.msg ${DATADIR}
 
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}/sql.extensions
-	${INSTALL_DATA} ${WRKSRC}/doc/WhatsNew ${WRKSRC}/doc/README.* ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/README.user ${DOCSDIR}/README
-	${INSTALL_DATA} ${WRKSRC}/doc/sql.extensions/README.* ${DOCSDIR}/sql.extensions
+	@${ECHO_MSG} "===>   Installing documentation for ${PKGNAME}"
+	@${MKDIR} ${FB_DOCS_DIRS:S!^!${DOCSDIR}/!}
+	@${INSTALL_DATA} ${FB_DOCS_FILES:S!^!${WRKSRC}/doc/!} ${DOCSDIR}
+	@${LN} -sf ${DOCSDIR}/README.user ${DOCSDIR}/README
+	@${INSTALL_DATA} ${WRKSRC}/doc/sql.extensions/* ${DOCSDIR}/sql.extensions
+	@${INSTALL_DATA} ${WRKSRC}/doc/license/* ${DOCSDIR}/license
+	@${INSTALL_DATA} ${WRKSRC}/src/misc/upgrade/v2/* ${DOCSDIR}/upgrade
 .endif
 .endif
 
diff --git a/databases/firebird20-server/distinfo b/databases/firebird20-server/distinfo
index 15324ea9280..cb55ddc572e 100644
--- a/databases/firebird20-server/distinfo
+++ b/databases/firebird20-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (Firebird-2.0.0.12745-ReleaseCandidate5.tar.bz2) = 8b11728a19172b6c4c2539261a5f0f8f
-SHA256 (Firebird-2.0.0.12745-ReleaseCandidate5.tar.bz2) = a8dc69bc4badc98eae6a29b308e6cce132b680e4a5d5aad21026eff54722ca1b
-SIZE (Firebird-2.0.0.12745-ReleaseCandidate5.tar.bz2) = 12474082
+MD5 (Firebird-2.0.0.12748.tar.bz2) = 51a299465766023db85a73cb7763d16c
+SHA256 (Firebird-2.0.0.12748.tar.bz2) = 2f0bba35a7d7ab712f3c53052202198aff10c8af2172339b307a04a251114f89
+SIZE (Firebird-2.0.0.12748.tar.bz2) = 12486774
diff --git a/databases/firebird20-server/pkg-plist b/databases/firebird20-server/pkg-plist
index 0f09cdcc03b..096c66efee8 100644
--- a/databases/firebird20-server/pkg-plist
+++ b/databases/firebird20-server/pkg-plist
@@ -10,6 +10,9 @@ bin/gsec
 bin/gstat
 bin/nbackup
 libexec/firebird/intl/fbintl
+libexec/firebird/intl/fbintl.conf
+libexec/firebird/udf/fbudf.so
+libexec/firebird/udf/fbudf.sql
 libexec/firebird/udf/ib_udf.so
 libexec/firebird/udf/ib_udf2.sql
 @unexec (cmp -s %D/%%CONFDIR%%/aliases.conf %D/%%CONFDIR%%/aliases.conf.sample && rm -f %D/%%CONFDIR%%/aliases.conf) || true