Index: games/retroarch/Makefile
===================================================================
--- games/retroarch/Makefile	(revision 418746)
+++ games/retroarch/Makefile	(working copy)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	RetroArch
-PORTVERSION=	1.3.4
+PORTVERSION=	1.3.6
 DISTVERSIONPREFIX=	v
 CATEGORIES=	games
 
@@ -64,8 +64,6 @@
 USES=		compiler:c++11-lib gmake pkgconfig
 USE_XORG=	x11 xcb xext xinerama xv xxf86vm
 
-MAN1PAGES=	retroarch-cg2glsl.1 retroarch.1
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|' \
 		${WRKSRC}/camera/drivers/video4linux2.c \
@@ -74,7 +72,7 @@
 		${WRKSRC}/memory/wii/mem2_manager.c
 	@${REINPLACE_CMD} -e 's|<asm/types.h>|<sys/types.h>|' \
 		${WRKSRC}/camera/drivers/video4linux2.c
-	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
+	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
 		${WRKSRC}/qb/config.libs.sh
 
 post-install:
@@ -81,8 +79,8 @@
 	if [ -n "${STRIP}" ]; then \
 	        ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/retroarch; \
 	fi
-	${GZIP_CMD} ${STAGEDIR}${PREFIX}/man/man1/retroarch.1
-	${GZIP_CMD} ${STAGEDIR}${PREFIX}/man/man1/retroarch-cg2glsl.1
+	${GZIP_CMD} ${STAGEDIR}${PREFIX}/man/man6/retroarch.6
+	${GZIP_CMD} ${STAGEDIR}${PREFIX}/man/man6/retroarch-cg2glsl.6
 	${RM} -rf ${STAGEDIR}${PREFIX}/share/man
 	@${REINPLACE_CMD} -e 's|# libretro_directory =|libretro_directory = "${PREFIX}/libexec/libretro"|' \
 		${STAGEDIR}${PREFIX}/etc/retroarch.cfg
Index: games/retroarch/distinfo
===================================================================
--- games/retroarch/distinfo	(revision 418746)
+++ games/retroarch/distinfo	(working copy)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1467661675
-SHA256 (libretro-RetroArch-v1.3.4_GH0.tar.gz) = a5733a0f4ad828afd00fa2a059deb6538939d46a2aefc4a566c30300a40efb1c
-SIZE (libretro-RetroArch-v1.3.4_GH0.tar.gz) = 11652146
+TIMESTAMP = 1468744279
+SHA256 (libretro-RetroArch-v1.3.6_GH0.tar.gz) = bed4201e49b2e97809e97df07d08c752879af0274feec93965a07cf6140759f5
+SIZE (libretro-RetroArch-v1.3.6_GH0.tar.gz) = 11967473
Index: games/retroarch/files/patch-libretro-common_include_streams_interface__stream.h
===================================================================
--- games/retroarch/files/patch-libretro-common_include_streams_interface__stream.h	(revision 418746)
+++ games/retroarch/files/patch-libretro-common_include_streams_interface__stream.h	(working copy)
@@ -1,4 +1,4 @@
---- libretro-common/include/streams/interface_stream.h.orig	2016-05-02 20:17:12 UTC
+--- libretro-common/include/streams/interface_stream.h.orig	2016-07-15 20:24:15 UTC
 +++ libretro-common/include/streams/interface_stream.h
 @@ -29,6 +29,8 @@
  #include <retro_common_api.h>
Index: games/retroarch/files/patch-libretro-common_net_net__ifinfo.c
===================================================================
--- games/retroarch/files/patch-libretro-common_net_net__ifinfo.c	(revision 418746)
+++ games/retroarch/files/patch-libretro-common_net_net__ifinfo.c	(working copy)
@@ -1,4 +1,4 @@
---- libretro-common/net/net_ifinfo.c.orig	2016-07-04 20:02:01 UTC
+--- libretro-common/net/net_ifinfo.c.orig	2016-07-15 20:24:15 UTC
 +++ libretro-common/net/net_ifinfo.c
 @@ -44,6 +44,8 @@
  
Index: games/retroarch/files/patch-libretro-common_rthreads_rthreads.c
===================================================================
--- games/retroarch/files/patch-libretro-common_rthreads_rthreads.c	(revision 418746)
+++ games/retroarch/files/patch-libretro-common_rthreads_rthreads.c	(working copy)
@@ -1,6 +1,6 @@
---- libretro-common/rthreads/rthreads.c.orig	2016-05-02 20:17:12 UTC
+--- libretro-common/rthreads/rthreads.c.orig	2016-07-15 20:24:15 UTC
 +++ libretro-common/rthreads/rthreads.c
