Sun Sep 20 12:04:01 2009 UTC ()
fix to build on FreeBSD7-STABE/amd64


(sno)
diff -r1.51 -r1.52 pkgsrc/x11/modular-xorg-server/Makefile
diff -r1.37 -r1.38 pkgsrc/x11/modular-xorg-server/distinfo
diff -r1.2 -r1.3 pkgsrc/x11/modular-xorg-server/patches/patch-sa
cvs diff -r1.51 -r1.52 pkgsrc/x11/modular-xorg-server/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/modular-xorg-server/Makefile 2009/08/01 15:33:46 1.51
+++ pkgsrc/x11/modular-xorg-server/Makefile 2009/09/20 12:04:01 1.52
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.51 2009/08/01 15:33:46 tnn Exp $ 1# $NetBSD: Makefile,v 1.52 2009/09/20 12:04:01 sno Exp $
2# 2#
3 3
4DISTNAME= xorg-server-1.6.3 4DISTNAME= xorg-server-1.6.3
5PKGNAME= modular-${DISTNAME} 5PKGNAME= modular-${DISTNAME}
6CATEGORIES= x11 6CATEGORIES= x11
7MASTER_SITES= ${MASTER_SITE_XORG:=xserver/} 7MASTER_SITES= ${MASTER_SITE_XORG:=xserver/}
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= bjs@NetBSD.org 10MAINTAINER= bjs@NetBSD.org
11HOMEPAGE= http://xorg.freedesktop.org/ 11HOMEPAGE= http://xorg.freedesktop.org/
12COMMENT= Modular X11 server from modular X.org 12COMMENT= Modular X11 server from modular X.org
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
@@ -36,26 +36,29 @@ BUILD_DEPENDS+= xorg-util-macros>=1.1.5: @@ -36,26 +36,29 @@ BUILD_DEPENDS+= xorg-util-macros>=1.1.5:
36 36
37DEPENDS+= xkbcomp-[0-9]*:../../x11/xkbcomp 37DEPENDS+= xkbcomp-[0-9]*:../../x11/xkbcomp
38DEPENDS+= xkeyboard-config-[0-9]*:../../x11/xkeyboard-config 38DEPENDS+= xkeyboard-config-[0-9]*:../../x11/xkeyboard-config
39 39
40.include "../../mk/bsd.prefs.mk" 40.include "../../mk/bsd.prefs.mk"
41 41
42CONFIGURE_ARGS+= --with-release-version=${PKGNAME:Q} 42CONFIGURE_ARGS+= --with-release-version=${PKGNAME:Q}
43CONFIGURE_ARGS+= --with-vendor-name="The NetBSD Foundation" 43CONFIGURE_ARGS+= --with-vendor-name="The NetBSD Foundation"
44CONFIGURE_ARGS+= --with-vendor-name-short="pkgsrc" 44CONFIGURE_ARGS+= --with-vendor-name-short="pkgsrc"
45.if ${OPSYS} == "NetBSD" 45.if ${OPSYS} == "NetBSD"
46CONFIGURE_ARGS+= --with-builder-addr="tech-x11@NetBSD.org" 46CONFIGURE_ARGS+= --with-builder-addr="tech-x11@NetBSD.org"
47CONFIGURE_ARGS+= --with-os-vendor="The NetBSD Foundation" 47CONFIGURE_ARGS+= --with-os-vendor="The NetBSD Foundation"
48.endif 48.endif
 49.if ${OPSYS} == "FreeBSD"
 50CONFIGURE_ARGS+= --without-dtrace
 51.endif
