sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix SUB_LIST issue by deconditionalising it.

Browse source 
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:
Chris Rees 2011-10-19 18:21:25 +00:00
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
Show stats Download patch file Download diff file Expand all files Collapse all files

7
databases/postgresql82-server/Makefile
View file

@ -232,6 +232,10 @@ MAN7= abort.7 alter_aggregate.7 alter_conversion.7 alter_database.7 \
savepoint.7 values.7 savepoint.7 values.7
.endif .endif
SUB_LIST+= PG_GROUP=$(PG_GROUP) \
PG_USER=$(PG_USER) \
PG_UID=$(PG_UID)
.if defined(SERVER_ONLY) .if defined(SERVER_ONLY)
pre-everything:: pre-everything::
@${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL @${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
@ -259,9 +263,6 @@ PKGMESSAGE= ${WRKSRC}/pkg-message${PKGNAMESUFFIX}
. endif . endif
. if exists(${FILESDIR}/pkg-install${PKGNAMESUFFIX}.in) . if exists(${FILESDIR}/pkg-install${PKGNAMESUFFIX}.in)
SUB_FILES+= pkg-install${PKGNAMESUFFIX} 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) PLIST_SUB+= PG_USER=$(PG_USER)
PKGINSTALL= ${WRKDIR}/pkg-install${PKGNAMESUFFIX} PKGINSTALL= ${WRKDIR}/pkg-install${PKGNAMESUFFIX}
. endif . endif

7
databases/postgresql83-server/Makefile
View file

@ -256,6 +256,10 @@ MAN7= abort.7 alter_aggregate.7 alter_conversion.7 alter_database.7 \
savepoint.7 values.7 savepoint.7 values.7
.endif .endif
SUB_LIST+= PG_GROUP=$(PG_GROUP) \
PG_USER=$(PG_USER) \
PG_UID=$(PG_UID)
.if defined(SERVER_ONLY) .if defined(SERVER_ONLY)
pre-everything:: pre-everything::
@${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL @${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
@ -283,9 +287,6 @@ PKGMESSAGE= ${WRKSRC}/pkg-message${PKGNAMESUFFIX}
. endif . endif
. if exists(${FILESDIR}/pkg-install${PKGNAMESUFFIX}.in) . if exists(${FILESDIR}/pkg-install${PKGNAMESUFFIX}.in)
SUB_FILES+= pkg-install${PKGNAMESUFFIX} 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) PLIST_SUB+= PG_USER=$(PG_USER)
. endif . endif
.endif .endif

7
databases/postgresql84-server/Makefile
View file

@ -263,6 +263,10 @@ MAN7= abort.7 alter_aggregate.7 alter_conversion.7 alter_database.7 \
savepoint.7 values.7 with.7 savepoint.7 values.7 with.7
.endif .endif
SUB_LIST+= PG_GROUP=$(PG_GROUP) \
PG_USER=$(PG_USER) \
PG_UID=$(PG_UID)
.if defined(SERVER_ONLY) .if defined(SERVER_ONLY)
pre-everything:: pre-everything::
@${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL @${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
@ -289,9 +293,6 @@ PKGMESSAGE= ${WRKSRC}/pkg-message${PKGNAMESUFFIX}
. endif . endif
. if exists(${FILESDIR}/pkg-install${PKGNAMESUFFIX}.in) . if exists(${FILESDIR}/pkg-install${PKGNAMESUFFIX}.in)
SUB_FILES+= pkg-install${PKGNAMESUFFIX} 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) PLIST_SUB+= PG_USER=$(PG_USER)
. endif . endif
.endif .endif

7
databases/postgresql90-server/Makefile
View file

@ -303,6 +303,10 @@ MAN7= ABORT.7 ALTER_AGGREGATE.7 ALTER_CONVERSION.7 ALTER_DATABASE.7 \
SAVEPOINT.7 VALUES.7 WITH.7 SAVEPOINT.7 VALUES.7 WITH.7
.endif .endif
SUB_LIST+= PG_GROUP=$(PG_GROUP) \
PG_USER=$(PG_USER) \
PG_UID=$(PG_UID)
.if defined(SERVER_ONLY) .if defined(SERVER_ONLY)
pre-everything:: pre-everything::
@${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL @${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
@ -329,9 +333,6 @@ PKGMESSAGE= ${WRKSRC}/pkg-message${PKGNAMESUFFIX}
. endif . endif
. if exists(${FILESDIR}/pkg-install${PKGNAMESUFFIX}.in) . if exists(${FILESDIR}/pkg-install${PKGNAMESUFFIX}.in)
SUB_FILES+= pkg-install${PKGNAMESUFFIX} 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) PLIST_SUB+= PG_USER=$(PG_USER)
PKGINSTALL= ${WRKDIR}/pkg-install${PKGNAMESUFFIX} PKGINSTALL= ${WRKDIR}/pkg-install${PKGNAMESUFFIX}
. endif . endif

7
databases/postgresql91-server/Makefile
View file

@ -305,6 +305,10 @@ MAN7= ABORT.7 ALTER_AGGREGATE.7 ALTER_COLLATION.7 ALTER_CONVERSION.7 \
SECURITY_LABEL.7 SECURITY_LABEL.7
.endif .endif
SUB_LIST+= PG_GROUP=$(PG_GROUP) \
PG_USER=$(PG_USER) \
PG_UID=$(PG_UID)
.if defined(SERVER_ONLY) .if defined(SERVER_ONLY)
pre-everything:: pre-everything::
@${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL @${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
@ -331,9 +335,6 @@ PKGMESSAGE= ${WRKSRC}/pkg-message${PKGNAMESUFFIX}
. endif . endif
. if exists(${FILESDIR}/pkg-install${PKGNAMESUFFIX}.in) . if exists(${FILESDIR}/pkg-install${PKGNAMESUFFIX}.in)
SUB_FILES+= pkg-install${PKGNAMESUFFIX} 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) PLIST_SUB+= PG_USER=$(PG_USER)
. endif . endif
.endif .endif

7
databases/postgresql92-server/Makefile
View file

@ -305,6 +305,10 @@ MAN7= ABORT.7 ALTER_AGGREGATE.7 ALTER_COLLATION.7 ALTER_CONVERSION.7 \
SECURITY_LABEL.7 SECURITY_LABEL.7
.endif .endif
SUB_LIST+= PG_GROUP=$(PG_GROUP) \
PG_USER=$(PG_USER) \
PG_UID=$(PG_UID)
.if defined(SERVER_ONLY) .if defined(SERVER_ONLY)
pre-everything:: pre-everything::
@${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL @${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
@ -331,9 +335,6 @@ PKGMESSAGE= ${WRKSRC}/pkg-message${PKGNAMESUFFIX}
. endif . endif
. if exists(${FILESDIR}/pkg-install${PKGNAMESUFFIX}.in) . if exists(${FILESDIR}/pkg-install${PKGNAMESUFFIX}.in)
SUB_FILES+= pkg-install${PKGNAMESUFFIX} 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) PLIST_SUB+= PG_USER=$(PG_USER)
. endif . endif
.endif .endif