[Midnightbsd-cvs] mports [23955] trunk/Mk/extensions/xorg.mk: fixup

[laffer1 at midnightbsd.org]

Revision: 23955
          http://svnweb.midnightbsd.org/mports/?rev=23955
Author:   laffer1
Date:     2018-08-26 18:26:56 -0400 (Sun, 26 Aug 2018)
Log Message:
-----------
fixup

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

Modified: trunk/Mk/extensions/xorg.mk
===================================================================
--- trunk/Mk/extensions/xorg.mk	2018-08-26 22:25:11 UTC (rev 23954)
+++ trunk/Mk/extensions/xorg.mk	2018-08-26 22:26:56 UTC (rev 23955)
@@ -68,19 +68,14 @@
 
 . if ${XORG_CAT} == "driver"
 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
-CFLAGS+=	-fno-optimize-sibling-calls
-.  endif
+		inputproto kbproto fontsproto videoproto dri2proto dri3proto \
+		xf86driproto presentproto glproto xineramaproto resourceproto \
+		scrnsaverproto
 CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4x DRIVER_MAN_DIR='$$(mandir)/man4'
 USES+=		libtool
+INSTALL_TARGET=	install-strip
 . endif
 
-INSTALL_TARGET=       install-strip
-
 . if ${XORG_CAT} == "font"
 FONTNAME?=	${PORTNAME:C/.*-//g:S/type/Type/:S/ttf/TTF/:S/speedo/Speedo/}
 CONFIGURE_ARGS+=	--with-fontrootdir=${PREFIX}/share/fonts
@@ -111,8 +106,8 @@
 CONFIGURE_ARGS+=	--with-xkb-path=${LOCALBASE}/share/X11/xkb \
 					--with-fontrootdir=${LOCALBASE}/share/fonts
 
-LIB_PC_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/dri
-USE_XORG+=	pciaccess xextproto videoproto fontsproto dri2proto fontutil:build
+LIB_PC_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/mesa-dri
+USE_XORG+=	fontutil:build
 . endif
 
 .endif
@@ -126,7 +121,7 @@
 # Register all xorg .pc files here.
 # foo_LIB_PC_DEPENDS means it should go to BUILD_DEPENDS *and* RUN_DEPENDS.
 
-XORG_MODULES=	bigreqsproto \
+XORG_MODULES=			bigreqsproto \
 				compositeproto \
 				damageproto \
 				dmx \
@@ -250,7 +245,7 @@
 xaw6_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xaw6.pc:x11-toolkits/libXaw
 xaw7_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xaw7.pc:x11-toolkits/libXaw
 xbitmaps_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xbitmaps.pc:x11/xbitmaps
-xcb_LIB_PC_DEPENDS=			${LOCALBASE}/libdata/pkgconfig/xcb.pc:x11/libxcb
+xcb_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xcb.pc:x11/libxcb
 xcmiscproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xcmiscproto.pc:x11/xcmiscproto
 xcomposite_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xcomposite.pc:x11/libXcomposite
 xcursor_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xcursor.pc:x11/libXcursor