diff --git a/x11-fm/polo/Makefile b/x11-fm/polo/Makefile
index 024dca397f4a..b9ed97874a78 100644
--- a/x11-fm/polo/Makefile
+++ b/x11-fm/polo/Makefile
@@ -1,45 +1,35 @@
 PORTNAME=	polo
 DISTVERSIONPREFIX=	v
 DISTVERSION=	18.8-beta
 PORTREVISION=	3
 CATEGORIES=	x11-fm
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Advanced graphical file manager written in Vala
 WWW=		https://teejee2008.github.io/polo/
 
 LICENSE=	GPLv2+
 
 LIB_DEPENDS=	libgee-0.8.so:devel/libgee \
 		libharfbuzz.so:print/harfbuzz \
 		libjson-glib-1.0.so:devel/json-glib
 
 USES=		desktop-file-utils gettext-tools gmake gnome pkgconfig \
 		vala:build
 USE_GITHUB=	yes
 GH_ACCOUNT=	teejee2008
 USE_GNOME=	cairo gdkpixbuf2 gtk30 libxml2 vte3
 
 MAKEFILE=	makefile
-
 WRKSRC_SUBDIR=	src
 
-.include <bsd.port.options.mk>
-
-.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
-USES+=	llvm:max=15
-CC=	clang${LLVM_VERSION}
-CPP=	clang-cpp${LLVM_VERSION}
-CXX=	clang++${LLVM_VERSION}
-.endif
-
 post-patch:
 	@${RM} ${WRKSRC}/share/polo/files/gtk-theme/*.orig
 	@${RM} ${WRKSRC}/share/polo/files/install-*.sh
 	@${RM} -r ${WRKSRC}/share/polo/files/udisks2
 # Adhere to GLib.Object naming conventions for properties
 	@${REINPLACE_CMD} -e 's,7zip_version,sevenzip_version,g' \
 		${WRKSRC}/Gtk/MainMenubar.vala \
 		${WRKSRC}/Utility/ArchiveTask.vala
 
 .include <bsd.port.mk>
diff --git a/x11-fm/polo/files/patch-makefile b/x11-fm/polo/files/patch-makefile
index 041a1842d28f..607de7693c6b 100644
--- a/x11-fm/polo/files/patch-makefile
+++ b/x11-fm/polo/files/patch-makefile
@@ -1,32 +1,51 @@
 --- makefile.orig	2018-08-12 04:41:58 UTC
 +++ makefile
 @@ -1,7 +1,7 @@
 -SHELL=/bin/bash
+-CFLAGS=--std=c99
 +SHELL=/bin/sh
- CFLAGS=--std=c99
++XCCFLAGS=$(foreach arg,$(CFLAGS),--Xcc=$(arg))
  
 -prefix=/usr
 +prefix=$(PREFIX)
  bindir=$(prefix)/bin
  sharedir=$(prefix)/share
  localedir=$(sharedir)/locale
+@@ -43,7 +43,7 @@ app-gtk:
+ 
+ 	#polo-gtk
+ 	valac -X -D'GETTEXT_PACKAGE="${app_name}"' \
+-		--Xcc="-lm" ${define_symbols} --Xcc="-O3" --thread \
++		--Xcc="-lm" ${define_symbols} ${XCCFLAGS} -v --thread \
+ 		Common/Main.vala \
+ 		Gtk/*.vala \
+ 		Utility/*.vala \
+@@ -60,7 +60,7 @@ app-util-gtk3:
+ 
+ app-util-disk:
+ 	valac --Xcc="-lm" -X -D'GETTEXT_PACKAGE="${app_name}"' \
+-		"polo-disk.vala" Console/*.vala --Xcc="-O3" -o polo-disk --pkg posix --pkg gio-unix-2.0 --pkg gee-0.8
++		"polo-disk.vala" Console/*.vala ${XCCFLAGS} -v -o polo-disk --pkg posix --pkg gio-unix-2.0 --pkg gee-0.8
+ 
+ app-translations:
+ 
 @@ -101,17 +101,15 @@ install:
  	mkdir -p "$(DESTDIR)$(sharedir)/${app_name}"
  	mkdir -p "$(DESTDIR)$(sharedir)/pixmaps"
  	mkdir -p "$(DESTDIR)$(sharedir)/appdata"
 -	mkdir -p "$(DESTDIR)/var/log/polo"
  	
  	#binary
  	install -m 0755 ${app_name}-gtk "$(DESTDIR)$(bindir)"
  	install -m 0755 ${app_name}-gtk3-helper "$(DESTDIR)$(bindir)"
  	install -m 0755 ${app_name}-disk "$(DESTDIR)$(bindir)"
 -	install -m 0755 ${app_name}-uninstall "$(DESTDIR)$(bindir)"
  
  	#shared files
 -	cp -dpr --no-preserve=ownership -t "$(DESTDIR)$(sharedir)/${app_name}" ./share/${app_name}/*
 -	chmod --recursive 0755 $(DESTDIR)$(sharedir)/${app_name}/*
 +	cp -Ppr share/${app_name}/* "$(DESTDIR)$(sharedir)/${app_name}"
 +	chmod -R 0755 $(DESTDIR)$(sharedir)/${app_name}/*
  	chmod a+x $(DESTDIR)$(sharedir)/${app_name}/files/gtk-theme/install-gtk-theme
  
  	#launcher