- Update to 0.3.1.

- Improve the port.

PR:		ports/116500
Submitted by:	Dmitry Marakasov <amdmi3@amdmi3.ru>

7 files changed, 32 insertions, 60 deletions

diff --git a/games/qonk/Makefile b/games/qonk/Makefile
index 558e03be7fec..e1f0bf9c3f32 100644
--- a/games/qonk/Makefile
+++ b/games/qonk/Makefile
@@ -6,44 +6,25 @@
 #
 
 PORTNAME=	qonk
-DISTVERSION=	0.0.2beta1
-PORTREVISION=	1
+PORTVERSION=	0.3.1
 CATEGORIES=	games
-MASTER_SITES=	http://anthony.liekens.net/pub/files/
+MASTER_SITES=	SF
 
 MAINTAINER=	alepulver@FreeBSD.org
-COMMENT=	Small build and conquer strategy game
+COMMENT=	Small space build and conquer strategy game
 
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_SDL=	gfx sdl ttf
+USE_SDL=	sdl gfx ttf image
 
-OPTIONS=	OPTIMIZED_CFLAGS "Enable compilation optimizations" on
-
-.include <bsd.port.pre.mk>
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 post-patch:
-# Fix Makefile.
-	@${REINPLACE_CMD} -e 's|g++|${CXX}| ; \
-		s|sdl-config|${SDL_CONFIG}| ; \
-		s|\(-O3\)|${CFLAGS} \1|' \
-		${WRKSRC}/${MAKEFILE}
-
-# Fix paths to ${DATADIR}.
-	@${REINPLACE_CMD} -e 's|\(font\.ttf\)|${DATADIR}/\1|' \
-		${WRKSRC}/main.cpp ${WRKSRC}/messages.cpp
-
-# Enable/disable compilation optimizations.
-.if defined(WITHOUT_OPTIMIZED_CFLAGS)
-	@${REINPLACE_CMD} -e 's|-O3||' \
-		${WRKSRC}/${MAKEFILE}
-.endif
-
-do-install:
-# Program.
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-
-# Data.
-	${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/font.ttf ${DATADIR}
+	@${REINPLACE_CMD} -e 's|-lSDL |`${SDL_CONFIG} --libs` |' \
+		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+	@${REINPLACE_CMD} -e 's|settings.h|../&|; s|canvas.h|../&|' \
+		${WRKSRC}/src/ui/menusystem.cpp
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/qonk/distinfo b/games/qonk/distinfo
index f5b09da6ad5a..fe7536e71d39 100644
--- a/games/qonk/distinfo
+++ b/games/qonk/distinfo
@@ -1,3 +1,3 @@
-MD5 (qonk-0.0.2beta1.tar.gz) = d3f445f94c11c5d2ac1c4ca4533ba412
-SHA256 (qonk-0.0.2beta1.tar.gz) = 3dd5add09f1fc4c9c3d00e125509197b13b70d586c3595f01f565a794eca8f64
-SIZE (qonk-0.0.2beta1.tar.gz) = 92832
+MD5 (qonk-0.3.1.tar.gz) = 9491980477ac5beb5bba6b8234d2ddfd
+SHA256 (qonk-0.3.1.tar.gz) = b327f46410ab7a83d33746a91b82a0fea6eb08e414e48c8923e30c6ebb910806
+SIZE (qonk-0.3.1.tar.gz) = 339374
diff --git a/games/qonk/files/patch-SDL_gfxPrimitives.h b/games/qonk/files/patch-SDL_gfxPrimitives.h
deleted file mode 100644
index 71d5e4ae3b20..000000000000
--- a/games/qonk/files/patch-SDL_gfxPrimitives.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- SDL_gfxPrimitives.h.orig	Sat Aug  6 08:53:38 2005
-+++ SDL_gfxPrimitives.h	Thu Apr 13 23:20:20 2006
-@@ -14,7 +14,7 @@
- #define M_PI	3.141592654
- #endif
- 
--#include <SDL/SDL.h>
-+#include <SDL.h>
- 
- /* Set up for C function definitions, even when using C++ */
- #ifdef __cplusplus
diff --git a/games/qonk/files/patch-main.cpp b/games/qonk/files/patch-main.cpp
deleted file mode 100644
index e17394a72ab0..000000000000
--- a/games/qonk/files/patch-main.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- main.cpp.orig	Wed Jul 13 13:40:12 2005
-+++ main.cpp	Wed Jul 13 13:41:13 2005
-@@ -1,5 +1,7 @@
- // Copyright 2005 by Anthony Liekens anthony@liekens.net
- 
-+#include <time.h>
-+
- #include "coordinate.h"
- #include "stars.h"
- #include "planets.h"
diff --git a/games/qonk/files/patch-src-menumanager.h b/games/qonk/files/patch-src-menumanager.h
new file mode 100644
index 000000000000..920d5d439432
--- /dev/null
+++ b/games/qonk/files/patch-src-menumanager.h
@@ -0,0 +1,11 @@
+--- src/menumanager.h.orig	Thu Sep 20 22:01:32 2007
++++ src/menumanager.h	Thu Sep 20 21:58:13 2007
+@@ -7,6 +7,8 @@
+ #ifndef MENUMANAGER_H
+ #define MENUMANAGER_H
+ 
++#include "ui/menuaction.h"
++
+ class Main;
+ 
+ class ControlOptions;
diff --git a/games/qonk/pkg-descr b/games/qonk/pkg-descr
index 3b679c480f13..975719816ed0 100644
--- a/games/qonk/pkg-descr
+++ b/games/qonk/pkg-descr
@@ -1,3 +1,5 @@
+[Original description for version 0.0.2beta1]
+
 Qonk is a small game I wrote to learn some SDL basics. The game is a small
 build-and-conquer strategy game with very simple rules. A complete game only
 lasts for a few minutes and can be a fun break away from work or whatever
@@ -15,7 +17,4 @@ had on its gameplay. The game engine itself is fully functional. A lot of
 things have to be added to make this a mature game (like menus and stuff), but
 since the engine itself works, Qonk is already very playable.
 
-WWW: http://anthony.liekens.net/index.php/Computers/Qonk
-
-- Alejandro Pulver
-alejandro@varnet.biz
+WWW: http://qonk.sourceforge.net/
diff --git a/games/qonk/pkg-plist b/games/qonk/pkg-plist
index 7a8cd501f38b..461b33789c6f 100644
--- a/games/qonk/pkg-plist
+++ b/games/qonk/pkg-plist
@@ -1,3 +1,5 @@
 bin/qonk
 %%DATADIR%%/font.ttf
+%%DATADIR%%/highlight.png
+%%DATADIR%%/normal.png
 @dirrm %%DATADIR%%