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.19
retrieving revision 1.33
diff -u -p -r1.19 -r1.33
--- pkgsrc/mk/pgsql.buildlink3.mk	2006/12/26 18:42:44	1.19
+++ pkgsrc/mk/pgsql.buildlink3.mk	2012/08/02 03:53:19	1.33
@@ -1,4 +1,4 @@
-# $NetBSD: pgsql.buildlink3.mk,v 1.19 2006/12/26 18:42:44 adam Exp $
+# $NetBSD: pgsql.buildlink3.mk,v 1.33 2012/08/02 03:53:19 asau Exp $
 #
 # User-settable variables:
 #
@@ -18,10 +18,15 @@
 .if !defined(PGVERSION_MK)
 PGVERSION_MK=	defined
 
+_VARGROUPS+=		pgsql
+_USER_VARS.pgsql=	PGSQL_VERSION_DEFAULT
+_PKG_VARS.pgsql=	PGSQL_VERSIONS_ACCEPTED
+_SYS_VARS.pgsql=	PG_LIB_EXT PGSQL_TYPE PGPKGSRCDIR
+
 .include "../../mk/bsd.prefs.mk"
 
-PGSQL_VERSION_DEFAULT?=		80
-PGSQL_VERSIONS_ACCEPTED?=	82 81 80 74
+PGSQL_VERSION_DEFAULT?=		91
+PGSQL_VERSIONS_ACCEPTED?=	91 90 84 83
 
 # transform the list into individual variables
 .for pv in ${PGSQL_VERSIONS_ACCEPTED}
@@ -36,37 +41,31 @@ PG_LIB_EXT=so
 
 # check what is installed
 .if ${OPSYS} == "Darwin"
-.if exists(${LOCALBASE}/lib/libecpg.5.0.2.dylib)
-_PGSQL_VERSION_82_INSTALLED=	yes
-.endif
-.if exists(${LOCALBASE}/lib/libecpg.5.0.1.dylib)
-_PGSQL_VERSION_81_INSTALLED=	yes
-.endif
-.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
+.  if exists(${LOCALBASE}/lib/libecpg.6.3.dylib)
+_PGSQL_VERSION_91_INSTALLED=	yes
+.  endif
+.  if exists(${LOCALBASE}/lib/libecpg.6.2.dylib)
+_PGSQL_VERSION_90_INSTALLED=	yes
+.  endif
+.  if exists(${LOCALBASE}/lib/libecpg.6.1.dylib)
+_PGSQL_VERSION_84_INSTALLED=	yes
+.  endif
+.  if exists(${LOCALBASE}/lib/libecpg.6.0.dylib)
+_PGSQL_VERSION_83_INSTALLED=	yes
+.  endif
 .else
-.if exists(${LOCALBASE}/lib/libecpg.so.5.0.2)
-_PGSQL_VERSION_82_INSTALLED=	yes
-.endif
-.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
+.  if exists(${LOCALBASE}/lib/libecpg.so.6.3)
+_PGSQL_VERSION_91_INSTALLED=	yes
+.  endif
+.  if exists(${LOCALBASE}/lib/libecpg.so.6.2)
+_PGSQL_VERSION_90_INSTALLED=	yes
+.  endif
+.  if exists(${LOCALBASE}/lib/libecpg.so.6.1)
+_PGSQL_VERSION_84_INSTALLED=	yes
+.  endif
+.  if exists(${LOCALBASE}/lib/libecpg.so.6.0)
+_PGSQL_VERSION_83_INSTALLED=	yes
+.  endif
 .endif
 
 # if a version is explicitely required, take it
@@ -106,22 +105,22 @@ _PGSQL_VERSION=	${_PGSQL_VERSION_FIRSTAC
 #
 # set variables for the version we decided to use:
 #
-.if ${_PGSQL_VERSION} == "82"
-PGSQL_TYPE=	postgresql82-client
-PGPKGSRCDIR=	../../databases/postgresql82-client
-.elif ${_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
+.if ${_PGSQL_VERSION} == "91"
+PGSQL_TYPE=	postgresql91-client
+PGPKGSRCDIR=	../../databases/postgresql91-client
+.elif ${_PGSQL_VERSION} == "90"
+PGSQL_TYPE=	postgresql90-client
+PGPKGSRCDIR=	../../databases/postgresql90-client
+.elif ${_PGSQL_VERSION} == "84"
+PGSQL_TYPE=	postgresql84-client
+PGPKGSRCDIR=	../../databases/postgresql84-client
+.elif ${_PGSQL_VERSION} == "83"
+PGSQL_TYPE=	postgresql83-client
+PGPKGSRCDIR=	../../databases/postgresql83-client
 .else
 # force an error
 PGSQL_TYPE=		none
-PKG_SKIP_REASON+=	"${_PGSQL_VERSION} is not a valid package"
+PKG_FAIL_REASON+=	"${_PGSQL_VERSION} is not a valid package"
 .endif
 
 .include "${PGPKGSRCDIR}/buildlink3.mk"