Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 9 Sep 2016 14:21:51 +0200
From:      Palle Girgensohn <girgen@pingpong.net>
To:        Matthew Seaman <matthew@FreeBSD.org>
Cc:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   Re: svn commit: r421361 - in head/databases: postgresql92-server postgresql96-client postgresql96-server
Message-ID:  <0C60B731-FBF0-4FA6-8520-E9156EFA608C@pingpong.net>
In-Reply-To: <c164f590-7f13-145c-3f0a-a404045e7947@FreeBSD.org>
References:  <201609051159.u85BxXlY065121@repo.freebsd.org> <277e42c7-60a2-29c2-4ca4-7d10a88536e6@FreeBSD.org> <08162A3A-4689-4BD9-A4C2-9E3547A65A0B@pingpong.net> <c164f590-7f13-145c-3f0a-a404045e7947@FreeBSD.org>

next in thread | previous in thread | raw e-mail | index | archive | help

--Apple-Mail=_586AE776-60AC-49FA-B04B-31BDBCFF5B37
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain;
	charset=windows-1252


> 6 sep. 2016 kl. 20:43 skrev Matthew Seaman <matthew@FreeBSD.org>:
>=20
> On 06/09/2016 16:57, Palle Girgensohn wrote:
>> I removed that in a subsequent commit :-)
>=20
> Yes, so you did.  With respect, that's not what I was on about though.
> I'm sorry -- it seems I didn't make myself clear.
>=20
> After the commit to remove the line from the pkg-plist for
> postgresql96-server that port will not pass the 'stage-qa' tests =
because
> you're still creating the directory =
'${STAGING}${LOCALBASE}/${PG_USER}'
> in the staging area and it now doesn't appear in the pkg-plist.
>=20
> The patch I included prevents creating that directory by
> postgresql96-server, so it will now pass the 'stage-qa' tests.  =
Without
> this poudriere, for instance, will consider the package build to have
> failed.

Ah, OK, sorry. I apparently didn't read your mail thoroughly. That's =
weird, I did test it with poudriere... :(

Anyway, that MKDIR line should be removed for all versions, right? Isn't =
it part of the USER rule in Mk...?

>=20
> 	Cheers,
>=20
> 	Matthew
>=20
>>=20
>> Palle
>>=20
>>> 6 sep. 2016 kl. 13:20 skrev Matthew Seaman <matthew@FreeBSD.org>:
>>>=20
>>>> On 05/09/2016 12:59, Palle Girgensohn wrote:
>>>> Modified: head/databases/postgresql96-server/pkg-plist-server
>>>> =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
>>>> --- head/databases/postgresql96-server/pkg-plist-server    Mon Sep  =
5 11:15:29 2016    (r421360)
>>>> +++ head/databases/postgresql96-server/pkg-plist-server    Mon Sep  =
5 11:59:32 2016    (r421361)
>>>> @@ -775,5 +775,3 @@ lib/libpgcommon.a
>>>> %%DATADIR%%/tsearch_data/synonym_sample.syn
>>>> %%DATADIR%%/tsearch_data/thesaurus_sample.ths
>>>> %%DATADIR%%/tsearch_data/turkish.stop
>>>> -@dir(%%PG_USER%%,%%PG_GROUP%%,) %%PG_USER%%
>>>> -
>>>=20
>>> This still fails stage-qa in poudriere, because you're creating
>>> a directory ${STAGEDIR}${LOCALBASE}/postgres
>>>=20
>>> =3D=3D=3D=3D> Running Q/A tests (stage-qa)
>>> =3D=3D=3D=3D> Checking for pkg-plist issues (check-plist)
>>> =3D=3D=3D> Parsing plist
>>> =3D=3D=3D> Checking for items in STAGEDIR missing from pkg-plist
>>> Error: Orphaned: @dir %%PG_USER%%
>>> =3D=3D=3D> Checking for items in pkg-plist which are not in STAGEDIR
>>> =3D=3D=3D> Error: Plist issues found.
>>> *** Error code 1
>>>=20
>>> Stop.
>>> make: stopped in /usr/ports/databases/postgresql96-server
>>> =3D=3D=3D=3D>> Error: check-plist failures detected
>>>=20
>>> This should help:
>>>=20
>>> # svn diff databases/postgresql92-server =
databases/postgresql96-server
>>> Index: databases/postgresql92-server/Makefile
>>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
>>> --- databases/postgresql92-server/Makefile         (revision 421417)
>>> +++ databases/postgresql92-server/Makefile         (working copy)
>>> @@ -243,7 +243,9 @@
>>>          ${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily ;\
>>>          ${INSTALL_SCRIPT} ${WRKDIR}/502.pgsql \
>>>                  ${STAGEDIR}${PREFIX}/etc/periodic/daily
>>> +.    if ${PORTVERSION:M9.[12345].*}
>>>          ${MKDIR} ${STAGEDIR}${PREFIX}/${PG_USER}
>>> +.    endif
>>> .  endif # SERVER_ONLY
>>> .  if defined(CLIENT_ONLY)
>>>          @ cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE_CMD}
>>> ${MAKE_ARGS} install-local
>>> Index: databases/postgresql96-server/Makefile
>>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
>>> --- databases/postgresql96-server/Makefile         (revision 421417)
>>> +++ databases/postgresql96-server/Makefile         (working copy)
>>> @@ -2,7 +2,7 @@
>>> # $FreeBSD$
>>>=20
>>> DISTVERSION?=3D    9.6rc1
>>> -PORTREVISION?=3D    1
>>> +PORTREVISION?=3D    2
>>>=20
>>> MAINTAINER?=3D      pgsql@FreeBSD.org
>>>=20
>>>   Cheers,
>>>=20
>>>   Matthew
>>>=20
>>>=20
>>=20
>=20
>=20


--Apple-Mail=_586AE776-60AC-49FA-B04B-31BDBCFF5B37
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename=signature.asc
Content-Type: application/pgp-signature;
	name=signature.asc
Content-Description: Message signed with OpenPGP using GPGMail

-----BEGIN PGP SIGNATURE-----
Comment: GPGTools - http://gpgtools.org

iQEcBAEBCAAGBQJX0qlfAAoJEDQn0sf36UlsntQH/jXwCQuU+HXiVPGipGH/upt9
5oJrOJQkCjiVhGP2DRkbCKpi9+ZEqkAhgMgGYwXA4hKuUpiYr5ebQiTQwPGFQm0g
jxF6Vy3tN2ymJU07p4BcXJADcohM4th5/cTn7UAhf/i4NUqFENnhEdniBEag3n9+
DbMii4vUnn+7zFBmMkUczr3yWzPwlbUX4eYSwnWZn01rSYJqtVPr8qzKualFh3Xz
0U/MuVjwFHTi9fE/mH+3mTkEETNzzku460iUek9VoAzOY664VOXAPfuDU3N4C0Y0
F2f20W2WrVUkpDr6II9Nx7Rpx37y9+ykmMl7kqeHtPWaOU43/Hi+tIiyWFeA5Qo=
=gUsC
-----END PGP SIGNATURE-----

--Apple-Mail=_586AE776-60AC-49FA-B04B-31BDBCFF5B37--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?0C60B731-FBF0-4FA6-8520-E9156EFA608C>