diff options
author | veego <veego> | 2007-12-17 22:08:12 +0000 |
---|---|---|
committer | veego <veego> | 2007-12-17 22:08:12 +0000 |
commit | 81f18b9b54bd406416f76d3790fb50e931916b25 (patch) | |
tree | e7632a930cac90501452991e6e37d705cde9a85b /sysutils | |
parent | 046d92a21d86bc509ef835ad924ca2c117ff1cb4 (diff) | |
download | pkgsrc-81f18b9b54bd406416f76d3790fb50e931916b25.tar.gz |
Apply patch from PR pkg/37557 which fixed a build error on x86_64.
Diffstat (limited to 'sysutils')
-rw-r--r-- | sysutils/xosview/Makefile | 4 | ||||
-rw-r--r-- | sysutils/xosview/distinfo | 4 | ||||
-rw-r--r-- | sysutils/xosview/patches/patch-aa | 22 |
3 files changed, 24 insertions, 6 deletions
diff --git a/sysutils/xosview/Makefile b/sysutils/xosview/Makefile index f98062f0d95..a371622b594 100644 --- a/sysutils/xosview/Makefile +++ b/sysutils/xosview/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.65 2007/11/30 19:32:55 rillig Exp $ +# $NetBSD: Makefile,v 1.66 2007/12/17 22:08:12 veego Exp $ DISTNAME= xosview-1.8.3 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xosview/} diff --git a/sysutils/xosview/distinfo b/sysutils/xosview/distinfo index c904cfbdd2c..5c320f5ab1c 100644 --- a/sysutils/xosview/distinfo +++ b/sysutils/xosview/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.22 2007/11/30 19:32:55 rillig Exp $ +$NetBSD: distinfo,v 1.23 2007/12/17 22:08:12 veego Exp $ SHA1 (xosview-1.8.3.tar.gz) = 420fd0620ff9fb9ba83fc833eeb8b872414e377e RMD160 (xosview-1.8.3.tar.gz) = 595e812dee686ccaa5d95eb537782679d752271b Size (xosview-1.8.3.tar.gz) = 259793 bytes -SHA1 (patch-aa) = 85d392004017e7dfe79262b3e7fcacfd8499b8a2 +SHA1 (patch-aa) = 4a618b50e5c852b454db84019e7fa281c4b67337 SHA1 (patch-ab) = 274b83fd3488af8e0c4ce0184b8c78f4f6ef87df SHA1 (patch-ac) = 3e9073c4ccd7e08d29a76b08f2ed0c7f9f9d9ede SHA1 (patch-ad) = 02ae8395e200e5cbf8d6339eced33fe5aa421d38 diff --git a/sysutils/xosview/patches/patch-aa b/sysutils/xosview/patches/patch-aa index 39113dcb1f0..a025fdd9f43 100644 --- a/sysutils/xosview/patches/patch-aa +++ b/sysutils/xosview/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.18 2007/11/30 19:32:56 rillig Exp $ +$NetBSD: patch-aa,v 1.19 2007/12/17 22:08:12 veego Exp $ --- bsd/kernel.cc.orig 2006-02-18 08:36:06.000000000 +0100 -+++ bsd/kernel.cc 2007-10-11 01:53:02.000000000 +0200 ++++ bsd/kernel.cc 2007-12-17 21:23:26.000000000 +0100 @@ -115,8 +115,16 @@ // in __NetBSD_Version__ for us if needed. #if defined(XOSVIEW_NETBSD) && defined(__NetBSD_Version__) && (__NetBSD_Version__ >= 106010000) @@ -164,3 +164,21 @@ $NetBSD: patch-aa,v 1.18 2007/11/30 19:32:56 rillig Exp $ } *bytesXferred = xferred; #else +@@ -1016,7 +1043,7 @@ + + while (evptr && i < NUM_INTR) { + +- safe_kvm_read((unsigned int)evptr, &evcnt, sizeof(evcnt)); ++ safe_kvm_read((u_long)evptr, &evcnt, sizeof(evcnt)); + + evptr = evcnt.ev_list.tqe_next; + +@@ -1024,7 +1051,7 @@ + if (evcnt.ev_type != EVCNT_TYPE_INTR) + continue; + +- safe_kvm_read((unsigned int)evcnt.ev_name, evname, evcnt.ev_namelen); ++ safe_kvm_read((u_long)evcnt.ev_name, evname, evcnt.ev_namelen); + // If it's a soft interrupt (has a name that starts with "soft"), skip it. + if (!strncmp(evname, "soft", 4)) + continue; |