Date: Tue, 7 Jan 2014 11:15:34 +0100 From: Baptiste Daroussin <bapt@FreeBSD.org> To: Dima Panov <fluffy@FreeBSD.org> Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org Subject: Re: svn commit: r338994 - head/www/lightsquid Message-ID: <20140107101534.GG36154@ithaqua.etoilebsd.net> In-Reply-To: <201401071012.s07ACXcZ047221@svn.freebsd.org> References: <201401071012.s07ACXcZ047221@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--doKZ0ri6bHmN2Q5y Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Jan 07, 2014 at 10:12:33AM +0000, Dima Panov wrote: > Author: fluffy > Date: Tue Jan 7 10:12:32 2014 > New Revision: 338994 > URL: http://svnweb.freebsd.org/changeset/ports/338994 >=20 > Log: > - Support staging >=20 > Modified: > head/www/lightsquid/Makefile >=20 > Modified: head/www/lightsquid/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=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/www/lightsquid/Makefile Tue Jan 7 10:02:05 2014 (r338993) > +++ head/www/lightsquid/Makefile Tue Jan 7 10:12:32 2014 (r338994) > @@ -18,7 +18,6 @@ USES=3D perl5 > USE_PERL5=3D run > NO_BUILD=3D yes > =20 > -NO_STAGE=3D yes > .include <bsd.port.options.mk> > =20 > CONFIGS=3D lightsquid.cfg realname.cfg skipuser.cfg group.cfg > @@ -49,37 +48,37 @@ post-patch: > @${MV} ${WRKSRC}/group.cfg.src ${WRKSRC}/group.cfg > =20 > do-install: > - ${MKDIR} ${DATADIR}/lang > + ${MKDIR} ${STAGEDIR}/${DATADIR}/lang > cd ${WRKSRC}/lang && \ > ${FIND} . -type f -regex '.*\.lng' -exec \ > - ${INSTALL_DATA} "{}" "${DATADIR}/lang/{}" \; > - ${MKDIR} ${PREFIX}/libexec/${PORTNAME} > + ${INSTALL_DATA} "{}" "${STAGEDIR}/${DATADIR}/lang/{}" \; > + ${MKDIR} ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME} > cd ${WRKSRC}/ip2name && \ > ${FIND} . -type f -exec \ > - ${INSTALL_DATA} "{}" "${PREFIX}/libexec/${PORTNAME}/{}" \; > - ${MKDIR} ${ETCDIR} > + ${INSTALL_DATA} "{}" "${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/{}" \; > + ${MKDIR} ${STAGEDIR}/${ETCDIR} > .for i in ${CONFIGS} > - ${INSTALL_DATA} ${WRKSRC}/${i} ${ETCDIR}/${i}.dist > + ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}/${ETCDIR}/${i}.dist > .if !exists(${ETCDIR}/${i}) > - ${INSTALL_DATA} ${WRKSRC}/${i} ${ETCDIR} > + ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}/${ETCDIR} > .endif > .endfor > - ${MKDIR} ${WWWDIR}/report > - ${MKDIR} ${WWWDIR}/tpl > + ${MKDIR} ${STAGEDIR}/${WWWDIR}/report > + ${MKDIR} ${STAGEDIR}/${WWWDIR}/tpl > cd ${WRKSRC}/tpl && \ > ${FIND} . -type d ! -empty -exec \ > - ${MKDIR} "${WWWDIR}/tpl/{}" \; && \ > + ${MKDIR} "${STAGEDIR}/${WWWDIR}/tpl/{}" \; && \ > ${FIND} . -type f -exec \ > - ${INSTALL_DATA} "{}" "${WWWDIR}/tpl/{}" \; > + ${INSTALL_DATA} "{}" "${STAGEDIR}/${WWWDIR}/tpl/{}" \; > cd ${WRKSRC} && \ > ${FIND} -E . -maxdepth 1 -regex '.*\.(cgi|pl)' -exec \ > - ${INSTALL_SCRIPT} "{}" "${WWWDIR}/{}" \; && \ > - ${INSTALL_DATA} .htaccess ${WWWDIR}/ > - @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR} > + ${INSTALL_SCRIPT} "{}" "${STAGEDIR}/${WWWDIR}/{}" \; && \ > + ${INSTALL_DATA} .htaccess ${STAGEDIR}/${WWWDIR}/ > + @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}/${WWWDIR} The above does not allow to build the package as a user so either you need NEED_ROOT or you need to then those right via the plist @owner www @group www files @dirs @owner @group Along with a @exec chown -R for pkg_install otherwise it will mess up things regards, Bapt --doKZ0ri6bHmN2Q5y Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.15 (FreeBSD) iEYEARECAAYFAlLL08YACgkQ8kTtMUmk6EywXQCfQJRX4LMbJmtfJWA2eIiMnUNR jEQAn3z7s5kK0mmWppEU0i4qZsUZJHNh =B44r -----END PGP SIGNATURE----- --doKZ0ri6bHmN2Q5y--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140107101534.GG36154>