[pkgsrc/trunk]: pkgsrc/x11/xservers Use C code instead of dubious inline asse...

[tron <tron%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1766894a4036
branches:  trunk
changeset: 508665:1766894a4036
user:      tron <tron%pkgsrc.org@localhost>
date:      Thu Feb 23 15:39:48 2006 +0000

description:
Use C code instead of dubious inline assembler to fix build problem under
NetBSD 3.99.15 which resulted in an incomplete package installation.
Problem pointed out by Thomas Klausner in private e-mail.

Bump package revision because of this fix.

diffstat:

 x11/xservers/Makefile         |   4 ++--
 x11/xservers/distinfo         |   3 ++-
 x11/xservers/patches/patch-ag |  22 ++++++++++++++++++++++
 3 files changed, 26 insertions(+), 3 deletions(-)

diffs (53 lines):

diff -r ef6140f690a8 -r 1766894a4036 x11/xservers/Makefile
--- a/x11/xservers/Makefile     Thu Feb 23 14:53:04 2006 +0000
+++ b/x11/xservers/Makefile     Thu Feb 23 15:39:48 2006 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2006/02/08 15:20:49 joerg Exp $
+# $NetBSD: Makefile,v 1.30 2006/02/23 15:39:48 tron Exp $
 
 DISTNAME=      xservers-3.3.6.5
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=  .tar.bz2
diff -r ef6140f690a8 -r 1766894a4036 x11/xservers/distinfo
--- a/x11/xservers/distinfo     Thu Feb 23 14:53:04 2006 +0000
+++ b/x11/xservers/distinfo     Thu Feb 23 15:39:48 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2006/01/06 17:20:21 tron Exp $
+$NetBSD: distinfo,v 1.6 2006/02/23 15:39:48 tron Exp $
 
 SHA1 (xservers-3.3.6.5.tar.bz2) = cac39534a4c5f8969d93ebfcf1352fc695148b69
 RMD160 (xservers-3.3.6.5.tar.bz2) = eb3cc52911ce7ce96cba1a24734086cbf92887d9
@@ -9,3 +9,4 @@
 SHA1 (patch-ad) = d2625138dba810be59a99e1ba8d28460f7edb789
 SHA1 (patch-ae) = 300e9c1afb7a77625f282e94611fa1494fe76b97
 SHA1 (patch-af) = ab5054d9374ca67ebbc5ffc1dedb29554040b225
+SHA1 (patch-ag) = a0add213c778b362612ba59cbf2ad45d6780cb93
diff -r ef6140f690a8 -r 1766894a4036 x11/xservers/patches/patch-ag
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xservers/patches/patch-ag     Thu Feb 23 15:39:48 2006 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-ag,v 1.1 2006/02/23 15:39:48 tron Exp $
+
+--- programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_inline.h.orig        2006-02-23 14:45:57.000000000 +0000
++++ programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_inline.h     2006-02-23 14:55:22.000000000 +0000
+@@ -28,6 +28,7 @@
+       : "cx", "di");
+ } 
+ 
++#ifdef BROKEN_INLINE_ASSEMBLER
+ static __inline__ void __memset( void * s, char c, int count ) {
+       __asm__ __volatile__(
+       "cld\n\t"
+@@ -58,6 +59,9 @@
+       : "=a" (c), "=D" (s), "=d" (count) :"0" (c),"1" (s),"2" (count)
+       :"cx");
+ }
++#else
++#define       __memset(s, c, count)   (void)memset((s), (c), (count))
++#endif
+ 
+ static __inline__ void __memcpy( void *to, void *from, int n ) {
+ __asm__ __volatile__("cld\n\t"