svn commit: r353730 - in head: . Mk

[Baptiste Daroussin]

Author: bapt
Date: Sun May 11 20:46:55 2014
New Revision: 353730
URL: http://svnweb.freebsd.org/changeset/ports/353730
QAT: https://qat.redports.org/buildarchive/r353730/

Log:
  Switch firebird to use DEFAULT_VERSIONS macro to set the default
  While here drop support for firebird 2.0

Modified:
  head/Mk/bsd.database.mk
  head/Mk/bsd.default-versions.mk
  head/UPDATING

Modified: head/Mk/bsd.database.mk
==============================================================================
--- head/Mk/bsd.database.mk	Sun May 11 20:23:42 2014	(r353729)
+++ head/Mk/bsd.database.mk	Sun May 11 20:46:55 2014	(r353730)
@@ -532,16 +532,12 @@ USE_FIREBIRD=	${WITH_FIREBIRD_VER}
 .endif
 
 .if ${USE_FIREBIRD:tl} == "yes"
-FIREBIRD_VER=	25
+FIREBIRD_VER=	${FIREBIRD_DEFAULT:S/.//}
 .else
 FIREBIRD_VER=	${USE_FIREBIRD}
 .endif
 
-.if ${FIREBIRD_VER} == "2"
-LIB_DEPENDS+=	libfbclient.so:${PORTSDIR}/databases/firebird20-client
-.elif ${FIREBIRD_VER} == "20"
-LIB_DEPENDS+=	libfbclient.so:${PORTSDIR}/databases/firebird20-client
-.elif ${FIREBIRD_VER} == "21"
+.if ${FIREBIRD_VER} == "21"
 LIB_DEPENDS+=	libfbclient.so:${PORTSDIR}/databases/firebird21-client
 .elif ${FIREBIRD_VER} == "25"
 LIB_DEPENDS+=	libfbclient.so:${PORTSDIR}/databases/firebird25-client

Modified: head/Mk/bsd.default-versions.mk
==============================================================================
--- head/Mk/bsd.default-versions.mk	Sun May 11 20:23:42 2014	(r353729)
+++ head/Mk/bsd.default-versions.mk	Sun May 11 20:46:55 2014	(r353730)
@@ -31,5 +31,6 @@ PYTHON2_DEFAULT?=	2.7
 PYTHON3_DEFAULT?=	3.3
 RUBY_DEFAULT?=		1.9
 TCLTK_DEFAULT?=		8.6
+FIREBIRD_DEFAULT?=	2.5
 
 .endif

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Sun May 11 20:23:42 2014	(r353729)
+++ head/UPDATING	Sun May 11 20:46:55 2014	(r353730)
@@ -5,6 +5,15 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20140511:
+  AFFECTS: users of databases/firebird*
+  AUTHOR: bapt at FreeBSD.org
+
+  The default version of databases/firebird* have been changed to support
+  DEFAULT_VERSIONS variable
+
+  DEFAULT_VERSIONS=firebird=2.5
+
 20140507:
   AFFECTS: users of lang/open-cobol
   AUTHOR: johans at FreeBSD.org