diff options
28 files changed, 4 insertions, 1026 deletions
diff --git a/devel/Makefile b/devel/Makefile index c4773f344b9..d8fdf81e16d 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.480 2004/04/02 09:24:44 jmmv Exp $ +# $NetBSD: Makefile,v 1.481 2004/04/02 12:20:24 jmmv Exp $ # COMMENT= Development utilities @@ -196,8 +196,6 @@ SUBDIR+= libgnome SUBDIR+= libgnomeui SUBDIR+= libgphoto2 SUBDIR+= libgsf -SUBDIR+= libgtop -SUBDIR+= libgtop2 SUBDIR+= libhfs SUBDIR+= libidn SUBDIR+= libmemmgr diff --git a/devel/libgtop/DESCR b/devel/libgtop/DESCR deleted file mode 100644 index 55f3012d616..00000000000 --- a/devel/libgtop/DESCR +++ /dev/null @@ -1,4 +0,0 @@ -libgtop is a library that fetches system information about the running -system such as cpu and memory usage, active processes etc. It -provides a setgid server that fetches the information and a -client-side library that talks to this server. diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile deleted file mode 100644 index a131cce6da7..00000000000 --- a/devel/libgtop/Makefile +++ /dev/null @@ -1,55 +0,0 @@ -# $NetBSD: Makefile,v 1.79 2004/03/01 03:39:56 kristerw Exp $ - -DISTNAME= libgtop-1.0.13 -PKGREVISION= 4 -CATEGORIES= devel gnome -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgtop/1.0/} -EXTRACT_SUFX= .tar.bz2 - -MAINTAINER= tron@NetBSD.org -HOMEPAGE= http://www.gnome.org/ -COMMENT= Library to retrieve system information, used in GNOME - -BUILD_USES_MSGFMT= yes - -NOT_FOR_PLATFORM= SunOS-*-* -OSVERSION_SPECIFIC= yes - -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == NetBSD -. if (${MACHINE_ARCH} != alpha) && (${MACHINE_ARCH} != x86_64) && \ - (${MACHINE_ARCH} != arm) && (${MACHINE_ARCH} != arm32) && \ - (${MACHINE_ARCH} != i386) && (${MACHINE_ARCH} != m68k) && \ - (${MACHINE_ARCH} != mipsel) && (${MACHINE_ARCH} != powerpc) && \ - (${MACHINE_ARCH} != sparc) && (${MACHINE_ARCH} != sparc64) -PKG_FAIL_REASON= "${PKGNAME} has not yet been ported to ${MACHINE_ARCH}." -PKG_FAIL_REASON+= "Please look at /usr/include/${MACHINE_ARCH}/pcb.h" -PKG_FAIL_REASON+= "and update patches/patch-al appropriately." -PKG_FAIL_REASON+= "(More information can be found in libgtop.info.)" -. endif -.endif - -USE_PERL5= build -USE_BUILDLINK2= yes -USE_PKGLOCALEDIR= yes -USE_X11BASE= YES -USE_GNU_TOOLS+= make -USE_LIBTOOL= YES -USE_MAKEINFO= YES -INFO_FILES= libgtop.info - -# The following flags are for debugging purposes. They don't need to -# be used unless you are actively developing/debugging libgtop. -#CPPFLAGS+= -DLIBGTOP_ENABLE_DEBUG -DLIBGTOP_FATAL_WARNINGS -#CFLAGS+= -g -#LDFLAGS+= -g - -GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --with-glib-prefix=${BUILDLINK_PREFIX.glib} \ - --with-catgets --with-libgtop-guile=no -CONFIGURE_ENV+= AWK="${AWK}" LN_S="${LN} -s" PERL="${PERL5}" - -.include "../../devel/gettext-lib/buildlink2.mk" -.include "../../x11/gnome-libs/buildlink2.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/devel/libgtop/PLIST b/devel/libgtop/PLIST deleted file mode 100644 index c38bd7e1c08..00000000000 --- a/devel/libgtop/PLIST +++ /dev/null @@ -1,115 +0,0 @@ -@comment $NetBSD: PLIST,v 1.6 2004/02/16 11:26:34 seb Exp $ -bin/libgtop-config -bin/libgtop_daemon -bin/libgtop_server -include/libgtop-1.0/glibtop.h -include/libgtop-1.0/glibtop/close.h -include/libgtop-1.0/glibtop/command.h -include/libgtop-1.0/glibtop/cpu.h -include/libgtop-1.0/glibtop/error.h -include/libgtop-1.0/glibtop/fsusage.h -include/libgtop-1.0/glibtop/global.h -include/libgtop-1.0/glibtop/gnuserv.h -include/libgtop-1.0/glibtop/inodedb.h -include/libgtop-1.0/glibtop/loadavg.h -include/libgtop-1.0/glibtop/mem.h -include/libgtop-1.0/glibtop/mountlist.h -include/libgtop-1.0/glibtop/msg_limits.h -include/libgtop-1.0/glibtop/netload.h -include/libgtop-1.0/glibtop/open.h -include/libgtop-1.0/glibtop/parameter.h -include/libgtop-1.0/glibtop/ppp.h -include/libgtop-1.0/glibtop/procargs.h -include/libgtop-1.0/glibtop/prockernel.h -include/libgtop-1.0/glibtop/proclist.h -include/libgtop-1.0/glibtop/procmap.h -include/libgtop-1.0/glibtop/procmem.h -include/libgtop-1.0/glibtop/procsegment.h -include/libgtop-1.0/glibtop/procsignal.h -include/libgtop-1.0/glibtop/procstate.h -include/libgtop-1.0/glibtop/proctime.h -include/libgtop-1.0/glibtop/procuid.h -include/libgtop-1.0/glibtop/read.h -include/libgtop-1.0/glibtop/read_data.h -include/libgtop-1.0/glibtop/sem_limits.h -include/libgtop-1.0/glibtop/shm_limits.h -include/libgtop-1.0/glibtop/signal.h -include/libgtop-1.0/glibtop/swap.h -include/libgtop-1.0/glibtop/sysdeps.h -include/libgtop-1.0/glibtop/sysinfo.h -include/libgtop-1.0/glibtop/types.h -include/libgtop-1.0/glibtop/union.h -include/libgtop-1.0/glibtop/uptime.h -include/libgtop-1.0/glibtop/version.h -include/libgtop-1.0/glibtop/write.h -include/libgtop-1.0/glibtop/xmalloc.h -include/libgtop-1.0/glibtop_machine.h -include/libgtop-1.0/glibtop_server.h -include/libgtop-1.0/glibtop_suid.h -lib/libgtop-features.def -lib/libgtop.a -lib/libgtop.la -lib/libgtop.so -lib/libgtop.so.1 -lib/libgtop.so.1.12 -lib/libgtopConf.sh -lib/libgtop_common.a -lib/libgtop_common.la -lib/libgtop_common.so -lib/libgtop_common.so.1 -lib/libgtop_common.so.1.12 -lib/libgtop_names.a -lib/libgtop_names.la -lib/libgtop_names.so -lib/libgtop_names.so.1 -lib/libgtop_names.so.1.12 -lib/libgtop_suid_common.a -lib/libgtop_suid_common.la -lib/libgtop_suid_common.so -lib/libgtop_suid_common.so.1 -lib/libgtop_suid_common.so.1.12 -lib/libgtop_sysdeps.a -lib/libgtop_sysdeps.la -lib/libgtop_sysdeps.so -lib/libgtop_sysdeps.so.1 -lib/libgtop_sysdeps.so.1.12 -lib/libgtop_sysdeps_suid.a -lib/libgtop_sysdeps_suid.la -lib/libgtop_sysdeps_suid.so -lib/libgtop_sysdeps_suid.so.1 -lib/libgtop_sysdeps_suid.so.1.12 -${PKGLOCALEDIR}/locale/az/LC_MESSAGES/libgtop.mo -${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/libgtop.mo -${PKGLOCALEDIR}/locale/da/LC_MESSAGES/libgtop.mo -${PKGLOCALEDIR}/locale/de/LC_MESSAGES/libgtop.mo -${PKGLOCALEDIR}/locale/el/LC_MESSAGES/libgtop.mo -${PKGLOCALEDIR}/locale/es/LC_MESSAGES/libgtop.mo -${PKGLOCALEDIR}/locale/es_DO/LC_MESSAGES/libgtop.mo -${PKGLOCALEDIR}/locale/es_GT/LC_MESSAGES/libgtop.mo -${PKGLOCALEDIR}/locale/es_HN/LC_MESSAGES/libgtop.mo -${PKGLOCALEDIR}/locale/es_MX/LC_MESSAGES/libgtop.mo -${PKGLOCALEDIR}/locale/es_PA/LC_MESSAGES/libgtop.mo -${PKGLOCALEDIR}/locale/es_PE/LC_MESSAGES/libgtop.mo -${PKGLOCALEDIR}/locale/es_SV/LC_MESSAGES/libgtop.mo -${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/libgtop.mo -${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/libgtop.mo -${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/libgtop.mo -${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/libgtop.mo -${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/libgtop.mo -${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/libgtop.mo -${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/libgtop.mo -${PKGLOCALEDIR}/locale/no/LC_MESSAGES/libgtop.mo -${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/libgtop.mo -${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/libgtop.mo -${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/libgtop.mo -${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/libgtop.mo -${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/libgtop.mo -${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/libgtop.mo -${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/libgtop.mo -${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/libgtop.mo -${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/libgtop.mo -${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/libgtop.mo -${PKGLOCALEDIR}/locale/zh_CN.GB2312/LC_MESSAGES/libgtop.mo -${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/libgtop.mo -@dirrm include/libgtop-1.0/glibtop -@dirrm include/libgtop-1.0 diff --git a/devel/libgtop/buildlink2.mk b/devel/libgtop/buildlink2.mk deleted file mode 100644 index 0c59f4b1ed9..00000000000 --- a/devel/libgtop/buildlink2.mk +++ /dev/null @@ -1,35 +0,0 @@ -# $NetBSD: buildlink2.mk,v 1.5 2004/01/03 18:49:38 reed Exp $ -# -# This Makefile fragment is included by packages that use libgtop. -# -# This file was created automatically using createbuildlink 2.2. -# - -.if !defined(LIBGTOP_BUILDLINK2_MK) -LIBGTOP_BUILDLINK2_MK= # defined - -BUILDLINK_PACKAGES+= libgtop -BUILDLINK_DEPENDS.libgtop?= libgtop>=1.0.13nb4 -BUILDLINK_PKGSRCDIR.libgtop?= ../../devel/libgtop - -EVAL_PREFIX+= BUILDLINK_PREFIX.libgtop=libgtop -BUILDLINK_PREFIX.libgtop_DEFAULT= ${X11PREFIX} -BUILDLINK_FILES.libgtop+= include/libgtop-1.0/*.h -BUILDLINK_FILES.libgtop+= include/libgtop-1.0/glibtop/*.h -BUILDLINK_FILES.libgtop+= lib/libgtop-features.def -BUILDLINK_FILES.libgtop+= lib/libgtop.* -BUILDLINK_FILES.libgtop+= lib/libgtopConf.sh -BUILDLINK_FILES.libgtop+= lib/libgtop_common.* -BUILDLINK_FILES.libgtop+= lib/libgtop_names.* -BUILDLINK_FILES.libgtop+= lib/libgtop_suid_common.* -BUILDLINK_FILES.libgtop+= lib/libgtop_sysdeps.* -BUILDLINK_FILES.libgtop+= lib/libgtop_sysdeps_suid.* - -.include "../../devel/gettext-lib/buildlink2.mk" -.include "../../x11/gnome-libs/buildlink2.mk" - -BUILDLINK_TARGETS+= libgtop-buildlink - -libgtop-buildlink: _BUILDLINK_USE - -.endif # LIBGTOP_BUILDLINK2_MK diff --git a/devel/libgtop/distinfo b/devel/libgtop/distinfo deleted file mode 100644 index 3dfda0f0a5d..00000000000 --- a/devel/libgtop/distinfo +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: distinfo,v 1.12 2004/03/01 03:39:56 kristerw Exp $ - -SHA1 (libgtop-1.0.13.tar.bz2) = 7002d37ab43ebac14315298472a170ceaedbd072 -Size (libgtop-1.0.13.tar.bz2) = 733873 bytes -SHA1 (patch-aa) = a640afa2d6a8b7f418052fabbdb04bfc6805b42d -SHA1 (patch-ab) = 3ce99bf4d72cf4e4203364d78361c8a2df081d8d -SHA1 (patch-ac) = 644bfe717bdcc993a668a3d075acda8ef39571d8 -SHA1 (patch-ad) = 9522d20b1467b73678003d5c0f98dcac7d312893 -SHA1 (patch-ae) = cf277165382c17d938593934b59d8035175fd8d0 -SHA1 (patch-af) = 6874f04a186a4dccfecadaa2e40a372bc9f2e2fe -SHA1 (patch-ag) = eb02b990d1316ac5f2ec0430e49b9c4487c6dab8 -SHA1 (patch-al) = 15c860638199d3d8c260b89b3fb70ced5054a69c -SHA1 (patch-an) = 339df94fd374d99565be913d1f8b59ea2f7b7881 -SHA1 (patch-ao) = 09cb66ba7ee9a7368ec1cd1d4bd40ea3f6637a31 -SHA1 (patch-ap) = 07a83340eb9d6a36a3f5b2db33eb50c74fbc4777 -SHA1 (patch-aq) = 93ebb47710f1c4cc70406a92503bdc4a5bfa50d2 -SHA1 (patch-ar) = 470e29d999b079a5f75993978b3cdcdec2fd7d9c -SHA1 (patch-as) = 0374fc36c418871e929fbb3c53ab4979e780e8d5 diff --git a/devel/libgtop/patches/patch-aa b/devel/libgtop/patches/patch-aa deleted file mode 100644 index 68a17338e22..00000000000 --- a/devel/libgtop/patches/patch-aa +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-aa,v 1.13 2003/01/21 10:12:31 tron Exp $ - ---- sysdeps/freebsd/glibtop_machine.h.orig Mon Nov 26 23:37:59 2001 -+++ sysdeps/freebsd/glibtop_machine.h Sun Jan 19 23:18:04 2003 -@@ -39,6 +39,14 @@ - #include <osreldate.h> - #endif - -+#ifdef __NetBSD__ -+#include <sys/proc.h> -+ -+#ifndef SRUN -+#define SRUN SACTIVE -+#endif -+#endif -+ - BEGIN_LIBGTOP_DECLS - - typedef struct _glibtop_machine glibtop_machine; diff --git a/devel/libgtop/patches/patch-ab b/devel/libgtop/patches/patch-ab deleted file mode 100644 index 65832588857..00000000000 --- a/devel/libgtop/patches/patch-ab +++ /dev/null @@ -1,48 +0,0 @@ -$NetBSD: patch-ab,v 1.8 2001/01/02 23:45:33 tron Exp $ - ---- sysdeps/freebsd/procsignal.c.orig Sun Feb 13 22:31:39 2000 -+++ sysdeps/freebsd/procsignal.c Wed Jan 3 00:42:45 2001 -@@ -70,7 +70,9 @@ - /* signal: mask of pending signals. - * pinfo [0].kp_proc.p_siglist - */ --#if (defined(__NetBSD__) && (NSIG > 32)) || (__FreeBSD_version >= 400011) -+#if defined(__NetBSD__) && (__NetBSD_Version__ > 105150000) -+ buf->signal [0] = pinfo [0].kp_proc.p_sigctx.ps_siglist.__bits[0]; -+#elif (defined(__NetBSD__) && (NSIG > 32)) || (__FreeBSD_version >= 400011) - buf->signal [0] = pinfo [0].kp_proc.p_siglist.__bits[0]; - #else - buf->signal [0] = pinfo [0].kp_proc.p_siglist; -@@ -79,7 +81,9 @@ - /* blocked: mask of blocked signals. - * pinfo [0].kp_proc.p_sigmask - */ --#if (defined(__NetBSD__) && (NSIG > 32)) || (__FreeBSD_version >= 400011) -+#if defined(__NetBSD__) && (__NetBSD_Version__ > 105150000) -+ buf->blocked [0] = pinfo [0].kp_proc.p_sigctx.ps_sigmask.__bits[0]; -+#elif (defined(__NetBSD__) && (NSIG > 32)) || (__FreeBSD_version >= 400011) - buf->blocked [0] = pinfo [0].kp_proc.p_sigmask.__bits[0]; - #else - buf->blocked [0] = pinfo [0].kp_proc.p_sigmask; -@@ -88,7 +92,9 @@ - /* sigignore: mask of ignored signals. - * pinfo [0].kp_proc.p_sigignore - */ --#if (defined(__NetBSD__) && (NSIG > 32)) || (__FreeBSD_version >= 400011) -+#if defined(__NetBSD__) && (__NetBSD_Version__ > 105150000) -+ buf->sigignore [0] = pinfo [0].kp_proc.p_sigctx.ps_sigignore.__bits[0]; -+#elif (defined(__NetBSD__) && (NSIG > 32)) || (__FreeBSD_version >= 400011) - buf->sigignore [0] = pinfo [0].kp_proc.p_sigignore.__bits[0]; - #else - buf->sigignore [0] = pinfo [0].kp_proc.p_sigignore; -@@ -97,7 +103,9 @@ - /* sigcatch: mask of caught signals. - * pinfo [0].kp_proc.p_sigcatch - */ --#if (defined(__NetBSD__) && (NSIG > 32)) || (__FreeBSD_version >= 400011) -+#if defined(__NetBSD__) && (__NetBSD_Version__ > 105150000) -+ buf->sigcatch [0] = pinfo [0].kp_proc.p_sigctx.ps_sigcatch.__bits[0]; -+#elif (defined(__NetBSD__) && (NSIG > 32)) || (__FreeBSD_version >= 400011) - buf->sigcatch [0] = pinfo [0].kp_proc.p_sigcatch.__bits[0]; - #else - buf->sigcatch [0] = pinfo [0].kp_proc.p_sigcatch; diff --git a/devel/libgtop/patches/patch-ac b/devel/libgtop/patches/patch-ac deleted file mode 100644 index bb1d292b1b2..00000000000 --- a/devel/libgtop/patches/patch-ac +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-ac,v 1.5 1999/08/30 08:54:03 jlam Exp $ - ---- include/glibtop/procstate.h.orig Tue Feb 23 06:43:11 1999 -+++ include/glibtop/procstate.h Sun Aug 29 19:50:34 1999 -@@ -36,6 +36,13 @@ - - #define GLIBTOP_MAX_PROC_STATE 4 - -+#define GLIBTOP_PROCESS_RUNNING 1 -+#define GLIBTOP_PROCESS_INTERRUPTIBLE 2 -+#define GLIBTOP_PROCESS_UNINTERRUPTIBLE 4 -+#define GLIBTOP_PROCESS_ZOMBIE 8 -+#define GLIBTOP_PROCESS_STOPPED 16 -+#define GLIBTOP_PROCESS_SWAPPING 32 -+ - typedef struct _glibtop_proc_state glibtop_proc_state; - - /* Name and status */ diff --git a/devel/libgtop/patches/patch-ad b/devel/libgtop/patches/patch-ad deleted file mode 100644 index 48e398e5e03..00000000000 --- a/devel/libgtop/patches/patch-ad +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ad,v 1.6 2000/06/03 21:25:55 tron Exp $ - ---- sysdeps/freebsd/procargs.c.orig Thu May 27 16:04:01 1999 -+++ sysdeps/freebsd/procargs.c Sat Jun 3 23:18:52 2000 -@@ -83,9 +83,9 @@ - - args = kvm_getargv (server->machine.kd, pinfo, max_len); - if (args == NULL) { -- glibtop_suid_leave (server); -- glibtop_warn_io_r (server, "kvm_getargv (%d)", pid); -- return NULL; -+ static char *dummy = NULL; -+ -+ args = &dummy; - } - - glibtop_suid_leave (server); diff --git a/devel/libgtop/patches/patch-ae b/devel/libgtop/patches/patch-ae deleted file mode 100644 index 4056d2d5830..00000000000 --- a/devel/libgtop/patches/patch-ae +++ /dev/null @@ -1,81 +0,0 @@ -$NetBSD: patch-ae,v 1.8 2001/07/17 11:02:02 wiz Exp $ - ---- sysdeps/freebsd/cpu.c.orig Sun Feb 13 16:47:58 2000 -+++ sysdeps/freebsd/cpu.c -@@ -27,11 +27,16 @@ - - #include <glibtop_suid.h> - -+#ifdef __NetBSD__ -+#include <sys/sched.h> -+#endif -+ - static const unsigned long _glibtop_sysdeps_cpu = - (1L << GLIBTOP_CPU_TOTAL) + (1L << GLIBTOP_CPU_USER) + - (1L << GLIBTOP_CPU_NICE) + (1L << GLIBTOP_CPU_SYS) + - (1L << GLIBTOP_CPU_IDLE) + (1L << GLIBTOP_CPU_FREQUENCY); - -+#ifndef KERN_CP_TIME - /* nlist structure for kernel access */ - static struct nlist nlst [] = { - #ifdef __bsdi__ -@@ -41,21 +46,27 @@ - #endif - { 0 } - }; -+#endif - - /* MIB array for sysctl */ - static int mib_length=2; - static int mib [] = { CTL_KERN, KERN_CLOCKRATE }; -+#ifdef KERN_CP_TIME -+static int mib2 [] = { CTL_KERN, KERN_CP_TIME }; -+#endif - - /* Init function. */ - - void - glibtop_init_cpu_p (glibtop *server) - { -+#ifndef KERN_CP_TIME - if (kvm_nlist (server->machine.kd, nlst) < 0) { - glibtop_warn_io_r (server, "kvm_nlist (cpu)"); - return; - } - -+#endif - /* Set this only if kvm_nlist () succeeded. */ - server->sysdeps.cpu = _glibtop_sysdeps_cpu; - } -@@ -65,7 +76,11 @@ - void - glibtop_get_cpu_p (glibtop *server, glibtop_cpu *buf) - { -+#ifdef KERN_CP_TIME -+ u_int64_t cpts [CPUSTATES]; -+#else - long cpts [CPUSTATES]; -+#endif - /* sysctl vars*/ - struct clockinfo ci; - size_t length; -@@ -78,11 +93,19 @@ - if (server->sysdeps.cpu == 0) - return; - -+#ifdef KERN_CP_TIME -+ length = sizeof (cpts); -+ if (sysctl (mib2, mib_length, cpts, &length, NULL, 0)) { -+ glibtop_warn_io_r (server, "sysctl"); -+ return; -+ } -+#else - if (kvm_read (server->machine.kd, nlst [0].n_value, - &cpts, sizeof (cpts)) != sizeof (cpts)) { - glibtop_warn_io_r (server, "kvm_read (cp_time)"); - return; - } -+#endif - - /* Get the clockrate data */ - length = sizeof (struct clockinfo); diff --git a/devel/libgtop/patches/patch-af b/devel/libgtop/patches/patch-af deleted file mode 100644 index 4eba5c7623a..00000000000 --- a/devel/libgtop/patches/patch-af +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-af,v 1.8 2003/01/21 10:12:31 tron Exp $ - ---- sysdeps/freebsd/procstate.c.orig Mon Nov 26 23:37:59 2001 -+++ sysdeps/freebsd/procstate.c Sun Jan 19 23:21:15 2003 -@@ -99,9 +99,11 @@ - case SRUN: - buf->state = GLIBTOP_PROCESS_RUNNING; - break; -+#ifdef SSLEEP - case SSLEEP: - buf->state = GLIBTOP_PROCESS_INTERRUPTIBLE; - break; -+#endif - case SSTOP: - buf->state = GLIBTOP_PROCESS_STOPPED; - break; -@@ -119,9 +121,11 @@ - case SRUN: - buf->state = 'R'; - break; -+#ifdef SSLEEP - case SSLEEP: - buf->state = 'S'; - break; -+#endif - case SSTOP: - buf->state = 'T'; - break; diff --git a/devel/libgtop/patches/patch-ag b/devel/libgtop/patches/patch-ag deleted file mode 100644 index cd7a52b4398..00000000000 --- a/devel/libgtop/patches/patch-ag +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ag,v 1.6 2003/01/21 10:12:31 tron Exp $ - ---- sysdeps/freebsd/procuid.c.orig Mon Nov 26 23:37:59 2001 -+++ sysdeps/freebsd/procuid.c Sun Jan 19 23:26:08 2003 -@@ -94,7 +94,11 @@ - buf->tpgid = pinfo [0].kp_eproc.e_tpgid; - - buf->nice = pinfo [0].kp_proc.p_nice; -+#if defined(__NetBSD__) && defined(SACTIVE) -+ buf->priority = 0; -+#else - buf->priority = pinfo [0].kp_proc.p_priority; -+#endif - - /* Set the flags for the data we're about to return*/ - buf->flags = _glibtop_sysdeps_proc_uid; diff --git a/devel/libgtop/patches/patch-al b/devel/libgtop/patches/patch-al deleted file mode 100644 index 4c159d871a5..00000000000 --- a/devel/libgtop/patches/patch-al +++ /dev/null @@ -1,120 +0,0 @@ -$NetBSD: patch-al,v 1.15 2004/03/01 03:39:57 kristerw Exp $ - ---- sysdeps/freebsd/prockernel.c.orig 2001-11-26 23:37:59.000000000 +0100 -+++ sysdeps/freebsd/prockernel.c 2004-03-01 03:44:24.000000000 +0100 -@@ -34,7 +34,7 @@ - #if (!defined __OpenBSD__) && (!defined __bsdi__) - #include <sys/user.h> - #endif --#if !defined(__bsdi__) && !(defined(__FreeBSD__) && defined(__alpha__)) -+#if !defined(__bsdi__) && !(defined(__FreeBSD__) && defined(__alpha__)) && !defined(__NetBSD__) - #include <machine/pcb.h> - #endif - #if defined(__FreeBSD__) && !defined(__alpha__) -@@ -48,6 +48,14 @@ - #include <osreldate.h> - #endif - -+#ifdef __NetBSD__ -+#include <machine/vmparam.h> -+#include <machine/pmap.h> -+#ifdef __arm32__ -+#define KERNBASE KERNEL_BASE -+#endif -+#endif -+ - static const unsigned long _glibtop_sysdeps_proc_kernel_pstats = - (1L << GLIBTOP_PROC_KERNEL_MIN_FLT) + - (1L << GLIBTOP_PROC_KERNEL_MAJ_FLT) + -@@ -101,6 +109,7 @@ - if ((pinfo == NULL) || (count != 1)) - glibtop_error_io_r (server, "kvm_getprocs (%d)", pid); - -+#if !defined(__NetBSD__) || !defined(SACTIVE) - buf->nwchan = (unsigned long) pinfo [0].kp_proc.p_wchan &~ KERNBASE; - buf->flags |= (1L << GLIBTOP_PROC_KERNEL_NWCHAN); - -@@ -112,6 +121,7 @@ - } else { - buf->wchan [0] = 0; - } -+#endif - - /* Taken from `saveuser ()' in `/usr/src/bin/ps/ps.c'. */ - -@@ -129,8 +139,16 @@ - - glibtop_suid_enter (server); - -+#if !defined(__NetBSD__) || !defined(SACTIVE) -+#ifdef __NetBSD__ -+ /* On NetBSD, there is no kvm_uread(), and kvm_read() always reads -+ * from kernel memory. */ -+ -+ if (kvm_read (server->machine.kd, -+#else - if ((pinfo [0].kp_proc.p_flag & P_INMEM) && - kvm_uread (server->machine.kd, &(pinfo [0]).kp_proc, -+#endif - (unsigned long) &u_addr->u_stats, - (char *) &pstats, sizeof (pstats)) == sizeof (pstats)) - { -@@ -148,9 +166,14 @@ - - buf->flags |= _glibtop_sysdeps_proc_kernel_pstats; - } -+#endif - -+#ifdef __NetBSD__ -+ if (kvm_read (server->machine.kd, -+#else - if ((pinfo [0].kp_proc.p_flag & P_INMEM) && - kvm_uread (server->machine.kd, &(pinfo [0]).kp_proc, -+#endif - (unsigned long) &u_addr->u_pcb, - (char *) &pcb, sizeof (pcb)) == sizeof (pcb)) - { -@@ -167,15 +190,43 @@ - /*xxx FreeBSD/Alpha? */ - #endif - #else -+#ifdef __i386__ - buf->kstk_esp = (u_int64_t) pcb.pcb_tss.tss_esp0; - #ifdef __bsdi__ - buf->kstk_eip = (u_int64_t) pcb.pcb_tss.tss_eip; - #else - buf->kstk_eip = (u_int64_t) pcb.pcb_tss.__tss_eip; - #endif -+#else -+#if defined(__NetBSD__) -+#if defined(__m68k__) -+ buf->kstk_esp = (u_int64_t) pcb.pcb_usp; -+ buf->kstk_eip = (u_int64_t) 0; -+#elif defined(__x86_64__) -+ buf->kstk_esp = (u_int64_t) pcb.pcb_usersp; -+ buf->kstk_eip = (u_int64_t) 0; -+#elif (defined(__arm32__) || defined(__powerpc__)) -+ buf->kstk_esp = (u_int64_t) pcb.pcb_sp; -+ buf->kstk_eip = (u_int64_t) 0; -+#elif defined(__mipsel__) -+ buf->kstk_esp = (u_int64_t) pcb.pcb_context[8]; -+ buf->kstk_eip = (u_int64_t) 0; -+#elif defined(__sparc__) -+ buf->kstk_esp = (u_int64_t) pcb.pcb_sp; -+ buf->kstk_eip = (u_int64_t) pcb.pcb_pc; -+#elif defined(__alpha__) -+ buf->kstk_esp = (u_int64_t) pcb.pcb_context[9]; -+ buf->kstk_eip = (u_int64_t) pcb.pcb_context[8]; -+#else -+ /* provide some defaults for other platforms */ -+ buf->kstk_esp = (u_int64_t) 0; -+ buf->kstk_eip = (u_int64_t) 0; -+#endif /* ${MACHINE_ARCH} */ -+#endif /* __NetBSD__ */ - - buf->flags |= _glibtop_sysdeps_proc_kernel_pcb; - #endif -+#endif - } - - /* Taken from `wchan ()' in `/usr/src/bin/ps/print.c'. */ diff --git a/devel/libgtop/patches/patch-an b/devel/libgtop/patches/patch-an deleted file mode 100644 index c1acdfbcd46..00000000000 --- a/devel/libgtop/patches/patch-an +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-an,v 1.1 2000/05/02 00:27:36 fredb Exp $ - ---- doc/libgtop.texi.orig Fri Jan 21 16:19:04 2000 -+++ doc/libgtop.texi Mon May 1 14:09:27 2000 -@@ -2,6 +2,10 @@ - @c %**start of header - @setfilename libgtop.info - @settitle LibGTop Reference Manual -+@dircategory Gnome -+@direntry -+* LibGTop: (libgtop). A library to retrieve system information. -+@end direntry - @setchapternewpage odd - @c %**end of header - diff --git a/devel/libgtop/patches/patch-ao b/devel/libgtop/patches/patch-ao deleted file mode 100644 index 53d25bd5849..00000000000 --- a/devel/libgtop/patches/patch-ao +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ao,v 1.2 2001/04/06 21:52:13 rh Exp $ - ---- src/daemon/Makefile.in.orig Tue Feb 27 15:02:08 2001 -+++ src/daemon/Makefile.in -@@ -196,7 +196,7 @@ - @ENABLE_STATIC_TRUE@libgtop_daemon_LDFLAGS = -static - - libgtop_server_SOURCES = server.c slave.c io.c version.c daemon.h --libgtop_server_LDADD = $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid.la $(top_builddir)/sysdeps/common/libgtop_suid_common.la -+libgtop_server_LDADD = $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid.la $(top_builddir)/sysdeps/common/libgtop_suid_common.la -lintl - - - @ENABLE_STATIC_TRUE@libgtop_server_LDFLAGS = -static diff --git a/devel/libgtop/patches/patch-ap b/devel/libgtop/patches/patch-ap deleted file mode 100644 index 20c8d81ab09..00000000000 --- a/devel/libgtop/patches/patch-ap +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ap,v 1.1 2000/07/30 02:45:41 jlam Exp $ - ---- sysdeps/freebsd/mem.c.orig Sun Feb 13 10:47:58 2000 -+++ sysdeps/freebsd/mem.c Sat Jul 29 22:32:44 2000 -@@ -29,7 +29,9 @@ - - #include <sys/sysctl.h> - #include <sys/vmmeter.h> -+#if defined(__NetBSD__) && (__NetBSD_Version__ < 105020000) - #include <vm/vm_param.h> -+#endif - - #if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) - #include <uvm/uvm_extern.h> -@@ -74,7 +76,6 @@ - }; - - /* MIB array for sysctl */ --static int mib_length=2; - #ifdef __bsdi__ - static int mib [] = { CTL_VM, VM_TOTAL }; - #else diff --git a/devel/libgtop/patches/patch-aq b/devel/libgtop/patches/patch-aq deleted file mode 100644 index 96e8f7a0b91..00000000000 --- a/devel/libgtop/patches/patch-aq +++ /dev/null @@ -1,46 +0,0 @@ -$NetBSD: patch-aq,v 1.2 2000/11/29 21:02:05 tron Exp $ - ---- sysdeps/freebsd/procmap.c.orig Thu May 27 20:56:48 1999 -+++ sysdeps/freebsd/procmap.c Wed Nov 29 21:57:15 2000 -@@ -32,9 +32,13 @@ - #include <sys/param.h> - #include <sys/proc.h> - #include <sys/resource.h> -+#if defined(__NetBSD__) && (__NetBSD_Version__ < 105020000) - #include <vm/vm_object.h> - #include <vm/vm_prot.h> - #include <vm/vm_map.h> -+#else -+#include <uvm/uvm_extern.h> -+#endif - - #include <sys/vnode.h> - #include <sys/mount.h> -@@ -46,9 +50,12 @@ - #include <sys/user.h> - #endif - #include <sys/sysctl.h> -+#if defined(__NetBSD__) && (__NetBSD_Version__ < 105020000) - #include <vm/vm.h> -+#endif - --#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) -+#if defined(__NetBSD__) && \ -+ (__NetBSD_Version__ >= 104000000) && (__NetBSD_Version < 105020000) - /* Fixme ... */ - #undef _KERNEL - #define _UVM_UVM_AMAP_I_H_ 1 -@@ -214,11 +221,13 @@ - #endif - - #if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) -+#if defined(UVM_VNODE_VALID) - if (!vnode.v_uvm.u_flags & UVM_VNODE_VALID) - continue; - - if ((vnode.v_type != VREG) || (vnode.v_tag != VT_UFS) || - !vnode.v_data) continue; -+#endif - - if (kvm_read (server->machine.kd, - (unsigned long) vnode.v_data, diff --git a/devel/libgtop/patches/patch-ar b/devel/libgtop/patches/patch-ar deleted file mode 100644 index c8b6af82da4..00000000000 --- a/devel/libgtop/patches/patch-ar +++ /dev/null @@ -1,69 +0,0 @@ -$NetBSD: patch-ar,v 1.3 2001/09/25 01:31:18 wiz Exp $ - ---- sysdeps/freebsd/procmem.c.orig Thu May 27 20:56:49 1999 -+++ sysdeps/freebsd/procmem.c -@@ -31,8 +31,12 @@ - #include <sys/param.h> - #include <sys/proc.h> - #include <sys/resource.h> -+#if defined(__NetBSD__) && (__NetBSD_Version__ < 105020000) - #include <vm/vm_object.h> - #include <vm/vm_map.h> -+#else -+#include <uvm/uvm_extern.h> -+#endif - - #include <sys/vnode.h> - #include <ufs/ufs/quota.h> -@@ -43,9 +47,14 @@ - #include <sys/user.h> - #endif - #include <sys/sysctl.h> -+#if defined(__NetBSD__) && (__NetBSD_Version__ < 105020000) - #include <vm/vm.h> -+#else -+#include <uvm/uvm.h> -+#endif - --#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) -+#if defined(__NetBSD__) && \ -+ (__NetBSD_Version__ >= 104000000) && (__NetBSD_Version__ < 105020000) - /* Fixme ... */ - #undef _KERNEL - #define _UVM_UVM_AMAP_I_H_ 1 -@@ -113,7 +122,6 @@ - struct vmspace *vms, vmspace; - #if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) - struct vnode vnode; -- struct inode inode; - #else - struct vm_object object; - #endif -@@ -233,17 +241,27 @@ - /* If the object is of type vnode, add its size */ - - #if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) -+#if defined(UVM_VNODE_VALID) - if (!vnode.v_uvm.u_flags & UVM_VNODE_VALID) - continue; -+#endif - - if ((vnode.v_type != VREG) || (vnode.v_tag != VT_UFS) || - !vnode.v_data) continue; - -+#if (__NetBSD_Version__ >= 105250000) -+ /* Reference count must be at least two. */ -+ if (vnode.v_usecount <= 1) -+ continue; -+ -+ buf->share += pagetok (vnode.v_uobj.uo_npages) << LOG1024; -+#else - /* Reference count must be at least two. */ - if (vnode.v_uvm.u_obj.uo_refs <= 1) - continue; - - buf->share += pagetok (vnode.v_uvm.u_obj.uo_npages) << LOG1024; -+#endif /* __NetBSD_Version__ >= 105250000 */ - #endif - - #ifdef __FreeBSD__ diff --git a/devel/libgtop/patches/patch-as b/devel/libgtop/patches/patch-as deleted file mode 100644 index 0979be7525c..00000000000 --- a/devel/libgtop/patches/patch-as +++ /dev/null @@ -1,38 +0,0 @@ -$NetBSD: patch-as,v 1.1 2001/07/17 10:48:06 wiz Exp $ - ---- sysdeps/freebsd/uptime.c.orig Thu May 27 16:04:16 1999 -+++ sysdeps/freebsd/uptime.c -@@ -49,6 +49,27 @@ - void - glibtop_get_uptime_p (glibtop *server, glibtop_uptime *buf) - { -+#ifdef __NetBSD__ -+ time_t now; -+ time_t uptime; -+ int mib[2]; -+ struct timeval boottime; -+ size_t size; -+ -+ mib[0] = CTL_KERN; -+ mib[1] = KERN_BOOTTIME; -+ size = sizeof(boottime); -+ if (sysctl(mib, 2, &boottime, &size, NULL, 0) != -1 && -+ boottime.tv_sec != 0) { -+ time(&now); -+ buf->uptime = now - boottime.tv_sec; -+ /* XXX: don't know a useful value to put here. */ -+ buf->idletime = 0; -+ buf->flags = _glibtop_sysdeps_uptime; -+ } -+#else -+ buf->flags = _glibtop_sysdeps_uptime; -+ - glibtop_cpu cpu; - - glibtop_init_p (server, (1L << GLIBTOP_SYSDEPS_UPTIME), 0); -@@ -70,4 +91,5 @@ - buf->idletime = (double) cpu.idle / (double) cpu.frequency; - - buf->flags = _glibtop_sysdeps_uptime; -+#endif - } diff --git a/devel/libgtop2/DESCR b/devel/libgtop2/DESCR deleted file mode 100644 index 55f3012d616..00000000000 --- a/devel/libgtop2/DESCR +++ /dev/null @@ -1,4 +0,0 @@ -libgtop is a library that fetches system information about the running -system such as cpu and memory usage, active processes etc. It -provides a setgid server that fetches the information and a -client-side library that talks to this server. diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile deleted file mode 100644 index 2c456e71e38..00000000000 --- a/devel/libgtop2/Makefile +++ /dev/null @@ -1,72 +0,0 @@ -# $NetBSD: Makefile,v 1.27 2004/04/01 18:34:27 jmmv Exp $ - -DISTNAME= libgtop-2.5.2 -PKGNAME= ${DISTNAME:S/-/2-/} -CATEGORIES= devel gnome -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgtop/2.5/} -EXTRACT_SUFX= .tar.bz2 - -MAINTAINER= tech-pkg@NetBSD.org -HOMEPAGE= http://www.gnome.org/ -COMMENT= Library to retrieve system information, used in GNOME2 - -BUILD_USES_MSGFMT= YES - -NOT_FOR_PLATFORM= SunOS-*-* -OSVERSION_SPECIFIC= YES -USE_MSGFMT_PLURALS= YES - -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == NetBSD -. if (${MACHINE_ARCH} != alpha) && \ - (${MACHINE_ARCH} != arm) && (${MACHINE_ARCH} != arm32) && \ - (${MACHINE_ARCH} != i386) && (${MACHINE_ARCH} != m68k) && \ - (${MACHINE_ARCH} != mipsel) && (${MACHINE_ARCH} != powerpc) && \ - (${MACHINE_ARCH} != sparc) && (${MACHINE_ARCH} != sparc64) && \ - (${MACHINE_ARCH} != x86_64) -PKG_FAIL_REASON= "${PKGNAME} has not yet been ported to ${MACHINE_ARCH}." -PKG_FAIL_REASON+= "Please look at /usr/include/${MACHINE_ARCH}/pcb.h" -PKG_FAIL_REASON+= "and update patches/patch-al appropriately." -PKG_FAIL_REASON+= "(More information can be found in libgtop.info.)" -. endif -.endif - -USE_PERL5= build -USE_BUILDLINK3= YES -USE_PKGLOCALEDIR= YES -USE_X11= YES -USE_GNU_TOOLS+= make -USE_LIBTOOL= YES -PKGCONFIG_OVERRIDE= libgtop-2.0.pc.in -PKGCONFIG_OVERRIDE+= support/gnome-support-2.0.pc.in -USE_MAKEINFO= YES -INFO_FILES= libgtop2.info -TEXINFO_REQD= 4.6 - -# The following flags are for debugging purposes. They don't need to -# be used unless you are actively developing/debugging libgtop. -#CPPFLAGS+= -DLIBGTOP_ENABLE_DEBUG -DLIBGTOP_FATAL_WARNINGS -#CFLAGS+= -g -#LDFLAGS+= -g - -GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --with-glib-prefix=${BUILDLINK_PREFIX.glib2} -CONFIGURE_ARGS+= --with-catgets --with-libgtop-guile=no -CONFIGURE_ENV+= AWK="${AWK}" LN_S="${LN} -s" PERL="${PERL5}" - -.if ${OPSYS} == "Linux" -PLIST_SUBST+= LIBGTOP_SERVER="@comment " -.else -PLIST_SUBST+= LIBGTOP_SERVER="" - -post-install: - @${CHMOD} g+s ${PREFIX}/bin/libgtop_server2 -.endif - -.include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/glib2/buildlink3.mk" -.include "../../devel/libgnome/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" -.include "../../devel/popt/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/devel/libgtop2/PLIST b/devel/libgtop2/PLIST deleted file mode 100644 index 0df03f84c8e..00000000000 --- a/devel/libgtop2/PLIST +++ /dev/null @@ -1,107 +0,0 @@ -@comment $NetBSD: PLIST,v 1.6 2004/04/01 18:34:27 jmmv Exp $ -bin/libgtop_daemon2 -${LIBGTOP_SERVER}bin/libgtop_server2 -include/libgtop-2.0/glibtop.h -include/libgtop-2.0/glibtop/close.h -include/libgtop-2.0/glibtop/command.h -include/libgtop-2.0/glibtop/cpu.h -include/libgtop-2.0/glibtop/error.h -include/libgtop-2.0/glibtop/fsusage.h -include/libgtop-2.0/glibtop/global.h -include/libgtop-2.0/glibtop/gnuserv.h -include/libgtop-2.0/glibtop/inodedb.h -include/libgtop-2.0/glibtop/loadavg.h -include/libgtop-2.0/glibtop/mem.h -include/libgtop-2.0/glibtop/mountlist.h -include/libgtop-2.0/glibtop/msg_limits.h -include/libgtop-2.0/glibtop/netload.h -include/libgtop-2.0/glibtop/open.h -include/libgtop-2.0/glibtop/parameter.h -include/libgtop-2.0/glibtop/ppp.h -include/libgtop-2.0/glibtop/procargs.h -include/libgtop-2.0/glibtop/prockernel.h -include/libgtop-2.0/glibtop/proclist.h -include/libgtop-2.0/glibtop/procmap.h -include/libgtop-2.0/glibtop/procmem.h -include/libgtop-2.0/glibtop/procsegment.h -include/libgtop-2.0/glibtop/procsignal.h -include/libgtop-2.0/glibtop/procstate.h -include/libgtop-2.0/glibtop/proctime.h -include/libgtop-2.0/glibtop/procuid.h -include/libgtop-2.0/glibtop/read.h -include/libgtop-2.0/glibtop/read_data.h -include/libgtop-2.0/glibtop/sem_limits.h -include/libgtop-2.0/glibtop/shm_limits.h -include/libgtop-2.0/glibtop/signal.h -include/libgtop-2.0/glibtop/swap.h -include/libgtop-2.0/glibtop/sysdeps.h -include/libgtop-2.0/glibtop/sysinfo.h -include/libgtop-2.0/glibtop/types.h -include/libgtop-2.0/glibtop/union.h -include/libgtop-2.0/glibtop/uptime.h -include/libgtop-2.0/glibtop/version.h -include/libgtop-2.0/glibtop/write.h -include/libgtop-2.0/glibtop_machine.h -include/libgtop-2.0/glibtop_server.h -${LIBGTOP_SERVER}include/libgtop-2.0/glibtop_suid.h -lib/libgtop-2.0.a -lib/libgtop-2.0.la -lib/libgtop-2.0.so -lib/libgtop-2.0.so.3 -lib/libgtop-2.0.so.3.0 -lib/pkgconfig/libgtop-2.0.pc -${PKGLOCALEDIR}/locale/am/LC_MESSAGES/libgtop-2.0.mo -${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/libgtop-2.0.mo -${PKGLOCALEDIR}/locale/az/LC_MESSAGES/libgtop-2.0.mo -${PKGLOCALEDIR}/locale/be/LC_MESSAGES/libgtop-2.0.mo -${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/libgtop-2.0.mo -${PKGLOCALEDIR}/locale/bn/LC_MESSAGES/libgtop-2.0.mo -${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/libgtop-2.0.mo -${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/libgtop-2.0.mo -${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/libgtop-2.0.mo -${PKGLOCALEDIR}/locale/da/LC_MESSAGES/libgtop-2.0.mo -${PKGLOCALEDIR}/locale/de/LC_MESSAGES/libgtop-2.0.mo -${PKGLOCALEDIR}/locale/el/LC_MESSAGES/libgtop-2.0.mo -${PKGLOCALEDIR}/locale/es/LC_MESSAGES/libgtop-2.0.mo -${PKGLOCALEDIR}/locale/et/LC_MESSAGES/libgtop-2.0.mo -${PKGLOCALEDIR}/locale/fa/LC_MESSAGES/libgtop-2.0.mo -${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/libgtop-2.0.mo -${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/libgtop-2.0.mo -${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/libgtop-2.0.mo -${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/libgtop-2.0.mo -${PKGLOCALEDIR}/locale/he/LC_MESSAGES/libgtop-2.0.mo -${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/libgtop-2.0.mo -${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/libgtop-2.0.mo -${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/libgtop-2.0.mo -${PKGLOCALEDIR}/locale/id/LC_MESSAGES/libgtop-2.0.mo -${PKGLOCALEDIR}/locale/it/LC_MESSAGES/libgtop-2.0.mo -${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/libgtop-2.0.mo -${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/libgtop-2.0.mo -${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/libgtop-2.0.mo -${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/libgtop-2.0.mo -${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/libgtop-2.0.mo -${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/libgtop-2.0.mo -${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/libgtop-2.0.mo -${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/libgtop-2.0.mo -${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/libgtop-2.0.mo -${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/libgtop-2.0.mo -${PKGLOCALEDIR}/locale/no/LC_MESSAGES/libgtop-2.0.mo -${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/libgtop-2.0.mo -${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/libgtop-2.0.mo -${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/libgtop-2.0.mo -${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/libgtop-2.0.mo -${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/libgtop-2.0.mo -${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/libgtop-2.0.mo -${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/libgtop-2.0.mo -${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/libgtop-2.0.mo -${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/libgtop-2.0.mo -${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/libgtop-2.0.mo -${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/libgtop-2.0.mo -${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/libgtop-2.0.mo -${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/libgtop-2.0.mo -${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/libgtop-2.0.mo -${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/libgtop-2.0.mo -${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/libgtop-2.0.mo -${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/libgtop-2.0.mo -@dirrm include/libgtop-2.0/glibtop -@dirrm include/libgtop-2.0 diff --git a/devel/libgtop2/buildlink3.mk b/devel/libgtop2/buildlink3.mk deleted file mode 100644 index 876bd6ba79f..00000000000 --- a/devel/libgtop2/buildlink3.mk +++ /dev/null @@ -1,22 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.6 2004/04/01 18:34:27 jmmv Exp $ - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBGTOP2_BUILDLINK3_MK:= ${LIBGTOP2_BUILDLINK3_MK}+ - -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libgtop2 -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgtop2} -BUILDLINK_PACKAGES+= libgtop2 - -.if !empty(LIBGTOP2_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.libgtop2+= libgtop2>=2.5.2 -BUILDLINK_PKGSRCDIR.libgtop2?= ../../devel/libgtop2 -.endif # LIBGTOP2_BUILDLINK3_MK - -.include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/glib2/buildlink3.mk" -.include "../../devel/popt/buildlink3.mk" - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/devel/libgtop2/distinfo b/devel/libgtop2/distinfo deleted file mode 100644 index f1d2fc5dd32..00000000000 --- a/devel/libgtop2/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: distinfo,v 1.10 2004/04/01 18:34:27 jmmv Exp $ - -SHA1 (libgtop-2.5.2.tar.bz2) = 0ef139ccfd7a6a11b9f94c17e3a9d382ded1dad3 -Size (libgtop-2.5.2.tar.bz2) = 935545 bytes -SHA1 (patch-aa) = 5ebb407abdaedb77ed02c01adbaba70113b333b6 -SHA1 (patch-al) = 4fad51ee02aa13c8f53d8716fb230bef2f282d4d diff --git a/devel/libgtop2/patches/patch-aa b/devel/libgtop2/patches/patch-aa deleted file mode 100644 index a33f3a6ccc2..00000000000 --- a/devel/libgtop2/patches/patch-aa +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-aa,v 1.4 2004/04/01 18:34:27 jmmv Exp $ - ---- configure.orig 2003-12-13 08:32:17.000000000 +0100 -+++ configure 2003-12-13 08:33:16.000000000 +0100 -@@ -19717,13 +19717,13 @@ - libgtop_sysdeps_dir=freebsd - libgtop_use_machine_h=yes - libgtop_need_server=yes -- libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server && chmod 2755 $(bindir)/libgtop_server' -+ libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server2 && chmod 2755 $(bindir)/libgtop_server' - ;; - solaris*) - libgtop_sysdeps_dir=solaris - libgtop_use_machine_h=yes - libgtop_need_server=yes -- libgtop_postinstall='chgrp sys $(bindir)/libgtop_server && chmod 2755 $(bindir)/libgtop_server' -+ libgtop_postinstall='chgrp sys $(bindir)/libgtop_server2 && chmod 2755 $(bindir)/libgtop_server' - ;; - aix*) - libgtop_sysdeps_dir=aix diff --git a/devel/libgtop2/patches/patch-al b/devel/libgtop2/patches/patch-al deleted file mode 100644 index c8f3f471aad..00000000000 --- a/devel/libgtop2/patches/patch-al +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-al,v 1.5 2004/04/01 18:34:27 jmmv Exp $ - ---- sysdeps/freebsd/prockernel.c.orig 2004-03-11 03:23:52.000000000 +0100 -+++ sysdeps/freebsd/prockernel.c -@@ -228,6 +228,9 @@ glibtop_get_proc_kernel_p (glibtop *serv - #if defined(__m68k__) - buf->kstk_esp = (u_int64_t) pcb.pcb_usp; - buf->kstk_eip = (u_int64_t) 0; -+#elif defined(__x86_64__) -+ buf->kstk_esp = (u_int64_t) pcb.pcb_usersp; -+ buf->kstk_eip = (u_int64_t) 0; - #elif (defined(__arm32__) || defined(__powerpc__)) - buf->kstk_esp = (u_int64_t) pcb.pcb_sp; - buf->kstk_eip = (u_int64_t) 0; diff --git a/sysutils/Makefile b/sysutils/Makefile index 891a95a0e0c..918c8d2b9b8 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.227 2004/04/01 19:07:35 jmmv Exp $ +# $NetBSD: Makefile,v 1.228 2004/04/02 12:20:24 jmmv Exp $ COMMENT= System utilities @@ -89,6 +89,8 @@ SUBDIR+= kdirstat SUBDIR+= koncd SUBDIR+= lambd SUBDIR+= lavaps +SUBDIR+= libgtop +SUBDIR+= libgtop2 SUBDIR+= libirman SUBDIR+= libol SUBDIR+= logrot |