Index: head/databases/firebird2-server/Makefile
===================================================================
--- head/databases/firebird2-server/Makefile	(revision 177188)
+++ head/databases/firebird2-server/Makefile	(revision 177189)
@@ -1,224 +1,232 @@
 # New ports collection makefile for:	firebird2-server
 # Date created:		15 August 2006
 # Whom:			Sergey Skvortsov <skv@protey.ru>
 #
 # $FreeBSD$
 #
 
 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)
 
 LATEST_LINK=	${PORTNAME}2${PKGNAMESUFFIX}
 
 USE_BISON=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	autoconf:259 aclocal:19 libtool:15
 ACLOCAL_ARGS=	--acdir=${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal \
 		-I ${WRKSRC}/m4
 USE_GCC=	3.4+
 
 LOCALSTATEDIR=	/var/db/firebird
 CONFDIR=	${PREFIX}/etc/firebird
 LIBEXECDIR=	${PREFIX}/libexec/firebird
 PLIST_SUB=	FIREBIRD_VERSION=${PORTVERSION} \
 		LOCALSTATEDIR="var/db/firebird" CONFDIR="etc/firebird"
 
 # Don't use ld for linking, use gcc
 LD=	${CC}
 
 # Don't strip binary files
 STRIP=
 
 ONLY_FOR_ARCHS=	i386 amd64
 CONFLICTS=	firebird-client-1* firebird-server-1*
 
 WRKSRC=		${WRKDIR}/${DISTNAME:C/^F/f/}
 
 INSTALL_FB=	${INSTALL} ${COPY} -g firebird
 
 .if !defined(CLIENT_ONLY)
 # Server part stuff
 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
 
 AUTOGENARGS=	--with-editline
 
 ALL_TARGET=	firebird_basic libfbembed embed_isql embed_gpre \
 		embed_gdef embed_qli libfbclient extlib
 #ALL_TARGET=	firebird_basic libfbembed libfbclient \
 #		client_gpre client_gdef client_isql client_qli extlib
 
 USE_LDCONFIG=	yes
 CLIENT_BIN=	gpre isql qli
 
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
 .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
 
 MAKE_ENV+=	CC=${CC} CXX=${CXX} FIREBIRD_TMP="${WRKDIR}" FIREBIRD_LOCK="${WRKDIR}"
 
 post-extract:
 	@${RM} -rf ${WRKSRC}/extern/icu
 
 post-patch:
 	@${MKDIR} ${WRKSRC}/m4
 	${CP} ${FILESDIR}/*.m4 ${WRKSRC}/m4
 
 .include <bsd.port.pre.mk>
 
 .if !defined(CLIENT_ONLY)
 pre-everything::
 	@${ECHO_MSG} "WARNING: The on-disk structure of the databases has"
 	@${ECHO_MSG} "changed since version 1.x."
 	@${ECHO_MSG} "Cancel this installation now and backup your databases"
 	@${ECHO_MSG} "if you have not already done so."
 .if !defined(BATCH)
 	@sleep 2
 .endif
 .endif
 
 .if !defined(CLIENT_ONLY)
 pre-su-install:
 	@${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
 
 post-install:
 	@${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PORTNAME} POST-INSTALL
 	@${CAT} ${PKGMESSAGE}
 .endif
 
 .ifndef WITHOUT_IPC_CLEANUP
 pre-build:
 .ifndef PACKAGE_BUILDING
 	@if [ `${ID} -u` -eq 0 ]; then \
 	${ECHO_MSG} "==> Please do not build ${PORTNAME} as 'root' because this may cause conflicts with SysV semaphores of running services."; exit 1; fi
 .endif
 	[ -f ${WRKDIR}/ipcs.pre.build ] || /usr/bin/ipcs -s | ${TAIL} -n +3 | \
 		${GREP} -F `${ID} -un` | ${CAT} > ${WRKDIR}/ipcs.pre.build
 
 post-build:
 	/usr/bin/ipcs -s | ${TAIL} -n +3 | ${GREP} -F `${ID} -un` | ${CAT} > ${WRKDIR}/ipcs.post.build
 	/usr/bin/diff -n ${WRKDIR}/ipcs.pre.build ${WRKDIR}/ipcs.post.build  | \
 		${TAIL} -n +2 | ${SED} -E 's/^s +([0-9]+).*$$/\/usr\/bin\/ipcrm -s \1/' > ${WRKDIR}/ipcrm.sh
 	${SH} ${WRKDIR}/ipcrm.sh
 .endif
 
 do-configure:
 	@(cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${MAKE_ENV} MAKE=${GMAKE}	\
 	${AUTOTOOLS_VARS} ./autogen.sh --localstatedir=${LOCALSTATEDIR} \
 		--prefix=${LOCALSTATEDIR} --exec-prefix=${PREFIX} \
 		--libexecdir=${LIBEXECDIR} \
 		--sysconfdir=${CONFDIR} --datadir=${DATADIR} \
 		--with-icu-config=${LOCALBASE}/bin/icu-config \
 		${AUTOGENARGS})
 
 post-configure:
 	@${REINPLACE_CMD} -e 's|__attribute__ ((__unused__));||' \
 		${WRKSRC}/src/dsql/parse.cpp
 
 do-install:
 .if !defined(CLIENT_ONLY)
 
 	${INSTALL_PROGRAM} ${UTIL_BIN:S!^!${WRKSRC}/gen/firebird/bin/!} ${PREFIX}/bin
 
 	${INSTALL_PROGRAM} -o firebird -g firebird -m 6550 \
 		${SUID_BIN:S!^!${WRKSRC}/gen/firebird/bin/!} ${PREFIX}/bin
 
 	@${MKDIR} ${CONFDIR}
 	${INSTALL_DATA} ${WRKDIR}/aliases.conf ${CONFDIR}/aliases.conf.sample
 .if !exists(${CONFDIR}/aliases.conf)
 	${INSTALL_DATA} ${WRKDIR}/aliases.conf ${CONFDIR}/aliases.conf
 .endif
 
 	${MKDIR} ${LIBEXECDIR}/udf ${LOCALSTATEDIR}/help ${LIBEXECDIR}/intl
 
 	${CHOWN} -R firebird:firebird ${LOCALSTATEDIR}
 
 	${INSTALL_FB} -m 0555 ${UDF_SO:S!^!${WRKSRC}/gen/firebird/UDF/!} ${LIBEXECDIR}/udf
 	${INSTALL_FB} -m 0444 ${UDF_SQL:S!^!${WRKSRC}/!} ${LIBEXECDIR}/udf
 
 .if !exists(${LOCALSTATEDIR}/security2.fdb)
 	${INSTALL_FB} -m 0660 -o firebird ${WRKSRC}/gen/firebird/security2.fdb \
 		${LOCALSTATEDIR}/security2.fdb
 .endif
 	${INSTALL_FB} -m 0660 -o firebird ${WRKSRC}/gen/firebird/security2.fdb \
 		${LOCALSTATEDIR}/security2.fdb.sample
 
 	${INSTALL_FB} -m 0440 ${WRKSRC}/gen/firebird/help/help.fdb \
 		${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/!} \
 		${PREFIX}/bin
 
 	${SED} -e "s=%%PREFIX%%=${PREFIX}=g" ${WRKSRC}/gen/firebird/misc/firebird.conf > ${WRKDIR}/firebird.conf
 
 	@${MKDIR} ${CONFDIR}
 .if !exists(${CONFDIR}/firebird.conf)
 	${INSTALL_DATA} ${WRKDIR}/firebird.conf ${CONFDIR}
 .endif
 	${INSTALL_DATA} ${WRKDIR}/firebird.conf ${CONFDIR}/firebird.conf.sample
 
 	${INSTALL_DATA} ${WRKSRC}/gen/firebird/lib/libib_util.so \
 		${WRKSRC}/gen/firebird/lib/libfbclient.so.${PORTVERSION} \
 		${WRKSRC}/gen/firebird/lib/libfbembed.so.${PORTVERSION} \
 		${PREFIX}/lib
 
 	${LN} -fs libfbclient.so.${PORTVERSION} ${PREFIX}/lib/libfbclient.so.2
 	${LN} -fs libfbclient.so.${PORTVERSION} ${PREFIX}/lib/libfbclient.so
 
 	${LN} -fs libfbembed.so.${PORTVERSION} ${PREFIX}/lib/libfbembed.so.2
 	${LN} -fs libfbembed.so.${PORTVERSION} ${PREFIX}/lib/libfbembed.so
 
 	${LN} -fs libfbclient.so.${PORTVERSION} ${PREFIX}/lib/libgds.so.2
 	${LN} -fs libfbclient.so.${PORTVERSION} ${PREFIX}/lib/libgds.so
 
 	@${MKDIR} ${PREFIX}/include
 	${INSTALL_DATA} ${WRKSRC}/gen/firebird/include/*.h ${PREFIX}/include
 
 	@${MKDIR} ${DATADIR}
 	${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
 
 .include <bsd.port.post.mk>

Property changes on: head/databases/firebird2-server/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.55
\ No newline at end of property
+1.56
\ No newline at end of property
Index: head/databases/firebird2-server/distinfo
===================================================================
--- head/databases/firebird2-server/distinfo	(revision 177188)
+++ head/databases/firebird2-server/distinfo	(revision 177189)
@@ -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

Property changes on: head/databases/firebird2-server/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.13
\ No newline at end of property
+1.14
\ No newline at end of property
Index: head/databases/firebird2-server/pkg-plist
===================================================================
--- head/databases/firebird2-server/pkg-plist	(revision 177188)
+++ head/databases/firebird2-server/pkg-plist	(revision 177189)
@@ -1,32 +1,35 @@
 @comment $FreeBSD$
 bin/fb_inet_server
 bin/fb_lock_mgr
 bin/fb_lock_print
 bin/gbak
 bin/gdef
 bin/gds_drop
 bin/gfix
 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
 %%CONFDIR%%/aliases.conf.sample
 @exec [ -f %B/aliases.conf ] || cp %B/%f %B/aliases.conf
 @dirrmtry %%CONFDIR%%
 @dirrm libexec/firebird/intl
 @dirrm libexec/firebird/udf
 @dirrm libexec/firebird
 @cwd /
 @unexec (cmp -s %D/%%LOCALSTATEDIR%%/security2.fdb %D/%%LOCALSTATEDIR%%/security2.fdb.sample && rm -f %D/%%LOCALSTATEDIR%%/security2.fdb) || true
 %%LOCALSTATEDIR%%/security2.fdb.sample
 @exec [ -f %D/%%LOCALSTATEDIR%%/security2.fdb ] || cp %D/%F %D/%%LOCALSTATEDIR%%/security2.fdb
 %%LOCALSTATEDIR%%/help/help.fdb
 @unexec [ -s %D/%%LOCALSTATEDIR%%/firebird.log ] || rm -f %D/%%LOCALSTATEDIR%%/firebird.log
 @unexec rm -f %D/%%LOCALSTATEDIR%%/isc_event1.`hostname`
 @unexec rm -f %D/%%LOCALSTATEDIR%%/isc_init1.`hostname`
 @unexec rm -f %D/%%LOCALSTATEDIR%%/isc_lock1.`hostname`
 @dirrm %%LOCALSTATEDIR%%/help
 @dirrmtry %%LOCALSTATEDIR%%

Property changes on: head/databases/firebird2-server/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.16
\ No newline at end of property
+1.17
\ No newline at end of property
Index: head/databases/firebird20-server/Makefile
===================================================================
--- head/databases/firebird20-server/Makefile	(revision 177188)
+++ head/databases/firebird20-server/Makefile	(revision 177189)
@@ -1,224 +1,232 @@
 # New ports collection makefile for:	firebird2-server
 # Date created:		15 August 2006
 # Whom:			Sergey Skvortsov <skv@protey.ru>
 #
 # $FreeBSD$
 #
 
 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)
 
 LATEST_LINK=	${PORTNAME}2${PKGNAMESUFFIX}
 
 USE_BISON=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	autoconf:259 aclocal:19 libtool:15
 ACLOCAL_ARGS=	--acdir=${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal \
 		-I ${WRKSRC}/m4
 USE_GCC=	3.4+
 
 LOCALSTATEDIR=	/var/db/firebird
 CONFDIR=	${PREFIX}/etc/firebird
 LIBEXECDIR=	${PREFIX}/libexec/firebird
 PLIST_SUB=	FIREBIRD_VERSION=${PORTVERSION} \
 		LOCALSTATEDIR="var/db/firebird" CONFDIR="etc/firebird"
 
 # Don't use ld for linking, use gcc
 LD=	${CC}
 
 # Don't strip binary files
 STRIP=
 
 ONLY_FOR_ARCHS=	i386 amd64
 CONFLICTS=	firebird-client-1* firebird-server-1*
 
 WRKSRC=		${WRKDIR}/${DISTNAME:C/^F/f/}
 
 INSTALL_FB=	${INSTALL} ${COPY} -g firebird
 
 .if !defined(CLIENT_ONLY)
 # Server part stuff
 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
 
 AUTOGENARGS=	--with-editline
 
 ALL_TARGET=	firebird_basic libfbembed embed_isql embed_gpre \
 		embed_gdef embed_qli libfbclient extlib
 #ALL_TARGET=	firebird_basic libfbembed libfbclient \
 #		client_gpre client_gdef client_isql client_qli extlib
 
 USE_LDCONFIG=	yes
 CLIENT_BIN=	gpre isql qli
 
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
 .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
 
 MAKE_ENV+=	CC=${CC} CXX=${CXX} FIREBIRD_TMP="${WRKDIR}" FIREBIRD_LOCK="${WRKDIR}"
 
 post-extract:
 	@${RM} -rf ${WRKSRC}/extern/icu
 
 post-patch:
 	@${MKDIR} ${WRKSRC}/m4
 	${CP} ${FILESDIR}/*.m4 ${WRKSRC}/m4
 
 .include <bsd.port.pre.mk>
 
 .if !defined(CLIENT_ONLY)
 pre-everything::
 	@${ECHO_MSG} "WARNING: The on-disk structure of the databases has"
 	@${ECHO_MSG} "changed since version 1.x."
 	@${ECHO_MSG} "Cancel this installation now and backup your databases"
 	@${ECHO_MSG} "if you have not already done so."
 .if !defined(BATCH)
 	@sleep 2
 .endif
 .endif
 
 .if !defined(CLIENT_ONLY)
 pre-su-install:
 	@${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
 
 post-install:
 	@${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PORTNAME} POST-INSTALL
 	@${CAT} ${PKGMESSAGE}
 .endif
 
 .ifndef WITHOUT_IPC_CLEANUP
 pre-build:
 .ifndef PACKAGE_BUILDING
 	@if [ `${ID} -u` -eq 0 ]; then \
 	${ECHO_MSG} "==> Please do not build ${PORTNAME} as 'root' because this may cause conflicts with SysV semaphores of running services."; exit 1; fi
 .endif
 	[ -f ${WRKDIR}/ipcs.pre.build ] || /usr/bin/ipcs -s | ${TAIL} -n +3 | \
 		${GREP} -F `${ID} -un` | ${CAT} > ${WRKDIR}/ipcs.pre.build
 
 post-build:
 	/usr/bin/ipcs -s | ${TAIL} -n +3 | ${GREP} -F `${ID} -un` | ${CAT} > ${WRKDIR}/ipcs.post.build
 	/usr/bin/diff -n ${WRKDIR}/ipcs.pre.build ${WRKDIR}/ipcs.post.build  | \
 		${TAIL} -n +2 | ${SED} -E 's/^s +([0-9]+).*$$/\/usr\/bin\/ipcrm -s \1/' > ${WRKDIR}/ipcrm.sh
 	${SH} ${WRKDIR}/ipcrm.sh
 .endif
 
 do-configure:
 	@(cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${MAKE_ENV} MAKE=${GMAKE}	\
 	${AUTOTOOLS_VARS} ./autogen.sh --localstatedir=${LOCALSTATEDIR} \
 		--prefix=${LOCALSTATEDIR} --exec-prefix=${PREFIX} \
 		--libexecdir=${LIBEXECDIR} \
 		--sysconfdir=${CONFDIR} --datadir=${DATADIR} \
 		--with-icu-config=${LOCALBASE}/bin/icu-config \
 		${AUTOGENARGS})
 
 post-configure:
 	@${REINPLACE_CMD} -e 's|__attribute__ ((__unused__));||' \
 		${WRKSRC}/src/dsql/parse.cpp
 
 do-install:
 .if !defined(CLIENT_ONLY)
 
 	${INSTALL_PROGRAM} ${UTIL_BIN:S!^!${WRKSRC}/gen/firebird/bin/!} ${PREFIX}/bin
 
 	${INSTALL_PROGRAM} -o firebird -g firebird -m 6550 \
 		${SUID_BIN:S!^!${WRKSRC}/gen/firebird/bin/!} ${PREFIX}/bin
 
 	@${MKDIR} ${CONFDIR}
 	${INSTALL_DATA} ${WRKDIR}/aliases.conf ${CONFDIR}/aliases.conf.sample
 .if !exists(${CONFDIR}/aliases.conf)
 	${INSTALL_DATA} ${WRKDIR}/aliases.conf ${CONFDIR}/aliases.conf
 .endif
 
 	${MKDIR} ${LIBEXECDIR}/udf ${LOCALSTATEDIR}/help ${LIBEXECDIR}/intl
 
 	${CHOWN} -R firebird:firebird ${LOCALSTATEDIR}
 
 	${INSTALL_FB} -m 0555 ${UDF_SO:S!^!${WRKSRC}/gen/firebird/UDF/!} ${LIBEXECDIR}/udf
 	${INSTALL_FB} -m 0444 ${UDF_SQL:S!^!${WRKSRC}/!} ${LIBEXECDIR}/udf
 
 .if !exists(${LOCALSTATEDIR}/security2.fdb)
 	${INSTALL_FB} -m 0660 -o firebird ${WRKSRC}/gen/firebird/security2.fdb \
 		${LOCALSTATEDIR}/security2.fdb
 .endif
 	${INSTALL_FB} -m 0660 -o firebird ${WRKSRC}/gen/firebird/security2.fdb \
 		${LOCALSTATEDIR}/security2.fdb.sample
 
 	${INSTALL_FB} -m 0440 ${WRKSRC}/gen/firebird/help/help.fdb \
 		${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/!} \
 		${PREFIX}/bin
 
 	${SED} -e "s=%%PREFIX%%=${PREFIX}=g" ${WRKSRC}/gen/firebird/misc/firebird.conf > ${WRKDIR}/firebird.conf
 
 	@${MKDIR} ${CONFDIR}
 .if !exists(${CONFDIR}/firebird.conf)
 	${INSTALL_DATA} ${WRKDIR}/firebird.conf ${CONFDIR}
 .endif
 	${INSTALL_DATA} ${WRKDIR}/firebird.conf ${CONFDIR}/firebird.conf.sample
 
 	${INSTALL_DATA} ${WRKSRC}/gen/firebird/lib/libib_util.so \
 		${WRKSRC}/gen/firebird/lib/libfbclient.so.${PORTVERSION} \
 		${WRKSRC}/gen/firebird/lib/libfbembed.so.${PORTVERSION} \
 		${PREFIX}/lib
 
 	${LN} -fs libfbclient.so.${PORTVERSION} ${PREFIX}/lib/libfbclient.so.2
 	${LN} -fs libfbclient.so.${PORTVERSION} ${PREFIX}/lib/libfbclient.so
 
 	${LN} -fs libfbembed.so.${PORTVERSION} ${PREFIX}/lib/libfbembed.so.2
 	${LN} -fs libfbembed.so.${PORTVERSION} ${PREFIX}/lib/libfbembed.so
 
 	${LN} -fs libfbclient.so.${PORTVERSION} ${PREFIX}/lib/libgds.so.2
 	${LN} -fs libfbclient.so.${PORTVERSION} ${PREFIX}/lib/libgds.so
 
 	@${MKDIR} ${PREFIX}/include
 	${INSTALL_DATA} ${WRKSRC}/gen/firebird/include/*.h ${PREFIX}/include
 
 	@${MKDIR} ${DATADIR}
 	${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
 
 .include <bsd.port.post.mk>

Property changes on: head/databases/firebird20-server/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.55
\ No newline at end of property
+1.56
\ No newline at end of property
Index: head/databases/firebird20-server/distinfo
===================================================================
--- head/databases/firebird20-server/distinfo	(revision 177188)
+++ head/databases/firebird20-server/distinfo	(revision 177189)
@@ -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

Property changes on: head/databases/firebird20-server/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.13
\ No newline at end of property
+1.14
\ No newline at end of property
Index: head/databases/firebird20-server/pkg-plist
===================================================================
--- head/databases/firebird20-server/pkg-plist	(revision 177188)
+++ head/databases/firebird20-server/pkg-plist	(revision 177189)
@@ -1,32 +1,35 @@
 @comment $FreeBSD$
 bin/fb_inet_server
 bin/fb_lock_mgr
 bin/fb_lock_print
 bin/gbak
 bin/gdef
 bin/gds_drop
 bin/gfix
 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
 %%CONFDIR%%/aliases.conf.sample
 @exec [ -f %B/aliases.conf ] || cp %B/%f %B/aliases.conf
 @dirrmtry %%CONFDIR%%
 @dirrm libexec/firebird/intl
 @dirrm libexec/firebird/udf
 @dirrm libexec/firebird
 @cwd /
 @unexec (cmp -s %D/%%LOCALSTATEDIR%%/security2.fdb %D/%%LOCALSTATEDIR%%/security2.fdb.sample && rm -f %D/%%LOCALSTATEDIR%%/security2.fdb) || true
 %%LOCALSTATEDIR%%/security2.fdb.sample
 @exec [ -f %D/%%LOCALSTATEDIR%%/security2.fdb ] || cp %D/%F %D/%%LOCALSTATEDIR%%/security2.fdb
 %%LOCALSTATEDIR%%/help/help.fdb
 @unexec [ -s %D/%%LOCALSTATEDIR%%/firebird.log ] || rm -f %D/%%LOCALSTATEDIR%%/firebird.log
 @unexec rm -f %D/%%LOCALSTATEDIR%%/isc_event1.`hostname`
 @unexec rm -f %D/%%LOCALSTATEDIR%%/isc_init1.`hostname`
 @unexec rm -f %D/%%LOCALSTATEDIR%%/isc_lock1.`hostname`
 @dirrm %%LOCALSTATEDIR%%/help
 @dirrmtry %%LOCALSTATEDIR%%

Property changes on: head/databases/firebird20-server/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.16
\ No newline at end of property
+1.17
\ No newline at end of property