cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CVS wasn't kind to this commit :). Remove the zero length patches,

Browse Source 
fix another patch that was lost in the update, oh and what the heck
update the version again.
This commit is contained in:
marcm 2004-12-11 17:41:52 +00:00
parent 059ae7b0b6
commit bb06e0824a
14 changed files with 77 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
devel/libgtop2/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.13 2004/12/10 20:33:59 marcm Exp $
# $OpenBSD: Makefile,v 1.14 2004/12/11 17:41:52 marcm Exp $
COMMENT= "portable library for obtaining system information"
V= 2.8.1
V= 2.8.2
DISTNAME= libgtop-${V}
PKGNAME= libgtop2-${V}
CATEGORIES= devel
@ -20,10 +20,10 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c kvm
MODULES= devel/gettext
BUILD_DEPENDS= :pkgconfig-*:devel/pkgconfig
LIB_DEPENDS= glib-2.0.0.0::devel/glib2 \
popt::devel/popt
MODULES= devel/gettext
BUILD_DEPENDS= :pkgconfig-*:devel/pkgconfig
LIB_DEPENDS= glib-2.0.0.0::devel/glib2 \
popt::devel/popt
USE_GMAKE= Yes
CONFIGURE_STYLE= gnu

6
devel/libgtop2/distinfo
View File

@ -1,3 +1,3 @@
MD5 (libgtop-2.8.1.tar.bz2) = 5d191cbf2b5b2a84dfee1972c99b1a78
RMD160 (libgtop-2.8.1.tar.bz2) = f6d899b14f5e140ce765676a08ac32415acffb13
SHA1 (libgtop-2.8.1.tar.bz2) = 90877ac470ef6feff31c22c533b99948d197ecc3
MD5 (libgtop-2.8.2.tar.bz2) = 96f9a35edeaa52f30adca6005f0f1b6d
RMD160 (libgtop-2.8.2.tar.bz2) = f7a523bd37e8f3bca3ebc9f37670c6e1ed757b31
SHA1 (libgtop-2.8.2.tar.bz2) = 5cfb4a4b3346b5242aad0bfd85c3bfd98c88c4e0

31
devel/libgtop2/patches/patch-lib_read_c
View File

@ -0,0 +1,31 @@
$OpenBSD: patch-lib_read_c,v 1.3 2004/12/11 17:41:53 marcm Exp $
--- lib/read.c.orig Sun Oct 10 10:21:57 2004
+++ lib/read.c Fri Dec 10 17:04:00 2004
@@ -22,6 +22,7 @@
*/
#include <config.h>
+#include <errno.h>
#include <glibtop/read.h>
#include "libgtop-i18n.h"
@@ -55,14 +56,18 @@ glibtop_read_l (glibtop *server, size_t
fprintf (stderr, "LIBRARY: really reading %d bytes.\n", size);
#endif
+retry:
if (server->socket) {
do_read (server->socket, buf, size);
} else {
- if(read (server->input [0], buf, size) < 0)
+ if(read (server->input [0], buf, size) < 0) {
+ if (errno == EINTR)
+ goto retry;
glibtop_error_io_r (
server,
ngettext ("read %d byte",
"read %d bytes", size),
size);
+ }
}
}

