Attachment 206686 Details for Bug 239960 – Improvements to the ports script and a man page.

[patch] Improvements to the ports script and a man page.

cannonball.patch (text/plain), 6.74 KB, created by Santhosh Raju on 2019-08-19 03:22:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Santhosh Raju

Created: 2019-08-19 03:22:29 UTC

Size: 6.74 KB

patch

obsolete

>diff --git a/emulators/cannonball/Makefile b/emulators/cannonball/Makefile
>index 95b1679..22a0b1b 100644
>--- a/emulators/cannonball/Makefile
>+++ b/emulators/cannonball/Makefile
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	cannonball
> DISTVERSION=	g20171201
>+PORTREVISION=	1
> CATEGORIES=	emulators games
> 
> MAINTAINER=	santhosh.raju@gmail.com
>@@ -17,8 +18,9 @@ LIB_DEPENDS=	libboost_program_options.so:devel/boost-libs
> USES=		cmake:insource pkgconfig sdl
> USE_SDL=	sdl
> 
>-CMAKE_ARGS=	${WRKSRC}/cmake \
>-		-DTARGET=bsd
>+CMAKE_ARGS+=	${WRKSRC}/cmake
>+CMAKE_ARGS+=	-DTARGET=bsd
>+CMAKE_ARGS+=	-DBSD_PREFIX_PATH=${LOCALBASE}
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	djyt
>@@ -27,7 +29,7 @@ GH_TAGNAME=	0c0814d
> BUILD_WRKSRC=		${WRKSRC}/cmake
> CONFIGURE_WRKSRC=	${WRKSRC}/cmake
> 
>-SUB_FILES=	${PORTNAME}.sh
>+SUB_FILES=	${PORTNAME}.sh ${PORTNAME}.6
> 
> do-install:
> 	${MKDIR} ${STAGEDIR}${DATADIR}/res
>@@ -35,6 +37,7 @@ do-install:
> 	${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
> 
>diff --git a/emulators/cannonball/distinfo b/emulators/cannonball/distinfo
>index 63dbddc..2b314fc 100644
>--- a/emulators/cannonball/distinfo
>+++ b/emulators/cannonball/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1560212844
>+TIMESTAMP = 1566104855
> SHA256 (djyt-cannonball-g20171201-0c0814d_GH0.tar.gz) = 9f79a26df838ad64b96137ddf5e843f3e76e639c2112f5bfaae39296698019d5
> SIZE (djyt-cannonball-g20171201-0c0814d_GH0.tar.gz) = 277297
>diff --git a/emulators/cannonball/files/cannonball.6.in b/emulators/cannonball/files/cannonball.6.in
>new file mode 100644
>index 0000000..24d50f1
>--- /dev/null
>+++ b/emulators/cannonball/files/cannonball.6.in
>@@ -0,0 +1,50 @@
>+.\" 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.
>diff --git a/emulators/cannonball/files/patch-cmake_CMakeLists.txt b/emulators/cannonball/files/patch-cmake_CMakeLists.txt
>index e7ff77c..db00a2d 100644
>--- a/emulators/cannonball/files/patch-cmake_CMakeLists.txt
>+++ b/emulators/cannonball/files/patch-cmake_CMakeLists.txt
>@@ -1,16 +1,33 @@
>-Remove the boost directory reference.
>+Adds support for BSD based builds.
> 
>-Not required in ports, since boost libraries are directly installed
>-in ${LOCALBASE}/include
>+1. PREFIX path is configured via BSD_PREFIX_PATH for BSDs.
> 
>---- cmake/CMakeLists.txt.orig	2019-06-10 03:25:18 UTC
>+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
>-@@ -25,7 +25,7 @@ else()
>+@@ -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)
>-+set(BOOST_INCLUDEDIR ${lib_base})
>++if(NOT(${TARGET} STREQUAL "bsd"))
>++    set(BOOST_INCLUDEDIR ${lib_base}/boost_1_54_0)
>++endif()
>++
>  find_package(Boost REQUIRED)
> 
>  # Include
>+
>diff --git a/emulators/cannonball/files/patch-cmake_bsd.cmake b/emulators/cannonball/files/patch-cmake_bsd.cmake
>index fe000b6..90039d9 100644
>--- a/emulators/cannonball/files/patch-cmake_bsd.cmake
>+++ b/emulators/cannonball/files/patch-cmake_bsd.cmake
>@@ -1,11 +1,14 @@
>-Create a cmake file for FreeBSD build.
>+Create a cmake file for BSD based builds.
> 
>---- cmake/bsd.cmake.orig	2019-06-10 03:23:23 UTC
>+--- cmake/bsd.cmake.orig        2019-08-18 00:41:57.311525123 +0000
> +++ cmake/bsd.cmake
>-@@ -0,0 +1,20 @@
>-+# Default CMake Setup. Used for FreeBSD Builds.
>+@@ -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}")
>@@ -16,10 +19,11 @@ Create a cmake file for FreeBSD build.
> +
> +# Linking
> +link_directories(
>-+    "/usr/local/lib"
>++    "${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")
>+
>diff --git a/emulators/cannonball/pkg-plist b/emulators/cannonball/pkg-plist
>index b8fcb4b..a7a5194 100644
>--- a/emulators/cannonball/pkg-plist
>+++ b/emulators/cannonball/pkg-plist
>@@ -1,5 +1,6 @@
> bin/cannonball
> libexec/cannonball
>+man/man6/cannonball.6.gz
> %%DATADIR%%/conf/config.xml
> %%DATADIR%%/res/tilemap.bin
> %%DATADIR%%/res/tilepatch.bin

Flags:

santhosh.raju: maintainer-approval+

Actions: View | Diff

Attachments on bug 239960: 206686 | 206701