Changeset 83027

Timestamp:

08/23/11 18:27:31 (4 years ago)

Author:

ryandesign@…

Message:

2Pong: update to 1.0.1a (which is a complete rewrite, hence the Portfile changes significantly); can now build 64-bit (and universal); rewrite master_sites to avoid redirects; fix livecheck

Location:

trunk/dports/games/2Pong

Files:

• Portfile (modified) (2 diffs)
• files/2Pong.in (added)
• files/patch-Makefile.diff (modified) (1 diff)
• files/patch-defs.h.diff (added)

trunk/dports/games/2Pong/Portfile

@@ -5 +5 @@
 
 name                    2Pong
-version                 0.6
-revision                2
+version                 1.0.1a
 categories              games
 platforms               darwin
@@ -13 +12 @@
 installs_libs           no
 
-# Compiles ok for x86_64 but crashes on launch
-supported_archs         i386 ppc
-
 description             Pong game with 2 balls, 2 and 4 player support
 long_description        ${description}
 
 homepage                http://twopong.sourceforge.net/
-master_sites            sourceforge:twopong
-checksums               md5 55d54deb30f079d4b2684b7f7c8ab57f
-use_bzip2               yes
+master_sites            sourceforge:project/twopong/2Pong/2Pong-${version}
+distname                2pong-src-${version}
+worksrcdir              2Pong-Source
+
+checksums               rmd160  43e0cde2485a3b89a4009db80118dda4a14aa82c \
+                        sha256  4075bf686126f785e10f3ff9dcaa7febc05291ad6ddf7a84bf2dd2890382a87b
 
 depends_lib             path:lib/pkgconfig/sdl.pc:libsdl \
-                        port:libsdl_image \
-                        port:libsdl_mixer
+                        port:libsdl_net \
+                        port:libsdl_mixer \
+                        port:libiconv \
+                        port:zlib \
+                        port:libxml2
 
-patchfiles              patch-Makefile.diff
+post-extract {
+    copy ${filespath}/${name}.in ${workpath}/${name}
+}
+
+patchfiles              patch-Makefile.diff \
+                        patch-defs.h.diff
+
+post-patch {
+    reinplace "s|@PREFIX@|${prefix}|g" ${workpath}/${name}
+}
 
 use_configure           no
 
+variant universal {}
+
+build.dir               ${worksrcpath}/src
 build.args              CC="${configure.cc} [get_canonical_archflags]" \
-                        CFLAGS="-I${prefix}/include -I${prefix}/include/SDL"
+                        CPPFLAGS="${configure.cppflags}" \
+                        CXX="${configure.cxx} [get_canonical_archflags]" \
+                        LINK="${configure.cxx} [get_canonical_archflags]"
 
-destroot.destdir        PRE=${destroot}${prefix}
-
-post-destroot {
-    reinplace s|${destroot}${prefix}|${prefix}|g ${destroot}${prefix}/bin/2Pong
+destroot {
+    xinstall ${workpath}/${name} ${destroot}${prefix}/bin
+    xinstall -d ${destroot}${prefix}/share/${name}/src ${destroot}${prefix}/libexec/${name}
+    xinstall ${worksrcpath}/2pong ${destroot}${prefix}/libexec/${name}/${name}
+    copy ${worksrcpath}/conf.xml ${destroot}${prefix}/share/${name}
+    copy ${worksrcpath}/src/data ${destroot}${prefix}/share/${name}/src
 }
 
-app.icon                Graphics/2pongicon.png
+app.icon                src/icon.bmp
 
-livecheck.version       ${name}-${version}
-livecheck.distname      ${name}
+livecheck.regex         /2pong-src-(\[0-9a-z.\]+)${extract.suffix}

trunk/dports/games/2Pong/files/patch-Makefile.diff

@@ -1 @@
---- Makefile.orig       2003-07-15 08:16:20.000000000 -0500
-+++ Makefile    2011-08-23 10:56:18.000000000 -0500
-@@ -9,7 +9,7 @@
- 
- 
- 2Pong: $(OBJECTS) src/2Pong.o
--       gcc $(CFLAGS) -o 2Pong $(OBJECTS) src/2Pong.o $(LIBS)
-+       $(CC) $(CFLAGS) -o 2Pong $(OBJECTS) src/2Pong.o $(LIBS)
- 
- 
- clean:
+--- src/Makefile.orig   2005-05-11 06:01:36.000000000 -0500
++++ src/Makefile        2010-03-26 17:44:01.000000000 -0500
+@@ -4,11 +4,11 @@
+ CXX      = g++
+ LEX      = flex
+ YACC     = yacc
+-CFLAGS   = -pipe -fno-exceptions -Wall -W -O2 -march=i486 -mcpu=i686 -D_REENTRANT
+-CXXFLAGS = -pipe -fno-exceptions -Wall -W -O2 -march=i486 -mcpu=i686 -D_REENTRANT
++CFLAGS   = -pipe -fno-exceptions -Wall -W -O2 -D_REENTRANT
++CXXFLAGS = -pipe -fno-exceptions -Wall -W -O2 -D_REENTRANT
+ LEXFLAGS = 
+ YACCFLAGS= -d
+-INCPATH  = `xml2-config --cflags` `sdl-config --cflags`
++INCPATH  = `xml2-config --cflags` `sdl-config --cflags` $(CPPFLAGS)
+ LINK     = g++
+ LFLAGS   = -fno-exceptions  -Wl,-rpath,/usr/lib/qt/lib
+ LIBS     = `xml2-config --libs` `sdl-config --libs` -lSDL_net -lSDL_mixer