Restore PG_SUBPREFIX.

4 files changed, 44 insertions, 35 deletions

diff --git a/databases/postgresql90-adminpack/PLIST b/databases/postgresql90-adminpack/PLIST
index ac4978334dc..9ff5902d272 100644
--- a/databases/postgresql90-adminpack/PLIST
+++ b/databases/postgresql90-adminpack/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2010/12/19 09:53:27 adam Exp $
-lib/postgresql/adminpack.la
-share/postgresql/contrib/adminpack.sql
-share/postgresql/contrib/uninstall_adminpack.sql
+@comment $NetBSD: PLIST,v 1.3 2010/12/24 08:07:57 asau Exp $
+${PG_SUBPREFIX}lib/postgresql/adminpack.la
+${PG_SUBPREFIX}share/postgresql/contrib/adminpack.sql
+${PG_SUBPREFIX}share/postgresql/contrib/uninstall_adminpack.sql
diff --git a/databases/postgresql90-client/buildlink3.mk b/databases/postgresql90-client/buildlink3.mk
index b151f99ce31..76ad40d5f86 100644
--- a/databases/postgresql90-client/buildlink3.mk
+++ b/databases/postgresql90-client/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2010/12/19 09:53:27 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2010/12/24 08:10:36 asau Exp $
 
 BUILDLINK_TREE+=	postgresql90-client
 
@@ -9,9 +9,18 @@ BUILDLINK_API_DEPENDS.postgresql90-client+=	postgresql90-client>=9.0.0
 BUILDLINK_ABI_DEPENDS.postgresql90-client+=	postgresql90-client>=9.0.0
 BUILDLINK_PKGSRCDIR.postgresql90-client?=	../../databases/postgresql90-client
 
+.if defined(PG_SUBPREFIX) && !empty(PG_SUBPREFIX)
+BUILDLINK_INCDIRS.postgresql90-client?=	${PG_SUBPREFIX}/include
+BUILDLINK_LIBDIRS.postgresql90-client?=	${PG_SUBPREFIX}/lib
+.endif
+
 # This variable contains the libraries need to link most clients.
 BUILDLINK_LDADD.postgresql90-client=	-lpq ${BUILDLINK_LDADD.gettext}
+.if defined(PG_SUBPREFIX) && !empty(PG_SUBPREFIX)
+BUILDLINK_FILES.postgresql90-client+=	$(PG_SUBPREFIX:/=)/bin/pg_config
+.else
 BUILDLINK_FILES.postgresql90-client+=	bin/pg_config
+.endif
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
diff --git a/databases/postgresql90-datatypes/PLIST b/databases/postgresql90-datatypes/PLIST
index b6f7246fe59..1a57d1178eb 100644
--- a/databases/postgresql90-datatypes/PLIST
+++ b/databases/postgresql90-datatypes/PLIST
@@ -1,26 +1,26 @@
-@comment $NetBSD: PLIST,v 1.2 2010/12/19 09:53:28 adam Exp $
-lib/postgresql/_int.la
-lib/postgresql/citext.so
-lib/postgresql/hstore.la
-lib/postgresql/isn.so
-lib/postgresql/lo.so
-lib/postgresql/ltree.la
-lib/postgresql/unaccent.la
-lib/postgresql/uuid-ossp.la
-share/postgresql/contrib/_int.sql
-share/postgresql/contrib/citext.sql
-share/postgresql/contrib/hstore.sql
-share/postgresql/contrib/isn.sql
-share/postgresql/contrib/lo.sql
-share/postgresql/contrib/ltree.sql
-share/postgresql/contrib/unaccent.sql
-share/postgresql/contrib/uninstall__int.sql
-share/postgresql/contrib/uninstall_citext.sql
-share/postgresql/contrib/uninstall_hstore.sql
-share/postgresql/contrib/uninstall_isn.sql
-share/postgresql/contrib/uninstall_lo.sql
-share/postgresql/contrib/uninstall_ltree.sql
-share/postgresql/contrib/uninstall_unaccent.sql
-share/postgresql/contrib/uninstall_uuid-ossp.sql
-share/postgresql/contrib/uuid-ossp.sql
-share/postgresql/tsearch_data/unaccent.rules
+@comment $NetBSD: PLIST,v 1.3 2010/12/24 08:13:34 asau Exp $
+${PG_SUBPREFIX}lib/postgresql/_int.la
+${PG_SUBPREFIX}lib/postgresql/citext.so
+${PG_SUBPREFIX}lib/postgresql/hstore.la
+${PG_SUBPREFIX}lib/postgresql/isn.so
+${PG_SUBPREFIX}lib/postgresql/lo.so
+${PG_SUBPREFIX}lib/postgresql/ltree.la
+${PG_SUBPREFIX}lib/postgresql/unaccent.la
+${PG_SUBPREFIX}lib/postgresql/uuid-ossp.la
+${PG_SUBPREFIX}share/postgresql/contrib/_int.sql
+${PG_SUBPREFIX}share/postgresql/contrib/citext.sql
+${PG_SUBPREFIX}share/postgresql/contrib/hstore.sql
+${PG_SUBPREFIX}share/postgresql/contrib/isn.sql
+${PG_SUBPREFIX}share/postgresql/contrib/lo.sql
+${PG_SUBPREFIX}share/postgresql/contrib/ltree.sql
+${PG_SUBPREFIX}share/postgresql/contrib/unaccent.sql
+${PG_SUBPREFIX}share/postgresql/contrib/uninstall__int.sql
+${PG_SUBPREFIX}share/postgresql/contrib/uninstall_citext.sql
+${PG_SUBPREFIX}share/postgresql/contrib/uninstall_hstore.sql
+${PG_SUBPREFIX}share/postgresql/contrib/uninstall_isn.sql
+${PG_SUBPREFIX}share/postgresql/contrib/uninstall_lo.sql
+${PG_SUBPREFIX}share/postgresql/contrib/uninstall_ltree.sql
+${PG_SUBPREFIX}share/postgresql/contrib/uninstall_unaccent.sql
+${PG_SUBPREFIX}share/postgresql/contrib/uninstall_uuid-ossp.sql
+${PG_SUBPREFIX}share/postgresql/contrib/uuid-ossp.sql
+${PG_SUBPREFIX}share/postgresql/tsearch_data/unaccent.rules
diff --git a/databases/postgresql90-dblink/PLIST b/databases/postgresql90-dblink/PLIST
index be662fe1e70..34caba93d56 100644
--- a/databases/postgresql90-dblink/PLIST
+++ b/databases/postgresql90-dblink/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/09/21 07:51:36 adam Exp $
-lib/postgresql/dblink.la
-share/postgresql/contrib/dblink.sql
-share/postgresql/contrib/uninstall_dblink.sql
+@comment $NetBSD: PLIST,v 1.2 2010/12/24 08:16:19 asau Exp $
+${PG_SUBPREFIX}lib/postgresql/dblink.la
+${PG_SUBPREFIX}share/postgresql/contrib/dblink.sql
+${PG_SUBPREFIX}share/postgresql/contrib/uninstall_dblink.sql