Index: head/Mk/Uses/pgsql.mk =================================================================== --- head/Mk/Uses/pgsql.mk (revision 490430) +++ head/Mk/Uses/pgsql.mk (revision 490431) @@ -1,161 +1,180 @@ # $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+ +# version Maintainer can set versions required. You can set this to +# [min]-[max] or min+ or -max or as an explicit version +# (eg. 9.3-9.6 for [min]-[max], 9.5+ or 9.6- +# for min+ and max-, 9.4 for an explicit version). Example: # +# USES=pgsql:9.4 # Only use PostgreSQL 9.4 +# USES=pgsql:9.3+ # Use PostgreSQL 9.3 or newer +# USES=pgsql:9.3-9.6 # Use PostgreSQL between 9.3 & 9.6 +# USES=pgsql:9.6- # Use any PostgreSQL up to 9.6 +# USES=pgsql # Use the default PostgreSQL +# # WANT_PGSQL= server[:fetch] plperl plpython pltcl # # 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.4 9.5 9.6 10 11 # 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.6 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]\).*/\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 +. elif ${pgsql_ARGS:M*-*} +_MIN=${pgsql_ARGS:M?*-?*:C,-.*,,} +_MAX=${pgsql_ARGS:M?*-?*:C,.*-,,} +. if ${_MIN} > ${_MAX} +IGNORE= The minimum version must be higher than the maximum version wanted +. endif +. for version in ${VALID_PGSQL_VER} +. if ${_MIN} <= ${version} && ${_MAX} >= ${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 plperl plpython pltcl 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_plpython=postgresql${PGSQL_VER_NODOT}-plpython>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)