10
devel/libgtop2/patches/patch-ltmain_sh
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-ltmain_sh,v 1.6 2004/08/01 06:06:35 marcm Exp $
--- ltmain.sh.orig 2004-04-05 23:57:07.000000000 -0600
+++ ltmain.sh 2004-06-21 13:40:25.000000000 -0600
$OpenBSD: patch-ltmain_sh,v 1.7 2004/12/11 17:41:53 marcm Exp $
--- ltmain.sh.orig Mon Nov 29 11:26:25 2004
+++ ltmain.sh Fri Dec 10 17:32:05 2004
@@ -1857,9 +1857,12 @@ EOF
if test "$linkmode,$pass" = "prog,link"; then
compile_deplibs="$deplib $compile_deplibs"
@ -16,7 +16,7 @@ $OpenBSD: patch-ltmain_sh,v 1.6 2004/08/01 06:06:35 marcm Exp $
continue
;;
-l*)
@@ -2274,10 +2277,6 @@ EOF
@@ -2270,10 +2273,6 @@ EOF
link_static=no # Whether the deplib will be linked statically
if test -n "$library_names" &&
{ test "$prefer_static_libs" = no || test -z "$old_library"; }; then
@ -27,7 +27,7 @@ $OpenBSD: patch-ltmain_sh,v 1.6 2004/08/01 06:06:35 marcm Exp $
# This is a shared library
# Warn about portability, can't link against -module's on
@@ -5827,40 +5826,6 @@ relink_command=\"$relink_command\""
@@ -5828,40 +5827,6 @@ relink_command=\"$relink_command\""
# Exit here if they wanted silent mode.
test "$show" = : && exit $EXIT_SUCCESS

10
devel/libgtop2/patches/patch-sysdeps_freebsd_cpu_c
View File

