Index: head/Mk/bsd.database.mk =================================================================== --- head/Mk/bsd.database.mk +++ head/Mk/bsd.database.mk @@ -75,15 +75,6 @@ # the Berkeley DB library directory. # BDB_VER # - Detected Berkeley DB version. -## -# USE_FIREBIRD - Add dependency on Firebird library. Valid values are: -# 2 and 1. If no version is given by the maintainer (if -# USE_FIREBIRD= yes) and the user did not define -# WITH_FIREBIRD_VER variable, fall back to default "2". -# WITH_FIREBIRD_VER -# - User defined variable to set Firebird version. -# FIREBIRD_VER -# - Detected Firebird version. .include "${PORTSDIR}/Mk/bsd.default-versions.mk" @@ -375,24 +366,4 @@ .endif # USE_BDB -.if defined(USE_FIREBIRD) - -.if defined(WITH_FIREBIRD_VER) -USE_FIREBIRD= ${WITH_FIREBIRD_VER} -.endif - -.if ${USE_FIREBIRD:tl} == "yes" -FIREBIRD_VER= ${FIREBIRD_DEFAULT:S/.//} -.else -FIREBIRD_VER= ${USE_FIREBIRD} -.endif - -.if ${FIREBIRD_VER} == "25" -LIB_DEPENDS+= libfbclient.so:databases/firebird25-client -.else -IGNORE= cannot install: unknown Firebird version: ${FIREBIRD_VER} -.endif - -.endif # defined(USE_FIREBIRD) - .endif # defined(_POSTMKINCLUDED) && !defined(Database_Post_Include) Index: head/Mk/bsd.port.mk =================================================================== --- head/Mk/bsd.port.mk +++ head/Mk/bsd.port.mk @@ -1864,7 +1864,7 @@ .endif .if defined(USE_MYSQL) || defined(WANT_MYSQL_VER) || \ - defined(USE_BDB) || defined(USE_FIREBIRD) + defined(USE_BDB) .include "${PORTSDIR}/Mk/bsd.database.mk" .endif Index: head/Mk/bsd.sanity.mk =================================================================== --- head/Mk/bsd.sanity.mk +++ head/Mk/bsd.sanity.mk @@ -168,9 +168,8 @@ INSTALLS_SHLIB USE_PYDISTUTILS PYTHON_CONCURRENT_INSTALL \ PYDISTUTILS_AUTOPLIST PYTHON_PY3K_PLIST_HACK PYDISTUTILS_NOEGGINFO \ USE_PYTHON_PREFIX USE_BZIP2 USE_XZ USE_PGSQL NEED_ROOT \ - UNIQUENAME LATEST_LINK USE_SQLITE -SANITY_DEPRECATED= PYTHON_PKGNAMESUFFIX USE_AUTOTOOLS PLIST_DIRSTRY \ - USE_FIREBIRD + UNIQUENAME LATEST_LINK USE_SQLITE USE_FIREBIRD +SANITY_DEPRECATED= PYTHON_PKGNAMESUFFIX USE_AUTOTOOLS PLIST_DIRSTRY SANITY_NOTNEEDED= WX_UNICODE USE_AUTOTOOLS_ALT= USES=autoreconf and GNU_CONFIGURE=yes Index: head/databases/firebird25-server/Makefile =================================================================== --- head/databases/firebird25-server/Makefile +++ head/databases/firebird25-server/Makefile @@ -72,7 +72,7 @@ .if !defined(CLIENT_ONLY) # Server part stuff -LIB_DEPENDS+= libfbembed.so:databases/firebird25-client +USES+= firebird CONFIGURE_ARGS+=--enable-superserver --without-editline Index: head/databases/flamerobin/Makefile =================================================================== --- head/databases/flamerobin/Makefile +++ head/databases/flamerobin/Makefile @@ -16,8 +16,7 @@ LICENSE_FILE= ${WRKSRC}/docs/fr_license.html LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -USES= compiler -USE_FIREBIRD= yes +USES= compiler firebird USE_WX= 2.8+ WX_COMPS= wx contrib WX_CONF_ARGS= absolute Index: head/databases/fpc-ibase/Makefile =================================================================== --- head/databases/fpc-ibase/Makefile +++ head/databases/fpc-ibase/Makefile @@ -17,6 +17,6 @@ IBASE_DESC= Install Interbase/Firebird client OPTIONS_DEFAULT= IBASE -IBASE_USE= FIREBIRD=yes +IBASE_USES= firebird .include "${MASTERDIR}/Makefile" Index: head/databases/p5-DBD-InterBase/Makefile =================================================================== --- head/databases/p5-DBD-InterBase/Makefile +++ head/databases/p5-DBD-InterBase/Makefile @@ -14,9 +14,7 @@ BUILD_DEPENDS= p5-DBI>=0:databases/p5-DBI RUN_DEPENDS:= ${BUILD_DEPENDS} -USE_FIREBIRD= yes - -USES= perl5 +USES= perl5 firebird USE_PERL5= patch configure post-patch: Index: head/databases/py-fdb/Makefile =================================================================== --- head/databases/py-fdb/Makefile +++ head/databases/py-fdb/Makefile @@ -12,10 +12,8 @@ LICENSE= ISCL -LIB_DEPENDS= libfbclient.so:databases/firebird25-client - NO_ARCH= yes -USES= python +USES= firebird python USE_PYTHON= autoplist distutils .include Index: head/databases/qt4-ibase-plugin/Makefile =================================================================== --- head/databases/qt4-ibase-plugin/Makefile +++ head/databases/qt4-ibase-plugin/Makefile @@ -5,6 +5,6 @@ COMMENT= Qt InterBase/Firebird database plugin DB= ibase -USE_FIREBIRD= yes +USES+= firebird .include "${.CURDIR:H:H}/devel/qt4/Makefile.sqldrivers" Index: head/databases/qt5-sqldrivers-ibase/Makefile =================================================================== --- head/databases/qt5-sqldrivers-ibase/Makefile +++ head/databases/qt5-sqldrivers-ibase/Makefile @@ -3,6 +3,6 @@ DB= IBase DB_DESC= InterBase/Firebird -USE_FIREBIRD= yes +USES= firebird .include "${.CURDIR:H:H}/devel/qt5/Makefile.sqldrivers" Index: head/databases/soci/Makefile =================================================================== --- head/databases/soci/Makefile +++ head/databases/soci/Makefile @@ -46,7 +46,7 @@ BOOST_CMAKE_ON= -DWITH_BOOST:BOOL=ON BOOST_CMAKE_OFF= -DWITH_BOOST:BOOL=OFF -FIREBIRD_USE= FIREBIRD=yes +FIREBIRD_USES= firebird FIREBIRD_CMAKE_ARGS_ON= -DWITH_FIREBIRD:BOOL=ON FIREBIRD_CMAKE_ARGS_OFF= -DWITH_FIREBIRD:BOOL=OFF Index: head/databases/sqlrelay/Makefile =================================================================== --- head/databases/sqlrelay/Makefile +++ head/databases/sqlrelay/Makefile @@ -110,7 +110,7 @@ .endif .if ${PORT_OPTIONS:MFIREBIRD} -USE_FIREBIRD= yes +USES+= firebird CONFIGURE_ARGS+= --with-firebird-prefix="${LOCALBASE}" TOSTRIP+= libexec/sqlrelay/sqlrconnection_firebird.so .else Index: head/devel/matreshka/Makefile =================================================================== --- head/devel/matreshka/Makefile +++ head/devel/matreshka/Makefile @@ -32,7 +32,7 @@ MYSQL_USE= MYSQL=yes PGSQL_USES= pgsql SQLITE3_USES= sqlite -FIREBIRD_USE= FIREBIRD=yes +FIREBIRD_USES= firebird MAKE_JOBS_UNSAFE= yes Index: head/editors/libreoffice/Makefile =================================================================== --- head/editors/libreoffice/Makefile +++ head/editors/libreoffice/Makefile @@ -27,8 +27,7 @@ ${LOCALBASE}/include/glm/glm.hpp:math/glm \ bash:shells/bash \ gsed:textproc/gsed -LIB_DEPENDS= libfbembed.so:databases/firebird25-client \ - libapr-1.so:devel/apr1 \ +LIB_DEPENDS= libapr-1.so:devel/apr1 \ libboost_date_time.so:devel/boost-libs \ libicutu.so:devel/icu \ liblangtag.so:devel/liblangtag \ @@ -96,7 +95,7 @@ USE_PERL5= build USE_QT4= # empty but required USE_XORG= xaw xrandr -USES= bison compiler:c++11-lib cpe gmake jpeg perl5 pkgconfig \ +USES= bison compiler:c++11-lib cpe firebird gmake jpeg perl5 pkgconfig \ python shared-mime-info tar:xz WANT_GNOME= yes Index: head/security/hydra/Makefile =================================================================== --- head/security/hydra/Makefile +++ head/security/hydra/Makefile @@ -28,7 +28,7 @@ OPTIONS_DEFINE= FIREBIRD SSH SVN X11 OPTIONS_DEFAULT=SSH OPTIONS_EXCLUDE=NLS DOCS -FIREBIRD_LIB_DEPENDS= libfbclient.so:databases/firebird25-client +FIREBIRD_USES= firebird SVN_LIB_DEPENDS= libsvn_client-1.so:devel/subversion .include