Index: head/emulators/mupen64plus-core/Makefile.common
===================================================================
--- head/emulators/mupen64plus-core/Makefile.common	(revision 389667)
+++ head/emulators/mupen64plus-core/Makefile.common	(revision 389668)
@@ -1,124 +1,123 @@
 USES+=			dos2unix
 DOS2UNIX_GLOB=		*.c *.cpp *.h *.H *.ini *.conf
 
-DISTINFO_FILE=		${.CURDIR}/distinfo
 DISTNAME=		${PORTNAME}-bundle-src-${PORTVERSION}
 PATCHDIR=		${.CURDIR}/files
 BUILD_WRKSRC?=		${WRKSRC}/source/${PORTNAME}${PKGNAMESUFFIX}/projects/unix
 WRKSRC?=		${WRKDIR}/${DISTNAME}
 
 EXTRACT_AFTER_ARGS?=	"${DISTNAME}/source/${PORTNAME}-core/*" \
 				"${DISTNAME}/source/${PORTNAME}${PKGNAMESUFFIX}/*"
 
 .if ${PKGNAMESUFFIX} == "-core"
 LIB_DEPENDS+=		libfreetype.so:${PORTSDIR}/print/freetype2 \
 			libpng.so:${PORTSDIR}/graphics/png \
 			libminizip.so:${PORTSDIR}/archivers/minizip
 .else
 PLIST=			${WRKDIR}/pkg-plist
 .endif
 
 .if ${PKGNAMESUFFIX} == "-video-rice"
 LIB_DEPENDS+=		libpng.so:${PORTSDIR}/graphics/png
 .endif
 
 .if ${PKGNAMESUFFIX} == "-video-glide64mk"
 LIB_DEPENDS+=		libboost_thread.so:${PORTSDIR}/devel/boost-libs
 .endif
 
 .if ${PKGNAMESUFFIX} != "-core"
 post-patch:
 	@cd ${BUILD_WRKSRC} && ${REINPLACE_CMD} -e 's|gcc|${CC}|g' -e \
 		's|g++|${CXX}|g' -e 's|sdl-config|${SDL2_CONFIG}|g' Makefile
 .	if ${PKGNAMESUFFIX} == "-video-glide64mk2"
 		@cd ${WRKSRC}/source/${PORTNAME}${PKGNAMESUFFIX}/src && \
 			${REINPLACE_CMD} -e 's|#include <thread>||g' \
 				GlideHQ/TxQuantize.cpp GlideHQ/TxFilter.cpp
 .	endif
 .	if ${PKGNAMESUFFIX} == "-video-glide64"
 		@cd ${WRKSRC}/${PORTNAME}${PKGNAMESUFFIX}/src && \
 			${REINPLACE_CMD} -e 's|__builtin_ia32_loadups|_mm_loadu_ps|g' -e \
 				's|__builtin_ia32_storeups|_mm_storeu_ps|g' \
 					3dmath.cpp
 .	endif
 
 pre-install:
 	@${RM} -f ${PLIST}
 .	if ${PKGNAMESUFFIX} == "-video-rice"
 		@${ECHO_CMD} "%%DATADIR%%/RiceVideoLinux.ini" >> ${PLIST}
 .	endif
 
 .	if ${PKGNAMESUFFIX} == "-video-glide64"
 		@${ECHO_CMD} "%%DATADIR%%/Glide64.ini" >> ${PLIST}
 .	endif
 
 .	if ${PKGNAMESUFFIX} == "-video-glide64mk2"
 		@${ECHO_CMD} "%%DATADIR%%/Glide64mk2.ini" >> ${PLIST}
 .	endif
 
 .	if ${PKGNAMESUFFIX} == "-input-sdl"
 		@${ECHO_CMD} "%%DATADIR%%/InputAutoCfg.ini" >> ${PLIST}
 .	endif
 
 .	if ${PKGNAMESUFFIX} == "-ui-console"
 		@${ECHO_CMD} "man/man6/mupen64plus.6.gz" >> ${PLIST}
 .	endif
 
 .	if ${PKGNAMESUFFIX} != "-ui-console"
 		@${ECHO_CMD} "lib/${PORTNAME}/${PORTNAME}${PKGNAMESUFFIX}.so" >> ${PLIST}
 .	else
 		@${ECHO_CMD} "bin/${PORTNAME}" >> ${PLIST}
 .	endif
 	@${ECHO_CMD} "@dir %%DATADIR%%" >> ${PLIST}
 .else
 post-patch:
 	@cd ${BUILD_WRKSRC} && ${REINPLACE_CMD} -e 's|gcc|${CC}|g' -e \
 		's|g++|${CXX}|g' Makefile
 .endif
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 .if ${PKGNAMESUFFIX} == "-core"
 
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/libmupen64plus.so.2.0.0 \
 		${STAGEDIR}${PREFIX}/lib/libmupen64plus.so.2.0.0
 
 	${INSTALL_DATA} ${WRKSRC}/source/${PORTNAME}${PKGNAMESUFFIX}/data/* \
 		${STAGEDIR}${DATADIR}
 
 	@${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/source/${PORTNAME}${PKGNAMESUFFIX}/src/api/m64p_*.h \
 		${STAGEDIR}${PREFIX}/include/${PORTNAME}
 
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/source/${PORTNAME}${PKGNAMESUFFIX}/RELEASE \
 		${STAGEDIR}${DOCSDIR}/RELEASE
 	${LN} -sf ${PREFIX}/lib/libmupen64plus.so.2.0.0 ${STAGEDIR}${PREFIX}/lib/libmupen64plus.so.2
 .else
 .	if ${PKGNAMESUFFIX} == "-ui-console"
 		${INSTALL_MAN} ${WRKSRC}/source/${PORTNAME}${PKGNAMESUFFIX}/doc/mupen64plus.6 ${STAGEDIR}${PREFIX}/man/man6/
 .	endif
 
 .	if ${PKGNAMESUFFIX} == "-video-rice"
 		${INSTALL_DATA} ${WRKSRC}/source/${PORTNAME}${PKGNAMESUFFIX}/data/RiceVideoLinux.ini ${STAGEDIR}${DATADIR}
 .	endif
 
 .	if ${PKGNAMESUFFIX} == "-video-glide64"
 		${INSTALL_DATA} ${WRKSRC}/${PORTNAME}${PKGNAMESUFFIX}/data/Glide64.ini ${STAGEDIR}${DATADIR}
 .	endif
 
 .	if ${PKGNAMESUFFIX} == "-video-glide64mk2"
 		${INSTALL_DATA} ${WRKSRC}/source/${PORTNAME}${PKGNAMESUFFIX}/data/Glide64mk2.ini ${STAGEDIR}${DATADIR}
 .	endif
 
 .	if ${PKGNAMESUFFIX} == "-input-sdl"
 		${INSTALL_DATA} ${WRKSRC}/source/${PORTNAME}${PKGNAMESUFFIX}/data/InputAutoCfg.ini ${STAGEDIR}${DATADIR}
 .	endif
 
 .	if ${PKGNAMESUFFIX} != "-ui-console"
 		@${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}
 		${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME}${PKGNAMESUFFIX}.so ${STAGEDIR}${PREFIX}/lib/${PORTNAME}
 .	else
 		${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 .	endif
 .endif
Index: head/emulators/mupen64plus-rsp-cxd4/Makefile
===================================================================
--- head/emulators/mupen64plus-rsp-cxd4/Makefile	(revision 389667)
+++ head/emulators/mupen64plus-rsp-cxd4/Makefile	(revision 389668)
@@ -1,26 +1,27 @@
 # Created by: Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
 
 PKGNAMESUFFIX=	-rsp-cxd4
 DISTFILES=	${PORTNAME}${PKGNAMESUFFIX}-src-${PORTVERSION}${EXTRACT_SUFX}:plugin
 
 COMMENT=	Low-level RSP processor plugin for the Mupen64Plus
 
 LIB_DEPENDS=	libmupen64plus.so.2:${PORTSDIR}/emulators/mupen64plus-core
 
 USE_GL=		#
 USE_SDL=	#
 
 MASTERDIR=	${.CURDIR}/../mupen64plus-core
 
 OPTIONS_DEFINE=	#
 
 MAKE_ENV+=	SSE=none	
 CFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/${PORTNAME}
 LDFLAGS+=	-L${LOCALBASE}/lib
 
+DISTINFO_FILE=		${.CURDIR}/distinfo
 EXTRACT_AFTER_ARGS=	#
 BUILD_WRKSRC=		${WRKSRC}/${PORTNAME}${PKGNAMESUFFIX}/projects/unix
 WRKSRC=			${WRKDIR}
 
 .include "${MASTERDIR}/Makefile"
Index: head/emulators/mupen64plus-rsp-z64/Makefile
===================================================================
--- head/emulators/mupen64plus-rsp-z64/Makefile	(revision 389667)
+++ head/emulators/mupen64plus-rsp-z64/Makefile	(revision 389668)
@@ -1,25 +1,26 @@
 # Created by: Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
 
 PKGNAMESUFFIX=	-rsp-z64
 DISTFILES=	${PORTNAME}${PKGNAMESUFFIX}-src-${PORTVERSION}${EXTRACT_SUFX}:plugin
 
 COMMENT=	Low-level RSP processor plugin for the Mupen64Plus
 
 LIB_DEPENDS=	libmupen64plus.so.2:${PORTSDIR}/emulators/mupen64plus-core
 
 USE_GL=		#
 USE_SDL=	#
 
 MASTERDIR=	${.CURDIR}/../mupen64plus-core
 
 OPTIONS_DEFINE=	#
 
 CFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/${PORTNAME}
 LDFLAGS+=	-L${LOCALBASE}/lib
 
+DISTINFO_FILE=		${.CURDIR}/distinfo
 EXTRACT_AFTER_ARGS=	#
 BUILD_WRKSRC=		${WRKSRC}/${PORTNAME}${PKGNAMESUFFIX}/projects/unix
 WRKSRC=			${WRKDIR}
 
 .include "${MASTERDIR}/Makefile"
Index: head/emulators/mupen64plus-video-arachnoid/Makefile
===================================================================
--- head/emulators/mupen64plus-video-arachnoid/Makefile	(revision 389667)
+++ head/emulators/mupen64plus-video-arachnoid/Makefile	(revision 389668)
@@ -1,25 +1,26 @@
 # Created by: Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
 
 PKGNAMESUFFIX=	-video-arachnoid
 DISTFILES=	${PORTNAME}${PKGNAMESUFFIX}-src-${PORTVERSION}${EXTRACT_SUFX}:plugin
 
 COMMENT=	The arachnoid video plugin for Mupen64plus
 
 LIB_DEPENDS=	libmupen64plus.so.2:${PORTSDIR}/emulators/mupen64plus-core
 
 USE_GL=		gl glu
 USE_SDL=	#
 
 MASTERDIR=	${.CURDIR}/../mupen64plus-core
 
 OPTIONS_DEFINE=	#
 
 CFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/${PORTNAME}
 LDFLAGS+=	-L${LOCALBASE}/lib
 
+DISTINFO_FILE=		${.CURDIR}/distinfo
 EXTRACT_AFTER_ARGS=	#
 BUILD_WRKSRC=		${WRKSRC}/${PORTNAME}${PKGNAMESUFFIX}/projects/unix
 WRKSRC=			${WRKDIR}
 
 .include "${MASTERDIR}/Makefile"
Index: head/emulators/mupen64plus-video-glide64/Makefile
===================================================================
--- head/emulators/mupen64plus-video-glide64/Makefile	(revision 389667)
+++ head/emulators/mupen64plus-video-glide64/Makefile	(revision 389668)
@@ -1,26 +1,27 @@
 # Created by: Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
 
 PORTREVISION=	0
 PKGNAMESUFFIX=	-video-glide64
 DISTFILES=	${PORTNAME}${PKGNAMESUFFIX}-src-${PORTVERSION}${EXTRACT_SUFX}:plugin
 
 COMMENT=	Glide64 video plugin for Mupen64Plus
 
 LIB_DEPENDS=	libmupen64plus.so.2:${PORTSDIR}/emulators/mupen64plus-core
 
 USE_GL=		gl
 USE_SDL=	sdl2
 
 MASTERDIR=	${.CURDIR}/../mupen64plus-core
 
 OPTIONS_DEFINE=	#
 
 CFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/${PORTNAME}
 LDFLAGS+=	-L${LOCALBASE}/lib
 
+DISTINFO_FILE=		${.CURDIR}/distinfo
 EXTRACT_AFTER_ARGS=	#
 BUILD_WRKSRC=		${WRKSRC}/${PORTNAME}${PKGNAMESUFFIX}/projects/unix
 WRKSRC=			${WRKDIR}
 
 .include "${MASTERDIR}/Makefile"
Index: head/emulators/mupen64plus-video-z64/Makefile
===================================================================
--- head/emulators/mupen64plus-video-z64/Makefile	(revision 389667)
+++ head/emulators/mupen64plus-video-z64/Makefile	(revision 389668)
@@ -1,26 +1,27 @@
 # Created by: Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
 
 PORTREVISION=	0
 PKGNAMESUFFIX=	-video-z64
 DISTFILES=	${PORTNAME}${PKGNAMESUFFIX}-src-${PORTVERSION}${EXTRACT_SUFX}:plugin
 
 COMMENT=	Low-level RDP plugin for the Mupen64Plus
 
 LIB_DEPENDS=	libmupen64plus.so.2:${PORTSDIR}/emulators/mupen64plus-core
 
 USE_GL=		gl glu glew
 USE_SDL=	sdl2
 
 MASTERDIR=	${.CURDIR}/../mupen64plus-core
 
 OPTIONS_DEFINE=	#
 
 CFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/GL -I${LOCALBASE}/include/${PORTNAME}
 LDFLAGS+=	-L${LOCALBASE}/lib
 
+DISTINFO_FILE=		${.CURDIR}/distinfo
 EXTRACT_AFTER_ARGS=	#
 BUILD_WRKSRC=		${WRKSRC}/${PORTNAME}${PKGNAMESUFFIX}/projects/unix
 WRKSRC=			${WRKDIR}
 
 .include "${MASTERDIR}/Makefile"