diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2008-04-14 06:17:55 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2008-04-14 06:17:55 +0000 |
| commit | de4e5b505cab180b30f87d31d4efa0adae0a5bc8 (patch) | |
| tree | b1e074841d65b05cf3d13b0df179e46078d48b8f /devel/libgtop | |
| parent | 716460e3098a503aee8f68936d245e24a9d2d6d5 (diff) | |
| download | ports-de4e5b505cab180b30f87d31d4efa0adae0a5bc8.tar.gz ports-de4e5b505cab180b30f87d31d4efa0adae0a5bc8.zip | |
Notes
Diffstat (limited to 'devel/libgtop')
| -rw-r--r-- | devel/libgtop/Makefile | 4 | ||||
| -rw-r--r-- | devel/libgtop/files/patch-sysdeps_freebsd_procopenfiles.c | 6 | ||||
| -rw-r--r-- | devel/libgtop/files/patch-sysdeps_freebsd_procwd.c | 6 |
3 files changed, 9 insertions, 7 deletions
diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile index a016e66906cd..1d0c78be470d 100644 --- a/devel/libgtop/Makefile +++ b/devel/libgtop/Makefile @@ -8,6 +8,7 @@ PORTNAME= libgtop PORTVERSION= 2.22.1 +PORTREVISION= 1 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -31,7 +32,8 @@ INFO= libgtop2 .include <bsd.port.pre.mk> -.if ${OSVERSION} < 800019 +.if ( ${OSVERSION} >= 800000 && ${OSVERSION} < 800019 ) || \ + ${OSVERSION} < 700104 RUN_DEPENDS+= lsof:${PORTSDIR}/sysutils/lsof .endif diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_procopenfiles.c b/devel/libgtop/files/patch-sysdeps_freebsd_procopenfiles.c index 93e596dcf5fb..eefdb3d6acb6 100644 --- a/devel/libgtop/files/patch-sysdeps_freebsd_procopenfiles.c +++ b/devel/libgtop/files/patch-sysdeps_freebsd_procopenfiles.c @@ -18,7 +18,7 @@ server->sysdeps.proc_open_files = _glibtop_sysdeps_proc_open_files; } -+#if __FreeBSD_version > 800018 ++#if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104) +static char * +addr_to_string(struct sockaddr_storage *ss) +{ @@ -87,7 +87,7 @@ glibtop_open_files_entry * glibtop_get_proc_open_files_s (glibtop *server, glibtop_proc_open_files *buf, pid_t pid) { -+#if __FreeBSD_version > 800018 ++#if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104) + struct kinfo_file *freep, *kif; + int name[4]; + size_t len; @@ -99,7 +99,7 @@ memset(buf, 0, sizeof (glibtop_proc_open_files)); -+#if __FreeBSD_version > 800018 ++#if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104) + name[0] = CTL_KERN; + name[1] = KERN_PROC; + name[2] = KERN_PROC_FILEDESC; diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_procwd.c b/devel/libgtop/files/patch-sysdeps_freebsd_procwd.c index 08a58359e584..d6fb5063d399 100644 --- a/devel/libgtop/files/patch-sysdeps_freebsd_procwd.c +++ b/devel/libgtop/files/patch-sysdeps_freebsd_procwd.c @@ -14,7 +14,7 @@ server->sysdeps.proc_wd = _glibtop_sysdeps_proc_wd; } -+#if __FreeBSD_version < 800019 ++#if (__FreeBSD_version >= 800000 && __FreeBSD_version < 800019) || _FreeBSD_version < 700104 static GPtrArray * parse_output(const char *output, glibtop_proc_wd *buf) { @@ -28,7 +28,7 @@ glibtop_get_proc_wd_s(glibtop *server, glibtop_proc_wd *buf, pid_t pid) { char path[MAXPATHLEN]; -+#if __FreeBSD_version > 800018 ++#if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104) + struct kinfo_file *freep, *kif; + GPtrArray *dirs; + size_t len; @@ -44,7 +44,7 @@ if (safe_readlink(path, buf->exe, sizeof(buf->exe))) buf->flags |= (1 << GLIBTOP_PROC_WD_EXE); -+#if __FreeBSD_version > 800018 ++#if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104) + name[0] = CTL_KERN; + name[1] = KERN_PROC; + name[2] = KERN_PROC_FILEDESC; |