[HEADSUP] Stage support for the ports tree

[Boris Samorodov]

24.09.2013 00:40, Baptiste Daroussin пишет:
> On Tue, Sep 24, 2013 at 12:29:21AM +0400, Boris Samorodov wrote:
>> 24.09.2013 00:18, Baptiste Daroussin пишет:
>>> On Mon, Sep 23, 2013 at 10:10:07PM +0400, Boris Samorodov wrote:
>>>> 23.09.2013 22:01, Baptiste Daroussin пишет:
>>>>> On Mon, Sep 23, 2013 at 09:59:04PM +0400, Boris Samorodov wrote:
>>>>>> 23.09.2013 17:45, Baptiste Daroussin пишет:
>>>>>>
>>>>>>> If you find any bug and have any diffulty to convert you port to stage
>>>>>>> directory, please report it.
>>>>>>
>>>>>> Are DESKTOP_ENTRIES supposed to work with stage?
>>>>>>
>>>>>
>>>>> Yes if not that needs to be fixed
>>>>
>>>> The Makefile does not define NO_STAGE=yes. However:
>>>> -----
>>>> % make -V DESKTOPDIR
>>>> /usr/local/share/applications
>>>> -----
>>>>
>>>> Should that be "${STAGEDIR}/usr/local/share/applications"?
>>>>
>>>> -- 
>>>> WBR, Boris Samorodov (bsam)
>>>> FreeBSD Committer, http://www.FreeBSD.org The Power To Serve
>>>
>>> Do you have a failing case?
>>>
>>> From what I see it should work. and it is normal that DESKTOPDIR is
>>> /usr/local/share/applications when running make -VDESKTOPDIR
>>
>> Minimal patch attached. I get the following error at "phase: stage":
>> http://gw.wart.ru/bulk/10-amd64-default/2013-09-23_20h32m32s/logs/errors/eos-movrec-0.3.2.b_1.log
>>
> Can you try with the following patch applied to bsd.port.mk?
> http://people.freebsd.org/~bapt/desktop.diff

The patch works! Thanks!!

> One remark below
> 
>> Index: /poudriere/ports/default/graphics/eos-movrec/Makefile
>> ===================================================================
>> --- /poudriere/ports/default/graphics/eos-movrec/Makefile	(revision 328026)
>> +++ /poudriere/ports/default/graphics/eos-movrec/Makefile	(working copy)
>> @@ -26,7 +26,6 @@
>>  DESKTOP_ENTRIES="EOS Camera Movie Recorder" "${COMMENT}" "${PORTNAME}" \
>>  		"eos_movrec" "Graphics;Photography;Qt;" false
>>  
>> -NO_STAGE=	yes
>>  post-patch:
>>  	@${REINPLACE_CMD} -e 's|GLIBC|${OPSYS}|' ${WRKSRC}/os_api.h
>>  .for s in 16 32 128 256 512
>> @@ -36,10 +35,10 @@
>>  
>>  post-install:
>>  .for s in ${ICON_SIZES}
>> -	@${MKDIR} ${PREFIX}/share/icons/hicolor/${s}/apps
>> +	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps
>>  	${INSTALL_DATA} ${WRKSRC}/mac.icons/${PORTNAME}_${s}.png \
>> -		${PREFIX}/share/icons/hicolor/${s}/apps/${PORTNAME}.png
>> +		${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps/${PORTNAME}.png
>>  .endfor
>> -	${LN} -sf ${PREFIX}/share/icons/hicolor/32x32/apps/${PORTNAME}.png ${PREFIX}/share/pixmaps/
>> +	${LN} -sf ${STAGEDIR}${PREFIX}/share/icons/hicolor/32x32/apps/${PORTNAME}.png ${STAGEDIR}${PREFIX}/share/pixmaps/
> 
> ^^
> Here this should be ${LN} -sf ${PREFIX}/share/icons/hicolor/32x32/apps/${PORTNAME}.png ${STAGEDIR}${PREFIX}/share/pixmaps/
> otherwise the created symlink will point inside the STAGEDIR which you don't
> want :)

I see the error, thanks.

-- 
WBR, Boris Samorodov (bsam)
FreeBSD Committer, http://www.FreeBSD.org The Power To Serve