pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
pinball: Fixed pkg and updated to pinball-0.3.1
Module Name: pkgsrc-wip
Committed By: i3enedek <git%xn--rvztrtkrfrgp-bbb7j2b8f0b9d7a21oft.com@localhost>
Pushed By: i3enedek
Date: Sun Sep 25 22:49:12 2016 +0100
Changeset: e4717a42355977f2fea08757d5c979dde18794d0
Modified Files:
pinball/Makefile
pinball/PLIST
pinball/distinfo
Added Files:
pinball/files/config-rzr.h
pinball/patches/patch-Makefile.am
pinball/patches/patch-base_Behavior.cpp
pinball/patches/patch-base_BehaviorVisitor.cpp
pinball/patches/patch-base_SignalSender.cpp
pinball/patches/patch-src_Makefile.am
pinball/patches/patch-src_Makefile.in
pinball/patches/patch-src_Obj3dsUtil.cpp
pinball/patches/patch-test_Makefile.am
pinball/patches/patch-test_Makefile.in
Log Message:
pinball: Fixed pkg and updated to pinball-0.3.1
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e4717a42355977f2fea08757d5c979dde18794d0
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
pinball/Makefile | 15 +-
pinball/PLIST | 113 +++++++++-
pinball/distinfo | 16 +-
pinball/files/config-rzr.h | 277 +++++++++++++++++++++++++
pinball/patches/patch-Makefile.am | 14 ++
pinball/patches/patch-base_Behavior.cpp | 12 ++
pinball/patches/patch-base_BehaviorVisitor.cpp | 12 ++
pinball/patches/patch-base_SignalSender.cpp | 13 ++
pinball/patches/patch-src_Makefile.am | 22 ++
pinball/patches/patch-src_Makefile.in | 13 ++
pinball/patches/patch-src_Obj3dsUtil.cpp | 22 ++
pinball/patches/patch-test_Makefile.am | 15 ++
pinball/patches/patch-test_Makefile.in | 12 ++
13 files changed, 549 insertions(+), 7 deletions(-)
diffs:
diff --git a/pinball/Makefile b/pinball/Makefile
index 03cc8ea..704754a 100644
--- a/pinball/Makefile
+++ b/pinball/Makefile
@@ -1,19 +1,28 @@
# $NetBSD: Makefile,v 1.11 2012/10/05 11:31:52 asau Exp $
#
-DISTNAME= pinball-0.2.0a
+DISTNAME= pinball-0.3.1
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pinball/}
MAINTAINER= virtus%wanadoo.nl@localhost
HOMEPAGE= http://pinball.sourceforge.net/
COMMENT= Pinball using the Allegro game library
+LICENSE= gnu-gpl-v1
USE_LANGUAGES= c c++
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake aclocal automake
GNU_CONFIGURE= YES
-WRKSRC= ${WRKDIR}/pinball-0.2.0
+WRKSRC= ${WRKDIR}/pinball-0.3.1
+
+MAKE_JOBS_SAFE= no
+
+post-extract:
+ cp ${FILESDIR}/config-rzr.h ${WRKSRC}/base/config-rzr.h
.include "../../devel/allegro/buildlink3.mk"
+.include "../../devel/SDL/buildlink3.mk"
+.include "../../graphics/SDL_image/buildlink3.mk"
+.include "../../audio/SDL_mixer/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/pinball/PLIST b/pinball/PLIST
index 75ff3e2..e572164 100644
--- a/pinball/PLIST
+++ b/pinball/PLIST
@@ -1 +1,112 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/04/12 12:34:11 virtus Exp $
+@comment $NetBSD$
+bin/pinball
+bin/pinball-config
+include/pinball/AlignVisitor.h
+include/pinball/AllegroVisitor.h
+include/pinball/AmbientLightVisitor.h
+include/pinball/ArmBehavior.h
+include/pinball/BallGroup.h
+include/pinball/BaseTest.h
+include/pinball/Behavior.h
+include/pinball/BehaviorVisitor.h
+include/pinball/BigSphere.h
+include/pinball/BillBoard.h
+include/pinball/BounceBehavior.h
+include/pinball/BumperBehavior.h
+include/pinball/Camera.h
+include/pinball/CollisionBounds.h
+include/pinball/CollisionVisitor.h
+include/pinball/ColorBehavior.h
+include/pinball/Cone.h
+include/pinball/Config.h
+include/pinball/Cube.h
+include/pinball/Cylinder.h
+include/pinball/EMath.h
+include/pinball/EmFont.h
+include/pinball/Engine.h
+include/pinball/EyeBehavior.h
+include/pinball/FakeModuleBehavior.h
+include/pinball/Grid.h
+include/pinball/Group.h
+include/pinball/KeyBehavior.h
+include/pinball/KeyRotBehavior.h
+include/pinball/Keyboard.h
+include/pinball/Light.h
+include/pinball/Loader.h
+include/pinball/LoaderModule.h
+include/pinball/Menu.h
+include/pinball/Node.h
+include/pinball/Obj3dsUtil.h
+include/pinball/OctTree.h
+include/pinball/OpenGLVisitor.h
+include/pinball/Pinball.h
+include/pinball/PlungerBehavior.h
+include/pinball/PointLightVisitor.h
+include/pinball/Polygon.h
+include/pinball/Private.h
+include/pinball/Profiler.h
+include/pinball/Score.h
+include/pinball/Script.h
+include/pinball/Shape3D.h
+include/pinball/SignalSender.h
+include/pinball/Sound.h
+include/pinball/SoundUtil.h
+include/pinball/SoundVisitor.h
+include/pinball/Sphere.h
+include/pinball/SrcTest.h
+include/pinball/StateBehavior.h
+include/pinball/StateMachine.h
+include/pinball/StdAnimation.h
+include/pinball/Table.h
+include/pinball/TexAnimation.h
+include/pinball/TextureUtil.h
+include/pinball/TransformVisitor.h
+include/pinball/Visitor.h
+include/pinball/pinconfig.h
+lib/pinball/libModuleProfessor.la
+lib/pinball/libModuleTest.la
+lib/pinball/libModuleTux.la
+lib/pinball/libemilia_addon.a
+lib/pinball/libemilia_base.a
+lib/pinball/libemilia_pin.a
+share/pinball/font_34.png
+share/pinball/font_35.pcx
+share/pinball/pinball.xpm
+share/pinball/professor/bump.wav
+share/pinball/professor/bumphard.wav
+share/pinball/professor/bumpsoft.wav
+share/pinball/professor/flip.wav
+share/pinball/professor/floor.png
+share/pinball/professor/floor.png.pcx
+share/pinball/professor/gameover.wav
+share/pinball/professor/introp.ogg
+share/pinball/professor/nudge.wav
+share/pinball/professor/pinball.pbl
+share/pinball/professor/professor.ogg
+share/pinball/professor/professor.png
+share/pinball/splash.png
+share/pinball/splash.png.pcx
+share/pinball/tux/bump.wav
+share/pinball/tux/bumphard.wav
+share/pinball/tux/bumpsoft.wav
+share/pinball/tux/face.png.pcx
+share/pinball/tux/face2.png
+share/pinball/tux/flip.wav
+share/pinball/tux/floor.pbl
+share/pinball/tux/floor2.png
+share/pinball/tux/floor2.png.pcx
+share/pinball/tux/floor3.png
+share/pinball/tux/game.ogg
+share/pinball/tux/gameover.wav
+share/pinball/tux/intro.mid
+share/pinball/tux/intro.ogg
+share/pinball/tux/lock.wav
+share/pinball/tux/loop.wav
+share/pinball/tux/multiball.ogg
+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
diff --git a/pinball/distinfo b/pinball/distinfo
index 9976e74..2fba934 100644
--- a/pinball/distinfo
+++ b/pinball/distinfo
@@ -1,5 +1,15 @@
$NetBSD: distinfo,v 1.2 2005/09/28 06:41:34 rillig Exp $
-SHA1 (pinball-0.2.0a.tar.gz) = 7bf3b5aae189f4d23cc7de5089466471c1e3fd55
-RMD160 (pinball-0.2.0a.tar.gz) = df31b7b923e0319474d823717043d835393d293f
-Size (pinball-0.2.0a.tar.gz) = 1497194 bytes
+SHA1 (pinball-0.3.1.tar.gz) = 7daf63a7b7e586ede2a6ffae3e53abd0e23fff22
+RMD160 (pinball-0.3.1.tar.gz) = ba85469c9f53f7a0a46ab26aa4e45666b2dca806
+SHA512 (pinball-0.3.1.tar.gz) = d54f2635f583be8a7e4bf3463c69c1ab368e1c069dd7c4edffb95df0448faf7e82ddb8f8607d22a7336e2db176134555ca65b613e9d008b38fecb8ad5a818498
+Size (pinball-0.3.1.tar.gz) = 6082982 bytes
+SHA1 (patch-Makefile.am) = 817166a891b7598536bb1861ba30a4e97896a1aa
+SHA1 (patch-base_Behavior.cpp) = 761e33a2d990ff87ba16861e285ff1e3fabb876b
+SHA1 (patch-base_BehaviorVisitor.cpp) = a783660b7028e9f2fbba9d2b9dc2c01bb4632103
+SHA1 (patch-base_SignalSender.cpp) = 1be66720cc1bed0a48da0a7ad6958022c831f0a3
+SHA1 (patch-src_Makefile.am) = c1b12605b821bd901ecedc6d2ef065d7c2fd15a8
+SHA1 (patch-src_Makefile.in) = 759dc5d53e0b8911eeee1e48fad402820403d837
+SHA1 (patch-src_Obj3dsUtil.cpp) = 87b37420c44d12b4f9fd42e4a5a6b522c72fdbd7
+SHA1 (patch-test_Makefile.am) = 48a43d2d47e382732a4c32b65e49f4dcc32b1913
+SHA1 (patch-test_Makefile.in) = 0ef31ce315dfea72410a61e3b2c63188e52f220d
diff --git a/pinball/files/config-rzr.h b/pinball/files/config-rzr.h
new file mode 100644
index 0000000..b57c689
--- /dev/null
+++ b/pinball/files/config-rzr.h
@@ -0,0 +1,277 @@
+//#ident "$Id: config-rzr.h,v 1.12 2003/07/26 22:13:42 rzr Exp $"
+//#warning "!+rzr: Win32 portability hacks @ www.rzr.online.fr"
+#ifndef config_rzr_h_ // !+rzr
+#define config_rzr_h_
+/**
+ * @author: www.Philippe.COVAL.online.fr - rev: $Author: rzr $
+ * Portability issues:
+ *
+ * - Linux = gcc@linux
+ configure && make && make install && make clean
+ *
+ * - WIN32 = mingw32@linux
+
+ cross-configure.sh --prefix=/pinball --disable-sdltest && \
+ cross-make.sh
+ cross-make.sh -C src wpinball.exe && \
+ \cp -f src/wpinball.exe /pinball/
+
+ * - WIN32 = msvc@windows
+ Install SDL libs
+ Just open the project file pinball.dsw
+ Build and copy dll in windows/system... or build dir (Release or Debug)
+ exec Pinball.exe
+
+ **/
+
+/// default settings customise yourself
+/// just define if you dont want to use plugins (dll vs static)
+/// default: undefined
+
+// used for single dir package (w32)
+//if the program file is copied elsewhere it still works
+//#undef RZR_PATHRELATIVE // @ base/Config.cpp
+
+// disable dyn libs (.dll)
+/// mingw32@Linux : Dyn loadling works, but keyboard is too slow w/ dll ???
+//#undef RZR_LIBSTATIC // @ src/Loader.cpp
+
+/// vfat etc
+//#undef RZR_LINKS_UNSUPPORTED
+
+/// configure should check if the install fs supports modes & links
+//#undef RZR_MODES_UNSUPPORTED // w32
+
+///
+//#undef RZR_CONFIG_STATIC_DEFAULT
+
+/// cstdlibs random is not definied @msvc + mingw32
+//#undef RZR_RANDOM_UNSUPPORTED
+
+/// devel only until official release
+//#undef RZR_PATCHES_3DS
+#define RZR_PATCHES_3DS
+
+///
+//#undef RZR_DEBUG
+
+//--------------------------------------------------------------------------
+/// GCC @ gnu.org (everything is autoconfigured)
+#if ( (defined unix ) && ( defined __GNUC__ ) )
+#ifdef RZR_PATHRELATIVE
+#undef EM_DATADIR //override autoconf path
+#undef EM_LIBDIR //unsed (so far)
+#undef EM_HIGHSCORE_DIR
+#endif
+#endif
+
+/// Visual C++ @ MicroSoft.com (win32@win32) dont use autoconf
+#if ( (defined WIN32 ) && ( defined _MSC_VER ) )
+#undef HAVE_CONFIG_H
+#undef HAVE_UNISTD_H
+#define RZR_LINKS_UNSUPPORTED 1
+#define RZR_MODES_UNSUPPORTED 1
+#define RZR_RANDOM_UNSUPPORTED 1
+#define RZR_WINAPI 1
+#define RZR_CPP_USE_NAMESPACE_STD
+#define RZR_LIBSTATIC 1
+#undef EM_HIGHSCORE_DIR
+#define RZR_CONFIG_STATIC_DEFAULT 1
+#ifdef _DEBUG // win32 msvc debug
+#define RZR_DEBUG 1
+#endif
+#define RZR_PATHRELATIVE 1
+#endif
+
+/// CodeWarrior @ MetroWreks.com (xcompiler windows2mac ) dont use autoconf
+#if( ( defined __MWERKS__ ) ) //(defined WIN32 ) &&
+#undef HAVE_CONFIG_H
+#define HAVE_UNISTD_H 1
+#define RZR_LINKS_UNSUPPORTED 1
+#define RZR_RANDOM_UNSUPPORTED 1
+#define RZR_CPP_USE_NAMESPACE_STD
+#define RZR_LIBSTATIC 1
+#define RZR_PATHRELATIVE // main(argc,argv) lost @src/Pinball.cpp
+#undef EM_DATADIR //override autoconf path
+#undef EM_LIBDIR //unsed (so far)
+#undef EM_HIGHSCORE_DIR
+#define RZR_CONFIG_STATIC_DEFAULT 1
+#endif
+
+/// gcc(mingw32) @ GNU.org (gcc for Win32, like cygwin) uses autoconf
+#if ( (defined WIN32 ) && ( defined __GNUC__ ) )
+#define HAVE_UNISTD_H 1
+#define RZR_LINKS_UNSUPPORTED 1
+#define RZR_MODES_UNSUPPORTED 1
+#define RZR_RANDOM_UNSUPPORTED 1 //@ stdlib
+#define RZR_LIBSTATIC 1
+#define RZR_PATHRELATIVE 1
+#undef EM_DATADIR //override autoconf path
+#undef EM_LIBDIR //unsed (so far)
+#undef EM_HIGHSCORE_DIR
+#endif
+
+/// MacOSX aka Darwin
+#if defined(__APPLE__) && defined(__MACH__)
+#define RZR_LIBSTATIC 1
+#endif
+
+/// project builder @ MacOSX
+#if defined ( MacOSX ) // !+Eye @ project builderx
+#define RZR_LIBSTATIC 1
+#define WANT_MALLOC_NO 1 //dont have <malloc.h>
+#undef RZR_PATCHES_3DS
+#endif
+
+/// other compilers
+#if ( !( (defined __GNUC__ ) || ( defined _MSC_VER ) || (defined __MWERKS__ )))
+//#warning "This compiler has never been tested (so far) please contact me"
+#define RZR_CONFIG_STATIC_DEFAULT 1
+#define RZR_LINKS_UNSUPPORTED 1
+#undef RZR_PATHRELATIVE
+#define HAVE_UNISTD_H
+#endif
+
+//--------------------------------------------------------------------------
+
+#ifdef RZR_LINKS_UNSUPPORTED
+#define lstat( name, opt) stat(name, opt); //undef on mingw32@Linux
+#endif
+
+// Common WIN32 options tested on mingw32 + msvc6
+#ifdef RZR_MODES_UNSUPPORTED //!+rzr MSVC++ , mingw32 (etc not tested so far)
+#ifdef _MSC_VER
+#include <direct.h>
+#include <io.h> // mkdir
+#else
+#include <fcntl.h> //@msvc
+#endif
+//#include <sys/stat.h>
+#define mkdir(dir,modes) mkdir(dir) // @direct.h // autoconf should do that
+#endif
+
+
+#ifdef RZR_RANDOM_UNSUPPORTED
+#define random rand // cstdlibs random is not definied @msvc + mingw32
+#endif
+
+#ifdef RZR_CPP_USE_NAMESPACE_STD
+//namespace std {}; //code warrior warn for empty namespace
+#include <iostream>
+using namespace std;
+#endif
+
+#ifdef RZR_WINAPI
+#include <windows.h>
+#ifndef WINAPI // what are those ? dll rt ? @ windows.h 4 GL/gl.h
+#define WINAPI __stdcall // not sure it is good , but it worked for me
+// WINGDIAPI
+#endif
+#endif
+
+#ifdef RZR_DEBUG
+#define EM_DEBUG 1
+#undef RELEASE
+//#include <assert.h>
+#include <cassert>
+#else // win32 msvc release
+#define RELEASE 1
+#undef EM_DEBUG
+//#undef assert
+//#define assert(x); {}
+#endif
+
+
+#ifdef RZR_PATHRELATIVE // Warning autoconf allready defines Path (abs) !!
+#ifndef EM_DATADIR
+#define EM_DATADIR "data" // single dir and exes in it (!= unix)
+#endif
+#ifndef EM_LIBDIR
+#define EM_LIBDIR "." // BUT subdirs are like unix
+#endif
+#else // Absolute default path, In case they're not defined
+#ifndef EM_DATADIR
+#define EM_DATADIR "/pinball/data"
+#endif
+#ifndef EM_LIBDIR
+#define EM_LIBDIR "/pinball/lib"
+#endif
+#endif
+#ifndef EM_HIGHSCORE_DIR
+#define EM_HIGHSCORE_DIR EM_DATADIR
+#endif
+
+//--------------------------------------------------------------------------
+
+#ifdef _MSC_VER
+//#undef WINAPI
+//#ifdef Polygon // Polygon Is A Macro So It Is Renamed To Be Used As AClass
+//#undef Polygon // other solution is to write "class Polygon" instead of just Polygon
+//#define Polygon PolygonClass
+// ---- Texture Engine // undefined reference to `gluErrorString@4
+//#undef EM_GLERROR
+//#define EM_GLERROR(a) EM_COUT(a,42)
+#include <GL/glu.h>
+//#define gluErrorString(x) x
+//#endif
+#endif // msvc6
+
+
+#ifdef _MSC_VER
+// trunct template 255
+#pragma warning (disable:4786)
+//Disable bogus conversion warnings.
+#pragma warning (disable:4244)
+// VC++ 5.0 version of above warning.
+#pragma warning (disable:4305)
+// ??? // MSVC6.0 dll / ccxx
+#pragma warning (disable:4273)
+// bool / uc
+#pragma warning (disable:4800)
+// symb trunc
+#pragma warning (disable:4786)
+// dominance ?
+#pragma warning (disable:4250)
+// unreferenced
+#pragma warning (disable:4101)
+#endif
+
+//--------------------------------------------------------------------------
+#ifdef RZR_DELETESAFE
+#define deletesafe(x); { delete(x); x=NULL; } //!+rzr @ Group.h
+#ifdef delete
+//#warning "..."
+#define delete_1stdef_hopeitisunused delete
+#undef delete
+#define delete(x) deletesafe(x) //!-rzr
+#endif
+#endif
+//--------------------------------------------------------------------------
+#ifdef RZR_CONFIG_STATIC_DEFAULT
+#define EM_USE_SOURCE_SPECULAR 1
+#define EM_USE_QUADTREE 1
+#define EM_USE_SDLIMAGE 1
+#define EM_USE_SDLMIXER 1
+#define EM_USE_SDL 1
+#define EM_USE_SHARED_COLOR 1
+#define HAVE_MEMORY_H 1
+#define HAVE_STDINT_H 1
+#define HAVE_STDLIB_H 1
+#define HAVE_STRING_H 1
+#define HAVE_SYS_STAT_H 1
+#define HAVE_SYS_TYPES_H 1
+#define PACKAGE "pinball"
+#define PACKAGE_BUGREPORT ""
+#define PACKAGE_NAME "pinball"
+#define PACKAGE_STRING "pinball cvs"
+#define PACKAGE_TARNAME "pinball"
+#define STDC_HEADERS 1
+#ifndef VERSION
+#define VERSION "cvs-__DATE__"
+#endif
+#ifndef PACKAGE_VERSION
+#define PACKAGE_VERSION VERSION
+#endif
+#endif
+#endif //!-rzr ----------------------------------------------------------------
+//EOF: $Id: config-rzr.h,v 1.12 2003/07/26 22:13:42 rzr Exp $
diff --git a/pinball/patches/patch-Makefile.am b/pinball/patches/patch-Makefile.am
new file mode 100644
index 0000000..e3dd28c
--- /dev/null
+++ b/pinball/patches/patch-Makefile.am
@@ -0,0 +1,14 @@
+$NetBSD$
+
+--- Makefile.am.orig 2003-12-10 10:15:35.000000000 +0000
++++ Makefile.am
+@@ -1,6 +1,8 @@
+ AUTOMAKE_OPTIONS = gnu
+
+-SUBDIRS = libltdl addon base data src test
++ACLOCAL_AMFLAGS = -I m4
++
++SUBDIRS = libltdl addon base data src test
+
+ EXTRA_DIST = bootstrap pinball.spec clean pinball.desktop
+
diff --git a/pinball/patches/patch-base_Behavior.cpp b/pinball/patches/patch-base_Behavior.cpp
new file mode 100644
index 0000000..86e6ca6
--- /dev/null
+++ b/pinball/patches/patch-base_Behavior.cpp
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- base/Behavior.cpp.orig 2003-11-20 16:46:16.000000000 +0000
++++ base/Behavior.cpp
+@@ -6,6 +6,7 @@
+ email : henqvist%excite.com@localhost
+ ***************************************************************************/
+
++#include <cstddef>
+ #include "Private.h"
+ #include "Behavior.h"
+ #include "Group.h"
diff --git a/pinball/patches/patch-base_BehaviorVisitor.cpp b/pinball/patches/patch-base_BehaviorVisitor.cpp
new file mode 100644
index 0000000..3b3ff48
--- /dev/null
+++ b/pinball/patches/patch-base_BehaviorVisitor.cpp
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- base/BehaviorVisitor.cpp.orig 2003-11-20 16:46:16.000000000 +0000
++++ base/BehaviorVisitor.cpp
+@@ -6,6 +6,7 @@
+ email : henqvist%excite.com@localhost
+ ***************************************************************************/
+
++#include <cstddef>
+ #include "BehaviorVisitor.h"
+ #include "Behavior.h"
+ #include "Group.h"
diff --git a/pinball/patches/patch-base_SignalSender.cpp b/pinball/patches/patch-base_SignalSender.cpp
new file mode 100644
index 0000000..43a9992
--- /dev/null
+++ b/pinball/patches/patch-base_SignalSender.cpp
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- base/SignalSender.cpp.orig 2003-11-20 16:46:16.000000000 +0000
++++ base/SignalSender.cpp
+@@ -6,7 +6,7 @@
+ email : henqvist%excite.com@localhost
+ ***************************************************************************/
+
+-
++#include <cstddef>
+ #include "Private.h"
+ #include "SignalSender.h"
+ #include "Group.h"
diff --git a/pinball/patches/patch-src_Makefile.am b/pinball/patches/patch-src_Makefile.am
new file mode 100644
index 0000000..dab1eac
--- /dev/null
+++ b/pinball/patches/patch-src_Makefile.am
@@ -0,0 +1,22 @@
+$NetBSD$
+
+--- src/Makefile.am.orig 2003-11-20 16:46:17.000000000 +0000
++++ src/Makefile.am
+@@ -7,7 +7,7 @@ bin_PROGRAMS = pinball
+
+ pinlib_LIBRARIES = libemilia_pin.a
+
+-INCLUDES = -I../base -I../addon @INCLTDL@
++AM_CPPFLAGS = -I../base -I../addon @INCLTDL@
+
+ pinball_LDADD = ../src/libemilia_pin.a ../addon/libemilia_addon.a ../base/libemilia_base.a @LIBLTDL@
+ pinball_LDFLAGS = -export-dynamic
+@@ -29,8 +29,6 @@ Script.cpp \
+ StateBehavior.cpp \
+ Table.cpp
+
+-dnl libemilia_pin_la_SOURCES = $(libemilia_pin_a_SOURCES)
+-
+ pininclude_HEADERS = \
+ ArmBehavior.h \
+ BallGroup.h \
diff --git a/pinball/patches/patch-src_Makefile.in b/pinball/patches/patch-src_Makefile.in
new file mode 100644
index 0000000..7db0065
--- /dev/null
+++ b/pinball/patches/patch-src_Makefile.in
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/Makefile.in.orig 2003-12-10 11:34:47.000000000 +0000
++++ src/Makefile.in
+@@ -505,8 +505,6 @@ uninstall-am: uninstall-binPROGRAMS unin
+ uninstall-pinincludeHEADERS uninstall-pinlibLIBRARIES
+
+
+-dnl libemilia_pin_la_SOURCES = $(libemilia_pin_a_SOURCES)
+-
+ # !+rzr : This trick workaround a bad generated rule (under Linux mingw32)
+ # src/ litool returns: -L/usr/local//lib /usr/lib/libjpeg.so
+ # make -C src wpinball.exe (build the final programm)
diff --git a/pinball/patches/patch-src_Obj3dsUtil.cpp b/pinball/patches/patch-src_Obj3dsUtil.cpp
new file mode 100644
index 0000000..b2806be
--- /dev/null
+++ b/pinball/patches/patch-src_Obj3dsUtil.cpp
@@ -0,0 +1,22 @@
+$NetBSD$
+
+--- src/Obj3dsUtil.cpp.orig 2003-11-20 16:46:17.000000000 +0000
++++ src/Obj3dsUtil.cpp
+@@ -570,7 +570,7 @@ extern "C" {
+ unsigned int i=0; FILE* f=0;
+
+ f=fopen( filename, "wt");
+- if ( ! f ) return (int) f;
++ if ( ! f ) return (intptr_t) f;
+ for(i=0; i < in->no; i++) {
+ t = fprintObject( f, & (in->vo[i]) );
+ }
+@@ -585,7 +585,7 @@ extern "C" {
+ FILE* f=0;
+ //debugf("+saveObject %s\n",filename);
+ f=fopen( filename, "wt");
+- if ( ! f ) return (int) f;
++ if ( ! f ) return (intptr_t) f;
+ t = fprintObject( f, o);
+ fclose(f);
+ //debug("-saveObject");
diff --git a/pinball/patches/patch-test_Makefile.am b/pinball/patches/patch-test_Makefile.am
new file mode 100644
index 0000000..f5b8ac4
--- /dev/null
+++ b/pinball/patches/patch-test_Makefile.am
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- test/Makefile.am.orig 2003-11-20 16:46:17.000000000 +0000
++++ test/Makefile.am
+@@ -4,9 +4,8 @@ testlibdir = $(EM_LIBDIR)
+ testdatadir = $(pkgdatadir)
+
+ noinst_PROGRAMS = scale simple light texture load explode collision signal billboard font thread menu joy sound trans math misc varray unittest
+-dnl noinst_PROGRAMS = unittest
+
+-INCLUDES = -I../base -I../addon -I../src @INCLTDL@
++AM_CPPFLAGS = -I../base -I../addon -I../src @INCLTDL@
+ LDADD = ../src/libemilia_pin.a ../addon/libemilia_addon.a ../base/libemilia_base.a @LIBLTDL@
+
+ testlib_LTLIBRARIES = libModuleTest.la
diff --git a/pinball/patches/patch-test_Makefile.in b/pinball/patches/patch-test_Makefile.in
new file mode 100644
index 0000000..3c87213
--- /dev/null
+++ b/pinball/patches/patch-test_Makefile.in
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- test/Makefile.in.orig 2003-12-10 11:34:48.000000000 +0000
++++ test/Makefile.in
+@@ -621,7 +621,6 @@ uninstall-am: uninstall-info-am uninstal
+ mostlyclean-generic mostlyclean-libtool tags uninstall \
+ uninstall-am uninstall-info-am uninstall-testlibLTLIBRARIES
+
+-dnl noinst_PROGRAMS = unittest
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
Home |
Main Index |
Thread Index |
Old Index