Date: Mon, 23 Sep 2013 22:40:45 +0200 From: Baptiste Daroussin <bapt@FreeBSD.org> To: Boris Samorodov <bsam@passap.ru> Cc: FreeBSD ports list <freebsd-ports@FreeBSD.org> Subject: Re: [HEADSUP] Stage support for the ports tree Message-ID: <20130923204044.GG73535@ithaqua.etoilebsd.net> In-Reply-To: <5240A4A1.90606@passap.ru> References: <20130923134521.GZ73535@ithaqua.etoilebsd.net> <52408168.7000503@passap.ru> <20130923180144.GD73535@ithaqua.etoilebsd.net> <524083FF.3070409@passap.ru> <20130923201800.GF73535@ithaqua.etoilebsd.net> <5240A4A1.90606@passap.ru>
next in thread | previous in thread | raw e-mail | index | archive | help
--+jSQVS1cnOkN9brn
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
On Tue, Sep 24, 2013 at 12:29:21AM +0400, Boris Samorodov wrote:
> 24.09.2013 00:18, Baptiste Daroussin =D0=BF=D0=B8=D1=88=D0=B5=D1=82:
> > On Mon, Sep 23, 2013 at 10:10:07PM +0400, Boris Samorodov wrote:
> >> 23.09.2013 22:01, Baptiste Daroussin =D0=BF=D0=B8=D1=88=D0=B5=D1=82:
> >>> On Mon, Sep 23, 2013 at 09:59:04PM +0400, Boris Samorodov wrote:
> >>>> 23.09.2013 17:45, Baptiste Daroussin =D0=BF=D0=B8=D1=88=D0=B5=D1=82:
> >>>>
> >>>>> If you find any bug and have any diffulty to convert you port to st=
age
> >>>>> 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=3Dyes. However:
> >> -----
> >> % make -V DESKTOPDIR
> >> /usr/local/share/applications
> >> -----
> >>
> >> Should that be "${STAGEDIR}/usr/local/share/applications"?
> >>
> >> --=20
> >> WBR, Boris Samorodov (bsam)
> >> FreeBSD Committer, http://www.FreeBSD.org The Power To Serve
> >=20
> > Do you have a failing case?
> >=20
> > From what I see it should work. and it is normal that DESKTOPDIR is
> > /usr/local/share/applications when running make -VDESKTOPDIR
>=20
> 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
>=20
Can you try with the following patch applied to bsd.port.mk?
http://people.freebsd.org/~bapt/desktop.diff
One remark below
> Index: /poudriere/ports/default/graphics/eos-movrec/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
> --- /poudriere/ports/default/graphics/eos-movrec/Makefile (revision 32802=
6)
> +++ /poudriere/ports/default/graphics/eos-movrec/Makefile (working copy)
> @@ -26,7 +26,6 @@
> DESKTOP_ENTRIES=3D"EOS Camera Movie Recorder" "${COMMENT}" "${PORTNAME}"=
\
> "eos_movrec" "Graphics;Photography;Qt;" false
> =20
> -NO_STAGE=3D 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 @@
> =20
> 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 ${PR=
EFIX}/share/pixmaps/
> + ${LN} -sf ${STAGEDIR}${PREFIX}/share/icons/hicolor/32x32/apps/${PORTNAM=
E}.png ${STAGEDIR}${PREFIX}/share/pixmaps/
^^
Here this should be ${LN} -sf ${PREFIX}/share/icons/hicolor/32x32/apps/${PO=
RTNAME}.png ${STAGEDIR}${PREFIX}/share/pixmaps/
otherwise the created symlink will point inside the STAGEDIR which you don't
want :)
regards,
Bapt
--+jSQVS1cnOkN9brn
Content-Type: application/pgp-signature
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (FreeBSD)
iEYEARECAAYFAlJAp0wACgkQ8kTtMUmk6EwciQCfZumPAqMBL+mbqlsami2h/Yq2
uMIAoLxJDuTWzk98SOZHwddiQDjzhJFL
=5X7v
-----END PGP SIGNATURE-----
--+jSQVS1cnOkN9brn--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130923204044.GG73535>