[pkgsrc/trunk]: pkgsrc Force a full dependency on libpciaccess in situations ...

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f4a43cc35105
branches:  trunk
changeset: 648036:f4a43cc35105
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Mon Mar 09 19:54:44 2015 +0000

description:
Force a full dependency on libpciaccess in situations where we definitely
need to link with it but might have included x11/xf86driproto's bl3.mk first,
because we have:
x11/xf86driproto/buildlink3.mk:BUILDLINK_DEPMETHOD.libpciaccess?=  build

(This issue appears only on non-x86 because on x86 we get libpciaccess
 through libdrm)

Bump PKGREVISION to get the dependency expressed.

diffstat:

 graphics/MesaLib/Makefile        |  4 ++--
 graphics/MesaLib/options.mk      |  3 ++-
 x11/modular-xorg-server/Makefile |  5 +++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diffs (52 lines):

diff -r 22ae9957d6c6 -r f4a43cc35105 graphics/MesaLib/Makefile
--- a/graphics/MesaLib/Makefile Mon Mar 09 19:47:54 2015 +0000
+++ b/graphics/MesaLib/Makefile Mon Mar 09 19:54:44 2015 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.97 2014/08/06 10:25:14 wiz Exp $
+# $NetBSD: Makefile,v 1.98 2015/03/09 19:54:44 tnn Exp $
 
 PKGNAME=       MesaLib-${MESA_PKGVERSION}
-PKGREVISION=   5
+PKGREVISION=   6
 COMMENT=       Graphics library similar to SGI's OpenGL
 
 CONFLICTS+=    xf86driproto<2.0.4
diff -r 22ae9957d6c6 -r f4a43cc35105 graphics/MesaLib/options.mk
--- a/graphics/MesaLib/options.mk       Mon Mar 09 19:47:54 2015 +0000
+++ b/graphics/MesaLib/options.mk       Mon Mar 09 19:54:44 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.26 2014/03/14 07:19:36 obache Exp $
+# $NetBSD: options.mk,v 1.27 2015/03/09 19:54:44 tnn Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.MesaLib
 PKG_SUPPORTED_OPTIONS=
@@ -48,6 +48,7 @@
 .if !empty(PKG_OPTIONS:Mdri)
 CONFIGURE_ARGS+=        --with-driver=dri
 PLIST.dri=     yes
+BUILDLINK_DEPMETHOD.libpciaccess=      full
 .  include "../../sysutils/libpciaccess/buildlink3.mk"
 USE_BUILTIN.MesaLib=   no
 .  include "../../graphics/MesaLib/dri.mk"
diff -r 22ae9957d6c6 -r f4a43cc35105 x11/modular-xorg-server/Makefile
--- a/x11/modular-xorg-server/Makefile  Mon Mar 09 19:47:54 2015 +0000
+++ b/x11/modular-xorg-server/Makefile  Mon Mar 09 19:54:44 2015 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.89 2015/03/03 00:55:58 khorben Exp $
+# $NetBSD: Makefile,v 1.90 2015/03/09 19:54:44 tnn Exp $
 
 DISTNAME=      xorg-server-1.12.4
 PKGNAME=       modular-${DISTNAME}
-PKGREVISION=   10
+PKGREVISION=   11
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_XORG:=xserver/}
 EXTRACT_SUFX=  .tar.bz2
@@ -135,6 +135,7 @@
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libpciaccess+=   libpciaccess>=0.11.0
+BUILDLINK_DEPMETHOD.libpciaccess=      full
 .include "../../sysutils/libpciaccess/buildlink3.mk"
 .include "../../x11/bigreqsproto/buildlink3.mk"
 .include "../../x11/compositeproto/buildlink3.mk"