- Update to 3.4.0

- Remove MD5 checksum
- Remove all patches now included upstream

9 files changed, 141 insertions, 81 deletions

diff --git a/games/paintown/Makefile b/games/paintown/Makefile
index 9b2b45cd8b39..9e43de6bfe4d 100644
--- a/games/paintown/Makefile
+++ b/games/paintown/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	paintown
-PORTVERSION=	3.3.1
+PORTVERSION=	3.4.0
 CATEGORIES=	games
 MASTER_SITES=	SF
 
@@ -29,10 +29,6 @@ DESKTOP_ENTRIES="Paintown" "Fighting game similar to Streets of Rage and TMNT" \
 		"${LOCALBASE}/share/icons/hicolor/32x32/apps/paintown.png" \
 		"paintown" "Game;ActionGame;" false
 
-post-patch:
-		@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
-			${WRKSRC}/src/dumb/SConscript
-
 do-install:
 		${MKDIR} ${DATADIR}
 		(cd ${WRKSRC} && ./install.sh -d ${DATADIR} -b ${PREFIX}/bin)
diff --git a/games/paintown/distinfo b/games/paintown/distinfo
index c03e8dce26c9..f63ea7c656d1 100644
--- a/games/paintown/distinfo
+++ b/games/paintown/distinfo
@@ -1,3 +1,2 @@
-MD5 (paintown-3.3.1.tar.gz) = 61ae18b78ff4ca1caf287ddf7f8e0bf9
-SHA256 (paintown-3.3.1.tar.gz) = 8dbad49147c6c149a9774902a6b54d6172d13479e5f585b20d703730b1e0e6eb
-SIZE (paintown-3.3.1.tar.gz) = 25032902
+SHA256 (paintown-3.4.0.tar.gz) = c266a3ff89131715914649efcca5ffd5b2cac56ab2a953582ca5e098b8600b1c
+SIZE (paintown-3.4.0.tar.gz) = 29088967
diff --git a/games/paintown/files/patch-install.sh b/games/paintown/files/patch-install.sh
deleted file mode 100644
index befe48dacc49..000000000000
--- a/games/paintown/files/patch-install.sh
+++ /dev/null
@@ -1,13 +0,0 @@
---- install.sh.orig	2010-04-14 20:48:09.000000000 +0200
-+++ install.sh	2010-04-14 20:48:08.000000000 +0200
-@@ -28,8 +28,8 @@
- 	echo "Copying data to $dir"
- 	mkdir -p $dir
- 
--	find data -type d ! -regex '.*\.svn.*' -print0 | xargs -i -0 mkdir -p "$dir/{}"
--	find data -type f ! -regex '.*\.svn.*' -print0 | xargs -i -0 cp "{}" "$dir/{}"
-+	find data -type d ! -regex '.*\.svn.*' -print0 | xargs -0 -I "{}" mkdir -p "$dir/{}"
-+	find data -type f ! -regex '.*\.svn.*' -print0 | xargs -0 -I "{}" cp "{}" "$dir/{}"
- 	cp paintown $dir/paintown-bin
- }
- 
diff --git a/games/paintown/files/patch-src__dump__SConscript b/games/paintown/files/patch-src__dump__SConscript
deleted file mode 100644
index a15c90f0c1be..000000000000
--- a/games/paintown/files/patch-src__dump__SConscript
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/dumb/SConscript.orig	2010-04-14 20:48:09.000000000 +0200
-+++ src/dumb/SConscript	2010-04-14 20:48:09.000000000 +0200
-@@ -61,7 +61,7 @@
- # helpers/resamp2.inc
- # helpers/resamp3.inc
- 
--env.Append( CPPPATH = ['include','include/internal'] )
-+env.Append( CPPPATH = ['/usr/local/include','include','include/internal'] )
- env.Append( CCFLAGS = ['-Wall','-W','-Wwrite-strings','-Wstrict-prototypes','-Wmissing-declarations', '-O2', '-ffast-math', '-fomit-frame-pointer', '-Wno-missing-declarations'] )
- 
- env.Append( CPPDEFINES = 'DUMB_DECLARE_DEPRECATED' )
diff --git a/games/paintown/files/patch-src__hawknl__hawknl__htinternal.h b/games/paintown/files/patch-src__hawknl__hawknl__htinternal.h
deleted file mode 100644
index 33cb0ea22f0b..000000000000
--- a/games/paintown/files/patch-src__hawknl__hawknl__htinternal.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/hawknl/hawknl/htinternal.h.orig	2010-04-14 20:48:09.000000000 +0200
-+++ src/hawknl/hawknl/htinternal.h	2010-04-14 20:48:09.000000000 +0200
-@@ -27,7 +27,7 @@
- 
- /* for malloc and free */
- #include <stdlib.h>
--#ifndef MACOSX
-+#if !defined(MACOSX) && !defined(__FreeBSD__)
- #include <malloc.h>
- #endif
- #ifdef HL_WINDOWS_APP
diff --git a/games/paintown/files/patch-src__hawknl__hawknl__nlinternal.h b/games/paintown/files/patch-src__hawknl__hawknl__nlinternal.h
deleted file mode 100644
index 0b494bccd6d4..000000000000
--- a/games/paintown/files/patch-src__hawknl__hawknl__nlinternal.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/hawknl/hawknl/nlinternal.h.orig	2010-04-14 20:48:09.000000000 +0200
-+++ src/hawknl/hawknl/nlinternal.h	2010-04-14 20:48:09.000000000 +0200
-@@ -28,7 +28,7 @@
- 
- /* for malloc and free */
- #include <stdlib.h>
--#ifndef MACOSX
-+#if !defined(MACOS) && !defined(__FreeBSD__)
- #include <malloc.h>
- #endif
- 
diff --git a/games/paintown/files/patch-src__hawknl__src__htcondition.c b/games/paintown/files/patch-src__hawknl__src__htcondition.c
deleted file mode 100644
index 36ce0380adfe..000000000000
--- a/games/paintown/files/patch-src__hawknl__src__htcondition.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/hawknl/src/htcondition.c.orig	2010-04-14 20:48:09.000000000 +0200
-+++ src/hawknl/src/htcondition.c	2010-04-14 20:48:09.000000000 +0200
-@@ -37,6 +37,9 @@
- 
- #else /* !HT_WIN_THREADS */
- 
-+#ifdef __FreeBSD__
-+#include <sys/types.h>
-+#endif
- #include <sys/timeb.h>
- 
- #ifdef HL_WINDOWS_APP
diff --git a/games/paintown/files/patch-src__hawknl__src__htmutex.c b/games/paintown/files/patch-src__hawknl__src__htmutex.c
deleted file mode 100644
index 5d33c666527d..000000000000
--- a/games/paintown/files/patch-src__hawknl__src__htmutex.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/hawknl/src/htmutex.c.orig	2010-04-14 20:48:09.000000000 +0200
-+++ src/hawknl/src/htmutex.c	2010-04-14 20:48:09.000000000 +0200
-@@ -72,7 +72,7 @@
-             return ENOMEM;
- 	    }
-         (void)pthread_mutexattr_init(&attr);
--#if defined MACOSX
-+#if defined MACOSX || defined __FreeBSD__
-         /* GUSI is not fully POSIX compliant, and does not
-          * define PTHREAD_MUTEX_ERRORCHECK
-          * http://lists.apple.com/archives/unix-porting/2005/May/msg00021.html
diff --git a/games/paintown/pkg-plist b/games/paintown/pkg-plist
index 95d805be3e37..b7b3cf0cc329 100644
--- a/games/paintown/pkg-plist
+++ b/games/paintown/pkg-plist
@@ -830,7 +830,6 @@ bin/paintown
 %%DATADIR%%/data/chars/yashiro/walk/walk8.png
 %%DATADIR%%/data/chars/yashiro/yashiro.txt
 %%DATADIR%%/data/chars/yashiro/yashiro.txt.good
-%%DATADIR%%/data/fonts.dat
 %%DATADIR%%/data/fonts/Neuropol.ttf
 %%DATADIR%%/data/fonts/arial.ttf
 %%DATADIR%%/data/fonts/chiller.ttf
@@ -869,8 +868,7 @@ bin/paintown
 %%DATADIR%%/data/menu/bgs/seizure-bg/00200011.png
 %%DATADIR%%/data/menu/bgs/seizure-bg/00200012.png
 %%DATADIR%%/data/menu/bgs/seizure-bg/00200013.png
-%%DATADIR%%/data/menu/change-mod.txt
-%%DATADIR%%/data/menu/level_select.txt
+%%DATADIR%%/data/menu/in-game.txt
 %%DATADIR%%/data/menu/main.txt
 %%DATADIR%%/data/menu/options.txt
 %%DATADIR%%/data/menu/paintown.png
@@ -2074,6 +2072,118 @@ bin/paintown
 %%DATADIR%%/data/players/maxima/walk/walk005.png
 %%DATADIR%%/data/players/maxima/walk/walk006.png
 %%DATADIR%%/data/players/maxima/walk/walk007.png
+%%DATADIR%%/data/players/mj/attack1/01.png
+%%DATADIR%%/data/players/mj/attack1/02.png
+%%DATADIR%%/data/players/mj/attack1/03.png
+%%DATADIR%%/data/players/mj/attack1/04.png
+%%DATADIR%%/data/players/mj/attack2/01.png
+%%DATADIR%%/data/players/mj/attack2/02.png
+%%DATADIR%%/data/players/mj/attack2/03.png
+%%DATADIR%%/data/players/mj/attack2/04.png
+%%DATADIR%%/data/players/mj/attack2/05.png
+%%DATADIR%%/data/players/mj/attack2/06.png
+%%DATADIR%%/data/players/mj/attack3/01.png
+%%DATADIR%%/data/players/mj/attack3/02.png
+%%DATADIR%%/data/players/mj/attack3/03.png
+%%DATADIR%%/data/players/mj/attack3/04.png
+%%DATADIR%%/data/players/mj/attack3/05.png
+%%DATADIR%%/data/players/mj/attack3/06.png
+%%DATADIR%%/data/players/mj/attack3/07.png
+%%DATADIR%%/data/players/mj/attack3/08.png
+%%DATADIR%%/data/players/mj/attack3/09.png
+%%DATADIR%%/data/players/mj/die.wav
+%%DATADIR%%/data/players/mj/fall/01.png
+%%DATADIR%%/data/players/mj/fall/02.png
+%%DATADIR%%/data/players/mj/fall/03.png
+%%DATADIR%%/data/players/mj/fall/04.png
+%%DATADIR%%/data/players/mj/fall/05.png
+%%DATADIR%%/data/players/mj/get/01.png
+%%DATADIR%%/data/players/mj/get/02.png
+%%DATADIR%%/data/players/mj/get/03.png
+%%DATADIR%%/data/players/mj/get/04.png
+%%DATADIR%%/data/players/mj/grab.png
+%%DATADIR%%/data/players/mj/hurt/01.png
+%%DATADIR%%/data/players/mj/hurt/02.png
+%%DATADIR%%/data/players/mj/hurt/03.png
+%%DATADIR%%/data/players/mj/icon.png
+%%DATADIR%%/data/players/mj/jump/01.png
+%%DATADIR%%/data/players/mj/jump/02.png
+%%DATADIR%%/data/players/mj/jump/03.png
+%%DATADIR%%/data/players/mj/jump/04.png
+%%DATADIR%%/data/players/mj/jump/05.png
+%%DATADIR%%/data/players/mj/jump/06.png
+%%DATADIR%%/data/players/mj/jump/07.png
+%%DATADIR%%/data/players/mj/jump/08.png
+%%DATADIR%%/data/players/mj/jump/09.png
+%%DATADIR%%/data/players/mj/jump/10.png
+%%DATADIR%%/data/players/mj/jump/11.png
+%%DATADIR%%/data/players/mj/jumpattack1/01.png
+%%DATADIR%%/data/players/mj/jumpattack1/02.png
+%%DATADIR%%/data/players/mj/jumpattack1/03.png
+%%DATADIR%%/data/players/mj/jumpattack1/04.png
+%%DATADIR%%/data/players/mj/jumpattack1/05.png
+%%DATADIR%%/data/players/mj/jumpattack1/06.png
+%%DATADIR%%/data/players/mj/jumpattack2/01.png
+%%DATADIR%%/data/players/mj/jumpattack2/02.png
+%%DATADIR%%/data/players/mj/jumpattack2/03.png
+%%DATADIR%%/data/players/mj/jumpattack2/04.png
+%%DATADIR%%/data/players/mj/mj.txt
+%%DATADIR%%/data/players/mj/rise/01.png
+%%DATADIR%%/data/players/mj/rise/02.png
+%%DATADIR%%/data/players/mj/rise/03.png
+%%DATADIR%%/data/players/mj/rise/04.png
+%%DATADIR%%/data/players/mj/rise/05.png
+%%DATADIR%%/data/players/mj/special/01.png
+%%DATADIR%%/data/players/mj/special/02.png
+%%DATADIR%%/data/players/mj/special/03.png
+%%DATADIR%%/data/players/mj/special/04.png
+%%DATADIR%%/data/players/mj/special/05.png
+%%DATADIR%%/data/players/mj/special/06.png
+%%DATADIR%%/data/players/mj/special/07.png
+%%DATADIR%%/data/players/mj/special/08.png
+%%DATADIR%%/data/players/mj/special/09.png
+%%DATADIR%%/data/players/mj/special/10.png
+%%DATADIR%%/data/players/mj/stand/01.png
+%%DATADIR%%/data/players/mj/stand/02.png
+%%DATADIR%%/data/players/mj/stand/03.png
+%%DATADIR%%/data/players/mj/stand/04.png
+%%DATADIR%%/data/players/mj/stand/05.png
+%%DATADIR%%/data/players/mj/stand/06.png
+%%DATADIR%%/data/players/mj/strike/01.png
+%%DATADIR%%/data/players/mj/strike/02.png
+%%DATADIR%%/data/players/mj/super/01.png
+%%DATADIR%%/data/players/mj/super/02.png
+%%DATADIR%%/data/players/mj/super/03.png
+%%DATADIR%%/data/players/mj/super/04.png
+%%DATADIR%%/data/players/mj/super/05.png
+%%DATADIR%%/data/players/mj/super/06.png
+%%DATADIR%%/data/players/mj/super/07.png
+%%DATADIR%%/data/players/mj/super/08.png
+%%DATADIR%%/data/players/mj/super/09.png
+%%DATADIR%%/data/players/mj/super/10.png
+%%DATADIR%%/data/players/mj/super/11.png
+%%DATADIR%%/data/players/mj/super/12.png
+%%DATADIR%%/data/players/mj/super/13.png
+%%DATADIR%%/data/players/mj/super/14.png
+%%DATADIR%%/data/players/mj/super/15.png
+%%DATADIR%%/data/players/mj/throw/01.png
+%%DATADIR%%/data/players/mj/throw/02.png
+%%DATADIR%%/data/players/mj/throw/03.png
+%%DATADIR%%/data/players/mj/throw/04.png
+%%DATADIR%%/data/players/mj/throw/05.png
+%%DATADIR%%/data/players/mj/throw/06.png
+%%DATADIR%%/data/players/mj/throw/07.png
+%%DATADIR%%/data/players/mj/walk/01.png
+%%DATADIR%%/data/players/mj/walk/02.png
+%%DATADIR%%/data/players/mj/walk/03.png
+%%DATADIR%%/data/players/mj/walk/04.png
+%%DATADIR%%/data/players/mj/walk/05.png
+%%DATADIR%%/data/players/mj/walk/06.png
+%%DATADIR%%/data/players/mj/walk/07.png
+%%DATADIR%%/data/players/mj/walk/08.png
+%%DATADIR%%/data/players/mj/walk/09.png
+%%DATADIR%%/data/players/mj/walk/10.png
+%%DATADIR%%/data/players/mj/walk/11.png
 %%DATADIR%%/data/players/ryu/Ryu.gif
 %%DATADIR%%/data/players/ryu/die.wav
 %%DATADIR%%/data/players/ryu/fall/ryu-fall01.png
@@ -2504,6 +2614,8 @@ bin/paintown
 %%DATADIR%%/data/players/wolverine/walk/5.png
 %%DATADIR%%/data/players/wolverine/walk/6.png
 %%DATADIR%%/data/players/wolverine/wolverine.txt
+%%DATADIR%%/data/psp/icon0.png
+%%DATADIR%%/data/psp/pic1.png
 %%DATADIR%%/data/river-city-ransom/players/alex/alex.txt
 %%DATADIR%%/data/river-city-ransom/players/alex/fall/1.png
 %%DATADIR%%/data/river-city-ransom/players/alex/fall/2.png
@@ -2552,22 +2664,25 @@ bin/paintown
 %%DATADIR%%/data/sounds/squish.wav
 %%DATADIR%%/data/sounds/steelsword.wav
 %%DATADIR%%/data/sounds/swing.wav
+%%DATADIR%%/data/sounds/thunder.wav
 %%DATADIR%%/data/sprites/arrow.png
 %%DATADIR%%/data/sprites/lamp.png
 %%DATADIR%%/data/sprites/logo.png
-%%DATADIR%%/data/sprites/select.png
 %%DATADIR%%/data/sprites/shadow/shadow1.png
 %%DATADIR%%/data/sprites/shadow/shadow2.png
 %%DATADIR%%/data/sprites/shadow/shadow3.png
 %%DATADIR%%/data/sprites/shadow/shadow4.png
 %%DATADIR%%/data/sprites/shadow/shadow5.png
 %%DATADIR%%/data/sprites/shadow/shadow6.png
+%%DATADIR%%/data/wii/icon.png
+%%DATADIR%%/data/wii/meta.xml
 %%DATADIR%%/paintown-bin
 share/icons/hicolor/32x32/apps/paintown.png
 @dirrmtry share/icons/hicolor/32x32/apps
 @dirrmtry share/icons/hicolor/32x32
 @dirrmtry share/icons/hicolor
 @dirrmtry share/icons
+@dirrm %%DATADIR%%/data/wii
 @dirrm %%DATADIR%%/data/sprites/shadow
 @dirrm %%DATADIR%%/data/sprites
 @dirrm %%DATADIR%%/data/sounds
@@ -2588,6 +2703,7 @@ share/icons/hicolor/32x32/apps/paintown.png
 @dirrm %%DATADIR%%/data/river-city-ransom/players/alex
 @dirrm %%DATADIR%%/data/river-city-ransom/players
 @dirrm %%DATADIR%%/data/river-city-ransom
+@dirrm %%DATADIR%%/data/psp
 @dirrm %%DATADIR%%/data/players/wolverine/walk
 @dirrm %%DATADIR%%/data/players/wolverine/taunt1
 @dirrm %%DATADIR%%/data/players/wolverine/special
@@ -2646,6 +2762,23 @@ share/icons/hicolor/32x32/apps/paintown.png
 @dirrm %%DATADIR%%/data/players/ryu/get
 @dirrm %%DATADIR%%/data/players/ryu/fall
 @dirrm %%DATADIR%%/data/players/ryu
+@dirrm %%DATADIR%%/data/players/mj/walk
+@dirrm %%DATADIR%%/data/players/mj/throw
+@dirrm %%DATADIR%%/data/players/mj/super
+@dirrm %%DATADIR%%/data/players/mj/strike
+@dirrm %%DATADIR%%/data/players/mj/stand
+@dirrm %%DATADIR%%/data/players/mj/special
+@dirrm %%DATADIR%%/data/players/mj/rise
+@dirrm %%DATADIR%%/data/players/mj/jumpattack2
+@dirrm %%DATADIR%%/data/players/mj/jumpattack1
+@dirrm %%DATADIR%%/data/players/mj/jump
+@dirrm %%DATADIR%%/data/players/mj/hurt
+@dirrm %%DATADIR%%/data/players/mj/get
+@dirrm %%DATADIR%%/data/players/mj/fall
+@dirrm %%DATADIR%%/data/players/mj/attack3
+@dirrm %%DATADIR%%/data/players/mj/attack2
+@dirrm %%DATADIR%%/data/players/mj/attack1
+@dirrm %%DATADIR%%/data/players/mj
 @dirrm %%DATADIR%%/data/players/maxima/walk
 @dirrm %%DATADIR%%/data/players/maxima/throw
 @dirrm %%DATADIR%%/data/players/maxima/super
@@ -2804,6 +2937,7 @@ share/icons/hicolor/32x32/apps/paintown.png
 @dirrm %%DATADIR%%/data/players/akuma/dragon-punch
 @dirrm %%DATADIR%%/data/players/akuma
 @dirrm %%DATADIR%%/data/players
+@dirrm %%DATADIR%%/data/paks
 @dirrm %%DATADIR%%/data/paintown/levels
 @dirrm %%DATADIR%%/data/paintown
 @dirrm %%DATADIR%%/data/music