diff options
author | Chris Rees <crees@FreeBSD.org> | 2011-10-19 18:21:25 +0000 |
---|---|---|
committer | Chris Rees <crees@FreeBSD.org> | 2011-10-19 18:21:25 +0000 |
commit | b91d7d2f817c6ac9fe36f9ea657b13c99046f67c (patch) | |
tree | 6708f2a9863b2c5f2562437b3ebe911e89871d73 | |
parent | - Cleanup gir* directories (diff) |
Fix SUB_LIST issue by deconditionalising it.
Temporary fix, but will stop the flurry of incoming PRs related.
PR: ports/161779 ports/161774 ports/161791 ports/161771 ports/161769
Submitted by: Many people, original fix suggested by Jason Helfman (jhelfman@e-e.com)
Approved by: portmgr (pav)
Notes
Notes:
svn path=/head/; revision=283932
-rw-r--r-- | databases/postgresql82-server/Makefile | 7 | ||||
-rw-r--r-- | databases/postgresql83-server/Makefile | 7 | ||||
-rw-r--r-- | databases/postgresql84-server/Makefile | 7 | ||||
-rw-r--r-- | databases/postgresql90-server/Makefile | 7 | ||||
-rw-r--r-- | databases/postgresql91-server/Makefile | 7 | ||||
-rw-r--r-- | databases/postgresql92-server/Makefile | 7 |
6 files changed, 24 insertions, 18 deletions
diff --git a/databases/postgresql82-server/Makefile b/databases/postgresql82-server/Makefile index e5126a85fb81..39fce7c8f763 100644 --- a/databases/postgresql82-server/Makefile +++ b/databases/postgresql82-server/Makefile @@ -232,6 +232,10 @@ MAN7= abort.7 alter_aggregate.7 alter_conversion.7 alter_database.7 \ savepoint.7 values.7 .endif +SUB_LIST+= PG_GROUP=$(PG_GROUP) \ + PG_USER=$(PG_USER) \ + PG_UID=$(PG_UID) + .if defined(SERVER_ONLY) pre-everything:: @${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL @@ -259,9 +263,6 @@ PKGMESSAGE= ${WRKSRC}/pkg-message${PKGNAMESUFFIX} . endif . if exists(${FILESDIR}/pkg-install${PKGNAMESUFFIX}.in) SUB_FILES+= pkg-install${PKGNAMESUFFIX} -SUB_LIST= PG_GROUP=$(PG_GROUP) \ - PG_USER=$(PG_USER) \ - PG_UID=$(PG_UID) PLIST_SUB+= PG_USER=$(PG_USER) PKGINSTALL= ${WRKDIR}/pkg-install${PKGNAMESUFFIX} . endif diff --git a/databases/postgresql83-server/Makefile b/databases/postgresql83-server/Makefile index c6aaf33e7d86..75d16ee31347 100644 --- a/databases/postgresql83-server/Makefile +++ b/databases/postgresql83-server/Makefile @@ -256,6 +256,10 @@ MAN7= abort.7 alter_aggregate.7 alter_conversion.7 alter_database.7 \ savepoint.7 values.7 .endif +SUB_LIST+= PG_GROUP=$(PG_GROUP) \ + PG_USER=$(PG_USER) \ + PG_UID=$(PG_UID) + .if defined(SERVER_ONLY) pre-everything:: @${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL @@ -283,9 +287,6 @@ PKGMESSAGE= ${WRKSRC}/pkg-message${PKGNAMESUFFIX} . endif . if exists(${FILESDIR}/pkg-install${PKGNAMESUFFIX}.in) SUB_FILES+= pkg-install${PKGNAMESUFFIX} -SUB_LIST= PG_GROUP=$(PG_GROUP) \ - PG_USER=$(PG_USER) \ - PG_UID=$(PG_UID) PLIST_SUB+= PG_USER=$(PG_USER) . endif .endif diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile index 769240c9feb7..8ea19b040fb7 100644 --- a/databases/postgresql84-server/Makefile +++ b/databases/postgresql84-server/Makefile @@ -263,6 +263,10 @@ MAN7= abort.7 alter_aggregate.7 alter_conversion.7 alter_database.7 \ savepoint.7 values.7 with.7 .endif +SUB_LIST+= PG_GROUP=$(PG_GROUP) \ + PG_USER=$(PG_USER) \ + PG_UID=$(PG_UID) + .if defined(SERVER_ONLY) pre-everything:: @${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL @@ -289,9 +293,6 @@ PKGMESSAGE= ${WRKSRC}/pkg-message${PKGNAMESUFFIX} . endif . if exists(${FILESDIR}/pkg-install${PKGNAMESUFFIX}.in) SUB_FILES+= pkg-install${PKGNAMESUFFIX} -SUB_LIST= PG_GROUP=$(PG_GROUP) \ - PG_USER=$(PG_USER) \ - PG_UID=$(PG_UID) PLIST_SUB+= PG_USER=$(PG_USER) . endif .endif diff --git a/databases/postgresql90-server/Makefile b/databases/postgresql90-server/Makefile index ccea4b175bcd..0d36a89d67a0 100644 --- a/databases/postgresql90-server/Makefile +++ b/databases/postgresql90-server/Makefile @@ -303,6 +303,10 @@ MAN7= ABORT.7 ALTER_AGGREGATE.7 ALTER_CONVERSION.7 ALTER_DATABASE.7 \ SAVEPOINT.7 VALUES.7 WITH.7 .endif +SUB_LIST+= PG_GROUP=$(PG_GROUP) \ + PG_USER=$(PG_USER) \ + PG_UID=$(PG_UID) + .if defined(SERVER_ONLY) pre-everything:: @${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL @@ -329,9 +333,6 @@ PKGMESSAGE= ${WRKSRC}/pkg-message${PKGNAMESUFFIX} . endif . if exists(${FILESDIR}/pkg-install${PKGNAMESUFFIX}.in) SUB_FILES+= pkg-install${PKGNAMESUFFIX} -SUB_LIST= PG_GROUP=$(PG_GROUP) \ - PG_USER=$(PG_USER) \ - PG_UID=$(PG_UID) PLIST_SUB+= PG_USER=$(PG_USER) PKGINSTALL= ${WRKDIR}/pkg-install${PKGNAMESUFFIX} . endif diff --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile index 1d2cd21217ad..07f88c1265c4 100644 --- a/databases/postgresql91-server/Makefile +++ b/databases/postgresql91-server/Makefile @@ -305,6 +305,10 @@ MAN7= ABORT.7 ALTER_AGGREGATE.7 ALTER_COLLATION.7 ALTER_CONVERSION.7 \ SECURITY_LABEL.7 .endif +SUB_LIST+= PG_GROUP=$(PG_GROUP) \ + PG_USER=$(PG_USER) \ + PG_UID=$(PG_UID) + .if defined(SERVER_ONLY) pre-everything:: @${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL @@ -331,9 +335,6 @@ PKGMESSAGE= ${WRKSRC}/pkg-message${PKGNAMESUFFIX} . endif . if exists(${FILESDIR}/pkg-install${PKGNAMESUFFIX}.in) SUB_FILES+= pkg-install${PKGNAMESUFFIX} -SUB_LIST= PG_GROUP=$(PG_GROUP) \ - PG_USER=$(PG_USER) \ - PG_UID=$(PG_UID) PLIST_SUB+= PG_USER=$(PG_USER) . endif .endif diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile index 1d2cd21217ad..07f88c1265c4 100644 --- a/databases/postgresql92-server/Makefile +++ b/databases/postgresql92-server/Makefile @@ -305,6 +305,10 @@ MAN7= ABORT.7 ALTER_AGGREGATE.7 ALTER_COLLATION.7 ALTER_CONVERSION.7 \ SECURITY_LABEL.7 .endif +SUB_LIST+= PG_GROUP=$(PG_GROUP) \ + PG_USER=$(PG_USER) \ + PG_UID=$(PG_UID) + .if defined(SERVER_ONLY) pre-everything:: @${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL @@ -331,9 +335,6 @@ PKGMESSAGE= ${WRKSRC}/pkg-message${PKGNAMESUFFIX} . endif . if exists(${FILESDIR}/pkg-install${PKGNAMESUFFIX}.in) SUB_FILES+= pkg-install${PKGNAMESUFFIX} -SUB_LIST= PG_GROUP=$(PG_GROUP) \ - PG_USER=$(PG_USER) \ - PG_UID=$(PG_UID) PLIST_SUB+= PG_USER=$(PG_USER) . endif .endif |