summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPalle Girgensohn <girgen@FreeBSD.org>2006-12-08 10:45:33 +0000
committerPalle Girgensohn <girgen@FreeBSD.org>2006-12-08 10:45:33 +0000
commit71381fc9b28134dfc11f71b39a984e5da3c34a03 (patch)
tree5801b0ce383707c3ebc3462495f8bdbb7ee68055
parentMore 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 PR: 106471
Notes
Notes: svn path=/head/; revision=179172
-rw-r--r--databases/erserver/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/databases/erserver/Makefile b/databases/erserver/Makefile
index 4e9cf8931773..4ca210b1820f 100644
--- a/databases/erserver/Makefile
+++ b/databases/erserver/Makefile
@@ -41,7 +41,7 @@ DEFAULT_PGSQL_VER?=74
# 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