diff options
-rw-r--r-- | sysutils/libgtop/Makefile | 6 | ||||
-rw-r--r-- | sysutils/libgtop/distinfo | 6 | ||||
-rw-r--r-- | sysutils/libgtop/patches/patch-ac | 17 | ||||
-rw-r--r-- | sysutils/libgtop/patches/patch-sysdeps_darwin_glibtop__suid.h | 15 | ||||
-rw-r--r-- | sysutils/libgtop/patches/patch-sysdeps_darwin_proclist.c | 15 |
5 files changed, 49 insertions, 10 deletions
diff --git a/sysutils/libgtop/Makefile b/sysutils/libgtop/Makefile index 29f93ce6aa7..b9061a3fd2d 100644 --- a/sysutils/libgtop/Makefile +++ b/sysutils/libgtop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.50 2016/02/26 10:24:13 jperkin Exp $ +# $NetBSD: Makefile,v 1.51 2016/04/07 11:54:57 youri Exp $ DISTNAME= libgtop-2.28.4 PKGREVISION= 8 @@ -54,7 +54,7 @@ PLIST_VARS+= server suid.h PLIST.server= yes PLIST.suid.h= yes SPECIAL_PERMS= bin/libgtop_server2 ${REAL_ROOT_USER} system 2755 -.elif ${OPSYS} == "Darwin" || ${OPSYS} == "DragonFly" || \ +.elif ${OPSYS} == "DragonFly" || \ ${OPSYS} == "FreeBSD" || ${OPSYS} == "NetBSD" || \ ${OPSYS} == "OpenBSD" PLIST.server= yes @@ -66,6 +66,8 @@ SPECIAL_PERMS= bin/libgtop_server2 ${REAL_ROOT_USER} kmem 2755 .elif ${OPSYS} == "SunOS" PLIST.server= yes SPECIAL_PERMS= bin/libgtop_server2 ${REAL_ROOT_USER} sys 2755 +.elif ${OPSYS} == "Darwin" +PLIST.server= yes .else PLIST.server= yes PLIST.suid.h= yes diff --git a/sysutils/libgtop/distinfo b/sysutils/libgtop/distinfo index 0c2e371c5f5..fcd6c0bd20b 100644 --- a/sysutils/libgtop/distinfo +++ b/sysutils/libgtop/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.30 2015/11/04 01:32:19 agc Exp $ +$NetBSD: distinfo,v 1.31 2016/04/07 11:54:57 youri Exp $ SHA1 (libgtop-2.28.4.tar.bz2) = b6f002cc80a61dc0908dd96e0b543113a46bc4b7 RMD160 (libgtop-2.28.4.tar.bz2) = 96ac76aa409bbd202bedacd94df14cd549e10d6b @@ -6,7 +6,7 @@ SHA512 (libgtop-2.28.4.tar.bz2) = 3bfb844eb09e4afed1f15f2d948fe09bf2080be52f3914 Size (libgtop-2.28.4.tar.bz2) = 819576 bytes SHA1 (patch-aa) = b056c00edebf3578364de50bcd1345bff67b45bc SHA1 (patch-ab) = cd11ad54870ab54fb940f922c1cc55d1c7ec2161 -SHA1 (patch-ac) = 3dd59355e36657df4c8575c35ef11c28d4192d77 +SHA1 (patch-ac) = dc45ad98e21de821b4b23008cd0020c47064c9eb SHA1 (patch-ad) = 304b91c38fa9b39ffcfd2d39d9c382ecdc23469e SHA1 (patch-ae) = 6e8386473dde21f316f867b5212d8c3324abb747 SHA1 (patch-ag) = 8ed7b66b4250dbc6f6321cef24941f58106fcbaf @@ -39,6 +39,8 @@ SHA1 (patch-dm) = ef08973aecacb1fb69f258632dd36edfdafd8c50 SHA1 (patch-dn) = 66f66731a3abd1290f67d62f9ef654f68756bccb SHA1 (patch-sysdeps_bsd_sem_limits.c) = 0cdc5e85a4d8d1297f2f658c1f345bf54abfb02c SHA1 (patch-sysdeps_bsd_shm_limits.c) = 2750d6b5c440f6071111c62ef1069d07867edcf2 +SHA1 (patch-sysdeps_darwin_glibtop__suid.h) = 1887511f74e27c7ed628ae37d5eec173db71ee81 +SHA1 (patch-sysdeps_darwin_proclist.c) = ee8e4df9376f4516787ae2e25453de6d871357d2 SHA1 (patch-sysdeps_freebsd_procwd.c) = 89961a4115785809b1a1dc5dd07f263cf35cf1b8 SHA1 (patch-sysdeps_solaris_glibtop__server.h) = ed3a657ecc024d0d5edc3d436e593b86ed39d726 SHA1 (patch-sysdeps_solaris_procopenfiles.c) = 8aef9e53cdd9d2e13a964e0cde43e71b507fcfa5 diff --git a/sysutils/libgtop/patches/patch-ac b/sysutils/libgtop/patches/patch-ac index 28c79a5e644..d60c8c3f282 100644 --- a/sysutils/libgtop/patches/patch-ac +++ b/sysutils/libgtop/patches/patch-ac @@ -1,17 +1,22 @@ -$NetBSD: patch-ac,v 1.6 2007/11/05 19:06:03 drochner Exp $ +$NetBSD: patch-ac,v 1.7 2016/04/07 11:54:57 youri Exp $ ---- sysdeps/common/mountlist.c.orig 2007-04-27 00:27:34.000000000 +0200 +--- sysdeps/common/mountlist.c.orig 2011-06-01 15:40:47.000000000 +0000 +++ sysdeps/common/mountlist.c -@@ -106,7 +106,7 @@ static struct mount_entry *read_filesyst +@@ -105,8 +105,12 @@ static struct mount_entry *read_filesyst + #define MOUNTED_GETMNTTBL #endif ++#ifdef __APPLE__ ++#define statvfs statfs ++#endif ++ -#if defined (MOUNTED_GETMNTINFO) && !defined (__NetBSD__) && !defined (__OpenBSD__) && !defined(__FreeBSD__) +#if defined (MOUNTED_GETMNTINFO) && !defined (__NetBSD__) && !defined (__OpenBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__) static const char * fstype_to_string (short t) { -@@ -298,7 +298,11 @@ read_filesystem_list (void) +@@ -298,7 +302,11 @@ read_filesystem_list (void) #ifdef MOUNTED_GETMNTINFO /* 4.4BSD. */ { @@ -23,7 +28,7 @@ $NetBSD: patch-ac,v 1.6 2007/11/05 19:06:03 drochner Exp $ int entries; entries = getmntinfo (&fsp, MNT_NOWAIT); -@@ -309,7 +313,7 @@ read_filesystem_list (void) +@@ -309,7 +317,7 @@ read_filesystem_list (void) me = (struct mount_entry *) g_malloc (sizeof (struct mount_entry)); me->me_devname = g_strdup (fsp->f_mntfromname); me->me_mountdir = g_strdup (fsp->f_mntonname); @@ -32,7 +37,7 @@ $NetBSD: patch-ac,v 1.6 2007/11/05 19:06:03 drochner Exp $ me->me_type = g_strdup (fsp->f_fstypename); #else me->me_type = g_strdup (fstype_to_string (fsp->f_type)); -@@ -544,6 +548,7 @@ static gboolean ignore_mount_entry(const +@@ -544,6 +552,7 @@ static gboolean ignore_mount_entry(const "devfs", "devpts", "fusectl", diff --git a/sysutils/libgtop/patches/patch-sysdeps_darwin_glibtop__suid.h b/sysutils/libgtop/patches/patch-sysdeps_darwin_glibtop__suid.h new file mode 100644 index 00000000000..f5d69d8d622 --- /dev/null +++ b/sysutils/libgtop/patches/patch-sysdeps_darwin_glibtop__suid.h @@ -0,0 +1,15 @@ +$NetBSD: patch-sysdeps_darwin_glibtop__suid.h,v 1.1 2016/04/07 11:54:57 youri Exp $ + +Fix Darwin build. + +--- sysdeps/darwin/glibtop_suid.h.orig 2011-06-01 15:40:47.000000000 +0000 ++++ sysdeps/darwin/glibtop_suid.h +@@ -22,6 +22,8 @@ + + G_BEGIN_DECLS + ++#include <glibtop_machine.h> ++ + static inline void glibtop_suid_enter (glibtop *server) { + setreuid (server->machine.uid, server->machine.euid); + }; diff --git a/sysutils/libgtop/patches/patch-sysdeps_darwin_proclist.c b/sysutils/libgtop/patches/patch-sysdeps_darwin_proclist.c new file mode 100644 index 00000000000..562083c604c --- /dev/null +++ b/sysutils/libgtop/patches/patch-sysdeps_darwin_proclist.c @@ -0,0 +1,15 @@ +$NetBSD: patch-sysdeps_darwin_proclist.c,v 1.1 2016/04/07 11:54:57 youri Exp $ + +Fix Darwin build. + +--- sysdeps/darwin/proclist.c.orig 2011-06-01 15:40:47.000000000 +0000 ++++ sysdeps/darwin/proclist.c +@@ -43,7 +43,7 @@ _glibtop_init_proclist_p (glibtop *serve + + pid_t * + glibtop_get_proclist_p (glibtop *server, glibtop_proclist *buf, +- int64_t which, int64_t arg) ++ gint64 which, gint64 arg) + { + unsigned count, total, i; + pid_t *pids_chain; |