diff options
| author | Niclas Zeising <zeising@FreeBSD.org> | 2013-06-14 14:39:18 +0000 |
|---|---|---|
| committer | Niclas Zeising <zeising@FreeBSD.org> | 2013-06-14 14:39:18 +0000 |
| commit | 5f84f960af86e98d381e6c6072bc6c4b7cc71741 (patch) | |
| tree | ec623a4c8a21539d22f71824c08f857133805387 /x11-servers/xorg-server | |
| parent | 4898ae0280ee9d4d0874ba776ad5498e0c97a081 (diff) | |
| download | ports-5f84f960af86e98d381e6c6072bc6c4b7cc71741.tar.gz ports-5f84f960af86e98d381e6c6072bc6c4b7cc71741.zip | |
Notes
Diffstat (limited to 'x11-servers/xorg-server')
| -rw-r--r-- | x11-servers/xorg-server/Makefile | 6 | ||||
| -rw-r--r-- | x11-servers/xorg-server/files/extra-new-arch-powerpc | 14 | ||||
| -rw-r--r-- | x11-servers/xorg-server/files/extra-old-arch-powerpc (renamed from x11-servers/xorg-server/files/extra-arch-powerpc) | 0 |
3 files changed, 19 insertions, 1 deletions
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile index 0359b5b06f1f..38f5643baf5d 100644 --- a/x11-servers/xorg-server/Makefile +++ b/x11-servers/xorg-server/Makefile @@ -127,7 +127,11 @@ PLIST_SUB+= IA64_NA="" .if ${ARCH} == powerpc || ${ARCH} == powerpc64 PLIST_SUB+= PPC_NA="@comment " -EXTRA_PATCHES= ${.CURDIR}/files/extra-arch-powerpc +.if defined(WITH_NEW_XORG) +EXTRA_PATCHES= ${.CURDIR}/files/extra-new-arch-powerpc +.else +EXTRA_PATCHES= ${.CURDIR}/files/extra-old-arch-powerpc +.endif .else PLIST_SUB+= PPC_NA="" .endif diff --git a/x11-servers/xorg-server/files/extra-new-arch-powerpc b/x11-servers/xorg-server/files/extra-new-arch-powerpc new file mode 100644 index 000000000000..894dfaeedb5e --- /dev/null +++ b/x11-servers/xorg-server/files/extra-new-arch-powerpc @@ -0,0 +1,14 @@ +--- hw/xfree86/os-support/bsd/ppc_video.c.orig 2012-05-17 19:09:03.000000000 +0200 ++++ hw/xfree86/os-support/bsd/ppc_video.c 2013-06-03 13:46:05.165578200 +0200 +@@ -135,7 +135,11 @@ + { + + if (ioBase != MAP_FAILED) { ++#if defined(__FreeBSD__) ++ munmap(__DEVOLATILE(unsigned char *, ioBase), 0x10000); ++#else + munmap(__UNVOLATILE(ioBase), 0x10000); ++#endif + ioBase = MAP_FAILED; + } + } diff --git a/x11-servers/xorg-server/files/extra-arch-powerpc b/x11-servers/xorg-server/files/extra-old-arch-powerpc index 6fa917849749..6fa917849749 100644 --- a/x11-servers/xorg-server/files/extra-arch-powerpc +++ b/x11-servers/xorg-server/files/extra-old-arch-powerpc |