- Update to 0.9.19

4 files changed, 55 insertions, 6 deletions

diff --git a/games/hedgewars/Makefile b/games/hedgewars/Makefile
index 37db3dd3373e..b667037f7f8b 100644
--- a/games/hedgewars/Makefile
+++ b/games/hedgewars/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	hedgewars
-DISTVERSION=	0.9.18-3
+PORTVERSION=	0.9.19
 CATEGORIES=	games
 MASTER_SITES=	http://download.gna.org/hedgewars/ \
 		http://mirror.amdmi3.ru/distfiles/
@@ -32,9 +32,34 @@ PLIST_FILES=	bin/hedgewars bin/hwengine \
 PLIST_DIRSTRY=	share/applications
 PORTDATA=	*
 
+OPTIONS_DEFINE=	VIDEOREC SERVER
+OPTIONS_DEFAULT=VIDEOREC SERVER
+VIDEOREC_DESC=	Enable video recording (requires ffmpeg)
+SERVER_DESC=	Build server (requires haskell)
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MVIDEOREC}
+LIB_DEPENDS+=	avcodec:${PORTSDIR}/multimedia/ffmpeg
+.else
+CMAKE_ARGS+=	-DNOVIDEOREC=1
+.endif
+
+.if ${PORT_OPTIONS:MSERVER}
+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
+PLIST_FILES+=	bin/hedgewars-server
+.else
+CMAKE_ARGS+=	-DNOSERVER=1
+.endif
+
 post-patch:
-	@${ECHO} "include_directories(${LOCALBASE}/include)" >> \
-		${WRKSRC}/QTfrontend/CMakeLists.txt
 .if defined(NOPORTDATA)
 	@${REINPLACE_CMD} -e '/add_subdirectory.*Data/I d' \
 		${WRKSRC}/share/hedgewars/CMakeLists.txt
@@ -42,7 +67,7 @@ post-patch:
 
 post-install:
 	${MKDIR} ${PREFIX}/share/applications
-	${INSTALL_DATA} ${WRKSRC}/misc/hedgewars.desktop \
+	${INSTALL_DATA} ${WRKSRC}/share/hedgewars/Data/misc/hedgewars.desktop \
 		${PREFIX}/share/applications/
 	${INSTALL_DATA} ${WRKSRC}/misc/hedgewars.png \
 		${PREFIX}/share/pixmaps/
diff --git a/games/hedgewars/distinfo b/games/hedgewars/distinfo
index 63704734ffee..4415fcf747e4 100644
--- a/games/hedgewars/distinfo
+++ b/games/hedgewars/distinfo
@@ -1,2 +1,2 @@
-SHA256 (hedgewars-src-0.9.18-3.tar.bz2) = 75cb5de74c480eb295d06a4a2db37fcc57560a464870f15989cf6bdf0e937daa
-SIZE (hedgewars-src-0.9.18-3.tar.bz2) = 180719233
+SHA256 (hedgewars-src-0.9.19.tar.bz2) = bfb2f342aa71b71efdacd4154162575a0b39f17507233af2a043324a04314d4f
+SIZE (hedgewars-src-0.9.19.tar.bz2) = 191557733
diff --git a/games/hedgewars/files/patch-QTfrontend-CMakeLists.txt b/games/hedgewars/files/patch-QTfrontend-CMakeLists.txt
new file mode 100644
index 000000000000..9fe228f936c4
--- /dev/null
+++ b/games/hedgewars/files/patch-QTfrontend-CMakeLists.txt
@@ -0,0 +1,13 @@
+--- 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
new file mode 100644
index 000000000000..bc6c5b60ea21
--- /dev/null
+++ b/games/hedgewars/files/patch-misc-libphysfs-platform__unix.c
@@ -0,0 +1,11 @@
+--- 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 */
+