Index: branches/2021Q1/audio/vgmplay/Makefile
===================================================================
--- branches/2021Q1/audio/vgmplay/Makefile	(revision 560740)
+++ branches/2021Q1/audio/vgmplay/Makefile	(revision 560741)
@@ -1,57 +1,57 @@
 # $FreeBSD$
 
 PORTNAME=	vgmplay
 PORTVERSION=	0.40.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	https://github.com/vgmrips/${PORTNAME}/releases/download/${PORTVERSION}/
 DISTNAME=	${PORTNAME:S/vgmp/VGMP/}_${PORTVERSION:S/.//:S/./-/}_src
 
 MAINTAINER=	tagattie@FreeBSD.org
 COMMENT=	Command-line player for VGM (video game music) files
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/licenses/GPL.txt
 
 USES=		7z compiler dos2unix gmake
 
 NO_WRKSUBDIR=	yes
 
 OPTIONS_SINGLE=	AUDIO
 OPTIONS_SINGLE_AUDIO=	OSS LIBAO
 OPTIONS_DEFAULT=	OSS
 
 OSS_DESC=	Use OSS (/dev/dsp)
 LIBAO_DESC=	Use libao
 
 OSS_MAKE_ENV+=	USE_LIBAO=0
 LIBAO_MAKE_ENV+=	USE_LIBAO=1
 LIBAO_LIB_DEPENDS=	libao.so:audio/libao
 LIBAO_USES=	localbase:ldflags
 
 MAKE_ENV+=	PREFIX=${LOCALBASE} ${MAKE_ENV_${ARCH}}
 MAKE_ENV_powerpc=	BYTE_ORDER=2
 MAKE_ENV_powerpc64=	BYTE_ORDER=2
 MAKE_ENV_powerpc64le=	BYTE_ORDER=1
 MAKE_ENV_powerpcspe=	BYTE_ORDER=2
 
-PLIST_FILES=	bin/vgmplay bin/vgm2pcm bin/vgm2wav man/man1/vgmplay.1.gz ${EXAMPLESDIR}/vgmplay.ini
+PLIST_FILES=	bin/vgmplay bin/vgm2pcm bin/vgm2wav share/man/man1/vgmplay.1.gz ${EXAMPLESDIR}/vgmplay.ini
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 	${REINPLACE_CMD} -e 's/@//' ${WRKSRC}/Makefile
 .if ${CHOSEN_COMPILER_TYPE} != clang
 	${REINPLACE_CMD} -e 's/-Wno-unused-but-set-variable//' ${WRKSRC}/Makefile
 .endif
 	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|; s|/usr/share/vgmplay|${EXAMPLESDIR}|; s|VGMPlay|vgmplay|g;' ${WRKSRC}/vgmplay.1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/vgmplay ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/vgm2pcm ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/vgm2wav ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/vgmplay.1 ${STAGEDIR}${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/vgmplay.1 ${STAGEDIR}${MANPREFIX}/share/man/man1
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/VGMPlay.ini ${STAGEDIR}${EXAMPLESDIR}/vgmplay.ini
 
 .include <bsd.port.post.mk>
Index: branches/2021Q1/audio/vgmplay/files/patch-Makefile
===================================================================
--- branches/2021Q1/audio/vgmplay/files/patch-Makefile	(revision 560740)
+++ branches/2021Q1/audio/vgmplay/files/patch-Makefile	(revision 560741)
@@ -1,12 +1,21 @@
---- Makefile.orig	2019-01-11 06:06:08 UTC
+--- Makefile.orig	2021-01-07 10:55:33 UTC
 +++ Makefile
 @@ -58,7 +58,9 @@ endif
  
  
  
 +ifndef CC
  CC = gcc
 +endif
  ifndef PREFIX
  PREFIX = /usr/local
  #PREFIX = $(HOME)/.local
+@@ -101,7 +103,7 @@ endif
+ 
+ # -- General Compile Flags --
+ ifeq ($(DEBUG), 0)
+-CFLAGS := -O3 -g0 $(CFLAGS)
++CFLAGS := -g0 $(CFLAGS)
+ else
+ CFLAGS := -g $(CFLAGS)
+ endif
Index: branches/2021Q1/audio/vgmplay/files/patch-VGMPlay__AddFmts.c
===================================================================
--- branches/2021Q1/audio/vgmplay/files/patch-VGMPlay__AddFmts.c	(nonexistent)
+++ branches/2021Q1/audio/vgmplay/files/patch-VGMPlay__AddFmts.c	(revision 560741)
@@ -0,0 +1,11 @@
+--- VGMPlay_AddFmts.c.orig	2021-01-06 02:49:31 UTC
++++ VGMPlay_AddFmts.c
+@@ -117,7 +117,7 @@ extern INT32 VGMSmplPlayed;
+ extern INT32 VGMSampleRate;
+ extern UINT32 BlocksSent;
+ extern UINT32 BlocksPlayed;
+-bool VGMEnd;
++extern bool VGMEnd;
+ extern bool EndPlay;
+ extern bool PausePlay;
+ extern bool FadePlay;

Property changes on: branches/2021Q1/audio/vgmplay/files/patch-VGMPlay__AddFmts.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2021Q1
===================================================================
--- branches/2021Q1	(revision 560740)
+++ branches/2021Q1	(revision 560741)

Property changes on: branches/2021Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r560739