diff options
| -rw-r--r-- | sysutils/est/Makefile | 10 | ||||
| -rw-r--r-- | sysutils/est/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/est/files/est.c.diff.fbsd4 | 27 |
3 files changed, 4 insertions, 37 deletions
diff --git a/sysutils/est/Makefile b/sysutils/est/Makefile index 1162263c579f..563351aab252 100644 --- a/sysutils/est/Makefile +++ b/sysutils/est/Makefile @@ -6,7 +6,7 @@ # PORTNAME= est -PORTVERSION= 0.6 +PORTVERSION= 0.7 CATEGORIES= sysutils MASTER_SITES= http://www.daemonology.net/freebsd-est/ @@ -23,12 +23,6 @@ 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} < 500023 -EXTRA_PATCHES= ${FILESDIR}/est.c.diff.fbsd4 -.endif - post-extract: ${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ ${FILESDIR}/est.sh > ${WRKDIR}/est.sh @@ -40,4 +34,4 @@ post-install: ${INSTALL_SCRIPT} ${WRKDIR}/est.sh ${PREFIX}/etc/rc.d/est.sh ${CAT} ${PKGMESSAGE} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/est/distinfo b/sysutils/est/distinfo index a71f1d1bf55e..9aff4551ab3e 100644 --- a/sysutils/est/distinfo +++ b/sysutils/est/distinfo @@ -1,2 +1,2 @@ -MD5 (est-0.6.tar.gz) = 57cf42fa9d1bf213a25c70e3cf5a2e08 -SIZE (est-0.6.tar.gz) = 3891 +MD5 (est-0.7.tar.gz) = d35f170283d5f5cf4db6cae755ec3cb0 +SIZE (est-0.7.tar.gz) = 5031 diff --git a/sysutils/est/files/est.c.diff.fbsd4 b/sysutils/est/files/est.c.diff.fbsd4 deleted file mode 100644 index d9eb77eab9ff..000000000000 --- a/sysutils/est/files/est.c.diff.fbsd4 +++ /dev/null @@ -1,27 +0,0 @@ ---- est.c.orig Thu Aug 26 22:51:42 2004 -+++ est.c Thu Aug 26 22:53:59 2004 -@@ -33,7 +33,7 @@ - #include <sys/sysctl.h> - #include <sys/module.h> - #include <sys/kernel.h> --#include <sys/pcpu.h> -+#include <sys/proc.h> - - typedef struct { - int mhz; -@@ -566,13 +566,13 @@ - - switch (what) { - case MOD_LOAD: -- err = kernel_sysctlbyname(curthread, "hw.model", hwmodel, -+ err = kernel_sysctlbyname(curproc, "hw.model", hwmodel, - &modellen, NULL, 0, NULL); - if (err) - return err; - - ncpulen = sizeof(ncpu); -- err = kernel_sysctlbyname(curthread, "hw.ncpu", &ncpu, -+ err = kernel_sysctlbyname(curproc, "hw.ncpu", &ncpu, - &ncpulen, NULL, 0, NULL); - if (err) - return err; |