diff options
| author | Pav Lucistnik <pav@FreeBSD.org> | 2010-06-22 14:37:27 +0000 |
|---|---|---|
| committer | Pav Lucistnik <pav@FreeBSD.org> | 2010-06-22 14:37:27 +0000 |
| commit | 140aa1c3fbc152c3251872ae3fa0b501e63ecb32 (patch) | |
| tree | 54bb862bd2fbdbb82931551d12d40cab4d1e5a88 | |
| parent | b597eef6ebf5b49f37392d873979600169fc6842 (diff) | |
| download | ports-140aa1c3fbc152c3251872ae3fa0b501e63ecb32.tar.gz ports-140aa1c3fbc152c3251872ae3fa0b501e63ecb32.zip | |
- Fix NOPORTDOCS, this port oddly installs configuration only with docs
Reported by: QAT
Feature safe: yes
Notes
Notes:
svn path=/head/; revision=256832
| -rw-r--r-- | sysutils/heartbeat/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/heartbeat/pkg-plist | 18 |
2 files changed, 11 insertions, 9 deletions
diff --git a/sysutils/heartbeat/Makefile b/sysutils/heartbeat/Makefile index cc25b9534c7a..f46ec9463529 100644 --- a/sysutils/heartbeat/Makefile +++ b/sysutils/heartbeat/Makefile @@ -167,6 +167,7 @@ pre-install: @${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL post-install: +.if !defined(NOPORTDOCS) # Install sample configuration @if [ ! -f ${PREFIX}/etc/ha.d/authkeys ]; then \ ${CP} -p ${DOCSDIR}/authkeys ${PREFIX}/etc/ha.d/authkeys ; \ @@ -183,6 +184,7 @@ post-install: ${CP} -p ${DOCSDIR}/logd.cf ${PREFIX}/etc/ha.d/logd.cf ; \ fi ${CP} -p ${DOCSDIR}/logd.cf ${PREFIX}/etc/ha.d/logd.cf.sample +.endif .if defined(WITH_LDIRECTORD) @if [ ! -f ${PREFIX}/etc/ha.d/ldirectord.cf ]; then \ diff --git a/sysutils/heartbeat/pkg-plist b/sysutils/heartbeat/pkg-plist index 01b82c648594..fc973857bb9e 100644 --- a/sysutils/heartbeat/pkg-plist +++ b/sysutils/heartbeat/pkg-plist @@ -2,16 +2,16 @@ bin/cl_respawn bin/cl_status %%MGMT%%bin/hb_gui etc/ha.d/README.config -@unexec if cmp -s %D/etc/ha.d/authkeys.sample %D/etc/ha.d/authkeys; then rm -f %D/etc/ha.d/authkeys; fi -etc/ha.d/authkeys.sample -@exec if [ ! -f %D/etc/ha.d/authkeys ]; then cp -p %D/%F %B/authkeys; fi -@unexec if cmp -s %D/etc/ha.d/ha.cf.sample %D/etc/ha.d/ha.cf; then rm -f %D/etc/ha.d/ha.cf; fi -etc/ha.d/ha.cf.sample -@exec if [ ! -f %D/etc/ha.d/ha.cf ]; then cp -p %D/%F %B/ha.cf; fi +%%NOPORTDOCS%%@unexec if cmp -s %D/etc/ha.d/authkeys.sample %D/etc/ha.d/authkeys; then rm -f %D/etc/ha.d/authkeys; fi +%%NOPORTDOCS%%etc/ha.d/authkeys.sample +%%NOPORTDOCS%%@exec if [ ! -f %D/etc/ha.d/authkeys ]; then cp -p %D/%F %B/authkeys; fi +%%NOPORTDOCS%%@unexec if cmp -s %D/etc/ha.d/ha.cf.sample %D/etc/ha.d/ha.cf; then rm -f %D/etc/ha.d/ha.cf; fi +%%NOPORTDOCS%%etc/ha.d/ha.cf.sample +%%NOPORTDOCS%%@exec if [ ! -f %D/etc/ha.d/ha.cf ]; then cp -p %D/%F %B/ha.cf; fi etc/ha.d/harc -@unexec if cmp -s %D/etc/ha.d/logd.cf.sample %D/etc/ha.d/logd.cf; then rm -f %D/etc/ha.d/logd.cf; fi -etc/ha.d/logd.cf.sample -@exec if [ ! -f %D/etc/ha.d/logd.cf ]; then cp -p %D/%F %B/logd.cf; fi +%%NOPORTDOCS%%@unexec if cmp -s %D/etc/ha.d/logd.cf.sample %D/etc/ha.d/logd.cf; then rm -f %D/etc/ha.d/logd.cf; fi +%%NOPORTDOCS%%etc/ha.d/logd.cf.sample +%%NOPORTDOCS%%@exec if [ ! -f %D/etc/ha.d/logd.cf ]; then cp -p %D/%F %B/logd.cf; fi %%LDIRECTORD%%@unexec if cmp -s %D/etc/ha.d/ldirectord.cf.sample %D/etc/ha.d/ldirectord.cf; then rm -f %D/etc/ha.d/ldirectord.cf; fi %%LDIRECTORD%%etc/ha.d/ldirectord.cf.sample %%LDIRECTORD%%@exec if [ ! -f %D/etc/ha.d/ldirectord.cf ]; then cp -p %D/%F %B/ldirectord.cf; fi |