diff --git a/audio/spectmorph/Makefile b/audio/spectmorph/Makefile
index 9f81a2f93cf2..273db6230c2f 100644
--- a/audio/spectmorph/Makefile
+++ b/audio/spectmorph/Makefile
@@ -1,54 +1,56 @@
 PORTNAME=	spectmorph
 DISTVERSION=	0.6.1
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	https://github.com/swesterfeld/spectmorph/releases/download/${DISTVERSION}/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Analyze and combine samples of musical instruments
 WWW=		https://spectmorph.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_aarch64=	error: unknown type name '__m128'
 BROKEN_armv7=	error: unknown type name '__m128'
 
 BUILD_DEPENDS=	fftw3>0:math/fftw3
 LIB_DEPENDS=	libao.so:audio/libao \
 		libfftw3f.so:math/fftw3-float \
 		libfreetype.so:print/freetype2 \
 		libsndfile.so:audio/libsndfile
 
 USES=		autoreconf desktop-file-utils gettext gl gmake gnome iconv libtool pkgconfig python:run qt:5 shebangfix tar:bz2 xorg
 USE_QT=		core gui widgets buildtools:build
 USE_GNOME=	cairo glib20
 USE_GL=		gl
 USE_XORG=	x11
 USE_LDCONFIG=	yes
 
 SHEBANG_FILES=	tools/sminstbuilder.in
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 
 LDFLAGS+=	-L${LOCALBASE}/lib -lfftw3f_threads
 
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=		JACK LV2
 OPTIONS_DEFAULT=	JACK LV2
 OPTIONS_SUB=		yes
 
 JACK_CONFIGURE_WITH=	jack
 JACK_LIB_DEPENDS=	libjack.so:audio/jack
 
 LV2_DESC=		Build the LV2 plugin
 LV2_CONFIGURE_WITH=	lv2
 LV2_BUILD_DEPENDS=	lv2>0:audio/lv2
 
 post-install:
 	@cd ${STAGEDIR}${PREFIX} && ${STRIP_CMD} \
 		lib/vst/spectmorph_vst.so \
 		lib/clap/SpectMorph.clap \
 		lib/lv2/spectmorph.lv2/spectmorph_lv2.so
 
 .include <bsd.port.mk>
