From owner-freebsd-x11@FreeBSD.ORG  Mon Jun 18 07:10:21 2012
Return-Path: <owner-freebsd-x11@FreeBSD.ORG>
Delivered-To: freebsd-x11@hub.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 5C96B106564A
	for <freebsd-x11@hub.freebsd.org>; Mon, 18 Jun 2012 07:10:21 +0000 (UTC)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
	[IPv6:2001:4f8:fff6::28])
	by mx1.freebsd.org (Postfix) with ESMTP id 2DEBD8FC19
	for <freebsd-x11@hub.freebsd.org>; Mon, 18 Jun 2012 07:10:21 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
	by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q5I7AKnh064509
	for <freebsd-x11@freefall.freebsd.org>; Mon, 18 Jun 2012 07:10:20 GMT
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q5I7AKtF064508;
	Mon, 18 Jun 2012 07:10:20 GMT (envelope-from gnats)
Date: Mon, 18 Jun 2012 07:10:20 GMT
Message-Id: <201206180710.q5I7AKtF064508@freefall.freebsd.org>
To: freebsd-x11@FreeBSD.org
From: Mark Linimon <linimon@lonesome.com>
Cc: 
Subject: Re: ports/167489: [patch] fix graphics/libdrm build on tier-2
X-BeenThere: freebsd-x11@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: Mark Linimon <linimon@lonesome.com>
List-Id: X11 on FreeBSD -- maintaining and support <freebsd-x11.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-x11>,
	<mailto:freebsd-x11-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-x11>
List-Post: <mailto:freebsd-x11@freebsd.org>
List-Help: <mailto:freebsd-x11-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-x11>,
	<mailto:freebsd-x11-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 18 Jun 2012 07:10:21 -0000

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

From: Mark Linimon <linimon@lonesome.com>
To: bug-followup@FreeBSD.org
Cc: Mark Linimon <linimon@lonesome.com>
Subject: Re: ports/167489: [patch] fix graphics/libdrm build on tier-2
Date: Mon, 18 Jun 2012 02:01:14 -0500

 updated patch
 
 Index: Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/graphics/libdrm/Makefile,v
 retrieving revision 1.24
 diff -u -r1.24 Makefile
 --- Makefile	22 Apr 2012 15:04:07 -0000	1.24
 +++ Makefile	18 Jun 2012 06:58:54 -0000
 @@ -50,9 +50,17 @@
  PLIST_SUB+=	OLD="" NEW="@comment "
  .endif
  
 +.include <bsd.port.pre.mk>
 +
 +.if ${ARCH} == "amd64" || ${ARCH} == "i386" || ${ARCH} == "ia64"
 +PLIST_SUB+=	X86=""
 +.else
 +PLIST_SUB+=	X86="@comment "
 +.endif
 +
  pre-patch:
  	@${REINPLACE_CMD} 's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig|g; \
  			   12661s/x86_/amd/g' \
  		${WRKSRC}/configure
  
 -.include <bsd.port.mk>
 +.include <bsd.port.post.mk>
 Index: pkg-plist
 ===================================================================
 RCS file: /home/pcvs/ports/graphics/libdrm/pkg-plist,v
 retrieving revision 1.11
 diff -u -r1.11 pkg-plist
 --- pkg-plist	21 Apr 2012 17:03:17 -0000	1.11
 +++ pkg-plist	18 Jun 2012 06:58:54 -0000
 @@ -11,13 +11,13 @@
  %%OLD%%include/drm/savage_drm.h
  %%OLD%%include/drm/sis_drm.h
  %%OLD%%include/drm/via_drm.h
 -%%OLD%%include/intel_bufmgr.h
 +%%OLD%%%%X86%%include/intel_bufmgr.h
  %%NEW%%include/libdrm/drm.h
  %%NEW%%include/libdrm/drm_fourcc.h
  %%NEW%%include/libdrm/drm_mode.h
  %%NEW%%include/libdrm/drm_sarea.h
  %%NEW%%include/libdrm/i915_drm.h
 -%%NEW%%include/libdrm/intel_bufmgr.h
 +%%NEW%%%%X86%%include/libdrm/intel_bufmgr.h
  %%NEW%%include/libdrm/intel_debug.h
  %%NEW%%include/libdrm/mach64_drm.h
  %%NEW%%include/libdrm/mga_drm.h
 @@ -53,9 +53,9 @@
  lib/libdrm.la
  lib/libdrm.so
  lib/libdrm.so.2
 -lib/libdrm_intel.la
 -lib/libdrm_intel.so
 -lib/libdrm_intel.so.1
 +%%X86%%lib/libdrm_intel.la
 +%%X86%%lib/libdrm_intel.so
 +%%X86%%lib/libdrm_intel.so.1
  lib/libdrm_nouveau.la
  lib/libdrm_nouveau.so
  lib/libdrm_nouveau.so.1
 @@ -66,7 +66,7 @@
  %%NEW%%%%KMS%%lib/libkms.so
  %%NEW%%%%KMS%%lib/libkms.so.1
  libdata/pkgconfig/libdrm.pc
 -libdata/pkgconfig/libdrm_intel.pc
 +%%X86%%libdata/pkgconfig/libdrm_intel.pc
  libdata/pkgconfig/libdrm_nouveau.pc
  %%NEW%%libdata/pkgconfig/libdrm_radeon.pc
  %%NEW%%%%KMS%%libdata/pkgconfig/libkms.pc