diff options
| author | girgen <girgen@FreeBSD.org> | 2011-04-27 21:28:51 +0800 |
|---|---|---|
| committer | girgen <girgen@FreeBSD.org> | 2011-04-27 21:28:51 +0800 |
| commit | d80456c0854ac6dc6d6d2e4947b0789ca3424c2c (patch) | |
| tree | 423277571b8f131f6508299b6b27411cc0ec8427 /databases/postgresql84-server/Makefile | |
| parent | 319f32f1164ce686a733c260e2298afec91bbf1a (diff) | |
| download | freebsd-ports-gnome-d80456c0854ac6dc6d6d2e4947b0789ca3424c2c.tar.gz freebsd-ports-gnome-d80456c0854ac6dc6d6d2e4947b0789ca3424c2c.tar.zst freebsd-ports-gnome-d80456c0854ac6dc6d6d2e4947b0789ca3424c2c.zip | |
Fix problem creating postgres user when PGUSER was set.
PR: 156662
Diffstat (limited to 'databases/postgresql84-server/Makefile')
| -rw-r--r-- | databases/postgresql84-server/Makefile | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile index d9800aa8e6c7..6bdc5fff0074 100644 --- a/databases/postgresql84-server/Makefile +++ b/databases/postgresql84-server/Makefile @@ -161,6 +161,8 @@ INSTALL_TARGET= install-strip .if (${OSVERSION} >= 700000) && !defined(WITHOUT_GSSAPI) CONFIGURE_ARGS+=--with-gssapi +.else +CONFIGURE_ARGS+=--without-gssapi .endif . if defined(WITH_MIT_KRB5) @@ -253,7 +255,7 @@ MAN7= abort.7 alter_aggregate.7 alter_conversion.7 alter_database.7 \ .if defined(SERVER_ONLY) pre-everything:: - @${SH} ${FILESDIR}/pkg-install${PKGNAMESUFFIX}.in ${PORTNAME} BACKUPWARNING + @${SH} ${FILESDIR}/pkg-install${PKGNAMESUFFIX} ${PORTNAME} BACKUPWARNING .endif .if !defined(NO_BUILD) @@ -276,13 +278,12 @@ SUB_FILES+= pkg-message${PKGNAMESUFFIX} PKGMESSAGE= ${WRKSRC}/pkg-message${PKGNAMESUFFIX} . endif -. if exists(${FILESDIR}/pkg-install${PKGNAMESUFFIX}.in) -SUB_FILES+= pkg-install${PKGNAMESUFFIX} +. if exists(${FILESDIR}/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} +PKGINSTALL= ${FILESDIR}/pkg-install${PKGNAMESUFFIX} . endif .endif @@ -290,6 +291,7 @@ PKGINSTALL= ${WRKDIR}/pkg-install${PKGNAMESUFFIX} .if defined(SERVER_ONLY) pre-su-install: @ ${SETENV} PKG_PREFIX=${PREFIX} PG_USER=$(PG_USER) PG_GROUP=$(PG_GROUP) \ + PG_UID=$(PG_UID) \ ${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL .endif |