Index: head/Mk/Uses/pgsql.mk =================================================================== --- head/Mk/Uses/pgsql.mk (revision 423216) +++ head/Mk/Uses/pgsql.mk (revision 423217) @@ -1,160 +1,160 @@ # $FreeBSD$ # # Provide support for PostgreSQL (pgsql) # # Feature: pgsql # Usage: USES= pgsql[:version] # # Maintainer can set version required. Minimum and maximum # versions can be specified; e.g. 9.0-, 9.2+ # # 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. # # MAINTAINER: pgsql@FreeBSD.org .if !defined(_INCLUDE_USES_PGSQL_MK) _INCLUDE_USES_PGSQL_MK= yes # Variables set by pgsql.mk: # # PGSQL_VER # Detected PostgreSQL version. Do *not* use this # to add dependencies; use WANT_PGSQL as explained above # # When adding a version, please keep the comment in # Mk/bsd.default-versions.mk in sync. -VALID_PGSQL_VER= 9.1 9.2 9.3 9.4 9.5 9.6 +VALID_PGSQL_VER= 9.2 9.3 9.4 9.5 9.6 # 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 .for v in ${PGSQL_DEFAULT} . if ! ${VALID_PGSQL_VER:M$v} IGNORE= Invalid PGSQL default version ${PGSQL_DEFAULT}; valid versions are ${VALID_PGSQL_VER} . endif .endfor . 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. 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 # Handle the + and - version stuff . if !empty(pgsql_ARGS) . if ${pgsql_ARGS:M*+} . for version in ${VALID_PGSQL_VER} . if ${pgsql_ARGS:S/+//} <= ${version} _WANT_PGSQL_VER+=${version} . endif . endfor . elif ${pgsql_ARGS:M*-} . for version in ${VALID_PGSQL_VER} . if ${pgsql_ARGS:S/-//} >= ${version} _WANT_PGSQL_VER+=${version} . endif . endfor . endif _WANT_PGSQL_VER?= ${pgsql_ARGS} . endif # Try to match default version, otherwise just take the first version # that matches. Prefer the installed version if it matches . if !empty(_WANT_PGSQL_VER) . for version in ${_WANT_PGSQL_VER} . if ${PGSQL_DEFAULT} == ${version} PGSQL_VER= ${version} . endif PGSQL_VER?= ${version} . endfor . if defined(_PGSQL_VER) . for v in ${_PGSQL_VER} . if ${_WANT_PGSQL_VER:M$v} == ${_PGSQL_VER} PGSQL_VER= ${_PGSQL_VER} . endif . endfor . endif . 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 # 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 # We don't want to be :S,.,, the whole time when doing port version checks PGSQL_VER_NODOT= ${PGSQL_VER:S,.,,} # And now we are checking if we can use it . 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_NODOT}-client (PostgreSQL ${IGNORE_WITH_PGSQL} not supported) . endif . endfor . endif # IGNORE_WITH_PGSQL .if !defined(WANT_PGSQL) || ${WANT_PGSQL:Mlib} LIB_DEPENDS+= libpq.so.${PGSQL${PGSQL_VER_NODOT}_LIBVER}:databases/postgresql${PGSQL_VER_NODOT}-client .endif _USE_PGSQL_DEP= client contrib docs pgtcl pltcl plperl server _USE_PGSQL_DEP_client= psql _USE_PGSQL_DEP_contrib= vacuumlo _USE_PGSQL_DEP_docs= postgresql${PGSQL_VER_NODOT}-docs>0 _USE_PGSQL_DEP_pgtcl= ${LOCALBASE}/lib/pgtcl/pkgIndex.tcl _USE_PGSQL_DEP_plperl= postgresql${PGSQL_VER_NODOT}-plperl>0 _USE_PGSQL_DEP_pltcl= postgresql${PGSQL_VER_NODOT}-pltcl>0 _USE_PGSQL_DEP_server= postgres . if defined(WANT_PGSQL) . for depend in ${_USE_PGSQL_DEP} . if ${WANT_PGSQL:M${depend}} BUILD_DEPENDS+= ${_USE_PGSQL_DEP_${depend}}:databases/postgresql${PGSQL_VER_NODOT}-${depend} RUN_DEPENDS+= ${_USE_PGSQL_DEP_${depend}}:databases/postgresql${PGSQL_VER_NODOT}-${depend} . elif ${WANT_PGSQL:M${depend}\:*} BUILD_DEPENDS+= ${NONEXISTENT}:databases/postgresql${PGSQL_VER_NODOT}-${depend}:${WANT_PGSQL:M${depend}\:*:C,^[^:]*\:,,} . endif . endfor . endif . else IGNORE?= cannot install: unknown PostgreSQL version: ${PGSQL_VER} . endif # Check for correct version CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib .endif # !defined(_INCLUDE_USES_PGSQL_MK) Index: head/Mk/bsd.default-versions.mk =================================================================== --- head/Mk/bsd.default-versions.mk (revision 423216) +++ head/Mk/bsd.default-versions.mk (revision 423217) @@ -1,127 +1,127 @@ # $FreeBSD$ # # MAINTAINER: ports@FreeBSD.org # # Provide default versions for ports with multiple versions selectable # by the user. # # Users who want to override these defaults can easily do so by defining # DEFAULT_VERSIONS in their make.conf as follows: # # DEFAULT_VERSIONS= perl5=5.18 ruby=2.0 .if !defined(_INCLUDE_BSD_DEFAULT_VERSIONS_MK) _INCLUDE_BSD_DEFAULT_VERSIONS_MK= yes LOCALBASE?= /usr/local .for lang in ${DEFAULT_VERSIONS} _l= ${lang:C/=.*//g} ${_l:tu}_DEFAULT= ${lang:C/.*=//g} .endfor # Possible values: 2.2, 2.4 APACHE_DEFAULT?= 2.4 # Possible values: 48, 5, 6 BDB_DEFAULT?= 5 # Possible values: 2.5 FIREBIRD_DEFAULT?= 2.5 # Possible values: 3.0.0 FPC_DEFAULT?= 3.0.0 # Possible values: 4.6, 4.7, 4.8, 4.9, 5 GCC_DEFAULT?= 4.8 # Possible values: 7, 8, 9, agpl GHOSTSCRIPT_DEFAULT?= agpl # Possible values: f10, c6, c6_64, c7, c7_64 LINUX_DEFAULT?= c6 .if defined(OVERRIDE_LINUX_BASE_PORT) LINUX_DEFAULT:= ${OVERRIDE_LINUX_BASE_PORT} WARNING+= "OVERRIDE_LINUX_BASE_PORT is deprecated, please use DEFAULT_VERSIONS+=linux=${OVERRIDE_LINUX_BASE_PORT}." .endif # Possible values: 5.1, 5.2, 5.3 LUA_DEFAULT?= 5.2 # Possible values: 5.1, 5.5, 5.6, 5.7, 5.5m, 10.0m, 10.1m, 5.5p, 5.6p MYSQL_DEFAULT?= 5.6 # Possible values: 5.18, 5.20, 5.22, devel .if !exists(${LOCALBASE}/bin/perl) || (!defined(_PORTS_ENV_CHECK) && \ defined(PACKAGE_BUILDING)) PERL5_DEFAULT?= 5.20 .elif !defined(PERL5_DEFAULT) # There's no need to replace development versions, like "5.23" with "devel" # because 1) nobody is supposed to use it outside of poudriere, and 2) it must # be set manually in /etc/make.conf in the first place, and we're never getting # in here. .if !defined(_PERL5_FROM_BIN) _PERL5_FROM_BIN!= perl -e 'printf "%vd\n", $$^V;' .endif _EXPORTED_VARS+= _PERL5_FROM_BIN PERL5_DEFAULT:= ${_PERL5_FROM_BIN:R} .endif -# Possible values: 9.1, 9.2, 9.3, 9.4, 9.5 +# Possible values: 9.2, 9.3, 9.4, 9.5, 9.6 PGSQL_DEFAULT?= 9.3 # Possible values: 5.5, 5.6, 7.0 PHP_DEFAULT?= 5.6 # Possible values: 2.7, 3.3, 3.4, 3.5 PYTHON_DEFAULT?= 2.7 # Possible values: 2.7 PYTHON2_DEFAULT?= 2.7 # Possible values: 3.3, 3.4, 3.5 PYTHON3_DEFAULT?= 3.4 # Possible values: 2.0, 2.1, 2.2, 2.3 RUBY_DEFAULT?= 2.2 # Possible values: base, openssl, openssl-devel, libressl, libressl-devel .if !defined(SSL_DEFAULT) # If no preference was set, check for an installed base version # but give an installed port preference over it. . if defined(WITH_OPENSSL_PORT) . if defined(OPENSSL_PORT) SSL_DEFAULT:=${OPENSSL_PORT:T} WARNING+= "Using WITH_OPENSSL_PORT and OPENSSL_PORT in make.conf is deprecated, replace them with DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT} in your make.conf" . else SSL_DEFAULT=openssl WARNING+= "Using WITH_OPENSSL_PORT in make.conf is deprecated, replace it with DEFAULT_VERSIONS+=ssl=openssl in your make.conf" . endif . elif defined(WITH_OPENSSL_BASE) SSL_DEFAULT=base WARNING+= "Using WITH_OPENSSL_BASE in make.conf is deprecated, replace it with DEFAULT_VERSIONS+=ssl=base in your make.conf" . elif !defined(WITH_OPENSSL_BASE) && \ !defined(WITH_OPENSSL_PORT) && \ !defined(SSL_DEFAULT) && \ !exists(${DESTDIR}/${LOCALBASE}/lib/libcrypto.so) && \ exists(${DESTDIR}/usr/include/openssl/opensslv.h) SSL_DEFAULT= base . else . if exists(${DESTDIR}/${LOCALBASE}/lib/libcrypto.so) . if defined(PKG_BIN) # find installed port and use it for dependency . if !defined(OPENSSL_INSTALLED) . if defined(DESTDIR) PKGARGS= -c ${DESTDIR} . else PKGARGS= . endif OPENSSL_INSTALLED!= ${PKG_BIN} ${PKGARGS} which -qo ${LOCALBASE}/lib/libcrypto.so || : . endif . if defined(OPENSSL_INSTALLED) && !empty(OPENSSL_INSTALLED) SSL_DEFAULT:= ${OPENSSL_INSTALLED:T} WARNING+= "You have ${OPENSSL_INSTALLED} installed but do not have DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT} set in your make.conf" . endif . else check-makevars:: @${ECHO_MSG} "You have a ${LOCALBASE}/lib/libcrypto.so file installed, but the framework is unable" @${ECHO_MSG} "to determine what port it comes from." @${ECHO_MSG} "Add DEFAULT_VERSIONS+=ssl= to your /etc/make.conf and try again." @${FALSE} . endif . endif . endif # Make sure we have a default in the end SSL_DEFAULT?= base .endif # Possible values: 8.4, 8.5, 8.6 TCLTK_DEFAULT?= 8.6 # Version of lang/gcc. Do not override! LANG_GCC_IS= 4.8 .endif