-@@ -53,6 +53,8 @@
+@@ -57,6 +57,8 @@
  #include <mach/mach.h>
  #endif
  
Index: games/retroarch/files/patch-qb_config.libs.sh
===================================================================
--- games/retroarch/files/patch-qb_config.libs.sh	(revision 418746)
+++ games/retroarch/files/patch-qb_config.libs.sh	(working copy)
@@ -1,4 +1,4 @@
---- qb/config.libs.sh.orig	2016-05-02 20:17:12 UTC
+--- qb/config.libs.sh.orig	2016-07-15 20:24:15 UTC
 +++ qb/config.libs.sh
 @@ -31,6 +31,9 @@ fi
  
@@ -9,24 +9,21 @@
 +
  [ "$OS" = 'Darwin' ] && HAVE_X11=no # X11 breaks on recent OSXes even if present.
  
- [ -d /opt/vc/lib ] && add_library_dirs /opt/vc/lib
-@@ -130,11 +133,11 @@ fi
+ [ -d /opt/vc/lib ] && add_library_dirs /opt/vc/lib && add_library_dirs /opt/vc/lib/GL
+@@ -130,11 +133,7 @@ fi
     add_define_make libretro "$LIBRETRO"
  }
  
 -if [ "$MAN_DIR" ]; then
-+#if [ "$MAN_DIR" ]; then
-    add_define_make MAN_DIR "$MAN_DIR"
+-   add_define_make MAN_DIR "$MAN_DIR"
 -else
--   add_define_make MAN_DIR "${PREFIX}/share/man/man1"
+-   add_define_make MAN_DIR "${PREFIX}/share/man"
 -fi
-+#else
-+   add_define_make MAN_DIR "${PREFIX}/man/man1"
-+#fi
++add_define_make MAN_DIR "${PREFIX}/man"
  
  if [ "$OS" = 'Win32' ]; then
     HAVE_THREADS=yes
-@@ -189,7 +192,7 @@ fi
+@@ -189,7 +188,7 @@ fi
  check_pkgconf ALSA alsa
  check_header OSS sys/soundcard.h
  check_header OSS_BSD soundcard.h
Index: games/retroarch/files/patch-qb_qb.params.sh
===================================================================
--- games/retroarch/files/patch-qb_qb.params.sh	(revision 418746)
+++ games/retroarch/files/patch-qb_qb.params.sh	(working copy)
@@ -1,12 +1,14 @@
---- qb/qb.params.sh.orig	2016-05-02 20:17:12 UTC
+--- qb/qb.params.sh.orig	2016-07-15 20:24:15 UTC
 +++ qb/qb.params.sh
-@@ -63,6 +63,9 @@ parse_input() # Parse stuff :V
- 	while [ "$1" ]; do
- 		case "$1" in
- 			--prefix=*) PREFIX=${1##--prefix=};;
-+			--build=*) ;;
-+			--x-includes=*) ;;
-+			--x-libraries=*) ;;
- 			--global-config-dir=*) GLOBAL_CONFIG_DIR=${1##--global-config-dir=};;
- 			--host=*) CROSS_COMPILE=${1##--host=}-;;
- 			--enable-*)
+@@ -79,7 +79,10 @@ parse_input() # Parse stuff :V
+ 				opt_exists "${arg%%=*}" "$1"
+ 				eval "$opt=\"$val\""
+ 			;;
+-			-h|--help) print_help; exit 0;;
++			--x-*)
++			;;
++			--build*)
++			;;
+ 			*) echo "Unknown option $1"; exit 1;;
+ 		esac
+ 		shift
Index: games/retroarch/pkg-plist
===================================================================
--- games/retroarch/pkg-plist	(revision 418746)
+++ games/retroarch/pkg-plist	(working copy)
@@ -1,7 +1,7 @@
 bin/retroarch
 bin/retroarch-cg2glsl
 etc/retroarch.cfg
-man/man1/retroarch-cg2glsl.1.gz
-man/man1/retroarch.1.gz
+man/man6/retroarch-cg2glsl.6.gz
+man/man6/retroarch.6.gz
 share/pixmaps/retroarch.svg
 share/applications/retroarch.desktop