From owner-svn-ports-all@FreeBSD.ORG Sun Jul 20 01:04:44 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D203FD5; Sun, 20 Jul 2014 01:04:44 +0000 (UTC) Received: from mail-we0-x229.google.com (mail-we0-x229.google.com [IPv6:2a00:1450:400c:c03::229]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D5F93201C; Sun, 20 Jul 2014 01:04:43 +0000 (UTC) Received: by mail-we0-f169.google.com with SMTP id u56so5997764wes.14 for ; Sat, 19 Jul 2014 18:04:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=F5IPFCkfFjXsXzaV/suKp2k+mhlpO+hmKbZT+ld1cS0=; b=QpzX/06bNcBVqaVwZNoAdEkBJt4p9wa1LSMuDZW3oEE+cCB65tFH16TFm06+mxzeck /Jjxcw5IDZbsgA0Fd5QSNMD0jknuBj0hfiAigqaYcGAp0eA272FKM+xYQgIrvCyIeozo SKZdZyyzu7DQy4j/YG92hu7r4lZq57hrxwLrZ3UpoMCJ00nTCpMvr8RKgOkdjiOvzWlh aIYkke3nDbWpMuce7ZQwqpIlcPypA9tFfOVtoq4smadF86EyL7Ke84gOdiI5+/ATddKx G62ULW3yTgbw32M4HRLj8OZMdmcXutiJThaP/3qZLDg7RWZ3NPudeKa4x4IzsiMGHR8w YVag== X-Received: by 10.180.11.74 with SMTP id o10mr43117368wib.78.1405818281358; Sat, 19 Jul 2014 18:04:41 -0700 (PDT) Received: from ivaldir.etoilebsd.net ([2001:41d0:8:db4c::1]) by mx.google.com with ESMTPSA id p3sm25720808wjw.13.2014.07.19.18.04.40 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 19 Jul 2014 18:04:40 -0700 (PDT) Sender: Baptiste Daroussin Date: Sun, 20 Jul 2014 03:04:38 +0200 From: Baptiste Daroussin To: Chris Rees Subject: Re: svn commit: r362282 - head/audio/musicpd Message-ID: <20140720010437.GT28314@ivaldir.etoilebsd.net> References: <201407192131.s6JLVS8t088706@svn.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="wYXww9TlNKyqAMAe" Content-Disposition: inline In-Reply-To: <201407192131.s6JLVS8t088706@svn.freebsd.org> User-Agent: Mutt/1.5.23 (2014-03-12) Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Jul 2014 01:04:44 -0000 --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 >=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--