Attachment #206701 for bug #239960




# $FreeBSD: head/emulators/cannonball/Makefile 506026 2019-07-06 18:55:17Z swills $

PORTNAME=	cannonball
DISTVERSION=	g20190819
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
GH_TAGNAME=	48d2c62

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

	${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} ${WRKSRC}/docs/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 (-3 / +3 lines)
1	TIMESTAMP = 1560212844	1	TIMESTAMP = 1566223011
2	SHA256 (djyt-cannonball-g20171201-0c0814d_GH0.tar.gz) = 9f79a26df838ad64b96137ddf5e843f3e76e639c2112f5bfaae39296698019d5	2	SHA256 (djyt-cannonball-g20190819-48d2c62_GH0.tar.gz) = 08c37ee43d2417446af9095ae845db3ff1f747b62fb328120d27e6ff21575b2a
3	SIZE (djyt-cannonball-g20171201-0c0814d_GH0.tar.gz) = 277297	3	SIZE (djyt-cannonball-g20190819-48d2c62_GH0.tar.gz) = 278238




Remove the boost directory reference.

Not required in ports, since boost libraries are directly installed
in ${LOCALBASE}/include

--- cmake/CMakeLists.txt.orig	2019-06-10 03:25:18 UTC
+++ cmake/CMakeLists.txt
@@ -25,7 +25,7 @@ else()
     include(${DCMAKE})
 endif(TARGET)
 
-set(BOOST_INCLUDEDIR ${lib_base}/boost_1_54_0)
+set(BOOST_INCLUDEDIR ${lib_base})
 find_package(Boost REQUIRED)
 
 # Include




Create a cmake file for FreeBSD build.

--- cmake/bsd.cmake.orig	2019-06-10 03:23:23 UTC
+++ cmake/bsd.cmake
@@ -0,0 +1,20 @@
+# Default CMake Setup. Used for FreeBSD Builds.
+
+set(lib_base /usr/local/include)
+set(sdl_root ${lib_base}/SDL)
+
+include_directories("${sdl_root}")
+
+link_libraries(cannonball
+    SDL
+)
+
+# Linking
+link_directories(
+    "/usr/local/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 1-7 Link Here

(-)b/emulators/cannonball/Makefile (-4 / +6 lines)
1	# $FreeBSD: head/emulators/cannonball/Makefile 506026 2019-07-06 18:55:17Z swills $	1	# $FreeBSD: head/emulators/cannonball/Makefile 506026 2019-07-06 18:55:17Z swills $
2		2
3	PORTNAME= cannonball	3	PORTNAME= cannonball
4	DISTVERSION= g20171201	4	DISTVERSION= g20190819
5	CATEGORIES= emulators games	5	CATEGORIES= emulators games
6		6
7	MAINTAINER= santhosh.raju@gmail.com	7	MAINTAINER= santhosh.raju@gmail.com
Lines 17-28 LIB_DEPENDS= libboost_program_options.so:devel/boost-libs Link Here
17	USES= cmake:insource pkgconfig sdl	17	USES= cmake:insource pkgconfig sdl
18	USE_SDL= sdl	18	USE_SDL= sdl
19		19
20	CMAKE_ARGS= ${WRKSRC}/cmake \	20	CMAKE_ARGS+= ${WRKSRC}/cmake
21	-DTARGET=bsd	21	CMAKE_ARGS+= -DTARGET=bsd
		22	CMAKE_ARGS+= -DBSD_PREFIX_PATH=${LOCALBASE}
22		23
23	USE_GITHUB= yes	24	USE_GITHUB= yes
24	GH_ACCOUNT= djyt	25	GH_ACCOUNT= djyt
25	GH_TAGNAME= 0c0814d	26	GH_TAGNAME= 48d2c62
26		27
27	BUILD_WRKSRC= ${WRKSRC}/cmake	28	BUILD_WRKSRC= ${WRKSRC}/cmake
28	CONFIGURE_WRKSRC= ${WRKSRC}/cmake	29	CONFIGURE_WRKSRC= ${WRKSRC}/cmake
Lines 35-40 do-install: Link Here
35	${INSTALL_DATA} ${WRKSRC}/cmake/res/tilemap.bin ${STAGEDIR}${DATADIR}/res/tilemap.bin	36	${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	37	${INSTALL_DATA} ${WRKSRC}/cmake/res/tilepatch.bin ${STAGEDIR}${DATADIR}/res/tilepatch.bin
37	${INSTALL_DATA} ${WRKSRC}/cmake/config.xml ${STAGEDIR}${DATADIR}/conf/config.xml	38	${INSTALL_DATA} ${WRKSRC}/cmake/config.xml ${STAGEDIR}${DATADIR}/conf/config.xml
		39	${INSTALL_MAN} ${WRKSRC}/docs/cannonball.6 ${STAGEDIR}${MAN1PREFIX}/man/man6
38	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME}	40	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
39	${INSTALL_PROGRAM} ${WRKSRC}/cmake/cannonball ${STAGEDIR}${PREFIX}/libexec	41	${INSTALL_PROGRAM} ${WRKSRC}/cmake/cannonball ${STAGEDIR}${PREFIX}/libexec
40		42

Removed Link Here

(-)a/emulators/cannonball/files/patch-cmake_CMakeLists.txt (-16 lines)
1	Remove the boost directory reference.
2
3	Not required in ports, since boost libraries are directly installed
4	in ${LOCALBASE}/include
5
6	--- cmake/CMakeLists.txt.orig 2019-06-10 03:25:18 UTC
7	+++ cmake/CMakeLists.txt
8	@@ -25,7 +25,7 @@ else()
9	include(${DCMAKE})
10	endif(TARGET)
11
12	-set(BOOST_INCLUDEDIR ${lib_base}/boost_1_54_0)
13	+set(BOOST_INCLUDEDIR ${lib_base})
14	find_package(Boost REQUIRED)
15
16	# Include

Removed Link Here

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