Update to 2.0.1

3 files changed, 18 insertions, 20 deletions

diff --git a/databases/firebird20-server/Makefile b/databases/firebird20-server/Makefile
index c6a7e42cd796..abd0c1d5a111 100644
--- a/databases/firebird20-server/Makefile
+++ b/databases/firebird20-server/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME?=	firebird
-PORTVERSION=	2.0.0
-PORTREVISION?=	4
+PORTVERSION=	2.0.1
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=firebird
 PKGNAMESUFFIX?=	-server
-DISTNAME=	Firebird-2.0.0.12748
+DISTNAME=	Firebird-2.0.1.12855-0
 
 MAINTAINER=	skv@FreeBSD.org
 COMMENT?=	Firebird-2 relational database (server)
@@ -43,8 +42,6 @@ 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)
@@ -86,7 +83,7 @@ CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
 .if !defined(NOPORTDOCS)
 PORTDOCS=	*
 FB_DOCS_FILES=	WhatsNew README.* Firebird* ReleaseNotes.pdf ambiguity.txt \
-                ods11-index-structure.html
+		ods11-index-structure.html
 FB_DOCS_DIRS=	sql.extensions license upgrade
 .endif
 .endif
@@ -99,6 +96,7 @@ post-extract:
 post-patch:
 	@${MKDIR} ${WRKSRC}/m4
 	${CP} ${FILESDIR}/*.m4 ${WRKSRC}/m4
+	${FIND} ${WRKSRC} -name "*.sh" -exec ${CHMOD} +x {} \+
 
 .include <bsd.port.pre.mk>
 
diff --git a/databases/firebird20-server/distinfo b/databases/firebird20-server/distinfo
index cb55ddc572ee..d58edee2b93e 100644
--- a/databases/firebird20-server/distinfo
+++ b/databases/firebird20-server/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (Firebird-2.0.1.12855-0.tar.bz2) = 9f16b202478eb3b287f70c87f9482308
+SHA256 (Firebird-2.0.1.12855-0.tar.bz2) = 4346471f7c302b5ecdb8440b3c329e3d1fd78483b948e9e7b94ef284c37cb86e
+SIZE (Firebird-2.0.1.12855-0.tar.bz2) = 12582690
diff --git a/databases/firebird20-server/files/patch-configure.in b/databases/firebird20-server/files/patch-configure.in
index 4e09407641e4..11429b343473 100644
--- a/databases/firebird20-server/files/patch-configure.in
+++ b/databases/firebird20-server/files/patch-configure.in
@@ -1,18 +1,18 @@
---- configure.in.orig	Tue Apr 25 21:07:23 2006
-+++ configure.in	Thu Sep 14 19:30:42 2006
-@@ -423,9 +423,10 @@
- AC_CHECK_LIB(curses, main)
- dnl AC_CHECK_LIB(termcap, main)
- if test "$EDITLINE_FLG" = "Y"; then
--  AC_SUBST(EDITLINE_A, -leditline)
-+  AC_SUBST(EDITLINE_A, "-ledit -lreadline")
+--- configure.in.orig	Fri Dec  8 21:26:56 2006
++++ configure.in	Fri Jan 12 13:04:42 2007
+@@ -445,9 +445,10 @@
+ 			AC_CHECK_LIB(termcap, tgetent, , \
+ 				AC_CHECK_LIB(tinfo, tgetent, , \
+ 					AC_MSG_ERROR(termcap support not found)))))  
+-	AC_SUBST(EDITLINE_A, -leditline)
++	AC_SUBST(EDITLINE_A, "-ledit -lreadline")
  fi
  AC_CHECK_LIB(stdc++, main,,, $LIBS)
-+AM_PATH_ICU(3, 4)
++AM_PATH_ICU(3, 6)
  
  
  dnl Check for functions
-@@ -696,6 +697,10 @@
+@@ -718,6 +719,10 @@
  AC_SUBST(NEW_FIREBIRD_DIR)
  
  AC_DEFINE_UNQUOTED(FB_PREFIX, $(if test "x$prefix" = "xNONE" ; then echo \"$ac_default_prefix\"; else echo \"$prefix\"; fi), [Installation path prefix])
@@ -23,7 +23,7 @@
  
  AC_CONFIG_COMMANDS(,,[
  dnl # rebuild version header if needed
-@@ -1004,19 +1009,11 @@
+@@ -1026,19 +1031,11 @@
  gen/Makefile.install:builds/install/arch-specific/${INSTALL_PREFIX}/Makefile.in
  Makefile:Makefile.in
  gen/Makefile.extern.editline:${MAKE_SRC_DIR}/Makefile.in.extern.editline