diff --git a/audio/spectmorph/pkg-plist b/audio/spectmorph/pkg-plist
index 4fcdaf042c2b..3c439cdc5cff 100644
--- a/audio/spectmorph/pkg-plist
+++ b/audio/spectmorph/pkg-plist
@@ -1,243 +1,243 @@
 bin/smenc
 %%JACK%%bin/smenccache
 %%JACK%%bin/sminspector
 %%JACK%%bin/sminstbuilder
 %%JACK%%bin/smjack
 %%JACK%%bin/smplay
 %%JACK%%bin/smsampleedit
 %%JACK%%bin/smsfimport
 bin/smstrip
 bin/smtool
 bin/smwavset
 include/spectmorph/smcore/smadsrenvelope.hh
 include/spectmorph/smcore/smalignedarray.hh
 include/spectmorph/smcore/smaudio.hh
 include/spectmorph/smcore/smaudiotool.hh
 include/spectmorph/smcore/smbinbuffer.hh
 include/spectmorph/smcore/smblockutils.hh
 include/spectmorph/smcore/smbuilderthread.hh
 include/spectmorph/smcore/smconfig.hh
 include/spectmorph/smcore/smdcblocker.hh
 include/spectmorph/smcore/smdebug.hh
 include/spectmorph/smcore/smeffectdecoder.hh
 include/spectmorph/smcore/smencoder.hh
 include/spectmorph/smcore/smfft.hh
 include/spectmorph/smcore/smflexadsr.hh
 include/spectmorph/smcore/smgenericin.hh
 include/spectmorph/smcore/smgenericout.hh
 include/spectmorph/smcore/smhexstring.hh
 include/spectmorph/smcore/smifftsynth.hh
 include/spectmorph/smcore/smindex.hh
 include/spectmorph/smcore/sminfile.hh
 include/spectmorph/smcore/sminsteditsynth.hh
 include/spectmorph/smcore/sminstenccache.hh
 include/spectmorph/smcore/sminstencoder.hh
 include/spectmorph/smcore/sminstrument.hh
 include/spectmorph/smcore/smjobqueue.hh
 include/spectmorph/smcore/smladdervcf.hh
 include/spectmorph/smcore/smleakdebugger.hh
 include/spectmorph/smcore/smlinearsmooth.hh
 include/spectmorph/smcore/smlivedecoder.hh
 include/spectmorph/smcore/smlivedecoderfilter.hh
 include/spectmorph/smcore/smlivedecodersource.hh
 include/spectmorph/smcore/smmain.hh
 include/spectmorph/smcore/smmath.hh
 include/spectmorph/smcore/smmatharm.hh
 include/spectmorph/smcore/smmemout.hh
 include/spectmorph/smcore/smmicroconf.hh
 include/spectmorph/smcore/smmidisynth.hh
 include/spectmorph/smcore/smminiresampler.hh
 include/spectmorph/smcore/smmmapin.hh
 include/spectmorph/smcore/smmodulationlist.hh
 include/spectmorph/smcore/smmorphgrid.hh
 include/spectmorph/smcore/smmorphgridmodule.hh
 include/spectmorph/smcore/smmorphlfo.hh
 include/spectmorph/smcore/smmorphlfomodule.hh
 include/spectmorph/smcore/smmorphlinear.hh
 include/spectmorph/smcore/smmorphlinearmodule.hh
 include/spectmorph/smcore/smmorphoperator.hh
 include/spectmorph/smcore/smmorphoperatormodule.hh
 include/spectmorph/smcore/smmorphoutput.hh
 include/spectmorph/smcore/smmorphoutputmodule.hh
 include/spectmorph/smcore/smmorphplan.hh
 include/spectmorph/smcore/smmorphplansynth.hh
 include/spectmorph/smcore/smmorphplanvoice.hh
 include/spectmorph/smcore/smmorphsource.hh
 include/spectmorph/smcore/smmorphsourcemodule.hh
 include/spectmorph/smcore/smmorphutils.hh
 include/spectmorph/smcore/smmorphwavsource.hh
 include/spectmorph/smcore/smmorphwavsourcemodule.hh
 include/spectmorph/smcore/smnoisebandpartition.hh
 include/spectmorph/smcore/smnoisedecoder.hh
 include/spectmorph/smcore/smnotifybuffer.hh
 include/spectmorph/smcore/smoutfile.hh
 include/spectmorph/smcore/smpandaresampler.hh
 include/spectmorph/smcore/smpcg32rng.hh
 include/spectmorph/smcore/smpolyphaseinter.hh
 include/spectmorph/smcore/smproject.hh
 include/spectmorph/smcore/smproperty.hh
 include/spectmorph/smcore/smrandom.hh
 include/spectmorph/smcore/smrtmemory.hh
 include/spectmorph/smcore/smsignal.hh
 include/spectmorph/smcore/smsinedecoder.hh
 include/spectmorph/smcore/smskfilter.hh
 include/spectmorph/smcore/smstdioin.hh
 include/spectmorph/smcore/smstdioout.hh
 include/spectmorph/smcore/smstdiosubin.hh
 include/spectmorph/smcore/smsynthinterface.hh
 include/spectmorph/smcore/smtimeinfo.hh
 include/spectmorph/smcore/smuserinstrumentindex.hh
 include/spectmorph/smcore/smutils.hh
 include/spectmorph/smcore/smwavdata.hh
 include/spectmorph/smcore/smwavset.hh
 include/spectmorph/smcore/smwavsetbuilder.hh
 include/spectmorph/smcore/smwavsetrepo.hh
 include/spectmorph/smcore/smzip.hh
 include/spectmorph/smcore/spectmorph.hh
 include/spectmorph/smglui/pugl/cairo_gl.h
 include/spectmorph/smglui/pugl/gl.h
 include/spectmorph/smglui/pugl/glew.h
 include/spectmorph/smglui/pugl/glu.h
 include/spectmorph/smglui/pugl/pugl.h
 include/spectmorph/smglui/pugl/pugl_internal.h
 include/spectmorph/smglui/smaboutdialog.hh
 include/spectmorph/smglui/smbankeditwindow.hh
 include/spectmorph/smglui/smbutton.hh
 include/spectmorph/smglui/smcheckbox.hh
 include/spectmorph/smglui/smclickablelabel.hh
 include/spectmorph/smglui/smcombobox.hh
 include/spectmorph/smglui/smcomboboxoperator.hh
 include/spectmorph/smglui/smcontrolstatus.hh
 include/spectmorph/smglui/smcontrolview.hh
 include/spectmorph/smglui/smcreatebankwindow.hh
 include/spectmorph/smglui/smdialog.hh
 include/spectmorph/smglui/smdrawutils.hh
 include/spectmorph/smglui/smeventloop.hh
 include/spectmorph/smglui/smfixedgrid.hh
 include/spectmorph/smglui/smframe.hh
 include/spectmorph/smglui/sminsteditnote.hh
 include/spectmorph/smglui/sminsteditparams.hh
 include/spectmorph/smglui/sminsteditvolume.hh
 include/spectmorph/smglui/sminsteditwindow.hh
 include/spectmorph/smglui/smlabel.hh
 include/spectmorph/smglui/smled.hh
 include/spectmorph/smglui/smlineedit.hh
 include/spectmorph/smglui/smlistbox.hh
 include/spectmorph/smglui/smloadstereodialog.hh
 include/spectmorph/smglui/smmenubar.hh
 include/spectmorph/smglui/smmessagebox.hh
 include/spectmorph/smglui/smmorphgridview.hh
 include/spectmorph/smglui/smmorphgridwidget.hh
 include/spectmorph/smglui/smmorphlfoview.hh
 include/spectmorph/smglui/smmorphlinearview.hh
 include/spectmorph/smglui/smmorphoperatorview.hh
 include/spectmorph/smglui/smmorphoutputview.hh
 include/spectmorph/smglui/smmorphplancontrol.hh
 include/spectmorph/smglui/smmorphplanview.hh
 include/spectmorph/smglui/smmorphplanwindow.hh
 include/spectmorph/smglui/smmorphsourceview.hh
 include/spectmorph/smglui/smmorphwavsourceview.hh
 include/spectmorph/smglui/smnativefiledialog.hh
 include/spectmorph/smglui/smoperatorlayout.hh
 include/spectmorph/smglui/smoperatorrolemap.hh
 include/spectmorph/smglui/smoutputadsrwidget.hh
 include/spectmorph/smglui/smparamlabel.hh
 include/spectmorph/smglui/smpathdialog.hh
 include/spectmorph/smglui/smprogressbar.hh
 include/spectmorph/smglui/smpropertyview.hh
 include/spectmorph/smglui/smpropertyviewedit.hh
 include/spectmorph/smglui/smrenameopwindow.hh
 include/spectmorph/smglui/smsamplewidget.hh
 include/spectmorph/smglui/smscrollbar.hh
 include/spectmorph/smglui/smscrollview.hh
 include/spectmorph/smglui/smshortcut.hh
 include/spectmorph/smglui/smsimplelines.hh
 include/spectmorph/smglui/smslider.hh
 include/spectmorph/smglui/smtimer.hh
 include/spectmorph/smglui/smtoolbutton.hh
 include/spectmorph/smglui/smvoicestatus.hh
 include/spectmorph/smglui/smvolumeresetdialog.hh
 include/spectmorph/smglui/smvumeter.hh
 include/spectmorph/smglui/smwidget.hh
 include/spectmorph/smglui/smwindow.hh
 include/spectmorph/smglui/spectmorphglui.hh
 include/spectmorph/smgui/smsampleview.hh
 include/spectmorph/smgui/smzoomcontroller.hh
 include/spectmorph/smgui/spectmorphgui.hh
 lib/clap/SpectMorph.clap
 lib/libspectmorph.a
 lib/libspectmorph.so
 lib/libspectmorph.so.0
 lib/libspectmorph.so.0.0.0
 lib/libspectmorphglui.a
 lib/libspectmorphglui.so
 lib/libspectmorphglui.so.0
 lib/libspectmorphglui.so.0.0.0
 lib/libspectmorphgui.a
 lib/libspectmorphgui.so
 lib/libspectmorphgui.so.0
 lib/libspectmorphgui.so.0.0.0
 %%JACK%%lib/libspectmorphjack.a
 %%JACK%%lib/libspectmorphjack.so
 %%JACK%%lib/libspectmorphjack.so.0
 %%JACK%%lib/libspectmorphjack.so.0.0.0
 %%LV2%%lib/lv2/spectmorph.lv2/manifest.ttl
 %%LV2%%lib/lv2/spectmorph.lv2/spectmorph.ttl
 %%LV2%%lib/lv2/spectmorph.lv2/spectmorph_lv2.so
 lib/vst/spectmorph_vst.so
 libdata/pkgconfig/spectmorph.pc
 libdata/pkgconfig/spectmorphglui.pc
 libdata/pkgconfig/spectmorphgui.pc
-man/man1/smenc.1.gz
-man/man1/sminspector.1.gz
-man/man1/sminstbuilder.1.gz
-man/man1/smjack.1.gz
-man/man1/smplay.1.gz
-man/man1/smsfimport.1.gz
-man/man1/smstrip.1.gz
-man/man1/smtool.1.gz
-man/man1/smwavset.1.gz
-man/man1/spectmorphoscgui.1.gz
 share/applications/smjack.desktop
