[83133] trunk/dports/games/neverball

26 Aug 2011

Revision: 83133
          http://trac.macports.org/changeset/83133
Author:   ryandesign@macports.org
Date:     2011-08-25 23:29:05 -0700 (Thu, 25 Aug 2011)
Log Message:
-----------
neverball:

 * update to 1.5.4 (#23680)
 * update homepage
 * use the correct -arch flags

Modified Paths:
--------------
    trunk/dports/games/neverball/Portfile
    trunk/dports/games/neverball/files/patch-Makefile.diff

Added Paths:
-----------
    trunk/dports/games/neverball/files/patch-share-fs.c.diff

Removed Paths:
-------------
    trunk/dports/games/neverball/files/patch-ball-main.c
    trunk/dports/games/neverball/files/patch-putt-main.c
    trunk/dports/games/neverball/files/patch-share-mapc.c

Modified: trunk/dports/games/neverball/Portfile
===================================================================

--- trunk/dports/games/neverball/Portfile	2011-08-26 06:28:05 UTC (rev 83132)
+++ trunk/dports/games/neverball/Portfile	2011-08-26 06:29:05 UTC (rev 83133)
@@ -3,44 +3,63 @@
 PortSystem 1.0
 
 name		neverball
-version		1.4.0
-revision	1
+version             1.5.4
 categories	games
 platforms	darwin
 maintainers	gmail.com:mvitocruz
+license             GPL-2+
+
 description	Tilt the floor to roll a ball through an obstacle course.
 long_description	\
 		Tilt the floor to roll a ball through an obstacle     \
 		course before time runs out. Neverball is part puzzle \
 		game, part action game, and entirely a test of skill.
 
-homepage	http://icculus.org/neverball/
+homepage            http://neverball.org/
 master_sites	${homepage}
-checksums	md5 a6cd860f1c2b7d8cecbcfc05ff228ef0
-patchfiles	patch-Makefile.diff patch-ball-main.c patch-putt-main.c patch-share-mapc.c
 
+checksums           rmd160  f546b5e6c12df1a125976a7e23fa55146480241d \
+                    sha256  ea31ca9f6eec70c8e66eaa20d7ce9e48295fdb077313b97637c503b16b7b0da6
+
 depends_lib	path:lib/pkgconfig/sdl.pc:libsdl \
-		port:libsdl_image \
-		port:libsdl_mixer \
-		port:libsdl_ttf
+                    port:libpng \
+                    port:jpeg \
+                    port:libvorbis \
+                    port:libsdl_ttf \
+                    port:physfs
 
+patchfiles          patch-Makefile.diff \
+                    patch-share-fs.c.diff
+
 post-patch {
-	reinplace "s|./data|${prefix}/share/${name}|g" ${worksrcpath}/share/config.h
+    reinplace "s|@CPPFLAGS@|${configure.cppflags}|g" ${worksrcpath}/Makefile
 }
 
 use_configure	no
 
-build.args	CC=${configure.cc}
+build.args          CC="${configure.cc} [get_canonical_archflags]" \
+                    DATADIR=${prefix}/share/games/${name}
 
 destroot {
-	xinstall -d -m 755 ${destroot}${prefix}/share/
-	file copy ${worksrcpath}/data ${destroot}${prefix}/share/${name}
-	xinstall -s -m 755 ${worksrcpath}/neverball ${destroot}${prefix}/bin
-	xinstall -s -m 755 ${worksrcpath}/neverputt ${destroot}${prefix}/bin
+    xinstall -d -m 755 ${destroot}${prefix}/share/games
+    file copy ${worksrcpath}/data ${destroot}${prefix}/share/games/${name}
+    fs-traverse item ${destroot}${prefix}/share/games/${name} {
+        if {[file isfile ${item}]} {
+            switch [file extension ${item}] {
+                .map {
+                    delete ${item}
+                }
+                .sol {
+                    file attributes ${item} -permissions 0644
+                }
+            }
+        }
+    }
+    xinstall -s -m 755 -W ${worksrcpath} neverball neverputt ${destroot}${prefix}/bin
 }
 
-platform darwin {
-	pre-destroot {
+platform macosx {
+	post-destroot {
 		xinstall -d -m 755 \
 			${destroot}${applications_dir}/Neverball.app/Contents/MacOS \
 			${destroot}${applications_dir}/Neverputt.app/Contents/MacOS

Modified: trunk/dports/games/neverball/files/patch-Makefile.diff
===================================================================
--- trunk/dports/games/neverball/files/patch-Makefile.diff	2011-08-26 06:28:05 UTC (rev 83132)
+++ trunk/dports/games/neverball/files/patch-Makefile.diff	2011-08-26 06:29:05 UTC (rev 83133)
@@ -1,26 +1,25 @@
---- Makefile.orig	2004-09-09 06:31:40.000000000 +1000
-+++ Makefile	2011-08-10 08:22:24.000000000 +1000
-@@ -6,12 +6,12 @@
- #X11_PATH= -L/usr/X11/lib
- #X11_PATH= -L/usr/X11R6/lib
+--- Makefile.orig	2009-09-20 05:06:00.000000000 -0500
++++ Makefile	2011-08-24 18:24:50.000000000 -0500
+@@ -87,11 +87,8 @@
+     ALL_CPPFLAGS += -DENABLE_WII=1
+ endif
  
--OGL_LIBS= -lGL -lm
-+OGL_LIBS= -framework OpenGL -lm
- #OGL_LIBS= -lm                                                # Think Different
+-ifdef DARWIN
+-    ALL_CPPFLAGS += -I/opt/local/include
+-endif
  
+-ALL_CPPFLAGS += $(CPPFLAGS)
++ALL_CPPFLAGS += $(CPPFLAGS) @CPPFLAGS@
+ 
  #------------------------------------------------------------------------------
+ # Libraries
+@@ -133,9 +130,6 @@
  
--CFLAGS= -Wall -O3 -ansi $(shell sdl-config --cflags)
-+CFLAGS= -Wall -O3 -ansi $(shell sdl-config --cflags) -FOpenGL
- #CFLAGS= -Wall -g -ansi $(shell sdl-config --cflags)
- #CFLAGS= -Wall -pg -ansi $(shell sdl-config --cflags)
+ BASE_LIBS := -ljpeg $(PNG_LIBS) $(FS_LIBS)
  
-@@ -265,7 +265,7 @@
- 	$(CC) $(CFLAGS) -o $(PUTT_TARG) $(PUTT_OBJS) $(LIBS)
+-ifdef DARWIN
+-    BASE_LIBS += -L/opt/local/lib
+-endif
  
- $(MAPC_TARG) : $(MAPC_OBJS)
--	$(CC) $(CFLAGS) -o $(MAPC_TARG) $(MAPC_OBJS) $(LIBS)
-+	$(CC) $(CFLAGS) -o $(MAPC_TARG) $(MAPC_OBJS) `echo $(LIBS) | sed 's|-lSDLmain||'`
- 
- clean-src :
- 	rm -f $(BALL_TARG) $(BALL_OBJS) $(BALL_DEPS)
+ ALL_LIBS := $(SDL_LIBS) $(BASE_LIBS) $(TILT_LIBS) $(INTL_LIBS) -lSDL_ttf \
+     -lvorbisfile $(OGL_LIBS)

Deleted: trunk/dports/games/neverball/files/patch-ball-main.c
===================================================================
--- trunk/dports/games/neverball/files/patch-ball-main.c	2011-08-26 06:28:05 UTC (rev 83132)
+++ trunk/dports/games/neverball/files/patch-ball-main.c	2011-08-26 06:29:05 UTC (rev 83133)
@@ -1,14 +0,0 @@
---- ball/main.c.old	Sat Feb 12 23:07:56 2005
-+++ ball/main.c	Sat Feb 12 23:08:18 2005
-@@ -97,11 +97,7 @@
-             {
-             case SDL_MOUSEMOTION:
-                 st_point(+e.motion.x,
--#ifdef __APPLE__
--                         +e.motion.y,
--#else
-                          -e.motion.y + config_get_d(CONFIG_HEIGHT),
--#endif
-                          +e.motion.xrel,
-                          config_get_d(CONFIG_MOUSE_INVERT)
-                          ? +e.motion.yrel : -e.motion.yrel);

Deleted: trunk/dports/games/neverball/files/patch-putt-main.c
===================================================================
--- trunk/dports/games/neverball/files/patch-putt-main.c	2011-08-26 06:28:05 UTC (rev 83132)
+++ trunk/dports/games/neverball/files/patch-putt-main.c	2011-08-26 06:29:05 UTC (rev 83133)
@@ -1,14 +0,0 @@
---- putt/main.c.old	Sat Feb 12 23:07:56 2005
-+++ putt/main.c	Sat Feb 12 23:08:05 2005
-@@ -103,11 +103,7 @@
-             {
-             case SDL_MOUSEMOTION:
-                 st_point(+e.motion.x,
--#ifdef __APPLE__
--                         +e.motion.y,
--#else
-                          -e.motion.y + config_get_d(CONFIG_HEIGHT),
--#endif
-                          +e.motion.xrel,
-                          -e.motion.yrel);
-                 break;

Added: trunk/dports/games/neverball/files/patch-share-fs.c.diff
===================================================================
--- trunk/dports/games/neverball/files/patch-share-fs.c.diff	                        (rev 0)
+++ trunk/dports/games/neverball/files/patch-share-fs.c.diff	2011-08-26 06:29:05 UTC (rev 83133)
@@ -0,0 +1,19 @@
+--- share/fs.c.orig	2009-09-20 05:06:00.000000000 -0500
++++ share/fs.c	2010-03-26 18:35:06.000000000 -0500
+@@ -389,16 +389,9 @@
+ 
+ /* -------------------------------------------------------------------------- */
+ 
+-/*
+- * Trying to avoid defining a feature test macro for every platform by
+- * declaring vsnprintf with the C99 signature.  This is probably bad.
+- */
+-
+ #include <stdio.h>
+ #include <stdarg.h>
+ 
+-extern int vsnprintf(char *, size_t, const char *, va_list);
+-
+ int fs_printf(fs_file fh, const char *fmt, ...)
+ {
+     char *buff;

Deleted: trunk/dports/games/neverball/files/patch-share-mapc.c
===================================================================
--- trunk/dports/games/neverball/files/patch-share-mapc.c	2011-08-26 06:28:05 UTC (rev 83132)
+++ trunk/dports/games/neverball/files/patch-share-mapc.c	2011-08-26 06:29:05 UTC (rev 83133)
@@ -1,10 +0,0 @@
---- share/mapc.c.orig	2004-08-29 08:26:29.000000000 +1000
-+++ share/mapc.c	2011-08-10 08:16:35.000000000 +1000
-@@ -26,6 +26,7 @@
- /*---------------------------------------------------------------------------*/
- 
- #include <SDL.h>
-+#undef main
- #include <SDL_image.h>
- #include <stdio.h>
- #include <stdlib.h>

    

[83133] trunk/dports/games/neverball

ryandesign＠macports.org