diff --git a/audio/harp/Makefile b/audio/harp/Makefile
index d47afc6d2dc7..b2e55b2ea024 100644
--- a/audio/harp/Makefile
+++ b/audio/harp/Makefile
@@ -1,63 +1,61 @@
 PORTNAME=	harp
 PORTVERSION=	0.6.0
+PORTREVISION=	1
 CATEGORIES=	audio
 
 MAINTAINER=	heckendorfc@gmail.com
 COMMENT=	Minimalist audio player
 
 LICENSE=	GPLv3
 
-BROKEN_FreeBSD_13=	ld: error: duplicate symbol: h
-BROKEN_FreeBSD_14=	ld: error: duplicate symbol: h
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	heckendorfc
 
 USES=		cmake sqlite
 
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	AAC FLAC MP3 SHOUTCAST VORBIS DOCS
 OPTIONS_SINGLE=	AUDIO_OUT
 OPTIONS_SINGLE_AUDIO_OUT=	JACK OSS PULSEAUDIO
 OPTIONS_DEFAULT=	AAC FLAC MP3 OSS SHOUTCAST VORBIS
 OPTIONS_SUB=	yes
 
 PORTDOCS=	README
 
 AAC_LIB_DEPENDS=	libfaad.so:audio/faad
 AAC_CMAKE_ON=		-DWITH_AAC:BOOL=ON
 AAC_CMAKE_OFF=		-DWITH_AAC:BOOL=OFF
 
 FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac
 FLAC_CMAKE_ON=		-DWITH_FLAC:BOOL=ON
 FLAC_CMAKE_OFF=		-DWITH_FLAC:BOOL=OFF
 
 MP3_LIB_DEPENDS+=	libmpg123.so:audio/mpg123
 MP3_CMAKE_ON=		-DWITH_MP3:BOOL=ON
 MP3_CMAKE_OFF=		-DWITH_MP3:BOOL=OFF
 
 SHOUTCAST_CMAKE_ON=	-DWITH_STREAM:BOOL=ON
 SHOUTCAST_CMAKE_OFF=	-DWITH_STREAM:BOOL=OFF
 
 VORBIS_LIB_DEPENDS=	libvorbisfile.so:audio/libvorbis
 VORBIS_CMAKE_ON=	-DWITH_VORBIS:BOOL=ON
 VORBIS_CMAKE_OFF=	-DWITH_VORBIS:BOOL=OFF
 
 OSS_CMAKE_ON=		-DWITH_OSS:BOOL=ON
 OSS_CMAKE_OFF=		-DWITH_OSS:BOOL=OFF
 
 JACK_LIB_DEPENDS=	libjack.so:audio/jack
 JACK_LIB_DEPENDS+=	libsamplerate.so:audio/libsamplerate
 JACK_CMAKE_ON=		-DWITH_JACK:BOOL=ON
 JACK_CMAKE_OFF=		-DWITH_JACK:BOOL=OFF
 
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CMAKE_ON=	-DWITH_PULSE:BOOL=ON
 PULSEAUDIO_CMAKE_OFF=	-DWITH_PULSE:BOOL=OFF
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/audio/harp/files/patch-plugins_aac_aac.c b/audio/harp/files/patch-plugins_aac_aac.c
new file mode 100644
index 000000000000..68966db35549
--- /dev/null
+++ b/audio/harp/files/patch-plugins_aac_aac.c
@@ -0,0 +1,11 @@
+--- plugins/aac/aac.c.orig	2021-04-10 21:47:11 UTC
++++ plugins/aac/aac.c
+@@ -25,7 +25,7 @@
+ 
+ #include "aacmeta.c"
+ 
+-struct aacHandles{
++static struct aacHandles{
+ 	volatile unsigned int *total;
+ 	volatile unsigned int *sample;
+ 	unsigned int *rate;
diff --git a/audio/harp/files/patch-plugins_mp3_mp3.c b/audio/harp/files/patch-plugins_mp3_mp3.c
new file mode 100644
index 000000000000..94361d803407
--- /dev/null
+++ b/audio/harp/files/patch-plugins_mp3_mp3.c
@@ -0,0 +1,11 @@
+--- plugins/mp3/mp3.c.orig	2021-04-10 21:47:11 UTC
++++ plugins/mp3/mp3.c
+@@ -22,7 +22,7 @@
+ 
+ pthread_mutex_t dechandle_lock;
+ 
+-struct mp3Handles{
++static struct mp3Handles{
+ 	mpg123_handle *m;
+ 	long total;
+ 	long tcarry;
diff --git a/audio/harp/files/patch-plugins_stream_stream.c b/audio/harp/files/patch-plugins_stream_stream.c
new file mode 100644
index 000000000000..c54db68520a2
--- /dev/null
+++ b/audio/harp/files/patch-plugins_stream_stream.c
@@ -0,0 +1,11 @@
+--- plugins/stream/stream.c.orig	2021-04-10 21:47:11 UTC
++++ plugins/stream/stream.c
+@@ -23,7 +23,7 @@
+ 
+ #define S_DEF_PORT_STR "80"
+ 
+-struct streamHandles{
++static struct streamHandles{
+ 	FILE *rfd;
+ 	FILE *wfd;
+ 	int sfd;
diff --git a/audio/harp/files/patch-plugins_vorbis_vorbis.c b/audio/harp/files/patch-plugins_vorbis_vorbis.c
new file mode 100644
index 000000000000..673a245720de
--- /dev/null
+++ b/audio/harp/files/patch-plugins_vorbis_vorbis.c
@@ -0,0 +1,11 @@
+--- plugins/vorbis/vorbis.c.orig	2021-04-10 21:47:11 UTC
++++ plugins/vorbis/vorbis.c
+@@ -21,7 +21,7 @@
+ 
+ #define VORB_CONTINUE (-50)
+ 
+-struct vorbisHandles{
++static struct vorbisHandles{
+ 	OggVorbis_File *vf;
+ 	unsigned int *total;
+ 	int rate;