aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--games/hedgewars/Makefile34
-rw-r--r--games/hedgewars/distinfo4
-rw-r--r--games/hedgewars/files/patch-CMakeLists.txt12
-rw-r--r--games/hedgewars/files/patch-gameServer__Actions.hs11
-rw-r--r--games/hedgewars/files/patch-share__hedgewars__Data__Locale__CMakeLists.txt21
-rw-r--r--games/hedgewars/files/patch-tools__CMakeLists.txt23
6 files changed, 32 insertions, 73 deletions
diff --git a/games/hedgewars/Makefile b/games/hedgewars/Makefile
index 483aa529fe61..35cbe903e6a3 100644
--- a/games/hedgewars/Makefile
+++ b/games/hedgewars/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= hedgewars
-PORTVERSION= 0.9.20.5
-PORTREVISION= 4
+PORTVERSION= 0.9.21.1
CATEGORIES= games
MASTER_SITES= http://download.gna.org/hedgewars/ \
http://mirror.amdmi3.ru/distfiles/
@@ -15,6 +14,8 @@ COMMENT= Free Worms-like turn based strategy game
LICENSE= GPLv2 GFDL
LICENSE_COMB= multi
+LIB_DEPENDS= libphysfs.so:${PORTSDIR}/devel/physfs
+
ONLY_FOR_ARCHS= i386 amd64
ONLY_FOR_ARCHS_REASON= depends on fpc which is only available for i386 and amd64
@@ -30,11 +31,10 @@ USE_LDCONFIG= yes
WRKSRC= ${WRKDIR}/${DISTNAME:C/\.[0-9]$//}
PLIST_FILES= bin/${PORTNAME} bin/hwengine \
+ share/appdata/hedgewars.appdata.xml \
share/applications/${PORTNAME}.desktop \
share/pixmaps/${PORTNAME}.png \
- lib/libhwphysfs.so \
- lib/libhwphysfs.so.1 \
- lib/libhwphysfs.so.2.1.0 \
+ share/pixmaps/${PORTNAME}.xpm \
lib/libphyslayer.so
PORTDATA= *
@@ -48,17 +48,19 @@ SERVER_DESC= Build server (requires haskell)
#VIDEOREC_LIB_DEPENDS=libavcodec0.so:${PORTSDIR}/multimedia/ffmpeg0
#VIDEOREC_CMAKE_OFF=-DNOVIDEOREC=1
-SERVER_BUILD_DEPENDS=\
- ghc:${PORTSDIR}/lang/ghc \
- hs-vector>=0:${PORTSDIR}/devel/hs-vector \
- hs-network>=0:${PORTSDIR}/net/hs-network \
- hs-utf8-string>=0:${PORTSDIR}/devel/hs-utf8-string \
- hs-bytestring-show>=0:${PORTSDIR}/devel/hs-bytestring-show \
- hs-dataenc>=0:${PORTSDIR}/converters/hs-dataenc \
- hs-random>=0:${PORTSDIR}/devel/hs-random \
- hs-hslogger>=0:${PORTSDIR}/devel/hs-hslogger
-SERVER_CMAKE_OFF=-DNOSERVER=1
-SERVER_PLIST_FILES=bin/${PORTNAME}-server
+SERVER_BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc \
+ hs-vector>=0:${PORTSDIR}/devel/hs-vector \
+ hs-network>=0:${PORTSDIR}/net/hs-network \
+ hs-utf8-string>=0:${PORTSDIR}/devel/hs-utf8-string \
+ hs-bytestring-show>=0:${PORTSDIR}/devel/hs-bytestring-show \
+ hs-dataenc>=0:${PORTSDIR}/converters/hs-dataenc \
+ hs-random>=0:${PORTSDIR}/devel/hs-random \
+ hs-hslogger>=0:${PORTSDIR}/devel/hs-hslogger \
+ hs-SHA>=0:${PORTSDIR}/security/hs-SHA \
+ hs-entropy>=0:${PORTSDIR}/security/hs-entropy \
+ hs-zlib>=0:${PORTSDIR}/archivers/hs-zlib
+SERVER_CMAKE_OFF= -DNOSERVER=1
+SERVER_PLIST_FILES= bin/${PORTNAME}-server
post-patch:
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/cmake_modules/*.cmake
diff --git a/games/hedgewars/distinfo b/games/hedgewars/distinfo
index aafe56e9d9fc..755d9fad657a 100644
--- a/games/hedgewars/distinfo
+++ b/games/hedgewars/distinfo
@@ -1,2 +1,2 @@
-SHA256 (hedgewars-src-0.9.20.5.tar.bz2) = a6d0896fe88d5746a4272c8f495c7457b17586e8d16ef429ce50dfa449c0adcc
-SIZE (hedgewars-src-0.9.20.5.tar.bz2) = 161550331
+SHA256 (hedgewars-src-0.9.21.1.tar.bz2) = 590a9458d2123c5550d5eb39edfed28d0663703d76e13c8987237c92ca41f3f8
+SIZE (hedgewars-src-0.9.21.1.tar.bz2) = 160250791
diff --git a/games/hedgewars/files/patch-CMakeLists.txt b/games/hedgewars/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..9e08ce0c36f4
--- /dev/null
+++ b/games/hedgewars/files/patch-CMakeLists.txt
@@ -0,0 +1,12 @@
+Fix ghc stack overflow while building server
+--- CMakeLists.txt.orig 2015-01-06 23:55:59.000000000 +0300
++++ CMakeLists.txt 2015-01-24 22:39:01.000000000 +0300
+@@ -108,7 +108,7 @@
+ endif()
+ endif()
+
+-list(APPEND haskell_flags ${ghflags_parsed} "-O2")
++list(APPEND haskell_flags ${ghflags_parsed})
+
+ #get BUILD_TYPE and enable/disable optimisation
+ message(STATUS "Using ${CMAKE_BUILD_TYPE} configuration")
diff --git a/games/hedgewars/files/patch-gameServer__Actions.hs b/games/hedgewars/files/patch-gameServer__Actions.hs
deleted file mode 100644
index 9c02e8860bc9..000000000000
--- a/games/hedgewars/files/patch-gameServer__Actions.hs
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./gameServer/Actions.hs.orig 2014-01-08 17:25:17.000000000 +0100
-+++ ./gameServer/Actions.hs 2014-08-10 23:44:17.631500480 +0200
-@@ -562,7 +562,7 @@
- si <- gets serverInfo
- newClId <- io $ do
- ci <- addClient rnc cl
-- _ <- Exception.mask (forkIO . clientRecvLoop (clientSocket cl) (coreChan si) (sendChan cl) ci)
-+ _ <- Exception.mask (\x -> forkIO $ clientRecvLoop (clientSocket cl) (coreChan si) (sendChan cl) ci x)
-
- infoM "Clients" (show ci ++ ": New client. Time: " ++ show (connectTime cl))
-
diff --git a/games/hedgewars/files/patch-share__hedgewars__Data__Locale__CMakeLists.txt b/games/hedgewars/files/patch-share__hedgewars__Data__Locale__CMakeLists.txt
deleted file mode 100644
index 951d88c8eee6..000000000000
--- a/games/hedgewars/files/patch-share__hedgewars__Data__Locale__CMakeLists.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-From 774cfec959227a52b9a54afa8b069277c2f7e656 Mon Sep 17 00:00:00 2001
-From: sheepluva <sheepyluva@gmail.com>
-Date: Fri, 15 Aug 2014 08:23:15 +0200
-Subject: [PATCH] part of patch in issue 803 (ty) - this hopefully should fix
- issues with cmake Makefiles trying to run "Qt4::lrelease" in the shell
-
----
- share/hedgewars/Data/Locale/CMakeLists.txt | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/share/hedgewars/Data/Locale/CMakeLists.txt b/share/hedgewars/Data/Locale/CMakeLists.txt
-index 6075ecb..3e0dada 100644
---- share/hedgewars/Data/Locale/CMakeLists.txt
-+++ share/hedgewars/Data/Locale/CMakeLists.txt
-@@ -1,3 +1,6 @@
-+find_package(Qt4 REQUIRED)
-+include(${QT_USE_FILE})
-+
- file(GLOB txttrans2 ??.txt)
- file(GLOB txttrans5 ?????.txt)
- file(GLOB tsfiles *.ts)
diff --git a/games/hedgewars/files/patch-tools__CMakeLists.txt b/games/hedgewars/files/patch-tools__CMakeLists.txt
deleted file mode 100644
index 5389b7300bd6..000000000000
--- a/games/hedgewars/files/patch-tools__CMakeLists.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-From b2d1b0d292c71b5a4266c9359280fa32a35ac56d Mon Sep 17 00:00:00 2001
-From: sheepluva <sheepyluva@gmail.com>
-Date: Wed, 13 Aug 2014 15:16:33 +0200
-Subject: [PATCH] this should fix the cmake 3.0 issue. thanks to Spacey for
- reporting
-
----
- tools/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
-index b55f09c..3da80ab 100644
---- tools/CMakeLists.txt
-+++ tools/CMakeLists.txt
-@@ -57,7 +57,7 @@ if(APPLE)
-
- #create the .dmg for deployment
- #first make sure .app exists, then remove any old .dmg with same name, finally run the script
-- add_custom_target(dmg COMMAND if [ ! -a Hedgewars.app ]; then make install\; fi;
-+ add_custom_target(dmg COMMAND "if [ ! -a Hedgewars.app ]; then make install\; fi;"
- COMMAND rm -f ${CMAKE_BINARY_DIR}/Hedgewars-${HEDGEWARS_VERSION}.dmg
- COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/create-dmg.sh
- --volname "Hedgewars ${HEDGEWARS_VERSION}"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-20 17:40:59 +0000