From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Jul 30 13:40:24 2005 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 4F1BD16A41F for ; Sat, 30 Jul 2005 13:40:24 +0000 (GMT) (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 9079443D4C for ; Sat, 30 Jul 2005 13:40:23 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j6UDeNG5013034 for ; Sat, 30 Jul 2005 13:40:23 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j6UDeNo6013033; Sat, 30 Jul 2005 13:40:23 GMT (envelope-from gnats) Resent-Date: Sat, 30 Jul 2005 13:40:23 GMT Resent-Message-Id: <200507301340.j6UDeNo6013033@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, "Alejandro Pulver" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AEBC716A41F for ; Sat, 30 Jul 2005 13:40:18 +0000 (GMT) (envelope-from alejandro@varnet.biz) Received: from relay.pair.com (relay00.pair.com [209.68.1.20]) by mx1.FreeBSD.org (Postfix) with SMTP id 25EA443D49 for ; Sat, 30 Jul 2005 13:40:17 +0000 (GMT) (envelope-from alejandro@varnet.biz) Received: (qmail 74444 invoked from network); 30 Jul 2005 13:40:16 -0000 Received: from unknown (HELO phobos.mars.bsd) (unknown) by unknown with SMTP; 30 Jul 2005 13:40:16 -0000 Message-Id: <1122730822.0@phobos.mars.bsd> Date: Sat, 30 Jul 2005 10:40:22 -0300 From: "Alejandro Pulver" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.6 Cc: Subject: ports/84343: [MAINTAINER UPDATE] games/freedroidrpg: fix compilation under FreeBSD >= 6 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Jul 2005 13:40:24 -0000 >Number: 84343 >Category: ports >Synopsis: [MAINTAINER UPDATE] games/freedroidrpg: fix compilation under FreeBSD >= 6 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Jul 30 13:40:22 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Alejandro Pulver >Release: FreeBSD 5.4-RELEASE i386 >Organization: >Environment: >Description: * Add USE_GL. * Use one of the existing patches only if OSVERSION < 600021. >How-To-Repeat: >Fix: --- freedroidrpg.diff begins here --- diff -urN freedroidrpg.old/Makefile freedroidrpg/Makefile --- freedroidrpg.old/Makefile Mon Jul 25 04:35:28 2005 +++ freedroidrpg/Makefile Fri Jul 29 14:29:11 2005 @@ -15,14 +15,15 @@ MAINTAINER= alejandro@varnet.biz COMMENT= Modification of the classical Freedroid engine into an RPG -USE_XLIB= yes USE_BZIP2= yes -USE_SDL= mixer image net sdl USE_REINPLACE= yes -GNU_CONFIGURE= yes +USE_GL= yes USE_GMAKE= yes USE_GNOME= gtk12 +USE_SDL= mixer image net sdl +USE_XLIB= yes +GNU_CONFIGURE= yes CONFIGURE_ARGS= --program-transform-name= MAN6= freedroidRPG.6 @@ -31,6 +32,10 @@ .if ${OSVERSION} < 500000 BROKEN= "does not compile (missing fenv.h)" +.endif + +.if ${OSVERSION} < 600021 +EXTRA_PATCHES= ${FILESDIR}/extra-patch-init.c .endif post-patch: diff -urN freedroidrpg.old/files/extra-patch-init.c freedroidrpg/files/extra-patch-init.c --- freedroidrpg.old/files/extra-patch-init.c Wed Dec 31 21:00:00 1969 +++ freedroidrpg/files/extra-patch-init.c Tue Jul 19 13:13:27 2005 @@ -0,0 +1,18 @@ +--- src/init.c.orig Mon Jul 18 02:00:54 2005 ++++ src/init.c Mon Jul 18 02:05:10 2005 +@@ -58,14 +58,9 @@ + * section about 'Arithmethic', subsection on floating point control + * functions. + * ---------------------------------------------------------------------- */ +-#if defined __APPLE_CC__ +-/* turn off these function-call on OS X, where there are not present */ ++/* turn off these function-call */ + int feenableexcept (int excepts) { return 0;} + int fedisableexcept (int TheExceptionFlags ) { return 0; } +-#else +-extern int feenableexcept (int excepts); +-extern int fedisableexcept (int TheExceptionFlags ); +-#endif + + /* ---------------------------------------------------------------------- + * diff -urN freedroidrpg.old/files/patch-init.c freedroidrpg/files/patch-init.c --- freedroidrpg.old/files/patch-init.c Tue Jul 19 13:13:27 2005 +++ freedroidrpg/files/patch-init.c Wed Dec 31 21:00:00 1969 @@ -1,18 +0,0 @@ ---- src/init.c.orig Mon Jul 18 02:00:54 2005 -+++ src/init.c Mon Jul 18 02:05:10 2005 -@@ -58,14 +58,9 @@ - * section about 'Arithmethic', subsection on floating point control - * functions. - * ---------------------------------------------------------------------- */ --#if defined __APPLE_CC__ --/* turn off these function-call on OS X, where there are not present */ -+/* turn off these function-call */ - int feenableexcept (int excepts) { return 0;} - int fedisableexcept (int TheExceptionFlags ) { return 0; } --#else --extern int feenableexcept (int excepts); --extern int fedisableexcept (int TheExceptionFlags ); --#endif - - /* ---------------------------------------------------------------------- - * --- freedroidrpg.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: