kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert r397786

Browse source 
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
This commit is contained in:
Baptiste Daroussin 2015-09-25 11:24:37 +00:00
parent 5ed65050ac
commit 440a430300
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=397808
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ports-mgmt/portshaker-config/Makefile
View file

@ -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"

4
ports-mgmt/portshaker-config/pkg-plist
View file

@ -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