From owner-svn-ports-all@FreeBSD.ORG Mon Jul 21 14:53:23 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 54EBF3BB; Mon, 21 Jul 2014 14:53:23 +0000 (UTC) Received: from mk-outboundfilter-6.mail.uk.tiscali.com (mk-outboundfilter-6.mail.uk.tiscali.com [212.74.114.14]) by mx1.freebsd.org (Postfix) with ESMTP id 02FBE2EC9; Mon, 21 Jul 2014 14:53:21 +0000 (UTC) X-Trace: 116071525/mk-outboundfilter-6.mail.uk.tiscali.com/PIPEX/$ON_NET_AUTH_ACCEPTED/pipex-temporary-group/81.170.76.163/-4.0/crees@physics.org X-SBRS: -4.0 X-RemoteIP: 81.170.76.163 X-IP-MAIL-FROM: crees@physics.org X-SMTP-AUTH: bayofrum@uwclub.net X-MUA: K-9 Mail for Android X-IP-BHB: Once X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AiMIAGsozVNRqkyjPGdsb2JhbABZgw5Sg0/CWIdFAYEXFwQBAQEBODaEBAEBBCMPASMeBRALFAQCAiYCAjkKFAYOBRuIKwmnQJcIF4EsiQGETQEBHDMHgniBTgWbJYFNhTAYkF88L4EM X-IPAS-Result: AiMIAGsozVNRqkyjPGdsb2JhbABZgw5Sg0/CWIdFAYEXFwQBAQEBODaEBAEBBCMPASMeBRALFAQCAiYCAjkKFAYOBRuIKwmnQJcIF4EsiQGETQEBHDMHgniBTgWbJYFNhTAYkF88L4EM X-IronPort-AV: E=Sophos;i="5.01,701,1400022000"; d="scan'208";a="116071525" X-IP-Direction: OUT Received: from 81-170-76-163.dynamic.dsl.as9105.com (HELO pegasus.bayofrum.net) ([81.170.76.163]) by smtp.pipex.tiscali.co.uk with ESMTP; 21 Jul 2014 15:53:19 +0100 Received: from [192.168.1.94] (unknown [192.168.1.94]) by pegasus.bayofrum.net (Postfix) with ESMTPSA id 11BEF60E02; Mon, 21 Jul 2014 15:47:07 +0100 (BST) User-Agent: K-9 Mail for Android In-Reply-To: <44E9C6BB-2725-4DF8-8AC2-7A2AF7F6089B@adamw.org> References: <201407192131.s6JLVS8t088706@svn.freebsd.org> <20140720010437.GT28314@ivaldir.etoilebsd.net> <98131e5d-843d-4d2d-97e8-0b7d304529ac@email.android.com> <44E9C6BB-2725-4DF8-8AC2-7A2AF7F6089B@adamw.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Subject: Re: svn commit: r362282 - head/audio/musicpd From: Chris Rees Date: Mon, 21 Jul 2014 15:46:57 +0100 To: Adam Weinberger Message-ID: <280acdef-8b82-452a-bb2a-49d2bc5c96de@email.android.com> X-bayofrum-MailScanner-Information: Please contact the ISP for more information X-bayofrum-MailScanner-ID: 11BEF60E02.A38E2 X-bayofrum-MailScanner: Found to be clean X-bayofrum-MailScanner-From: crees@physics.org X-Spam-Status: No Cc: Chris Rees , svn-ports-head@freebsd.org, Baptiste Daroussin , 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: Mon, 21 Jul 2014 14:53:23 -0000 On 21 July 2014 15:13:50 BST, Adam Weinberger wrote: >On 21 Jul, 2014, at 9:19, Chris Rees wrote: > >> >> >> On 20 July 2014 02:04:38 BST, Baptiste Daroussin >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/ >>>> >>>> Log: >>>> Stop pkg complaining, and do exactly the same as before :) >>>> >>>> Modified: >>>> head/audio/musicpd/Makefile >>>> head/audio/musicpd/pkg-plist >>>> >>>> Modified: head/audio/musicpd/Makefile >>>> >>> >============================================================================== >>>> --- 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 >>>> >>>> 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 >>>> >>>> .include >>>> >>>> Modified: head/audio/musicpd/pkg-plist >>>> >>> >============================================================================== >>>> --- 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 >>> >>> The above can be replaced by @sample etc/musicpd.conf.sample >>> >>>> -@exec install -d -o %%MPDUSER%% -g %%MPDGROUP%% %%MPDDIR%% >>> %%MPDDIR%%/.mpd >>>> -@unexec rmdir -p %%MPDDIR%%/.mpd 2>/dev/null || true >> >> Yes, I did that when I just removed all that above code, thanks. >> >> 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 > That's really not the point I'm making. I have always been annoyed by the readonly config files, even for root- I was suggesting a global solution. Also, 666??? 664/644. Chris -- Sent from my Android device with K-9 Mail. Please excuse my brevity. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.