@ -1,5 +1,5 @@
--- sysdeps/freebsd/cpu.c.orig Wed Dec 1 19:22:45 2004
+++ sysdeps/freebsd/cpu.c Wed Dec 1 19:25:52 2004
--- sysdeps/freebsd/cpu.c.orig Sun Jul 18 13:33:56 2004
+++ sysdeps/freebsd/cpu.c Fri Dec 10 19:15:09 2004
@@ -27,7 +27,7 @@
#include <glibtop_suid.h>
@ -9,7 +9,7 @@
#include <sys/sched.h>
#endif
@@ -36,7 +36,7 @@
@@ -36,7 +36,7 @@ static const unsigned long _glibtop_sysd
(1L << GLIBTOP_CPU_NICE) + (1L << GLIBTOP_CPU_SYS) +
(1L << GLIBTOP_CPU_IDLE) + (1L << GLIBTOP_CPU_FREQUENCY);
@ -18,7 +18,7 @@
/* nlist structure for kernel access */
static struct nlist nlst [] = {
#ifdef __bsdi__
@@ -54,13 +54,16 @@
@@ -54,13 +54,16 @@ static int mib [] = { CTL_KERN, KERN_CLO
#ifdef KERN_CP_TIME
static int mib2 [] = { CTL_KERN, KERN_CP_TIME };
#endif
@ -36,7 +36,7 @@
if (kvm_nlist (server->machine.kd, nlst) < 0) {
glibtop_warn_io_r (server, "kvm_nlist (cpu)");
return;
@@ -93,7 +96,7 @@
@@ -93,7 +96,7 @@ glibtop_get_cpu_p (glibtop *server, glib
if (server->sysdeps.cpu == 0)
return;

0
devel/libgtop2/patches/patch-sysdeps_freebsd_mem_c
View File

0
devel/libgtop2/patches/patch-sysdeps_freebsd_ppp_c
View File

12
devel/libgtop2/patches/patch-sysdeps_freebsd_prockernel_c
View File

@ -1,5 +1,5 @@
--- sysdeps/freebsd/prockernel.c.orig Wed Dec 1 19:29:56 2004
+++ sysdeps/freebsd/prockernel.c Wed Dec 1 19:30:04 2004
--- sysdeps/freebsd/prockernel.c.orig Sun Jul 18 13:33:56 2004
+++ sysdeps/freebsd/prockernel.c Fri Dec 10 19:15:09 2004
@@ -35,7 +35,7 @@
#include <sys/user.h>
#endif
@ -34,7 +34,7 @@
static const unsigned long _glibtop_sysdeps_proc_kernel_pstats =
(1L << GLIBTOP_PROC_KERNEL_MIN_FLT) +
(1L << GLIBTOP_PROC_KERNEL_MAJ_FLT) +
@@ -132,7 +124,7 @@
@@ -132,7 +124,7 @@ glibtop_get_proc_kernel_p (glibtop *serv
#endif
@ -43,7 +43,7 @@
buf->nwchan = (unsigned long) pinfo [0].PROC_WCHAN &~ KERNBASE;
buf->flags |= (1L << GLIBTOP_PROC_KERNEL_NWCHAN);
@@ -164,8 +156,8 @@
@@ -164,8 +156,8 @@ glibtop_get_proc_kernel_p (glibtop *serv
glibtop_suid_enter (server);
@ -54,7 +54,7 @@
/* On NetBSD, there is no kvm_uread(), and kvm_read() always reads
* from kernel memory. */
@@ -193,7 +185,7 @@
@@ -193,7 +185,7 @@ glibtop_get_proc_kernel_p (glibtop *serv
buf->flags |= _glibtop_sysdeps_proc_kernel_pstats;
}
@ -63,7 +63,7 @@
if (kvm_read (server->machine.kd,
#else
if ((pinfo [0].kp_proc.p_flag & P_INMEM) &&
@@ -223,7 +215,7 @@
@@ -223,7 +215,7 @@ glibtop_get_proc_kernel_p (glibtop *serv
buf->kstk_eip = (guint64) pcb.pcb_tss.__tss_eip;
#endif
#else

12
devel/libgtop2/patches/patch-sysdeps_freebsd_procmap_c
View File

@ -1,5 +1,5 @@
--- sysdeps/freebsd/procmap.c.orig Fri Sep 24 18:49:06 2004
+++ sysdeps/freebsd/procmap.c Wed Dec 1 19:58:45 2004
--- sysdeps/freebsd/procmap.c.orig Wed Jun 9 11:52:21 2004
+++ sysdeps/freebsd/procmap.c Fri Dec 10 19:15:09 2004
@@ -35,7 +35,7 @@
#include <vm/vm_object.h>
#include <vm/vm_prot.h>
@ -24,7 +24,7 @@
/* Fixme ... */
#undef _KERNEL
#define _UVM_UVM_AMAP_I_H_ 1
@@ -95,7 +97,7 @@
@@ -95,7 +97,7 @@ glibtop_get_proc_map_p (glibtop *server,
struct kinfo_proc *pinfo;
struct vm_map_entry entry, *first;
struct vmspace vmspace;
@ -33,7 +33,7 @@
struct vnode vnode;
struct inode inode;
#else
@@ -179,7 +181,7 @@
@@ -179,7 +181,7 @@ glibtop_get_proc_map_p (glibtop *server,
continue;
#endif
#else
@ -42,7 +42,7 @@
if (UVM_ET_ISSUBMAP (&entry))
continue;
#else
@@ -205,7 +207,7 @@
@@ -205,7 +207,7 @@ glibtop_get_proc_map_p (glibtop *server,
i++;
@ -51,7 +51,7 @@
if (!entry.object.uvm_obj)
continue;
@@ -229,7 +231,7 @@
@@ -229,7 +231,7 @@ glibtop_get_proc_map_p (glibtop *server,
glibtop_error_io_r (server, "kvm_read (object)");
#endif

16
devel/libgtop2/patches/patch-sysdeps_freebsd_procmem_c
View File

@ -1,5 +1,5 @@
--- sysdeps/freebsd/procmem.c.orig Wed Dec 1 19:37:32 2004
+++ sysdeps/freebsd/procmem.c Wed Dec 1 19:41:00 2004
--- sysdeps/freebsd/procmem.c.orig Sun Jul 18 13:33:56 2004
+++ sysdeps/freebsd/procmem.c Fri Dec 10 19:15:09 2004
@@ -31,7 +31,7 @@
#include <sys/param.h>
#include <sys/proc.h>
@ -18,7 +18,7 @@
#include <uvm/uvm.h>
#else
#include <vm/vm.h>
@@ -70,7 +70,7 @@
@@ -70,7 +70,7 @@ static const unsigned long _glibtop_sysd
(1L << GLIBTOP_PROC_MEM_RSS_RLIM);
static const unsigned long _glibtop_sysdeps_proc_mem_share =
@ -27,7 +27,7 @@
(1L << GLIBTOP_PROC_MEM_SHARE);
#elif defined(__FreeBSD__)
(1L << GLIBTOP_PROC_MEM_SHARE);
@@ -120,12 +120,12 @@
@@ -120,12 +120,12 @@ glibtop_get_proc_mem_p (glibtop *server,
struct kinfo_proc *pinfo;
struct vm_map_entry entry, *first;
struct vmspace *vms, vmspace;
@ -42,7 +42,7 @@
int count;
glibtop_init_p (server, (1L << GLIBTOP_SYSDEPS_PROC_MEM), 0);
@@ -159,16 +159,12 @@
@@ -159,16 +159,12 @@ glibtop_get_proc_mem_p (glibtop *server,
#else
#define PROC_VMSPACE kp_proc.p_vmspace
@ -63,7 +63,7 @@
vms = &pinfo [0].kp_eproc.e_vm;
@@ -220,7 +216,7 @@
@@ -220,7 +216,7 @@ glibtop_get_proc_mem_p (glibtop *server,
continue;
#endif
#else
@ -72,7 +72,7 @@
if (UVM_ET_ISSUBMAP (&entry))
continue;
#else
@@ -228,8 +224,7 @@
@@ -228,8 +224,7 @@ glibtop_get_proc_mem_p (glibtop *server,
continue;
#endif
#endif
@ -82,7 +82,7 @@
if (!entry.object.uvm_obj)
continue;
@@ -256,7 +251,7 @@
@@ -256,7 +251,7 @@ glibtop_get_proc_mem_p (glibtop *server,
#endif
/* If the object is of type vnode, add its size */

8
devel/libgtop2/patches/patch-sysdeps_freebsd_procuid_c
View File

@ -1,6 +1,6 @@
--- sysdeps/freebsd/procuid.c.orig Wed Dec 1 19:41:15 2004
+++ sysdeps/freebsd/procuid.c Wed Dec 1 19:42:03 2004
@@ -56,7 +56,7 @@
--- sysdeps/freebsd/procuid.c.orig Wed Jun 9 11:52:21 2004
+++ sysdeps/freebsd/procuid.c Fri Dec 10 19:15:09 2004
@@ -56,7 +56,7 @@ glibtop_get_proc_uid_p (glibtop *server,
int count = 0;
#if LIBGTOP_VERSION_CODE >= 1001000
@ -9,7 +9,7 @@
struct ucred ucred;
void *ucred_ptr;
#endif
@@ -115,7 +115,7 @@
@@ -115,7 +115,7 @@ glibtop_get_proc_uid_p (glibtop *server,
buf->tpgid = pinfo [0].PROC_TPGID;
buf->nice = pinfo [0].PROC_NICE;

6
devel/libgtop2/patches/patch-sysdeps_freebsd_sem_limits_c
View File

@ -1,6 +1,6 @@
--- sysdeps/freebsd/sem_limits.c.orig Wed Dec 1 19:42:08 2004
+++ sysdeps/freebsd/sem_limits.c Wed Dec 1 19:42:20 2004
@@ -104,7 +104,6 @@
--- sysdeps/freebsd/sem_limits.c.orig Wed Jun 9 11:52:21 2004
+++ sysdeps/freebsd/sem_limits.c Fri Dec 10 19:15:09 2004
@@ -104,7 +104,6 @@ glibtop_get_sem_limits_p (glibtop *serve
if (server->sysdeps.sem_limits == 0)
return;

0
devel/libgtop2/patches/patch-sysdeps_freebsd_swap_c
View File

0
devel/libgtop2/patches/patch-sysdeps_freebsd_uptime_c
View File