From ae0b13c01baff2c32c7e6467366e51ad04b9e124 Mon Sep 17 00:00:00 2001 From: phx Date: Sat, 8 Mar 2008 10:37:48 +0000 Subject: [PATCH] Make XFree86 compile for ofppc. Approved by garbled. --- distrib/sets/lists/xserver/md.ofppc | 267 ++++++++++++++++++ share/mk/bsd.x11.mk | 3 +- x11/Xserver/Makefile.common | 4 +- x11/Xserver/hw/xfree86/drivers/Makefile | 4 +- x11/Xserver/hw/xfree86/drivers/ati/Makefile | 4 +- .../hw/xfree86/drivers/atimisc/Makefile | 4 +- x11/Xserver/hw/xfree86/drivers/chips/Makefile | 4 +- x11/Xserver/hw/xfree86/drivers/glint/Makefile | 5 +- x11/Xserver/hw/xfree86/drivers/r128/Makefile | 5 +- x11/Xserver/hw/xfree86/xf86/Makefile | 4 +- x11/Xserver/hw/xfree86/xf86_os/Makefile | 9 +- 11 files changed, 292 insertions(+), 21 deletions(-) create mode 100644 distrib/sets/lists/xserver/md.ofppc diff --git a/distrib/sets/lists/xserver/md.ofppc b/distrib/sets/lists/xserver/md.ofppc new file mode 100644 index 000000000000..917732d95146 --- /dev/null +++ b/distrib/sets/lists/xserver/md.ofppc @@ -0,0 +1,267 @@ +# $NetBSD: md.ofppc,v 1.1 2008/03/08 10:37:48 phx Exp $ +./usr/X11R6/bin/X +./usr/X11R6/bin/XFree86 +./usr/X11R6/bin/dga +./usr/X11R6/bin/gtf +./usr/X11R6/bin/kbd_mode +./usr/X11R6/bin/mmapr +./usr/X11R6/bin/mmapw +./usr/X11R6/bin/pcitweak +./usr/X11R6/bin/scanpci +./usr/X11R6/bin/xf86cfg +./usr/X11R6/bin/xf86config +./usr/X11R6/include/X11/bitmaps/card.xbm +./usr/X11R6/include/X11/bitmaps/down.xbm +./usr/X11R6/include/X11/bitmaps/keyboard.xbm +./usr/X11R6/include/X11/bitmaps/left.xbm +./usr/X11R6/include/X11/bitmaps/monitor.xbm +./usr/X11R6/include/X11/bitmaps/mouse.xbm +./usr/X11R6/include/X11/bitmaps/narrower.xbm +./usr/X11R6/include/X11/bitmaps/right.xbm +./usr/X11R6/include/X11/bitmaps/shorter.xbm +./usr/X11R6/include/X11/bitmaps/taller.xbm +./usr/X11R6/include/X11/bitmaps/up.xbm +./usr/X11R6/include/X11/bitmaps/wider.xbm +./usr/X11R6/include/X11/pixmaps/card.xpm +./usr/X11R6/include/X11/pixmaps/computer.xpm +./usr/X11R6/include/X11/pixmaps/keyboard.xpm +./usr/X11R6/include/X11/pixmaps/monitor.xpm +./usr/X11R6/include/X11/pixmaps/mouse.xpm +./usr/X11R6/include/xf86Optrec.h +./usr/X11R6/include/xf86Parser.h +./usr/X11R6/lib/X11/Cards +./usr/X11R6/lib/X11/Options +./usr/X11R6/lib/X11/XF86Config.98 +./usr/X11R6/lib/X11/XF86Config.eg +./usr/X11R6/lib/X11/app-defaults/XF86Cfg +./usr/X11R6/lib/X11/doc/BUILD +./usr/X11R6/lib/X11/doc/BugReport +./usr/X11R6/lib/X11/doc/DESIGN +./usr/X11R6/lib/X11/doc/Install +./usr/X11R6/lib/X11/doc/LICENSE +./usr/X11R6/lib/X11/doc/README +./usr/X11R6/lib/X11/doc/README.DECtga +./usr/X11R6/lib/X11/doc/README.DGA xserver-obsolete obsolete +./usr/X11R6/lib/X11/doc/README.DRI +./usr/X11R6/lib/X11/doc/README.DRIcomp +./usr/X11R6/lib/X11/doc/README.I128 +./usr/X11R6/lib/X11/doc/README.SiS +./usr/X11R6/lib/X11/doc/README.XKB-Config +./usr/X11R6/lib/X11/doc/README.XKB-Enhancing +./usr/X11R6/lib/X11/doc/README.apm +./usr/X11R6/lib/X11/doc/README.ati +./usr/X11R6/lib/X11/doc/README.chips +./usr/X11R6/lib/X11/doc/README.cyrix +./usr/X11R6/lib/X11/doc/README.dps +./usr/X11R6/lib/X11/doc/README.fonts +./usr/X11R6/lib/X11/doc/README.i740 +./usr/X11R6/lib/X11/doc/README.i810 +./usr/X11R6/lib/X11/doc/README.mouse +./usr/X11R6/lib/X11/doc/README.newport +./usr/X11R6/lib/X11/doc/README.r128 +./usr/X11R6/lib/X11/doc/README.rapidaccess +./usr/X11R6/lib/X11/doc/README.rendition +./usr/X11R6/lib/X11/doc/README.s3virge +./usr/X11R6/lib/X11/doc/RELNOTES +./usr/X11R6/lib/X11/doc/ServersOnly xserver-obsolete obsolete +./usr/X11R6/lib/X11/doc/Status xserver-obsolete obsolete +./usr/X11R6/lib/X11/doc/Versions +./usr/X11R6/lib/X11/doc/VideoBoard98 +./usr/X11R6/lib/X11/etc/xmodmap.std +./usr/X11R6/lib/libxf86config.a +./usr/X11R6/lib/modules/codeconv/libARABIC.a xserver-obsolete obsolete +./usr/X11R6/lib/modules/codeconv/libARMSCII8.a xserver-obsolete obsolete +./usr/X11R6/lib/modules/codeconv/libBIG5.a xserver-obsolete obsolete +./usr/X11R6/lib/modules/codeconv/libBIG5HKSCS.a xserver-obsolete obsolete +./usr/X11R6/lib/modules/codeconv/libDOSENCODING.a xserver-obsolete obsolete +./usr/X11R6/lib/modules/codeconv/libGB2312.a xserver-obsolete obsolete +./usr/X11R6/lib/modules/codeconv/libGBK.a xserver-obsolete obsolete +./usr/X11R6/lib/modules/codeconv/libGEORGIAN.a xserver-obsolete obsolete +./usr/X11R6/lib/modules/codeconv/libISO8859_1.a xserver-obsolete obsolete +./usr/X11R6/lib/modules/codeconv/libISO8859_10.a xserver-obsolete obsolete +./usr/X11R6/lib/modules/codeconv/libISO8859_11.a xserver-obsolete obsolete +./usr/X11R6/lib/modules/codeconv/libISO8859_14.a xserver-obsolete obsolete +./usr/X11R6/lib/modules/codeconv/libISO8859_15.a xserver-obsolete obsolete +./usr/X11R6/lib/modules/codeconv/libISO8859_2.a xserver-obsolete obsolete +./usr/X11R6/lib/modules/codeconv/libISO8859_3.a xserver-obsolete obsolete +./usr/X11R6/lib/modules/codeconv/libISO8859_4.a xserver-obsolete obsolete +./usr/X11R6/lib/modules/codeconv/libISO8859_5.a xserver-obsolete obsolete +./usr/X11R6/lib/modules/codeconv/libISO8859_6.a xserver-obsolete obsolete +./usr/X11R6/lib/modules/codeconv/libISO8859_7.a xserver-obsolete obsolete +./usr/X11R6/lib/modules/codeconv/libISO8859_8.a xserver-obsolete obsolete +./usr/X11R6/lib/modules/codeconv/libISO8859_9.a xserver-obsolete obsolete +./usr/X11R6/lib/modules/codeconv/libJISX0201.a xserver-obsolete obsolete +./usr/X11R6/lib/modules/codeconv/libJISX0208.a xserver-obsolete obsolete +./usr/X11R6/lib/modules/codeconv/libJISX0212.a xserver-obsolete obsolete +./usr/X11R6/lib/modules/codeconv/libKOI8.a xserver-obsolete obsolete +./usr/X11R6/lib/modules/codeconv/libKSC5601.a xserver-obsolete obsolete +./usr/X11R6/lib/modules/codeconv/libKSCJOHAB.a xserver-obsolete obsolete +./usr/X11R6/lib/modules/codeconv/libMULEENCODING.a xserver-obsolete obsolete +./usr/X11R6/lib/modules/codeconv/libTCVN.a xserver-obsolete obsolete +./usr/X11R6/lib/modules/codeconv/libVISCII.a xserver-obsolete obsolete +./usr/X11R6/lib/modules/drivers/ati_drv.o +./usr/X11R6/lib/modules/drivers/atimisc_drv.o +./usr/X11R6/lib/modules/drivers/chips_drv.o +./usr/X11R6/lib/modules/drivers/fbdev_drv.o +./usr/X11R6/lib/modules/drivers/glint_drv.o +./usr/X11R6/lib/modules/drivers/imstt_drv.o +./usr/X11R6/lib/modules/drivers/mga_drv.o +./usr/X11R6/lib/modules/drivers/nv_drv.o +./usr/X11R6/lib/modules/drivers/r128_drv.o +./usr/X11R6/lib/modules/drivers/radeon_drv.o +./usr/X11R6/lib/modules/drivers/riva128.o +./usr/X11R6/lib/modules/drivers/s3_drv.o +./usr/X11R6/lib/modules/drivers/s3virge_drv.o +./usr/X11R6/lib/modules/drivers/savage_drv.o +./usr/X11R6/lib/modules/drivers/sis_drv.o +./usr/X11R6/lib/modules/drivers/tdfx_drv.o +./usr/X11R6/lib/modules/drivers/trident_drv.o +./usr/X11R6/lib/modules/drivers/vga_drv.o +./usr/X11R6/lib/modules/drivers/wsfb.o xserver-obsolete obsolete +./usr/X11R6/lib/modules/drivers/wsfb_drv.o +./usr/X11R6/lib/modules/extensions/libGLcore.a +./usr/X11R6/lib/modules/extensions/libdbe.a +./usr/X11R6/lib/modules/extensions/libextmod.a +./usr/X11R6/lib/modules/extensions/libglx.a +./usr/X11R6/lib/modules/extensions/librecord.a +./usr/X11R6/lib/modules/extensions/libxtrap.a +./usr/X11R6/lib/modules/fonts/libbitmap.a +./usr/X11R6/lib/modules/fonts/libfreetype.a +./usr/X11R6/lib/modules/fonts/libspeedo.a +./usr/X11R6/lib/modules/fonts/libtype1.a +./usr/X11R6/lib/modules/fonts/libxtt.a +./usr/X11R6/lib/modules/input/acecad_drv.o +./usr/X11R6/lib/modules/input/calcomp_drv.o +./usr/X11R6/lib/modules/input/citron_drv.o +./usr/X11R6/lib/modules/input/digitaledge_drv.o +./usr/X11R6/lib/modules/input/dmc_drv.o +./usr/X11R6/lib/modules/input/dynapro_drv.o +./usr/X11R6/lib/modules/input/elographics_drv.o +./usr/X11R6/lib/modules/input/fpit_drv.o +./usr/X11R6/lib/modules/input/hyperpen_drv.o +./usr/X11R6/lib/modules/input/js_x_drv.o +./usr/X11R6/lib/modules/input/kbd_drv.o +./usr/X11R6/lib/modules/input/magellan_drv.o +./usr/X11R6/lib/modules/input/microtouch_drv.o +./usr/X11R6/lib/modules/input/mouse_drv.o +./usr/X11R6/lib/modules/input/mutouch_drv.o +./usr/X11R6/lib/modules/input/palmax_drv.o +./usr/X11R6/lib/modules/input/penmount_drv.o +./usr/X11R6/lib/modules/input/spaceorb_drv.o +./usr/X11R6/lib/modules/input/summa_drv.o +./usr/X11R6/lib/modules/input/tek4957_drv.o +./usr/X11R6/lib/modules/input/usbtablet_drv.o +./usr/X11R6/lib/modules/input/void_drv.o +./usr/X11R6/lib/modules/input/wacom_drv.o +./usr/X11R6/lib/modules/libcfb.a +./usr/X11R6/lib/modules/libcfb16.a +./usr/X11R6/lib/modules/libcfb24.a +./usr/X11R6/lib/modules/libcfb32.a +./usr/X11R6/lib/modules/libddc.a +./usr/X11R6/lib/modules/libfb.a +./usr/X11R6/lib/modules/libi2c.a +./usr/X11R6/lib/modules/libint10.a +./usr/X11R6/lib/modules/liblayer.a +./usr/X11R6/lib/modules/libmfb.a +./usr/X11R6/lib/modules/libpcidata.a +./usr/X11R6/lib/modules/librac.a +./usr/X11R6/lib/modules/libramdac.a +./usr/X11R6/lib/modules/libscanpci.a +./usr/X11R6/lib/modules/libshadow.a +./usr/X11R6/lib/modules/libshadowfb.a +./usr/X11R6/lib/modules/libvbe.a +./usr/X11R6/lib/modules/libvgahw.a +./usr/X11R6/lib/modules/libxaa.a +./usr/X11R6/lib/modules/libxf1bpp.a +./usr/X11R6/lib/modules/libxf24_32bpp.a +./usr/X11R6/lib/modules/libxf4bpp.a +./usr/X11R6/lib/modules/libxf8_16bpp.a +./usr/X11R6/lib/modules/libxf8_32bpp.a +./usr/X11R6/man/cat1/XFree86.0 -unknown- .cat +./usr/X11R6/man/cat1/dga.0 -unknown- .cat +./usr/X11R6/man/cat1/gtf.0 -unknown- .cat +./usr/X11R6/man/cat1/kbd_mode.0 -unknown- .cat +./usr/X11R6/man/cat1/pcitweak.0 -unknown- .cat +./usr/X11R6/man/cat1/scanpci.0 -unknown- .cat +./usr/X11R6/man/cat1/xf86cfg.0 -unknown- .cat +./usr/X11R6/man/cat1/xf86config.0 -unknown- .cat +./usr/X11R6/man/cat4/acecad.0 -unknown- .cat +./usr/X11R6/man/cat4/ati.0 -unknown- .cat +./usr/X11R6/man/cat4/chips.0 -unknown- .cat +./usr/X11R6/man/cat4/citron.0 -unknown- .cat +./usr/X11R6/man/cat4/dmc.0 -unknown- .cat +./usr/X11R6/man/cat4/dynapro.0 -unknown- .cat +./usr/X11R6/man/cat4/elographics.0 -unknown- .cat +./usr/X11R6/man/cat4/fbdev.0 -unknown- .cat +./usr/X11R6/man/cat4/fbdevhw.0 -unknown- .cat +./usr/X11R6/man/cat4/fpit.0 -unknown- .cat +./usr/X11R6/man/cat4/glint.0 -unknown- .cat +./usr/X11R6/man/cat4/imstt.0 -unknown- .cat +./usr/X11R6/man/cat4/js_x.0 -unknown- .cat +./usr/X11R6/man/cat4/kbd.0 -unknown- .cat +./usr/X11R6/man/cat4/keyboard.0 -unknown- .cat +./usr/X11R6/man/cat4/mga.0 -unknown- .cat +./usr/X11R6/man/cat4/microtouch.0 -unknown- .cat +./usr/X11R6/man/cat4/mouse.0 -unknown- .cat +./usr/X11R6/man/cat4/mutouch.0 -unknown- .cat +./usr/X11R6/man/cat4/nv.0 -unknown- .cat +./usr/X11R6/man/cat4/palmax.0 -unknown- .cat +./usr/X11R6/man/cat4/penmount.0 -unknown- .cat +./usr/X11R6/man/cat4/r128.0 -unknown- .cat +./usr/X11R6/man/cat4/radeon.0 -unknown- .cat +./usr/X11R6/man/cat4/s3virge.0 -unknown- .cat +./usr/X11R6/man/cat4/savage.0 -unknown- .cat +./usr/X11R6/man/cat4/sis.0 -unknown- .cat +./usr/X11R6/man/cat4/tdfx.0 -unknown- .cat +./usr/X11R6/man/cat4/tek4957.0 -unknown- .cat +./usr/X11R6/man/cat4/trident.0 -unknown- .cat +./usr/X11R6/man/cat4/usbtablet.0 -unknown- .cat +./usr/X11R6/man/cat4/vga.0 -unknown- .cat +./usr/X11R6/man/cat4/void.0 -unknown- .cat +./usr/X11R6/man/cat4/wacom.0 -unknown- .cat +./usr/X11R6/man/cat4/wsfb.0 -unknown- .cat +./usr/X11R6/man/cat5/XF86Config.0 -unknown- .cat +./usr/X11R6/man/man1/XFree86.1 -unknown- .man +./usr/X11R6/man/man1/dga.1 -unknown- .man +./usr/X11R6/man/man1/gtf.1 -unknown- .man +./usr/X11R6/man/man1/kbd_mode.1 -unknown- .man +./usr/X11R6/man/man1/pcitweak.1 -unknown- .man +./usr/X11R6/man/man1/scanpci.1 -unknown- .man +./usr/X11R6/man/man1/xf86cfg.1 -unknown- .man +./usr/X11R6/man/man1/xf86config.1 -unknown- .man +./usr/X11R6/man/man4/acecad.4 -unknown- .man +./usr/X11R6/man/man4/ati.4 -unknown- .man +./usr/X11R6/man/man4/chips.4 -unknown- .man +./usr/X11R6/man/man4/citron.4 -unknown- .man +./usr/X11R6/man/man4/dmc.4 -unknown- .man +./usr/X11R6/man/man4/dynapro.4 -unknown- .man +./usr/X11R6/man/man4/elographics.4 -unknown- .man +./usr/X11R6/man/man4/fbdev.4 -unknown- .man +./usr/X11R6/man/man4/fbdevhw.4 -unknown- .man +./usr/X11R6/man/man4/fpit.4 -unknown- .man +./usr/X11R6/man/man4/glint.4 -unknown- .man +./usr/X11R6/man/man4/imstt.4 -unknown- .man +./usr/X11R6/man/man4/js_x.4 -unknown- .man +./usr/X11R6/man/man4/kbd.4 -unknown- .man +./usr/X11R6/man/man4/keyboard.4 -unknown- .man +./usr/X11R6/man/man4/mga.4 -unknown- .man +./usr/X11R6/man/man4/microtouch.4 -unknown- .man +./usr/X11R6/man/man4/mouse.4 -unknown- .man +./usr/X11R6/man/man4/mutouch.4 -unknown- .man +./usr/X11R6/man/man4/nv.4 -unknown- .man +./usr/X11R6/man/man4/palmax.4 -unknown- .man +./usr/X11R6/man/man4/penmount.4 -unknown- .man +./usr/X11R6/man/man4/r128.4 -unknown- .man +./usr/X11R6/man/man4/radeon.4 -unknown- .man +./usr/X11R6/man/man4/s3virge.4 -unknown- .man +./usr/X11R6/man/man4/savage.4 -unknown- .man +./usr/X11R6/man/man4/sis.4 -unknown- .man +./usr/X11R6/man/man4/tdfx.4 -unknown- .man +./usr/X11R6/man/man4/tek4957.4 -unknown- .man +./usr/X11R6/man/man4/trident.4 -unknown- .man +./usr/X11R6/man/man4/usbtablet.4 -unknown- .man +./usr/X11R6/man/man4/vga.4 -unknown- .man +./usr/X11R6/man/man4/void.4 -unknown- .man +./usr/X11R6/man/man4/wacom.4 -unknown- .man +./usr/X11R6/man/man4/wsfb.4 -unknown- .man +./usr/X11R6/man/man5/XF86Config.5 -unknown- .man diff --git a/share/mk/bsd.x11.mk b/share/mk/bsd.x11.mk index b66f32c0d211..886c2d87a443 100644 --- a/share/mk/bsd.x11.mk +++ b/share/mk/bsd.x11.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.x11.mk,v 1.56 2007/08/06 04:25:57 lukem Exp $ +# $NetBSD: bsd.x11.mk,v 1.57 2008/03/08 10:39:39 phx Exp $ .include @@ -77,6 +77,7 @@ X11FLAGS.EXTENSION+= -D__GLX_ALIGN64 ${MACHINE} == "i386" || \ ${MACHINE} == "macppc" || \ ${MACHINE} == "netwinder" || \ + ${MACHINE} == "ofppc" || \ ${MACHINE} == "sgimips" || \ ${MACHINE} == "sparc64" || \ ${MACHINE} == "sparc" || \ diff --git a/x11/Xserver/Makefile.common b/x11/Xserver/Makefile.common index 427292b25c80..7f317a7f4b87 100644 --- a/x11/Xserver/Makefile.common +++ b/x11/Xserver/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.33 2006/12/21 01:45:32 macallan Exp $ +# $NetBSD: Makefile.common,v 1.34 2008/03/08 10:38:59 phx Exp $ # These define parts of the Xserver tree that are to be # conditionally compiled for different platforms. See @@ -48,7 +48,7 @@ XSERVER_XNEWSMIPS?= yes .if ${MACHINE} == "i386" || ${MACHINE} == "amd64" || \ ${MACHINE} == "macppc" || ${MACHINE} == "cats" || \ ${MACHINE} == "sgimips" || ${MACHINE} == "sparc64" || \ - ${MACHINE} == "sparc" || \ + ${MACHINE} == "sparc" || ${MACHINE} == "ofppc" || \ ${MACHINE} == "netwinder" || ${MACHINE} == "shark" XSERVER_NEEDS_XFONT= yes XSERVER_NEEDS_MIEXT= yes diff --git a/x11/Xserver/hw/xfree86/drivers/Makefile b/x11/Xserver/hw/xfree86/drivers/Makefile index 2282d0cf29b6..11f70c163335 100644 --- a/x11/Xserver/hw/xfree86/drivers/Makefile +++ b/x11/Xserver/hw/xfree86/drivers/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2007/12/19 17:33:55 macallan Exp $ +# $NetBSD: Makefile,v 1.22 2008/03/08 10:38:59 phx Exp $ SUBDIR= ati atimisc chips fbdev glint imstt mga nv r128 radeon \ s3 s3virge savage sis tdfx trident wsfb @@ -11,7 +11,7 @@ SUBDIR+= vga SUBDIR+= i740 i810 neomagic via vmware .endif -.if ${MACHINE} != "macppc" && ${MACHINE} != "sgimips" +.if ${MACHINE} != "macppc" && ${MACHINE} != "sgimips" && ${MACHINE} != "ofppc" SUBDIR+= apm ark cirrus cyrix dummy i128 nsc \ rendition siliconmotion tga tseng vesa .endif diff --git a/x11/Xserver/hw/xfree86/drivers/ati/Makefile b/x11/Xserver/hw/xfree86/drivers/ati/Makefile index 708e44099d41..34db65805bb1 100644 --- a/x11/Xserver/hw/xfree86/drivers/ati/Makefile +++ b/x11/Xserver/hw/xfree86/drivers/ati/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2004/09/18 06:49:27 rtr Exp $ +# $NetBSD: Makefile,v 1.6 2008/03/08 10:38:59 phx Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/drivers @@ -57,7 +57,7 @@ CPPFLAGS+= -DAVOID_CPIO # XXX from the Imakefile # -DAVOID_NON_PCI must be defined for those platforms that do not # tolerate PCI master aborts. -.if ${MACHINE} == "macppc" +.if ${MACHINE} == "macppc" || ${MACHINE} == "ofppc" CPPFLAGS+= -DAVOID_NON_PCI .endif diff --git a/x11/Xserver/hw/xfree86/drivers/atimisc/Makefile b/x11/Xserver/hw/xfree86/drivers/atimisc/Makefile index 4018226cc9df..b8f120699000 100644 --- a/x11/Xserver/hw/xfree86/drivers/atimisc/Makefile +++ b/x11/Xserver/hw/xfree86/drivers/atimisc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2004/09/18 06:49:27 rtr Exp $ +# $NetBSD: Makefile,v 1.5 2008/03/08 10:38:59 phx Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/drivers @@ -67,7 +67,7 @@ CPPFLAGS+= -DAVOID_CPIO # XXX from the Imakefile # -DAVOID_NON_PCI must be defined for those platforms that do not # tolerate PCI master aborts. -.if ${MACHINE} == "macppc" +.if ${MACHINE} == "macppc" || ${MACHINE} == "ofppc" CPPFLAGS+= -DAVOID_NON_PCI .endif diff --git a/x11/Xserver/hw/xfree86/drivers/chips/Makefile b/x11/Xserver/hw/xfree86/drivers/chips/Makefile index 35974d37f966..53dc34b551ee 100644 --- a/x11/Xserver/hw/xfree86/drivers/chips/Makefile +++ b/x11/Xserver/hw/xfree86/drivers/chips/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2006/12/21 00:24:04 macallan Exp $ +# $NetBSD: Makefile,v 1.5 2008/03/08 10:38:59 phx Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/drivers @@ -42,7 +42,7 @@ CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/chips \ CPPFLAGS+= -DPSZ=8 -.if ${MACHINE} == "macppc" +.if ${MACHINE} == "macppc" || ${MACHINE} == "ofppc" CPPFLAGS+= -DNO_VBE .endif diff --git a/x11/Xserver/hw/xfree86/drivers/glint/Makefile b/x11/Xserver/hw/xfree86/drivers/glint/Makefile index 257b922d9e2c..d0ef89738ca6 100644 --- a/x11/Xserver/hw/xfree86/drivers/glint/Makefile +++ b/x11/Xserver/hw/xfree86/drivers/glint/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2007/12/19 17:15:54 macallan Exp $ +# $NetBSD: Makefile,v 1.5 2008/03/08 10:39:00 phx Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/drivers @@ -13,7 +13,8 @@ SRCS= glint_driver.c pm2_dac.c pm2ramdac.c pm2_accel.c pm_dac.c \ pm2vramdac.c pm2_video.c pm3_dac.c pm3_accel.c pm3_video.c \ TIramdac.c glint_shadow.c sx_accel.c glint_dga.c -.if ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "macppc" +.if ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "macppc" || \ + ${MACHINE} == "ofppc" CPPFLAGS+= -DGLINT_AVOID_INT10 .endif diff --git a/x11/Xserver/hw/xfree86/drivers/r128/Makefile b/x11/Xserver/hw/xfree86/drivers/r128/Makefile index 69fc460f664a..e74ac7a5e494 100644 --- a/x11/Xserver/hw/xfree86/drivers/r128/Makefile +++ b/x11/Xserver/hw/xfree86/drivers/r128/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2006/04/07 17:52:55 macallan Exp $ +# $NetBSD: Makefile,v 1.6 2008/03/08 10:39:00 phx Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/drivers @@ -51,7 +51,8 @@ CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/GL/dri \ CPPFLAGS+= ${X11FLAGS.DRI} .endif -.if ${MACHINE} == "macppc" || ${MACHINE} == "sparc" ||${MACHINE} == "sparc64" +.if ${MACHINE} == "macppc" || ${MACHINE} == "sparc" || \ + ${MACHINE} == "sparc64" || ${MACHINE} == "ofppc" CPPFLAGS+= -DAVOID_VGAHW .endif diff --git a/x11/Xserver/hw/xfree86/xf86/Makefile b/x11/Xserver/hw/xfree86/xf86/Makefile index 6885af789106..58a77ceb9d50 100644 --- a/x11/Xserver/hw/xfree86/xf86/Makefile +++ b/x11/Xserver/hw/xfree86/xf86/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/11/12 22:57:47 spz Exp $ +# $NetBSD: Makefile,v 1.11 2008/03/08 10:39:00 phx Exp $ .include # for HOST_SH @@ -22,7 +22,7 @@ SRCS+= xf86sbusBus.c CPPFLAGS+=-DUSE_MODULAR_KBD .endif -.if ${MACHINE} == "macppc" +.if ${MACHINE} == "macppc" || ${MACHINE} == "ofppc" CPPFLAGS+=-DUSE_MODULAR_KBD .endif diff --git a/x11/Xserver/hw/xfree86/xf86_os/Makefile b/x11/Xserver/hw/xfree86/xf86_os/Makefile index 10b305720a8e..9b9389c070b0 100644 --- a/x11/Xserver/hw/xfree86/xf86_os/Makefile +++ b/x11/Xserver/hw/xfree86/xf86_os/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2006/12/21 01:45:33 macallan Exp $ +# $NetBSD: Makefile,v 1.15 2008/03/08 10:39:00 phx Exp $ .include "../../../Makefile.serverlib" @@ -30,7 +30,7 @@ CPPFLAGS.${_FN}+= -DPCVT_SUPPORT -DWSCONS_SUPPORT \ .endfor .endif -.if ${MACHINE} == "macppc" +.if ${MACHINE} == "macppc" || ${MACHINE} == "ofppc" SRCS.bsd+= ppc_video.c bsdResource.c pm_noop.c lnx_agp.c .for _FN in ${SRCS.bsd} CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC -DUSE_PPC_MMAP @@ -83,7 +83,7 @@ SRCS.bus+= ix86Pci.c .if ${MACHINE} == "macppc" || ${MACHINE} == "cats" || \ ${MACHINE} == "sgimips" || ${MACHINE} == "sparc64" || \ ${MACHINE} == "sparc" || ${MACHINE} == "netwinder" || \ - ${MACHINE} == "shark" + ${MACHINE} == "shark" || ${MACHINE} == "ofppc" SRCS.bus+= netbsdPci.c .endif @@ -101,7 +101,8 @@ CPPFLAGS.SlowBcopy.S= -DUSE_GAS .if ${MACHINE} == "amd64" || ${MACHINE} == "macppc" || \ ${MACHINE} == "cats" || ${MACHINE} == "sgimips" || \ ${MACHINE} == "sparc64" || ${MACHINE} == "sparc" || \ - ${MACHINE} == "netwinder" || ${MACHINE} == "shark" + ${MACHINE} == "netwinder" || ${MACHINE} == "shark" || \ + ${MACHINE} == "ofppc" SRCS.misc+= CBUSmemcpy.c CIODelay.c CSlowBcopy.c .endif