summaryrefslogtreecommitdiffstats
path: root/devel/libgtop
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2008-02-15 01:32:05 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2008-02-15 01:32:05 +0800
commit0c6c586dc00e0fb3cb5998f828eab5d9d4065858 (patch)
tree93795ce054bae18dd01a5f3f6d3c2765d7937afc /devel/libgtop
parent984bf56a64337b8b1c7fffd0a40ab591cda2c8d7 (diff)
downloadmarcuscom-ports-0c6c586dc00e0fb3cb5998f828eab5d9d4065858.tar
marcuscom-ports-0c6c586dc00e0fb3cb5998f828eab5d9d4065858.tar.gz
marcuscom-ports-0c6c586dc00e0fb3cb5998f828eab5d9d4065858.tar.bz2
marcuscom-ports-0c6c586dc00e0fb3cb5998f828eab5d9d4065858.tar.lz
marcuscom-ports-0c6c586dc00e0fb3cb5998f828eab5d9d4065858.tar.xz
marcuscom-ports-0c6c586dc00e0fb3cb5998f828eab5d9d4065858.tar.zst
marcuscom-ports-0c6c586dc00e0fb3cb5998f828eab5d9d4065858.zip
Sync with FreeBSD ports tree.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@10446 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'devel/libgtop')
-rw-r--r--devel/libgtop/Makefile4
-rw-r--r--devel/libgtop/files/patch-sysdeps_freebsd_shm_limits.c22
2 files changed, 24 insertions, 2 deletions
diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index 87abfe01c..4d0be8a44 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/libgtop/Makefile,v 1.29 2008/02/10 00:14:15 marcus Exp $
+# $MCom: ports/devel/libgtop/Makefile,v 1.30 2008/02/10 00:52:19 marcus Exp $
#
PORTNAME= libgtop
PORTVERSION= 2.21.5
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_shm_limits.c b/devel/libgtop/files/patch-sysdeps_freebsd_shm_limits.c
new file mode 100644
index 000000000..755bb6231
--- /dev/null
+++ b/devel/libgtop/files/patch-sysdeps_freebsd_shm_limits.c
@@ -0,0 +1,22 @@
+--- sysdeps/freebsd/shm_limits.c.orig 2008-02-14 12:26:46.000000000 -0500
++++ sysdeps/freebsd/shm_limits.c 2008-02-14 12:26:29.000000000 -0500
+@@ -25,6 +25,7 @@
+ #include <glibtop/shm_limits.h>
+
+ #include <sys/types.h>
++#include <sys/param.h>
+ #include <sys/sysctl.h>
+
+ static unsigned long _glibtop_sysdeps_shm_limits =
+@@ -46,7 +47,11 @@ void
+ glibtop_get_shm_limits_s (glibtop *server, glibtop_shm_limits *buf)
+ {
+ size_t len;
++#if __FreeBSD_version < 800020
+ int shmmax, shmmin, shmmni, shmseg, shmall;
++#else
++ unsigned long shmmax, shmmin, shmmni, shmseg, shmall;
++#endif
+
+ glibtop_init_s (&server, GLIBTOP_SYSDEPS_SHM_LIMITS, 0);
+