+share/man/man1/smenc.1.gz
+share/man/man1/sminspector.1.gz
+share/man/man1/sminstbuilder.1.gz
+share/man/man1/smjack.1.gz
+share/man/man1/smplay.1.gz
+share/man/man1/smsfimport.1.gz
+share/man/man1/smstrip.1.gz
+share/man/man1/smtool.1.gz
+share/man/man1/smwavset.1.gz
+share/man/man1/spectmorphoscgui.1.gz
 share/pixmaps/smjack.png
 %%DATADIR%%/instruments/standard/alto-flute.smset
 %%DATADIR%%/instruments/standard/alto-saxophone.smset
 %%DATADIR%%/instruments/standard/bass-clarinet.smset
 %%DATADIR%%/instruments/standard/bass-flute.smset
 %%DATADIR%%/instruments/standard/bass-trombone.smset
 %%DATADIR%%/instruments/standard/bassoon.smset
 %%DATADIR%%/instruments/standard/cello.smset
 %%DATADIR%%/instruments/standard/clarinet.smset
 %%DATADIR%%/instruments/standard/claudia-ah.smset
 %%DATADIR%%/instruments/standard/claudia-ih.smset
 %%DATADIR%%/instruments/standard/claudia-oh.smset
 %%DATADIR%%/instruments/standard/double-bass.smset
 %%DATADIR%%/instruments/standard/french-horn.smset
 %%DATADIR%%/instruments/standard/index.smindex
 %%DATADIR%%/instruments/standard/mirko-ah.smset
 %%DATADIR%%/instruments/standard/mirko-oh.smset
 %%DATADIR%%/instruments/standard/oboe.smset
 %%DATADIR%%/instruments/standard/pan-flute.smset
 %%DATADIR%%/instruments/standard/reed-organ.smset
 %%DATADIR%%/instruments/standard/soprano-saxophone.smset
 %%DATADIR%%/instruments/standard/sven-ah.smset
 %%DATADIR%%/instruments/standard/sven-ih.smset
 %%DATADIR%%/instruments/standard/sven-oh.smset
 %%DATADIR%%/instruments/standard/synth-saw.smset
 %%DATADIR%%/instruments/standard/tenor-trombone.smset
 %%DATADIR%%/instruments/standard/trumpet.smset
 %%DATADIR%%/instruments/standard/viola.smset
 %%DATADIR%%/instruments/standard/violin.smset
 %%DATADIR%%/templates/1-instrument-wav-source.smplan
 %%DATADIR%%/templates/1-instrument.smplan
 %%DATADIR%%/templates/2-instruments-linear-gui.smplan
 %%DATADIR%%/templates/2-instruments-linear-lfo.smplan
 %%DATADIR%%/templates/2-instruments-unison.smplan
 %%DATADIR%%/templates/2x2-instruments-grid-gui.smplan
 %%DATADIR%%/templates/aurora.smplan
 %%DATADIR%%/templates/cheese-cake-bass.smplan
 %%DATADIR%%/templates/empty.smplan
 %%DATADIR%%/templates/index.smpindex
 %%DATADIR%%/templates/liquid-silver.smplan
 %%DATADIR%%/templates/mars.smplan
 %%DATADIR%%/templates/saturn.smplan
diff --git a/audio/tosha/Makefile b/audio/tosha/Makefile
index e510a34c1179..bd6c8511c21f 100644
--- a/audio/tosha/Makefile
+++ b/audio/tosha/Makefile
@@ -1,12 +1,12 @@
 PORTNAME=	tosha
 PORTVERSION=	0.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	LOCAL/markp
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Read CD digital audio and video data via the SCSI bus
 
 LICENSE=	BSD3CLAUSE
 
 .include <bsd.port.mk>
diff --git a/audio/tosha/files/patch-Makefile b/audio/tosha/files/patch-Makefile
index e7e855d44109..17b65058b2ac 100644
--- a/audio/tosha/files/patch-Makefile
+++ b/audio/tosha/files/patch-Makefile
@@ -1,31 +1,40 @@
 --- Makefile.orig	1998-12-16 12:34:09 UTC
 +++ Makefile
-@@ -17,7 +17,7 @@ MANDIR=$(PREFIX)/man
+@@ -8,7 +8,7 @@ ETCDIR=$(PREFIX)/etc
+ PREFIX?=/usr/local
+ BINDIR=$(PREFIX)/bin
+ ETCDIR=$(PREFIX)/etc
+-MANDIR=$(PREFIX)/man
++MANDIR=$(PREFIX)/share/man
+ 
+ ###################################################
+ ######                                       ######
+@@ -17,7 +17,7 @@ CFLAGS?=-O2
  ###################################################
  
  CFLAGS?=-O2
 -CFLAGS+=-Wall -ansi -DGLOBAL_ETC_DIR=\"$(ETCDIR)\"
 +CFLAGS+=-Wall -DGLOBAL_ETC_DIR=\"$(ETCDIR)\"
  
  .if (exists(/usr/include/camlib.h))
  CFLAGS+=-DCAM
-@@ -53,15 +53,10 @@ pcmfade:	pcmfade.o utils.o
+@@ -53,15 +53,10 @@ install:	$(BINS)
  	$(CC) $(CFLAGS) -o pcmfade pcmfade.o utils.o
  
  install:	$(BINS)
 -	strip $(BINS)
 -	install -s -g bin -o bin -m 755 $(BINS) $(BINDIR)
 -	install -c -g bin -o bin -m 644 tosharc $(ETCDIR)
 -	install -c -g bin -o bin -m 644 tosha.1 pcmplay.1 pcmfade.1 \
 -		$(MANDIR)/man1
 -.if !defined(NOMANCOMPRESS)
 -	cd $(MANDIR)/man1 ; \
 -	$(GZIP_CMD) tosha.1 pcmplay.1 pcmfade.1
 -.endif
 +	$(BSD_INSTALL_PROGRAM) $(BINS) $(DESTDIR)$(BINDIR)
 +	$(BSD_INSTALL_DATA) tosharc $(DESTDIR)$(ETCDIR)
 +	$(BSD_INSTALL_MAN) tosha.1 pcmplay.1 pcmfade.1 \
 +		$(DESTDIR)$(MANDIR)/man1
  
  clean:
  	rm -f $(OBJS) *core $(BINS)
diff --git a/audio/tosha/pkg-plist b/audio/tosha/pkg-plist
index 9209a7f27b8f..74e3f60b353e 100644
--- a/audio/tosha/pkg-plist
+++ b/audio/tosha/pkg-plist
@@ -1,7 +1,7 @@
 bin/pcmfade
 bin/pcmplay
 bin/tosha
 etc/tosharc
