Index: Mk/bsd.port.mk
===================================================================
RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.511
diff -u -r1.511 bsd.port.mk
--- Mk/bsd.port.mk	17 Mar 2005 23:22:07 -0000	1.511
+++ Mk/bsd.port.mk	3 Jun 2005 19:13:13 -0000
@@ -1713,6 +1713,9 @@
 
 .if defined(USE_PGSQL)
 DEFAULT_PGSQL_VER?=	74
+PGSQL73_LIBVER=		3
+PGSQL74_LIBVER=		3
+PGSQL80_LIBVER=		4
 
 # Setting/finding PostgreSQL version we want.
 .if exists(${LOCALBASE}/bin/pg_config)
@@ -1732,7 +1735,7 @@
 .endif
 
 # And now we are checking if we can use it
-.if exists(${PORTSDIR}/databases/postgresql${PGSQL_VER}-client)
+.if defined(PGSQL${PGSQL_VER}_LIBVER)
 .if defined(BROKEN_WITH_PGSQL)
 .	for VER in ${BROKEN_WITH_PGSQL}
 .		if (${PGSQL_VER} == "${VER}")
@@ -1740,7 +1743,7 @@
 .		endif
 .	endfor
 .endif # BROKEN_WITH_PGSQL
-LIB_DEPENDS+=	pq:${PORTSDIR}/databases/postgresql${PGSQL_VER}-client
+LIB_DEPENDS+=	pq.${PGSQL${PGSQL_VER}_LIBVER}:${PORTSDIR}/databases/postgresql${PGSQL_VER}-client
 .else
 BROKEN=		"unknown PostgreSQL version: ${PGSQL_VER}"
 .endif # Check for correct version