10 files changed, 135 insertions, 20 deletions

diff --git a/x11-servers/xorg-server-snap/Makefile b/x11-servers/xorg-server-snap/Makefile
index dcf1f93b7b5a..18fde38c2517 100644
--- a/x11-servers/xorg-server-snap/Makefile
+++ b/x11-servers/xorg-server-snap/Makefile
@@ -80,7 +80,6 @@ IGNORE= is part of X.Org. For switching to X.Org, read UPDATING entry 20040723
 PLIST_SUB+=	ALPHA_NA="@comment "
 .else
 PLIST_SUB+=	ALPHA_NA=""
-MAN4+=		vesa.4x
 .endif
 		
 .if ${ARCH} == ia64
@@ -89,6 +88,13 @@ PLIST_SUB+=	IA64_NA="@comment "
 PLIST_SUB+=	IA64_NA=""
 .endif
 
+.if ${ARCH} == powerpc
+PLIST_SUB+=	PPC_NA="@comment "
+MAN4+=		nv.4x
+.else
+PLIST_SUB+=	PPC_NA=""
+.endif
+
 .if ${ARCH} == sparc64
 PLIST_SUB+=	SPARC64=""
 PLIST_SUB+=	SPARC64_NA="@comment "
@@ -102,6 +108,9 @@ MAN4+=		sunbw2.4x \
 .else
 PLIST_SUB+=	SPARC64="@comment "
 PLIST_SUB+=	SPARC64_NA=""
+.endif
+
+.if ${ARCH} != powerpc && ${ARCH} != sparc64
 MAN4+=		cirrus.4x \
 		nv.4x \
 		rendition.4x \
@@ -110,6 +119,10 @@ MAN4+=		cirrus.4x \
 		siliconmotion.4x
 .endif
 
+.if ${ARCH} != powerpc && ${ARCH} != alpha
+MAN4+=		vesa.4x
+.endif
+
 .if ${ARCH} == i386
 PLIST_SUB+=	I386=""
 MAN1+=		scanpci.1
diff --git a/x11-servers/xorg-server-snap/files/patch-FreeBSD.cf b/x11-servers/xorg-server-snap/files/patch-FreeBSD.cf
index b2c195f77b75..9a208d778fa3 100644
--- a/x11-servers/xorg-server-snap/files/patch-FreeBSD.cf
+++ b/x11-servers/xorg-server-snap/files/patch-FreeBSD.cf
@@ -1,5 +1,5 @@
---- config/cf/FreeBSD.cf.orig	Sat Aug 14 17:03:36 2004
-+++ config/cf/FreeBSD.cf	Wed Dec 29 13:40:20 2004
+--- config/cf/FreeBSD.cf.orig	Sun Aug 15 10:03:36 2004
++++ config/cf/FreeBSD.cf	Sun Feb  6 03:56:59 2005
 @@ -78,6 +78,7 @@
  #define HasIssetugid		YES
  #define HasPoll			YES
@@ -59,7 +59,18 @@
  #  else
  #   define LibraryRpathLoadFlags	-R $(USRLIBDIRPATH)
  #  endif
-@@ -463,18 +465,8 @@
+@@ -442,7 +444,9 @@
+ #define AsVISOption		-Av9a
+ #define AsOutputArchSize	64
+ #endif
+-
++#ifdef PpcArchitecture
++#define XF86INT10_BUILD		X86INT10_STUB
++#endif
+ #define StandardDefines	-DCSRG_BASED
+ 
+ #if OSMajorVersion > 1
+@@ -463,18 +467,8 @@
  #define XawI18nDefines		-DUSE_XWCHAR_STRING -DUSE_XMBTOWC
  #endif
  
