From alejandro@varnet.biz  Sat Jul 30 13:40:18 2005
Return-Path: <alejandro@varnet.biz>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id AEBC716A41F
	for <FreeBSD-gnats-submit@freebsd.org>; 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 <FreeBSD-gnats-submit@freebsd.org>; 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" <alejandro@varnet.biz>
To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@freebsd.org>
Subject: [MAINTAINER UPDATE] games/freedroidrpg: fix compilation under FreeBSD >= 6
X-Send-Pr-Version: gtk-send-pr 0.4.6 
X-GNATS-Notify:

>Number:         84343
>Category:       ports
>Synopsis:       [MAINTAINER UPDATE] games/freedroidrpg: fix compilation under FreeBSD >= 6
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    lesi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jul 30 13:40:22 GMT 2005
>Closed-Date:    Sat Jul 30 15:55:13 GMT 2005
>Last-Modified:  Sat Jul 30 15:55:13 GMT 2005
>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:
Responsible-Changed-From-To: freebsd-ports-bugs->lesi 
Responsible-Changed-By: lesi 
Responsible-Changed-When: Sat Jul 30 15:29:52 GMT 2005 
Responsible-Changed-Why:  
Grab. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=84343 
State-Changed-From-To: open->closed 
State-Changed-By: lesi 
State-Changed-When: Sat Jul 30 15:54:41 GMT 2005 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=84343 
>Unformatted:
