Date: Mon, 21 Jul 2014 10:13:50 -0400 From: Adam Weinberger <adamw@adamw.org> To: Chris Rees <crees@physics.org> Cc: Chris Rees <crees@FreeBSD.org>, svn-ports-head@freebsd.org, Baptiste Daroussin <bapt@FreeBSD.org>, svn-ports-all@freebsd.org, ports-committers@freebsd.org Subject: Re: svn commit: r362282 - head/audio/musicpd Message-ID: <44E9C6BB-2725-4DF8-8AC2-7A2AF7F6089B@adamw.org> In-Reply-To: <98131e5d-843d-4d2d-97e8-0b7d304529ac@email.android.com> References: <201407192131.s6JLVS8t088706@svn.freebsd.org> <20140720010437.GT28314@ivaldir.etoilebsd.net> <98131e5d-843d-4d2d-97e8-0b7d304529ac@email.android.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On 21 Jul, 2014, at 9:19, Chris Rees <crees@physics.org> wrote: >=20 >=20 > On 20 July 2014 02:04:38 BST, Baptiste Daroussin <bapt@FreeBSD.org> = wrote: >> On Sat, Jul 19, 2014 at 09:31:28PM +0000, Chris Rees wrote: >>> Author: crees >>> Date: Sat Jul 19 21:31:27 2014 >>> New Revision: 362282 >>> URL: http://svnweb.freebsd.org/changeset/ports/362282 >>> QAT: https://qat.redports.org/buildarchive/r362282/ >>>=20 >>> Log: >>> Stop pkg complaining, and do exactly the same as before :) >>>=20 >>> Modified: >>> head/audio/musicpd/Makefile >>> head/audio/musicpd/pkg-plist >>>=20 >>> Modified: head/audio/musicpd/Makefile >>>=20 >> = =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/audio/musicpd/Makefile Sat Jul 19 20:26:10 2014 = (r362281) >>> +++ head/audio/musicpd/Makefile Sat Jul 19 21:31:27 2014 = (r362282) >>> @@ -217,17 +217,26 @@ post-patch: >>> .endif >>>=20 >>> do-install: >>> - @${INSTALL_PROGRAM} ${WRKSRC}/src/mpd \ >>> + ${INSTALL_PROGRAM} ${WRKSRC}/src/mpd \ >>> ${STAGEDIR}/${PREFIX}/bin/${PORTNAME} >>> - @${INSTALL_MAN} ${WRKSRC}/doc/mpd.1 \ >>> + ${INSTALL_MAN} ${WRKSRC}/doc/mpd.1 \ >>> ${STAGEDIR}/${PREFIX}/man/man1/${PORTNAME}.1 >>> - @${INSTALL_MAN} ${WRKSRC}/doc/mpd.conf.5 \ >>> + ${INSTALL_MAN} ${WRKSRC}/doc/mpd.conf.5 \ >>> ${STAGEDIR}/${PREFIX}/man/man5/${PORTNAME}.conf.5 >>> - @${MKDIR} ${STAGEDIR}/${DOCSDIR} >>> -.for doc in ${PORTDOCS} >>> - @${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}/${DOCSDIR}/ >>> -.endfor >>> - @${INSTALL_DATA} ${WRKSRC}/doc/mpdconf.example \ >>> + ${MKDIR} ${STAGEDIR}/${DOCSDIR} >>> + ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} = ${STAGEDIR}/${DOCSDIR}/ >>> + ${INSTALL_DATA} ${WRKSRC}/doc/mpdconf.example \ >>> ${STAGEDIR}/${PREFIX}/etc/${PORTNAME}.conf.sample >>> + ${PRINTF} "%s\n%s\n%s\n" "@cwd /" "@owner ${MPDUSER}" \ >>> + "@group ${MPDGROUP}" >> ${TMPPLIST} >>> + cd ${STAGEDIR} && ${MKDIR} -v ${MPDDIR:S,^/,,}/.mpd | ${SORT} -r = | >> \ >>> + ${SED} 's,^,@dirrmtry ,' >> ${TMPPLIST} >>> +.ifndef WITH_PKGNG >>> + # Cute, we can't use @dirrmtry with pkg_old... >>> + # Remove once all using pkgng >>=20 >> Now is does :) >>=20 >>> + ${REINPLACE_CMD} \ >>> + 's,^@dirrmtry \(.*\),@unexec rmdir \1 > /dev/null || :,' = \ >>> + ${TMPPLIST} >>> +.endif >>>=20 >>> .include <bsd.port.mk> >>>=20 >>> Modified: head/audio/musicpd/pkg-plist >>>=20 >> = =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/audio/musicpd/pkg-plist Sat Jul 19 20:26:10 2014 = (r362281) >>> +++ head/audio/musicpd/pkg-plist Sat Jul 19 21:31:27 2014 = (r362282) >>> @@ -2,7 +2,5 @@ bin/musicpd >>> @unexec if cmp -s %D/etc/musicpd.conf.sample %D/etc/musicpd.conf; >> then rm -f %D/etc/musicpd.conf; fi >>> etc/musicpd.conf.sample >>> @exec if [ ! -f %B/musicpd.conf ] ; then cp -p %D/%F >> %B/musicpd.conf; fi >>=20 >> The above can be replaced by @sample etc/musicpd.conf.sample >>=20 >>> -@exec install -d -o %%MPDUSER%% -g %%MPDGROUP%% %%MPDDIR%% >> %%MPDDIR%%/.mpd >>> -@unexec rmdir -p %%MPDDIR%%/.mpd 2>/dev/null || true >=20 > Yes, I did that when I just removed all that above code, thanks. >=20 > What would be really nice would be a chmod u+w on the config file once = copied over! @mode 666 @sample etc/musicpd.conf.sample @mode If you only want it on the non-sample, you can also add @exec chmod 444 %D/etc/musicpd.conf.sample # Adam --=20 Adam Weinberger adamw@adamw.org http://www.adamw.org
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?44E9C6BB-2725-4DF8-8AC2-7A2AF7F6089B>