DELTA 307452 0 608 SVN?*FGBW (2 \ ${FILESDIR}/extra-clang386 .if defined(WITH_NEW_XORG) EXTRA_PATCHES+= ${FILESDIR}/extra-new-arch-i386 .else EXTRA_PATCHES+= ${FILESDIR}/extra-old-arch-i386 .endifENDREP DELTA SVNmomm--- hw/xfree86/common/compiler.h.orig 2012-05-17 19:09:03.000000000 +0200 +++ hw/xfree86/common/compiler.h 2013-01-18 13:59:18.366436857 +0100 @@ -1335,7 +1335,7 @@ #if !defined(__SUNPRO_C) #if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__) -#ifdef GCCUSESGAS +#if defined(GCCUSESGAS) || defined(__clang__) /* * If gcc uses gas rather than the native assembler, the syntax of these ENDREP DELTA SVN--- hw/xfree86/common/compiler.h.orig 2010-05-04 02:47:58.000000000 +0200 +++ hw/xfree86/common/compiler.h 2013-01-18 13:07:35.785442739 +0100 @@ -1021,7 +1021,7 @@ # if !defined(__SUNPRO_C) # if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__) -# ifdef GCCUSESGAS +# if defined(GCCUSESGAS) || defined(__clang__) /* * If gcc uses gas rather than the native assembler, the syntax of these ENDREP id: 5-108795.0.r310652/1297 type: file pred: 5-108795.0.r308898/808 count: 94 text: 310652 0 207 5311 dd78243f945727a52e430b01c7d909d9 97783b2352b854104957d87ff172461dc4aed797 310651-6npg/_4 props: 307452 635 103 0 bb58aa814bbdf5f7c1ab04a05656f5a5 cpath: /head/x11-servers/xorg-server/Makefile copyroot: 0 / PLAIN K 15 fbsd:nokeywords V 3 yes K 13 svn:eol-style V 6 native K 13 svn:mime-type V 10 text/plain END ENDREP id: 5-310652.0.r310652/1717 type: file count: 0 text: 310652 233 510 493 53d00ce07863c45b0753374c505b07a0 c19a027cef92478827ae6a9d4c63d6cea869406c 310651-6npg/_7 props: 310652 1606 98 0 8dda59e103a981389badbb35c2ee62ce cpath: /head/x11-servers/xorg-server/files/extra-new-arch-i386 copyroot: 0 / PLAIN K 15 fbsd:nokeywords V 3 yes K 13 svn:eol-style V 6 native K 13 svn:mime-type V 10 text/plain END ENDREP id: 8-310652.0.r310652/2125 type: file count: 0 text: 310652 756 528 511 5d1458de68f39965dc4158b9bf3c7ae5 dfb98be10af61885a89ec55536adb16a758a7633 310651-6npg/_9 props: 310652 2014 98 0 8dda59e103a981389badbb35c2ee62ce cpath: /head/x11-servers/xorg-server/files/extra-old-arch-i386 copyroot: 0 / PLAIN K 15 extra-arch-ia64 V 32 file 5-236350.0.r300897/11637887 K 18 extra-arch-powerpc V 32 file 8-204842.0.r300897/11642277 K 11 extra-clang V 28 file 5-308898.0.r308898/1226 K 18 extra-dix_events.c V 32 file 5-295417.0.r300897/11641107 K 32 extra-hw_dmx_glxProxy_compsize.h V 33 file 8c-295195.0.r300897/11638270 K 31 extra-hw_dmx_glxProxy_glxcmds.h V 33 file 8e-295195.0.r300897/11641488 K 24 extra-include_eventstr.h V 33 file 8g-295195.0.r300897/11640292 K 19 extra-new-arch-i386 V 28 file 5-310652.0.r310652/1717 K 19 extra-old-arch-i386 V 28 file 8-310652.0.r310652/2125 K 22 extra-patch-os-utils.c V 33 file 8i-295195.0.r300897/11642653 K 44 patch-Xserver-hw-xfree86-common-xf86Config.c V 32 file 8-155065.0.r300897/11638672 K 52 patch-Xserver-hw-xfree86-os-support-bsd-i386_video.c V 32 file a-155065.0.r300897/11640685 K 55 patch-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c V 32 file e-231409.0.r300897/11639087 K 26 patch-Xserver-os-xprintf.c V 32 file c-155065.0.r300897/11639507 K 16 patch-servermd.h V 33 file 2u-154073.0.r300897/11641889 K 18 patch-xorgconf.cpp V 32 file e-125635.0.r300897/11639904 K 16 pkg-deinstall.in V 29 file v-303429.0.r303429/92470 K 14 pkg-install.in V 29 file y-303429.0.r303429/92878 END ENDREP id: c-108795.0.r310652/3668 type: dir pred: c-108795.0.r308898/2643 count: 72 text: 310652 2422 1233 1233 5708799f338a7447abcb134c8ea5302a cpath: /head/x11-servers/xorg-server/files copyroot: 0 / PLAIN K 8 Makefile V 28 file 5-108795.0.r310652/1297 K 8 distinfo V 32 file a-108795.0.r300897/11637146 K 5 files V 27 dir c-108795.0.r310652/3668 K 9 pkg-descr V 33 file 14-108795.0.r300897/11637516 K 9 pkg-plist V 30 file 18-108795.0.r303429/94453 END ENDREP id: 4-108795.0.r310652/4126 type: dir pred: 4-108795.0.r308898/3101 count: 110 text: 310652 3865 248 248 1a860bf3cd9528d31a5bc9886211078f cpath: /head/x11-servers/xorg-server copyroot: 0 / PLAIN K 8 Makefile V 31 file 2-19812.0.r300897/11654328 K 5 Xfstt V 30 dir 2-15552.0.r300897/11652206 K 8 driglide V 25 dir k-40683.0.r308494/789 K 7 mga_hal V 31 dir 4-126283.0.r300897/11654082 K 5 x2vnc V 30 dir 4-32562.0.r300897/11629401 K 3 x2x V 30 dir 2-32224.0.r300897/11631481 K 6 xephyr V 31 dir 4-213383.0.r300897/11627949 K 8 xorg-dmx V 31 dir 4-131603.0.r300897/11647076 K 15 xorg-nestserver V 31 dir 4-114504.0.r300897/11655930 K 11 xorg-server V 27 dir 4-108795.0.r310652/4126 K 14 xorg-vfbserver V 31 dir 4-111774.0.r300897/11632962 END ENDREP id: 1n-710.0.r310652/4875 type: dir pred: 1n-710.0.r308898/3850 count: 625 text: 310652 4316 546 546 b603cf8e63bb1615a4c40c75b3e6fae6 cpath: /head/x11-servers copyroot: 0 / PLAIN K 10 .cvsignore V 23 file 1-7295.0.r7322/129 K 7 CHANGES V 27 file 1-99373.0.r308910/9871 K 9 COPYRIGHT V 26 file 1-146787.0.r309727/49 K 4 GIDs V 28 file 1-168311.0.r310500/3100 K 5 KNOBS V 31 file 1-147337.0.r300895/4669965 K 5 LEGAL V 24 file 1-748.0.r309993/837 K 5 MOVED V 26 file 1-69878.0.r310525/908 K 8 Makefile V 21 file 1-6.0.r302115/94 K 2 Mk V 22 dir 1-5.0.r310430/3306 K 6 README V 29 file 1-2408.0.r300895/4775053 K 9 Templates V 28 dir 1-2932.0.r300895/4753190 K 5 Tools V 26 dir 3-15302.0.r309059/3573 K 4 UIDs V 28 file 4-168311.0.r310500/3382 K 8 UPDATING V 27 file 1-102685.0.r310545/696 K 13 accessibility V 26 dir 1-42583.0.r309947/4219 K 6 arabic V 27 dir 1-38973.0.r309662/49132 K 9 archivers V 25 dir 1-242.0.r310522/14448 K 5 astro V 24 dir 1-301.0.r310548/7331 K 5 audio V 25 dir 1-148.0.r310620/48169 K 10 benchmarks V 23 dir 1-62.0.r310617/4879 K 7 biology V 25 dir 1-9066.0.r310361/7520 K 3 cad V 24 dir 1-276.0.r310451/6471 K 7 chinese V 26 dir 1-3770.0.r310125/11287 K 5 comms V 24 dir 1-76.0.r310508/11489 K 10 converters V 25 dir 1-1561.0.r310546/9300 K 9 databases V 25 dir 1-771.0.r310640/50071 K 9 deskutils V 26 dir 1-2098.0.r310555/17438 K 5 devel V 25 dir 1-73.0.r310651/235221 K 3 dns V 27 dir 1-6145.0.r310443/331718 K 7 editors V 23 dir 4-6.0.r310600/17244 K 9 emulators V 25 dir 1-181.0.r310544/13007 K 7 finance V 27 dir 1-4110.0.r310522/336196 K 6 french V 28 dir 1-25673.0.r310162/354227 K 3 ftp V 24 dir 1-199.0.r310528/6559 K 5 games V 26 dir 1-104.0.r310647/312677 K 6 german V 25 dir 1-7451.0.r310560/5223 K 8 graphics V 24 dir 1-94.0.r310644/58161 K 6 hebrew V 28 dir 3-31142.0.r309662/651625 K 9 hungarian V 29 dir 1p-38973.0.r310162/479572 K 3 irc V 24 dir 1-42.0.r310609/15693 K 8 japanese V 25 dir 1-410.0.r310614/19366 K 4 java V 25 dir 1-2798.0.r310610/8525 K 6 korean V 27 dir 1-5873.0.r309662/685367 K 4 lang V 24 dir 1-15.0.r310618/19708 K 4 mail V 24 dir 1-57.0.r310608/41882 K 4 math V 26 dir 1-162.0.r310647/349583 K 4 misc V 24 dir 7-35.0.r310594/31337 K 10 multimedia V 25 dir d-333.0.r310619/23607 K 3 net V 25 dir 1-22.0.r310647/419225 K 6 net-im V 28 dir 15-11144.0.r310623/12421 K 8 net-mgmt V 26 dir r-1011.0.r310635/20741 K 7 net-p2p V 27 dir g-29106.0.r310511/10297 K 4 news V 26 dir 1-145.0.r310443/587223 K 4 palm V 27 dir 1-6646.0.r308605/239862 K 6 polish V 27 dir tv-38973.0.r309960/2448 K 10 ports-mgmt V 27 dir 1-5132.0.r310522/398181 K 10 portuguese V 28 dir 1-17842.0.r309662/957701 K 5 print V 24 dir 1-79.0.r310588/17559 K 7 russian V 27 dir 1-1559.0.r309662/979896 K 7 science V 27 dir n-5356.0.r310553/318921 K 8 security V 25 dir 1-269.0.r310595/53159 K 6 shells V 22 dir w-6.0.r310540/3345 K 8 sysutils V 25 dir b-339.0.r310622/54623 K 8 textproc V 25 dir 1-322.0.r310650/83188 K 9 ukrainian V 29 dir g-39704.0.r309662/1192501 K 10 vietnamese V 28 dir 1-4812.0.r309662/1194712 K 3 www V 26 dir 1-114.0.r310649/121844 K 3 x11 V 24 dir 1-16.0.r310624/32046 K 10 x11-clocks V 26 dir 1-931.0.r309766/109437 K 11 x11-drivers V 27 dir 1-157567.0.r310463/4332 K 6 x11-fm V 24 dir 1-691.0.r310405/2817 K 9 x11-fonts V 24 dir 1-543.0.r310490/9986 K 11 x11-servers V 25 dir 1n-710.0.r310652/4875 K 10 x11-themes V 28 dir 1-14410.0.r310522/410502 K 12 x11-toolkits V 25 dir 1-120.0.r310600/33669 K 6 x11-wm V 23 dir 1-40.0.r310584/9805 END ENDREP id: 2-1.0.r310652/8379 type: dir pred: 2-1.0.r310651/238727 count: 310399 text: 310652 5049 3317 3317 d55aefeb6f724eca65fcc6d053a48b28 props: 308235 235189 45 0 7a04b33bf8e35fd5c3d111baaf403dc5 cpath: /head copyroot: 0 / PLAIN K 8 branches V 23 dir 0-1.0.r307934/26820 K 4 head V 22 dir 2-1.0.r310652/8379 K 8 svnadmin V 22 dir 3-1.0.r310407/1676 K 4 tags V 22 dir 8-1.0.r308518/4563 END ENDREP id: 0.0.r310652/8775 type: dir pred: 0.0.r310651/239128 count: 310652 text: 310652 8601 161 161 a296aab32b098110c1ce9412dc35843b cpath: / copyroot: 0 / minfo-cnt: 2 5-108795.0.t310651-6npg modify-file true false /head/x11-servers/xorg-server/Makefile _5.0.t310651-6npg add-file true true /head/x11-servers/xorg-server/files/extra-new-arch-i386 _8.0.t310651-6npg add-file true true /head/x11-servers/xorg-server/files/extra-old-arch-i386 8775 8941