svn commit: r339550 - in head/Mk: . Uses
Chris Rees
crees at FreeBSD.org
Sun Jan 12 21:16:07 UTC 2014
Author: crees
Date: Sun Jan 12 21:16:06 2014
New Revision: 339550
URL: http://svnweb.freebsd.org/changeset/ports/339550
Log:
Strip postgresql code out of bsd.database.mk, and introduce USES=pgsql.
New syntax:
# Depend on postgresql-client
USES= pgsql
# Depend on postgresql-client at least 9.2
USES= pgsql:9.2+
#Depend on postgresql-server at least 9.0
USES= pgsql:9.0+
WANT_PGSQL= server
Postgresql now supports DEFAULT_VERSIONS, and please note that the
version syntax now includes dots(!); i.e. before it was 90, now 9.0
Reviewed by: ade, silence from pgsql@
Added:
head/Mk/Uses/pgsql.mk
- copied, changed from r338462, head/Mk/bsd.database.mk
Modified:
head/Mk/bsd.database.mk
head/Mk/bsd.default-versions.mk
Copied and modified: head/Mk/Uses/pgsql.mk (from r338462, head/Mk/bsd.database.mk)
==============================================================================
--- head/Mk/bsd.database.mk Thu Jan 2 16:32:22 2014 (r338462, copy source)
+++ head/Mk/Uses/pgsql.mk Sun Jan 12 21:16:06 2014 (r339550)
@@ -1,544 +1,142 @@
-# -*- tab-width: 4; -*-
-# ex: ts=4
-#
# $FreeBSD$
#
+# Provide support for PostgreSQL (pgsql)
+#
+# MAINTAINER: pgsql at FreeBSD.org
+#
+# Feature: pgsql
+# Usage: USES= pgsql[:version]
+#
+# Maintainer can set version required. Minimum and maximum
+# versions can be specified; e.g. 9.0-, 8.4+
+#
+# WANT_PGSQL= server[:fetch] pltcl plperl
+#
+# Add PostgreSQL component dependency, using
+# WANT_PGSQL= component[:target].
+# For the full list use make -V _USE_PGSQL_DEP
+# If no version is given (by the maintainer via the port or
+# by the user via defined variable), try to find the
+# currently installed version. Fall back to default if
+# necessary.
-.if defined(_POSTMKINCLUDED) && !defined(Database_Post_Include)
+.if !defined(_INCLUDE_USES_PGSQL_MK)
-Database_Post_Include= bsd.database.mk
-Database_Include_MAINTAINER= ports at FreeBSD.org
+_INCLUDE_USES_PGSQL_MK= yes
-# This file contains some routines to interact with different databases, such
-# as MySQL, PostgreSQL, and Berkley DB. To include this file, define macro
-# USE_[DATABASE], for example USE_MYSQL. Defining macro like
-# USE_[DATABASE]_VER or WANT_[DATABASE]_VER will include this file as well.
+# Variables set by pgsql.mk:
#
-##
-# USE_MYSQL - Add MySQL (client/server/embedded) dependency (default:
-# client).
-# If no version is given (by the maintainer via the port or
-# by the user via defined variable), try to find the
-# currently installed version. Fall back to default if
-# necessary (MySQL-5.5 = 55).
-# DEFAULT_MYSQL_VER
-# - MySQL default version. Can be overridden within a port.
-# Default: 55.
-# WANT_MYSQL_VER
-# - Maintainer can set an arbitrary version of MySQL to always
-# build this port with (overrides WITH_MYSQL_VER).
-# IGNORE_WITH_MYSQL
-# - This variable can be defined if the ports does not support
-# one or more versions of MySQL.
-# WITH_MYSQL_VER
-# - User defined variable to set MySQL version.
-# MYSQL_VER
-# - Detected MySQL version.
-##
-# USE_PGSQL - Add PostgreSQL client dependency. Components can be depended
-# on using USE_PGSQL= component[:target]. For the full list
-# use make -V _USE_PGSQL_DEP
-# If no version is given (by the maintainer via the port or
-# by the user via defined variable), try to find the
-# currently installed version. Fall back to default if
-# necessary (PostgreSQL-9.0 = 90).
-# DEFAULT_PGSQL_VER
-# - PostgreSQL default version, currently 90.
-# WANT_PGSQL_VER
-# - Maintainer can set an arbitrary version of PostgreSQL to
-# always build this port with (overrides WITH_PGSQL_VER).
-# Minimum and maximum versions can be set (e.g. 90+)
-# WITH_PGSQL_VER
-# - User defined variable to set PostgreSQL version.
# PGSQL_VER
-# - Detected PostgreSQL version.
-##
-# USE_BDB - Add Berkeley DB library dependency.
-# If no version is given (by the maintainer via the port or
-# by the user via defined variable), try to find the
-# currently installed version. Fall back to default if
-# necessary (db41+).
-# INVALID_BDB_VER
-# - This variable can be defined when the port does not
-# support one or more versions of Berkeley DB.
-# WANT_BDB_VER
-# - Maintainer can set a version of Berkeley DB to always
-# build this port with (overrides WITH_BDB_VER).
-# WITH_BDB_VER
-# - User defined global variable to set Berkeley DB version.
-# <UNIQUENAME>_WITH_BDB_VER
-# - User defined port specific variable to set Berkeley DB
-# version.
-# WITH_BDB_HIGHEST
-# - Use the highest installed version of Berkeley DB.
-# BDB_LIB_NAME
-# - This variable is automatically set to the name of the
-# Berkeley DB library (default: db41).
-# BDB_LIB_CXX_NAME
-# - This variable is automatically set to the name of the
-# Berkeley DB C++ library (default: db41_cxx).
-# BDB_INCLUDE_DIR
-# - This variable is automatically set to the location of
-# the Berkeley DB include directory (default:
-# ${LOCALBASE}/include/db41).
-# BDB_LIB_DIR
-# - This variable is automatically set to the location of
-# the Berkeley DB library directory.
-# BDB_VER
-# - Detected Berkeley DB version.
-##
-# USE_SQLITE - Add dependency on SQLite library. Valid values are:
-# 3 and 2. If version is not specified directly then
-# SQLite-3 is used (if USE_SQLITE= yes).
-# SQLITE_VER
-# - Detected SQLite 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.
-
-.if defined(USE_MYSQL)
-DEFAULT_MYSQL_VER?= 55
-# MySQL client version currently supported.
-MYSQL51_LIBVER= 16
-MYSQL53m_LIBVER= 16
-MYSQL55_LIBVER= 18
-MYSQL55m_LIBVER= 18
-MYSQL55p_LIBVER= 18
-MYSQL56_LIBVER= 18
-MYSQL56p_LIBVER= 18
-
-# Setting/finding MySQL version we want.
-.if exists(${LOCALBASE}/bin/mysql)
-_MYSQL!= ${LOCALBASE}/bin/mysql --version | ${SED} -e 's/.*Distrib \([0-9]\)\.\([0-9]*\).*/\1\2/'
-_PERCONA!= ${LOCALBASE}/bin/mysql --version | ${GREP} Percona | wc -l
-_MARIADB!= ${LOCALBASE}/bin/mysql --version | ${GREP} MariaDB | wc -l
-
-.if ${_PERCONA} == 1
-_MYSQL_VER= ${_MYSQL}p
-.elif ${_MARIADB} == 1
-_MYSQL_VER= ${_MYSQL}m
-.else
-_MYSQL_VER= ${_MYSQL}
-.endif
-.endif
-
-.if defined(WANT_MYSQL_VER)
-.if defined(WITH_MYSQL_VER) && ${WITH_MYSQL_VER} != ${WANT_MYSQL_VER}
-IGNORE= cannot install: the port wants mysql${WANT_MYSQL_VER}-client and you try to install mysql${WITH_MYSQL_VER}-client
-.endif
-MYSQL_VER= ${WANT_MYSQL_VER}
-.elif defined(WITH_MYSQL_VER)
-MYSQL_VER= ${WITH_MYSQL_VER}
-.else
-.if defined(_MYSQL_VER)
-MYSQL_VER= ${_MYSQL_VER}
-.else
-MYSQL_VER= ${DEFAULT_MYSQL_VER}
-.endif
-.endif # WANT_MYSQL_VER
-
-.if defined(_MYSQL_VER)
-.if ${_MYSQL_VER} != ${MYSQL_VER}
-IGNORE= cannot install: MySQL versions mismatch: mysql${_MYSQL_VER}-client is installed and wanted version is mysql${MYSQL_VER}-client
-.endif
-.endif
-
-.if (${MYSQL_VER} == "53m")
-_MYSQL_CLIENT= databases/mariadb-client
-_MYSQL_SERVER= databases/mariadb-server
-.elif (${MYSQL_VER} == "55m")
-_MYSQL_CLIENT= databases/mariadb55-client
-_MYSQL_SERVER= databases/mariadb55-server
-.elif (${MYSQL_VER} == "55p")
-_MYSQL_CLIENT= databases/percona55-client
-_MYSQL_SERVER= databases/percona55-server
-.elif (${MYSQL_VER} == "56p")
-_MYSQL_CLIENT= databases/percona56-client
-_MYSQL_SERVER= databases/percona56-server
-.else
-_MYSQL_CLIENT= databases/mysql${MYSQL_VER}-client
-_MYSQL_SERVER= databases/mysql${MYSQL_VER}-server
-.endif
+# Detected PostgreSQL version. Do *not* use this
+# to add dependencies; use WANT_PGSQL as explained above
+#
-# And now we are checking if we can use it
-.if defined(MYSQL${MYSQL_VER}_LIBVER)
-.if defined(IGNORE_WITH_MYSQL)
-. for VER in ${IGNORE_WITH_MYSQL}
-. if (${MYSQL_VER} == "${VER}")
-IGNORE= cannot install: does not work with MySQL version ${MYSQL_VER} (MySQL ${IGNORE_WITH_MYSQL} not supported)
-. endif
-. endfor
-.endif # IGNORE_WITH_MYSQL
-.if (${USE_MYSQL} == "server" || ${USE_MYSQL} == "embedded")
-RUN_DEPENDS+= ${LOCALBASE}/libexec/mysqld:${PORTSDIR}/${_MYSQL_SERVER}
-.if (${USE_MYSQL} == "embedded")
-BUILD_DEPENDS+= ${LOCALBASE}/lib/mysql/libmysqld.a:${PORTSDIR}/${_MYSQL_SERVER}
-.endif
-.else
-LIB_DEPENDS+= mysqlclient.${MYSQL${MYSQL_VER}_LIBVER}:${PORTSDIR}/${_MYSQL_CLIENT}
-.endif
-.else
-IGNORE= cannot install: unknown MySQL version: ${MYSQL_VER}
-.endif # Check for correct libs
-.endif # USE_MYSQL
-
-.if defined(USE_PGSQL)
-VALID_PGSQL_VER= 84 90 91 92 93
-DEFAULT_PGSQL_VER?= 90
-PGSQL83_LIBVER= 5
-PGSQL84_LIBVER= 5
-PGSQL90_LIBVER= 5
-PGSQL91_LIBVER= 5
-PGSQL92_LIBVER= 5
-PGSQL93_LIBVER= 5
+VALID_PGSQL_VER= 8.4 9.0 9.1 9.2 9.3
+
+# Override non-default LIBVERS like this:
+#PGSQL99_LIBVER=6
+
+PGSQL_LIBVER= 5
+.for v in ${VALID_PGSQL_VER:S,.,,}
+PGSQL$v_LIBVER?= ${PGSQL_LIBVER}
+.endfor
+
+# We don't want to be :S,.,, the whole time when doing port version checks
+PGSQL_VER_NODOT= ${PGSQL_VER:S,.,,}
+
+.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
+
+. for w in WITH DEFAULT
+. ifdef $w_PGSQL_VER
+WARNING+= "$w_PGSQL_VER is defined, consider using DEFAULT_VERSIONS=pgsql=${$w_PGSQL_VER:C,^.,&.,} instead"
+PGSQL_DEFAULT?= ${$w_PGSQL_VER:C,^.,&.,}
+. endif
+. endfor
+
+. ifdef DEFAULT_PGSQL_VER && WITH_PGSQL_VER
+IGNORE= will not allow setting both DEFAULT_PGSQL_VER and WITH_PGSQL_VER. Use DEFAULT_VERSIONS=pgsql=9.0 instead
+. endif
# Setting/finding PostgreSQL version we want.
-. if exists(${LOCALBASE}/bin/pg_config)
-_PGSQL_VER!= ${LOCALBASE}/bin/pg_config --version | ${SED} -n 's/PostgreSQL[^0-9]*\([0-9][0-9]*\)\.\([0-9][0-9]*\)[^0-9].*/\1\2/p'
-WITH_PGSQL_VER?= ${_PGSQL_VER}
-. if ${WITH_PGSQL_VER} != ${_PGSQL_VER}
-IGNORE?= cannot install: you have set WITH_PGSQL_VER=${WITH_PGSQL_VER} in make.conf, but you have postgresql${_PGSQL_VER}-client installed
-. endif
+PG_CONFIG?= ${LOCALBASE}/bin/pg_config
+. if exists(${PG_CONFIG})
+_PGSQL_VER!= ${PG_CONFIG} --version | ${SED} -n 's/PostgreSQL[^0-9]*\([0-9][0-9]*\.[0-9][0-9]*\)[^0-9].*/\1/p'
. endif
-. if defined(WANT_PGSQL_VER)
-. if ${WANT_PGSQL_VER:M*+}
+# Handle the + and - version stuff
+. if defined(pgsql_ARGS)
+. if ${pgsql_ARGS:M*+}
. for version in ${VALID_PGSQL_VER}
-. if ${WANT_PGSQL_VER:S/+//} <= ${version}
+. if ${pgsql_ARGS:S/+//} <= ${version}
_WANT_PGSQL_VER+=${version}
. endif
. endfor
-. elif ${WANT_PGSQL_VER:M*-}
+. elif ${pgsql_ARGS:M*-}
. for version in ${VALID_PGSQL_VER}
-. if ${WANT_PGSQL_VER:S/-//} >= ${version}
+. if ${pgsql_ARGS:S/-//} >= ${version}
_WANT_PGSQL_VER+=${version}
. endif
. endfor
. endif
-_WANT_PGSQL_VER?= ${WANT_PGSQL_VER}
+_WANT_PGSQL_VER?= ${pgsql_ARGS}
. endif
+# Try to match default version, otherwise just take the first version
+# that matches
. if !empty(_WANT_PGSQL_VER)
. for version in ${_WANT_PGSQL_VER}
-. if defined(WITH_PGSQL_VER)
-. if ${WITH_PGSQL_VER} == ${version}
-PGSQL_VER= ${WITH_PGSQL_VER}
-. endif
-. elif ${DEFAULT_PGSQL_VER} == ${version}
+. if ${PGSQL_DEFAULT} == ${version}
PGSQL_VER= ${version}
. endif
PGSQL_VER?= ${version}
. endfor
-. if defined(WITH_PGSQL_VER) && ${WITH_PGSQL_VER} != ${PGSQL_VER}
-IGNORE?= cannot install: the port wants postgresql-client version ${WANT_PGSQL_VER} and you have version ${WITH_PGSQL_VER} installed or set in make.conf
+. if defined(_PGSQL_VER) && ${_PGSQL_VER} != ${PGSQL_VER}
+IGNORE?= cannot install: the port wants postgresql-client version ${_WANT_PGSQL_VER} and you have version ${_PGSQL_VER} installed
. endif
. endif
-.if !empty(WITH_PGSQL_VER)
-PGSQL_VER?= ${WITH_PGSQL_VER}
-.else
-PGSQL_VER?= ${DEFAULT_PGSQL_VER}
-.endif
+# OK, so the port is ambivalent, we'll just take what's on the system.
+PGSQL_VER?= ${_PGSQL_VER}
+
+# After all that, we still have found nothing!
+. if empty(PGSQL_VER)
+PGSQL_VER= ${PGSQL_DEFAULT}
+. endif
# And now we are checking if we can use it
-.if defined(PGSQL${PGSQL_VER}_LIBVER)
-.if defined(IGNORE_WITH_PGSQL)
+. if defined(PGSQL${PGSQL_VER_NODOT}_LIBVER)
+# Compat. Please DO NOT use IGNORE_WITH_PGSQL!
+. if defined(IGNORE_WITH_PGSQL)
+DEV_WARNING+= "Do not set IGNORE_WITH_PGSQL, use the version argument to USES=pgsql"
. for ver in ${IGNORE_WITH_PGSQL}
. if (${PGSQL_VER} == ${ver})
-IGNORE?= cannot install: does not work with postgresql${PGSQL_VER}-client (PostgresSQL ${IGNORE_WITH_PGSQL} not supported)
+IGNORE?= cannot install: does not work with postgresql${PGSQL_VER}-client (PostgreSQL ${IGNORE_WITH_PGSQL} not supported)
. endif
. endfor
-.endif # IGNORE_WITH_PGSQL
+. endif # IGNORE_WITH_PGSQL
-LIB_DEPENDS+= pq.${PGSQL${PGSQL_VER}_LIBVER}:${PORTSDIR}/databases/postgresql${PGSQL_VER}-client
+LIB_DEPENDS+= pq.${PGSQL${PGSQL_VER_NODOT}_LIBVER}:${PORTSDIR}/databases/postgresql${PGSQL_VERS_NODOT}-client
-_USE_PGSQL_DEP= contrib docs pgtcl pltcl plperl server
+_USE_PGSQL_DEP= contrib docs pgtcl pltcl plperl server
_USE_PGSQL_DEP_contrib= pgbench
_USE_PGSQL_DEP_docs= postgresql${PGSQL_VER}-docs>0
_USE_PGSQL_DEP_pgtcl= ${LOCALBASE}/lib/pgtcl/pkgIndex.tcl
_USE_PGSQL_DEP_plperl= postgresql${PGSQL_VER}-plperl>0
_USE_PGSQL_DEP_pltcl= postgresql${PGSQL_VER}-pltcl>0
_USE_PGSQL_DEP_server= postgres
-. for depend in ${_USE_PGSQL_DEP}
-. if ${USE_PGSQL:M${depend}}
-BUILD_DEPENDS+= ${_USE_PGSQL_DEP_${depend}}:${PORTSDIR}/databases/postgresql${PGSQL_VER}-${depend}
-RUN_DEPENDS+= ${_USE_PGSQL_DEP_${depend}}:${PORTSDIR}/databases/postgresql${PGSQL_VER}-${depend}
-. elif ${USE_PGSQL:M${depend}\:*}
-BUILD_DEPENDS+= ${NONEXISTENT}:${PORTSDIR}/databases/postgresql${PGSQL_VER}-${depend}:${USE_PGSQL:M${depend}\:*:C,^[^:]*\:,,}
-. endif
-. endfor
+. for depend in ${_USE_PGSQL_DEP}
+. if ${WANT_PGSQL:M${depend}}
+BUILD_DEPENDS+= ${_USE_PGSQL_DEP_${depend}}:${PORTSDIR}/databases/postgresql${PGSQL_VER_NODOT}-${depend}
+RUN_DEPENDS+= ${_USE_PGSQL_DEP_${depend}}:${PORTSDIR}/databases/postgresql${PGSQL_VER_NODOT}-${depend}
+. elif ${WANT_PGSQL:M${depend}\:*}
+BUILD_DEPENDS+= ${NONEXISTENT}:${PORTSDIR}/databases/postgresql${PGSQL_VER_NODOT}-${depend}:${USE_PGSQL:M${depend}\:*:C,^[^:]*\:,,}
+. endif
+. endfor
-.else
+. else
IGNORE?= cannot install: unknown PostgreSQL version: ${PGSQL_VER}
-.endif # Check for correct version
+. endif # Check for correct version
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-.endif # USE_PGSQL
-
-.if defined(USE_BDB)
-
-_DB_PORTS= 40 41 42 43 44 46 47 48 5 6 40+ 41+ 42+ 43+ 44+ 46+ 47+ 48+ 5+ 6+
-# Dependence lines for different db versions
-db40_DEPENDS= libdb4.so:${PORTSDIR}/databases/db4
-db41_DEPENDS= libdb41.so:${PORTSDIR}/databases/db41
-db42_DEPENDS= libdb-4.2.so:${PORTSDIR}/databases/db42
-db43_DEPENDS= libdb-4.3.so:${PORTSDIR}/databases/db43
-db44_DEPENDS= libdb-4.4.so:${PORTSDIR}/databases/db44
-db46_DEPENDS= libdb-4.6.so:${PORTSDIR}/databases/db46
-db47_DEPENDS= libdb-4.7.so:${PORTSDIR}/databases/db47
-db48_DEPENDS= libdb-4.8.so:${PORTSDIR}/databases/db48
-db5_DEPENDS= libdb-5.3.so:${PORTSDIR}/databases/db5
-db6_DEPENDS= libdb-6.0.so:${PORTSDIR}/databases/db6
-# Detect db versions by finding some files
-db40_FIND= ${LOCALBASE}/include/db4/db.h
-db41_FIND= ${LOCALBASE}/include/db41/db.h
-db42_FIND= ${LOCALBASE}/include/db42/db.h
-db43_FIND= ${LOCALBASE}/include/db43/db.h
-db44_FIND= ${LOCALBASE}/include/db44/db.h
-db46_FIND= ${LOCALBASE}/include/db46/db.h
-db47_FIND= ${LOCALBASE}/include/db47/db.h
-db48_FIND= ${LOCALBASE}/include/db48/db.h
-db5_FIND= ${LOCALBASE}/include/db5/db.h
-db6_FIND= ${LOCALBASE}/include/db6/db.h
-
-# For specifying [40, 41, ..]+
-_DB_40P= 40 ${_DB_41P}
-_DB_41P= 41 ${_DB_42P}
-_DB_42P= 42 ${_DB_43P}
-_DB_43P= 43 ${_DB_44P}
-_DB_44P= 44 ${_DB_46P}
-_DB_46P= 46 ${_DB_47P}
-_DB_47P= 47 ${_DB_48P}
-_DB_48P= 48 ${_DB_5P}
-_DB_5P= 5 ${_DB_6P}
-_DB_6P= 6
-
-# Override the global WITH_BDB_VER with the
-# port specific <UNIQUENAME>_WITH_BDB_VER
-.if defined(${UNIQUENAME:U:S,-,_,}_WITH_BDB_VER)
-WITH_BDB_VER= ${${UNIQUENAME:U:S,-,_,}_WITH_BDB_VER}
-.endif
-
-.if defined(WITH_BDB_VER)
-. if ${WITH_BDB_VER} == 4
-USE_BDB= 40
-. elif ${WITH_BDB_VER} != 1
-USE_BDB= ${WITH_BDB_VER}
-. endif
-.endif
-_WANT_BDB_VER= ${USE_BDB}
-
-# Assume the default bdb version as 41
-.if ${USE_BDB:L} == "yes"
-_WANT_BDB_VER= 41+
-.endif
-
-# Detect bdb version
-_BDB_VER= no
-_BDB_IGNORE= no
-
-# Override the user defined WITH_BDB_VER with the WANT_BDB_VER
-.if defined(WANT_BDB_VER)
-.for bdb in ${_DB_PORTS}
-.if ${WANT_BDB_VER} == "${bdb}" && ${_BDB_VER} == "no"
-_BDB_VER= ${WANT_BDB_VER}
-.endif
-.endfor
-USE_BDB= ${WANT_BDB_VER}
-.else
-.for bdb in ${_DB_PORTS}
-.if ${_WANT_BDB_VER} == "${bdb}" && ${_BDB_VER} == "no"
-_MATCHED_DB_VER:= ${bdb:S/+//}
-. if ${_MATCHED_DB_VER} == "${bdb}"
-# USE_BDB is exactly specified
-_BDB_VER= ${bdb}
-.else
-# USE_BDB is specified as VER+
-. for dbx in ${_DB_${_MATCHED_DB_VER}P}
-. if exists(${db${dbx}_FIND})
-_BRKDB= no
-# Skip versions we are incompatible with
-. if defined(INVALID_BDB_VER)
-_CHK_BDB:= ${dbx}
-. for BRKDB in ${INVALID_BDB_VER}
-. if ${_CHK_BDB} == "${BRKDB}"
-_BRKDB= yes
-. endif
-. endfor
-. endif
-. if ${_BRKDB} == no
-. if defined(WITH_BDB_HIGHEST)
-# Use the highest version of Berkeley DB found
-_BDB_VER= ${dbx}
-. elif ${_BDB_VER} == no
-# Use the first Berkeley DB found
-_BDB_VER= ${dbx}
-. endif
-. endif
-. endif
-. endfor
-. if ${_BDB_VER} == "no"
-# No existing db4 version is detected in system
-_BDB_VER= ${_MATCHED_DB_VER}
-. endif
-. endif
-.endif
-.endfor
-.endif
-
-# USE_BDB is specified incorrectly, so mark this as IGNORE
-.if ${_BDB_VER} == "no"
-IGNORE= cannot install: unknown Berkeley DB version: ${USE_BDB}
-.else
-# Now check if we can use it
-. if defined(INVALID_BDB_VER)
-. for VER in ${INVALID_BDB_VER}
-_CHK_PLUS:= ${VER:S/+//}
-# INVALID_BDB_VER is specified as VER+
-. if ${_CHK_PLUS} != "${VER}"
-. if ${_BDB_VER} == "${_CHK_PLUS}"
-_BDB_IGNORE= yes
-. else
-. for VER_P in ${_DB_${_CHK_PLUS}P}
-. if ${_BDB_VER} == "${VER_P}"
-_BDB_IGNORE= yes
-. endif
-. endfor
-. endif
-. elif ${_BDB_VER} == "${VER}"
-_BDB_IGNORE= yes
-. endif
-. endfor
-. endif
-. if ${_BDB_IGNORE} == "yes"
-IGNORE= cannot install: does not work with Berkeley DB version ${_BDB_VER} (${INVALID_BDB_VER} not supported)
-. else
-# Now add the dependency on Berkeley DB ${_BDB_VER) version
-# This is for ports that want to link Berkeley DB statically, such
-# as devel/subversion, if the corresponding option is active:
-.if defined(BDB_BUILD_DEPENDS)
-BUILD_DEPENDS+= ${db${_BDB_VER}_FIND}:${db${_BDB_VER}_DEPENDS:C/^libdb.*://}
-.else
-LIB_DEPENDS+= ${db${_BDB_VER}_DEPENDS}
-.endif
-. if ${_BDB_VER} == 40
-BDB_LIB_NAME= db4
-BDB_LIB_CXX_NAME= db4_cxx
-BDB_INCLUDE_DIR= ${LOCALBASE}/include/db4
-. elif ${_BDB_VER} == 42
-BDB_LIB_NAME= db-4.2
-BDB_LIB_CXX_NAME= db_cxx-4.2
-BDB_LIB_DIR= ${LOCALBASE}/lib/db42
-. elif ${_BDB_VER} == 43
-BDB_LIB_NAME= db-4.3
-BDB_LIB_CXX_NAME= db_cxx-4.3
-BDB_LIB_DIR= ${LOCALBASE}/lib/db43
-. elif ${_BDB_VER} == 44
-BDB_LIB_NAME= db-4.4
-BDB_LIB_CXX_NAME= db_cxx-4.4
-BDB_LIB_DIR= ${LOCALBASE}/lib/db44
-. elif ${_BDB_VER} == 46
-BDB_LIB_NAME= db-4.6
-BDB_LIB_CXX_NAME= db_cxx-4.6
-BDB_LIB_DIR= ${LOCALBASE}/lib/db46
-. elif ${_BDB_VER} == 47
-BDB_LIB_NAME= db-4.7
-BDB_LIB_CXX_NAME= db_cxx-4.7
-BDB_LIB_DIR= ${LOCALBASE}/lib/db47
-. elif ${_BDB_VER} == 48
-BDB_LIB_NAME= db-4.8
-BDB_LIB_CXX_NAME= db_cxx-4.8
-BDB_LIB_DIR= ${LOCALBASE}/lib/db48
-. elif ${_BDB_VER} == 5
-BDB_LIB_NAME= db-5.3
-BDB_LIB_CXX_NAME= db_cxx-5.3
-BDB_LIB_DIR= ${LOCALBASE}/lib/db5
-. elif ${_BDB_VER} == 6
-BDB_LIB_NAME= db-6.0
-BDB_LIB_CXX_NAME= db_cxx-6.0
-BDB_LIB_DIR= ${LOCALBASE}/lib/db6
-. endif
-BDB_LIB_NAME?= db${_BDB_VER}
-BDB_LIB_CXX_NAME?= db${_BDB_VER}_cxx
-BDB_INCLUDE_DIR?= ${LOCALBASE}/include/db${_BDB_VER}
-BDB_LIB_DIR?= ${LOCALBASE}/lib
-. endif
-BDB_VER= ${_BDB_VER}
-.endif
-
-# Obsolete variables - ports can define these to want users about
-# variables that may be in /etc/make.conf but that are no longer
-# effective:
-.if defined(OBSOLETE_BDB_VAR)
-. for var in ${OBSOLETE_BDB_VAR}
-. if defined(${var})
-BAD_VAR+= ${var},
-. endif
-. endfor
-. if defined(BAD_VAR)
-_IGNORE_MSG= Obsolete variable(s) ${BAD_VAR} use WITH_BDB_VER or ${UNIQUENAME:U:S,-,_,}_WITH_BDB_VER to select Berkeley DB version
-. if defined(IGNORE)
-IGNORE+= ${_IGNORE_MSG}
-. else
-IGNORE= ${_IGNORE_MSG}
-. endif
-. endif
-.endif
-
-.endif # USE_BDB
-
-# Handling SQLite dependency
-.if defined(USE_SQLITE)
-
-.if ${USE_SQLITE:L} == "yes"
-_SQLITE_VER= 3
-.else
-_SQLITE_VER= ${USE_SQLITE}
-.endif
-
-# USE_SQLITE is specified incorrectly, so mark this as IGNORE
-.if ${_SQLITE_VER} == "3"
-LIB_DEPENDS+= libsqlite3.so:${PORTSDIR}/databases/sqlite${_SQLITE_VER}
-SQLITE_VER= ${_SQLITE_VER}
-.elif ${_SQLITE_VER} == "2"
-LIB_DEPENDS+= libsqlite.so:${PORTSDIR}/databases/sqlite${_SQLITE_VER}
-SQLITE_VER= ${_SQLITE_VER}
-.else
-IGNORE= cannot install: unknown SQLite version: ${_SQLITE_VER}
-.endif
-
-.endif # defined(USE_SQLITE)
-
-.if defined(USE_FIREBIRD)
-
-.if defined(WITH_FIREBIRD_VER)
-USE_FIREBIRD= ${WITH_FIREBIRD_VER}
-.endif
-
-.if ${USE_FIREBIRD:L} == "yes"
-FIREBIRD_VER= 25
-.else
-FIREBIRD_VER= ${USE_FIREBIRD}
-.endif
-
-.if ${FIREBIRD_VER} == "2"
-LIB_DEPENDS+= fbclient.2:${PORTSDIR}/databases/firebird20-client
-.elif ${FIREBIRD_VER} == "20"
-LIB_DEPENDS+= fbclient.2:${PORTSDIR}/databases/firebird20-client
-.elif ${FIREBIRD_VER} == "21"
-LIB_DEPENDS+= fbclient.2:${PORTSDIR}/databases/firebird21-client
-.elif ${FIREBIRD_VER} == "25"
-LIB_DEPENDS+= fbclient.2:${PORTSDIR}/databases/firebird25-client
-.else
-IGNORE= cannot install: unknown Firebird version: ${FIREBIRD_VER}
-.endif
-
-.endif # defined(USE_FIREBIRD)
-.endif # defined(_POSTMKINCLUDED) && !defined(Database_Post_Include)
+.endif # !defined(_INCLUDE_USES_PGSQL_MK)
Modified: head/Mk/bsd.database.mk
==============================================================================
--- head/Mk/bsd.database.mk Sun Jan 12 21:16:05 2014 (r339549)
+++ head/Mk/bsd.database.mk Sun Jan 12 21:16:06 2014 (r339550)
@@ -35,24 +35,6 @@ Database_Include_MAINTAINER= ports at FreeB
# MYSQL_VER
# - Detected MySQL version.
##
-# USE_PGSQL - Add PostgreSQL client dependency. Components can be depended
-# on using USE_PGSQL= component[:target]. For the full list
-# use make -V _USE_PGSQL_DEP
-# If no version is given (by the maintainer via the port or
-# by the user via defined variable), try to find the
-# currently installed version. Fall back to default if
-# necessary (PostgreSQL-9.0 = 90).
-# DEFAULT_PGSQL_VER
-# - PostgreSQL default version, currently 90.
-# WANT_PGSQL_VER
-# - Maintainer can set an arbitrary version of PostgreSQL to
-# always build this port with (overrides WITH_PGSQL_VER).
-# Minimum and maximum versions can be set (e.g. 90+)
-# WITH_PGSQL_VER
-# - User defined variable to set PostgreSQL version.
-# PGSQL_VER
-# - Detected PostgreSQL version.
-##
# USE_BDB - Add Berkeley DB library dependency.
# If no version is given (by the maintainer via the port or
# by the user via defined variable), try to find the
@@ -189,96 +171,23 @@ IGNORE= cannot install: unknown MySQL v
.endif # USE_MYSQL
.if defined(USE_PGSQL)
-VALID_PGSQL_VER= 84 90 91 92 93
-DEFAULT_PGSQL_VER?= 90
-PGSQL83_LIBVER= 5
-PGSQL84_LIBVER= 5
-PGSQL90_LIBVER= 5
-PGSQL91_LIBVER= 5
-PGSQL92_LIBVER= 5
-PGSQL93_LIBVER= 5
-
-# Setting/finding PostgreSQL version we want.
-. if exists(${LOCALBASE}/bin/pg_config)
-_PGSQL_VER!= ${LOCALBASE}/bin/pg_config --version | ${SED} -n 's/PostgreSQL[^0-9]*\([0-9][0-9]*\)\.\([0-9][0-9]*\)[^0-9].*/\1\2/p'
-WITH_PGSQL_VER?= ${_PGSQL_VER}
-. if ${WITH_PGSQL_VER} != ${_PGSQL_VER}
-IGNORE?= cannot install: you have set WITH_PGSQL_VER=${WITH_PGSQL_VER} in make.conf, but you have postgresql${_PGSQL_VER}-client installed
-. endif
-. endif
-
-. if defined(WANT_PGSQL_VER)
-. if ${WANT_PGSQL_VER:M*+}
-. for version in ${VALID_PGSQL_VER}
-. if ${WANT_PGSQL_VER:S/+//} <= ${version}
-_WANT_PGSQL_VER+=${version}
-. endif
-. endfor
-. elif ${WANT_PGSQL_VER:M*-}
-. for version in ${VALID_PGSQL_VER}
-. if ${WANT_PGSQL_VER:S/-//} >= ${version}
-_WANT_PGSQL_VER+=${version}
-. endif
-. endfor
-. endif
-_WANT_PGSQL_VER?= ${WANT_PGSQL_VER}
-. endif
-
-. if !empty(_WANT_PGSQL_VER)
-. for version in ${_WANT_PGSQL_VER}
-. if defined(WITH_PGSQL_VER)
-. if ${WITH_PGSQL_VER} == ${version}
-PGSQL_VER= ${WITH_PGSQL_VER}
-. endif
-. elif ${DEFAULT_PGSQL_VER} == ${version}
-PGSQL_VER= ${version}
-. endif
-PGSQL_VER?= ${version}
-. endfor
-. if defined(WITH_PGSQL_VER) && ${WITH_PGSQL_VER} != ${PGSQL_VER}
-IGNORE?= cannot install: the port wants postgresql-client version ${WANT_PGSQL_VER} and you have version ${WITH_PGSQL_VER} installed or set in make.conf
-. endif
-. endif
-
-.if !empty(WITH_PGSQL_VER)
-PGSQL_VER?= ${WITH_PGSQL_VER}
+.ifdef WANT_PGSQL_VER
+_USES_POST+= pgsql:${WANT_PGSQL_VER:C,^.,&.,}
+_pgsql_devwarning= USE_PGSQL is deprecated, please use USES=pgsql:${WANT_PGSQL_VER:C,^.,&.,}
.else
-PGSQL_VER?= ${DEFAULT_PGSQL_VER}
+_USES_POST+= pgsql
+_pgsql_devwarning= USE_PGSQL is deprecated, please use USES=pgsql
.endif
+.for dep in contrib docs pgtcl pltcl plperl server
+WANT_PGSQL+= ${USE_PGSQL:M$dep}
+.endfor
-# And now we are checking if we can use it
-.if defined(PGSQL${PGSQL_VER}_LIBVER)
-.if defined(IGNORE_WITH_PGSQL)
-. for ver in ${IGNORE_WITH_PGSQL}
-. if (${PGSQL_VER} == ${ver})
-IGNORE?= cannot install: does not work with postgresql${PGSQL_VER}-client (PostgresSQL ${IGNORE_WITH_PGSQL} not supported)
-. endif
-. endfor
-.endif # IGNORE_WITH_PGSQL
-
-LIB_DEPENDS+= pq.${PGSQL${PGSQL_VER}_LIBVER}:${PORTSDIR}/databases/postgresql${PGSQL_VER}-client
-
-_USE_PGSQL_DEP= contrib docs pgtcl pltcl plperl server
-_USE_PGSQL_DEP_contrib= pgbench
-_USE_PGSQL_DEP_docs= postgresql${PGSQL_VER}-docs>0
-_USE_PGSQL_DEP_pgtcl= ${LOCALBASE}/lib/pgtcl/pkgIndex.tcl
-_USE_PGSQL_DEP_plperl= postgresql${PGSQL_VER}-plperl>0
-_USE_PGSQL_DEP_pltcl= postgresql${PGSQL_VER}-pltcl>0
-_USE_PGSQL_DEP_server= postgres
-. for depend in ${_USE_PGSQL_DEP}
-. if ${USE_PGSQL:M${depend}}
-BUILD_DEPENDS+= ${_USE_PGSQL_DEP_${depend}}:${PORTSDIR}/databases/postgresql${PGSQL_VER}-${depend}
-RUN_DEPENDS+= ${_USE_PGSQL_DEP_${depend}}:${PORTSDIR}/databases/postgresql${PGSQL_VER}-${depend}
-. elif ${USE_PGSQL:M${depend}\:*}
-BUILD_DEPENDS+= ${NONEXISTENT}:${PORTSDIR}/databases/postgresql${PGSQL_VER}-${depend}:${USE_PGSQL:M${depend}\:*:C,^[^:]*\:,,}
-. endif
-. endfor
-
+.if !empty(WANT_PGSQL)
+DEV_WARNING+= "${_pgsql_devwarning} and WANT_PGSQL=${WANT_PGSQL}"
.else
-IGNORE?= cannot install: unknown PostgreSQL version: ${PGSQL_VER}
-.endif # Check for correct version
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
+DEV_WARNING+= "${_pgsql_devwarning}"
+.endif
+
.endif # USE_PGSQL
.if defined(USE_BDB)
Modified: head/Mk/bsd.default-versions.mk
==============================================================================
--- head/Mk/bsd.default-versions.mk Sun Jan 12 21:16:05 2014 (r339549)
+++ head/Mk/bsd.default-versions.mk Sun Jan 12 21:16:06 2014 (r339550)
@@ -17,12 +17,13 @@ _l= ${lang:C/=.*//g}
${_l:U}_DEFAULT= ${lang:C/.*=//g}
.endfor
+LUA_DEFAULT?= 5.2
PERL5_DEFAULT?= 5.16
-RUBY_DEFAULT?= 1.9
-TCLTK_DEFAULT?= 8.6
+PGSQL_DEFAULT?= 9.0
PYTHON_DEFAULT?= 2.7
PYTHON2_DEFAULT?= 2.7
PYTHON3_DEFAULT?= 3.3
-LUA_DEFAULT?= 5.2
+RUBY_DEFAULT?= 1.9
+TCLTK_DEFAULT?= 8.6
.endif
More information about the svn-ports-all
mailing list