-man/man1/pcmfade.1.gz
-man/man1/pcmplay.1.gz
-man/man1/tosha.1.gz
+share/man/man1/pcmfade.1.gz
+share/man/man1/pcmplay.1.gz
+share/man/man1/tosha.1.gz
diff --git a/audio/tse3/Makefile b/audio/tse3/Makefile
index 5e7b3fd5fd5e..f19ccae1a959 100644
--- a/audio/tse3/Makefile
+++ b/audio/tse3/Makefile
@@ -1,36 +1,37 @@
 PORTNAME=	tse3
 PORTVERSION=	0.3.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME:tu}/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	MIDI library
 WWW=		https://tse3.sourceforge.net/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		gmake libtool
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS=	--without-doc-install \
 		--without-aRts
 USE_LDCONFIG=	yes
 MAKE_JOBS_UNSAFE=	yes
 INSTALL_TARGET=	install-strip
 
 LDFLAGS+=	-lpthread
 
 OPTIONS_DEFINE=	DOCS
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/*.gif ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/*.jpeg ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/*.png ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/History ${STAGEDIR}${DOCSDIR}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/songs
 	${INSTALL_DATA} ${WRKSRC}/demos/*.tse3 ${STAGEDIR}${DOCSDIR}/songs
 
 .include <bsd.port.mk>
diff --git a/audio/tse3/pkg-plist b/audio/tse3/pkg-plist
index a2e5c8927cde..11d6b4e70d7f 100644
--- a/audio/tse3/pkg-plist
+++ b/audio/tse3/pkg-plist
@@ -1,149 +1,149 @@
 bin/tse3play
 include/tse3/DisplayParams.h
 include/tse3/Error.h
 include/tse3/EventTrack.h
 include/tse3/FileBlockParser.h
 include/tse3/Filter.h
 include/tse3/FlagTrack.h
 include/tse3/KeySigTrack.h
 include/tse3/Metronome.h
 include/tse3/Midi.h
 include/tse3/MidiCommandFilter.h
 include/tse3/MidiData.h
 include/tse3/MidiEcho.h
 include/tse3/MidiFile.h
 include/tse3/MidiFilter.h
 include/tse3/MidiMapper.h
 include/tse3/MidiParams.h
 include/tse3/MidiScheduler.h
 include/tse3/Mixer.h
 include/tse3/Mutex.h
 include/tse3/Notifier.h
 include/tse3/Panic.h
 include/tse3/Part.h
 include/tse3/Phrase.h
 include/tse3/PhraseEdit.h
 include/tse3/PhraseList.h
 include/tse3/Playable.h
 include/tse3/Progress.h
 include/tse3/RepeatTrack.h
 include/tse3/Serializable.h
 include/tse3/Song.h
 include/tse3/TSE2MDL.h
 include/tse3/TSE3.h
 include/tse3/TSE3MDL.h
 include/tse3/TempoTrack.h
 include/tse3/TimeSigTrack.h
 include/tse3/Track.h
 include/tse3/Transport.h
 include/tse3/app/Application.h
 include/tse3/app/Choices.h
 include/tse3/app/Modified.h
 include/tse3/app/PartDisplay.h
 include/tse3/app/PartSelection.h
 include/tse3/app/Record.h
 include/tse3/app/TrackSelection.h
 include/tse3/cmd/Command.h
 include/tse3/cmd/CommandGroup.h
 include/tse3/cmd/CommandHistory.h
 include/tse3/cmd/FlagTrack.h
 include/tse3/cmd/Part.h
 include/tse3/cmd/Phrase.h
 include/tse3/cmd/Song.h
 include/tse3/cmd/Track.h
 include/tse3/file/Write.h
 include/tse3/file/XML.h
 include/tse3/ins/Destination.h
 include/tse3/ins/Instrument.h
 include/tse3/listen/DisplayParams.h
 include/tse3/listen/EventTrack.h
 include/tse3/listen/FlagTrack.h
 include/tse3/listen/KeySigTrack.h
 include/tse3/listen/Metronome.h
 include/tse3/listen/MidiCommandFilter.h
 include/tse3/listen/MidiData.h
 include/tse3/listen/MidiEcho.h
 include/tse3/listen/MidiFile.h
 include/tse3/listen/MidiFilter.h
 include/tse3/listen/MidiMapper.h
 include/tse3/listen/MidiParams.h
 include/tse3/listen/MidiScheduler.h
 include/tse3/listen/Mixer.h
 include/tse3/listen/Panic.h
 include/tse3/listen/Part.h
 include/tse3/listen/Phrase.h
 include/tse3/listen/PhraseEdit.h
 include/tse3/listen/PhraseList.h
 include/tse3/listen/Playable.h
 include/tse3/listen/RepeatTrack.h
 include/tse3/listen/Song.h
 include/tse3/listen/TempoTrack.h
 include/tse3/listen/TimeSigTrack.h
 include/tse3/listen/Track.h
 include/tse3/listen/Transport.h
 include/tse3/listen/app/Modified.h
 include/tse3/listen/app/PartSelection.h
 include/tse3/listen/app/Record.h
 include/tse3/listen/app/TrackSelection.h
 include/tse3/listen/cmd/CommandHistory.h
 include/tse3/listen/ins/Destination.h
 include/tse3/plt/Alsa.h
 include/tse3/plt/Arts.h
 include/tse3/plt/Factory.h
 include/tse3/plt/OSS.h
 include/tse3/plt/RiscOS.cpp
 include/tse3/plt/RiscOS.h
 include/tse3/plt/Win32.cpp
 include/tse3/plt/Win32.h
 include/tse3/util/Demidify.h
 include/tse3/util/MidiScheduler.h
 include/tse3/util/MulDiv.h
 include/tse3/util/NoteNumber.h
 include/tse3/util/Phrase.h
 include/tse3/util/PowerQuantise.h
 include/tse3/util/Snap.h
 include/tse3/util/Song.h
 include/tse3/util/Track.h
 lib/libtse3.so
 lib/libtse3.so.0
 lib/libtse3.so.0.0.0
-man/man1/tse3play.1.gz
-man/man3/tse3.3.gz
+share/man/man1/tse3play.1.gz
+share/man/man3/tse3.3.gz
 %%PORTDOCS%%%%DOCSDIR%%/About.html
 %%PORTDOCS%%%%DOCSDIR%%/Article.html
 %%PORTDOCS%%%%DOCSDIR%%/Bugs.html
 %%PORTDOCS%%%%DOCSDIR%%/Build.html
 %%PORTDOCS%%%%DOCSDIR%%/Commands.html
 %%PORTDOCS%%%%DOCSDIR%%/Copyright.html
 %%PORTDOCS%%%%DOCSDIR%%/Error.html
 %%PORTDOCS%%%%DOCSDIR%%/Examples.html
 %%PORTDOCS%%%%DOCSDIR%%/Feedback.html
 %%PORTDOCS%%%%DOCSDIR%%/HOWTO.html
 %%PORTDOCS%%%%DOCSDIR%%/History
 %%PORTDOCS%%%%DOCSDIR%%/History.html
 %%PORTDOCS%%%%DOCSDIR%%/InsFiles.html
 %%PORTDOCS%%%%DOCSDIR%%/KDOC.html
 %%PORTDOCS%%%%DOCSDIR%%/Mutex.html
 %%PORTDOCS%%%%DOCSDIR%%/Notifier.html
 %%PORTDOCS%%%%DOCSDIR%%/Playable.html
 %%PORTDOCS%%%%DOCSDIR%%/Porting.html
 %%PORTDOCS%%%%DOCSDIR%%/Psalm150.html
 %%PORTDOCS%%%%DOCSDIR%%/Song.html
 %%PORTDOCS%%%%DOCSDIR%%/Structure.html
 %%PORTDOCS%%%%DOCSDIR%%/TSE3MDL.html
 %%PORTDOCS%%%%DOCSDIR%%/Trax.html
 %%PORTDOCS%%%%DOCSDIR%%/Trouble.html
 %%PORTDOCS%%%%DOCSDIR%%/Version.html
 %%PORTDOCS%%%%DOCSDIR%%/Whitepaper.html
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/pete.jpeg
 %%PORTDOCS%%%%DOCSDIR%%/songs/Ambient.tse3
 %%PORTDOCS%%%%DOCSDIR%%/songs/Bry.tse3
 %%PORTDOCS%%%%DOCSDIR%%/songs/Demo.tse3
 %%PORTDOCS%%%%DOCSDIR%%/songs/Enigma.tse3
 %%PORTDOCS%%%%DOCSDIR%%/songs/FunkyJob.tse3
 %%PORTDOCS%%%%DOCSDIR%%/songs/Humphry.tse3
 %%PORTDOCS%%%%DOCSDIR%%/songs/Trip.tse3
 %%PORTDOCS%%%%DOCSDIR%%/trax.gif
 %%PORTDOCS%%%%DOCSDIR%%/tse3.gif
 %%PORTDOCS%%%%DOCSDIR%%/tse3logo.png
diff --git a/audio/wavplay/Makefile b/audio/wavplay/Makefile
index fbd801885f87..976429adc670 100644
--- a/audio/wavplay/Makefile
+++ b/audio/wavplay/Makefile
@@ -1,30 +1,32 @@
 PORTNAME=	wavplay
 PORTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	SF/${PORTNAME}/Release%20Downloads/
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Wav player and recorder
 WWW=		https://sourceforge.net/projects/wavplay/
 
 LICENSE=	GPLv2 # only
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 ONLY_FOR_ARCHS=	aarch64 amd64 armv6 armv7 i386 powerpc64le
 ONLY_FOR_ARCHS_REASON=	does not play sound correctly
 
 USES=		autoreconf libtool:build
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 
 OPTIONS_DEFINE=	X11
 OPTIONS_SUB=	yes
 
 X11_CONFIGURE_OFF=	--enable-nox
 X11_USES=		localbase:ldflags xorg
 X11_USE=		XORG=x11,xmu,xt
 X11_LIB_DEPENDS=	libXm.so:x11-toolkits/lesstif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|machine/soundcard|sys/soundcard|g' ${WRKSRC}/src/*.c
 
 .include <bsd.port.mk>
diff --git a/audio/wavplay/pkg-plist b/audio/wavplay/pkg-plist
index 3ae09b9fdcfe..ab3ebabbd2ba 100644
--- a/audio/wavplay/pkg-plist
+++ b/audio/wavplay/pkg-plist
@@ -1,5 +1,5 @@
 bin/wavplay
 bin/wavplay-config
 bin/wavrec
 %%X11%%bin/xltwavplay
-man/man1/wavplay.1.gz
+share/man/man1/wavplay.1.gz
diff --git a/audio/x42-plugins-lv2/Makefile b/audio/x42-plugins-lv2/Makefile
index d1fe2820b783..8d7caacd0bb9 100644
--- a/audio/x42-plugins-lv2/Makefile
+++ b/audio/x42-plugins-lv2/Makefile
@@ -1,58 +1,59 @@
 PORTNAME=	x42-plugins
 DISTVERSION=	20230706 # the version is published here: http://gareus.org/misc/x42-plugins.php
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://gareus.org/misc/x42-plugins/
 PKGNAMESUFFIX=	-lv2
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} # only to allow USE_GITHUB=nodefault for zita4 compatilility patch
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Collection of LV2 plugins (submodules)
 WWW=		https://github.com/x42/x42-plugins/
 
 LICENSE=	GPLv2
 
 BROKEN_i386=	compilation fails: unsupported option '--fast-math'; did you mean '-ffast-math', reported to the author on 2022-11-06
 
 BUILD_DEPENDS=	lv2>0:audio/lv2 \
 		${LOCALBASE}/include/fftw3.h:math/fftw3 \
 		bash:shells/bash
 LIB_DEPENDS=	libfftw3f.so:math/fftw3-float \
 		libharfbuzz.so:print/harfbuzz \
 		libjack.so:audio/jack \
 		liblo.so:audio/liblo \
 		libltc.so:audio/libltc \
 		libsamplerate.so:audio/libsamplerate \
 		libsndfile.so:audio/libsndfile \
 		libzita-convolver.so:audio/zita-convolver
 
 USES=		compiler:c++11-lang gl gmake gnome localbase pkgconfig tar:xz \
 		shebangfix xorg
 USE_GNOME=	glib20 pango cairo
 USE_XORG=	x11
 USE_GL=		glu gl
 
 USE_GITHUB=	nodefault
 GH_TUPLE=	x42:convoLV2:ff291a3:x/convoLV2zita4
 
-MAKE_ENV=	BUILDOPENGL=yes BUILDGTK=no LV2DIR=${PREFIX}/lib/lv2 MANDIR=${PREFIX}/man/man1
+MAKE_ENV=	BUILDOPENGL=yes BUILDGTK=no LV2DIR=${PREFIX}/lib/lv2 MANDIR=${PREFIX}/share/man/man1
 SHEBANG_FILES=	stepseq.lv2/gridgen.sh
 
 CXXFLAGS+=	-std=c++98
 
 CONFLICTS_INSTALL=	phaserotate-lv2 # lib/lv2/phaserotate.lv2/phaserotate.so
 
 OPTIONS_DEFINE_amd64=	SSE
 OPTIONS_DEFINE_i386=	SSE
 OPTIONS_DEFAULT_amd64=	SSE
 OPTIONS_DEFAULT_i386=	SSE
 
 SSE_MAKE_ARGS=	PORT_SIMD_FLAGS="-msse -msse2 -mfpmath=sse"
 
 post-patch:
 	@${REINPLACE_CMD} 's| -O3||' \
 		${WRKSRC}/*.lv2/Makefile
 	@cd ${WRKSRC} && ${RM} -r convoLV2 && ${MV} convoLV2zita4 convoLV2
 	@${REINPLACE_CMD} 's| -msse -msse2 -mfpmath=sse| $$(PORT_SIMD_FLAGS)|' \
 		${WRKSRC}/*.lv2/Makefile ${WRKSRC}/convoLV2/Makefile
 
 .include <bsd.port.mk>
diff --git a/audio/x42-plugins-lv2/pkg-plist b/audio/x42-plugins-lv2/pkg-plist
index ec35d5dc18b8..57c8d13e457a 100644
--- a/audio/x42-plugins-lv2/pkg-plist
+++ b/audio/x42-plugins-lv2/pkg-plist
@@ -1,114 +1,114 @@
 bin/x42-darc
 bin/x42-dpl
 bin/x42-fat1
 bin/x42-fil4
 bin/x42-matrixmixer8x8
 bin/x42-meter
 bin/x42-mixtri
 bin/x42-phaserotate
 bin/x42-scope
 bin/x42-spectr
 bin/x42-stepseq
 bin/x42-tuna
 lib/lv2/balance.lv2/balance.so
 lib/lv2/balance.lv2/balance.ttl
 lib/lv2/balance.lv2/manifest.ttl
 lib/lv2/controlfilter.lv2/controlfilter.so
 lib/lv2/controlfilter.lv2/controlfilter.ttl
 lib/lv2/controlfilter.lv2/manifest.ttl
 lib/lv2/controlfilter.lv2/presets.ttl
 lib/lv2/darc.lv2/darc.so
 lib/lv2/darc.lv2/darc.ttl
 lib/lv2/darc.lv2/darcUI_gl.so
 lib/lv2/darc.lv2/manifest.ttl
 lib/lv2/dpl.lv2/dpl.so
 lib/lv2/dpl.lv2/dpl.ttl
 lib/lv2/dpl.lv2/dplUI_gl.so
 lib/lv2/dpl.lv2/manifest.ttl
 lib/lv2/fat1.lv2/fat1.so
 lib/lv2/fat1.lv2/fat1.ttl
 lib/lv2/fat1.lv2/fat1UI_gl.so
 lib/lv2/fat1.lv2/manifest.ttl
 lib/lv2/fat1.lv2/presets.ttl
 lib/lv2/fil4.lv2/fil4.so
 lib/lv2/fil4.lv2/fil4.ttl
 lib/lv2/fil4.lv2/fil4UI_gl.so
 lib/lv2/fil4.lv2/manifest.ttl
 lib/lv2/matrixmixer.lv2/manifest.ttl
 lib/lv2/matrixmixer.lv2/matrixmixer.so
 lib/lv2/matrixmixer.lv2/matrixmixer.ttl
 lib/lv2/matrixmixer.lv2/matrixmixerUI_gl.so
 lib/lv2/meters.lv2/manifest.ttl
 lib/lv2/meters.lv2/meters.so
 lib/lv2/meters.lv2/meters.ttl
 lib/lv2/meters.lv2/meters_glui.so
 lib/lv2/mididebug.lv2/manifest.ttl
 lib/lv2/mididebug.lv2/mididebug.so
 lib/lv2/mididebug.lv2/mididebug.ttl
 lib/lv2/midifilter.lv2/manifest.ttl
 lib/lv2/midifilter.lv2/midifilter.so
 lib/lv2/midifilter.lv2/midifilter.ttl
 lib/lv2/midifilter.lv2/presets.ttl
 lib/lv2/midigen.lv2/manifest.ttl
 lib/lv2/midigen.lv2/midigen.so
 lib/lv2/midigen.lv2/midigen.ttl
 lib/lv2/midimap.lv2/manifest.ttl
 lib/lv2/midimap.lv2/midimap.so
 lib/lv2/midimap.lv2/midimap.ttl
 lib/lv2/midimap.lv2/presets.ttl
 lib/lv2/mixtri.lv2/manifest.ttl
 lib/lv2/mixtri.lv2/mixtri.so
 lib/lv2/mixtri.lv2/mixtri.ttl
 lib/lv2/mixtri.lv2/mixtriUI_gl.so
 lib/lv2/nodelay.lv2/manifest.ttl
 lib/lv2/nodelay.lv2/nodelay.so
 lib/lv2/nodelay.lv2/nodelay.ttl
 lib/lv2/onsettrigger.lv2/manifest.ttl
 lib/lv2/onsettrigger.lv2/onsettrigger.so
 lib/lv2/onsettrigger.lv2/onsettrigger.ttl
 lib/lv2/phaserotate.lv2/manifest.ttl
 lib/lv2/phaserotate.lv2/phaserotate.so
 lib/lv2/phaserotate.lv2/phaserotate.ttl
 lib/lv2/phaserotate.lv2/phaserotateUI_gl.so
 lib/lv2/sisco.lv2/manifest.ttl
 lib/lv2/sisco.lv2/sisco.so
 lib/lv2/sisco.lv2/sisco.ttl
 lib/lv2/sisco.lv2/siscoUI_gl.so
 lib/lv2/spectra.lv2/manifest.ttl
 lib/lv2/spectra.lv2/spectra.so
 lib/lv2/spectra.lv2/spectra.ttl
 lib/lv2/spectra.lv2/spectraUI_gl.so
 lib/lv2/stepseq_s8n8.lv2/manifest.ttl
 lib/lv2/stepseq_s8n8.lv2/stepseq.so
 lib/lv2/stepseq_s8n8.lv2/stepseq.ttl
 lib/lv2/stepseq_s8n8.lv2/stepseqUI_gl.so
 lib/lv2/stereoroute.lv2/manifest.ttl
 lib/lv2/stereoroute.lv2/stereoroute.so
 lib/lv2/stereoroute.lv2/stereoroute.ttl
 lib/lv2/testsignal.lv2/manifest.ttl
 lib/lv2/testsignal.lv2/testsignal.so
 lib/lv2/testsignal.lv2/testsignal.ttl
 lib/lv2/tuna.lv2/manifest.ttl
 lib/lv2/tuna.lv2/tuna.so
 lib/lv2/tuna.lv2/tuna.ttl
 lib/lv2/tuna.lv2/tunaUI_gl.so
 lib/lv2/xfade.lv2/manifest.ttl
 lib/lv2/xfade.lv2/xfade.so
 lib/lv2/xfade.lv2/xfade.ttl
 lib/lv2/zeroconvo.lv2/ir/delta-48k.wav
 lib/lv2/zeroconvo.lv2/manifest.ttl
 lib/lv2/zeroconvo.lv2/presets.ttl
 lib/lv2/zeroconvo.lv2/zeroconvolv.so
 lib/lv2/zeroconvo.lv2/zeroconvolv.ttl
-man/man1/x42-darc.1.gz
-man/man1/x42-dpl.1.gz
-man/man1/x42-fat1.1.gz
-man/man1/x42-fil4.1.gz
-man/man1/x42-matrixmixer.1.gz
-man/man1/x42-meter.1.gz
-man/man1/x42-mixtri.1.gz
-man/man1/x42-phaserotate.1.gz
-man/man1/x42-scope.1.gz
-man/man1/x42-spectr.1.gz
-man/man1/x42-stepseq.1.gz
-man/man1/x42-tuna.1.gz
+share/man/man1/x42-darc.1.gz
+share/man/man1/x42-dpl.1.gz
+share/man/man1/x42-fat1.1.gz
+share/man/man1/x42-fil4.1.gz
+share/man/man1/x42-matrixmixer.1.gz
+share/man/man1/x42-meter.1.gz
+share/man/man1/x42-mixtri.1.gz
+share/man/man1/x42-phaserotate.1.gz
+share/man/man1/x42-scope.1.gz
+share/man/man1/x42-spectr.1.gz
+share/man/man1/x42-stepseq.1.gz
+share/man/man1/x42-tuna.1.gz
diff --git a/audio/xfce4-mixer/Makefile b/audio/xfce4-mixer/Makefile
index 814f512a352f..8265e38fdf5f 100644
--- a/audio/xfce4-mixer/Makefile
+++ b/audio/xfce4-mixer/Makefile
@@ -1,62 +1,63 @@
 PORTNAME=	xfce4-mixer
 PORTVERSION=	4.18.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio xfce
 MASTER_SITES=	XFCE/apps
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
 COMMENT=	Volume control for the Xfce desktop
 WWW=		https://docs.xfce.org/apps/xfce4-mixer/start
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libharfbuzz.so:print/harfbuzz
 
 FLAVORS=	lite full
 FLAVOR?=	${FLAVORS:[1]}
 
 lite_CONFLICTS_INSTALL=		xfce4-mixer-full
 
 full_PKGNAMESUFFIX=		-full
 full_CONFLICTS_INSTALL=		xfce4-mixer
 
 USES=		compiler:c11 gettext-tools gmake gnome gstreamer libtool \
 		pkgconfig tar:bzip2 xfce xorg
 USE_GNOME=	cairo gdkpixbuf2 glib20 gtk30 intltool
 USE_GSTREAMER=	good
 USE_XFCE=	libmenu panel xfconf
 USE_XORG=	x11
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=		KEYBINDER NLS
 OPTIONS_DEFAULT=	OSS
 OPTIONS_GROUP=		AUDIO
 OPTIONS_GROUP_AUDIO=	ALSA OSS PULSEAUDIO SNDIO
 OPTIONS_SUB=		yes
 
 .if ${FLAVOR} == full
 OPTIONS_DEFAULT+=	ALSA KEYBINDER PULSEAUDIO SNDIO
 .endif
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CONFIGURE_ENABLE=	alsa
 
 KEYBINDER_DESC=			Multimedia keyboard shortcuts
 KEYBINDER_LIB_DEPENDS=		libkeybinder-3.0.so:x11/keybinder-gtk3
 KEYBINDER_CONFIGURE_ENABLE=	keybinder
 
 NLS_USES=		gettext-runtime
 NLS_CONFIGURE_ENABLE=	nls
 
 OSS_CONFIGURE_ENABLE=	oss
 
 PULSEAUDIO_LIB_DEPENDS=		libpulse.so:audio/pulseaudio
 PULSEAUDIO_CONFIGURE_ENABLE=	pulse
 
 SNDIO_LIB_DEPENDS=	libsndio.so:audio/sndio
 SNDIO_CONFIGURE_ENABLE=	sndio
 
 .include <bsd.port.mk>
diff --git a/audio/xfce4-mixer/pkg-plist b/audio/xfce4-mixer/pkg-plist
index 1bb4d0e67e2f..a552ac8f35ee 100644
--- a/audio/xfce4-mixer/pkg-plist
+++ b/audio/xfce4-mixer/pkg-plist
@@ -1,66 +1,66 @@
 bin/xfce4-mixer
 lib/xfce4/panel/plugins/libmixer.so
-man/man1/xfce4-mixer.1.gz
 share/applications/xfce4-mixer.desktop
 %%NLS%%share/locale/ar/LC_MESSAGES/xfce4-mixer.mo
 %%NLS%%share/locale/ast/LC_MESSAGES/xfce4-mixer.mo
 %%NLS%%share/locale/be/LC_MESSAGES/xfce4-mixer.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/xfce4-mixer.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/xfce4-mixer.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/xfce4-mixer.mo
 %%NLS%%share/locale/da/LC_MESSAGES/xfce4-mixer.mo
 %%NLS%%share/locale/de/LC_MESSAGES/xfce4-mixer.mo
 %%NLS%%share/locale/el/LC_MESSAGES/xfce4-mixer.mo
 %%NLS%%share/locale/en_AU/LC_MESSAGES/xfce4-mixer.mo
 %%NLS%%share/locale/en_CA/LC_MESSAGES/xfce4-mixer.mo
 %%NLS%%share/locale/en_GB/LC_MESSAGES/xfce4-mixer.mo
 %%NLS%%share/locale/es/LC_MESSAGES/xfce4-mixer.mo
 %%NLS%%share/locale/eu/LC_MESSAGES/xfce4-mixer.mo
 %%NLS%%share/locale/fa_IR/LC_MESSAGES/xfce4-mixer.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/xfce4-mixer.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/xfce4-mixer.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/xfce4-mixer.mo
 %%NLS%%share/locale/he/LC_MESSAGES/xfce4-mixer.mo
 %%NLS%%share/locale/hr/LC_MESSAGES/xfce4-mixer.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/xfce4-mixer.mo
 %%NLS%%share/locale/hy_AM/LC_MESSAGES/xfce4-mixer.mo
 %%NLS%%share/locale/hye/LC_MESSAGES/xfce4-mixer.mo
 %%NLS%%share/locale/id/LC_MESSAGES/xfce4-mixer.mo
 %%NLS%%share/locale/ie/LC_MESSAGES/xfce4-mixer.mo
 %%NLS%%share/locale/is/LC_MESSAGES/xfce4-mixer.mo
 %%NLS%%share/locale/it/LC_MESSAGES/xfce4-mixer.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/xfce4-mixer.mo
 %%NLS%%share/locale/kk/LC_MESSAGES/xfce4-mixer.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/xfce4-mixer.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/xfce4-mixer.mo
 %%NLS%%share/locale/lv/LC_MESSAGES/xfce4-mixer.mo
 %%NLS%%share/locale/ms/LC_MESSAGES/xfce4-mixer.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/xfce4-mixer.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/xfce4-mixer.mo
 %%NLS%%share/locale/nn/LC_MESSAGES/xfce4-mixer.mo
 %%NLS%%share/locale/oc/LC_MESSAGES/xfce4-mixer.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/xfce4-mixer.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/xfce4-mixer.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/xfce4-mixer.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/xfce4-mixer.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/xfce4-mixer.mo
 %%NLS%%share/locale/si/LC_MESSAGES/xfce4-mixer.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/xfce4-mixer.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/xfce4-mixer.mo
 %%NLS%%share/locale/sq/LC_MESSAGES/xfce4-mixer.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/xfce4-mixer.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/xfce4-mixer.mo
 %%NLS%%share/locale/th/LC_MESSAGES/xfce4-mixer.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/xfce4-mixer.mo
 %%NLS%%share/locale/ug/LC_MESSAGES/xfce4-mixer.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/xfce4-mixer.mo
 %%NLS%%share/locale/ur/LC_MESSAGES/xfce4-mixer.mo
 %%NLS%%share/locale/ur_PK/LC_MESSAGES/xfce4-mixer.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/xfce4-mixer.mo
 %%NLS%%share/locale/zh_HK/LC_MESSAGES/xfce4-mixer.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/xfce4-mixer.mo
+share/man/man1/xfce4-mixer.1.gz
 share/pixmaps/xfce4-mixer/chain-broken.png
 share/pixmaps/xfce4-mixer/chain.png
 share/xfce4/mixer/icons/hicolor/16x16/status/audio-input-microphone-muted.png
 share/xfce4/mixer/icons/hicolor/scalable/status/audio-input-microphone-muted.svg
 share/xfce4/panel/plugins/mixer.desktop
diff --git a/audio/xfmpc/Makefile b/audio/xfmpc/Makefile
index 8fe7f5c0e419..5b7ec64d6911 100644
--- a/audio/xfmpc/Makefile
+++ b/audio/xfmpc/Makefile
@@ -1,32 +1,33 @@
 PORTNAME=	xfmpc
 PORTVERSION=	0.3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio xfce
 MASTER_SITES=	XFCE/apps
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
 COMMENT=	Graphical MPD client focusing on low footprint
 WWW=		https://goodies.xfce.org/projects/applications/xfmpc
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libmpd.so:audio/libmpd \
 		libharfbuzz.so:print/harfbuzz
 
 USES=		compiler:c11 gettext-tools gmake gnome pkgconfig tar:bzip2 \
 		vala:build xfce xorg
 USE_GNOME=	cairo gdkpixbuf2 gtk30 intltool
 USE_XFCE=	libmenu
 USE_XORG=	ice sm x11
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
 
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext-runtime
 
 .include <bsd.port.mk>
diff --git a/audio/xfmpc/pkg-plist b/audio/xfmpc/pkg-plist
index 684ab61df7cd..dc0aaf0a7f67 100644
--- a/audio/xfmpc/pkg-plist
+++ b/audio/xfmpc/pkg-plist
@@ -1,56 +1,56 @@
 bin/xfmpc
-man/man1/xfmpc.1.gz
 share/applications/xfmpc.desktop
 %%NLS%%share/locale/am/LC_MESSAGES/xfmpc.mo
 %%NLS%%share/locale/ar/LC_MESSAGES/xfmpc.mo
 %%NLS%%share/locale/ast/LC_MESSAGES/xfmpc.mo
 %%NLS%%share/locale/be/LC_MESSAGES/xfmpc.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/xfmpc.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/xfmpc.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/xfmpc.mo
 %%NLS%%share/locale/da/LC_MESSAGES/xfmpc.mo
 %%NLS%%share/locale/de/LC_MESSAGES/xfmpc.mo
 %%NLS%%share/locale/el/LC_MESSAGES/xfmpc.mo
 %%NLS%%share/locale/en_AU/LC_MESSAGES/xfmpc.mo
 %%NLS%%share/locale/en_GB/LC_MESSAGES/xfmpc.mo
 %%NLS%%share/locale/es/LC_MESSAGES/xfmpc.mo
 %%NLS%%share/locale/et/LC_MESSAGES/xfmpc.mo
 %%NLS%%share/locale/eu/LC_MESSAGES/xfmpc.mo
 %%NLS%%share/locale/fa_IR/LC_MESSAGES/xfmpc.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/xfmpc.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/xfmpc.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/xfmpc.mo
 %%NLS%%share/locale/he/LC_MESSAGES/xfmpc.mo
 %%NLS%%share/locale/hr/LC_MESSAGES/xfmpc.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/xfmpc.mo
 %%NLS%%share/locale/hy_AM/LC_MESSAGES/xfmpc.mo
 %%NLS%%share/locale/hye/LC_MESSAGES/xfmpc.mo
 %%NLS%%share/locale/id/LC_MESSAGES/xfmpc.mo
 %%NLS%%share/locale/ie/LC_MESSAGES/xfmpc.mo
 %%NLS%%share/locale/is/LC_MESSAGES/xfmpc.mo
 %%NLS%%share/locale/it/LC_MESSAGES/xfmpc.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/xfmpc.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/xfmpc.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/xfmpc.mo
 %%NLS%%share/locale/ms/LC_MESSAGES/xfmpc.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/xfmpc.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/xfmpc.mo
 %%NLS%%share/locale/oc/LC_MESSAGES/xfmpc.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/xfmpc.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/xfmpc.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/xfmpc.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/xfmpc.mo
 %%NLS%%share/locale/si/LC_MESSAGES/xfmpc.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/xfmpc.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/xfmpc.mo
 %%NLS%%share/locale/sq/LC_MESSAGES/xfmpc.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/xfmpc.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/xfmpc.mo
 %%NLS%%share/locale/th/LC_MESSAGES/xfmpc.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/xfmpc.mo
 %%NLS%%share/locale/ug/LC_MESSAGES/xfmpc.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/xfmpc.mo
 %%NLS%%share/locale/ur/LC_MESSAGES/xfmpc.mo
 %%NLS%%share/locale/ur_PK/LC_MESSAGES/xfmpc.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/xfmpc.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/xfmpc.mo
+share/man/man1/xfmpc.1.gz
diff --git a/audio/xoscope/Makefile b/audio/xoscope/Makefile
index 7bddac682100..570e2d3ac206 100644
--- a/audio/xoscope/Makefile
+++ b/audio/xoscope/Makefile
@@ -1,23 +1,24 @@
 PORTNAME=	xoscope
 PORTVERSION=	2.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio hamradio
 MASTER_SITES=	SF
 
 MAINTAINER=	db@FreeBSD.org
 COMMENT=	Sound card oscilloscope
 WWW=		https://xoscope.sourceforge.net/
 
 LICENSE=	GPLv1
 LICENSE_FILE=	${WRKSRC}/README
 
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS=	--prefix=${STAGEDIR}${PREFIX} --sysconfdir=${STAGEDIR}${PREFIX}
 USES=		gmake gnome pkgconfig tar:tgz xorg
 USE_GNOME=	cairo gdkpixbuf2 gtk20
 USE_XORG=	x11
 
 .include <bsd.port.mk>
diff --git a/audio/xoscope/pkg-plist b/audio/xoscope/pkg-plist
index 13c51f588431..2ef005a26547 100644
--- a/audio/xoscope/pkg-plist
+++ b/audio/xoscope/pkg-plist
@@ -1,2 +1,2 @@
 bin/xoscope
-man/man1/xoscope.1.gz
+share/man/man1/xoscope.1.gz