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 (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,139 +1,142 @@ @@ -1,139 +1,142 @@
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
15SPECIAL_PERMS+= bin/Xorg ${SETUID_ROOT_PERMS} 15SPECIAL_PERMS+= bin/Xorg ${SETUID_ROOT_PERMS}
16 16
17GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
18USE_LIBTOOL= yes 18USE_LIBTOOL= yes
19USE_TOOLS+= gmake pkg-config 19USE_TOOLS+= gmake pkg-config
20 20
21PKGCONFIG_OVERRIDE+= xorg-server.pc.in 21PKGCONFIG_OVERRIDE+= xorg-server.pc.in
22SHLIBTOOL_OVERRIDE= # empty 22SHLIBTOOL_OVERRIDE= # empty
23 23
24BUILD_DEFS+= VARBASE 24BUILD_DEFS+= VARBASE
25BUILD_DEFS_EFFECTS+= XKB_OUTPUT_DIR 25BUILD_DEFS_EFFECTS+= XKB_OUTPUT_DIR
26 26
27OWN_DIRS+= ${XKB_OUTPUT_DIR} 27OWN_DIRS+= ${XKB_OUTPUT_DIR}
28XKB_OUTPUT_DIR?= ${VARBASE}/db/xkb # XXX sync with xkeyboard-config 28XKB_OUTPUT_DIR?= ${VARBASE}/db/xkb # XXX sync with xkeyboard-config
29 29
30CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} 30CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q}
31CONFIGURE_ARGS+= --with-xkb-output=${XKB_OUTPUT_DIR:Q} 31CONFIGURE_ARGS+= --with-xkb-output=${XKB_OUTPUT_DIR:Q}
32 32
33.if !empty(USE_TOOLS:Mauto*) 33.if !empty(USE_TOOLS:Mauto*)
34BUILD_DEPENDS+= xorg-util-macros>=1.1.5:../../devel/xorg-util-macros 34BUILD_DEPENDS+= xorg-util-macros>=1.1.5:../../devel/xorg-util-macros
35.endif 35.endif
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
62CONFIGURE_ARGS+= --disable-xsdl 65CONFIGURE_ARGS+= --disable-xsdl
63CONFIGURE_ARGS+= --disable-xfbdev 66CONFIGURE_ARGS+= --disable-xfbdev
64CONFIGURE_ARGS+= --disable-kbd_mode # deprecated 67CONFIGURE_ARGS+= --disable-kbd_mode # deprecated
65CONFIGURE_ARGS+= --disable-xorgcfg # deprecated 68CONFIGURE_ARGS+= --disable-xorgcfg # deprecated
66 69
67CONFIGURE_ARGS+= --with-int10=x86emu 70CONFIGURE_ARGS+= --with-int10=x86emu
68 71
69CONFIGURE_ENV+= APP_MAN_SUFFIX=1 FILE_MAN_SUFFIX=5 72CONFIGURE_ENV+= APP_MAN_SUFFIX=1 FILE_MAN_SUFFIX=5
70 73
71# Workaround for PR#41556. 74# Workaround for PR#41556.
72# Avoid to use bsd_kqueue_apm, force to use bsd_apm instead. 75# Avoid to use bsd_kqueue_apm, force to use bsd_apm instead.
73.if ${OPSYS} == "NetBSD" 76.if ${OPSYS} == "NetBSD"
74CONFIGURE_ENV+= ac_cv_header_sys_event_h=no 77CONFIGURE_ENV+= ac_cv_header_sys_event_h=no
75.endif 78.endif
76 79
77INSTALLATION_DIRS+= lib/xorg/modules/drivers lib/xorg/modules/input 80INSTALLATION_DIRS+= lib/xorg/modules/drivers lib/xorg/modules/input
78 81
79BUILDLINK_API_DEPENDS.MesaLib+= MesaLib>=7.1.0 82BUILDLINK_API_DEPENDS.MesaLib+= MesaLib>=7.1.0
80BUILDLINK_API_DEPENDS.compositeproto+= compositeproto>=0.4 83BUILDLINK_API_DEPENDS.compositeproto+= compositeproto>=0.4
81BUILDLINK_API_DEPENDS.fixesproto+= fixesproto>=4.0 84BUILDLINK_API_DEPENDS.fixesproto+= fixesproto>=4.0
82BUILDLINK_API_DEPENDS.glproto+= glproto>=1.4.9 85BUILDLINK_API_DEPENDS.glproto+= glproto>=1.4.9
83BUILDLINK_API_DEPENDS.inputproto+= inputproto>=1.5 86BUILDLINK_API_DEPENDS.inputproto+= inputproto>=1.5
84BUILDLINK_API_DEPENDS.kbproto+= kbproto>=1.0.3 87BUILDLINK_API_DEPENDS.kbproto+= kbproto>=1.0.3
85BUILDLINK_API_DEPENDS.pixman+= pixman>=0.13.2 88BUILDLINK_API_DEPENDS.pixman+= pixman>=0.13.2
86BUILDLINK_API_DEPENDS.randrproto+= randrproto>=1.2.99.1 89BUILDLINK_API_DEPENDS.randrproto+= randrproto>=1.2.99.1
87BUILDLINK_API_DEPENDS.renderproto+= renderproto>=0.9.3 90BUILDLINK_API_DEPENDS.renderproto+= renderproto>=0.9.3
88BUILDLINK_API_DEPENDS.xf86dgaproto+= xf86dgaproto>=2.0.3 91BUILDLINK_API_DEPENDS.xf86dgaproto+= xf86dgaproto>=2.0.3
89BUILDLINK_API_DEPENDS.xf86driproto+= xf86driproto>=2.0.4 92BUILDLINK_API_DEPENDS.xf86driproto+= xf86driproto>=2.0.4
90 93
91.include "options.mk" 94.include "options.mk"
92 95
93.include "../../devel/ncurses/buildlink3.mk" 96.include "../../devel/ncurses/buildlink3.mk"
94.include "../../devel/zlib/buildlink3.mk" 97.include "../../devel/zlib/buildlink3.mk"
95.include "../../fonts/libfontenc/buildlink3.mk" 98.include "../../fonts/libfontenc/buildlink3.mk"
96.include "../../graphics/MesaLib/buildlink3.mk" 99.include "../../graphics/MesaLib/buildlink3.mk"
97.include "../../security/openssl/buildlink3.mk" 100.include "../../security/openssl/buildlink3.mk"
98.include "../../sysutils/libpciaccess/buildlink3.mk" 101.include "../../sysutils/libpciaccess/buildlink3.mk"
99.include "../../x11/bigreqsproto/buildlink3.mk" 102.include "../../x11/bigreqsproto/buildlink3.mk"
100.include "../../x11/compositeproto/buildlink3.mk" 103.include "../../x11/compositeproto/buildlink3.mk"
101.include "../../x11/damageproto/buildlink3.mk" 104.include "../../x11/damageproto/buildlink3.mk"
102.include "../../x11/dri2proto/buildlink3.mk" 105.include "../../x11/dri2proto/buildlink3.mk"
103.include "../../x11/evieext/buildlink3.mk" 106.include "../../x11/evieext/buildlink3.mk"
104.include "../../x11/fixesproto/buildlink3.mk" 107.include "../../x11/fixesproto/buildlink3.mk"
105.include "../../x11/fontsproto/buildlink3.mk" 108.include "../../x11/fontsproto/buildlink3.mk"
106.include "../../x11/glproto/buildlink3.mk" 109.include "../../x11/glproto/buildlink3.mk"
107.include "../../x11/inputproto/buildlink3.mk" 110.include "../../x11/inputproto/buildlink3.mk"
108.include "../../x11/libX11/buildlink3.mk" 111.include "../../x11/libX11/buildlink3.mk"
109.include "../../x11/libXau/buildlink3.mk" 112.include "../../x11/libXau/buildlink3.mk"
110.include "../../x11/libXaw/buildlink3.mk" 113.include "../../x11/libXaw/buildlink3.mk"
111.include "../../x11/libXext/buildlink3.mk" 114.include "../../x11/libXext/buildlink3.mk"
112.include "../../x11/libXfixes/buildlink3.mk" 115.include "../../x11/libXfixes/buildlink3.mk"
113.include "../../x11/libXfont/buildlink3.mk" 116.include "../../x11/libXfont/buildlink3.mk"
114.include "../../x11/libXt/buildlink3.mk" 117.include "../../x11/libXt/buildlink3.mk"
115.include "../../x11/libXxf86misc/buildlink3.mk" 118.include "../../x11/libXxf86misc/buildlink3.mk"
116.include "../../x11/libXxf86vm/buildlink3.mk" 119.include "../../x11/libXxf86vm/buildlink3.mk"
117.include "../../x11/libdrm/buildlink3.mk" 120.include "../../x11/libdrm/buildlink3.mk"
118.include "../../x11/libxkbfile/buildlink3.mk" 121.include "../../x11/libxkbfile/buildlink3.mk"
119.include "../../x11/libxkbui/buildlink3.mk" 122.include "../../x11/libxkbui/buildlink3.mk"
120.include "../../x11/pixman/buildlink3.mk" 123.include "../../x11/pixman/buildlink3.mk"
121.include "../../x11/randrproto/buildlink3.mk" 124.include "../../x11/randrproto/buildlink3.mk"
122.include "../../x11/recordproto/buildlink3.mk" 125.include "../../x11/recordproto/buildlink3.mk"
123.include "../../x11/renderproto/buildlink3.mk" 126.include "../../x11/renderproto/buildlink3.mk"
124.include "../../x11/resourceproto/buildlink3.mk" 127.include "../../x11/resourceproto/buildlink3.mk"
125.include "../../x11/scrnsaverproto/buildlink3.mk" 128.include "../../x11/scrnsaverproto/buildlink3.mk"
126.include "../../x11/trapproto/buildlink3.mk" 129.include "../../x11/trapproto/buildlink3.mk"
127.include "../../x11/videoproto/buildlink3.mk" 130.include "../../x11/videoproto/buildlink3.mk"
128.include "../../x11/xcmiscproto/buildlink3.mk" 131.include "../../x11/xcmiscproto/buildlink3.mk"
129.include "../../x11/xextproto/buildlink3.mk" 132.include "../../x11/xextproto/buildlink3.mk"
130.include "../../x11/xf86bigfontproto/buildlink3.mk" 133.include "../../x11/xf86bigfontproto/buildlink3.mk"
131.include "../../x11/xf86dgaproto/buildlink3.mk" 134.include "../../x11/xf86dgaproto/buildlink3.mk"
132.include "../../x11/xf86driproto/buildlink3.mk" 135.include "../../x11/xf86driproto/buildlink3.mk"
133.include "../../x11/xf86miscproto/buildlink3.mk" 136.include "../../x11/xf86miscproto/buildlink3.mk"
134.include "../../x11/xf86vidmodeproto/buildlink3.mk" 137.include "../../x11/xf86vidmodeproto/buildlink3.mk"
135.include "../../x11/xineramaproto/buildlink3.mk" 138.include "../../x11/xineramaproto/buildlink3.mk"
136.include "../../x11/xproto/buildlink3.mk" 139.include "../../x11/xproto/buildlink3.mk"
137.include "../../x11/xtrans/buildlink3.mk" 140.include "../../x11/xtrans/buildlink3.mk"
138 141
139.include "../../mk/bsd.pkg.mk" 142.include "../../mk/bsd.pkg.mk"
cvs diff -r1.37 -r1.38 pkgsrc/x11/modular-xorg-server/distinfo (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 (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