It is still an alpha version, but now FreeBSD can really compete with Windows ;-) Fix: Execute the following shar file: How-To-Repeat: N/A.
Le 15/08/2002 à 21:26:26 +0200, Thierry Thomas <thierry@pompo.net> écrivait : > > >Number: 41693 > >Category: ports > >Synopsis: New port: games/pinball - an OpenGL pinball game The following patch upgrades Emilia pinball to release 0.1.2. Remark: it can be built WITH_ALLEGRO, but either PR ports/45176 or PR ports/45344 must have been committed. New file: files/patch-base_TextureUtil.cpp Removed file: files/patch-README files/patch-base_Private.h files/patch-test_load.cpp diff -urN games/pinball.orig/Makefile games/pinball/Makefile --- games/pinball.orig/Makefile Thu Aug 15 21:15:47 2002 +++ games/pinball/Makefile Sat Nov 16 22:18:24 2002 @@ -6,26 +6,36 @@ # PORTNAME= pinball -PORTVERSION= 0.0.7 +PORTVERSION= 0.1.2 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= thierry@pompo.net +.if !defined(WITH_ALLEGRO) BUILD_DEPENDS= ${SDL_CONFIG}:${PORTSDIR}/devel/sdl12 -LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ - SDL-1.1.4:${PORTSDIR}/devel/sdl12 +LIB_DEPENDS= SDL_image.10:${PORTSDIR}/graphics/sdl_image \ + SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer +.else +BUILD_DEPENDS= ${ALLEGRO_CONFIG}:${PORTSDIR}/devel/allegro +LIB_DEPENDS= alleg.41:${PORTSDIR}/devel/allegro +.endif USE_X_PREFIX= yes HAS_CONFIGURE= yes +USE_GMAKE= yes USE_MESA= yes CONFIGURE_ARGS= --prefix=${PREFIX} +.if defined(WITH_ALLEGRO) +CONFIGURE_ARGS+= --with-allegro +.endif CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib" \ SDL_CONFIG="${SDL_CONFIG}" -SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config +SDL_CONFIG= ${LOCALBASE}/bin/sdl11-config +ALLEGRO_CONFIG= ${LOCALBASE}/bin/allegro-config DOCS= README diff -urN games/pinball.orig/distinfo games/pinball/distinfo --- games/pinball.orig/distinfo Tue Aug 13 23:20:15 2002 +++ games/pinball/distinfo Sat Nov 9 12:09:49 2002 @@ -1 +1 @@ -MD5 (pinball-0.0.7.tar.gz) = a7c9e89a2b0214ee16bbbb0df1f769bd +MD5 (pinball-0.1.2.tar.gz) = 8c40d8b8be8352c1c476d6d86438336d diff -urN games/pinball.orig/files/patch-README games/pinball/files/patch-README --- games/pinball.orig/files/patch-README Wed Aug 14 00:56:00 2002 +++ games/pinball/files/patch-README Thu Jan 1 01:00:00 1970 @@ -1,35 +0,0 @@ ---- README.orig Thu May 23 14:42:29 2002 -+++ README Wed Aug 14 00:55:30 2002 -@@ -6,26 +6,17 @@ - Installing and Running - ====================== - --TAR.GZ -------- --Install with the usual: --configure -+Port -+---- -+Installed with the usual: - make - make install - - The make install step has to be performed as root user. The default --locatation of the game is /usr/local/bin and /usr/local/share/pinball --for the data files. The game is started with 'pinball'. You may leave --out the 'make install' but in such case you must start the game from the --game directory by typing './src/pinball -data data'. -+locatation of the game is /usr/X11R6/bin and /usr/X11R6/share/pinball -+for the data files. The game is started with 'pinball'. - --To save some space you can do a 'make clean' after installation (only --works if you do the 'make install'. -- --RPM ----- -- --rpm -U pinball-0.x.x-x.rpm as root. -+To save some space you can do a 'make clean' after installation. - - Keys - ==== diff -urN games/pinball.orig/files/patch-base_Private.h games/pinball/files/patch-base_Private.h --- games/pinball.orig/files/patch-base_Private.h Wed Aug 14 00:03:25 2002 +++ games/pinball/files/patch-base_Private.h Thu Jan 1 01:00:00 1970 @@ -1,15 +0,0 @@ ---- base/Private.h.orig Mon May 20 10:07:10 2002 -+++ base/Private.h Wed Aug 14 00:02:47 2002 -@@ -20,10 +20,10 @@ - #include <GL/glx.h> - #include <GL/glut.h> - --#include <SDL/SDL.h> -+#include <SDL.h> - #if EM_THREADS - #warning using sdl threads --#include <SDL/SDL_thread.h> -+#include <SDL_thread.h> - #endif - - #ifdef HAVE_CONFIG_H diff -urN games/pinball.orig/files/patch-base_TextureUtil.cpp games/pinball/files/patch-base_TextureUtil.cpp --- games/pinball.orig/files/patch-base_TextureUtil.cpp Thu Jan 1 01:00:00 1970 +++ games/pinball/files/patch-base_TextureUtil.cpp Mon Nov 11 01:28:40 2002 @@ -0,0 +1,11 @@ +--- ./base/TextureUtil.cpp.orig Fri Nov 1 14:49:57 2002 ++++ ./base/TextureUtil.cpp Mon Nov 11 01:27:54 2002 +@@ -18,7 +18,7 @@ + #if EM_DEBUG + #include <GL/glu.h> + #endif +-#include <SDL/SDL.h> ++#include <SDL.h> + #include <SDL_image.h> + + extern "C" { diff -urN games/pinball.orig/files/patch-configure games/pinball/files/patch-configure --- games/pinball.orig/files/patch-configure Wed Aug 14 23:34:43 2002 +++ games/pinball/files/patch-configure Mon Nov 11 00:39:59 2002 @@ -1,13 +1,48 @@ ---- configure.orig Thu Jun 13 16:33:08 2002 -+++ configure Wed Aug 14 00:25:01 2002 -@@ -532,8 +532,8 @@ +--- configure.orig Wed Nov 6 12:03:53 2002 ++++ configure Mon Nov 11 00:39:54 2002 +@@ -713,8 +713,8 @@ --CFLAGS="-O2" --CXXFLAGS="-O2" -+#CFLAGS="-O2" -+#CXXFLAGS="-O2" - - +-CFLAGS="-g -W -Wall -O2" +-CXXFLAGS="-g -W -Wall -O2" ++#CFLAGS="-g -W -Wall -O2" ++#CXXFLAGS="-g -W -Wall -O2" + + SDL_VERSION=1.2.0 + ALLEGRO_VERSION=4.0.0 +@@ -5599,7 +5599,7 @@ + fi + + +-if test x"$use_allegro" == "xno"; then ++if test x"$use_allegro" = xno; then + + cat >> confdefs.h <<\EOF + #define EM_USE_SDL 1 +@@ -6997,7 +6997,7 @@ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> +-#include "allegro.h" ++#include <allegro.h> + + char* + my_strdup (char *str) +@@ -7092,7 +7092,7 @@ + #include "confdefs.h" + + #include <stdio.h> +-#include "ALLEGRO.h" ++#include <allegro.h> + + int main(int argc, char *argv[]) + { return 0; } +@@ -7225,6 +7225,7 @@ + int main () { int i; for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); + exit (0); } ++END_OF_MAIN(); + EOF + if { (eval echo configure:7231: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null diff -urN games/pinball.orig/files/patch-test_load.cpp games/pinball/files/patch-test_load.cpp --- games/pinball.orig/files/patch-test_load.cpp Wed Aug 14 00:04:45 2002 +++ games/pinball/files/patch-test_load.cpp Thu Jan 1 01:00:00 1970 @@ -1,11 +0,0 @@ ---- ./test/load.cpp.orig Tue Apr 23 11:35:01 2002 -+++ ./test/load.cpp Wed Aug 14 00:04:14 2002 -@@ -10,7 +10,7 @@ - #include "KeyRotBehavior.h" - #include "Keyboard.h" - #include "Shape3DUtil.h" --#include "SDL/SDL.h" -+#include "SDL.h" - - /** Main */ - int main(int argc, char *argv[]) { diff -urN games/pinball.orig/pkg-comment games/pinball/pkg-comment --- games/pinball.orig/pkg-comment Tue Aug 13 22:48:21 2002 +++ games/pinball/pkg-comment Sat Nov 16 22:18:17 2002 @@ -1 +1 @@ -Emilia Pinball is a free OpenGL pinball game +Emilia Pinball is a free pinball game diff -urN games/pinball.orig/pkg-descr games/pinball/pkg-descr --- games/pinball.orig/pkg-descr Wed Aug 14 23:25:44 2002 +++ games/pinball/pkg-descr Sat Nov 16 22:20:42 2002 @@ -1,3 +1,6 @@ -Emilia Pinball is a free OpenGL pinball game. +Emilia Pinball is a free pinball game. + +It requires OpenGL, if your hardware supports it; else, it is possible +to build it with allegro (make -DWITH_ALLEGRO). WWW: http://pinball.sourceforge.net/ diff -urN games/pinball.orig/pkg-plist games/pinball/pkg-plist --- games/pinball.orig/pkg-plist Wed Aug 14 00:58:38 2002 +++ games/pinball/pkg-plist Mon Nov 11 20:29:12 2002 @@ -1,41 +1,47 @@ bin/pinball %%PORTDOCS%%share/doc/pinball/README -share/pinball/arm_le_co.emi -share/pinball/flip.wav -share/pinball/grid.emi -share/pinball/arm_le.emi -share/pinball/grid_long.emi -share/pinball/arm_ri_co.emi -share/pinball/floor2.png -share/pinball/grid_tex_co.emi -share/pinball/arm_ri.emi -share/pinball/floor.emi -share/pinball/grid_tex.emi -share/pinball/tablestd.emi -share/pinball/ball_co.emi -share/pinball/floor.jpg -share/pinball/head_co.emi -share/pinball/tbltruck_co.emi -share/pinball/bumper_co.emi -share/pinball/flush.wav -share/pinball/head.emi -share/pinball/bumper.emi -share/pinball/linux.png -share/pinball/tbltruck.emi -share/pinball/bumper_sh.emi -share/pinball/lock.wav -share/pinball/tbltruck_lo.emi -share/pinball/bump.wav -share/pinball/tbltruck_vi.emi share/pinball/font_34.png -share/pinball/tiles.png -share/pinball/evil.wav -share/pinball/formats.txt -share/pinball/topgrid.emi -share/pinball/fart.wav -share/pinball/nudge.wav -share/pinball/fjong.wav -share/pinball/grid_big.emi -share/pinball/pinballnew.pbl +share/pinball/font_35.pcx +share/pinball/libmodule_test.a +share/pinball/libmodule_test.la +share/pinball/libmodule_test.so +share/pinball/libmodule_test.so.0 +share/pinball/pinball.xpm +share/pinball/professor/floor.png +share/pinball/professor/floor.png.pcx +share/pinball/professor/libmodule_professor.a +share/pinball/professor/libmodule_professor.la +share/pinball/professor/libmodule_professor.so +share/pinball/professor/libmodule_professor.so.0 +share/pinball/professor/pinball.pbl +share/pinball/professor/professor.mid +share/pinball/tux/bump.wav +share/pinball/tux/bumphard.wav +share/pinball/tux/bumpsoft.wav +share/pinball/tux/face.png +share/pinball/tux/face.png.pcx +share/pinball/tux/flip.wav +share/pinball/tux/floor.pbl +share/pinball/tux/floor2.png +share/pinball/tux/floor2.png.pcx +share/pinball/tux/game.mid +share/pinball/tux/gameover.wav +share/pinball/tux/intro.mid +share/pinball/tux/libmodule_tux.a +share/pinball/tux/libmodule_tux.la +share/pinball/tux/libmodule_tux.so +share/pinball/tux/libmodule_tux.so.0 +share/pinball/tux/locklock.wav +share/pinball/tux/loop.wav +share/pinball/tux/multiball.mid +share/pinball/tux/nudge.wav +share/pinball/tux/opentux.wav +share/pinball/tux/pinball.pbl +share/pinball/tux/shoot.wav +share/pinball/tux/tiles.png +share/pinball/tux/tiles.png.pcx +share/pinball/tux/up.wav %%PORTDOCS%%@dirrm share/doc/pinball +@dirrm share/pinball/professor +@dirrm share/pinball/tux @dirrm share/pinball -- Th. Thomas.
State Changed From-To: open->closed Committed, thanks