Attachment #206686 for bug #239960





PORTNAME=	cannonball
DISTVERSION=	g20171201
PORTREVISION=	1
CATEGORIES=	emulators games

MAINTAINER=	santhosh.raju@gmail.com

USES=		cmake:insource pkgconfig sdl
USE_SDL=	sdl

CMAKE_ARGS+=	${WRKSRC}/cmake
CMAKE_ARGS+=	-DTARGET=bsd
CMAKE_ARGS+=	-DBSD_PREFIX_PATH=${LOCALBASE}

USE_GITHUB=	yes
GH_ACCOUNT=	djyt

BUILD_WRKSRC=		${WRKSRC}/cmake
CONFIGURE_WRKSRC=	${WRKSRC}/cmake

SUB_FILES=	${PORTNAME}.sh ${PORTNAME}.6

do-install:
	${MKDIR} ${STAGEDIR}${DATADIR}/res

	${INSTALL_DATA} ${WRKSRC}/cmake/res/tilemap.bin ${STAGEDIR}${DATADIR}/res/tilemap.bin
	${INSTALL_DATA} ${WRKSRC}/cmake/res/tilepatch.bin ${STAGEDIR}${DATADIR}/res/tilepatch.bin
	${INSTALL_DATA} ${WRKSRC}/cmake/config.xml ${STAGEDIR}${DATADIR}/conf/config.xml
	${INSTALL_MAN} ${WRKDIR}/cannonball.6 ${STAGEDIR}${MAN1PREFIX}/man/man6
	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
	${INSTALL_PROGRAM} ${WRKSRC}/cmake/cannonball ${STAGEDIR}${PREFIX}/libexec


Lines 1-3 Link Here

(-)b/emulators/cannonball/distinfo (-1 / +1 lines)
1	TIMESTAMP = 1560212844	1	TIMESTAMP = 1566104855
2	SHA256 (djyt-cannonball-g20171201-0c0814d_GH0.tar.gz) = 9f79a26df838ad64b96137ddf5e843f3e76e639c2112f5bfaae39296698019d5	2	SHA256 (djyt-cannonball-g20171201-0c0814d_GH0.tar.gz) = 9f79a26df838ad64b96137ddf5e843f3e76e639c2112f5bfaae39296698019d5
3	SIZE (djyt-cannonball-g20171201-0c0814d_GH0.tar.gz) = 277297	3	SIZE (djyt-cannonball-g20171201-0c0814d_GH0.tar.gz) = 277297




.\" Manpage for cannonball
.TH "cannonball" "6" "August 2019" "CannonBall 0.3" "CannonBall - Configuration Help"
.SH NAME
cannonball \- An Enhanced OutRun Engine
.SH SYNOPSIS
cannonball
.SH DESCRIPTION
CannonBall is a program which allows you to play an enhanced version
of Yu Suzuki's seminal arcade racer, OutRun, on a variety of systems.
.SH CONFIGURATION
In order for CannonBall to work you need to provide a copy of the
OutRun revision B romset to the roms subdirectory. Rename the files if
necessary.

The roms subdirectory can be found at $XDG_DATA_HOME/cannonball/roms
which defaults to $HOME/.local/share/cannonball/roms

Configuration can be found at $XDG_DATA_HOME/cannonball/config.xml
which defaults to $HOME/.local/share/cannonball/config.xml

NOTE: The directories will be created on the first run of Cannonball
if they do not exist.
.SH OPTIONS
cannonball does not take any options.
.SH SEE ALSO
CannonBall Wiki <https://github.com/djyt/cannonball/wiki>

CannonBall online manual
<https://github.com/djyt/cannonball/wiki/Cannonball-Manual>
.SH BUGS
For known issues see <https://github.com/djyt/cannonball/issues>.
.SH COPYRIGHT
Copyright (c) 2012-2014 Chris White.

Users of CannonBall are expected to own licensed copies of the ROM
files that is intended to be used with this program. These ROMs may be
subject to their copyright laws under their jurisdiction. Make sure
you can legally transfer the ROMs to your system before using them
with this program.

OutRun ROMs may be subject to copyright laws. 

OutRun is a trademark of the SEGA Corporation. This project is not
affiliated with SEGA in any way.
.SH AUTHOR
Chris White <pointblnk@hotmail.com> - Project creator.

