svn commit: r421361 - in head/databases: postgresql92-server postgresql96-client postgresql96-server

[Matthew Seaman]

On 06/09/2016 16:57, Palle Girgensohn wrote:
> I removed that in a subsequent commit :-)

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.

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.

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.

	Cheers,

	Matthew

> 
> Palle 
> 
>> 6 sep. 2016 kl. 13:20 skrev Matthew Seaman <matthew at FreeBSD.org>:
>>
>>> On 05/09/2016 12:59, Palle Girgensohn wrote:
>>> Modified: head/databases/postgresql96-server/pkg-plist-server
>>> ==============================================================================
>>> --- 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
>>> - at dir(%%PG_USER%%,%%PG_GROUP%%,) %%PG_USER%%
>>> -
>>
>> This still fails stage-qa in poudriere, because you're creating
>> a directory ${STAGEDIR}${LOCALBASE}/postgres
>>
>> ====> Running Q/A tests (stage-qa)
>> ====> Checking for pkg-plist issues (check-plist)
>> ===> Parsing plist
>> ===> Checking for items in STAGEDIR missing from pkg-plist
>> Error: Orphaned: @dir %%PG_USER%%
>> ===> Checking for items in pkg-plist which are not in STAGEDIR
>> ===> Error: Plist issues found.
>> *** Error code 1
>>
>> Stop.
>> make: stopped in /usr/ports/databases/postgresql96-server
>> ====>> Error: check-plist failures detected
>>
>> This should help:
>>
>> # svn diff databases/postgresql92-server databases/postgresql96-server
>> Index: databases/postgresql92-server/Makefile
>> ===================================================================
>> --- 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
>> ===================================================================
>> --- databases/postgresql96-server/Makefile         (revision 421417)
>> +++ databases/postgresql96-server/Makefile         (working copy)
>> @@ -2,7 +2,7 @@
>> # $FreeBSD$
>>
>> DISTVERSION?=    9.6rc1
>> -PORTREVISION?=    1
>> +PORTREVISION?=    2
>>
>> MAINTAINER?=      pgsql at FreeBSD.org
>>
>>    Cheers,
>>
>>    Matthew
>>
>>
> 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 931 bytes
Desc: OpenPGP digital signature
URL: <http://lists.freebsd.org/pipermail/svn-ports-head/attachments/20160906/ac6ebf06/attachment.sig>