ports/116500: [PATCH] games/qonk: update to 0.3.1

Thu Sep 20 23:30:04 UTC 2007

>Number:         116500
>Category:       ports
>Synopsis:       [PATCH] games/qonk: update to 0.3.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Sep 20 23:30:03 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Dmitry Marakasov
>Release:        FreeBSD 6.1-RELEASE-p12 i386
>Organization:
>Environment:
System: FreeBSD hades.panopticon 6.1-RELEASE-p12 FreeBSD 6.1-RELEASE-p12 #0: Tue Jan 16 23:12:21 MSK 2007 amdmi3 at hades.panopticon:/usr/obj/usr/src/sys/HADES i386


>Description:
* Update to 0.3.1
* Improve the port
>How-To-Repeat:
>Fix:

--- qonk-0.3.1.patch begins here ---
diff -ruN qonk.orig/Makefile qonk/Makefile
--- qonk.orig/Makefile	Thu Sep 20 21:31:48 2007
+++ qonk/Makefile	Fri Sep 21 01:54:18 2007
@@ -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 at 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=${MACHINE_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` |' \
+		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|settings.h|../&|; s|canvas.h|../&|' \
+		${WRKSRC}/src/ui/menusystem.cpp
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -ruN qonk.orig/distinfo qonk/distinfo
--- qonk.orig/distinfo	Thu Sep 20 21:31:48 2007
+++ qonk/distinfo	Thu Sep 20 21:34:13 2007
@@ -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 -ruN qonk.orig/files/patch-SDL_gfxPrimitives.h qonk/files/patch-SDL_gfxPrimitives.h
--- qonk.orig/files/patch-SDL_gfxPrimitives.h	Thu Sep 20 21:31:48 2007
+++ qonk/files/patch-SDL_gfxPrimitives.h	Thu Jan  1 03:00:00 1970
@@ -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 -ruN qonk.orig/files/patch-main.cpp qonk/files/patch-main.cpp
--- qonk.orig/files/patch-main.cpp	Thu Sep 20 21:31:48 2007
+++ qonk/files/patch-main.cpp	Thu Jan  1 03:00:00 1970
@@ -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 at liekens.net
- 
-+#include <time.h>
-+
- #include "coordinate.h"
- #include "stars.h"
- #include "planets.h"
diff -ruN qonk.orig/files/patch-src-menumanager.h qonk/files/patch-src-menumanager.h
--- qonk.orig/files/patch-src-menumanager.h	Thu Jan  1 03:00:00 1970
+++ qonk/files/patch-src-menumanager.h	Thu Sep 20 22:04:40 2007
@@ -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 -ruN qonk.orig/pkg-descr qonk/pkg-descr
--- qonk.orig/pkg-descr	Thu Sep 20 21:31:48 2007
+++ qonk/pkg-descr	Thu Sep 20 22:14:35 2007
@@ -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,7 @@
 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
+WWW: http://qonk.sourceforge.net
 
 - Alejandro Pulver
 alejandro at varnet.biz
diff -ruN qonk.orig/pkg-plist qonk/pkg-plist
--- qonk.orig/pkg-plist	Thu Sep 20 21:31:48 2007
+++ qonk/pkg-plist	Thu Sep 20 22:08:09 2007
@@ -1,3 +1,5 @@
 bin/qonk
 %%DATADIR%%/font.ttf
+%%DATADIR%%/highlight.png
+%%DATADIR%%/normal.png
 @dirrm %%DATADIR%%
--- qonk-0.3.1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:

