Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/pkgsrc/mk/pgsql.buildlink3.mk,v
rcsdiff: /ftp/cvs/cvsroot/pkgsrc/mk/pgsql.buildlink3.mk,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.2
retrieving revision 1.16
diff -u -p -r1.2 -r1.16
--- pkgsrc/mk/pgsql.buildlink3.mk	2004/07/24 10:40:15	1.2
+++ pkgsrc/mk/pgsql.buildlink3.mk	2006/06/06 19:43:43	1.16
@@ -1,25 +1,49 @@
-# $NetBSD: pgsql.buildlink3.mk,v 1.2 2004/07/24 10:40:15 recht Exp $
+# $NetBSD: pgsql.buildlink3.mk,v 1.16 2006/06/06 19:43:43 joerg Exp $
 
 .if !defined(PGVERSION_MK)
 PGVERSION_MK=	defined
 
 .include "../../mk/bsd.prefs.mk"
 
-PGSQL_VERSION_DEFAULT?=		74
-PGSQL_VERSIONS_ACCEPTED?=	74 73
+PGSQL_VERSION_DEFAULT?=		80
+PGSQL_VERSIONS_ACCEPTED?=	81 80 74
 
 # transform the list into individual variables
 .for pv in ${PGSQL_VERSIONS_ACCEPTED}
 _PGSQL_VERSION_${pv}_OK=	yes
 .endfor
 
+.if ${_OPSYS_SHLIB_TYPE} == "dylib"
+PG_LIB_EXT=dylib
+.else
+PG_LIB_EXT=so
+.endif
+
 # check what is installed
-.if exists(${LOCALBASE}/lib/libecpg.so.4)
+.if ${OPSYS} == "Darwin"
+.if exists(${LOCALBASE}/lib/libecpg.5.0.dylib)
+_PGSQL_VERSION_80_INSTALLED=	yes
+.endif
+.if exists(${LOCALBASE}/lib/libecpg.4.1.dylib)
+_PGSQL_VERSION_74_INSTALLED=	yes
+.endif
+.if exists(${LOCALBASE}/lib/libecpg.3.dylib)
+_PGSQL_VERSION_73_INSTALLED=yes
+.endif
+.else
+.if exists(${LOCALBASE}/lib/libecpg.so.5.0.1)
+_PGSQL_VERSION_81_INSTALLED=	yes
+.endif
+.if exists(${LOCALBASE}/lib/libecpg.so.5.0.0)
+_PGSQL_VERSION_80_INSTALLED=	yes
+.endif
+.if exists(${LOCALBASE}/lib/libecpg.so.4.1)
 _PGSQL_VERSION_74_INSTALLED=	yes
 .endif
 .if exists(${LOCALBASE}/lib/libecpg.so.3)
 _PGSQL_VERSION_73_INSTALLED=yes
 .endif
+.endif
 
 # if a version is explicitely required, take it
 .if defined(PGSQL_VERSION_REQD)
@@ -58,18 +82,24 @@ _PGSQL_VERSION=	${_PGSQL_VERSION_FIRSTAC
 #
 # set variables for the version we decided to use:
 #
-.if ${_PGSQL_VERSION} == "74"
+.if ${_PGSQL_VERSION} == "81"
+PGSQL_TYPE=	postgresql81-client
+PGPKGSRCDIR=	../../databases/postgresql81-client
+.elif ${_PGSQL_VERSION} == "80"
+PGSQL_TYPE=	postgresql80-client
+PGPKGSRCDIR=	../../databases/postgresql80-client
+.elif ${_PGSQL_VERSION} == "74"
+PGSQL_TYPE=	postgresql74-lib
 PGPKGSRCDIR=	../../databases/postgresql74-lib
-.elif ${_PGSQL_VERSION} == "73"
-PGPKGSRCDIR=	../../databases/postgresql73-lib
 .else
 # force an error
-	error: no valid PostgreSQL version
+PGSQL_TYPE=		none
+PKG_SKIP_REASON+=	"${_PGSQL_VERSION} is not a valid package"
 .endif
 
-.if (defined(USE_BUILDLINK3) && empty(USE_BUILDLINK3:M[nN][oO]))
-.    include "${PGPKGSRCDIR}/buildlink3.mk"
-PGSQL_PREFIX=	${BUILDLINK_PREFIX.postgresql${_PGSQL_VERSION}-lib}
-.endif
+.include "${PGPKGSRCDIR}/buildlink3.mk"
+PGSQL_PREFIX=	${BUILDLINK_PREFIX.${PGSQL_TYPE}}
+
+PGSQL_VERSION=	${_PGSQL_VERSION}
 
 .endif	# PGVERSION_MK