Index: Makefile
===================================================================
--- Makefile	(revision 510776)
+++ Makefile	(working copy)
@@ -26,7 +26,7 @@
 # - Create a meta-port for the recommended packages
 
 USES=		compiler:c++11-lang gmake iconv libtool localbase pathfix \
-		perl5 readline:port
+		perl5 readline:port xorg
 USE_LDCONFIG=	${PREFIX}/lib/R/lib
 USE_PERL5=	build
 
@@ -125,11 +125,11 @@
 
 LIBVER=		${PORTVERSION:R}
 
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
 
 # LLVM, which gets pulled in with FLANG, provides libomp.  So, only depend on
 # devel/openmp when GFORTRAN and OPENMP are on.
-.if ! ${PORT_OPTIONS:MFLANG} && ${PORT_OPTIONS:MOPENMP}
+.if ! ${PORT_OPTIONS:MFLANG} && ${PORT_OPTIONS:MOPENMP} && ${CHOSEN_COMPILER_TYPE} == clang
 LIB_DEPENDS+=	libomp.so:devel/openmp
 .endif
 
@@ -148,4 +148,4 @@
 	@${REINPLACE_CMD} -e "s| -lR| -lR ${BLASLIB}|" \
 		${STAGEDIR}${PREFIX}/libdata/pkgconfig/libR.pc
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>