[Midnightbsd-cvs] mports [15746] trunk/Mk/extensions/xorg.mk: update depends handling for xorg

[laffer1 at midnightbsd.org]

Revision: 15746
          http://svnweb.midnightbsd.org/mports/?rev=15746
Author:   laffer1
Date:     2013-12-22 13:25:49 -0500 (Sun, 22 Dec 2013)
Log Message:
-----------
update depends handling for xorg

Modified Paths:
--------------
    trunk/Mk/extensions/xorg.mk

Modified: trunk/Mk/extensions/xorg.mk
===================================================================
--- trunk/Mk/extensions/xorg.mk	2013-12-22 18:25:09 UTC (rev 15745)
+++ trunk/Mk/extensions/xorg.mk	2013-12-22 18:25:49 UTC (rev 15746)
@@ -65,7 +65,9 @@
 . endif
 
 . if ${XORG_CAT} == "driver"
-USE_XORG+=	xorg-server xproto randrproto xi
+USE_XORG+=	xorg-server xproto randrproto xi renderproto xextproto \
+			inputproto kbproto fontsproto videoproto dri2proto xf86driproto \
+			glproto xineramaproto resourceproto scrnsaverproto
 # work around a llvm bug on i386, llvm bug #15806 
 # reproduced with clang 3.2 (current release) and 3.1
 .  if ${ARCH} == i386
@@ -72,14 +74,6 @@
 CFLAGS+=	-fno-optimize-sibling-calls
 .  endif
 CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4x DRIVER_MAN_DIR='$$(mandir)/man4'
-.  if ${PORTNAME:M*input*}x != x
-USE_XORG+=	inputproto videoproto fontsproto renderproto xextproto \
-		dri2proto
-.  elif ${PORTNAME:M*video*}x != x
-USE_XORG+=	videoproto fontsproto renderproto xextproto dri2proto
-.  else
-IGNORE=		doesn't contain either "video" or "input"
-.  endif
 . endif
 
 . if ${XORG_CAT} == "font"
@@ -156,7 +150,7 @@
 CONFIGURE_ARGS+=	--with-xkb-path=${LOCALBASE}/share/X11/xkb
 
 LIB_PC_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/dri.pc:${PORTSDIR}/graphics/dri
-USE_XORG+=	pciaccess xextproto videoproto fontsproto dri2proto
+USE_XORG+=	pciaccess xextproto videoproto fontsproto dri2proto fontutil:build
 . endif
 
 .endif
@@ -180,6 +174,7 @@
 				dmx \
 				dmxproto \
 				dri2proto \
+				dri3proto \
 				evieproto \
 				fixesproto \
 				fontcacheproto \
@@ -194,6 +189,7 @@
 				oldx \
 				pciaccess \
 				pixman \
+				presentproto \
 				printproto \
 				randrproto \
 				recordproto \
@@ -247,6 +243,7 @@
 				xrender \
 				xres \
 				xscrnsaver \
+				xshmfence \
 				xt \
 				xtrans \
 				xtrap \
@@ -263,6 +260,7 @@
 dmx_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/dmx.pc:${PORTSDIR}/x11/libdmx
 dmxproto_BUILD_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/dmxproto.pc:${PORTSDIR}/x11/dmxproto
 dri2proto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dri2proto.pc:${PORTSDIR}/x11/dri2proto
+dri3proto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dri3proto.pc:${PORTSDIR}/x11/dri3proto
 evieproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/evieproto.pc:${PORTSDIR}/x11/evieext
 fixesproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/fixesproto.pc:${PORTSDIR}/x11/fixesproto
 fontcacheproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/fontcacheproto.pc:${PORTSDIR}/x11-fonts/fontcacheproto
@@ -277,6 +275,7 @@
 oldx_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/oldx.pc:${PORTSDIR}/x11/liboldX
 pciaccess_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/pciaccess.pc:${PORTSDIR}/devel/libpciaccess
 pixman_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/pixman-1.pc:${PORTSDIR}/x11/pixman
+presentproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/presentproto.pc:${PORTSDIR}/x11/presentproto
 printproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/printproto.pc:${PORTSDIR}/x11/printproto
 randrproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/randrproto.pc:${PORTSDIR}/x11/randrproto
 recordproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/recordproto.pc:${PORTSDIR}/x11/recordproto
@@ -331,6 +330,7 @@
 xres_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xres.pc:${PORTSDIR}/x11/libXres
 xscrnsaver_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xscrnsaver.pc:${PORTSDIR}/x11/libXScrnSaver
 xt_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xt.pc:${PORTSDIR}/x11-toolkits/libXt
+xshmfence_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xshmfence.pc:${PORTSDIR}/x11/libxshmfence
 xtrans_BUILD_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xtrans.pc:${PORTSDIR}/x11/xtrans
 xtrap_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xtrap.pc:${PORTSDIR}/x11/libXTrap
 xtst_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xtst.pc:${PORTSDIR}/x11/libXtst