From 8b9f7f9e3ec8162500ee9ccf1972726fe8efc9f9 Mon Sep 17 00:00:00 2001 From: Larry Hajali Date: Wed, 12 May 2010 23:29:34 +0200 Subject: games/supertuxkart: Added to 12.2 repository --- games/supertuxkart/patches/Makefile_am.diff | 121 ++++++++++++++++++++ games/supertuxkart/patches/Makefile_in.diff | 132 ++++++++++++++++++++++ games/supertuxkart/patches/fix-bin-directory.diff | 53 +++++++++ 3 files changed, 306 insertions(+) create mode 100644 games/supertuxkart/patches/Makefile_am.diff create mode 100644 games/supertuxkart/patches/Makefile_in.diff create mode 100644 games/supertuxkart/patches/fix-bin-directory.diff (limited to 'games/supertuxkart/patches') diff --git a/games/supertuxkart/patches/Makefile_am.diff b/games/supertuxkart/patches/Makefile_am.diff new file mode 100644 index 0000000000..38c4da98ad --- /dev/null +++ b/games/supertuxkart/patches/Makefile_am.diff @@ -0,0 +1,121 @@ +diff -Naur supertuxkart-0.6.1a.orig/data/Makefile.am supertuxkart-0.6.1a/data/Makefile.am +--- supertuxkart-0.6.1a.orig/data/Makefile.am 2009-01-28 22:57:55.000000000 +0000 ++++ supertuxkart-0.6.1a/data/Makefile.am 2009-05-14 06:53:59.000000000 +0000 +@@ -1,7 +1,7 @@ + # data/ + + SUBDIRS = fonts items karts models music po sfx textures tracks grandprix +-pkgdatadir = $(datadir)/games/$(PACKAGE)/data ++pkgdatadir = $(datadir)/$(PACKAGE)/data + + dist_pkgdata_DATA = \ + $(shell find $(srcdir) -name "*.data") \ +diff -Naur supertuxkart-0.6.1a.orig/data/fonts/Makefile.am supertuxkart-0.6.1a/data/fonts/Makefile.am +--- supertuxkart-0.6.1a.orig/data/fonts/Makefile.am 2009-01-28 22:57:39.000000000 +0000 ++++ supertuxkart-0.6.1a/data/fonts/Makefile.am 2009-05-14 06:53:59.000000000 +0000 +@@ -1,5 +1,5 @@ + # data/fonts/ + +-pkgdatadir = $(datadir)/games/$(PACKAGE)/data/fonts ++pkgdatadir = $(datadir)/$(PACKAGE)/data/fonts + + dist_pkgdata_DATA = $(shell find $(srcdir) -name "*.txf") +diff -Naur supertuxkart-0.6.1a.orig/data/grandprix/Makefile.am supertuxkart-0.6.1a/data/grandprix/Makefile.am +--- supertuxkart-0.6.1a.orig/data/grandprix/Makefile.am 2009-01-28 22:57:55.000000000 +0000 ++++ supertuxkart-0.6.1a/data/grandprix/Makefile.am 2009-05-14 06:53:59.000000000 +0000 +@@ -1,6 +1,6 @@ + # data/music + +-pkgdatadir = $(datadir)/games/$(PACKAGE)/data/grandprix ++pkgdatadir = $(datadir)/$(PACKAGE)/data/grandprix + + dist_pkgdata_DATA = $(shell find $(srcdir) -name "*.grandprix") \ + $(shell find $(srcdir) -name "*.challenge") +diff -Naur supertuxkart-0.6.1a.orig/data/items/Makefile.am supertuxkart-0.6.1a/data/items/Makefile.am +--- supertuxkart-0.6.1a.orig/data/items/Makefile.am 2009-01-28 22:57:39.000000000 +0000 ++++ supertuxkart-0.6.1a/data/items/Makefile.am 2009-05-14 06:53:59.000000000 +0000 +@@ -1,6 +1,6 @@ + # data/herrings/ + +-pkgdatadir = $(datadir)/games/$(PACKAGE)/data/items ++pkgdatadir = $(datadir)/$(PACKAGE)/data/items + + dist_pkgdata_DATA = $(shell find $(srcdir) -name "*.ac") License.txt + +diff -Naur supertuxkart-0.6.1a.orig/data/karts/Makefile.am supertuxkart-0.6.1a/data/karts/Makefile.am +--- supertuxkart-0.6.1a.orig/data/karts/Makefile.am 2009-02-18 23:43:38.000000000 +0000 ++++ supertuxkart-0.6.1a/data/karts/Makefile.am 2009-05-14 06:53:59.000000000 +0000 +@@ -1,6 +1,6 @@ + # data/karts + +-pkgdatadir= $(datadir)/games/$(PACKAGE)/data/karts ++pkgdatadir= $(datadir)/$(PACKAGE)/data/karts + + nobase_dist_pkgdata_DATA = $(shell find $(srcdir) -name "materials.dat") \ + $(shell find $(srcdir) -name "*.rgb") \ +diff -Naur supertuxkart-0.6.1a.orig/data/models/Makefile.am supertuxkart-0.6.1a/data/models/Makefile.am +--- supertuxkart-0.6.1a.orig/data/models/Makefile.am 2009-01-28 22:57:55.000000000 +0000 ++++ supertuxkart-0.6.1a/data/models/Makefile.am 2009-05-14 06:53:59.000000000 +0000 +@@ -1,6 +1,6 @@ + # data/models/ + +-pkgdatadir = $(datadir)/games/$(PACKAGE)/data/models ++pkgdatadir = $(datadir)/$(PACKAGE)/data/models + + dist_pkgdata_DATA = $(shell find $(srcdir) -name "*.ac") License.txt + +diff -Naur supertuxkart-0.6.1a.orig/data/music/Makefile.am supertuxkart-0.6.1a/data/music/Makefile.am +--- supertuxkart-0.6.1a.orig/data/music/Makefile.am 2009-01-28 22:57:47.000000000 +0000 ++++ supertuxkart-0.6.1a/data/music/Makefile.am 2009-05-14 06:53:59.000000000 +0000 +@@ -1,6 +1,6 @@ + # data/music + +-pkgdatadir = $(datadir)/games/$(PACKAGE)/data/music ++pkgdatadir = $(datadir)/$(PACKAGE)/data/music + + dist_pkgdata_DATA = $(shell find $(srcdir) -name "*.ogg") \ + $(shell find $(srcdir) -name "*.music") \ +diff -Naur supertuxkart-0.6.1a.orig/data/po/Makefile.am supertuxkart-0.6.1a/data/po/Makefile.am +--- supertuxkart-0.6.1a.orig/data/po/Makefile.am 2009-01-28 22:57:38.000000000 +0000 ++++ supertuxkart-0.6.1a/data/po/Makefile.am 2009-05-14 06:53:59.000000000 +0000 +@@ -1,6 +1,6 @@ + # data/po/ + +-pkgdatadir = $(datadir)/games/@PACKAGE@/data/po ++pkgdatadir = @localedir@ + + nobase_pkgdata_DATA = $(shell find $(srcdir) -name "*.po") \ + $(shell find $(srcdir) -name "*.mo") \ +diff -Naur supertuxkart-0.6.1a.orig/data/sfx/Makefile.am supertuxkart-0.6.1a/data/sfx/Makefile.am +--- supertuxkart-0.6.1a.orig/data/sfx/Makefile.am 2009-01-28 22:57:39.000000000 +0000 ++++ supertuxkart-0.6.1a/data/sfx/Makefile.am 2009-05-14 06:53:59.000000000 +0000 +@@ -1,6 +1,6 @@ + # sfx/ + +-pkgdatadir = $(datadir)/games/$(PACKAGE)/data/sfx ++pkgdatadir = $(datadir)/$(PACKAGE)/data/sfx + + nobase_dist_pkgdata_DATA = $(shell find $(srcdir) -name "*.wav") \ + $(shell find $(srcdir) -name "README")\ +diff -Naur supertuxkart-0.6.1a.orig/data/textures/Makefile.am supertuxkart-0.6.1a/data/textures/Makefile.am +--- supertuxkart-0.6.1a.orig/data/textures/Makefile.am 2009-01-28 22:57:54.000000000 +0000 ++++ supertuxkart-0.6.1a/data/textures/Makefile.am 2009-05-14 06:53:59.000000000 +0000 +@@ -1,6 +1,6 @@ + # data/textures + +-pkgdatadir = $(datadir)/games/$(PACKAGE)/data/textures ++pkgdatadir = $(datadir)/$(PACKAGE)/data/textures + dist_pkgdata_DATA = $(shell find $(srcdir) -name "*.rgb") materials.dat License.txt + + +diff -Naur supertuxkart-0.6.1a.orig/data/tracks/Makefile.am supertuxkart-0.6.1a/data/tracks/Makefile.am +--- supertuxkart-0.6.1a.orig/data/tracks/Makefile.am 2009-01-28 22:58:20.000000000 +0000 ++++ supertuxkart-0.6.1a/data/tracks/Makefile.am 2009-05-14 06:53:59.000000000 +0000 +@@ -1,6 +1,6 @@ + # data/tracks + +-pkgdatadir= $(datadir)/games/$(PACKAGE)/data/tracks ++pkgdatadir= $(datadir)/$(PACKAGE)/data/tracks + nobase_dist_pkgdata_DATA = $(shell find $(srcdir) -name "readme.txt") \ + $(shell find $(srcdir) -name "*.track") \ + $(shell find $(srcdir) -name "*.drv?") \ diff --git a/games/supertuxkart/patches/Makefile_in.diff b/games/supertuxkart/patches/Makefile_in.diff new file mode 100644 index 0000000000..4ceb85dafd --- /dev/null +++ b/games/supertuxkart/patches/Makefile_in.diff @@ -0,0 +1,132 @@ +diff -Naur supertuxkart-0.6.1a.orig/data/Makefile.in supertuxkart-0.6.1a/data/Makefile.in +--- supertuxkart-0.6.1a.orig/data/Makefile.in 2009-02-18 23:30:40.000000000 +0000 ++++ supertuxkart-0.6.1a/data/Makefile.in 2009-05-14 08:20:11.000000000 +0000 +@@ -75,7 +75,7 @@ + CTAGS = ctags + DIST_SUBDIRS = $(SUBDIRS) + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-pkgdatadir = $(datadir)/games/$(PACKAGE)/data ++pkgdatadir = $(datadir)/$(PACKAGE)/data + ACLOCAL = @ACLOCAL@ + AMDEP_FALSE = @AMDEP_FALSE@ + AMDEP_TRUE = @AMDEP_TRUE@ +diff -Naur supertuxkart-0.6.1a.orig/data/fonts/Makefile.in supertuxkart-0.6.1a/data/fonts/Makefile.in +--- supertuxkart-0.6.1a.orig/data/fonts/Makefile.in 2009-02-18 23:30:40.000000000 +0000 ++++ supertuxkart-0.6.1a/data/fonts/Makefile.in 2009-05-14 08:20:11.000000000 +0000 +@@ -63,7 +63,7 @@ + dist_pkgdataDATA_INSTALL = $(INSTALL_DATA) + DATA = $(dist_pkgdata_DATA) + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-pkgdatadir = $(datadir)/games/$(PACKAGE)/data/fonts ++pkgdatadir = $(datadir)/$(PACKAGE)/data/fonts + ACLOCAL = @ACLOCAL@ + AMDEP_FALSE = @AMDEP_FALSE@ + AMDEP_TRUE = @AMDEP_TRUE@ +diff -Naur supertuxkart-0.6.1a.orig/data/grandprix/Makefile.in supertuxkart-0.6.1a/data/grandprix/Makefile.in +--- supertuxkart-0.6.1a.orig/data/grandprix/Makefile.in 2009-02-18 23:30:40.000000000 +0000 ++++ supertuxkart-0.6.1a/data/grandprix/Makefile.in 2009-05-14 08:20:11.000000000 +0000 +@@ -63,7 +63,7 @@ + dist_pkgdataDATA_INSTALL = $(INSTALL_DATA) + DATA = $(dist_pkgdata_DATA) + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-pkgdatadir = $(datadir)/games/$(PACKAGE)/data/grandprix ++pkgdatadir = $(datadir)/$(PACKAGE)/data/grandprix + ACLOCAL = @ACLOCAL@ + AMDEP_FALSE = @AMDEP_FALSE@ + AMDEP_TRUE = @AMDEP_TRUE@ +diff -Naur supertuxkart-0.6.1a.orig/data/items/Makefile.in supertuxkart-0.6.1a/data/items/Makefile.in +--- supertuxkart-0.6.1a.orig/data/items/Makefile.in 2009-02-18 23:30:40.000000000 +0000 ++++ supertuxkart-0.6.1a/data/items/Makefile.in 2009-05-14 08:20:11.000000000 +0000 +@@ -63,7 +63,7 @@ + dist_pkgdataDATA_INSTALL = $(INSTALL_DATA) + DATA = $(dist_pkgdata_DATA) + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-pkgdatadir = $(datadir)/games/$(PACKAGE)/data/items ++pkgdatadir = $(datadir)/$(PACKAGE)/data/items + ACLOCAL = @ACLOCAL@ + AMDEP_FALSE = @AMDEP_FALSE@ + AMDEP_TRUE = @AMDEP_TRUE@ +diff -Naur supertuxkart-0.6.1a.orig/data/karts/Makefile.in supertuxkart-0.6.1a/data/karts/Makefile.in +--- supertuxkart-0.6.1a.orig/data/karts/Makefile.in 2009-02-18 23:44:11.000000000 +0000 ++++ supertuxkart-0.6.1a/data/karts/Makefile.in 2009-05-14 08:20:11.000000000 +0000 +@@ -63,7 +63,7 @@ + nobase_dist_pkgdataDATA_INSTALL = $(install_sh_DATA) + DATA = $(nobase_dist_pkgdata_DATA) + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-pkgdatadir = $(datadir)/games/$(PACKAGE)/data/karts ++pkgdatadir = $(datadir)/$(PACKAGE)/data/karts + ACLOCAL = @ACLOCAL@ + AMDEP_FALSE = @AMDEP_FALSE@ + AMDEP_TRUE = @AMDEP_TRUE@ +diff -Naur supertuxkart-0.6.1a.orig/data/models/Makefile.in supertuxkart-0.6.1a/data/models/Makefile.in +--- supertuxkart-0.6.1a.orig/data/models/Makefile.in 2009-02-18 23:30:40.000000000 +0000 ++++ supertuxkart-0.6.1a/data/models/Makefile.in 2009-05-14 08:20:11.000000000 +0000 +@@ -63,7 +63,7 @@ + dist_pkgdataDATA_INSTALL = $(INSTALL_DATA) + DATA = $(dist_pkgdata_DATA) + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-pkgdatadir = $(datadir)/games/$(PACKAGE)/data/models ++pkgdatadir = $(datadir)/$(PACKAGE)/data/models + ACLOCAL = @ACLOCAL@ + AMDEP_FALSE = @AMDEP_FALSE@ + AMDEP_TRUE = @AMDEP_TRUE@ +diff -Naur supertuxkart-0.6.1a.orig/data/music/Makefile.in supertuxkart-0.6.1a/data/music/Makefile.in +--- supertuxkart-0.6.1a.orig/data/music/Makefile.in 2009-02-18 23:30:40.000000000 +0000 ++++ supertuxkart-0.6.1a/data/music/Makefile.in 2009-05-14 08:20:11.000000000 +0000 +@@ -63,7 +63,7 @@ + dist_pkgdataDATA_INSTALL = $(INSTALL_DATA) + DATA = $(dist_pkgdata_DATA) + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-pkgdatadir = $(datadir)/games/$(PACKAGE)/data/music ++pkgdatadir = $(datadir)/$(PACKAGE)/data/music + ACLOCAL = @ACLOCAL@ + AMDEP_FALSE = @AMDEP_FALSE@ + AMDEP_TRUE = @AMDEP_TRUE@ +diff -Naur supertuxkart-0.6.1a.orig/data/po/Makefile.in supertuxkart-0.6.1a/data/po/Makefile.in +--- supertuxkart-0.6.1a.orig/data/po/Makefile.in 2009-02-18 23:30:40.000000000 +0000 ++++ supertuxkart-0.6.1a/data/po/Makefile.in 2009-05-14 08:20:11.000000000 +0000 +@@ -62,7 +62,7 @@ + nobase_pkgdataDATA_INSTALL = $(install_sh_DATA) + DATA = $(nobase_pkgdata_DATA) + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-pkgdatadir = $(datadir)/games/@PACKAGE@/data/po ++pkgdatadir = @localedir@ + ACLOCAL = @ACLOCAL@ + AMDEP_FALSE = @AMDEP_FALSE@ + AMDEP_TRUE = @AMDEP_TRUE@ +diff -Naur supertuxkart-0.6.1a.orig/data/sfx/Makefile.in supertuxkart-0.6.1a/data/sfx/Makefile.in +--- supertuxkart-0.6.1a.orig/data/sfx/Makefile.in 2009-02-18 23:30:41.000000000 +0000 ++++ supertuxkart-0.6.1a/data/sfx/Makefile.in 2009-05-14 08:20:11.000000000 +0000 +@@ -63,7 +63,7 @@ + nobase_dist_pkgdataDATA_INSTALL = $(install_sh_DATA) + DATA = $(nobase_dist_pkgdata_DATA) + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-pkgdatadir = $(datadir)/games/$(PACKAGE)/data/sfx ++pkgdatadir = $(datadir)/$(PACKAGE)/data/sfx + ACLOCAL = @ACLOCAL@ + AMDEP_FALSE = @AMDEP_FALSE@ + AMDEP_TRUE = @AMDEP_TRUE@ +diff -Naur supertuxkart-0.6.1a.orig/data/textures/Makefile.in supertuxkart-0.6.1a/data/textures/Makefile.in +--- supertuxkart-0.6.1a.orig/data/textures/Makefile.in 2009-02-18 23:30:41.000000000 +0000 ++++ supertuxkart-0.6.1a/data/textures/Makefile.in 2009-05-14 08:20:11.000000000 +0000 +@@ -63,7 +63,7 @@ + dist_pkgdataDATA_INSTALL = $(INSTALL_DATA) + DATA = $(dist_pkgdata_DATA) + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-pkgdatadir = $(datadir)/games/$(PACKAGE)/data/textures ++pkgdatadir = $(datadir)/$(PACKAGE)/data/textures + ACLOCAL = @ACLOCAL@ + AMDEP_FALSE = @AMDEP_FALSE@ + AMDEP_TRUE = @AMDEP_TRUE@ +diff -Naur supertuxkart-0.6.1a.orig/data/tracks/Makefile.in supertuxkart-0.6.1a/data/tracks/Makefile.in +--- supertuxkart-0.6.1a.orig/data/tracks/Makefile.in 2009-02-18 23:30:41.000000000 +0000 ++++ supertuxkart-0.6.1a/data/tracks/Makefile.in 2009-05-14 08:20:11.000000000 +0000 +@@ -63,7 +63,7 @@ + nobase_dist_pkgdataDATA_INSTALL = $(install_sh_DATA) + DATA = $(nobase_dist_pkgdata_DATA) + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-pkgdatadir = $(datadir)/games/$(PACKAGE)/data/tracks ++pkgdatadir = $(datadir)/$(PACKAGE)/data/tracks + ACLOCAL = @ACLOCAL@ + AMDEP_FALSE = @AMDEP_FALSE@ + AMDEP_TRUE = @AMDEP_TRUE@ diff --git a/games/supertuxkart/patches/fix-bin-directory.diff b/games/supertuxkart/patches/fix-bin-directory.diff new file mode 100644 index 0000000000..095b731c68 --- /dev/null +++ b/games/supertuxkart/patches/fix-bin-directory.diff @@ -0,0 +1,53 @@ +diff -Naur supertuxkart-0.6.1a.orig/src/Makefile.am supertuxkart-0.6.1a/src/Makefile.am +--- supertuxkart-0.6.1a.orig/src/Makefile.am 2009-02-16 01:23:45.000000000 +0000 ++++ supertuxkart-0.6.1a/src/Makefile.am 2009-05-14 06:54:40.000000000 +0000 +@@ -2,10 +2,10 @@ + + SUBDIRS = ide + +-bindir=$(prefix)/games ++bindir=$(prefix)/bin + bin_PROGRAMS = supertuxkart + +-AM_CPPFLAGS = -DSUPERTUXKART_DATADIR="\"$(datadir)/games/$(PACKAGE)/\"" \ ++AM_CPPFLAGS = -DSUPERTUXKART_DATADIR="\"$(datadir)/$(PACKAGE)/\"" \ + -I$(srcdir)/bullet/src/ -I$(srcdir)/enet/include/ + + supertuxkart_SOURCES = \ +diff -Naur supertuxkart-0.6.1a.orig/src/Makefile.in supertuxkart-0.6.1a/src/Makefile.in +--- supertuxkart-0.6.1a.orig/src/Makefile.in 2009-02-18 23:30:42.000000000 +0000 ++++ supertuxkart-0.6.1a/src/Makefile.in 2009-05-14 08:49:48.000000000 +0000 +@@ -226,7 +226,7 @@ + am__quote = @am__quote@ + am__tar = @am__tar@ + am__untar = @am__untar@ +-bindir = $(prefix)/games ++bindir = $(prefix)/bin + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ +@@ -271,7 +271,7 @@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ + SUBDIRS = ide +-AM_CPPFLAGS = -DSUPERTUXKART_DATADIR="\"$(datadir)/games/$(PACKAGE)/\"" \ ++AM_CPPFLAGS = -DSUPERTUXKART_DATADIR="\"$(datadir)/$(PACKAGE)/\"" \ + -I$(srcdir)/bullet/src/ -I$(srcdir)/enet/include/ + + supertuxkart_SOURCES = \ +diff -Naur supertuxkart-0.6.1a.orig/data/supertuxkart_desktop.template supertuxkart-0.6.1a/data/supertuxkart_desktop.template +--- supertuxkart-0.6.1a.orig/data/supertuxkart_desktop.template 2009-01-28 22:57:49.000000000 +0000 ++++ supertuxkart-0.6.1a/data/supertuxkart_desktop.template 2009-05-14 09:01:44.000000000 +0000 +@@ -8,10 +8,10 @@ + Comment[fr_FR]=Un jeu de karting + Comment[ro_RO]=Un joc de curse cu carturi + Comment[de_DE]=Ein Kart-Rennspiel +-Exec=PREFIX/games/supertuxkart --log=file ++Exec=PREFIX/bin/supertuxkart --log=file + Terminal=false + StartupNotify=false + Type=Application +-TryExec=PREFIX/games/supertuxkart ++TryExec=PREFIX/bin/supertuxkart + Categories=Game;ArcadeGame + GenericName= -- cgit v1.2.3