summaryrefslogtreecommitdiff
path: root/sysutils
diff options
context:
space:
mode:
authorColin Percival <cperciva@FreeBSD.org>2005-03-06 11:32:22 +0000
committerColin Percival <cperciva@FreeBSD.org>2005-03-06 11:32:22 +0000
commit93517e4c8b47cf07a082c9bd57821b3313d36b24 (patch)
treec8dd16c0d2a89c30f317cec9cf0f7b54ef23d716 /sysutils
parent- Update to phpmyadmin-2.6.1.pl3 which corrects some pugs introduced (diff)
Set IGNORE for est and estctrl on recent -CURRENTs, since njl has added
them to the base system (as part of cpufreq, and under the name "powerd", respectively). Approved by: pav
Notes
Notes: svn path=/head/; revision=130445
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/est/Makefile8
-rw-r--r--sysutils/estctrl/Makefile8
2 files changed, 14 insertions, 2 deletions
diff --git a/sysutils/est/Makefile b/sysutils/est/Makefile
index dcae913da7be..fd9164b16b4a 100644
--- a/sysutils/est/Makefile
+++ b/sysutils/est/Makefile
@@ -23,6 +23,12 @@ RC_SCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
PLIST_FILES= modules/est.ko \
etc/rc.d/est.sh
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} > 600015
+IGNORE= "est now contained in the base system (see cpufreq(4))"
+.endif
+
post-extract:
${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
${FILESDIR}/est.sh > ${WRKDIR}/est.sh
@@ -34,4 +40,4 @@ post-install:
${INSTALL_SCRIPT} ${WRKDIR}/est.sh ${PREFIX}/etc/rc.d/est.sh
${CAT} ${PKGMESSAGE}
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/sysutils/estctrl/Makefile b/sysutils/estctrl/Makefile
index 1cb2b51785d6..2fbb65e3ec11 100644
--- a/sysutils/estctrl/Makefile
+++ b/sysutils/estctrl/Makefile
@@ -26,6 +26,12 @@ PLIST_FILES= sbin/estctrl \
MAKE_ENV= BINDIR=${PREFIX}/sbin
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} > 600015
+IGNORE= "estctrl now contained in the base system (see powerd(8))"
+.endif
+
post-extract:
${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
${FILESDIR}/estctrl.sh > ${WRKDIR}/estctrl.sh
@@ -34,4 +40,4 @@ post-install:
${INSTALL_SCRIPT} ${WRKDIR}/estctrl.sh ${PREFIX}/etc/rc.d/estctrl.sh
${CAT} ${PKGMESSAGE}
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>