Date: Sun, 20 Jul 2014 03:04:38 +0200 From: Baptiste Daroussin <bapt@FreeBSD.org> To: Chris Rees <crees@FreeBSD.org> Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org Subject: Re: svn commit: r362282 - head/audio/musicpd Message-ID: <20140720010437.GT28314@ivaldir.etoilebsd.net> In-Reply-To: <201407192131.s6JLVS8t088706@svn.freebsd.org> References: <201407192131.s6JLVS8t088706@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--wYXww9TlNKyqAMAe Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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 > =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 Now is does :) > + ${REINPLACE_CMD} \ > + 's,^@dirrmtry \(.*\),@unexec rmdir \1 > /dev/null || :,' \ > + ${TMPPLIST} > +.endif > =20 > .include <bsd.port.mk> >=20 > Modified: head/audio/musicpd/pkg-plist > =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 r= m -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 The above can be replaced by @sample etc/musicpd.conf.sample > -@exec install -d -o %%MPDUSER%% -g %%MPDGROUP%% %%MPDDIR%% %%MPDDIR%%/.m= pd > -@unexec rmdir -p %%MPDDIR%%/.mpd 2>/dev/null || true --wYXww9TlNKyqAMAe Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iEYEARECAAYFAlPLFaUACgkQ8kTtMUmk6EwkiACfRAOGP6o2MgOAtLU65MSckURC p2YAnR6/RItShTsmtxMpDpu/q03Q9Ejt =5/Qm -----END PGP SIGNATURE----- --wYXww9TlNKyqAMAe--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140720010437.GT28314>