databases/postgresql84-server 8.4.9 rc.d script broken

[Greg Larkin]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 10/18/11 8:45 PM, John Marshall wrote:
> After upgrading databases/postgresql84-server from 8.4.8_1 to 8.4.9, the
> rc.d script vomits thus:
> 
>   rwsrv03# /usr/local/etc/rc.d/postgresql start
>   su: unknown login: %%PG_USER%%
> 
> Presumably the updated port is missing a substitution edit but I haven't
> found where.
> 

Hi John,

Apply this patch to the Makefile and reinstall postgres:

- ------------------------------------------------------------------
- --- Makefile.orig       2011-10-18 21:07:27.000000000 -0400
+++ Makefile    2011-10-18 21:10:41.000000000 -0400
@@ -287,13 +287,8 @@
 SUB_FILES+=    pkg-message${PKGNAMESUFFIX}
 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)
+SUB_LIST=      PG_USER=$(PG_USER)
 PLIST_SUB+=    PG_USER=$(PG_USER)
- -.  endif
 .endif

 .if !defined(NO_BUILD)
- ------------------------------------------------------------------

The Makefile depended on the presence of a file that was removed in the
last commit.  Because of that, the substitutions were no longer added to
SUB_LIST.

I'll open a PR tomorrow, if someone doesn't get to it before me.

Hope that helps,
Greg
- -- 
Greg Larkin

http://www.FreeBSD.org/           - The Power To Serve
http://www.sourcehosting.net/     - Ready. Set. Code.
http://twitter.com/cpucycle/      - Follow you, follow me
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (Darwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk6eJOkACgkQ0sRouByUApBxGQCeKBCKeU54O1tM+59bgcDOq4mL
m0UAn0ViZlz8InU+tOYQXkD2QiRVAh0M
=ZNsK
-----END PGP SIGNATURE-----