Arun Horne - Cross platform work.

Santhosh Raju <fox@NetBSD.org> - Man page.




Adds support for BSD based builds.

1. PREFIX path is configured via BSD_PREFIX_PATH for BSDs.
in ${LOCALBASE}/include

2. Boost include directory is set from bsd.cmake for BSDs.

--- cmake/CMakeLists.txt.orig   2019-08-18 00:42:17.620253273 +0000
+++ cmake/CMakeLists.txt
@@ -20,12 +20,22 @@ if(TARGET)
         message("CMake files for ${TARGET} not found, using ${DCMAKE}")
         include(${DCMAKE})
     endif()
+    if(${TARGET} STREQUAL "bsd")
+        if(NOT DEFINED BSD_PREFIX_PATH)
+            message(FATAL_ERROR "Warning: BSD_PREFIX_PATH Variable Not Defined!")
+        else()
+            message("Setting ${BSD_PREFIX_PATH} as the prefix path.")
+        endif()
+    endif()
 else()
     message("TARGET not passed, using ${DCMAKE}")
     include(${DCMAKE})
 endif(TARGET)

-set(BOOST_INCLUDEDIR ${lib_base}/boost_1_54_0)
+if(NOT(${TARGET} STREQUAL "bsd"))
+    set(BOOST_INCLUDEDIR ${lib_base}/boost_1_54_0)
+endif()
+
 find_package(Boost REQUIRED)

 # Include





Create a cmake file for BSD based builds.

--- cmake/bsd.cmake.orig        2019-08-18 00:41:57.311525123 +0000
+++ cmake/bsd.cmake
@@ -0,0 +1,23 @@
+# Default CMake Setup. Used for BSD Builds.
+
+set(lib_base ${BSD_PREFIX_PATH}/include)
+
+set(BOOST_INCLUDEDIR ${lib_base})
+
+set(lib_base /usr/local/include)
+set(sdl_root ${lib_base}/SDL)
+
+include_directories("${sdl_root}")

+
+# Linking
+link_directories(
+    "${BSD_PREFIX_PATH}/lib"
+)
+
+# Location for Cannonball to create save files
+# Used to auto-generate setup.hpp with various file paths
+set(xml_directory ./)
+set(sdl_flags "SDL_DOUBLEBUF | SDL_SWSURFACE")


Lines 1-5 Link Here

(-)b/emulators/cannonball/pkg-plist (+1 lines)
1	bin/cannonball	1	bin/cannonball
2	libexec/cannonball	2	libexec/cannonball
		3	man/man6/cannonball.6.gz
3	%%DATADIR%%/conf/config.xml	4	%%DATADIR%%/conf/config.xml
4	%%DATADIR%%/res/tilemap.bin	5	%%DATADIR%%/res/tilemap.bin
5	%%DATADIR%%/res/tilepatch.bin	6	%%DATADIR%%/res/tilepatch.bin

Return to bug 239960

Lines 2-7 Link Here

(-)b/emulators/cannonball/Makefile (-3 / +6 lines)
2		2
3	PORTNAME= cannonball	3	PORTNAME= cannonball
4	DISTVERSION= g20171201	4	DISTVERSION= g20171201
		5	PORTREVISION= 1
5	CATEGORIES= emulators games	6	CATEGORIES= emulators games
6		7
7	MAINTAINER= santhosh.raju@gmail.com	8	MAINTAINER= santhosh.raju@gmail.com
Lines 17-24 LIB_DEPENDS= libboost_program_options.so:devel/boost-libs Link Here
17	USES= cmake:insource pkgconfig sdl	18	USES= cmake:insource pkgconfig sdl
18	USE_SDL= sdl	19	USE_SDL= sdl
19		20
20	CMAKE_ARGS= ${WRKSRC}/cmake \	21	CMAKE_ARGS+= ${WRKSRC}/cmake
21	-DTARGET=bsd	22	CMAKE_ARGS+= -DTARGET=bsd
		23	CMAKE_ARGS+= -DBSD_PREFIX_PATH=${LOCALBASE}
