Attachment 206701 Details for Bug 239960 – Patch to upgrade the ports script to support cannonball-g20190819 builds

[patch] Patch to upgrade the ports script to support cannonball-g20190819 builds

cannonball.patch (text/plain), 3.76 KB, created by Santhosh Raju on 2019-08-19 14:17:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Santhosh Raju

Created: 2019-08-19 14:17:21 UTC

Size: 3.76 KB

patch

obsolete

>diff --git a/emulators/cannonball/Makefile b/emulators/cannonball/Makefile
>index 95b1679..054a36c 100644
>--- a/emulators/cannonball/Makefile
>+++ b/emulators/cannonball/Makefile
>@@ -1,7 +1,7 @@
> # $FreeBSD: head/emulators/cannonball/Makefile 506026 2019-07-06 18:55:17Z swills $
> 
> PORTNAME=	cannonball
>-DISTVERSION=	g20171201
>+DISTVERSION=	g20190819
> CATEGORIES=	emulators games
> 
> MAINTAINER=	santhosh.raju@gmail.com
>@@ -17,12 +17,13 @@ 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
>-GH_TAGNAME=	0c0814d
>+GH_TAGNAME=	48d2c62
> 
> BUILD_WRKSRC=		${WRKSRC}/cmake
> CONFIGURE_WRKSRC=	${WRKSRC}/cmake
>@@ -35,6 +36,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} ${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
> 
>diff --git a/emulators/cannonball/distinfo b/emulators/cannonball/distinfo
>index 63dbddc..20df915 100644
>--- a/emulators/cannonball/distinfo
>+++ b/emulators/cannonball/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1560212844
>-SHA256 (djyt-cannonball-g20171201-0c0814d_GH0.tar.gz) = 9f79a26df838ad64b96137ddf5e843f3e76e639c2112f5bfaae39296698019d5
>-SIZE (djyt-cannonball-g20171201-0c0814d_GH0.tar.gz) = 277297
>+TIMESTAMP = 1566223011
>+SHA256 (djyt-cannonball-g20190819-48d2c62_GH0.tar.gz) = 08c37ee43d2417446af9095ae845db3ff1f747b62fb328120d27e6ff21575b2a
>+SIZE (djyt-cannonball-g20190819-48d2c62_GH0.tar.gz) = 278238
>diff --git a/emulators/cannonball/files/patch-cmake_CMakeLists.txt b/emulators/cannonball/files/patch-cmake_CMakeLists.txt
>deleted file mode 100644
>index e7ff77c..0000000
>--- a/emulators/cannonball/files/patch-cmake_CMakeLists.txt
>+++ /dev/null
>@@ -1,16 +0,0 @@
>-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
>diff --git a/emulators/cannonball/files/patch-cmake_bsd.cmake b/emulators/cannonball/files/patch-cmake_bsd.cmake
>deleted file mode 100644
>index fe000b6..0000000
>--- a/emulators/cannonball/files/patch-cmake_bsd.cmake
>+++ /dev/null
>@@ -1,25 +0,0 @@
>-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")
>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