summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorjoerg <joerg>2006-08-14 09:54:39 +0000
committerjoerg <joerg>2006-08-14 09:54:39 +0000
commit0c4aa6b5ac7b0011c16dfd58128b8ba5e03df04c (patch)
tree0743c325a677ba35ec205147266f6cc53b0ee20d /x11
parent1d9590818dc10cb4783c0d0d6d063a879ae05d32 (diff)
downloadpkgsrc-0c4aa6b5ac7b0011c16dfd58128b8ba5e03df04c.tar.gz
Don't install os.h and misc.h in server builds, it would override
files from xorg-libs.
Diffstat (limited to 'x11')
-rw-r--r--x11/xorg-libs/distinfo3
-rw-r--r--x11/xorg-libs/patches/patch-bq14
2 files changed, 16 insertions, 1 deletions
diff --git a/x11/xorg-libs/distinfo b/x11/xorg-libs/distinfo
index f3a34ac382a..b62f17de907 100644
--- a/x11/xorg-libs/distinfo
+++ b/x11/xorg-libs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.50 2006/07/31 16:39:41 joerg Exp $
+$NetBSD: distinfo,v 1.51 2006/08/14 09:54:39 joerg Exp $
SHA1 (X11R6.9.0-src1.tar.gz) = a6c077ed8fdeee5fe1956a427c4cb0bc266e1bef
RMD160 (X11R6.9.0-src1.tar.gz) = d12270a4f41a3ceee4bfd5da22d387a3aa707df8
@@ -51,6 +51,7 @@ SHA1 (patch-bm) = f9b73b7c1bd7d6d6db6d23741d5d1125eea5f860
SHA1 (patch-bn) = 58049eb799b469b70b5a2c611b8aef37a5631c0c
SHA1 (patch-bo) = fd34e4c71756f17294aeab63db1f15090b3edc1b
SHA1 (patch-bp) = 6bf5252ceeefb2a59cfa16b7375bba61f4867d01
+SHA1 (patch-bq) = 8e8f9a634b80b10dae7d79faaf1684cc9d8c1fa8
SHA1 (patch-ca) = 8a2a46defa2f62917128a0aaaf946cda8a169892
SHA1 (patch-cb) = 96e00c680acbafa3665ccae650a513daea3c2a01
SHA1 (patch-cc) = d5d72e525f9564eda7f2ea21ddb179800fb153b5
diff --git a/x11/xorg-libs/patches/patch-bq b/x11/xorg-libs/patches/patch-bq
new file mode 100644
index 00000000000..a0cd3b6aaae
--- /dev/null
+++ b/x11/xorg-libs/patches/patch-bq
@@ -0,0 +1,14 @@
+$NetBSD: patch-bq,v 1.1 2006/08/14 09:54:39 joerg Exp $
+
+--- programs/Xserver/include/Imakefile.orig 2006-08-14 08:07:51.000000000 +0000
++++ programs/Xserver/include/Imakefile
+@@ -5,7 +5,9 @@ XCOMM $Xorg: Imakefile,v 1.3 2000/08/17
+
+ XCOMM $XFree86: xc/programs/Xserver/include/Imakefile,v 3.21 2001/01/17 22:36:56 dawes Exp $
+
++#if !BuildServer
+ HEADERS = os.h misc.h
++#endif
+
+ #if defined(XorgVersion) || defined(XFree86Version) \
+ || defined(BSDOSArchitecture)