diff options
Diffstat (limited to 'games/paintown')
-rw-r--r-- | games/paintown/Makefile | 4 | ||||
-rw-r--r-- | games/paintown/distinfo | 4 | ||||
-rw-r--r-- | games/paintown/files/patch-IMG_png.c | 35 | ||||
-rw-r--r-- | games/paintown/files/patch-IMG_savepng.c | 28 | ||||
-rw-r--r-- | games/paintown/pkg-plist | 141 |
5 files changed, 144 insertions, 68 deletions
diff --git a/games/paintown/Makefile b/games/paintown/Makefile index bb351fe9d295..e6fb5ac1e769 100644 --- a/games/paintown/Makefile +++ b/games/paintown/Makefile @@ -6,8 +6,7 @@ # PORTNAME= paintown -PORTVERSION= 3.5.0 -PORTREVISION= 2 +PORTVERSION= 3.6.0 CATEGORIES= games MASTER_SITES= SF @@ -21,6 +20,7 @@ LIB_DEPENDS+= alleg.42:${PORTSDIR}/devel/allegro \ png15:${PORTSDIR}/graphics/png \ freetype:${PORTSDIR}/print/freetype2 +USE_BZIP2= yes USE_SCONS= yes USE_SDL= yes INSTALLS_ICONS= yes diff --git a/games/paintown/distinfo b/games/paintown/distinfo index 8c94e67d70d5..8610ab32ffc5 100644 --- a/games/paintown/distinfo +++ b/games/paintown/distinfo @@ -1,2 +1,2 @@ -SHA256 (paintown-3.5.0.tar.gz) = a34fc688e648b8d195ea3f463df9572c42ae68fd403efb08765c2507e52d358e -SIZE (paintown-3.5.0.tar.gz) = 70701014 +SHA256 (paintown-3.6.0.tar.bz2) = 81392d353e533dee9d5199be17798d796adff56d5c69814d4508c3e9c3a2034a +SIZE (paintown-3.6.0.tar.bz2) = 71714877 diff --git a/games/paintown/files/patch-IMG_png.c b/games/paintown/files/patch-IMG_png.c deleted file mode 100644 index fce0773fe601..000000000000 --- a/games/paintown/files/patch-IMG_png.c +++ /dev/null @@ -1,35 +0,0 @@ ---- src/util/sdl/image/IMG_png.c.orig 2012-04-29 06:46:37.000000000 +0200 -+++ src/util/sdl/image/IMG_png.c 2012-04-30 06:37:36.000000000 +0200 -@@ -70,6 +70,7 @@ - #define MACOS - #endif - #include <png.h> -+#include <pngpriv.h> - - - static struct { -@@ -288,7 +289,7 @@ - } - - /* Load a PNG type image from an SDL datasource */ --static void png_read_data(png_structp ctx, png_bytep area, png_size_t size) -+static void local_png_read_data(png_structp ctx, png_bytep area, png_size_t size) - { - SDL_RWops *src; - -@@ -347,13 +348,13 @@ - * the normal method of doing things with libpng). REQUIRED unless you - * set up your own error handlers in png_create_read_struct() earlier. - */ -- if ( setjmp(png_ptr->jmpbuf) ) { -+ if ( setjmp(png_jmpbuf(png_ptr)) ) { - error = "Error reading the PNG file."; - goto done; - } - - /* Set up the input control */ -- lib.png_set_read_fn(png_ptr, src, png_read_data); -+ lib.png_set_read_fn(png_ptr, src, local_png_read_data); - - /* Read PNG header info */ - lib.png_read_info(png_ptr, info_ptr); diff --git a/games/paintown/files/patch-IMG_savepng.c b/games/paintown/files/patch-IMG_savepng.c deleted file mode 100644 index b16cb6c054f0..000000000000 --- a/games/paintown/files/patch-IMG_savepng.c +++ /dev/null @@ -1,28 +0,0 @@ ---- src/util/sdl/image/IMG_savepng.c.orig 2012-04-29 06:46:37.000000000 +0200 -+++ src/util/sdl/image/IMG_savepng.c 2012-05-01 10:22:57.000000000 +0200 -@@ -33,6 +33,7 @@ - #include <SDL/SDL_byteorder.h> - #endif - #include <png.h> -+#include <zlib.h> - #include "IMG_savepng.h" - - int IMG_SavePNG(const char *file, SDL_Surface *surf,int compression){ -@@ -50,7 +52,7 @@ - return ret; - } - --static void png_write_data(png_structp png_ptr,png_bytep data, png_size_t length){ -+static void local_png_write_data(png_structp png_ptr,png_bytep data, png_size_t length){ - SDL_RWops *rp = (SDL_RWops*) png_get_io_ptr(png_ptr); - SDL_RWwrite(rp,data,1,length); - } -@@ -89,7 +90,7 @@ - goto savedone; - } - /* setup custom writer functions */ -- png_set_write_fn(png_ptr,(voidp)src,png_write_data,NULL); -+ png_set_write_fn(png_ptr,(voidp)src,local_png_write_data,NULL); - - if (setjmp(png_jmpbuf(png_ptr))){ - SDL_SetError("Unknown error writing PNG"); diff --git a/games/paintown/pkg-plist b/games/paintown/pkg-plist index 6eddda9af0b2..23a6780ed7cc 100644 --- a/games/paintown/pkg-plist +++ b/games/paintown/pkg-plist @@ -1,5 +1,98 @@ @comment $FreeBSD$ bin/paintown +%%DATADIR%%/data/asteroids/explode/explode01.png +%%DATADIR%%/data/asteroids/explode/explode02.png +%%DATADIR%%/data/asteroids/explode/explode03.png +%%DATADIR%%/data/asteroids/explode/explode04.png +%%DATADIR%%/data/asteroids/explode/explode05.png +%%DATADIR%%/data/asteroids/explode/explode06.png +%%DATADIR%%/data/asteroids/explode/explode07.png +%%DATADIR%%/data/asteroids/explode/explode08.png +%%DATADIR%%/data/asteroids/explode/explode09.png +%%DATADIR%%/data/asteroids/explode/explode10.png +%%DATADIR%%/data/asteroids/explode/explode11.png +%%DATADIR%%/data/asteroids/explode/explode12.png +%%DATADIR%%/data/asteroids/explode/explode13.png +%%DATADIR%%/data/asteroids/explode/explode14.png +%%DATADIR%%/data/asteroids/explode/explode15.png +%%DATADIR%%/data/asteroids/large/asteroidBig01.png +%%DATADIR%%/data/asteroids/large/asteroidBig02.png +%%DATADIR%%/data/asteroids/large/asteroidBig03.png +%%DATADIR%%/data/asteroids/large/asteroidBig04.png +%%DATADIR%%/data/asteroids/large/asteroidBig05.png +%%DATADIR%%/data/asteroids/large/asteroidBig06.png +%%DATADIR%%/data/asteroids/large/asteroidBig07.png +%%DATADIR%%/data/asteroids/large/asteroidBig08.png +%%DATADIR%%/data/asteroids/large/asteroidBig09.png +%%DATADIR%%/data/asteroids/large/asteroidBig10.png +%%DATADIR%%/data/asteroids/large/asteroidBig11.png +%%DATADIR%%/data/asteroids/large/asteroidBig12.png +%%DATADIR%%/data/asteroids/large/asteroidBig13.png +%%DATADIR%%/data/asteroids/large/asteroidBig14.png +%%DATADIR%%/data/asteroids/large/asteroidBig15.png +%%DATADIR%%/data/asteroids/large/asteroidBig16.png +%%DATADIR%%/data/asteroids/large/asteroidBig17.png +%%DATADIR%%/data/asteroids/large/asteroidBig18.png +%%DATADIR%%/data/asteroids/large/asteroidBig19.png +%%DATADIR%%/data/asteroids/large/asteroidBig20.png +%%DATADIR%%/data/asteroids/large/asteroidBig21.png +%%DATADIR%%/data/asteroids/large/asteroidBig22.png +%%DATADIR%%/data/asteroids/large/asteroidBig23.png +%%DATADIR%%/data/asteroids/medium/asteroidMid01.png +%%DATADIR%%/data/asteroids/medium/asteroidMid02.png +%%DATADIR%%/data/asteroids/medium/asteroidMid03.png +%%DATADIR%%/data/asteroids/medium/asteroidMid04.png +%%DATADIR%%/data/asteroids/medium/asteroidMid05.png +%%DATADIR%%/data/asteroids/medium/asteroidMid06.png +%%DATADIR%%/data/asteroids/medium/asteroidMid07.png +%%DATADIR%%/data/asteroids/medium/asteroidMid08.png +%%DATADIR%%/data/asteroids/medium/asteroidMid09.png +%%DATADIR%%/data/asteroids/medium/asteroidMid10.png +%%DATADIR%%/data/asteroids/medium/asteroidMid11.png +%%DATADIR%%/data/asteroids/medium/asteroidMid12.png +%%DATADIR%%/data/asteroids/medium/asteroidMid13.png +%%DATADIR%%/data/asteroids/medium/asteroidMid14.png +%%DATADIR%%/data/asteroids/medium/asteroidMid15.png +%%DATADIR%%/data/asteroids/medium/asteroidMid16.png +%%DATADIR%%/data/asteroids/medium/asteroidMid17.png +%%DATADIR%%/data/asteroids/medium/asteroidMid18.png +%%DATADIR%%/data/asteroids/medium/asteroidMid19.png +%%DATADIR%%/data/asteroids/ships/ship1.png +%%DATADIR%%/data/asteroids/small-explode/explodeSmall01.png +%%DATADIR%%/data/asteroids/small-explode/explodeSmall02.png +%%DATADIR%%/data/asteroids/small-explode/explodeSmall03.png +%%DATADIR%%/data/asteroids/small-explode/explodeSmall04.png +%%DATADIR%%/data/asteroids/small-explode/explodeSmall05.png +%%DATADIR%%/data/asteroids/small-explode/explodeSmall06.png +%%DATADIR%%/data/asteroids/small-explode/explodeSmall07.png +%%DATADIR%%/data/asteroids/small-explode/explodeSmall08.png +%%DATADIR%%/data/asteroids/small-explode/explodeSmall09.png +%%DATADIR%%/data/asteroids/small-explode/explodeSmall10.png +%%DATADIR%%/data/asteroids/small-explode/explodeSmall11.png +%%DATADIR%%/data/asteroids/small-explode/explodeSmall12.png +%%DATADIR%%/data/asteroids/small-explode/explodeSmall13.png +%%DATADIR%%/data/asteroids/small-explode/explodeSmall14.png +%%DATADIR%%/data/asteroids/small-explode/explodeSmall15.png +%%DATADIR%%/data/asteroids/small/asteroid01.png +%%DATADIR%%/data/asteroids/small/asteroid02.png +%%DATADIR%%/data/asteroids/small/asteroid03.png +%%DATADIR%%/data/asteroids/small/asteroid04.png +%%DATADIR%%/data/asteroids/small/asteroid05.png +%%DATADIR%%/data/asteroids/small/asteroid06.png +%%DATADIR%%/data/asteroids/small/asteroid07.png +%%DATADIR%%/data/asteroids/small/asteroid08.png +%%DATADIR%%/data/asteroids/small/asteroid09.png +%%DATADIR%%/data/asteroids/small/asteroid10.png +%%DATADIR%%/data/asteroids/small/asteroid11.png +%%DATADIR%%/data/asteroids/small/asteroid12.png +%%DATADIR%%/data/asteroids/small/asteroid13.png +%%DATADIR%%/data/asteroids/small/asteroid14.png +%%DATADIR%%/data/asteroids/small/asteroid15.png +%%DATADIR%%/data/asteroids/small/asteroid16.png +%%DATADIR%%/data/asteroids/sounds/crash.wav +%%DATADIR%%/data/asteroids/sounds/explode.wav +%%DATADIR%%/data/asteroids/sounds/laser.wav +%%DATADIR%%/data/asteroids/sounds/pop.wav %%DATADIR%%/data/bgs/alley/back.png %%DATADIR%%/data/bgs/alley/p01.png %%DATADIR%%/data/bgs/alley/p02.png @@ -945,6 +1038,36 @@ bin/paintown %%DATADIR%%/data/misc/flash/flash008.png %%DATADIR%%/data/misc/flash/flash009.png %%DATADIR%%/data/misc/flash/flash010.png +%%DATADIR%%/data/missile-defend/images/background.png +%%DATADIR%%/data/missile-defend/images/city1.png +%%DATADIR%%/data/missile-defend/images/city2.png +%%DATADIR%%/data/missile-defend/images/closedmoambase.png +%%DATADIR%%/data/missile-defend/images/crosshair.png +%%DATADIR%%/data/missile-defend/images/deadcity1.png +%%DATADIR%%/data/missile-defend/images/deadcity2.png +%%DATADIR%%/data/missile-defend/images/deadmisslebase.png +%%DATADIR%%/data/missile-defend/images/fireball.png +%%DATADIR%%/data/missile-defend/images/hand.png +%%DATADIR%%/data/missile-defend/images/mdefend.png +%%DATADIR%%/data/missile-defend/images/missle1.png +%%DATADIR%%/data/missile-defend/images/missle2.png +%%DATADIR%%/data/missile-defend/images/missle3.png +%%DATADIR%%/data/missile-defend/images/missle4.png +%%DATADIR%%/data/missile-defend/images/missle5.png +%%DATADIR%%/data/missile-defend/images/misslebase.png +%%DATADIR%%/data/missile-defend/images/moam.png +%%DATADIR%%/data/missile-defend/images/moambase.png +%%DATADIR%%/data/missile-defend/images/moambaseanim1.png +%%DATADIR%%/data/missile-defend/images/moambaseanim2.png +%%DATADIR%%/data/missile-defend/images/moambaseanim3.png +%%DATADIR%%/data/missile-defend/images/moambaseanim4.png +%%DATADIR%%/data/missile-defend/images/smoke.png +%%DATADIR%%/data/missile-defend/images/turret.png +%%DATADIR%%/data/missile-defend/sounds/ding.wav +%%DATADIR%%/data/missile-defend/sounds/exploded.wav +%%DATADIR%%/data/missile-defend/sounds/explosion2.wav +%%DATADIR%%/data/missile-defend/sounds/launch.wav +%%DATADIR%%/data/missile-defend/sounds/tick.wav %%DATADIR%%/data/mugen/chars/kfm/air.test %%DATADIR%%/data/mugen/chars/kfm/ending.def %%DATADIR%%/data/mugen/chars/kfm/ending.sff @@ -1032,7 +1155,6 @@ bin/paintown %%DATADIR%%/data/music/fall.xm %%DATADIR%%/data/music/kajahtaa.xm %%DATADIR%%/data/music/kilimanz.mod -%%DATADIR%%/data/paintown-title.png %%DATADIR%%/data/paintown/levels/1.txt %%DATADIR%%/data/paintown/levels/10.txt %%DATADIR%%/data/paintown/levels/11.txt @@ -2880,6 +3002,11 @@ bin/paintown %%DATADIR%%/data/river-city-ransom/players/alex/walk/1.png %%DATADIR%%/data/river-city-ransom/players/alex/walk/2.png %%DATADIR%%/data/scripts/paintown.py +%%DATADIR%%/data/select/back.png +%%DATADIR%%/data/select/front.png +%%DATADIR%%/data/select/select0.png +%%DATADIR%%/data/select/select1.png +%%DATADIR%%/data/select/selectalt.png %%DATADIR%%/data/sounds/beat1.wav %%DATADIR%%/data/sounds/beat2.wav %%DATADIR%%/data/sounds/beat3.wav @@ -2935,6 +3062,7 @@ share/icons/hicolor/32x32/apps/paintown.png @dirrm %%DATADIR%%/data/sprites/arrows @dirrm %%DATADIR%%/data/sprites @dirrm %%DATADIR%%/data/sounds +@dirrm %%DATADIR%%/data/select @dirrm %%DATADIR%%/data/scripts @dirrm %%DATADIR%%/data/river-city-ransom/players/alex/walk @dirrm %%DATADIR%%/data/river-city-ransom/players/alex/upper-cut @@ -3228,6 +3356,9 @@ share/icons/hicolor/32x32/apps/paintown.png @dirrm %%DATADIR%%/data/mugen/chars/kfm @dirrm %%DATADIR%%/data/mugen/chars @dirrm %%DATADIR%%/data/mugen +@dirrm %%DATADIR%%/data/missile-defend/sounds +@dirrm %%DATADIR%%/data/missile-defend/images +@dirrm %%DATADIR%%/data/missile-defend @dirrm %%DATADIR%%/data/misc/flash @dirrm %%DATADIR%%/data/misc/chicken @dirrm %%DATADIR%%/data/misc/cat/yawn @@ -3345,5 +3476,13 @@ share/icons/hicolor/32x32/apps/paintown.png @dirrm %%DATADIR%%/data/bgs/bar @dirrm %%DATADIR%%/data/bgs/alley @dirrm %%DATADIR%%/data/bgs +@dirrm %%DATADIR%%/data/asteroids/sounds +@dirrm %%DATADIR%%/data/asteroids/small-explode +@dirrm %%DATADIR%%/data/asteroids/small +@dirrm %%DATADIR%%/data/asteroids/ships +@dirrm %%DATADIR%%/data/asteroids/medium +@dirrm %%DATADIR%%/data/asteroids/large +@dirrm %%DATADIR%%/data/asteroids/explode +@dirrm %%DATADIR%%/data/asteroids @dirrm %%DATADIR%%/data @dirrm %%DATADIR%% |