From 326880eb13075f41cbeac559426e7917a4422b29 Mon Sep 17 00:00:00 2001 From: Dmitry Marakasov Date: Sun, 12 Jan 2014 20:51:40 +0000 Subject: - Update to 0.9.20.5 - Add LICENSE - Bring back SERVER option, haskell ports were fixed - Patches were integrated upstream PR: 185538 Submitted by: Hardy Schumacher --- games/hedgewars/Makefile | 19 +++++++++++++------ games/hedgewars/distinfo | 4 ++-- games/hedgewars/files/patch-QTfrontend-CMakeLists.txt | 13 ------------- .../files/patch-misc-libphysfs-platform__unix.c | 11 ----------- 4 files changed, 15 insertions(+), 32 deletions(-) delete mode 100644 games/hedgewars/files/patch-QTfrontend-CMakeLists.txt delete mode 100644 games/hedgewars/files/patch-misc-libphysfs-platform__unix.c diff --git a/games/hedgewars/Makefile b/games/hedgewars/Makefile index dd3cfab199e7..2739e8e4c71e 100644 --- a/games/hedgewars/Makefile +++ b/games/hedgewars/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= hedgewars -PORTVERSION= 0.9.19.3 +PORTVERSION= 0.9.20.5 CATEGORIES= games MASTER_SITES= http://download.gna.org/hedgewars/ \ http://mirror.amdmi3.ru/distfiles/ @@ -11,6 +11,9 @@ DISTNAME= ${PORTNAME}-src-${DISTVERSION} MAINTAINER= amdmi3@FreeBSD.org COMMENT= Free Worms-like turn based strategy game +LICENSE= GPLv2 GFDL +LICENSE_COMB= multi + ONLY_FOR_ARCHS= i386 amd64 ONLY_FOR_ARCHS_REASON= depends on fpc which is only available for i386 and amd64 @@ -23,18 +26,22 @@ USE_QT4= corelib gui moc_build network \ qmake_build rcc_build svg xml \ uic_build linguist_build CMAKE_ARGS= -DNOVIDEOREC=1 +USE_LDCONFIG= yes -WRKSRC= ${WRKDIR}/${DISTNAME:C/-[0-9]$//} +WRKSRC= ${WRKDIR}/${DISTNAME:C/\.[0-9]$//} PLIST_FILES= bin/${PORTNAME} bin/hwengine \ share/applications/${PORTNAME}.desktop \ - share/pixmaps/${PORTNAME}.png + share/pixmaps/${PORTNAME}.png \ + lib/libhwphysfs.so \ + lib/libhwphysfs.so.1 \ + lib/libhwphysfs.so.2.1.0 \ + lib/libphyslayer.so PORTDATA= * # VIDEOREC - broken with recent ffmpeg -# SERVER - depends on ghc which has problems in 10.x OPTIONS_DEFINE= SERVER # VIDEOREC -OPTIONS_DEFAULT=#empty +OPTIONS_DEFAULT=SERVER SERVER_DESC= Build server (requires haskell) #VIDEOREC_DESC= Enable video recording (requires ffmpeg) @@ -42,7 +49,7 @@ SERVER_DESC= Build server (requires haskell) #VIDEOREC_LIB_DEPENDS=libavcodec0.so:${PORTSDIR}/multimedia/ffmpeg0 #VIDEOREC_CMAKE_OFF=-DNOVIDEOREC=1 -SERVER_BUILD_DEPENDS= \ +SERVER_BUILD_DEPENDS=\ ghc:${PORTSDIR}/lang/ghc \ hs-vector>=0:${PORTSDIR}/devel/hs-vector \ hs-network>=0:${PORTSDIR}/net/hs-network \ diff --git a/games/hedgewars/distinfo b/games/hedgewars/distinfo index e9409af53120..aafe56e9d9fc 100644 --- a/games/hedgewars/distinfo +++ b/games/hedgewars/distinfo @@ -1,2 +1,2 @@ -SHA256 (hedgewars-src-0.9.19.3.tar.bz2) = 93adb39268e92b730d1014897bfcf55e0ee46e31b174f769b11408690a33ae90 -SIZE (hedgewars-src-0.9.19.3.tar.bz2) = 191688324 +SHA256 (hedgewars-src-0.9.20.5.tar.bz2) = a6d0896fe88d5746a4272c8f495c7457b17586e8d16ef429ce50dfa449c0adcc +SIZE (hedgewars-src-0.9.20.5.tar.bz2) = 161550331 diff --git a/games/hedgewars/files/patch-QTfrontend-CMakeLists.txt b/games/hedgewars/files/patch-QTfrontend-CMakeLists.txt deleted file mode 100644 index 9fe228f936c4..000000000000 --- a/games/hedgewars/files/patch-QTfrontend-CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ ---- QTfrontend/CMakeLists.txt.orig 2013-05-31 00:07:30.000000000 +0400 -+++ QTfrontend/CMakeLists.txt 2013-06-15 02:38:38.536133398 +0400 -@@ -55,8 +55,8 @@ - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/util/platform) - include_directories(${SDL_INCLUDE_DIR}) - include_directories(${SDLMIXER_INCLUDE_DIR}) --include_directories(${PHYSFS_INCLUDE_DIR}) --include_directories(${PHYSLAYER_INCLUDE_DIR}) -+include_directories(BEFORE ${PHYSFS_INCLUDE_DIR}) -+include_directories(BEFORE ${PHYSLAYER_INCLUDE_DIR}) - - - if(UNIX) diff --git a/games/hedgewars/files/patch-misc-libphysfs-platform__unix.c b/games/hedgewars/files/patch-misc-libphysfs-platform__unix.c deleted file mode 100644 index bc6c5b60ea21..000000000000 --- a/games/hedgewars/files/patch-misc-libphysfs-platform__unix.c +++ /dev/null @@ -1,11 +0,0 @@ ---- misc/libphysfs/platform_unix.c.orig 2013-05-31 00:07:37.000000000 +0400 -+++ misc/libphysfs/platform_unix.c 2013-06-17 05:41:06.249112731 +0400 -@@ -193,7 +193,7 @@ - - if (access(exe, X_OK) == 0) /* Exists as executable? We're done. */ - { -- exe[size - binlen] = '\0'; /* chop off filename, leave '/' */ -+ exe[size - binlen - 1] = '\0'; /* chop off filename, leave '/' */ - return exe; - } /* if */ - -- cgit v1.2.3