- Fix packaging issue (missed %%PG_USER%% in pkg-plist-server)

- Remove extra bsd.port.pre.mk include from postgresql82-server

PR:		ports/161816 ports/161824 ports/161821
Submitted by:	Jason Helfman (jhelfman@e-e.com)
Approved by:	portmgr (pav)
This commit is contained in:
Chris Rees 2011-10-20 21:07:29 +00:00
parent 8e2df11edd
commit 213e27c72b
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=284016
12 changed files with 12 additions and 2 deletions

View file

@ -91,8 +91,6 @@ USE_OPENSSL= yes
CONFIGURE_ARGS+=--with-openssl
.endif
.include <bsd.port.pre.mk>
.if !defined(SLAVE_ONLY)
OPTIONS+= PAM "Build with PAM support (server only)" off
OPTIONS+= LDAP "Build with LDAP authentication support" off
@ -233,6 +231,7 @@ MAN7= abort.7 alter_aggregate.7 alter_conversion.7 alter_database.7 \
savepoint.7 values.7
.endif
PLIST_SUB+= PG_USER=$(PG_USER)
SUB_LIST+= PG_GROUP=$(PG_GROUP) \
PG_USER=$(PG_USER) \
PG_UID=$(PG_UID)

View file

@ -750,3 +750,4 @@ share/postgresql/timezonesets/Pacific.txt
@dirrmtry etc/periodic/daily
@dirrmtry etc/periodic
@dirrmtry lib/postgresql
@dirrmtry %%PG_USER%%

View file

@ -257,6 +257,7 @@ MAN7= abort.7 alter_aggregate.7 alter_conversion.7 alter_database.7 \
savepoint.7 values.7
.endif
PLIST_SUB+= PG_USER=$(PG_USER)
SUB_LIST+= PG_GROUP=$(PG_GROUP) \
PG_USER=$(PG_USER) \
PG_UID=$(PG_UID)

View file

@ -781,3 +781,4 @@ share/postgresql/tsearch_data/thesaurus_sample.ths
@dirrmtry etc/periodic/daily
@dirrmtry etc/periodic
@dirrmtry lib/postgresql
@dirrmtry %%PG_USER%%

View file

@ -263,6 +263,7 @@ MAN7= abort.7 alter_aggregate.7 alter_conversion.7 alter_database.7 \
savepoint.7 values.7 with.7
.endif
PLIST_SUB+= PG_USER=$(PG_USER)
SUB_LIST+= PG_GROUP=$(PG_GROUP) \
PG_USER=$(PG_USER) \
PG_UID=$(PG_UID)

View file

@ -766,3 +766,4 @@ share/postgresql/tsearch_data/thesaurus_sample.ths
@dirrmtry etc/periodic/daily
@dirrmtry etc/periodic
@dirrmtry lib/postgresql
@dirrmtry %%PG_USER%%

View file

@ -303,6 +303,7 @@ MAN7= ABORT.7 ALTER_AGGREGATE.7 ALTER_CONVERSION.7 ALTER_DATABASE.7 \
SAVEPOINT.7 VALUES.7 WITH.7
.endif
PLIST_SUB+= PG_USER=$(PG_USER)
SUB_LIST+= PG_GROUP=$(PG_GROUP) \
PG_USER=$(PG_USER) \
PG_UID=$(PG_UID)

View file

@ -775,3 +775,4 @@ share/postgresql/tsearch_data/thesaurus_sample.ths
@dirrmtry etc/periodic/daily
@dirrmtry etc/periodic
@dirrmtry lib/postgresql
@dirrmtry %%PG_USER%%

View file

@ -305,6 +305,7 @@ MAN7= ABORT.7 ALTER_AGGREGATE.7 ALTER_COLLATION.7 ALTER_CONVERSION.7 \
SECURITY_LABEL.7
.endif
PLIST_SUB+= PG_USER=$(PG_USER)
SUB_LIST+= PG_GROUP=$(PG_GROUP) \
PG_USER=$(PG_USER) \
PG_UID=$(PG_UID)

View file

@ -769,3 +769,4 @@ share/postgresql/tsearch_data/thesaurus_sample.ths
@dirrmtry etc/periodic/daily
@dirrmtry etc/periodic
@dirrmtry lib/postgresql
@dirrmtry %%PG_USER%%

View file

@ -305,6 +305,7 @@ MAN7= ABORT.7 ALTER_AGGREGATE.7 ALTER_COLLATION.7 ALTER_CONVERSION.7 \
SECURITY_LABEL.7
.endif
PLIST_SUB+= PG_USER=$(PG_USER)
SUB_LIST+= PG_GROUP=$(PG_GROUP) \
PG_USER=$(PG_USER) \
PG_UID=$(PG_UID)

View file

@ -769,3 +769,4 @@ share/postgresql/tsearch_data/thesaurus_sample.ths
@dirrmtry etc/periodic/daily
@dirrmtry etc/periodic
@dirrmtry lib/postgresql
@dirrmtry %%PG_USER%%