/devel/p5-SPOPS/

epository'/>
summaryrefslogtreecommitdiffstats
path: root/devel/libgtop
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2009-04-11 03:24:39 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2009-04-11 03:24:39 +0800
commit58794b38b1a24b93c9a8c3321694e3883bae4cd0 (patch)
tree3d921b9d8836f0a4c0ba361d4581a70d202545ad /devel/libgtop
parentf33c5fb61cfe4c8856817db7f2c84041a862250b (diff)
downloadmarcuscom-ports-58794b38b1a24b93c9a8c3321694e3883bae4cd0.tar.gz
marcuscom-ports-58794b38b1a24b93c9a8c3321694e3883bae4cd0.tar.zst
marcuscom-ports-58794b38b1a24b93c9a8c3321694e3883bae4cd0.zip
Remove these ports now that they have been merged into FreeBSD ports.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@12240 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'devel/libgtop')
-rw-r--r--devel/libgtop/Makefile49
-rw-r--r--devel/libgtop/distinfo3
-rw-r--r--devel/libgtop/files/patch-config.h.in12
-rw-r--r--devel/libgtop/files/patch-configure81
-rw-r--r--devel/libgtop/files/patch-libgtop-sysdeps.m412
-rw-r--r--devel/libgtop/files/patch-src_daemon_server.c17
-rw-r--r--devel/libgtop/files/patch-sysdeps_freebsd_Makefile.am17
-rw-r--r--devel/libgtop/files/patch-sysdeps_freebsd_Makefile.in43
-rw-r--r--devel/libgtop/files/patch-sysdeps_freebsd_nosuid.c19
-rw-r--r--devel/libgtop/files/patch-sysdeps_freebsd_open.c91
-rw-r--r--devel/libgtop/files/patch-sysdeps_freebsd_procopenfiles.c59
-rw-r--r--devel/libgtop/files/patch-sysdeps_freebsd_procwd.c58
-rw-r--r--devel/libgtop/files/patch-sysdeps_freebsd_suid_open.c94
-rw-r--r--devel/libgtop/files/patch-sysdeps_freebsd_sysinfo.c13
-rw-r--r--devel/libgtop/files/pkg-message13
-rw-r--r--devel/libgtop/pkg-descr3
-rw-r--r--devel/libgtop/pkg-plist205
17 files changed, 0 insertions, 789 deletions
diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
deleted file mode 100644
index 5ba509199..000000000
--- a/devel/libgtop/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-# New ports collection makefile for: libgtop2
-# Date Created: 29 April 2002
-# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
-#
-# $FreeBSD$
-# $MCom: ports/devel/libgtop/Makefile,v 1.45 2009/01/10 01:59:21 mezz Exp $
-#
-
-PORTNAME= libgtop
-PORTVERSION= 2.26.0
-CATEGORIES= devel gnome
-MASTER_SITES= GNOME
-DIST_SUBDIR= gnome2
-
-MAINTAINER= gnome@FreeBSD.org
-COMMENT= GNOME 2 top library
-
-USE_BZIP2= yes
-USE_PERL5_BUILD=yes
-USE_GETTEXT= yes
-USE_GMAKE= yes
-USE_GNOME= gnomehack glib20 ltverhack intlhack
-USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:15
-CONFIGURE_ARGS= --disable-gtk-doc \
- --with-html-dir=${PREFIX}/share/doc
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
-
-INFO= libgtop2
-
-PKGMESSAGE= ${FILESDIR}/pkg-message
-
-.include <bsd.port.pre.mk>
-
-.if ( ${OSVERSION} >= 800000 && ${OSVERSION} < 800019 ) || \
- ${OSVERSION} < 700104
-RUN_DEPENDS+= lsof:${PORTSDIR}/sysutils/lsof
-.endif
-
-post-patch:
- @${FIND} ${WRKSRC} -type f | ${XARGS} ${TOUCH} -f
-
-post-install:
- @${CHGRP} kmem ${PREFIX}/bin/libgtop_server2
- @${CHMOD} 2555 ${PREFIX}/bin/libgtop_server2
- @${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
diff --git a/devel/libgtop/distinfo b/devel/libgtop/distinfo
deleted file mode 100644
index 6bcefcbda..000000000
--- a/devel/libgtop/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gnome2/libgtop-2.26.0.tar.bz2) = a51ff49eddcce4573f7385e4be33158a
-SHA256 (gnome2/libgtop-2.26.0.tar.bz2) = acc11d54614722a752a44237b5e11e9d6508da82c6d7ad25bf97156f5e28a7fd
-SIZE (gnome2/libgtop-2.26.0.tar.bz2) = 791512
diff --git a/devel/libgtop/files/patch-config.h.in b/devel/libgtop/files/patch-config.h.in
deleted file mode 100644
index 8fc4a10b1..000000000
--- a/devel/libgtop/files/patch-config.h.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- config.h.in.orig 2008-12-06 16:05:23.000000000 -0500
-+++ config.h.in 2008-12-06 16:05:27.000000000 -0500
-@@ -115,6 +115,9 @@
- /* defined if you have linux/isdn.h */
- #undef HAVE_ISDN_H
-
-+/* Define if you have the kinfo_getfile function */
-+#undef HAVE_KINFO_GETFILE
-+
- /* Define to 1 if you have the `lchown' function. */
- #undef HAVE_LCHOWN
-
diff --git a/devel/libgtop/files/patch-configure b/devel/libgtop/files/patch-configure
deleted file mode 100644
index 800116d44..000000000
--- a/devel/libgtop/files/patch-configure
+++ /dev/null
@@ -1,81 +0,0 @@
---- configure.orig 2009-01-13 01:39:39.000000000 -0500
-+++ configure 2009-01-13 01:45:25.000000000 -0500
-@@ -21745,6 +21745,78 @@ fi
- if test -n "${osreldate}" && test ${osreldate} -ge 600000 ; then
- EXTRA_SYSDEPS_LIBS="-lgeom -ldevstat"
- fi
-+ { echo "$as_me:$LINENO: checking for kinfo_getfile in -lutil" >&5
-+echo $ECHO_N "checking for kinfo_getfile in -lutil... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_util_kinfo_getfile+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lutil $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char kinfo_getfile ();
-+int
-+main ()
-+{
-+return kinfo_getfile ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-+ ac_cv_lib_util_kinfo_getfile=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ ac_cv_lib_util_kinfo_getfile=no
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_util_kinfo_getfile" >&5
-+echo "${ECHO_T}$ac_cv_lib_util_kinfo_getfile" >&6; }
-+if test $ac_cv_lib_util_kinfo_getfile = yes; then
-+ EXTRA_SYSDEPS_LIBS="${EXTRA_SYSDEPS_LIBS} -lutil"
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_KINFO_GETFILE 1
-+_ACEOF
-+
-+else
-+ :
-+fi
-+
- ;;
- esac
-
diff --git a/devel/libgtop/files/patch-libgtop-sysdeps.m4 b/devel/libgtop/files/patch-libgtop-sysdeps.m4
deleted file mode 100644
index 1805da02a..000000000
--- a/devel/libgtop/files/patch-libgtop-sysdeps.m4
+++ /dev/null
@@ -1,12 +0,0 @@
---- libgtop-sysdeps.m4.orig 2008-04-21 14:58:38.000000000 -0400
-+++ libgtop-sysdeps.m4 2008-12-06 16:16:00.000000000 -0500
-@@ -158,6 +160,9 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
- if test -n "${osreldate}" && test ${osreldate} -ge 600000 ; then
- EXTRA_SYSDEPS_LIBS="-lgeom -ldevstat"
- fi
-+ AC_CHECK_LIB(util, kinfo_getfile,
-+ [EXTRA_SYSDEPS_LIBS="${EXTRA_SYSDEPS_LIBS} -lutil"
-+ AC_DEFINE(HAVE_KINFO_GETFILE, 1, [Define if you have the kinfo_getfile function])], [:])
- ;;
- esac
-
diff --git a/devel/libgtop/files/patch-src_daemon_server.c b/devel/libgtop/files/patch-src_daemon_server.c
deleted file mode 100644
index bf0bba5c7..000000000
--- a/devel/libgtop/files/patch-src_daemon_server.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/daemon/server.c.orig Mon Feb 17 15:22:19 2003
-+++ src/daemon/server.c Mon Feb 17 15:23:31 2003
-@@ -88,11 +88,12 @@
- if (strcmp (uts.sysname, LIBGTOP_COMPILE_SYSTEM) ||
- strcmp (uts.release, LIBGTOP_COMPILE_RELEASE) ||
- strcmp (uts.machine, LIBGTOP_COMPILE_MACHINE)) {
-- fprintf (stderr, "Can only run on %s %s %s\n",
-+ fprintf (stderr, "This libgtop was compiled on %s %s %s\n",
- LIBGTOP_COMPILE_SYSTEM,
- LIBGTOP_COMPILE_RELEASE,
- LIBGTOP_COMPILE_MACHINE);
-- _exit (1);
-+ fprintf (stderr, "If you see strange problems caused by it,\n");
-+ fprintf (stderr, "you should recompile libgtop and dependent applications\n");
- }
- #endif
-
diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_Makefile.am b/devel/libgtop/files/patch-sysdeps_freebsd_Makefile.am
deleted file mode 100644
index 25ec1f7d7..000000000
--- a/devel/libgtop/files/patch-sysdeps_freebsd_Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
---- sysdeps/freebsd/Makefile.am.orig 2008-09-29 17:21:56.000000000 -0400
-+++ sysdeps/freebsd/Makefile.am 2008-09-29 17:22:07.000000000 -0400
-@@ -7,12 +7,12 @@ libgtop_sysdeps_2_0_la_SOURCES = nosuid.
- cpu.c msg_limits.c sem_limits.c loadavg.c \
- uptime.c netlist.c fsusage.c mem.c \
- mountlist.c procopenfiles.c procwd.c \
-- procaffinity.c glibtop_private.c
-+ procaffinity.c glibtop_private.c open.c
-
- libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO)
-
- libgtop_sysdeps_suid_2_0_la_LIBADD = $(KVM_LIBS) $(EXTRA_SYSDEPS_LIBS)
--libgtop_sysdeps_suid_2_0_la_SOURCES = open.c close.c swap.c \
-+libgtop_sysdeps_suid_2_0_la_SOURCES = suid_open.c close.c swap.c \
- proclist.c procstate.c procuid.c \
- proctime.c procmem.c procsignal.c \
- prockernel.c procsegment.c procargs.c \
diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_Makefile.in b/devel/libgtop/files/patch-sysdeps_freebsd_Makefile.in
deleted file mode 100644
index d60fe782e..000000000
--- a/devel/libgtop/files/patch-sysdeps_freebsd_Makefile.in
+++ /dev/null
@@ -1,43 +0,0 @@
---- sysdeps/freebsd/Makefile.in.orig 2009-01-13 01:49:02.172092000 -0500
-+++ sysdeps/freebsd/Makefile.in 2009-01-13 01:53:30.000000000 -0500
-@@ -50,7 +50,8 @@ libgtop_sysdeps_2_0_la_LIBADD =
- am_libgtop_sysdeps_2_0_la_OBJECTS = nosuid.lo siglist.lo sysinfo.lo \
- shm_limits.lo cpu.lo msg_limits.lo sem_limits.lo loadavg.lo \
- uptime.lo netlist.lo fsusage.lo mem.lo mountlist.lo \
-- procopenfiles.lo procwd.lo procaffinity.lo glibtop_private.lo
-+ procopenfiles.lo procwd.lo procaffinity.lo glibtop_private.lo \
-+ open.lo
- libgtop_sysdeps_2_0_la_OBJECTS = $(am_libgtop_sysdeps_2_0_la_OBJECTS)
- libgtop_sysdeps_2_0_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-@@ -58,7 +59,7 @@ libgtop_sysdeps_2_0_la_LINK = $(LIBTOOL)
- am__DEPENDENCIES_1 =
- libgtop_sysdeps_suid_2_0_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1)
--am_libgtop_sysdeps_suid_2_0_la_OBJECTS = open.lo close.lo swap.lo \
-+am_libgtop_sysdeps_suid_2_0_la_OBJECTS = suid_open.lo close.lo swap.lo \
- proclist.lo procstate.lo procuid.lo proctime.lo procmem.lo \
- procsignal.lo prockernel.lo procsegment.lo procargs.lo \
- procmap.lo netload.lo ppp.lo
-@@ -296,11 +297,11 @@ libgtop_sysdeps_2_0_la_SOURCES = nosuid.
- cpu.c msg_limits.c sem_limits.c loadavg.c \
- uptime.c netlist.c fsusage.c mem.c \
- mountlist.c procopenfiles.c procwd.c \
-- procaffinity.c glibtop_private.c
-+ procaffinity.c glibtop_private.c open.c
-
- libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO)
- libgtop_sysdeps_suid_2_0_la_LIBADD = $(KVM_LIBS) $(EXTRA_SYSDEPS_LIBS)
--libgtop_sysdeps_suid_2_0_la_SOURCES = open.c close.c swap.c \
-+libgtop_sysdeps_suid_2_0_la_SOURCES = suid_open.c close.c swap.c \
- proclist.c procstate.c procuid.c \
- proctime.c procmem.c procsignal.c \
- prockernel.c procsegment.c procargs.c \
-@@ -375,6 +376,7 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netlist.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netload.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nosuid.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/suid_open.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/open.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ppp.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/procaffinity.Plo@am__quote@
diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_nosuid.c b/devel/libgtop/files/patch-sysdeps_freebsd_nosuid.c
deleted file mode 100644
index acb327f98..000000000
--- a/devel/libgtop/files/patch-sysdeps_freebsd_nosuid.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- sysdeps/freebsd/nosuid.c.orig 2008-09-29 17:28:31.000000000 -0400
-+++ sysdeps/freebsd/nosuid.c 2008-09-29 17:28:39.000000000 -0400
-@@ -21,16 +21,8 @@
-
- #include <config.h>
- #include <glibtop.h>
--#include <glibtop/open.h>
- #include <glibtop/close.h>
-
- void
--glibtop_open_s (glibtop *server,
-- const char *program_name,
-- const unsigned long features,
-- const unsigned flags)
--{ }
--
--void
- glibtop_close_s (glibtop *server)
- { }
diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_open.c b/devel/libgtop/files/patch-sysdeps_freebsd_open.c
deleted file mode 100644
index f7bf0e3b1..000000000
--- a/devel/libgtop/files/patch-sysdeps_freebsd_open.c
+++ /dev/null
@@ -1,91 +0,0 @@
---- sysdeps/freebsd/open.c.orig 2008-05-23 18:13:23.000000000 -0400
-+++ sysdeps/freebsd/open.c 2008-09-29 17:23:22.000000000 -0400
-@@ -20,76 +20,33 @@
- */
-
- #include <config.h>
-+#include <sys/types.h>
-+#include <sys/sysctl.h>
- #include <glibtop.h>
--#include <glibtop/error.h>
- #include <glibtop/open.h>
--#include <glibtop/init_hooks.h>
--
--/* !!! THIS FUNCTION RUNS SUID ROOT - CHANGE WITH CAUTION !!! */
--
--void
--glibtop_init_p (glibtop *server, const unsigned long features,
-- const unsigned flags)
--{
-- const _glibtop_init_func_t *init_fkt;
--
-- if (server == NULL)
-- glibtop_error_r (NULL, "glibtop_init_p (server == NULL)");
--
-- /* Do the initialization, but only if not already initialized. */
--
-- if ((server->flags & _GLIBTOP_INIT_STATE_SYSDEPS) == 0) {
-- glibtop_open_p (server, "glibtop", features, flags);
-+#include <glibtop/cpu.h>
-+#include <glibtop/error.h>
-
-- for (init_fkt = _glibtop_init_hook_p; *init_fkt; init_fkt++)
-- (*init_fkt) (server);
-+#include <glibtop_private.h>
-
-- server->flags |= _GLIBTOP_INIT_STATE_SYSDEPS;
-- }
--}
-
- void
--glibtop_open_p (glibtop *server, const char *program_name,
-+glibtop_open_s (glibtop *server, const char *program_name,
- const unsigned long features,
- const unsigned flags)
- {
--#ifdef DEBUG
-- fprintf (stderr, "DEBUG (%d): glibtop_open_p ()\n", getpid ());
--#endif
-+ int ncpus;
-+ size_t len;
-
-- /* !!! WE ARE ROOT HERE - CHANGE WITH CAUTION !!! */
-+ len = sizeof (ncpus);
-+ sysctlbyname ("hw.ncpu", &ncpus, &len, NULL, 0);
-+ server->real_ncpu = ncpus - 1;
-+ server->ncpu = MIN(GLIBTOP_NCPU - 1, server->real_ncpu);
-
-- server->machine.uid = getuid ();
-- server->machine.euid = geteuid ();
-- server->machine.gid = getgid ();
-- server->machine.egid = getegid ();
- #if defined(__FreeBSD_kernel__)
- server->os_version_code = __FreeBSD_kernel_version;
- #else
- server->os_version_code = __FreeBSD_version;
- #endif
-- /* Setup machine-specific data */
-- server->machine.kd = kvm_open (NULL, NULL, NULL, O_RDONLY, "kvm_open");
--
-- if (server->machine.kd == NULL)
-- glibtop_error_io_r (server, "kvm_open");
--
-- /* Drop priviledges. */
--
-- if (setreuid (server->machine.euid, server->machine.uid))
-- _exit (1);
--
-- if (setregid (server->machine.egid, server->machine.gid))
-- _exit (1);
--
-- /* !!! END OF SUID ROOT PART !!! */
--
-- /* Our effective uid is now those of the user invoking the server,
-- * so we do no longer have any priviledges. */
-
-- /* NOTE: On FreeBSD, we do not need to be suid root, we just need to
-- * be sgid kmem.
-- *
-- * The server will only use setegid() to get back it's priviledges,
-- * so it will fail if it is suid root and not sgid kmem. */
- }
diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_procopenfiles.c b/devel/libgtop/files/patch-sysdeps_freebsd_procopenfiles.c
deleted file mode 100644
index e14dd39bd..000000000
--- a/devel/libgtop/files/patch-sysdeps_freebsd_procopenfiles.c
+++ /dev/null
@@ -1,59 +0,0 @@
---- sysdeps/freebsd/procopenfiles.c.orig 2008-08-18 11:23:36.000000000 -0400
-+++ sysdeps/freebsd/procopenfiles.c 2008-12-07 00:17:26.000000000 -0500
-@@ -35,6 +35,9 @@
- #include <sys/user.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
-+#ifdef HAVE_KINFO_PROC
-+#include <libutil.h>
-+#endif
- #include <string.h>
- #include <stdlib.h>
-
-@@ -263,8 +266,12 @@ glibtop_get_proc_open_files_s (glibtop *
- {
- #if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104)
- struct kinfo_file *freep, *kif;
-+#ifndef HAVE_KINFO_GETFILE
- int name[4];
- size_t len;
-+#else
-+ int cnt;
-+#endif
- size_t i;
- #else
- char *output;
-@@ -274,6 +281,7 @@ glibtop_get_proc_open_files_s (glibtop *
- memset(buf, 0, sizeof (glibtop_proc_open_files));
-
- #if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104)
-+#ifndef HAVE_KINFO_GETFILE
- name[0] = CTL_KERN;
- name[1] = KERN_PROC;
- name[2] = KERN_PROC_FILEDESC;
-@@ -287,12 +295,25 @@ glibtop_get_proc_open_files_s (glibtop *
- g_free(freep);
- return NULL;
- }
-+#else
-+ freep = kinfo_getfile(pid, &cnt);
-+#endif
-
- entries = g_array_new(FALSE, FALSE, sizeof(glibtop_open_files_entry));
-
-+#ifndef HAVE_KINFO_GETFILE
- for (i = 0; i < len / sizeof(*kif); i++, kif++) {
- glibtop_open_files_entry entry = {0};
-
-+ if (kif->kf_structsize != sizeof(*kif))
-+ continue;
-+#else
-+ for (i = 0; i < cnt; i++) {
-+ glibtop_open_files_entry entry = {0};
-+
-+ kif = &freep[i];
-+#endif
-+
- if (kif->kf_fd < 0)
- continue;
-
diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_procwd.c b/devel/libgtop/files/patch-sysdeps_freebsd_procwd.c
deleted file mode 100644