Date: Fri, 25 Sep 2015 11:24:38 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r397808 - head/ports-mgmt/portshaker-config Message-ID: <201509251124.t8PBOcSi096452@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Fri Sep 25 11:24:37 2015 New Revision: 397808 URL: https://svnweb.freebsd.org/changeset/ports/397808 Log: Revert r397786 Both portshaker and portshaker-config tries to manipulate the portshaker.conf So converting this one to @sample make it conflict with the portshaker package Reported by: mat Pointyhat to: bapt Modified: head/ports-mgmt/portshaker-config/Makefile head/ports-mgmt/portshaker-config/pkg-plist Modified: head/ports-mgmt/portshaker-config/Makefile ============================================================================== --- head/ports-mgmt/portshaker-config/Makefile Fri Sep 25 10:05:48 2015 (r397807) +++ head/ports-mgmt/portshaker-config/Makefile Fri Sep 25 11:24:37 2015 (r397808) @@ -22,6 +22,6 @@ pre-install: post-install: @${MV} ${STAGEDIR}${PREFIX}/etc/portshaker.conf \ - ${STAGEDIR}${PREFIX}/etc/portshaker.conf.sample + ${STAGEDIR}${PREFIX}/etc/portshaker.conf.sample-config .include "${MASTERDIR}/Makefile" Modified: head/ports-mgmt/portshaker-config/pkg-plist ============================================================================== --- head/ports-mgmt/portshaker-config/pkg-plist Fri Sep 25 10:05:48 2015 (r397807) +++ head/ports-mgmt/portshaker-config/pkg-plist Fri Sep 25 11:24:37 2015 (r397808) @@ -1,4 +1,6 @@ -@sample etc/portshaker.conf.sample +@unexec if cmp -s %D/etc/portshaker.conf.sample-config %D/etc/portshaker.conf; then rm -f %D/etc/portshaker.conf; fi +etc/portshaker.conf.sample-config +@exec if [ ! -f %D/etc/portshaker.conf ] ; then cp -p %D/%F %B/portshaker.conf; fi etc/portshaker.d/bsd_sharp etc/portshaker.d/bsd_sharp_releng_2_0 etc/portshaker.d/bsd_sharp_releng_2_2
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509251124.t8PBOcSi096452>