From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Oct 30 23:30:02 2007 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 48F4D16A46B for ; Tue, 30 Oct 2007 23:30:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 22BB413C4BC for ; Tue, 30 Oct 2007 23:30:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.1/8.14.1) with ESMTP id l9UNU1lY010774 for ; Tue, 30 Oct 2007 23:30:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.1/8.14.1/Submit) id l9UNU10Z010773; Tue, 30 Oct 2007 23:30:01 GMT (envelope-from gnats) Resent-Date: Tue, 30 Oct 2007 23:30:01 GMT Resent-Message-Id: <200710302330.l9UNU10Z010773@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 [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 94AA716A417 for ; Tue, 30 Oct 2007 23:23:45 +0000 (UTC) (envelope-from amdmi3@amdmi3.ru) Received: from cp65.agava.net (cp65.agava.net [89.108.66.215]) by mx1.freebsd.org (Postfix) with ESMTP id 2F5D513C48D for ; Tue, 30 Oct 2007 23:23:45 +0000 (UTC) (envelope-from amdmi3@amdmi3.ru) Received: from [213.148.20.85] (helo=nexii.panopticon) by cp65.agava.net with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.44 (FreeBSD)) id 1In07n-000Imy-2v for FreeBSD-gnats-submit@freebsd.org; Wed, 31 Oct 2007 02:03:55 +0300 Received: from hades.panopticon (hades.panopticon [192.168.0.2]) by nexii.panopticon (Postfix) with ESMTP id 5BD421703E for ; Wed, 31 Oct 2007 02:04:33 +0300 (MSK) Received: by hades.panopticon (Postfix, from userid 1000) id A90874252; Wed, 31 Oct 2007 02:05:27 +0300 (MSK) Message-Id: <20071030230527.A90874252@hades.panopticon> Date: Wed, 31 Oct 2007 02:05:27 +0300 (MSK) From: Dmitry Marakasov To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/117697: [MAINTAINER] games/diameter: update to 0.4.0.2 (== fix build on amd64/gcc42) 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: Tue, 30 Oct 2007 23:30:02 -0000 >Number: 117697 >Category: ports >Synopsis: [MAINTAINER] games/diameter: update to 0.4.0.2 (== fix build on amd64/gcc42) >Confidential: no >Severity: serious >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Oct 30 23:30:01 UTC 2007 >Closed-Date: >Last-Modified: >Originator: Dmitry Marakasov >Release: FreeBSD 6.1-RELEASE-p20 i386 >Organization: >Environment: System: FreeBSD hades.panopticon 6.1-RELEASE-p20 FreeBSD 6.1-RELEASE-p20 #1: Tue Oct 23 05:28:10 MSD 2007 root@hades.panopticon:/usr/obj/usr/src/sys/HADES i386 >Description: - Update to 0.4.0.2, which fixes build on amd64 with gcc42 There are no functional changes between 0.4.0.1 and 0.4.0.2, only 64bit fixes and some patches merged from the port, diff-proven. >How-To-Repeat: >Fix: --- diameter-0.4.0.2.shar begins here --- diff -ruN diameter.orig/Makefile diameter/Makefile --- diameter.orig/Makefile Thu Oct 25 02:48:26 2007 +++ diameter/Makefile Wed Oct 31 01:30:27 2007 @@ -6,12 +6,10 @@ # PORTNAME= diameter -PORTVERSION= 0.4.0.1 -PORTREVISION= 1 +PORTVERSION= 0.4.0.2 CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITES= SF MASTER_SITE_SUBDIR= gamediameter -DISTNAME= ${PORTNAME}-${PORTVERSION} MAINTAINER= amdmi3@amdmi3.ru COMMENT= Arcade-style game with elements of economy and adventure @@ -24,7 +22,6 @@ USE_GMAKE= yes USE_GL= yes USE_SDL= sdl mixer image -USE_GCC= 3.4+ USE_PYTHON= yes WRKSRC= ${WRKDIR}/gamediameter @@ -34,20 +31,8 @@ DATADIR= ${PREFIX}/share/gamediameter -.include - -.if ${OSVERSION} >= 700042 -.if ${ARCH} == "amd64" || ${ARCH} == "sparc64" -BROKEN= Does not compile with GCC 4.2 -.endif -.endif - post-patch: - @${REINPLACE_CMD} -e '/PKG_CONFIG/ s|libpng|libpng12|' \ - -e 's|sdl-config|$$SDL_CONFIG|' \ - -e '/LIBS/ s|-lSDL |`$$SDL_CONFIG --libs` |' \ - -e '/^CFLAGS=.*march/ d' \ - -e '/PKG_CHECK_MODULES/ s|^|#|' \ - ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}|; /^CFLAGS=.*march/ d; \ + /PKG_CONFIG/ s|libpng|libpng12|' ${WRKSRC}/configure -.include +.include diff -ruN diameter.orig/distinfo diameter/distinfo --- diameter.orig/distinfo Thu Oct 25 02:48:26 2007 +++ diameter/distinfo Wed Oct 31 01:26:31 2007 @@ -1,3 +1,3 @@ -MD5 (diameter-0.4.0.1.tar.bz2) = 9a6c397c99188d0dc214b4455c2bf032 -SHA256 (diameter-0.4.0.1.tar.bz2) = c62687bbd469cec4ef99f73bf4682b645119943dbd4f55143f60cc7427afe68f -SIZE (diameter-0.4.0.1.tar.bz2) = 4760022 +MD5 (diameter-0.4.0.2.tar.bz2) = b9f8c0ea61f21ea33d802da83d28366a +SHA256 (diameter-0.4.0.2.tar.bz2) = eaa1ba0b35c3ba25c16fa0104a2a3a6096d94c2a45a048006456932e340430ea +SIZE (diameter-0.4.0.2.tar.bz2) = 4777529 diff -ruN diameter.orig/files/patch-src-main.cpp diameter/files/patch-src-main.cpp --- diameter.orig/files/patch-src-main.cpp Thu Oct 25 02:48:26 2007 +++ diameter/files/patch-src-main.cpp Thu Jan 1 03:00:00 1970 @@ -1,18 +0,0 @@ ---- src/main.cpp.orig Mon Jan 29 18:36:35 2007 -+++ src/main.cpp Wed Jan 31 16:36:40 2007 -@@ -9,7 +9,6 @@ - #ifdef _POSIX_C_SOURCE // shut up pyconfig.h complaints - #undef _POSIX_C_SOURCE - #endif --#include - - #ifdef __unix__ - #else -@@ -41,6 +40,7 @@ - #include "./res/loadworld.h" - #include "./wor/pylevel.h" - -+#include - - TextureList TTemp; - UTextureList TextureDelet; --- diameter-0.4.0.2.shar ends here --- >Release-Note: >Audit-Trail: >Unformatted: