Mon Jan 14 07:12:53 2008 UTC ()
... wrong patch, this one has the final #endif


(tnn)
diff -r1.7 -r1.8 pkgsrc/x11/libX11/distinfo
diff -r1.1 -r1.2 pkgsrc/x11/libX11/patches/patch-ah
cvs diff -r1.7 -r1.8 pkgsrc/x11/libX11/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/libX11/distinfo 2008/01/14 06:50:51 1.7
+++ pkgsrc/x11/libX11/distinfo 2008/01/14 07:12:53 1.8
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: distinfo,v 1.7 2008/01/14 06:50:51 tnn Exp $ 1$NetBSD: distinfo,v 1.8 2008/01/14 07:12:53 tnn Exp $
2 2
3SHA1 (libX11-1.1.3.tar.bz2) = 235f69172b262f874d2a2d7bd17e8197aea5b767 3SHA1 (libX11-1.1.3.tar.bz2) = 235f69172b262f874d2a2d7bd17e8197aea5b767
4RMD160 (libX11-1.1.3.tar.bz2) = fcb8d5d31befa0ae227210dc7274c17b30c37fad 4RMD160 (libX11-1.1.3.tar.bz2) = fcb8d5d31befa0ae227210dc7274c17b30c37fad
5Size (libX11-1.1.3.tar.bz2) = 1526958 bytes 5Size (libX11-1.1.3.tar.bz2) = 1526958 bytes
6SHA1 (patch-aa) = 7c1905781ca9467adfb45e2cad9b710533bbcd17 6SHA1 (patch-aa) = 7c1905781ca9467adfb45e2cad9b710533bbcd17
7SHA1 (patch-ab) = 000f81dd5d21cbabf38e91b5066e8f1ce43ff957 7SHA1 (patch-ab) = 000f81dd5d21cbabf38e91b5066e8f1ce43ff957
8SHA1 (patch-ac) = 9b3bea367661efeef337f8b9ae62d5f430a2204e 8SHA1 (patch-ac) = 9b3bea367661efeef337f8b9ae62d5f430a2204e
9SHA1 (patch-ad) = 58645e734f48334ce5cbf62f5870d087d95194ee 9SHA1 (patch-ad) = 58645e734f48334ce5cbf62f5870d087d95194ee
10SHA1 (patch-ae) = 124c47038ac2c12dd37f3f63606396b9ed976822 10SHA1 (patch-ae) = 124c47038ac2c12dd37f3f63606396b9ed976822
11SHA1 (patch-af) = a97f3b31eecc783caecfeb315ac2cf6603ec32a5 11SHA1 (patch-af) = a97f3b31eecc783caecfeb315ac2cf6603ec32a5
12SHA1 (patch-ag) = 0d1cf4804049fd3640d627ddfbab7b717f20b445 12SHA1 (patch-ag) = 0d1cf4804049fd3640d627ddfbab7b717f20b445
13SHA1 (patch-ah) = 7c8e5a87c4cf3048e54448bef60e69193b39f24b 13SHA1 (patch-ah) = 3565c046484ba7b7d18cd5ddc3265870f143ffda
cvs diff -r1.1 -r1.2 pkgsrc/x11/libX11/patches/Attic/patch-ah (expand / switch to unified diff)

--- pkgsrc/x11/libX11/patches/Attic/patch-ah 2008/01/14 06:50:52 1.1
+++ pkgsrc/x11/libX11/patches/Attic/patch-ah 2008/01/14 07:12:53 1.2
@@ -1,15 +1,18 @@ @@ -1,15 +1,18 @@
1$NetBSD: patch-ah,v 1.1 2008/01/14 06:50:52 tnn Exp $ 1$NetBSD: patch-ah,v 1.2 2008/01/14 07:12:53 tnn Exp $
2 2
3--- src/XlibInt.c.orig 2007-07-21 10:45:39.000000000 +0200 3--- src/XlibInt.c.orig 2007-07-21 10:45:39.000000000 +0200
4+++ src/XlibInt.c 4+++ src/XlibInt.c
5@@ -138,6 +138,10 @@ xthread_t (*_Xthread_self_fn)(void) = NU 5@@ -138,8 +138,13 @@ xthread_t (*_Xthread_self_fn)(void) = NU
6 #ifdef ISC 6 #ifdef ISC
7 #define ECHECK(err) ((errno == err) || ETEST()) 7 #define ECHECK(err) ((errno == err) || ETEST())
8 #else 8 #else
9+#ifdef __hpux 9+#ifdef __hpux
10+#define ECHECK(err) ((errno == err) || ETEST()) 10+#define ECHECK(err) ((errno == err) || ETEST())
11+#define SUNSYSV 1 11+#define SUNSYSV 1
12+#else 12+#else
13 #define ECHECK(err) (errno == err) 13 #define ECHECK(err) (errno == err)
14 #endif 14 #endif
 15+#endif
15 #define ESET(val) errno = val 16 #define ESET(val) errno = val
 17 #endif
 18 #endif