Index: head/graphics/libosmesa/Makefile
===================================================================
--- head/graphics/libosmesa/Makefile	(revision 472507)
+++ head/graphics/libosmesa/Makefile	(revision 472508)
@@ -1,41 +1,35 @@
 # Created by: gahr
 # $FreeBSD$
 
 PORTNAME=	libosmesa
 PORTVERSION=	${MESAVERSION}
 CATEGORIES=	graphics
 
 COMMENT=	Off-Screen Mesa implementation of the OpenGL API
 
 USE_XORG=	glproto
 
-# As of version 17.0.5 / 17.1.2, the Gallium variant fails to build due to
-# incorrectly ordered linker flags. Fortunately, autoreconf fixes the problem.
-# Unfortunately, we must reconf before we know if we're doing a Gallium build.
-USES=		autoreconf
-EXTRA_PATCHES=	${PATCHDIR}/configure.ac
-
 .include <bsd.port.options.mk>
 .include "${.CURDIR:H:H}/graphics/mesa-dri/Makefile.common"
 
 CONFIGURE_ARGS+=	--disable-dri --disable-egl --disable-gbm \
 			--disable-gles2 --with-gallium-drivers=swrast
 MESA_BUILD_WRKSRC=	src/util src/compiler src/mapi src/mesa
 
 .if "${MESA_LLVM_VER}" != ""
 CONFIGURE_ARGS+=	--enable-osmesa-gallium
 MESA_BUILD_WRKSRC+=	src/gallium
 MESA_INSTALL_WRKSRC=	src/gallium/state_trackers/osmesa src/gallium/targets/osmesa
 .else
 CONFIGURE_ARGS+=	--enable-osmesa
 MESA_INSTALL_WRKSRC=	src/mesa/drivers/osmesa
 .endif
 
 .include "${MASTERDIR}/Makefile.targets"
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/include/GL
 	${INSTALL_DATA} ${WRKSRC}/include/GL/osmesa.h \
 		${STAGEDIR}${PREFIX}/include/GL
 
 .include <bsd.port.post.mk>
Index: head/graphics/mesa-dri/Makefile.targets
===================================================================
--- head/graphics/mesa-dri/Makefile.targets	(revision 472507)
+++ head/graphics/mesa-dri/Makefile.targets	(revision 472508)
@@ -1,39 +1,36 @@
 # $FreeBSD$
 #
 # this file holds common targets
 
 post-patch:
 .if ${OPSYS} == FreeBSD
 	@${REINPLACE_CMD} -e 's|x86_64|amd64|' ${WRKSRC}/configure
-. if ${COMPONENT} == osmesa
-	@${REINPLACE_CMD} -e 's|x86_64|amd64|' ${WRKSRC}/configure.ac
-. endif
 .endif
 	@${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' \
 		${WRKSRC}/src/util/xmlconfig.c
 
 pre-build: mesa-pre-build
 
 #custom targets so we can build parts of Mesa
 mesa-pre-build:
 # do propper gmake target.
 	@cd ${WRKSRC}/src && ${MAKE_CMD} git_sha1.h libglsl_util.la
 	@cd ${WRKSRC}/src/mesa/drivers/dri/common/ && ${MAKE_CMD}
 	@cd ${WRKSRC}/src/loader && ${MAKE_CMD}
 # libloader.la
 
 .if defined(MESA_BUILD_WRKSRC)
 do-build:
 . for dir in ${MESA_BUILD_WRKSRC}
 	(cd ${WRKSRC}/${dir}; ${DO_MAKE_BUILD} ${ALL_TARGET};)
 . endfor
 .endif
 
 .if defined(MESA_INSTALL_WRKSRC)
 do-install:
 . for dir in ${MESA_INSTALL_WRKSRC}
 	(cd ${WRKSRC}/${dir} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
 		${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
 . endfor
 .endif