diff options
| author | linimon <linimon@FreeBSD.org> | 2005-11-10 08:29:46 +0800 |
|---|---|---|
| committer | linimon <linimon@FreeBSD.org> | 2005-11-10 08:29:46 +0800 |
| commit | 603f36368a0f7f9a13cee2fb94c4092f0ab0c7a2 (patch) | |
| tree | 0df82fd567bb8a74b5c3c3c10d1cac0553cf57a7 | |
| parent | 3dfaf386e6a3238c4f33b78b058a091a83f28221 (diff) | |
| download | freebsd-ports-gnome-603f36368a0f7f9a13cee2fb94c4092f0ab0c7a2.tar.gz freebsd-ports-gnome-603f36368a0f7f9a13cee2fb94c4092f0ab0c7a2.tar.zst freebsd-ports-gnome-603f36368a0f7f9a13cee2fb94c4092f0ab0c7a2.zip | |
Fix mis-merge from latest round of changes. Fixes 'make describe' in misc/.
| -rw-r--r-- | devel/portmk/Mk/bsd.database.mk | 1 | ||||
| -rw-r--r-- | ports-mgmt/portmk/Mk/bsd.database.mk | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/devel/portmk/Mk/bsd.database.mk b/devel/portmk/Mk/bsd.database.mk index 067519f389dd..02b07bd0c291 100644 --- a/devel/portmk/Mk/bsd.database.mk +++ b/devel/portmk/Mk/bsd.database.mk @@ -117,7 +117,6 @@ PGSQL81_LIBVER= 4 .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' .endif -.endif .if defined(WANT_PGSQL_VER) && defined(_PGSQL_VER) && ${WANT_PGSQL_VER} != ${_PGSQL_VER} BROKEN= the port wants postgresql${WANT_PGSQL_VER}-client but you have postgresql${_PGSQL_VER}-client installed diff --git a/ports-mgmt/portmk/Mk/bsd.database.mk b/ports-mgmt/portmk/Mk/bsd.database.mk index 067519f389dd..02b07bd0c291 100644 --- a/ports-mgmt/portmk/Mk/bsd.database.mk +++ b/ports-mgmt/portmk/Mk/bsd.database.mk @@ -117,7 +117,6 @@ PGSQL81_LIBVER= 4 .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' .endif -.endif .if defined(WANT_PGSQL_VER) && defined(_PGSQL_VER) && ${WANT_PGSQL_VER} != ${_PGSQL_VER} BROKEN= the port wants postgresql${WANT_PGSQL_VER}-client but you have postgresql${_PGSQL_VER}-client installed |