diff --git a/x11-servers/xorg-server-snap/files/patch-Imake.cf b/x11-servers/xorg-server-snap/files/patch-Imake.cf
new file mode 100644
index 000000000000..14f519aa9a16
--- /dev/null
+++ b/x11-servers/xorg-server-snap/files/patch-Imake.cf
@@ -0,0 +1,15 @@
+--- config/cf/Imake.cf.orig	Wed Jan 19 20:53:39 2005
++++ config/cf/Imake.cf	Wed Jan 19 20:55:09 2005
+@@ -282,6 +282,10 @@
+ #  undef __amd64__
+ #  undef __x86_64__
+ # endif
++# ifdef __powerpc__
++#  define PpcArchitecture
++#  undef __powerpc__
++# endif
+ #endif /* __FreeBSD__ */
+ 
+ /* Systems based on kernel of FreeBSD */
+
+
diff --git a/x11-servers/xorg-server-snap/files/patch-Pci.h b/x11-servers/xorg-server-snap/files/patch-Pci.h
new file mode 100644
index 000000000000..9a9be743bc6e
--- /dev/null
+++ b/x11-servers/xorg-server-snap/files/patch-Pci.h
@@ -0,0 +1,11 @@
+--- programs/Xserver/hw/xfree86/os-support/bus/Pci.h.orig	Thu Jan 20 06:51:21 2005
++++ programs/Xserver/hw/xfree86/os-support/bus/Pci.h	Thu Jan 20 06:52:09 2005
+@@ -285,7 +285,7 @@
+ #  define ARCH_PCI_INIT linuxPciInit
+ #  define INCLUDE_XF86_MAP_PCI_MEM
+ #  define INCLUDE_XF86_NO_DOMAIN	/* Needs kernel work to remove */
+-# elif defined(__OpenBSD__)
++# elif defined(__FreeBSD__) || defined(__OpenBSD__)
+ #  define  ARCH_PCI_INIT freebsdPciInit
+ #  define INCLUDE_XF86_MAP_PCI_MEM
+ #  define INCLUDE_XF86_NO_DOMAIN
diff --git a/x11-servers/xorg-server-snap/files/patch-bus-Imakefile b/x11-servers/xorg-server-snap/files/patch-bus-Imakefile
new file mode 100644
index 000000000000..c5f62ec48a41
--- /dev/null
+++ b/x11-servers/xorg-server-snap/files/patch-bus-Imakefile
@@ -0,0 +1,18 @@
+--- programs/Xserver/hw/xfree86/os-support/bus/Imakefile.orig	Thu Jan 20 03:43:03 2005
++++ programs/Xserver/hw/xfree86/os-support/bus/Imakefile	Thu Jan 20 03:46:40 2005
+@@ -66,6 +66,13 @@
+ PCIDRVRSRC = netbsdPci.c
+ PCIDRVROBJ = netbsdPci.o
+ 
++#elif defined(FreeBSDArchitecture) && defined(PpcArchitecture)
++
++XCOMM FreeBSD/PowerPC PCI driver (using /dev/pci)
++
++PCIDRVRSRC = freebsdPci.c
++PCIDRVROBJ = freebsdPci.o
++
+ #elif defined(PpcArchitecture)
+ 
+ XCOMM PowerPC PCI drivers
+
+
diff --git a/x11-servers/xorg-server-snap/files/patch-compiler.h b/x11-servers/xorg-server-snap/files/patch-compiler.h
new file mode 100644
index 000000000000..2b350252c97e
--- /dev/null
+++ b/x11-servers/xorg-server-snap/files/patch-compiler.h
@@ -0,0 +1,11 @@
+--- programs/Xserver/hw/xfree86/common/compiler.h.orig	Fri Jan 21 03:19:16 2005
++++ programs/Xserver/hw/xfree86/common/compiler.h	Fri Jan 21 03:20:03 2005
+@@ -1068,7 +1068,7 @@
+ #     define write_mem_barrier()	/* NOP */
+ #    endif /* __arm32__ */
+ 
+-#   elif (defined(Lynx) || defined(linux) || defined(__OpenBSD__) || defined(__NetBSD__)) && defined(__powerpc__)
++#   elif (defined(Lynx) || defined(linux) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__)) && defined(__powerpc__)
+ 
+ #    ifndef MAP_FAILED
+ #     define MAP_FAILED ((void *)-1)
diff --git a/x11-servers/xorg-server-snap/files/patch-loader.c b/x11-servers/xorg-server-snap/files/patch-loader.c
new file mode 100644
index 000000000000..f68744ce35fc
--- /dev/null
+++ b/x11-servers/xorg-server-snap/files/patch-loader.c
@@ -0,0 +1,13 @@
+--- programs/Xserver/hw/xfree86/loader/loader.c.orig	Tue Feb 22 06:58:18 2005
++++ programs/Xserver/hw/xfree86/loader/loader.c	Tue Feb 22 06:59:09 2005
+@@ -552,8 +552,8 @@
+ 	FatalError("\n_LoaderFileToMem() read() failed: %s\n",
+ 		   strerror(errno));
+ 
+-# if (defined(linux) || defined(__NetBSD__) || defined(__OpenBSD__)) \
+-    && defined(__powerpc__)
++# if (defined(linux) || defined(__NetBSD__) || defined(__OpenBSD__) \
++    || defined(__FreeBSD__)) && defined(__powerpc__)
+     /*
+      * Keep the instruction cache in sync with changes in the
+      * main memory.
diff --git a/x11-servers/xorg-server-snap/files/patch-mouse.c b/x11-servers/xorg-server-snap/files/patch-mouse.c
new file mode 100644
index 000000000000..745ea92c5dbb
--- /dev/null
+++ b/x11-servers/xorg-server-snap/files/patch-mouse.c
@@ -0,0 +1,13 @@
+--- programs/Xserver/hw/xfree86/input/mouse/mouse.c.orig	Sat Jan 29 06:57:55 2005
++++ programs/Xserver/hw/xfree86/input/mouse/mouse.c	Sat Jan 29 06:59:03 2005
+@@ -1501,8 +1501,8 @@
+ 
+ 	case PROT_SYSMOUSE:	/* sysmouse */
+ 	    buttons = (~pBuf[0]) & 0x07;
+-	    dx =    (char)(pBuf[1]) + (char)(pBuf[3]);
+-	    dy = - ((char)(pBuf[2]) + (char)(pBuf[4]));
++	    dx =    (signed char)(pBuf[1]) + (signed char)(pBuf[3]);
++	    dy = - ((signed char)(pBuf[2]) + (signed char)(pBuf[4]));
+ 	    /* FreeBSD sysmouse sends additional data bytes */
+ 	    if (pMse->protoPara[4] >= 8) {
+ 		/*
diff --git a/x11-servers/xorg-server-snap/files/patch-os-support-Imakefile b/x11-servers/xorg-server-snap/files/patch-os-support-Imakefile
new file mode 100644
index 000000000000..fab8641dacac
--- /dev/null
+++ b/x11-servers/xorg-server-snap/files/patch-os-support-Imakefile
@@ -0,0 +1,10 @@
+--- programs/Xserver/hw/xfree86/os-support/Imakefile.orig	Thu Jan 20 03:30:38 2005
++++ programs/Xserver/hw/xfree86/os-support/Imakefile	Thu Jan 20 03:31:37 2005
+@@ -15,6 +15,7 @@
+ 	(defined(SunArchitecture) && defined(SparcArchitecture)) || \
+ 	(defined(KFreeBSDArchitecture) && defined(AlphaArchitecture)) || \
+ 	(defined(KFreeBSDArchitecture) && defined(Sparc64Architecture)) || \
++	(defined(KFreeBSDArchitecture) && defined(PpcArchitecture)) || \
+ 	(defined(KNetBSDArchitecture) && defined(AlphaArchitecture)) || \
+ 	(defined(KNetBSDArchitecture) && defined(PpcArchitecture)) || \
+ 	(defined(KNetBSDArchitecture) && defined(SparcArchitecture)) || \
diff --git a/x11-servers/xorg-server-snap/pkg-plist b/x11-servers/xorg-server-snap/pkg-plist
index 55a23938adc6..1a28ebdfef04 100644
--- a/x11-servers/xorg-server-snap/pkg-plist
+++ b/x11-servers/xorg-server-snap/pkg-plist
@@ -3,16 +3,16 @@ bin/Xorg
 bin/getconfig
 bin/getconfig.pl
 bin/gtf
-%%SPARC64_NA%%bin/inb
-%%SPARC64_NA%%bin/inl
-%%SPARC64_NA%%bin/inw
-%%SPARC64_NA%%bin/ioport
+%%SPARC64_NA%%%%PPC_NA%%bin/inb
+%%SPARC64_NA%%%%PPC_NA%%bin/inl
+%%SPARC64_NA%%%%PPC_NA%%bin/inw
+%%SPARC64_NA%%%%PPC_NA%%bin/ioport
 bin/kbd_mode
 bin/mmapr
 bin/mmapw
-%%SPARC64_NA%%bin/outb
-%%SPARC64_NA%%bin/outl
-%%SPARC64_NA%%bin/outw
+%%SPARC64_NA%%%%PPC_NA%%bin/outb
+%%SPARC64_NA%%%%PPC_NA%%bin/outl
+%%SPARC64_NA%%%%PPC_NA%%bin/outw
 bin/pcitweak
 %%I386%%bin/scanpci
 bin/xorgcfg
@@ -83,9 +83,9 @@ lib/X11/xserver/SecurityPolicy
 lib/modules/drivers/ati_drv.o
 lib/modules/drivers/atimisc_drv.o
 %%AMD64_I386%%lib/modules/drivers/chips_drv.o
-%%SPARC64_NA%%lib/modules/drivers/cirrus_alpine.o
-%%SPARC64_NA%%lib/modules/drivers/cirrus_drv.o
-%%SPARC64_NA%%lib/modules/drivers/cirrus_laguna.o
+%%SPARC64_NA%%%%PPC_NA%%lib/modules/drivers/cirrus_alpine.o
+%%SPARC64_NA%%%%PPC_NA%%lib/modules/drivers/cirrus_drv.o
+%%SPARC64_NA%%%%PPC_NA%%lib/modules/drivers/cirrus_laguna.o
 %%AMD64_I386%%lib/modules/drivers/cyrix_drv.o
 %%AMD64_I386%%lib/modules/drivers/dummy_drv.o
 lib/modules/drivers/glint_drv.o
@@ -98,12 +98,12 @@ lib/modules/drivers/mga_drv.o
 %%SPARC64_NA%%lib/modules/drivers/nv_drv.o
 lib/modules/drivers/r128_drv.o
 lib/modules/drivers/radeon_drv.o
-%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/rendition_drv.o
+%%SPARC64_NA%%%%IA64_NA%%%%PPC_NA%%lib/modules/drivers/rendition_drv.o
 %%SPARC64_NA%%lib/modules/drivers/riva128.o
 %%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/s3_drv.o
 %%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/s3virge_drv.o
 %%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/savage_drv.o
-%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/siliconmotion_drv.o
+%%SPARC64_NA%%%%IA64_NA%%%%PPC_NA%%lib/modules/drivers/siliconmotion_drv.o
 %%AMD64_I386%%lib/modules/drivers/sis_drv.o
 %%SPARC64%%lib/modules/drivers/sunbw2_drv.o
 %%SPARC64%%lib/modules/drivers/suncg14_drv.o
@@ -113,10 +113,10 @@ lib/modules/drivers/radeon_drv.o
 %%SPARC64%%lib/modules/drivers/sunleo_drv.o
 %%SPARC64%%lib/modules/drivers/suntcx_drv.o
 lib/modules/drivers/tdfx_drv.o
-%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/tga_drv.o
+%%SPARC64_NA%%%%IA64_NA%%%%PPC_NA%%lib/modules/drivers/tga_drv.o
 %%AMD64_I386%%lib/modules/drivers/trident_drv.o
 %%AMD64_I386%%lib/modules/drivers/tseng_drv.o
-%%ALPHA_NA%%lib/modules/drivers/vesa_drv.o
+%%ALPHA_NA%%%%PPC_NA%%lib/modules/drivers/vesa_drv.o
 lib/modules/drivers/vga_drv.o
 %%I386%%lib/modules/drivers/via_drv.o
 %%I386%%lib/modules/drivers/vmware_drv.o
@@ -182,8 +182,8 @@ lib/modules/libxf4bpp.a
 lib/modules/libxf8_16bpp.a
 lib/modules/libxf8_32bpp.a
 %%SPARC64%%lib/modules/libxf8_32wid.a
-%%SPARC64_NA%%lib/modules/v10002d.uc
-%%SPARC64_NA%%lib/modules/v20002d.uc
+%%SPARC64_NA%%%%PPC_NA%%lib/modules/v10002d.uc
+%%SPARC64_NA%%%%PPC_NA%%lib/modules/v20002d.uc
 @dirrm lib/X11/getconfig
 @dirrm lib/modules/fonts
 @dirrm lib/modules/extensions