From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Jul 20 10:30:17 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D68FB16A4DF for ; Thu, 20 Jul 2006 10:30:17 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 977E343D5A for ; Thu, 20 Jul 2006 10:30:16 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k6KAUG3M082313 for ; Thu, 20 Jul 2006 10:30:16 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k6KAUGGg082312; Thu, 20 Jul 2006 10:30:16 GMT (envelope-from gnats) Resent-Date: Thu, 20 Jul 2006 10:30:16 GMT Resent-Message-Id: <200607201030.k6KAUGGg082312@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Dmitry Marakasov Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4E9F516A4DE for ; Thu, 20 Jul 2006 10:22:44 +0000 (UTC) (envelope-from amdmi3@mail.ru) Received: from mx1.mail.ru (mx1.mail.ru [194.67.23.121]) by mx1.FreeBSD.org (Postfix) with ESMTP id A1B8E43D58 for ; Thu, 20 Jul 2006 10:22:43 +0000 (GMT) (envelope-from amdmi3@mail.ru) Received: from [213.148.29.33] (port=2129 helo=nexii.panopticon) by mx1.mail.ru with esmtp id 1G3Vg2-000Dvg-00 for FreeBSD-gnats-submit@freebsd.org; Thu, 20 Jul 2006 14:22:42 +0400 Received: from hades.panopticon (hades.panopticon [192.168.0.2]) by nexii.panopticon (Postfix) with ESMTP id 7AE3911448 for ; Thu, 20 Jul 2006 14:28:42 +0400 (MSD) Received: by hades.panopticon (Postfix, from userid 0) id 06324B; Thu, 20 Jul 2006 14:24:18 +0400 (MSD) Message-Id: <20060720102418.06324B@hades.panopticon> Date: Thu, 20 Jul 2006 14:24:18 +0400 (MSD) From: Dmitry Marakasov To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/100603: [PATCH] Update games/warzone2100 to 2.0.3 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Dmitry Marakasov List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Jul 2006 10:30:17 -0000 >Number: 100603 >Category: ports >Synopsis: [PATCH] Update games/warzone2100 to 2.0.3 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Jul 20 10:30:15 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Dmitry Marakasov >Release: FreeBSD 6.1-RELEASE i386 >Organization: >Environment: System: FreeBSD hades.panopticon 6.1-RELEASE FreeBSD 6.1-RELEASE #0: Thu May 11 15:07:32 MSD 2006 amdmi3@hades.panopticon:/usr/obj/usr/src/sys/HADES i386 >Description: There is new version of Warzone2100 linux adaption at http://home.gna.org/warzone/. It seem to be based on what is found on http://sf.net/warzone2100 (current port), with numerous changes and fixes and with more intense development. Changes since 0.2.2 (actually 0.2.2->0.2.3->2.0.3) are numerous, and can be seen here http://svn.gna.org/viewcvs/warzone/trunk/CHANGELOG?rev=109&view=markup. I've done severe rewrite of a port, hope alepulver@ won't be mad :) Unfortunately, I didn't manage to find any mirrors in addition to gna.org. Also I'm not sure whether it should me marked as ONLY_FOR_ARCHS=i386 (note in configure about -m32 stuff says code is not yet 64bit - ready) - but if 0.2.2 worked, this should work to. >How-To-Repeat: >Fix: --- warzone2100.patch begins here --- diff -ruN warzone2100.orig/Makefile warzone2100/Makefile --- warzone2100.orig/Makefile Thu Jul 20 14:10:03 2006 +++ warzone2100/Makefile Thu Jul 20 14:09:25 2006 @@ -6,11 +6,10 @@ # PORTNAME= warzone2100 -PORTVERSION= 0.2.2 -PORTREVISON= 2 +PORTVERSION= 2.0.3 CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= http://download.gna.org/warzone/releases/2.0/ +DISTNAME= warzone-${PORTVERSION} MAINTAINER= alepulver@FreeBSD.org COMMENT= Innovative 3D real-time strategy game @@ -20,7 +19,7 @@ ogg.5:${PORTSDIR}/audio/libogg \ openal.0:${PORTSDIR}/audio/openal \ vorbis.3:${PORTSDIR}/audio/libvorbis \ - alut.1:${PORTSDIR}/audio/freealut + physfs-1.0.1:${PORTSDIR}/devel/physfs USE_BZIP2= yes USE_GL= yes @@ -28,55 +27,24 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --program-transform-name="" -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \ - LDFLAGS="-L${X11BASE}/lib" - -SUB_FILES= warzone +CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \ + LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" \ + LIBS="-pthread" post-patch: -# Remove "-m32" flag + @${REINPLACE_CMD} -e '/stdint.h/d' ${WRKSRC}/lib/ivis_opengl/screen.c @${REINPLACE_CMD} -e 's|-m32||' \ - ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} \ - ${WRKSRC}/makerules/common.mk - -# Fix SDL include statement + -e 's|/usr/local|${LOCALBASE}|; s|/usr/X11R6|${X11BASE}|' \ + ${WRKSRC}/configure .for f in configure *.c *.h @${FIND} ${WRKSRC} -type f -name "${f}" -print0 | \ - ${XARGS} -0 ${REINPLACE_CMD} -e \ - 's|\(#include.*\)SDL/\(SDL.*\)|\1\2| ; \ - s|-lopenal |&-lalut|g ; \ - s|"-lalut|"-lopenal -lalut|' + ${XARGS} -0 ${REINPLACE_CMD} -e 's|SDL/|SDL11/|' .endfor -do-install: -# Script - @${INSTALL_SCRIPT} ${WRKDIR}/warzone ${PREFIX}/bin - -# Program - @${INSTALL_PROGRAM} ${WRKSRC}/src/warzone ${PREFIX}/libexec - -# Data - @${MKDIR} ${DATADIR} - @${CP} -R ${WRKSRC}/data/* ${DATADIR} - -# Documentation .if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} -.endif - post-install: -# Fix permissions - @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DATADIR} - @${FIND} ${DATADIR} -type f -print0 | \ - ${XARGS} -0 ${CHMOD} ${SHAREMODE} - @${FIND} ${DATADIR} -type d -print0 | \ - ${XARGS} -0 ${CHMOD} ${BINMODE} - -.include - -.if ${OSVERSION} < 500000 -IGNORE= does not compile (missing stdint.h) + @${MKDIR} ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/ .endif -.include +.include diff -ruN warzone2100.orig/distinfo warzone2100/distinfo --- warzone2100.orig/distinfo Thu Jul 20 14:10:03 2006 +++ warzone2100/distinfo Thu Jul 20 14:09:25 2006 @@ -1,3 +1,3 @@ -MD5 (warzone2100-0.2.2.tar.bz2) = b23fa1896856c3b9ee37b39029e4c532 -SHA256 (warzone2100-0.2.2.tar.bz2) = 677e891a25c7caae96fc8e3226945bb5b5ffa1258a3ef9023365c03d7b47e062 -SIZE (warzone2100-0.2.2.tar.bz2) = 31076323 +MD5 (warzone-2.0.3.tar.bz2) = 2396e0def69e5e48902448d04944927a +SHA256 (warzone-2.0.3.tar.bz2) = 7668f6b794faad8d7ae66dbd0c7317df2521b33593f29174ab3fecb647326749 +SIZE (warzone-2.0.3.tar.bz2) = 19902273 diff -ruN warzone2100.orig/files/patch-src_loadsave.c warzone2100/files/patch-src_loadsave.c --- warzone2100.orig/files/patch-src_loadsave.c Thu Jul 20 14:10:03 2006 +++ warzone2100/files/patch-src_loadsave.c Thu Jan 1 03:00:00 1970 @@ -1,22 +0,0 @@ ---- src/loadsave.c.orig Wed Jul 27 13:33:56 2005 -+++ src/loadsave.c Thu Sep 22 15:40:54 2005 -@@ -341,7 +341,8 @@ - } - } - } -- closedir(d); -+ if (d) -+ closedir(d); - } - #endif - bLoadSaveUp = TRUE; -@@ -444,7 +445,8 @@ - DeleteFile(entry->d_name); - } - -- closedir(d); -+ if (d) -+ closedir(d); - } - #endif - diff -ruN warzone2100.orig/files/warzone.in warzone2100/files/warzone.in --- warzone2100.orig/files/warzone.in Thu Jul 20 14:10:03 2006 +++ warzone2100/files/warzone.in Thu Jan 1 03:00:00 1970 @@ -1,7 +0,0 @@ -#!/bin/sh - -# The executable needs to be run from its data directory. - -cd %%DATADIR%% || exit 1 - -exec %%PREFIX%%/libexec/warzone "$@" diff -ruN warzone2100.orig/pkg-descr warzone2100/pkg-descr --- warzone2100.orig/pkg-descr Thu Jul 20 14:10:03 2006 +++ warzone2100/pkg-descr Thu Jul 20 14:09:25 2006 @@ -10,4 +10,4 @@ now, Warzone 2100 works very well on Windows and GNU/Linux, and we have even heard of it running on BSD with no particular issue. -WWW: http://warzone2100.sf.net/ +WWW: http://home.gna.org/warzone/ diff -ruN warzone2100.orig/pkg-plist warzone2100/pkg-plist --- warzone2100.orig/pkg-plist Thu Jul 20 14:10:03 2006 +++ warzone2100/pkg-plist Thu Jul 20 14:09:25 2006 @@ -1,93 +1,4 @@ bin/warzone -libexec/warzone -%%PORTDOCS%%%%DOCSDIR%%/README -%%DATADIR%%/2c-ardvark.wdg -%%DATADIR%%/2c-bitofabarny.wdg -%%DATADIR%%/2c-marspyscho.wdg -%%DATADIR%%/8c-mars3gorges_8.wdg -%%DATADIR%%/8c-marscodao.wdg -%%DATADIR%%/8c-marsendgame.wdg -%%DATADIR%%/8c-marsnrglvalis.wdg -%%DATADIR%%/8c-marsrelic.wdg -%%DATADIR%%/aug27.wdg -%%DATADIR%%/cam2tech.wdg -%%DATADIR%%/dec00.wdg -%%DATADIR%%/july30.wdg -%%DATADIR%%/june25.wdg -%%DATADIR%%/marsbetamaps.txt -%%DATADIR%%/may21.wdg -%%DATADIR%%/may28.wdg -%%DATADIR%%/multiplay/skirmish/player0.slo -%%DATADIR%%/multiplay/skirmish/player0.vlo -%%DATADIR%%/multiplay/skirmish/player1.slo -%%DATADIR%%/multiplay/skirmish/player1.vlo -%%DATADIR%%/multiplay/skirmish/player2.slo -%%DATADIR%%/multiplay/skirmish/player2.vlo -%%DATADIR%%/multiplay/skirmish/player3.slo -%%DATADIR%%/multiplay/skirmish/player3.vlo -%%DATADIR%%/multiplay/skirmish/player4.slo -%%DATADIR%%/multiplay/skirmish/player4.vlo -%%DATADIR%%/multiplay/skirmish/player5.slo -%%DATADIR%%/multiplay/skirmish/player5.vlo -%%DATADIR%%/multiplay/skirmish/player6.slo -%%DATADIR%%/multiplay/skirmish/player6.vlo -%%DATADIR%%/multiplay/skirmish/player7.slo -%%DATADIR%%/multiplay/skirmish/player7.vlo -%%DATADIR%%/multiplay/skirmish/rules.slo -%%DATADIR%%/multiplay/skirmish/rules.vlo -%%DATADIR%%/multiplay/skirmish/scriptlang.rtf -%%DATADIR%%/multiplay/skirmish/sk2tech.vlo -%%DATADIR%%/multiplay/skirmish/sk3tech.vlo -%%DATADIR%%/multiplay/skirmish/sktech.slo -%%DATADIR%%/music/music.wpl -%%DATADIR%%/music/neos_aurore.ogg -%%DATADIR%%/music/neos_chocolat.ogg -%%DATADIR%%/music/neos_down.ogg -%%DATADIR%%/music/neos_esperance.ogg -%%DATADIR%%/music/neos_indy.ogg -%%DATADIR%%/music/neos_symphonie_du_vide.ogg -%%DATADIR%%/newmaps.wdg -%%DATADIR%%/newtech.wdg -%%DATADIR%%/nov.wdg -%%DATADIR%%/oct.wdg -%%DATADIR%%/sep30.wdg -%%DATADIR%%/skirmish3.wdg -%%DATADIR%%/stats/names.txt -%%DATADIR%%/texpages/bdrops/00-bdrop.jpg -%%DATADIR%%/texpages/bdrops/00-bdrop.pcx -%%DATADIR%%/texpages/bdrops/01-bdrop.jpg -%%DATADIR%%/texpages/bdrops/01-bdrop.pcx -%%DATADIR%%/texpages/bdrops/02-bdrop.jpg -%%DATADIR%%/texpages/bdrops/02-bdrop.pcx -%%DATADIR%%/texpages/bdrops/03-bdrop.jpg -%%DATADIR%%/texpages/bdrops/03-bdrop.pcx -%%DATADIR%%/texpages/bdrops/04-bdrop.jpg -%%DATADIR%%/texpages/bdrops/04-bdrop.pcx -%%DATADIR%%/texpages/bdrops/05-bdrop.jpg -%%DATADIR%%/texpages/bdrops/05-bdrop.pcx -%%DATADIR%%/texpages/bdrops/06-bdrop.jpg -%%DATADIR%%/texpages/bdrops/06-bdrop.pcx -%%DATADIR%%/texpages/bdrops/credits.jpg -%%DATADIR%%/texpages/bdrops/credits.pcx -%%DATADIR%%/texpages/bdrops/missionend.jpg -%%DATADIR%%/texpages/bdrops/missionend.pcx -%%DATADIR%%/texpages/readme.txt -%%DATADIR%%/texpages/tertilesc1.pcx -%%DATADIR%%/texpages/tertilesc2.pcx -%%DATADIR%%/texpages/tertilesc3.pcx -%%DATADIR%%/texpages/tertilesc4hw.pcx -%%DATADIR%%/texpages/tertilesc5.pcx -%%DATADIR%%/texpages/tertilesc5hw.pcx -%%DATADIR%%/texpages/tertilesc6.pcx -%%DATADIR%%/texpages/tertilesc7.pcx -%%DATADIR%%/texpages/tertilesc7hw.pcx -%%DATADIR%%/update.rtf -%%DATADIR%%/warzone.wdg -@dirrm %%DATADIR%%/texpages/bdrops -@dirrm %%DATADIR%%/texpages -@dirrm %%DATADIR%%/stats -@dirrm %%DATADIR%%/music -@dirrm %%DATADIR%%/multiplay/skirmish -@dirrm %%DATADIR%%/multiplay +%%DATADIR%%/mp.wz +%%DATADIR%%/warzone.wz @dirrm %%DATADIR%% -%%PORTDOCS%%@dirrm %%DOCSDIR%% --- warzone2100.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: