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

- convert to use gnome.port.mk

Browse Source 
- regen patches
This commit is contained in:
jasper 2007-12-28 14:31:52 +00:00
parent 1b2f8b322d
commit 6d839c0aeb
8 changed files with 46 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
devel/libgtop2/Makefile
View File

@ -1,19 +1,14 @@
# $OpenBSD: Makefile,v 1.28 2007/11/13 14:06:21 steven Exp $
# $OpenBSD: Makefile,v 1.29 2007/12/28 14:31:52 jasper Exp $
COMMENT= portable library for obtaining system information
V= 2.14.6
DISTNAME= libgtop-${V}
PKGNAME= libgtop2-${V}p2
GNOME_VERSION= 2.14.6
GNOME_PROJECT= libgtop
PKGNAME= libgtop2-${VERSION}p3
SHARED_LIBS= gtop-2.0 7.0 # .7.0
CATEGORIES= devel
HOMEPAGE= http://www.gnome.org
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgtop/2.14/}
EXTRACT_SUFX= .tar.bz2
# GPL
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
@ -21,13 +16,13 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= Xau c kvm pcre
MODULES= devel/gettext
BUILD_DEPENDS= ::textproc/p5-XML-Parser
MODULES= devel/gettext \
x11/gnome
LIB_DEPENDS= glib-2.0::devel/glib2 \
popt::devel/popt
USE_GMAKE= Yes
USE_LIBTOOL= Yes
USE_X11= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}

14
devel/libgtop2/patches/patch-configure
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure,v 1.2 2007/01/18 19:31:34 jasper Exp $
--- configure.orig Wed Jan 17 08:48:59 2007
+++ configure Wed Jan 17 08:55:18 2007
$OpenBSD: patch-configure,v 1.3 2007/12/28 14:31:52 jasper Exp $
--- configure.orig Thu Jan 11 21:37:51 2007
+++ configure Fri Dec 28 15:29:17 2007
@@ -6185,6 +6185,16 @@ freebsd* | dragonfly*)
fi
;;
@ -18,7 +18,7 @@ $OpenBSD: patch-configure,v 1.2 2007/01/18 19:31:34 jasper Exp $
gnu*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -20874,7 +20884,6 @@ echo $ECHO_N "checking for libgtop sysde
@@ -20874,7 +20884,6 @@ echo $ECHO_N "checking for libgtop sysdeps directory..
libgtop_sysdeps_dir=freebsd
libgtop_use_machine_h=yes
libgtop_need_server=yes
@ -34,7 +34,7 @@ $OpenBSD: patch-configure,v 1.2 2007/01/18 19:31:34 jasper Exp $
#include <sys/ipc.h>
#include <sys/msg.h>
#include <stdio.h>
@@ -26161,7 +26171,7 @@ if test "${ac_cv_lib_intl_strftime+set}"
@@ -26161,7 +26171,7 @@ if test "${ac_cv_lib_intl_strftime+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
@ -43,7 +43,7 @@ $OpenBSD: patch-configure,v 1.2 2007/01/18 19:31:34 jasper Exp $
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -26221,7 +26231,7 @@ if test $ac_cv_lib_intl_strftime = yes;
@@ -26221,7 +26231,7 @@ if test $ac_cv_lib_intl_strftime = yes; then
#define HAVE_STRFTIME 1
_ACEOF
@ -52,7 +52,7 @@ $OpenBSD: patch-configure,v 1.2 2007/01/18 19:31:34 jasper Exp $
fi
fi
@@ -27365,7 +27375,7 @@ if test "${ac_cv_lib_intl_bindtextdomain
@@ -27365,7 +27375,7 @@ if test "${ac_cv_lib_intl_bindtextdomain+set}" = set;
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS

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

@ -1,7 +1,7 @@
$OpenBSD: patch-lib_open_c,v 1.4 2007/02/21 17:27:54 steven Exp $
$OpenBSD: patch-lib_open_c,v 1.5 2007/12/28 14:31:52 jasper Exp $
--- lib/open.c.orig Tue Jan 2 23:50:29 2007
+++ lib/open.c Sun Feb 18 20:23:18 2007
@@ -112,7 +112,7 @@ glibtop_open_l (glibtop *server, const c
+++ lib/open.c Fri Dec 28 15:29:17 2007
@@ -112,7 +112,7 @@ glibtop_open_l (glibtop *server, const char *program_n
close (server->input [0]); close (server->output [1]);
dup2 (server->input [1], 1);
dup2 (server->output [0], 0);

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

@ -1,7 +1,7 @@
$OpenBSD: patch-sysdeps_freebsd_fsusage_c,v 1.2 2007/01/18 19:31:34 jasper Exp $
--- sysdeps/freebsd/fsusage.c.orig Wed Jan 17 08:55:52 2007
+++ sysdeps/freebsd/fsusage.c Wed Jan 17 08:56:21 2007
@@ -47,7 +47,6 @@ _glibtop_freebsd_get_fsusage_read_write(
$OpenBSD: patch-sysdeps_freebsd_fsusage_c,v 1.3 2007/12/28 14:31:52 jasper Exp $
--- sysdeps/freebsd/fsusage.c.orig Tue Jan 2 23:50:28 2007
+++ sysdeps/freebsd/fsusage.c Fri Dec 28 15:29:17 2007
@@ -47,7 +47,6 @@ _glibtop_freebsd_get_fsusage_read_write(glibtop *serve
return;
}
#if !defined(__FreeBSD_kernel__)

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

@ -1,6 +1,6 @@
$OpenBSD: patch-sysdeps_freebsd_prockernel_c,v 1.4 2007/01/18 19:31:34 jasper Exp $
--- sysdeps/freebsd/prockernel.c.orig Wed Jan 17 08:57:14 2007
+++ sysdeps/freebsd/prockernel.c Wed Jan 17 09:00:34 2007
$OpenBSD: patch-sysdeps_freebsd_prockernel_c,v 1.5 2007/12/28 14:31:52 jasper Exp $
--- sysdeps/freebsd/prockernel.c.orig Tue Jan 2 23:50:28 2007
+++ sysdeps/freebsd/prockernel.c Fri Dec 28 15:29:17 2007
@@ -35,8 +35,9 @@
#if (!defined __OpenBSD__) && (!defined __bsdi__)
#include <sys/user.h>
@ -23,7 +23,7 @@ $OpenBSD: patch-sysdeps_freebsd_prockernel_c,v 1.4 2007/01/18 19:31:34 jasper Ex
_glibtop_sysdeps_proc_kernel_wchan;
}
@@ -216,13 +219,15 @@ glibtop_get_proc_kernel_p (glibtop *serv
@@ -216,13 +219,15 @@ glibtop_get_proc_kernel_p (glibtop *server,
/*xxx FreeBSD/Alpha? */
#endif
#else
@ -40,7 +40,7 @@ $OpenBSD: patch-sysdeps_freebsd_prockernel_c,v 1.4 2007/01/18 19:31:34 jasper Ex
#else
#if defined(__NetBSD__)
#if defined(__m68k__)
@@ -249,7 +254,10 @@ glibtop_get_proc_kernel_p (glibtop *serv
@@ -249,7 +254,10 @@ glibtop_get_proc_kernel_p (glibtop *server,
buf->kstk_eip = (guint64) 0;
#endif /* ${MACHINE_ARCH} */
#endif /* __NetBSD__ */

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

@ -1,6 +1,6 @@
$OpenBSD: patch-sysdeps_freebsd_procmap_c,v 1.6 2007/02/21 17:27:54 steven Exp $
$OpenBSD: patch-sysdeps_freebsd_procmap_c,v 1.7 2007/12/28 14:31:52 jasper Exp $
--- sysdeps/freebsd/procmap.c.orig Tue Jan 2 23:50:28 2007
+++ sysdeps/freebsd/procmap.c Sun Feb 18 20:23:18 2007
+++ sysdeps/freebsd/procmap.c Fri Dec 28 15:29:17 2007
@@ -36,7 +36,7 @@
#include <vm/vm_object.h>
#include <vm/vm_prot.h>
@ -24,7 +24,7 @@ $OpenBSD: patch-sysdeps_freebsd_procmap_c,v 1.6 2007/02/21 17:27:54 steven Exp $
/* Fixme ... */
#undef _KERNEL
#define _UVM_UVM_AMAP_I_H_ 1
@@ -102,7 +102,7 @@ glibtop_get_proc_map_p (glibtop *server,
@@ -102,7 +102,7 @@ glibtop_get_proc_map_p (glibtop *server, glibtop_proc_
struct kinfo_proc *pinfo;
struct vm_map_entry entry, *first;
struct vmspace vmspace;
@ -33,7 +33,7 @@ $OpenBSD: patch-sysdeps_freebsd_procmap_c,v 1.6 2007/02/21 17:27:54 steven Exp $
struct vnode vnode;
struct inode inode;
#else
@@ -167,7 +167,7 @@ glibtop_get_proc_map_p (glibtop *server,
@@ -167,7 +167,7 @@ glibtop_get_proc_map_p (glibtop *server, glibtop_proc_
/* I tested this a few times with `mmap'; as soon as you write
* to the mmap'ed area, the object type changes from OBJT_VNODE
@ -42,7 +42,7 @@ $OpenBSD: patch-sysdeps_freebsd_procmap_c,v 1.6 2007/02/21 17:27:54 steven Exp $
do {
if (update) {
@@ -188,7 +188,7 @@ glibtop_get_proc_map_p (glibtop *server,
@@ -188,7 +188,7 @@ glibtop_get_proc_map_p (glibtop *server, glibtop_proc_
continue;
#endif
#else
@ -51,7 +51,7 @@ $OpenBSD: patch-sysdeps_freebsd_procmap_c,v 1.6 2007/02/21 17:27:54 steven Exp $
if (UVM_ET_ISSUBMAP (&entry))
continue;
#else
@@ -214,7 +214,7 @@ glibtop_get_proc_map_p (glibtop *server,
@@ -214,7 +214,7 @@ glibtop_get_proc_map_p (glibtop *server, glibtop_proc_
i++;
@ -60,7 +60,7 @@ $OpenBSD: patch-sysdeps_freebsd_procmap_c,v 1.6 2007/02/21 17:27:54 steven Exp $
if (!entry.object.uvm_obj)
continue;
@@ -238,7 +238,7 @@ glibtop_get_proc_map_p (glibtop *server,
@@ -238,7 +238,7 @@ glibtop_get_proc_map_p (glibtop *server, glibtop_proc_
glibtop_error_io_r (server, "kvm_read (object)");
#endif

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

@ -1,6 +1,6 @@
$OpenBSD: patch-sysdeps_freebsd_procmem_c,v 1.5 2007/01/18 19:31:34 jasper Exp $
--- sysdeps/freebsd/procmem.c.orig Wed Jan 17 09:01:28 2007
+++ sysdeps/freebsd/procmem.c Wed Jan 17 09:05:01 2007
$OpenBSD: patch-sysdeps_freebsd_procmem_c,v 1.6 2007/12/28 14:31:52 jasper Exp $
--- sysdeps/freebsd/procmem.c.orig Tue Jan 2 23:50:28 2007
+++ sysdeps/freebsd/procmem.c Fri Dec 28 15:29:17 2007
@@ -34,7 +34,7 @@
#include <sys/resource.h>
#if defined(__NetBSD__) && (__NetBSD_Version__ >= 105020000)
@ -26,7 +26,7 @@ $OpenBSD: patch-sysdeps_freebsd_procmem_c,v 1.5 2007/01/18 19:31:34 jasper Exp $
/* Fixme ... */
#undef _KERNEL
#define _UVM_UVM_AMAP_I_H_ 1
@@ -71,10 +72,8 @@ static const unsigned long _glibtop_sysd
@@ -71,10 +72,8 @@ static const unsigned long _glibtop_sysdeps_proc_mem =
(1L << GLIBTOP_PROC_MEM_RSS_RLIM);
static const unsigned long _glibtop_sysdeps_proc_mem_share =
@ -38,7 +38,7 @@ $OpenBSD: patch-sysdeps_freebsd_procmem_c,v 1.5 2007/01/18 19:31:34 jasper Exp $
#else
0;
#endif
@@ -121,7 +120,7 @@ glibtop_get_proc_mem_p (glibtop *server,
@@ -121,7 +120,7 @@ glibtop_get_proc_mem_p (glibtop *server, glibtop_proc_
struct kinfo_proc *pinfo;
struct vm_map_entry entry, *first;
struct vmspace *vms, vmspace;
@ -47,7 +47,7 @@ $OpenBSD: patch-sysdeps_freebsd_procmem_c,v 1.5 2007/01/18 19:31:34 jasper Exp $
struct vnode vnode;
#else
struct vm_object object;
@@ -223,7 +222,7 @@ glibtop_get_proc_mem_p (glibtop *server,
@@ -223,7 +222,7 @@ glibtop_get_proc_mem_p (glibtop *server, glibtop_proc_
continue;
#endif
#else
@ -56,7 +56,7 @@ $OpenBSD: patch-sysdeps_freebsd_procmem_c,v 1.5 2007/01/18 19:31:34 jasper Exp $
if (UVM_ET_ISSUBMAP (&entry))
continue;
#else
@@ -232,7 +231,7 @@ glibtop_get_proc_mem_p (glibtop *server,
@@ -232,7 +231,7 @@ glibtop_get_proc_mem_p (glibtop *server, glibtop_proc_
#endif
#endif
@ -65,7 +65,7 @@ $OpenBSD: patch-sysdeps_freebsd_procmem_c,v 1.5 2007/01/18 19:31:34 jasper Exp $
if (!entry.object.uvm_obj)
continue;
@@ -259,7 +258,7 @@ glibtop_get_proc_mem_p (glibtop *server,
@@ -259,7 +258,7 @@ glibtop_get_proc_mem_p (glibtop *server, glibtop_proc_
#endif
/* If the object is of type vnode, add its size */
@ -74,7 +74,7 @@ $OpenBSD: patch-sysdeps_freebsd_procmem_c,v 1.5 2007/01/18 19:31:34 jasper Exp $
#if defined(UVM_VNODE_VALID)
if (!vnode.v_uvm.u_flags & UVM_VNODE_VALID)
continue;
@@ -275,7 +274,7 @@ glibtop_get_proc_mem_p (glibtop *server,
@@ -275,7 +274,7 @@ glibtop_get_proc_mem_p (glibtop *server, glibtop_proc_
#else
/* Reference count must be at least two. */

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

@ -1,7 +1,7 @@
$OpenBSD: patch-sysdeps_freebsd_sem_limits_c,v 1.5 2007/02/21 17:27:54 steven Exp $
$OpenBSD: patch-sysdeps_freebsd_sem_limits_c,v 1.6 2007/12/28 14:31:52 jasper Exp $
--- sysdeps/freebsd/sem_limits.c.orig Tue Jan 2 23:50:28 2007
+++ sysdeps/freebsd/sem_limits.c Sun Feb 18 20:23:18 2007
@@ -57,7 +57,10 @@ glibtop_get_sem_limits_p (glibtop *serve
+++ sysdeps/freebsd/sem_limits.c Fri Dec 28 15:29:17 2007
@@ -57,7 +57,10 @@ glibtop_get_sem_limits_p (glibtop *server, glibtop_sem
#include <sys/sem.h>
static unsigned long _glibtop_sysdeps_sem_limits =
@ -13,7 +13,7 @@ $OpenBSD: patch-sysdeps_freebsd_sem_limits_c,v 1.5 2007/02/21 17:27:54 steven Ex
(1L << GLIBTOP_IPC_SEMMNS) + (1L << GLIBTOP_IPC_SEMMNU) +
(1L << GLIBTOP_IPC_SEMMSL) + (1L << GLIBTOP_IPC_SEMOPM) +
(1L << GLIBTOP_IPC_SEMUME) + (1L << GLIBTOP_IPC_SEMUSZ) +
@@ -105,7 +108,9 @@ glibtop_get_sem_limits_p (glibtop *serve
@@ -105,7 +108,9 @@ glibtop_get_sem_limits_p (glibtop *server, glibtop_sem
if (server->sysdeps.sem_limits == 0)
return;