Index: head/emulators/mupen64plus-core/Makefile.common
===================================================================
--- head/emulators/mupen64plus-core/Makefile.common	(revision 389666)
+++ head/emulators/mupen64plus-core/Makefile.common	(revision 389667)
@@ -1,123 +1,124 @@
 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
+			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-core/files/patch-source_mupen64plus-core_src_main_savestates.c
===================================================================
--- head/emulators/mupen64plus-core/files/patch-source_mupen64plus-core_src_main_savestates.c	(nonexistent)
+++ head/emulators/mupen64plus-core/files/patch-source_mupen64plus-core_src_main_savestates.c	(revision 389667)
@@ -0,0 +1,13 @@
+--- source/mupen64plus-core/src/main/savestates.c	2015-06-12 17:56:37.000000000 -0500
++++ source/mupen64plus-core/src/main/savestates.c	2015-06-12 17:56:55.000000000 -0500
+@@ -57,8 +57,8 @@
+ #include "workqueue.h"
+ 
+ #ifdef LIBMINIZIP
+-    #include <unzip.h>
+-    #include <zip.h>
++    #include <minizip/unzip.h>
++    #include <minizip/zip.h>
+ #else
+     #include "main/zip/unzip.h"
+     #include "main/zip/zip.h"

Property changes on: head/emulators/mupen64plus-core/files/patch-source_mupen64plus-core_src_main_savestates.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: head/emulators/mupen64plus-rsp-z64/distinfo
===================================================================
--- head/emulators/mupen64plus-rsp-z64/distinfo	(nonexistent)
+++ head/emulators/mupen64plus-rsp-z64/distinfo	(revision 389667)
@@ -0,0 +1,2 @@
+SHA256 (mupen64plus/mupen64plus-rsp-z64-src-2.5.tar.gz) = e671c63556160f00554b608ab5f24cd7a1c15eef4c4de4c94c8bde4d2baa5763
+SIZE (mupen64plus/mupen64plus-rsp-z64-src-2.5.tar.gz) = 45594

Property changes on: head/emulators/mupen64plus-rsp-z64/distinfo
___________________________________________________________________
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: head/emulators/mupen64plus-video-arachnoid/distinfo
===================================================================
--- head/emulators/mupen64plus-video-arachnoid/distinfo	(nonexistent)
+++ head/emulators/mupen64plus-video-arachnoid/distinfo	(revision 389667)
@@ -0,0 +1,2 @@
+SHA256 (mupen64plus/mupen64plus-video-arachnoid-src-2.5.tar.gz) = 9c1e9c6373d4a8f503fdf3a114f45c0c81f2da31955d90fe7bc1c2464fb92852
+SIZE (mupen64plus/mupen64plus-video-arachnoid-src-2.5.tar.gz) = 128880

Property changes on: head/emulators/mupen64plus-video-arachnoid/distinfo
___________________________________________________________________
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: head/emulators/mupen64plus-video-glide64/distinfo
===================================================================
--- head/emulators/mupen64plus-video-glide64/distinfo	(nonexistent)
+++ head/emulators/mupen64plus-video-glide64/distinfo	(revision 389667)
@@ -0,0 +1,2 @@
+SHA256 (mupen64plus/mupen64plus-video-glide64-src-2.5.tar.gz) = c5fc21df4d1bd9380e151bec694e649fcb0b0ef257c42da6a005d97d4b66a3de
+SIZE (mupen64plus/mupen64plus-video-glide64-src-2.5.tar.gz) = 334145

Property changes on: head/emulators/mupen64plus-video-glide64/distinfo
___________________________________________________________________
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: head/emulators/mupen64plus-video-z64/distinfo
===================================================================
--- head/emulators/mupen64plus-video-z64/distinfo	(nonexistent)
+++ head/emulators/mupen64plus-video-z64/distinfo	(revision 389667)
@@ -0,0 +1,2 @@
+SHA256 (mupen64plus/mupen64plus-video-z64-src-2.5.tar.gz) = c25fdfad9c4707373dd7f47c118b2b6bdc2872c73b679cc5aba3e6051e88e947
+SIZE (mupen64plus/mupen64plus-video-z64-src-2.5.tar.gz) = 66797

Property changes on: head/emulators/mupen64plus-video-z64/distinfo
___________________________________________________________________
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