summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkuriyama <kuriyama@FreeBSD.org>2003-05-07 00:30:12 +0000
committerkuriyama <kuriyama@FreeBSD.org>2003-05-07 00:30:12 +0000
commit78aae6e30ce74708696d8aa408687980af249fa3 (patch)
tree9ae0b30f384d75f411f112df2fbac216732ee745
parentf5b1e474a520f2f8b7d581992ea823cdc6f0f747 (diff)
downloadFreeBSD-ports-78aae6e30ce74708696d8aa408687980af249fa3.zip
FreeBSD-ports-78aae6e30ce74708696d8aa408687980af249fa3.tar.gz
Unbreak on -current.
Fix plist on deinstall.
-rw-r--r--sysutils/kcpuload/Makefile1
-rw-r--r--sysutils/kcpuload/files/patch-kcpuproc.cpp16
-rw-r--r--sysutils/kcpuload/pkg-plist14
3 files changed, 24 insertions, 7 deletions
diff --git a/sysutils/kcpuload/Makefile b/sysutils/kcpuload/Makefile
index ec1a816..cf3d435 100644
--- a/sysutils/kcpuload/Makefile
+++ b/sysutils/kcpuload/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kcpuload
PORTVERSION= 1.99
+PORTREVISION= 1
CATEGORIES= sysutils kde
MASTER_SITES= http://ftp.kde.com/Administration/Monitoring/Resources/KCPULoad/
diff --git a/sysutils/kcpuload/files/patch-kcpuproc.cpp b/sysutils/kcpuload/files/patch-kcpuproc.cpp
new file mode 100644
index 0000000..8e56e5b
--- /dev/null
+++ b/sysutils/kcpuload/files/patch-kcpuproc.cpp
@@ -0,0 +1,16 @@
+--- kcpuload/kcpuproc.cpp.orig Wed May 7 09:07:19 2003
++++ kcpuload/kcpuproc.cpp Wed May 7 09:16:42 2003
+@@ -18,8 +18,12 @@
+
+ // BSD-specific includes.
+ #ifdef Q_OS_BSD4
+-#include <sys/dkstat.h>
+ #include <sys/param.h>
++#if defined(__FreeBSD__) && __FreeBSD_version >= 500101
++#include <sys/resource.h>
++#else
++#include <sys/dkstat.h>
++#endif
+ #include <sys/sysctl.h>
+ #include <string.h>
+ #include <kvm.h>
diff --git a/sysutils/kcpuload/pkg-plist b/sysutils/kcpuload/pkg-plist
index 374b2fb..5bb12a3 100644
--- a/sysutils/kcpuload/pkg-plist
+++ b/sysutils/kcpuload/pkg-plist
@@ -34,10 +34,10 @@ share/icons/locolor/32x32/apps/kcpuload.png
@dirrm share/apps/kcpuload
@dirrm share/doc/HTML/en/kcpuload/common
@dirrm share/doc/HTML/en/kcpuload
-@dirrm share/icons/crystalsvg/16x16/apps
-@dirrm share/icons/crystalsvg/16x16
-@dirrm share/icons/crystalsvg/32x32/apps
-@dirrm share/icons/crystalsvg/32x32
-@dirrm share/icons/crystalsvg/48x48/apps
-@dirrm share/icons/crystalsvg/48x48
-@dirrm share/icons/crystalsvg
+@unexec rmdir %D/share/icons/crystalsvg/16x16/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/crystalsvg/16x16 2>/dev/null || true
+@unexec rmdir %D/share/icons/crystalsvg/32x32/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/crystalsvg/32x32 2>/dev/null || true
+@unexec rmdir %D/share/icons/crystalsvg/48x48/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/crystalsvg/48x48 2>/dev/null || true
+@unexec rmdir %D/share/icons/crystalsvg 2>/dev/null || true
OpenPOWER on IntegriCloud