Attachment #172601 for bug #211167




# $FreeBSD$

PORTNAME=	RetroArch
PORTVERSION=	1.3.6
DISTVERSIONPREFIX=	v
CATEGORIES=	games


USES=		compiler:c++11-lib gmake pkgconfig
USE_XORG=	x11 xcb xext xinerama xv xxf86vm

MAN1PAGES=	retroarch-cg2glsl.6 retroarch.6

post-patch:
	@${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|' \

	if [ -n "${STRIP}" ]; then \
	        ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/retroarch; \
	fi
	${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

Lines 1-3 Link Here

(-)games/retroarch/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1467661675	1	TIMESTAMP = 1468744279
2	SHA256 (libretro-RetroArch-v1.3.4_GH0.tar.gz) = a5733a0f4ad828afd00fa2a059deb6538939d46a2aefc4a566c30300a40efb1c	2	SHA256 (libretro-RetroArch-v1.3.6_GH0.tar.gz) = bed4201e49b2e97809e97df07d08c752879af0274feec93965a07cf6140759f5
3	SIZE (libretro-RetroArch-v1.3.4_GH0.tar.gz) = 11652146	3	SIZE (libretro-RetroArch-v1.3.6_GH0.tar.gz) = 11967473

Lines 1-4 Link Here

(-)games/retroarch/files/patch-libretro-common_include_streams_interface__stream.h (-1 / +1 lines)
1	--- libretro-common/include/streams/interface_stream.h.orig 2016-05-02 20:17:12 UTC	1	--- libretro-common/include/streams/interface_stream.h.orig 2016-07-15 20:24:15 UTC
2	+++ libretro-common/include/streams/interface_stream.h	2	+++ libretro-common/include/streams/interface_stream.h
3	@@ -29,6 +29,8 @@	3	@@ -29,6 +29,8 @@
4	#include <retro_common_api.h>	4	#include <retro_common_api.h>

Lines 1-4 Link Here

(-)games/retroarch/files/patch-libretro-common_net_net__ifinfo.c (-1 / +1 lines)
1	--- libretro-common/net/net_ifinfo.c.orig 2016-07-04 20:02:01 UTC	1	--- libretro-common/net/net_ifinfo.c.orig 2016-07-15 20:24:15 UTC
2	+++ libretro-common/net/net_ifinfo.c	2	+++ libretro-common/net/net_ifinfo.c
3	@@ -44,6 +44,8 @@	3	@@ -44,6 +44,8 @@
4		4

Lines 1-6 Link Here

(-)games/retroarch/files/patch-libretro-common_rthreads_rthreads.c (-2 / +2 lines)
1	--- libretro-common/rthreads/rthreads.c.orig 2016-05-02 20:17:12 UTC	1	--- libretro-common/rthreads/rthreads.c.orig 2016-07-15 20:24:15 UTC
2	+++ libretro-common/rthreads/rthreads.c	2	+++ libretro-common/rthreads/rthreads.c
3	@@ -53,6 +53,8 @@	3	@@ -57,6 +57,8 @@
4	#include <mach/mach.h>	4	#include <mach/mach.h>
5	#endif	5	#endif
6		6




--- qb/config.libs.sh.orig	2016-07-15 20:24:15 UTC
+++ qb/config.libs.sh
@@ -31,6 +31,9 @@ fi
 

+
 [ "$OS" = 'Darwin' ] && HAVE_X11=no # X11 breaks on recent OSXes even if present.
 
 [ -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
-   add_define_make MAN_DIR "$MAN_DIR"
    add_define_make MAN_DIR "$MAN_DIR"
-else
-   add_define_make MAN_DIR "${PREFIX}/share/man"
-fi
+add_define_make MAN_DIR "${PREFIX}/man"
+   add_define_make MAN_DIR "${PREFIX}/man/man1"
+#fi
 
 if [ "$OS" = 'Win32' ]; then
    HAVE_THREADS=yes
@@ -189,7 +188,7 @@ fi
 check_pkgconf ALSA alsa
 check_header OSS sys/soundcard.h
 check_header OSS_BSD soundcard.h

Lines 1-12 Link Here

(-)games/retroarch/files/patch-qb_qb.params.sh (-11 / +13 lines)
1	--- qb/qb.params.sh.orig 2016-05-02 20:17:12 UTC	1	--- qb/qb.params.sh.orig 2016-07-15 20:24:15 UTC
2	+++ qb/qb.params.sh	2	+++ qb/qb.params.sh
3	@@ -63,6 +63,9 @@ parse_input() # Parse stuff :V	3	@@ -79,7 +79,10 @@ parse_input() # Parse stuff :V
4	while [ "$1" ]; do	4	opt_exists "${arg%%=*}" "$1"
5	case "$1" in	5	eval "$opt=\"$val\""
6	--prefix=*) PREFIX=${1##--prefix=};;	6	;;
7	+ --build=*) ;;	7	- -h\|--help) print_help; exit 0;;
8	+ --x-includes=*) ;;	8	+ --x-*)
9	+ --x-libraries=*) ;;	9	+ ;;
10	--global-config-dir=*) GLOBAL_CONFIG_DIR=${1##--global-config-dir=};;	10	+ --build*)
11	--host=*) CROSS_COMPILE=${1##--host=}-;;	11	+ ;;
12	--enable-*)	12	*) echo "Unknown option $1"; exit 1;;
		13	esac
		14	shift

Lines 1-7 Link Here

(-)games/retroarch/pkg-plist (-2 / +2 lines)
1	bin/retroarch	1	bin/retroarch
2	bin/retroarch-cg2glsl	2	bin/retroarch-cg2glsl
3	etc/retroarch.cfg	3	etc/retroarch.cfg
4	man/man1/retroarch-cg2glsl.1.gz	4	man/man6/retroarch-cg2glsl.6.gz
5	man/man1/retroarch.1.gz	5	man/man6/retroarch.6.gz
6	share/pixmaps/retroarch.svg	6	share/pixmaps/retroarch.svg
7	share/applications/retroarch.desktop	7	share/applications/retroarch.desktop

Return to bug 211167

Lines 2-8 Link Here

(-)games/retroarch/Makefile (-4 / +4 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= RetroArch	4	PORTNAME= RetroArch
5	PORTVERSION= 1.3.4	5	PORTVERSION= 1.3.6
6	DISTVERSIONPREFIX= v	6	DISTVERSIONPREFIX= v
7	CATEGORIES= games	7	CATEGORIES= games
8		8
Lines 64-70 Link Here
64	USES= compiler:c++11-lib gmake pkgconfig	64	USES= compiler:c++11-lib gmake pkgconfig
65	USE_XORG= x11 xcb xext xinerama xv xxf86vm	65	USE_XORG= x11 xcb xext xinerama xv xxf86vm
66		66
67	MAN1PAGES= retroarch-cg2glsl.1 retroarch.1	67	MAN1PAGES= retroarch-cg2glsl.6 retroarch.6
68		68
69	post-patch:	69	post-patch:
70	@${REINPLACE_CMD} -e 's\|<malloc.h>\|<stdlib.h>\|' \	70	@${REINPLACE_CMD} -e 's\|<malloc.h>\|<stdlib.h>\|' \
Lines 81-88 Link Here
81	if [ -n "${STRIP}" ]; then \	81	if [ -n "${STRIP}" ]; then \
82	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/retroarch; \	82	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/retroarch; \
83	fi	83	fi
84	${GZIP_CMD} ${STAGEDIR}${PREFIX}/man/man1/retroarch.1	84	${GZIP_CMD} ${STAGEDIR}${PREFIX}/man/man6/retroarch.6
85	${GZIP_CMD} ${STAGEDIR}${PREFIX}/man/man1/retroarch-cg2glsl.1	85	${GZIP_CMD} ${STAGEDIR}${PREFIX}/man/man6/retroarch-cg2glsl.6
86	${RM} -rf ${STAGEDIR}${PREFIX}/share/man	86	${RM} -rf ${STAGEDIR}${PREFIX}/share/man
87	@${REINPLACE_CMD} -e 's\|# libretro_directory =\|libretro_directory = "${PREFIX}/libexec/libretro"\|' \	87	@${REINPLACE_CMD} -e 's\|# libretro_directory =\|libretro_directory = "${PREFIX}/libexec/libretro"\|' \
88	${STAGEDIR}${PREFIX}/etc/retroarch.cfg	88	${STAGEDIR}${PREFIX}/etc/retroarch.cfg

Lines 1-4 Link Here

(-)games/retroarch/files/patch-qb_config.libs.sh (-10 / +7 lines)
1	--- qb/config.libs.sh.orig 2016-05-02 20:17:12 UTC	1	--- qb/config.libs.sh.orig 2016-07-15 20:24:15 UTC
2	+++ qb/config.libs.sh	2	+++ qb/config.libs.sh
3	@@ -31,6 +31,9 @@ fi	3	@@ -31,6 +31,9 @@ fi
4		4
Lines 9-32 Link Here
9	+	9	+
10	[ "$OS" = 'Darwin' ] && HAVE_X11=no # X11 breaks on recent OSXes even if present.	10	[ "$OS" = 'Darwin' ] && HAVE_X11=no # X11 breaks on recent OSXes even if present.
11		11
12	[ -d /opt/vc/lib ] && add_library_dirs /opt/vc/lib	12	[ -d /opt/vc/lib ] && add_library_dirs /opt/vc/lib && add_library_dirs /opt/vc/lib/GL
13	@@ -130,11 +133,11 @@ fi	13	@@ -130,11 +133,7 @@ fi
14	add_define_make libretro "$LIBRETRO"	14	add_define_make libretro "$LIBRETRO"
15	}	15	}
16		16
17	-if [ "$MAN_DIR" ]; then	17	-if [ "$MAN_DIR" ]; then
18	+#if [ "$MAN_DIR" ]; then	18	- add_define_make MAN_DIR "$MAN_DIR"
19	add_define_make MAN_DIR "$MAN_DIR"
20	-else	19	-else
21	- add_define_make MAN_DIR "${PREFIX}/share/man/man1"	20	- add_define_make MAN_DIR "${PREFIX}/share/man"
22	-fi	21	-fi
23	+#else	22	+add_define_make MAN_DIR "${PREFIX}/man"
24	+ add_define_make MAN_DIR "${PREFIX}/man/man1"
25	+#fi
26		23
27	if [ "$OS" = 'Win32' ]; then	24	if [ "$OS" = 'Win32' ]; then
28	HAVE_THREADS=yes	25	HAVE_THREADS=yes
29	@@ -189,7 +192,7 @@ fi	26	@@ -189,7 +188,7 @@ fi
30	check_pkgconf ALSA alsa	27	check_pkgconf ALSA alsa
31	check_header OSS sys/soundcard.h	28	check_header OSS sys/soundcard.h
32	check_header OSS_BSD soundcard.h	29	check_header OSS_BSD soundcard.h