mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 01:39:16 -04:00
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)
This commit is contained in:
parent
3ea5721db1
commit
b91d7d2f81
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=283932
6 changed files with 24 additions and 18 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Reference in a new issue