Changeset 83133

Timestamp:

08/25/11 23:29:05 (4 years ago)

Author:

ryandesign@…

Message:

neverball:

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

Location:

trunk/dports/games/neverball

Files:

• Portfile (modified) (2 diffs)
• files/patch-Makefile.diff (modified) (1 diff)
• files/patch-ball-main.c (deleted)
• files/patch-putt-main.c (deleted)
• files/patch-share-fs.c.diff (added)
• files/patch-share-mapc.c (deleted)

trunk/dports/games/neverball/Portfile

@@ -4 +4 @@
 
 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        \
@@ -15 +16 @@
                 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 \

trunk/dports/games/neverball/files/patch-Makefile.diff

@@ -1 @@
---- 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)