22		24
23	USE_GITHUB= yes	25	USE_GITHUB= yes
24	GH_ACCOUNT= djyt	26	GH_ACCOUNT= djyt
Lines 27-33 GH_TAGNAME= 0c0814d Link Here
27	BUILD_WRKSRC= ${WRKSRC}/cmake	29	BUILD_WRKSRC= ${WRKSRC}/cmake
28	CONFIGURE_WRKSRC= ${WRKSRC}/cmake	30	CONFIGURE_WRKSRC= ${WRKSRC}/cmake
29		31
30	SUB_FILES= ${PORTNAME}.sh	32	SUB_FILES= ${PORTNAME}.sh ${PORTNAME}.6
31		33
32	do-install:	34	do-install:
33	${MKDIR} ${STAGEDIR}${DATADIR}/res	35	${MKDIR} ${STAGEDIR}${DATADIR}/res
Lines 35-40 do-install: Link Here
35	${INSTALL_DATA} ${WRKSRC}/cmake/res/tilemap.bin ${STAGEDIR}${DATADIR}/res/tilemap.bin	37	${INSTALL_DATA} ${WRKSRC}/cmake/res/tilemap.bin ${STAGEDIR}${DATADIR}/res/tilemap.bin
36	${INSTALL_DATA} ${WRKSRC}/cmake/res/tilepatch.bin ${STAGEDIR}${DATADIR}/res/tilepatch.bin	38	${INSTALL_DATA} ${WRKSRC}/cmake/res/tilepatch.bin ${STAGEDIR}${DATADIR}/res/tilepatch.bin
37	${INSTALL_DATA} ${WRKSRC}/cmake/config.xml ${STAGEDIR}${DATADIR}/conf/config.xml	39	${INSTALL_DATA} ${WRKSRC}/cmake/config.xml ${STAGEDIR}${DATADIR}/conf/config.xml
		40	${INSTALL_MAN} ${WRKDIR}/cannonball.6 ${STAGEDIR}${MAN1PREFIX}/man/man6
38	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME}	41	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
39	${INSTALL_PROGRAM} ${WRKSRC}/cmake/cannonball ${STAGEDIR}${PREFIX}/libexec	42	${INSTALL_PROGRAM} ${WRKSRC}/cmake/cannonball ${STAGEDIR}${PREFIX}/libexec
40		43

Added Link Here

(-)b/emulators/cannonball/files/cannonball.6.in (+50 lines)
1	.\" Manpage for cannonball
2	.TH "cannonball" "6" "August 2019" "CannonBall 0.3" "CannonBall - Configuration Help"
3	.SH NAME
4	cannonball \- An Enhanced OutRun Engine
5	.SH SYNOPSIS
6	cannonball
7	.SH DESCRIPTION
8	CannonBall is a program which allows you to play an enhanced version
9	of Yu Suzuki's seminal arcade racer, OutRun, on a variety of systems.
10	.SH CONFIGURATION
11	In order for CannonBall to work you need to provide a copy of the
12	OutRun revision B romset to the roms subdirectory. Rename the files if
13	necessary.
14
15	The roms subdirectory can be found at $XDG_DATA_HOME/cannonball/roms
16	which defaults to $HOME/.local/share/cannonball/roms
17
18	Configuration can be found at $XDG_DATA_HOME/cannonball/config.xml
19	which defaults to $HOME/.local/share/cannonball/config.xml
20
21	NOTE: The directories will be created on the first run of Cannonball
22	if they do not exist.
23	.SH OPTIONS
24	cannonball does not take any options.
25	.SH SEE ALSO
26	CannonBall Wiki <https://github.com/djyt/cannonball/wiki>
27
28	CannonBall online manual
29	<https://github.com/djyt/cannonball/wiki/Cannonball-Manual>
30	.SH BUGS
31	For known issues see <https://github.com/djyt/cannonball/issues>.
32	.SH COPYRIGHT
33	Copyright (c) 2012-2014 Chris White.
34
35	Users of CannonBall are expected to own licensed copies of the ROM
36	files that is intended to be used with this program. These ROMs may be
37	subject to their copyright laws under their jurisdiction. Make sure
38	you can legally transfer the ROMs to your system before using them
39	with this program.
40
41	OutRun ROMs may be subject to copyright laws.
42
43	OutRun is a trademark of the SEGA Corporation. This project is not
44	affiliated with SEGA in any way.
45	.SH AUTHOR
46	Chris White <pointblnk@hotmail.com> - Project creator.
47
48	Arun Horne - Cross platform work.
49
50	Santhosh Raju <fox@NetBSD.org> - Man page.

