From 1b139bb7e8871a34cd3ce57d3bccc5a294f52d78 Mon Sep 17 00:00:00 2001 From: bcallah Date: Wed, 1 Jan 2020 18:52:50 +0000 Subject: [PATCH] Update to devilutionx-1.0.0 Changelog: https://github.com/diasurgical/devilutionX/releases/tag/1.0.0 ok cwen@ --- games/devilutionx/Makefile | 10 ++++-- games/devilutionx/distinfo | 4 +-- .../devilutionx/patches/patch-CMakeLists_txt | 34 +++++++++---------- 3 files changed, 26 insertions(+), 22 deletions(-) diff --git a/games/devilutionx/Makefile b/games/devilutionx/Makefile index 5f53bf0818b..9608553b9b9 100644 --- a/games/devilutionx/Makefile +++ b/games/devilutionx/Makefile @@ -1,12 +1,12 @@ -# $OpenBSD: Makefile,v 1.4 2019/11/09 22:35:19 bcallah Exp $ +# $OpenBSD: Makefile,v 1.5 2020/01/01 18:52:50 bcallah Exp $ COMMENT = open source engine recreation for Diablo 1 game -DISTNAME = devilutionx-0.5.0 +PKGNAME = ${DISTNAME:L} CATEGORIES = games x11 GH_ACCOUNT = diasurgical GH_PROJECT = devilutionX -GH_COMMIT = 2afc5862a0762bdf1a2005249d5e34245815c595 +GH_TAGNAME = 1.0.0 MAINTAINER = Brian Callahan @@ -35,6 +35,10 @@ USE_NINJA = No NO_TEST = Yes +# Remove DOS line endings from patched files +post-extract: + @cd ${WRKSRC} && perl -i -pe 's/\r$$//' CMakeLists.txt + # No install target do-install: ${INSTALL_PROGRAM} ${WRKBUILD}/devilutionx ${PREFIX}/bin diff --git a/games/devilutionx/distinfo b/games/devilutionx/distinfo index 69f1a0ff638..73da2e02cbc 100644 --- a/games/devilutionx/distinfo +++ b/games/devilutionx/distinfo @@ -1,2 +1,2 @@ -SHA256 (devilutionx-0.5.0-2afc5862.tar.gz) = W+N9S07qWHqFLPuv9Km18EIY+x0dIHGHvgukmL5By7o= -SIZE (devilutionx-0.5.0-2afc5862.tar.gz) = 1781028 +SHA256 (devilutionX-1.0.0.tar.gz) = +vsLrJNbu+6OJh1/vS1Op2m4i7x4uhr/73QGSizHd3k= +SIZE (devilutionX-1.0.0.tar.gz) = 1798349 diff --git a/games/devilutionx/patches/patch-CMakeLists_txt b/games/devilutionx/patches/patch-CMakeLists_txt index ad4cf4be7b1..aeaf4c8c170 100644 --- a/games/devilutionx/patches/patch-CMakeLists_txt +++ b/games/devilutionx/patches/patch-CMakeLists_txt @@ -1,23 +1,23 @@ -$OpenBSD: patch-CMakeLists_txt,v 1.3 2019/11/09 22:35:19 bcallah Exp $ +$OpenBSD: patch-CMakeLists_txt,v 1.4 2020/01/01 18:52:50 bcallah Exp $ Don't do git here. Index: CMakeLists.txt --- CMakeLists.txt.orig +++ CMakeLists.txt -@@ -18,14 +18,8 @@ option(NIGHTLY_BUILD "Enable options for nightly build - option(USE_SDL1 "Use SDL1.2 instead of SDL2" OFF) - option(NONET "Disable network" OFF) - --include(CMake/git.cmake) --get_git_tag(GIT_TAG) --if(NOT CMAKE_BUILD_TYPE MATCHES "Release") -- get_git_commit_hash(GIT_COMMIT_HASH) --endif() -- - project(DevilutionX -- VERSION ${GIT_TAG} -+ VERSION 0.5.0 - LANGUAGES C CXX) - - if(BINARY_RELEASE) +@@ -19,14 +19,8 @@ option(NIGHTLY_BUILD "Enable options for nightly build + option(USE_SDL1 "Use SDL1.2 instead of SDL2" OFF) + option(NONET "Disable network" OFF) + +-include(CMake/git.cmake) +-get_git_tag(GIT_TAG) +-if(NOT CMAKE_BUILD_TYPE MATCHES "Release") +- get_git_commit_hash(GIT_COMMIT_HASH) +-endif() +- + project(DevilutionX +- VERSION ${GIT_TAG} ++ VERSION 1.0.0 + LANGUAGES C CXX) + + if(BINARY_RELEASE)