diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2015-09-25 11:24:37 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2015-09-25 11:24:37 +0000 |
| commit | 440a43030049b7c9a4db271ed97278473673989e (patch) | |
| tree | 8606f0c40e38790de1b4a2cb668ac6450bd4a039 /ports-mgmt | |
| parent | Fix build on -CURRENT. [1] (diff) | |
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
Notes
Notes:
svn path=/head/; revision=397808
Diffstat (limited to 'ports-mgmt')
| -rw-r--r-- | ports-mgmt/portshaker-config/Makefile | 2 | ||||
| -rw-r--r-- | ports-mgmt/portshaker-config/pkg-plist | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/ports-mgmt/portshaker-config/Makefile b/ports-mgmt/portshaker-config/Makefile index 5df1f14aa7f7..0420e2cd7c46 100644 --- a/ports-mgmt/portshaker-config/Makefile +++ b/ports-mgmt/portshaker-config/Makefile @@ -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" diff --git a/ports-mgmt/portshaker-config/pkg-plist b/ports-mgmt/portshaker-config/pkg-plist index b8c6863f7dc3..10b8010fb72e 100644 --- a/ports-mgmt/portshaker-config/pkg-plist +++ b/ports-mgmt/portshaker-config/pkg-plist @@ -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 |