ports/179229: commit references a PR

[dfilter service]

The following reply was made to PR ports/179229; it has been noted by GNATS.

From: dfilter at FreeBSD.ORG (dfilter service)
To: bug-followup at FreeBSD.org
Cc:  
Subject: Re: ports/179229: commit references a PR
Date: Fri, 14 Jun 2013 14:39:31 +0000 (UTC)

 Author: zeising
 Date: Fri Jun 14 14:39:18 2013
 New Revision: 320937
 URL: http://svnweb.freebsd.org/changeset/ports/320937
 
 Log:
   Fix patching on powerpc with new xorg.
   
   PR:		ports/179229
   Submitted by:	jhibbits (PR), zeising (patch)
 
 Added:
   head/x11-servers/xorg-server/files/extra-new-arch-powerpc
      - copied, changed from r320890, head/x11-servers/xorg-server/files/extra-arch-powerpc
   head/x11-servers/xorg-server/files/extra-old-arch-powerpc
      - copied unchanged from r320890, head/x11-servers/xorg-server/files/extra-arch-powerpc
 Deleted:
   head/x11-servers/xorg-server/files/extra-arch-powerpc
 Modified:
   head/x11-servers/xorg-server/Makefile
 
 Modified: head/x11-servers/xorg-server/Makefile
 ==============================================================================
 --- head/x11-servers/xorg-server/Makefile	Fri Jun 14 14:36:08 2013	(r320936)
 +++ head/x11-servers/xorg-server/Makefile	Fri Jun 14 14:39:18 2013	(r320937)
 @@ -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
 
 Copied and modified: head/x11-servers/xorg-server/files/extra-new-arch-powerpc (from r320890, head/x11-servers/xorg-server/files/extra-arch-powerpc)
 ==============================================================================
 --- head/x11-servers/xorg-server/files/extra-arch-powerpc	Fri Jun 14 08:15:44 2013	(r320890, copy source)
 +++ head/x11-servers/xorg-server/files/extra-new-arch-powerpc	Fri Jun 14 14:39:18 2013	(r320937)
 @@ -1,14 +1,14 @@
 ---- hw/xfree86/os-support/bsd/ppc_video.c.orig	2008-01-02 12:29:21.000000000 +0000
 -+++ hw/xfree86/os-support/bsd/ppc_video.c	2008-01-02 12:29:00.000000000 +0000
 -@@ -164,7 +164,11 @@
 +--- 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 (ioBase != MAP_FAILED) {
  +#if defined(__FreeBSD__)
 -+		munmap(__DEVOLATILE(unsigned char *, ioBase), 0x10000);
 ++        munmap(__DEVOLATILE(unsigned char *, ioBase), 0x10000);
  +#else
 -                 munmap(__UNVOLATILE(ioBase), 0x10000);
 +         munmap(__UNVOLATILE(ioBase), 0x10000);
  +#endif
 -                 ioBase = MAP_FAILED;
 -         }
 +         ioBase = MAP_FAILED;
 +     }
   }
 
 Copied: head/x11-servers/xorg-server/files/extra-old-arch-powerpc (from r320890, head/x11-servers/xorg-server/files/extra-arch-powerpc)
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/x11-servers/xorg-server/files/extra-old-arch-powerpc	Fri Jun 14 14:39:18 2013	(r320937, copy of r320890, head/x11-servers/xorg-server/files/extra-arch-powerpc)
 @@ -0,0 +1,14 @@
 +--- hw/xfree86/os-support/bsd/ppc_video.c.orig	2008-01-02 12:29:21.000000000 +0000
 ++++ hw/xfree86/os-support/bsd/ppc_video.c	2008-01-02 12:29:00.000000000 +0000
 +@@ -164,7 +164,11 @@
 + 
 +         if (ioBase != MAP_FAILED)
 +         {
 ++#if defined(__FreeBSD__)
 ++		munmap(__DEVOLATILE(unsigned char *, ioBase), 0x10000);
 ++#else
 +                 munmap(__UNVOLATILE(ioBase), 0x10000);
 ++#endif
 +                 ioBase = MAP_FAILED;
 +         }
 + }
 _______________________________________________
 svn-ports-all at freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe at freebsd.org"