diff options
| author | Palle Girgensohn <girgen@FreeBSD.org> | 2006-12-08 10:59:53 +0000 |
|---|---|---|
| committer | Palle Girgensohn <girgen@FreeBSD.org> | 2006-12-08 10:59:53 +0000 |
| commit | 924cdc8b1f197ae45978d87f838a86997e5e6cd5 (patch) | |
| tree | dff3b72bfb96d7ed4db12fb2b21b639de422d811 | |
| parent | More rubust regex to determine which version of postgresql that is (diff) | |
More rubust regex to determine which version of postgresql that is
already installed.
Reported by: Kostik Belousov
Notes
Notes:
svn path=/head/; revision=179173
| -rw-r--r-- | databases/p5-DBD-PgSPI/Makefile | 2 | ||||
| -rw-r--r-- | databases/postgresql-plruby/Makefile | 2 | ||||
| -rw-r--r-- | databases/slony1/Makefile | 2 | ||||
| -rw-r--r-- | databases/slony1v2/Makefile | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/databases/p5-DBD-PgSPI/Makefile b/databases/p5-DBD-PgSPI/Makefile index 5e6ed4622cbf..c5743c856d29 100644 --- a/databases/p5-DBD-PgSPI/Makefile +++ b/databases/p5-DBD-PgSPI/Makefile @@ -38,7 +38,7 @@ PGSQL_WRKSRC_CMD= cd ${PGSQL_PORTDIR} && ${MAKE} -V WRKSRC # Setting/finding PostgreSQL version we want. .if exists(${LOCALBASE}/bin/postmaster) PGSQL_VER!= ${LOCALBASE}/bin/postmaster -V | \ - ${SED} -n 's/postmaster.*PostgreSQL[^0-9]*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*/\1\2/p' + ${SED} -n 's/.*PostgreSQL[^0-9]*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*/\1\2/p' .elif 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]*\)\..*/\1\2/p' .else diff --git a/databases/postgresql-plruby/Makefile b/databases/postgresql-plruby/Makefile index 87ad5183b52d..1d77059ab7df 100644 --- a/databases/postgresql-plruby/Makefile +++ b/databases/postgresql-plruby/Makefile @@ -61,7 +61,7 @@ post-build: # Setting/finding PostgreSQL version we want. .if exists(${LOCALBASE}/bin/postmaster) PGSQL_VER!= ${LOCALBASE}/bin/postmaster -V | \ - ${SED} -n 's/postmaster.*PostgreSQL[^0-9]*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*/\1\2/p' + ${SED} -n 's/.*PostgreSQL[^0-9]*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*/\1\2/p' .elif 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]*\)\..*/\1\2/p' .else diff --git a/databases/slony1/Makefile b/databases/slony1/Makefile index 12aa6c55971f..ceede4ac2e61 100644 --- a/databases/slony1/Makefile +++ b/databases/slony1/Makefile @@ -59,7 +59,7 @@ DEFAULT_PGSQL_VER?=80 # Setting/finding PostgreSQL version we want. .if exists(${LOCALBASE}/bin/postmaster) PGSQL_VER!= ${LOCALBASE}/bin/postmaster -V | \ - ${SED} -En 's/postmaster.*PostgreSQL[^0-9]*([0-9]+)\.([0-9]+)\..*/\1\2/p' + ${SED} -En 's/.*PostgreSQL[^0-9]*([0-9]+)\.([0-9]+)\..*/\1\2/p' .elif exists(${LOCALBASE}/bin/pg_config) PGSQL_VER!= ${LOCALBASE}/bin/pg_config --version | \ ${SED} -En 's/PostgreSQL[^0-9]*([0-9]*)\.([0-9]+)\..*/\1\2/p' diff --git a/databases/slony1v2/Makefile b/databases/slony1v2/Makefile index 12aa6c55971f..ceede4ac2e61 100644 --- a/databases/slony1v2/Makefile +++ b/databases/slony1v2/Makefile @@ -59,7 +59,7 @@ DEFAULT_PGSQL_VER?=80 # Setting/finding PostgreSQL version we want. .if exists(${LOCALBASE}/bin/postmaster) PGSQL_VER!= ${LOCALBASE}/bin/postmaster -V | \ - ${SED} -En 's/postmaster.*PostgreSQL[^0-9]*([0-9]+)\.([0-9]+)\..*/\1\2/p' + ${SED} -En 's/.*PostgreSQL[^0-9]*([0-9]+)\.([0-9]+)\..*/\1\2/p' .elif exists(${LOCALBASE}/bin/pg_config) PGSQL_VER!= ${LOCALBASE}/bin/pg_config --version | \ ${SED} -En 's/PostgreSQL[^0-9]*([0-9]*)\.([0-9]+)\..*/\1\2/p' |