[116913] trunk/dports/emulators/freesci

[jmr at macports.org]

Revision: 116913
          https://trac.macports.org/changeset/116913
Author:   jmr at macports.org
Date:     2014-02-10 01:06:04 -0800 (Mon, 10 Feb 2014)
Log Message:
-----------
freesci: set license, fix bug instead of telling the compiler to ignore it

Modified Paths:
--------------
    trunk/dports/emulators/freesci/Portfile

Added Paths:
-----------
    trunk/dports/emulators/freesci/files/
    trunk/dports/emulators/freesci/files/sfx_core.c.patch

Modified: trunk/dports/emulators/freesci/Portfile
===================================================================
--- trunk/dports/emulators/freesci/Portfile	2014-02-10 06:44:09 UTC (rev 116912)
+++ trunk/dports/emulators/freesci/Portfile	2014-02-10 09:06:04 UTC (rev 116913)
@@ -1,10 +1,12 @@
 # $Id$
 
 PortSystem          1.0
+
 name                freesci
 version             0.6.4
 revision            4
 categories          emulators
+license             GPL-2
 maintainers         nomaintainer
 description         Interpreter for SCI (old Sierra Online) games
 long_description \
@@ -26,6 +28,7 @@
                     sha1    2761812ab95ed9eb3225717a2d336c0b4098fc76 \
                     rmd160  8aa189f4b9b612fe8625be6b42a9bdfd46fef33b
 
+configure.cflags-append -std=gnu89
 configure.args      --datadir=${prefix}/share/${name} \
                     --mandir=${prefix}/share/man \
                     --with-x --without-sdl
@@ -47,15 +50,10 @@
 	port:libpng
    depends_lib-append      port:libsdl
    configure.args-delete   --with-x --without-sdl
-   configure.args-append   --without-x --with-sdl-prefix=${prefix}
+   configure.args-append   --without-x --with-sdl-prefix=${prefix} --disable-sdltest
 }
 
-# TODO: *REALLY* fix this bug
-# core.c:916:3: error: non-void function 'sfx_send_midi' should return a value [-Wreturn-type]
-if {[string match *clang* ${configure.compiler}]} {
-    configure.cflags-append -Wno-return-type -std=gnu89
-}
-
+patchfiles          sfx_core.c.patch
 post-patch {
     reinplace "s/getline/fs_getline/g" ${worksrcpath}/src/tools/bdfgname.c
 }

Added: trunk/dports/emulators/freesci/files/sfx_core.c.patch
===================================================================
--- trunk/dports/emulators/freesci/files/sfx_core.c.patch	                        (rev 0)
+++ trunk/dports/emulators/freesci/files/sfx_core.c.patch	2014-02-10 09:06:04 UTC (rev 116913)
@@ -0,0 +1,11 @@
+--- src/sfx/core.c.orig	2008-05-03 05:20:50.000000000 +1000
++++ src/sfx/core.c	2014-02-10 19:58:35.000000000 +1100
+@@ -913,7 +913,7 @@ sfx_send_midi(sfx_state_t *self, song_ha
+ 		break;
+ 	default:
+ 		sciprintf("Unexpected explicit MIDI command %02x\n", command);
+-		return;
++		return SFX_ERROR;
+ 	}
+ 
+ 	if (tell)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140210/7f71c185/attachment.html>