Lines 1-16 Link Here

(-)b/emulators/cannonball/files/patch-cmake_CMakeLists.txt (-6 / +23 lines)
1	Remove the boost directory reference.	1	Adds support for BSD based builds.
2		2
3	Not required in ports, since boost libraries are directly installed	3	1. PREFIX path is configured via BSD_PREFIX_PATH for BSDs.
4	in ${LOCALBASE}/include
5		4
6	--- cmake/CMakeLists.txt.orig 2019-06-10 03:25:18 UTC	5	2. Boost include directory is set from bsd.cmake for BSDs.
		6
		7	--- cmake/CMakeLists.txt.orig 2019-08-18 00:42:17.620253273 +0000
7	+++ cmake/CMakeLists.txt	8	+++ cmake/CMakeLists.txt
8	@@ -25,7 +25,7 @@ else()	9	@@ -20,12 +20,22 @@ if(TARGET)
		10	message("CMake files for ${TARGET} not found, using ${DCMAKE}")
		11	include(${DCMAKE})
		12	endif()
		13	+ if(${TARGET} STREQUAL "bsd")
		14	+ if(NOT DEFINED BSD_PREFIX_PATH)
		15	+ message(FATAL_ERROR "Warning: BSD_PREFIX_PATH Variable Not Defined!")
		16	+ else()
		17	+ message("Setting ${BSD_PREFIX_PATH} as the prefix path.")
		18	+ endif()
		19	+ endif()
		20	else()
		21	message("TARGET not passed, using ${DCMAKE}")
9	include(${DCMAKE})	22	include(${DCMAKE})
10	endif(TARGET)	23	endif(TARGET)
11		24
12	-set(BOOST_INCLUDEDIR ${lib_base}/boost_1_54_0)	25	-set(BOOST_INCLUDEDIR ${lib_base}/boost_1_54_0)
13	+set(BOOST_INCLUDEDIR ${lib_base})	26	+if(NOT(${TARGET} STREQUAL "bsd"))
		27	+ set(BOOST_INCLUDEDIR ${lib_base}/boost_1_54_0)
		28	+endif()
		29	+
14	find_package(Boost REQUIRED)	30	find_package(Boost REQUIRED)
15		31
16	# Include	32	# Include
		33

Lines 1-11 Link Here

(-)b/emulators/cannonball/files/patch-cmake_bsd.cmake (-6 / +10 lines)
1	Create a cmake file for FreeBSD build.	1	Create a cmake file for BSD based builds.
2		2
3	--- cmake/bsd.cmake.orig 2019-06-10 03:23:23 UTC	3	--- cmake/bsd.cmake.orig 2019-08-18 00:41:57.311525123 +0000
4	+++ cmake/bsd.cmake	4	+++ cmake/bsd.cmake
5	@@ -0,0 +1,20 @@	5	@@ -0,0 +1,23 @@
6	+# Default CMake Setup. Used for FreeBSD Builds.	6	+# Default CMake Setup. Used for BSD Builds.
		7	+
		8	+set(lib_base ${BSD_PREFIX_PATH}/include)
		9	+
		10	+set(BOOST_INCLUDEDIR ${lib_base})
7	+	11	+
8	+set(lib_base /usr/local/include)
9	+set(sdl_root ${lib_base}/SDL)	12	+set(sdl_root ${lib_base}/SDL)
10	+	13	+
11	+include_directories("${sdl_root}")	14	+include_directories("${sdl_root}")
Lines 16-25 Create a cmake file for FreeBSD build. Link Here
16	+	19	+
17	+# Linking	20	+# Linking
18	+link_directories(	21	+link_directories(
19	+ "/usr/local/lib"	22	+ "${BSD_PREFIX_PATH}/lib"
20	+)	23	+)
21	+	24	+
22	+# Location for Cannonball to create save files	25	+# Location for Cannonball to create save files
23	+# Used to auto-generate setup.hpp with various file paths	26	+# Used to auto-generate setup.hpp with various file paths
24	+set(xml_directory ./)	27	+set(xml_directory ./)
25	+set(sdl_flags "SDL_DOUBLEBUF \| SDL_SWSURFACE")	28	+set(sdl_flags "SDL_DOUBLEBUF \| SDL_SWSURFACE")
		29