49CONFIGURE_ARGS+= --with-os-name=${MACHINE_PLATFORM:Q} 52CONFIGURE_ARGS+= --with-os-name=${MACHINE_PLATFORM:Q}
50CONFIGURE_ARGS+= --with-vendor-web="http://www.pkgsrc.org/" 53CONFIGURE_ARGS+= --with-vendor-web="http://www.pkgsrc.org/"
51 54
52CONFIGURE_ARGS+= --enable-xorg 55CONFIGURE_ARGS+= --enable-xorg
53 56
54CONFIGURE_ARGS+= --disable-config-hal 57CONFIGURE_ARGS+= --disable-config-hal
55CONFIGURE_ARGS+= --disable-dmx 58CONFIGURE_ARGS+= --disable-dmx
56CONFIGURE_ARGS+= --disable-xprint 59CONFIGURE_ARGS+= --disable-xprint
57CONFIGURE_ARGS+= --disable-xwin 60CONFIGURE_ARGS+= --disable-xwin
58CONFIGURE_ARGS+= --disable-xephyr 61CONFIGURE_ARGS+= --disable-xephyr
59CONFIGURE_ARGS+= --disable-kdrive 62CONFIGURE_ARGS+= --disable-kdrive
60CONFIGURE_ARGS+= --disable-kdrive-vesa 63CONFIGURE_ARGS+= --disable-kdrive-vesa
61CONFIGURE_ARGS+= --disable-xfake 64CONFIGURE_ARGS+= --disable-xfake
cvs diff -r1.37 -r1.38 pkgsrc/x11/modular-xorg-server/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/modular-xorg-server/distinfo 2009/08/01 11:06:23 1.37
+++ pkgsrc/x11/modular-xorg-server/distinfo 2009/09/20 12:04:01 1.38
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: distinfo,v 1.37 2009/08/01 11:06:23 hasso Exp $ 1$NetBSD: distinfo,v 1.38 2009/09/20 12:04:01 sno Exp $
2 2
3SHA1 (xorg-server-1.6.3.tar.bz2) = 1f28e8723e110e5c1a1adf3bc89325a81a526184 3SHA1 (xorg-server-1.6.3.tar.bz2) = 1f28e8723e110e5c1a1adf3bc89325a81a526184
4RMD160 (xorg-server-1.6.3.tar.bz2) = 5b9ddfeb9fb7082ef600e368ada8abbb006fe418 4RMD160 (xorg-server-1.6.3.tar.bz2) = 5b9ddfeb9fb7082ef600e368ada8abbb006fe418
5Size (xorg-server-1.6.3.tar.bz2) = 4651487 bytes 5Size (xorg-server-1.6.3.tar.bz2) = 4651487 bytes
6SHA1 (patch-ab) = c65457bf58b7504375b31512c743c9f1a5dcdde0 6SHA1 (patch-ab) = c65457bf58b7504375b31512c743c9f1a5dcdde0
7SHA1 (patch-af) = 722d4679d3386c9a02e1c45a1aa355658ccc2908 7SHA1 (patch-af) = 722d4679d3386c9a02e1c45a1aa355658ccc2908
8SHA1 (patch-ah) = 2820d1a394de6bf19b980cc52a41cbb09c582b8f 8SHA1 (patch-ah) = 2820d1a394de6bf19b980cc52a41cbb09c582b8f
9SHA1 (patch-aj) = 84ff5c6215d0b62734cf26e78394a70afe2b7007 9SHA1 (patch-aj) = 84ff5c6215d0b62734cf26e78394a70afe2b7007
10SHA1 (patch-ak) = df6d3b2172254e1f9d44eb40144cad5ed29a7d1d 10SHA1 (patch-ak) = df6d3b2172254e1f9d44eb40144cad5ed29a7d1d
11SHA1 (patch-al) = cb1fb44037f23fb2838ed36aaf2591946264fe53 11SHA1 (patch-al) = cb1fb44037f23fb2838ed36aaf2591946264fe53
12SHA1 (patch-am) = be278e6044dfa37b108d2544c82b84f36b6ca9d7 12SHA1 (patch-am) = be278e6044dfa37b108d2544c82b84f36b6ca9d7
13SHA1 (patch-sa) = a22001b4146dcbcbd5405c9a1ff7b1632ec946b8 13SHA1 (patch-sa) = bdd9209e873f676ee4d0436a94e468b824e80f87
14SHA1 (patch-sb) = 0a064016b16e088d08cd9e290a57cb4efb4f5d26 14SHA1 (patch-sb) = 0a064016b16e088d08cd9e290a57cb4efb4f5d26
15SHA1 (patch-sc) = dd93e15253b78395050d65df0f972e57ccf546e0 15SHA1 (patch-sc) = dd93e15253b78395050d65df0f972e57ccf546e0
16SHA1 (patch-sd) = 36d3946217b57416e8d0d3099e48d4e9f957c881 16SHA1 (patch-sd) = 36d3946217b57416e8d0d3099e48d4e9f957c881
17SHA1 (patch-se) = 22b20c734b7fcf59d75227aeb1fa703465582568 17SHA1 (patch-se) = 22b20c734b7fcf59d75227aeb1fa703465582568
cvs diff -r1.2 -r1.3 pkgsrc/x11/modular-xorg-server/patches/Attic/patch-sa (expand / switch to unified diff)

--- pkgsrc/x11/modular-xorg-server/patches/Attic/patch-sa 2009/06/07 11:23:47 1.2
+++ pkgsrc/x11/modular-xorg-server/patches/Attic/patch-sa 2009/09/20 12:04:01 1.3
@@ -1,13 +1,22 @@ @@ -1,13 +1,22 @@
1$NetBSD: patch-sa,v 1.2 2009/06/07 11:23:47 wiz Exp $ 1$NetBSD: patch-sa,v 1.3 2009/09/20 12:04:01 sno Exp $
2 2
3--- hw/xfree86/common/compiler.h.orig 2009-05-19 14:25:30 +0300 3--- hw/xfree86/common/compiler.h.orig 2009-07-07 19:48:58.000000000 +0200
4+++ hw/xfree86/common/compiler.h 2009-05-19 14:26:04 +0300 4+++ hw/xfree86/common/compiler.h 2009-09-20 11:51:51.000000000 +0200
5@@ -531,7 +531,7 @@ inl(unsigned short port) 5@@ -465,7 +465,7 @@
 6 extern unsigned int inw(unsigned long port);
 7 extern unsigned int inl(unsigned long port);
 8
 9-# elif defined(linux) && defined(__amd64__)
 10+# elif (defined(linux) || defined(__FreeBSD__)) && defined(__amd64__)
 11
 12 # include <inttypes.h>
 13
 14@@ -531,7 +531,7 @@
6 return ret; 15 return ret;
7 } 16 }
8  17
9-# elif (defined(linux) || defined(sun) || defined(__OpenBSD__) || defined(__FreeBSD__)) && defined(__sparc__) 18-# elif (defined(linux) || defined(sun) || defined(__OpenBSD__) || defined(__FreeBSD__)) && defined(__sparc__)
10+# elif (defined(linux) || defined(sun) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__)) && defined(__sparc__) 19+# elif (defined(linux) || defined(sun) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__)) && defined(__sparc__)
11  20
12 # ifndef ASI_PL 21 # ifndef ASI_PL
13 # define ASI_PL 0x88 22 # define ASI_PL 0x88