diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2012-06-01 05:26:28 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2012-06-01 05:26:28 +0000 |
| commit | 2b74a89bc8342f0b9b737c37d87737caf7b0ea1e (patch) | |
| tree | c04604583d8be53b3ed7f10975be828c731f87cb /games | |
| parent | 24315159daa0089f08acea4ba1b130fb6721ad5c (diff) | |
| download | ports-2b74a89bc8342f0b9b737c37d87737caf7b0ea1e.tar.gz ports-2b74a89bc8342f0b9b737c37d87737caf7b0ea1e.zip | |
- update png to 1.5.10
Notes
Notes:
svn path=/head/; revision=297915
Diffstat (limited to 'games')
445 files changed, 1600 insertions, 500 deletions
diff --git a/games/0ad/Makefile b/games/0ad/Makefile index 3ab2c906ccc1..c0ba3e2313be 100644 --- a/games/0ad/Makefile +++ b/games/0ad/Makefile @@ -7,6 +7,7 @@ PORTNAME= 0ad DISTVERSION= alpha.10 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF/zero-ad/releases DISTFILES= ${PORTNAME}-${SVNREV}-alpha-unix-build.tar.xz \ @@ -20,7 +21,7 @@ BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash \ cmake:${PORTSDIR}/devel/cmake LIB_DEPENDS= boost_thread:${PORTSDIR}/devel/boost-libs \ execinfo:${PORTSDIR}/devel/libexecinfo \ - png:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ ogg:${PORTSDIR}/audio/libogg \ vorbis:${PORTSDIR}/audio/libvorbis \ curl:${PORTSDIR}/ftp/curl \ diff --git a/games/4stattack/Makefile b/games/4stattack/Makefile index f84ad8a0c7fe..a8f5c9b4dea8 100644 --- a/games/4stattack/Makefile +++ b/games/4stattack/Makefile @@ -7,7 +7,7 @@ PORTNAME= 4stattack PORTVERSION= 2.1.4 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games MASTER_SITES= SF/forcedattack/4stAttack/${PORTVERSION} DISTNAME= 4stAttack-${PORTVERSION} diff --git a/games/54321/Makefile b/games/54321/Makefile index a1685c1a639d..00e3e4f9ea82 100644 --- a/games/54321/Makefile +++ b/games/54321/Makefile @@ -7,7 +7,7 @@ PORTNAME= 54321 PORTVERSION= 1.0.2001.11.16 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= games MASTER_SITES= http://www.nklein.com/products/54321/${PORTVERSION}/ DISTNAME= ${PORTNAME} @@ -16,7 +16,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= llwang@infor.org COMMENT= 54321 is five games in four-, three-, or two-dimensions for one player -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png USE_SDL= image sdl USE_GMAKE= yes diff --git a/games/adgali/Makefile b/games/adgali/Makefile index 78d8c6fa0cfb..1ac19a489301 100644 --- a/games/adgali/Makefile +++ b/games/adgali/Makefile @@ -8,7 +8,7 @@ PORTNAME= adgali PORTVERSION= 0.2.4 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= games devel MASTER_SITES= http://adgali.apiou.org/download/ @@ -18,7 +18,7 @@ COMMENT= An open source game library useful for 2D game development LICENSE= GPLv2 LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \ - png.6:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ freetype.9:${PORTSDIR}/print/freetype2 \ execinfo.1:${PORTSDIR}/devel/libexecinfo diff --git a/games/adgali/files/patch-src-input-imageio-agl_pngio.c b/games/adgali/files/patch-src-input-imageio-agl_pngio.c index 9a7155464ad0..53ad107e4dee 100644 --- a/games/adgali/files/patch-src-input-imageio-agl_pngio.c +++ b/games/adgali/files/patch-src-input-imageio-agl_pngio.c @@ -1,5 +1,5 @@ --- src/input/imageio/agl_pngio.c.orig 2003-06-24 01:58:47.000000000 +0200 -+++ src/input/imageio/agl_pngio.c 2010-03-30 11:23:50.000000000 +0200 ++++ src/input/imageio/agl_pngio.c 2012-05-01 09:02:25.000000000 +0200 @@ -65,7 +65,7 @@ unsigned char buf[8]; @@ -9,6 +9,15 @@ return 0; } +@@ -106,7 +106,7 @@ + } + + /* standard png error handler */ +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + agl_error("Error reading the PNG file"); + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); @@ -131,7 +131,7 @@ /* see pnglib for these calls */ @@ -18,3 +27,12 @@ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) png_set_tRNS_to_alpha(png_ptr); +@@ -171,7 +171,7 @@ + *rowp = (png_bytep) pixelp; + /* standard png error handler redeclared to free the agl image if an + * error occurs */ +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + agl_error("Error reading the PNG file"); + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); diff --git a/games/afternoonstalker/Makefile b/games/afternoonstalker/Makefile index bf5bcd5fa752..70194dad05b3 100644 --- a/games/afternoonstalker/Makefile +++ b/games/afternoonstalker/Makefile @@ -7,7 +7,7 @@ PORTNAME= afternoonstalker PORTVERSION= 1.1.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://perso.b2b2c.ca/sarrazip/dev/ \ LOCAL/martymac diff --git a/games/agame/Makefile b/games/agame/Makefile index cce5e4200b21..f4df6e2c96e6 100644 --- a/games/agame/Makefile +++ b/games/agame/Makefile @@ -7,7 +7,7 @@ PORTNAME= agame PORTVERSION= 1577 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= games MASTER_SITES= http://zevv.nl/play/code/game/ \ http://critical.ch/distfiles/ \ diff --git a/games/alephone/Makefile b/games/alephone/Makefile index 44d268d6dfe4..486168e196d6 100644 --- a/games/alephone/Makefile +++ b/games/alephone/Makefile @@ -7,6 +7,7 @@ PORTNAME= alephone PORTVERSION= 20120128 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF/marathon/Aleph%20One/2012-01-28 DISTNAME= AlephOne-${PORTVERSION} diff --git a/games/alienarena/Makefile b/games/alienarena/Makefile index def4b0301327..50c4b5ef4cf3 100644 --- a/games/alienarena/Makefile +++ b/games/alienarena/Makefile @@ -7,6 +7,7 @@ PORTNAME= alienarena PORTVERSION= 2011.753 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ftp://ftp.linux.kiev.ua/pub/Linux/Gentoo/distfiles/ \ http://ftp.jeuxlinux.fr/files/ \ @@ -51,8 +52,9 @@ LIBDIR= ${PREFIX}/lib/${PORTNAME} .if defined(WITH_CLIENT) BUILD_DEPENDS+= pkg-config:${PORTSDIR}/devel/pkg-config LIB_DEPENDS+= curl.6:${PORTSDIR}/ftp/curl \ + freetype.9:${PORTSDIR}/print/freetype2 \ jpeg.11:${PORTSDIR}/graphics/jpeg \ - png.6:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ vorbis.4:${PORTSDIR}/audio/libvorbis USE_GL= yes USE_OPENAL= soft alut diff --git a/games/allacrost/Makefile b/games/allacrost/Makefile index 69da252d1e68..4a41a3ac6149 100644 --- a/games/allacrost/Makefile +++ b/games/allacrost/Makefile @@ -7,7 +7,7 @@ PORTNAME= allacrost PORTVERSION= 1.0.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-demo/${PORTVERSION} DISTNAME= ${PORTNAME}_demo_source_${PORTVERSION} @@ -16,7 +16,7 @@ MAINTAINER= amdmi3@FreeBSD.org COMMENT= A single player 2D role-playing game LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \ - png.6:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ ogg.7:${PORTSDIR}/audio/libogg \ vorbis.4:${PORTSDIR}/audio/libvorbis \ boost_thread.4:${PORTSDIR}/devel/boost-libs @@ -34,7 +34,7 @@ USE_GETTEXT= yes MAKE_JOBS_SAFE= yes CONFIGURE_ARGS= --datadir=${DATADIR} -CPPFLAGS+= -I${LOCALBASE}/include -I${LUA_INCDIR} +CPPFLAGS+= -I${LOCALBASE}/include -I${LUA_INCDIR} -I${LOCALBASE}/include/libpng15 LDFLAGS+= -L${LOCALBASE}/lib -L${LUA_LIBDIR} WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} diff --git a/games/allacrost/files/patch-src-engine-video-image.cpp b/games/allacrost/files/patch-src-engine-video-image.cpp new file mode 100644 index 000000000000..46f36cd87638 --- /dev/null +++ b/games/allacrost/files/patch-src-engine-video-image.cpp @@ -0,0 +1,10 @@ +--- src/engine/video/image.cpp.orig 2010-05-17 01:38:27.000000000 +0200 ++++ src/engine/video/image.cpp 2012-05-03 05:56:08.000000000 +0200 +@@ -17,6 +17,7 @@ + #include <math.h> + + #include "video.h" ++#include "pngpriv.h" + + using namespace std; + using namespace hoa_utils; diff --git a/games/allacrost/files/patch-src-engine-video-image_base.cpp b/games/allacrost/files/patch-src-engine-video-image_base.cpp new file mode 100644 index 000000000000..6ce0a13b3a14 --- /dev/null +++ b/games/allacrost/files/patch-src-engine-video-image_base.cpp @@ -0,0 +1,10 @@ +--- src/engine/video/image_base.cpp.orig 2010-05-17 01:38:27.000000000 +0200 ++++ src/engine/video/image_base.cpp 2012-05-03 05:51:57.000000000 +0200 +@@ -18,6 +18,7 @@ + + #include "image_base.h" + #include "video.h" ++#include "pngpriv.h" + + using namespace std; + using namespace hoa_utils; diff --git a/games/amoebax/Makefile b/games/amoebax/Makefile index 7460ba68fcec..1fb26e2972f9 100644 --- a/games/amoebax/Makefile +++ b/games/amoebax/Makefile @@ -7,7 +7,7 @@ PORTNAME= amoebax PORTVERSION= 0.2.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games MASTER_SITES= http://www.emma-soft.com/games/amoebax/download/ \ http://mirror.amdmi3.ru/distfiles/ diff --git a/games/anki/Makefile.inc b/games/anki/Makefile.inc index b6b441cc3e75..5d6d099b4626 100644 --- a/games/anki/Makefile.inc +++ b/games/anki/Makefile.inc @@ -2,7 +2,7 @@ PORTNAME= anki PORTVERSION= 1.2.11 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= games MASTER_SITES= GOOGLE_CODE \ http://ankisrs.net/download/mirror/ diff --git a/games/armagetron/Makefile b/games/armagetron/Makefile index e21e2c6638e8..b7d6f7c5152e 100644 --- a/games/armagetron/Makefile +++ b/games/armagetron/Makefile @@ -8,7 +8,7 @@ PORTNAME= armagetron PORTVERSION= 0.2.8.2.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}ad/${PORTNAME}ad-src/${PORTVERSION} DISTNAME= armagetronad-${PORTVERSION} @@ -24,7 +24,7 @@ CXXFLAGS+= ${CFLAGS} -I${LOCALBASE}/include BUILD_DEPENDS+= bash:${PORTSDIR}/shells/bash LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg \ - png.6:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ xml2.5:${PORTSDIR}/textproc/libxml2 OPTIONS= MUSIC "Compile in support for background music" on \ diff --git a/games/asc/Makefile b/games/asc/Makefile index 30d6852ab423..e2df070bf129 100644 --- a/games/asc/Makefile +++ b/games/asc/Makefile @@ -7,7 +7,7 @@ PORTNAME= asc PORTVERSION= 2.4.0.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}-hq/ASC%20Source/${PORTVERSION:R} \ http://www.asc-hq.org/music/ diff --git a/games/assaultcube/Makefile b/games/assaultcube/Makefile index 0203ea93a871..00bede844c1c 100644 --- a/games/assaultcube/Makefile +++ b/games/assaultcube/Makefile @@ -7,7 +7,7 @@ PORTNAME= assaultcube PORTVERSION= 1.1.0.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= SF/actiongame/AssaultCube%20Version%20${PORTVERSION} DISTFILES= AssaultCube_v${PORTVERSION}_source${EXTRACT_SUFX} \ diff --git a/games/atomix/Makefile b/games/atomix/Makefile index ce0ea20d0165..32b525a3476f 100644 --- a/games/atomix/Makefile +++ b/games/atomix/Makefile @@ -8,7 +8,7 @@ PORTNAME= atomix PORTVERSION= 2.14.0 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= games gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/games/avoision/Makefile b/games/avoision/Makefile index 2d4ca788b313..9b7acf71fcfd 100644 --- a/games/avoision/Makefile +++ b/games/avoision/Makefile @@ -7,6 +7,7 @@ PORTNAME= avoision PORTVERSION= 1.1 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF/avsn/ @@ -22,7 +23,7 @@ LICENSE_PERMS_CCbyNCSA3=dist-mirror pkg-mirror auto-accept LIB_DEPENDS= radius:${PORTSDIR}/graphics/radius-engine \ lua-5.1:${PORTSDIR}/lang/lua \ - png:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ physfs.1:${PORTSDIR}/devel/physfs RUN_DEPENDS= zip:${PORTSDIR}/archivers/zip diff --git a/games/battletanks/Makefile b/games/battletanks/Makefile index ecf40c4be482..6648b9ce157c 100644 --- a/games/battletanks/Makefile +++ b/games/battletanks/Makefile @@ -7,7 +7,7 @@ PORTNAME= btanks PORTVERSION= 0.9.8083 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-source/ diff --git a/games/belooted/Makefile b/games/belooted/Makefile index 6a6e6867944b..ff9e89cf438a 100644 --- a/games/belooted/Makefile +++ b/games/belooted/Makefile @@ -7,7 +7,7 @@ PORTNAME= belooted PORTVERSION= 0.1.4.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= games MASTER_SITES= http://boby.joe.free.fr/dev/belooted/files/ \ LOCAL/martymac diff --git a/games/biloba/Makefile b/games/biloba/Makefile index f2e7c7978ac6..5f9c33b3e78b 100644 --- a/games/biloba/Makefile +++ b/games/biloba/Makefile @@ -7,7 +7,7 @@ PORTNAME= biloba PORTVERSION= 0.9.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/Biloba/${PORTVERSION} diff --git a/games/biniax2/Makefile b/games/biniax2/Makefile index a5e34a5c2e0b..271f8863997e 100644 --- a/games/biniax2/Makefile +++ b/games/biniax2/Makefile @@ -7,7 +7,7 @@ PORTNAME= biniax2 PORTVERSION= 1.30 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games MASTER_SITES= http://mordred.dir.bg/biniax/ \ http://mirror.amdmi3.ru/distfiles/ diff --git a/games/blackjack/Makefile b/games/blackjack/Makefile index 1ae284431e4c..41e959d6caa7 100644 --- a/games/blackjack/Makefile +++ b/games/blackjack/Makefile @@ -7,7 +7,7 @@ PORTNAME= blackjack PORTVERSION= 1.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= games/strategy diff --git a/games/blinken/Makefile b/games/blinken/Makefile index d4f62abccf8f..70921583fc6c 100644 --- a/games/blinken/Makefile +++ b/games/blinken/Makefile @@ -7,6 +7,7 @@ PORTNAME= blinken PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= games kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src diff --git a/games/blinkensisters/Makefile b/games/blinkensisters/Makefile index 1fa1c394cabb..bf85c339960e 100644 --- a/games/blinkensisters/Makefile +++ b/games/blinkensisters/Makefile @@ -7,7 +7,7 @@ PORTNAME= blinkensisters PORTVERSION= 0.5.3 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/Blinkensisters%20-%20Lost%20Pixels/LostPixels%20${PORTVERSION} diff --git a/games/bloboats/Makefile b/games/bloboats/Makefile index adc69a75790f..67b56642e22e 100644 --- a/games/bloboats/Makefile +++ b/games/bloboats/Makefile @@ -7,7 +7,7 @@ PORTNAME= bloboats PORTVERSION= 1.0.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://mirror.kapsi.fi/bloboats.dy.fi/ \ CRITICAL diff --git a/games/blokish/Makefile b/games/blokish/Makefile index 6c5209df6dc4..e370304dfef4 100644 --- a/games/blokish/Makefile +++ b/games/blokish/Makefile @@ -7,7 +7,7 @@ PORTNAME= blokish PORTVERSION= 0.9.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/v${PORTVERSION} DISTNAME= ${PORTNAME}_v${PORTVERSION} diff --git a/games/bloodfrontier/Makefile b/games/bloodfrontier/Makefile index 1eb369ee943a..d877ae11c301 100644 --- a/games/bloodfrontier/Makefile +++ b/games/bloodfrontier/Makefile @@ -7,7 +7,7 @@ PORTNAME= bloodfrontier DISTVERSION= B2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/Blood%20Frontier%20Beta%202 DISTNAME= ${PORTNAME}-${DISTVERSION}-linux diff --git a/games/bomberclone/Makefile b/games/bomberclone/Makefile index 9d08884fdcdc..0cc1f4292f43 100644 --- a/games/bomberclone/Makefile +++ b/games/bomberclone/Makefile @@ -7,7 +7,7 @@ PORTNAME= bomberclone PORTVERSION= 0.11.8 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= games MASTER_SITES= SF diff --git a/games/bombermaze/Makefile b/games/bombermaze/Makefile index fd345baebe22..f5833f85dd14 100644 --- a/games/bombermaze/Makefile +++ b/games/bombermaze/Makefile @@ -7,7 +7,7 @@ PORTNAME= bombermaze PORTVERSION= 0.6.6 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= games gnome MASTER_SITES= SF diff --git a/games/bomns/Makefile b/games/bomns/Makefile index a7ba0538b5bb..789718158e08 100644 --- a/games/bomns/Makefile +++ b/games/bomns/Makefile @@ -7,7 +7,7 @@ PORTNAME= bomns PORTVERSION= 0.99.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SF/greenridge/Bomns%20for%20Linux/Bomns%20for%20Linux%20${PORTVERSION} diff --git a/games/boswars/Makefile b/games/boswars/Makefile index 3822a12da115..c170688f1862 100644 --- a/games/boswars/Makefile +++ b/games/boswars/Makefile @@ -7,7 +7,7 @@ PORTNAME= boswars PORTVERSION= 2.6.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://www.boswars.org/dist/releases/ DISTNAME= ${PORTNAME}-${PORTVERSION}-src @@ -17,7 +17,7 @@ COMMENT= A real-time strategy game LICENSE= GPLv2 -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ theora.0:${PORTSDIR}/multimedia/libtheora \ vorbis.4:${PORTSDIR}/audio/libvorbis diff --git a/games/brainparty/Makefile b/games/brainparty/Makefile index ac6a53e20a3e..ae8439ce88ad 100644 --- a/games/brainparty/Makefile +++ b/games/brainparty/Makefile @@ -7,7 +7,7 @@ PORTNAME= brainparty PORTVERSION= 0.5 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= http://www.tuxradar.com/files/brainparty/ \ http://mirror.amdmi3.ru/distfiles/ diff --git a/games/brickshooter/Makefile b/games/brickshooter/Makefile index 8dfc50324f88..7f7ecbe18b6d 100644 --- a/games/brickshooter/Makefile +++ b/games/brickshooter/Makefile @@ -7,7 +7,7 @@ PORTNAME= brickshooter PORTVERSION= 0.04 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games MASTER_SITES= http://bilious.homelinux.org/~paxed/brickshooter/ \ http://mirror.amdmi3.ru/distfiles/ diff --git a/games/brikx/Makefile b/games/brikx/Makefile index 7957d6e87587..e983650729cb 100644 --- a/games/brikx/Makefile +++ b/games/brikx/Makefile @@ -7,7 +7,7 @@ PORTNAME= brikx PORTVERSION= 0.4.5 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games MASTER_SITES= http://mirror.amdmi3.ru/distfiles/ # SF/brikx/Brikx/${PORTVERSION} diff --git a/games/briquolo/Makefile b/games/briquolo/Makefile index d70877a4f901..9ccbe3ec882e 100644 --- a/games/briquolo/Makefile +++ b/games/briquolo/Makefile @@ -7,14 +7,14 @@ PORTNAME= briquolo PORTVERSION= 0.5.7 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= games MASTER_SITES= http://briquolo.free.fr/download/ MAINTAINER= martymac@FreeBSD.org COMMENT= Breakout clone with an OpenGL 3D representation -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png LICENSE= GPLv2 diff --git a/games/brutalchess/Makefile b/games/brutalchess/Makefile index f036ee028945..9a63389a4623 100644 --- a/games/brutalchess/Makefile +++ b/games/brutalchess/Makefile @@ -7,7 +7,7 @@ PORTNAME= brutalchess PORTVERSION= 0.5.2 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-alpha/${PORTNAME}-alpha-${PORTVERSION} DISTNAME= ${PORTNAME}-alpha-${PORTVERSION}-src diff --git a/games/bubbros/Makefile b/games/bubbros/Makefile index 80d7b7f80d37..4d9fe040c425 100644 --- a/games/bubbros/Makefile +++ b/games/bubbros/Makefile @@ -7,7 +7,7 @@ PORTNAME= bubbros PORTVERSION= 1.6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= SF/bub-n-bros/bub-n-bros/${PORTVERSION} diff --git a/games/bugsquish/Makefile b/games/bugsquish/Makefile index 2da0750c31f6..1e7c458fb3dd 100644 --- a/games/bugsquish/Makefile +++ b/games/bugsquish/Makefile @@ -7,7 +7,7 @@ PORTNAME= bugsquish PORTVERSION= 0.0.6 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= games MASTER_SITES= ftp://ftp.billsgames.com/unix/x/bugsquish/src/ diff --git a/games/bumprace/Makefile b/games/bumprace/Makefile index 21021ee13314..a9b11217f482 100644 --- a/games/bumprace/Makefile +++ b/games/bumprace/Makefile @@ -7,7 +7,7 @@ PORTNAME= bumprace PORTVERSION= 1.5.3 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= games MASTER_SITES= http://user.cs.tu-berlin.de/~karlb/bumprace/ \ http://mirror.amdmi3.ru/distfiles/ diff --git a/games/burgerspace/Makefile b/games/burgerspace/Makefile index 0327949d14d1..773244d7ce7d 100644 --- a/games/burgerspace/Makefile +++ b/games/burgerspace/Makefile @@ -7,7 +7,7 @@ PORTNAME= burgerspace PORTVERSION= 1.9.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://perso.b2b2c.ca/sarrazip/dev/ \ LOCAL/martymac diff --git a/games/burrtools/Makefile b/games/burrtools/Makefile index ed56794d2cbf..8bd28307a3ea 100644 --- a/games/burrtools/Makefile +++ b/games/burrtools/Makefile @@ -8,6 +8,7 @@ PORTNAME= burrtools PORTVERSION= 0.6.2 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF \ http://www.c-s.li/ports/ @@ -17,7 +18,7 @@ COMMENT= A puzzle solver LICENSE= GPLv3 -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ xmlwrapp.5:${PORTSDIR}/textproc/xmlwrapp \ fltk.1:${PORTSDIR}/x11-toolkits/fltk \ boost_thread:${PORTSDIR}/devel/boost-libs diff --git a/games/bygfoot/Makefile b/games/bygfoot/Makefile index 8970d67e5a82..889fa722156d 100644 --- a/games/bygfoot/Makefile +++ b/games/bygfoot/Makefile @@ -7,7 +7,7 @@ PORTNAME= bygfoot PORTVERSION= 2.2.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} DISTNAME= ${PORTNAME}-${PORTVERSION}-source diff --git a/games/caph/Makefile b/games/caph/Makefile index 3a7a421f41be..96e86e6a864b 100644 --- a/games/caph/Makefile +++ b/games/caph/Makefile @@ -7,7 +7,7 @@ PORTNAME= caph PORTVERSION= 1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SF/caphgame/${PORTNAME}/caphgame-${PORTVERSION}/ DISTNAME= caphgame-${PORTVERSION} @@ -15,7 +15,7 @@ DISTNAME= caphgame-${PORTVERSION} MAINTAINER= amdmi3@FreeBSD.org COMMENT= Physics-based sandbox game -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/doc/caph/COPYING diff --git a/games/cave9/Makefile b/games/cave9/Makefile index 845cfac5b5fe..276f921dc19b 100644 --- a/games/cave9/Makefile +++ b/games/cave9/Makefile @@ -7,7 +7,7 @@ PORTNAME= cave9 PORTVERSION= 0.3 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} DISTNAME= ${PORTNAME}_src-${PORTVERSION} diff --git a/games/ceferino/Makefile b/games/ceferino/Makefile index 7888b7f38878..9fff2381b978 100644 --- a/games/ceferino/Makefile +++ b/games/ceferino/Makefile @@ -7,7 +7,7 @@ PORTNAME= ceferino PORTVERSION= 0.97.8 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= games MASTER_SITES= http://www.losersjuegos.com.ar/_media/juegos/ceferino/descargas/ diff --git a/games/chanta/Makefile b/games/chanta/Makefile index 962878661219..7af440fa755a 100644 --- a/games/chanta/Makefile +++ b/games/chanta/Makefile @@ -7,7 +7,7 @@ PORTNAME= chanta PORTVERSION= 0.15 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= games MASTER_SITES= http://www.losersjuegos.com.ar/_media/juegos/chanta/descargas/ diff --git a/games/chapping/Makefile b/games/chapping/Makefile index 759f7d1a43f1..730c7d40e9ab 100644 --- a/games/chapping/Makefile +++ b/games/chapping/Makefile @@ -7,7 +7,7 @@ PORTNAME= chapping PORTVERSION= 0.43 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= games MASTER_SITES= http://forja.rediris.es/frs/download.php/760/ \ http://mirror.amdmi3.ru/distfiles/ diff --git a/games/cheech/Makefile b/games/cheech/Makefile index a7d468c52a46..5d53cf83058b 100644 --- a/games/cheech/Makefile +++ b/games/cheech/Makefile @@ -7,7 +7,7 @@ PORTNAME= cheech PORTVERSION= 0.8 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= games MASTER_SITES= SF EXTRACT_SUFX= .tgz diff --git a/games/childsplay_plugins/Makefile b/games/childsplay_plugins/Makefile index 68d3a4bccb66..a2033014d515 100644 --- a/games/childsplay_plugins/Makefile +++ b/games/childsplay_plugins/Makefile @@ -7,6 +7,7 @@ PORTNAME= childsplay_plugins PORTVERSION= 0.90 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF/childsplay/childsplay-plugins/${PORTVERSION} EXTRACT_SUFX= .tgz diff --git a/games/chroma/Makefile b/games/chroma/Makefile index 25bca9d1dd63..fc4439246daa 100644 --- a/games/chroma/Makefile +++ b/games/chroma/Makefile @@ -7,7 +7,7 @@ PORTNAME= chroma PORTVERSION= 1.08 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= http://www.level7.org.uk/chroma/download/ \ http://mirror.amdmi3.ru/distfiles/ diff --git a/games/chromium-bsu/Makefile b/games/chromium-bsu/Makefile index 196ec139acb2..e45647b593b3 100644 --- a/games/chromium-bsu/Makefile +++ b/games/chromium-bsu/Makefile @@ -7,7 +7,7 @@ PORTNAME= chromium-bsu PORTVERSION= 0.9.15 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/Chromium%20B.S.U.%20source%20code/${PORTVERSION} diff --git a/games/circuslinux/Makefile b/games/circuslinux/Makefile index a5ec99497dda..8912d3dca04b 100644 --- a/games/circuslinux/Makefile +++ b/games/circuslinux/Makefile @@ -7,7 +7,7 @@ PORTNAME= circuslinux PORTVERSION= 1.0.3 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= games MASTER_SITES= ftp://ftp.billsgames.com/unix/x/circus-linux/src/ diff --git a/games/colorcode/Makefile b/games/colorcode/Makefile index 1c776ec45bd3..ebd621cedae9 100644 --- a/games/colorcode/Makefile +++ b/games/colorcode/Makefile @@ -7,6 +7,7 @@ PORTNAME= colorcode PORTVERSION= 0.7.2 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://colorcode.laebisch.com/download/ DISTNAME= ColorCode-${PORTVERSION} diff --git a/games/concentration/Makefile b/games/concentration/Makefile index 698aab5ac6e1..523ca5fe66d2 100644 --- a/games/concentration/Makefile +++ b/games/concentration/Makefile @@ -7,7 +7,7 @@ PORTNAME= concentration PORTVERSION= 1.2 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= games MASTER_SITES= http://www.shiftygames.com/concentration/ \ http://mirror.amdmi3.ru/distfiles/ diff --git a/games/cosmosmash/Makefile b/games/cosmosmash/Makefile index 1348e4176d1f..0db91162440b 100644 --- a/games/cosmosmash/Makefile +++ b/games/cosmosmash/Makefile @@ -7,7 +7,7 @@ PORTNAME= cosmosmash DISTVERSION= 1.4.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://perso.b2b2c.ca/sarrazip/dev/ \ LOCAL/martymac diff --git a/games/crack-attack/Makefile b/games/crack-attack/Makefile index 83b52f43f9f6..6d06be2031ba 100644 --- a/games/crack-attack/Makefile +++ b/games/crack-attack/Makefile @@ -6,7 +6,7 @@ PORTNAME= crack-attack PORTVERSION= 1.1.14 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SAVANNAH} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/games/cretan-hubris/Makefile b/games/cretan-hubris/Makefile index b36cd038b50c..2aee291178d4 100644 --- a/games/cretan-hubris/Makefile +++ b/games/cretan-hubris/Makefile @@ -7,6 +7,7 @@ PORTNAME= cretan-hubris PORTVERSION= 0.2 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF/radius-engine/egp/ @@ -22,7 +23,7 @@ LICENSE_PERMS_CCbyNCSA3=dist-mirror pkg-mirror auto-accept LIB_DEPENDS= radius:${PORTSDIR}/graphics/radius-engine \ lua-5.1:${PORTSDIR}/lang/lua \ - png:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ physfs.1:${PORTSDIR}/devel/physfs RUN_DEPENDS= zip:${PORTSDIR}/archivers/zip diff --git a/games/criticalmass/Makefile b/games/criticalmass/Makefile index 1a5f9d33821e..548a891c9b4c 100644 --- a/games/criticalmass/Makefile +++ b/games/criticalmass/Makefile @@ -7,7 +7,7 @@ PORTNAME= criticalmass PORTVERSION= 1.0.0 -PORTREVISION= 10 +PORTREVISION= 11 PORTEPOCH= 1 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/Critical%20Mass/${PORTVERSION} @@ -16,6 +16,8 @@ DISTNAME= CriticalMass-${PORTVERSION} MAINTAINER= acm@FreeBSD.org COMMENT= An SDL/OpenGL space shoot\'em up game +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png + CONFLICTS= shaaft-[0-9]* USE_BZIP2= yes @@ -23,6 +25,7 @@ USE_SDL= image mixer sdl USE_GL= gl USE_XORG= x11 GNU_CONFIGURE= yes +CFLAGS= -I${LOCALBASE}/include/libpng15 CONFIGURE_ARGS= --disable-optimize MAN6= critter.6 diff --git a/games/criticalmass/files/patch-game__main.cpp b/games/criticalmass/files/patch-game__main.cpp new file mode 100644 index 000000000000..4ec7f7f7e7b0 --- /dev/null +++ b/games/criticalmass/files/patch-game__main.cpp @@ -0,0 +1,10 @@ +--- game/main.cpp.orig 2005-09-12 04:04:52.000000000 +0200 ++++ game/main.cpp 2012-05-11 17:51:11.000000000 +0200 +@@ -27,6 +27,7 @@ + + #include <sys/stat.h> + #include <sys/types.h> ++#include <zlib.h> + + void migrateConfig( void) + { diff --git a/games/criticalmass/files/patch-utilssdl_PNG.cpp b/games/criticalmass/files/patch-utilssdl_PNG.cpp new file mode 100644 index 000000000000..60965df5faf4 --- /dev/null +++ b/games/criticalmass/files/patch-utilssdl_PNG.cpp @@ -0,0 +1,19 @@ +--- utilssdl/PNG.cpp.orig 2004-12-18 03:41:42.000000000 +0100 ++++ utilssdl/PNG.cpp 2012-05-08 07:00:15.000000000 +0200 +@@ -13,6 +13,7 @@ + // FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details + // + #include <PNG.hpp> ++#include "pngpriv.h" + + //Save SDL surface as png + bool PNG::Save( SDL_Surface *img, const string &filename) +@@ -72,7 +73,7 @@ + return false; + } + +- if( setjmp(_png->jmpbuf)) ++ if( setjmp(_png->longjmp_buffer)) + { + fclose( fp); + png_destroy_write_struct(&_png, (png_infopp)NULL); diff --git a/games/crossfire-client/Makefile b/games/crossfire-client/Makefile index 52074143e93f..cabb113bcd70 100644 --- a/games/crossfire-client/Makefile +++ b/games/crossfire-client/Makefile @@ -7,7 +7,7 @@ PORTNAME= crossfire-client PORTVERSION= 1.70.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SF/crossfire/crossfire-${PORTVERSION} diff --git a/games/crossfire-server/Makefile b/games/crossfire-server/Makefile index d076db2b2eff..eb25d7bd3240 100644 --- a/games/crossfire-server/Makefile +++ b/games/crossfire-server/Makefile @@ -7,6 +7,7 @@ PORTNAME= crossfire PORTVERSION= 1.70.0 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION} PKGNAMESUFFIX= -server @@ -18,7 +19,7 @@ COMMENT= Server for multiplayer graphical arcade and adventure game BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl \ - png.6:${PORTSDIR}/graphics/png + png15:${PORTSDIR}/graphics/png LICENSE= GPLv2 GPLv3 LICENSE_COMB= dual diff --git a/games/csmash/Makefile b/games/csmash/Makefile index ffd6eaa14711..9186509b9292 100644 --- a/games/csmash/Makefile +++ b/games/csmash/Makefile @@ -8,7 +8,7 @@ PORTNAME= csmash PORTVERSION= 0.6.6 -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES= games MASTER_SITES= SF/cannonsmash/CannonSmash/${PORTVERSION} diff --git a/games/cube/Makefile b/games/cube/Makefile index 1a2a08860556..63c78de54904 100644 --- a/games/cube/Makefile +++ b/games/cube/Makefile @@ -7,7 +7,7 @@ PORTNAME= cube PORTVERSION= 2005.08.29 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/2005_08_29 DISTFILES= ${CUBE_DATA} ${CUBE_SRC} diff --git a/games/cuyo/Makefile b/games/cuyo/Makefile index c897903b2d3f..055b33e5ff7b 100644 --- a/games/cuyo/Makefile +++ b/games/cuyo/Makefile @@ -7,7 +7,7 @@ PORTNAME= cuyo PORTVERSION= 2.1.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games MASTER_SITES= http://mirror.publicns.net/pub/nongnu/cuyo/ DISTNAME= ${PORTNAME}-2.~-1.1 diff --git a/games/d2x-xl/Makefile b/games/d2x-xl/Makefile index bbd34e105e0a..b1897f463d5d 100644 --- a/games/d2x-xl/Makefile +++ b/games/d2x-xl/Makefile @@ -7,7 +7,7 @@ PORTNAME= d2x-xl PORTVERSION= 1.14.121 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games MASTER_SITES= SF/d2x-xl/Linux/Archive:source \ SF/d2x-xl/Linux:source \ diff --git a/games/d2x/Makefile b/games/d2x/Makefile index 94ee5db824f5..dae4d220be1c 100644 --- a/games/d2x/Makefile +++ b/games/d2x/Makefile @@ -7,7 +7,7 @@ PORTNAME= d2x PORTVERSION= 0.2.5 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= games MASTER_SITES= http://offload2.icculus.org:9090/d2x/src/ diff --git a/games/daimonin/Makefile b/games/daimonin/Makefile index 18bc14585e91..94652050e018 100644 --- a/games/daimonin/Makefile +++ b/games/daimonin/Makefile @@ -7,7 +7,7 @@ PORTNAME= daimonin PORTVERSION= 0.10.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://daimonin.svn.sourceforge.net/viewvc/daimonin/main/client/?view=tar&pathrev=${SVN_REVISION}&file= DIST_SUBDIR= ${PORTNAME} diff --git a/games/dangen/Makefile b/games/dangen/Makefile index 62cf7ac5a0b2..66f93118f098 100644 --- a/games/dangen/Makefile +++ b/games/dangen/Makefile @@ -7,7 +7,7 @@ PORTNAME= dangen PORTVERSION= 0.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://www.interq.or.jp/libra/oohara/dangen/ \ http://mirror.amdmi3.ru/distfiles/ diff --git a/games/dangerdeep/Makefile b/games/dangerdeep/Makefile index 70ba6392d6c8..6362b87ec0ba 100644 --- a/games/dangerdeep/Makefile +++ b/games/dangerdeep/Makefile @@ -7,7 +7,7 @@ PORTNAME= dangerdeep PORTVERSION= 0.3.0 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/danger_from_the_deep-src/${PORTVERSION} DIST_SUBDIR= ${PORTNAME} diff --git a/games/demonquake/Makefile b/games/demonquake/Makefile index c4f5ac745eff..f7d38b07cbcb 100644 --- a/games/demonquake/Makefile +++ b/games/demonquake/Makefile @@ -7,7 +7,7 @@ PORTNAME= demonquake PORTVERSION= 0.16.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games MASTER_SITES= http://qudos.quakedev.com/linux/quake1/ DISTNAME= ${PORTNAME}-${PORTVERSION}-src @@ -18,7 +18,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Another improved Quake engine based on FuhQuake LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg \ - png.6:${PORTSDIR}/graphics/png + png15:${PORTSDIR}/graphics/png USE_GMAKE= yes USE_DOS2UNIX= yes @@ -58,10 +58,6 @@ MAKE_ENV+= BUILD_DEMONQUAKE_SDL=YES PLIST_FILES+= bin/${PORTNAME}-sdl .endif -post-patch: - ${REINPLACE_CMD} -e 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' \ - ${WRKSRC}/gl_image.c - do-install: .if !defined(WITHOUT_GLX) ${INSTALL_PROGRAM} ${WRKSRC}/quake/${PORTNAME}-glx ${PREFIX}/bin diff --git a/games/demonquake/files/patch-gl_image.c b/games/demonquake/files/patch-gl_image.c new file mode 100644 index 000000000000..ba72bffe524a --- /dev/null +++ b/games/demonquake/files/patch-gl_image.c @@ -0,0 +1,37 @@ +--- gl_image.c.orig 2012-04-27 12:56:30.000000000 +0200 ++++ gl_image.c 2012-04-27 12:58:31.000000000 +0200 +@@ -21,6 +21,7 @@ + + #include "quakedef.h" + #include <png.h> ++#include <zlib.h> + + int image_width, image_height; + +@@ -470,7 +471,7 @@ + return NULL; + } + +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf(png))) + { + png_destroy_read_struct (&png, &pnginfo, NULL); + fclose (fin); +@@ -496,7 +497,7 @@ + } + + if (colortype == PNG_COLOR_TYPE_GRAY && bitdepth < 8) +- png_set_gray_1_2_4_to_8 (png); ++ png_set_expand_gray_1_2_4_to_8 (png); + + if (png_get_valid(png, pnginfo, PNG_INFO_tRNS)) + png_set_tRNS_to_alpha (png); +@@ -582,7 +583,7 @@ + return false; + } + +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + png_destroy_write_struct (&png_ptr, &info_ptr); + fclose (fp); diff --git a/games/deng/Makefile b/games/deng/Makefile index 89d7d4ea804f..83295121c522 100644 --- a/games/deng/Makefile +++ b/games/deng/Makefile @@ -7,7 +7,7 @@ PORTNAME= deng PORTVERSION= 1.9.0b6.9 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/Doomsday%20Engine/1.9.0-beta6.9 DISTNAME= ${PORTNAME}-${PORTVERSION:S/b/-beta/} @@ -17,7 +17,7 @@ COMMENT= An enhanced Doom, Heretic and Hexen source port BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl \ - png.6:${PORTSDIR}/graphics/png + png15:${PORTSDIR}/graphics/png RUN_DEPENDS= timidity:${PORTSDIR}/audio/timidity USE_GL= gl glu @@ -31,6 +31,7 @@ BUILD_WRKSRC= ${BUILDDIR} INSTALL_WRKSRC= ${BUILDDIR} USE_CMAKE= yes +CFLAGS+= -I${LOCALBASE}/include/libpng15 CMAKE_ARGS+= -DCMAKE_EXE_LINKER_FLAGS:STRING="-Wl,--export-dynamic" MAN6= doomsday.6 diff --git a/games/deng/files/patch-gl_png.c b/games/deng/files/patch-gl_png.c new file mode 100644 index 000000000000..0d0fb58a0f84 --- /dev/null +++ b/games/deng/files/patch-gl_png.c @@ -0,0 +1,10 @@ +--- doomsday/engine/portable/src/gl_png.c.orig 2010-04-07 22:52:50.000000000 +0200 ++++ doomsday/engine/portable/src/gl_png.c 2012-04-29 06:31:36.000000000 +0200 +@@ -32,6 +32,7 @@ + // HEADER FILES ------------------------------------------------------------ + + #include <png.h> ++#include <pngpriv.h> + #include <setjmp.h> + + #include "de_base.h" diff --git a/games/diameter/Makefile b/games/diameter/Makefile index 262edf8b828d..e89004ce1221 100644 --- a/games/diameter/Makefile +++ b/games/diameter/Makefile @@ -7,7 +7,7 @@ PORTNAME= diameter PORTVERSION= 0.4.0.3 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games MASTER_SITES= SF/game${PORTNAME}/game${PORTNAME}/${PORTNAME}-0.4.0 @@ -15,6 +15,7 @@ MAINTAINER= amdmi3@FreeBSD.org COMMENT= Arcade-style game with elements of economy and adventure BUILD_DEPENDS= guichan>=0.8.1:${PORTSDIR}/devel/guichan +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png RUN_DEPENDS:= ${BUILD_DEPENDS} USE_BZIP2= yes @@ -33,6 +34,6 @@ DATADIR= ${PREFIX}/share/gamediameter post-patch: @${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}|; /^CFLAGS=.*march/ d; \ - /PKG_CONFIG/ s|libpng|libpng14|' ${WRKSRC}/configure + /PKG_CONFIG/ s|libpng|libpng15|' ${WRKSRC}/configure .include <bsd.port.mk> diff --git a/games/dodgindiamond2/Makefile b/games/dodgindiamond2/Makefile index 0a77180e2a14..16449b65fad3 100644 --- a/games/dodgindiamond2/Makefile +++ b/games/dodgindiamond2/Makefile @@ -7,7 +7,7 @@ PORTNAME= dodgindiamond2 PORTVERSION= 0.2.2 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= games MASTER_SITES= http://www.usebox.net/jjm/dd2/releases/ DISTNAME= dd2-${PORTVERSION} diff --git a/games/easysok/Makefile b/games/easysok/Makefile index 39e139754cff..aadfeb1c081a 100644 --- a/games/easysok/Makefile +++ b/games/easysok/Makefile @@ -6,7 +6,7 @@ PORTNAME= easysok PORTVERSION= 0.3.5 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= games kde MASTER_SITES= SF DISTNAME= ${PORTNAME}-${PORTVERSION}-kde3 diff --git a/games/eboard/Makefile b/games/eboard/Makefile index b3c1845ef47a..287d88227ede 100644 --- a/games/eboard/Makefile +++ b/games/eboard/Makefile @@ -7,7 +7,7 @@ PORTNAME= eboard PORTVERSION= 1.1.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= SF \ SF/${PORTNAME}/eboard-extras/pack%201%20patchlevel%202/:p1 \ @@ -20,6 +20,8 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= johans@FreeBSD.org COMMENT= GTK+ chess board interface (mainly for FICS and chessd) +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png + EXTRAS= 1pl2 2 USE_BZIP2= yes HAS_CONFIGURE= yes diff --git a/games/eboard/files/patch-cimg.cc b/games/eboard/files/patch-cimg.cc new file mode 100644 index 000000000000..476a4f82df2a --- /dev/null +++ b/games/eboard/files/patch-cimg.cc @@ -0,0 +1,10 @@ +--- cimg.cc.orig 2008-02-22 16:51:22.000000000 +0100 ++++ cimg.cc 2012-05-08 07:19:55.000000000 +0200 +@@ -27,6 +27,7 @@ + #include <stdlib.h> + #include <string.h> + #include <png.h> ++#include <pngpriv.h> + #include "cimg.h" + + CImg::CImg(int w,int h) { diff --git a/games/edge/Makefile b/games/edge/Makefile index 5a4dfb87b650..5c1a4f0ccd09 100644 --- a/games/edge/Makefile +++ b/games/edge/Makefile @@ -7,7 +7,7 @@ PORTNAME= edge PORTVERSION= 1.35 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/EDGE%20Source%20Code/${PORTVERSION} \ SF/${PORTNAME}/EDGE%20Binaries/${PORTVERSION}:wad @@ -24,7 +24,7 @@ LICENSE_COMB= dual LIB_DEPENDS= vorbis.4:${PORTSDIR}/audio/libvorbis \ GLEW.1:${PORTSDIR}/graphics/glew \ jpeg.11:${PORTSDIR}/graphics/jpeg \ - png.6:${PORTSDIR}/graphics/png + png15:${PORTSDIR}/graphics/png WRKSRC= ${WRKDIR}/Edge-${PORTVERSION}-source diff --git a/games/edge/files/patch-epi__image_png.cc b/games/edge/files/patch-epi__image_png.cc new file mode 100644 index 000000000000..89672145e28c --- /dev/null +++ b/games/edge/files/patch-epi__image_png.cc @@ -0,0 +1,37 @@ +--- epi/image_png.cc.orig 2010-06-08 15:36:37.000000000 +0200 ++++ epi/image_png.cc 2012-04-27 13:02:14.000000000 +0200 +@@ -22,6 +22,7 @@ + + #undef _SETJMP_H // workaround for some weirdness in pngconf.h + #include <png.h> ++#include <zlib.h> + + namespace epi + { +@@ -96,7 +97,7 @@ + /* set error handling since we are using the setjmp/longjmp method + * (this is the normal method of doing things with libpng). + */ +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + fprintf(stderr, "PNG_Load - Error loading PNG image !\n"); + goto failed; +@@ -238,7 +239,7 @@ + /* set error handling since we are using the setjmp/longjmp method + * (this is the normal method of doing things with libpng). + */ +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + fprintf(stderr, "PNG: Error loading PNG image !\n"); + goto failed; +@@ -315,7 +318,7 @@ + /* set error handling since we are using the setjmp/longjmp method + * (this is the normal method of doing things with libpng). + */ +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + fprintf(stderr, "PNG: Error saving PNG image !\n"); + goto failed; diff --git a/games/eduke32/Makefile b/games/eduke32/Makefile index fd485ae13fbe..5f1d56d98f05 100644 --- a/games/eduke32/Makefile +++ b/games/eduke32/Makefile @@ -6,7 +6,7 @@ PORTNAME= eduke32 PORTVERSION= 20110627 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://dukeworld.duke4.net/eduke32/synthesis/${PORTVERSION}-${SVNREVISION}/ \ http://dukeworld.duke4.net/eduke32/synthesis/old/${PORTVERSION}-${SVNREVISION}/ diff --git a/games/egl/Makefile b/games/egl/Makefile index 48728f379e2f..6a4b0d0f1520 100644 --- a/games/egl/Makefile +++ b/games/egl/Makefile @@ -7,7 +7,7 @@ PORTNAME= egl PORTVERSION= 0.3.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= games MASTER_SITES= http://egl.quakedev.com/files/:src \ ftp://ftp.alepulver.com.ar/distfiles/:data @@ -41,8 +41,10 @@ LIBDIR= ${PREFIX}/lib/${PORTNAME} .if defined(WITH_CLIENT) LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg \ - png.6:${PORTSDIR}/graphics/png + png15:${PORTSDIR}/graphics/png USE_GL= yes +CFLAGS+= -I${LOCALBASE}/include/libpng15 +MAKE_ENV*= CFLAGS="${CFLAGS}" PLIST_SUB+= CLIENT="" EGL_BIN+= egl .else diff --git a/games/egl/files/patch-renderer__rf_image.c b/games/egl/files/patch-renderer__rf_image.c index 0205ae4daf96..1811e4922906 100644 --- a/games/egl/files/patch-renderer__rf_image.c +++ b/games/egl/files/patch-renderer__rf_image.c @@ -1,7 +1,14 @@ - ---- renderer/rf_image.c.orig 2010-07-08 22:47:22.720284451 +0200 -+++ renderer/rf_image.c 2010-07-08 22:53:00.496664288 +0200 -@@ -44,7 +44,7 @@ +--- renderer/rf_image.c.orig 2012-04-29 06:34:41.000000000 +0200 ++++ renderer/rf_image.c 2012-04-29 06:35:42.000000000 +0200 +@@ -32,6 +32,7 @@ + #else + # include <jpeglib.h> + # include <png.h> ++# include <pngpriv.h> + #endif + + #define MAX_IMAGE_HASH (MAX_IMAGES/4) +@@ -44,7 +45,7 @@ image_t *r_lmTextures[R_MAX_LIGHTMAPS]; static image_t r_imageList[MAX_IMAGES]; static image_t *r_imageHashTree[MAX_IMAGE_HASH]; @@ -10,7 +17,7 @@ static byte r_intensityTable[256]; static byte r_gammaTable[256]; -@@ -261,21 +261,6 @@ +@@ -261,21 +262,6 @@ cinfo->src->bytes_in_buffer -= (size_t) num_bytes; } @@ -32,7 +39,7 @@ /* ============= R_LoadJPG -@@ -610,7 +595,7 @@ +@@ -610,7 +596,7 @@ png_set_filler (png_ptr, 0xFF, PNG_FILLER_AFTER); if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY && info_ptr->bit_depth < 8) @@ -41,5 +48,3 @@ if (png_get_valid (png_ptr, info_ptr, PNG_INFO_tRNS)) png_set_tRNS_to_alpha (png_ptr); - - diff --git a/games/egoboo/Makefile b/games/egoboo/Makefile index db0fcb49fc85..7deed23773db 100644 --- a/games/egoboo/Makefile +++ b/games/egoboo/Makefile @@ -6,7 +6,7 @@ PORTNAME= egoboo PORTVERSION= 2.7.5 -PORTREVISION= 7 +PORTREVISION= 8 PORTEPOCH= 1 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/Linux%20Source%20Distro/${PORTVERSION} diff --git a/games/el/Makefile b/games/el/Makefile index 47b791c540a5..15ba62e71b2b 100644 --- a/games/el/Makefile +++ b/games/el/Makefile @@ -7,7 +7,7 @@ PORTNAME= el PORTVERSION= 192 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \ ${MASTER_SITE_LOCAL:S,$,acm/${PORTNAME}/,} @@ -16,7 +16,7 @@ DIST_SUBDIR= ${PORTNAME} MAINTAINER= acm@FreeBSD.org COMMENT= Eternal Lands is a free 3D MMORPG -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ vorbis.4:${PORTSDIR}/audio/libvorbis \ cal3d.12:${PORTSDIR}/graphics/cal3d RUN_DEPENDS= ${LOCALBASE}/share/${PORTNAME}/el.ini:${PORTSDIR}/games/el-data diff --git a/games/ember/Makefile b/games/ember/Makefile index 0628498264f7..aa74312779d2 100644 --- a/games/ember/Makefile +++ b/games/ember/Makefile @@ -7,7 +7,7 @@ PORTNAME= ember PORTVERSION= 0.6.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= SF/worldforge/Ember%20%28OGRE%20client%29/${PORTVERSION} \ http://amber.worldforge.org/ember/releases/stable/ diff --git a/games/endgame-singularity/Makefile b/games/endgame-singularity/Makefile index 8b48f6c1c39b..4a9193f8c972 100644 --- a/games/endgame-singularity/Makefile +++ b/games/endgame-singularity/Makefile @@ -7,7 +7,7 @@ PORTNAME= singularity PORTVERSION= 0.30b -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} PKGNAMEPREFIX= endgame- diff --git a/games/enigma/Makefile b/games/enigma/Makefile index 675c9c017103..a9f76c103d83 100644 --- a/games/enigma/Makefile +++ b/games/enigma/Makefile @@ -7,7 +7,7 @@ PORTNAME= enigma PORTVERSION= 1.01 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= games MASTER_SITES= BERLIOS/enigma-game DISTNAME= ${PORTNAME}-${PORTVERSION}-64bit @@ -15,7 +15,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-64bit MAINTAINER= amdmi3@FreeBSD.org COMMENT= Enigma is a reimplementation of Oxyd, a puzzle game -LIB_DEPENDS= xerces-c.27:${PORTSDIR}/textproc/xerces-c2 +LIB_DEPENDS= xerces-c.27:${PORTSDIR}/textproc/xerces-c2 \ + png15:${PORTSDIR}/graphics/png BUILD_DEPENDS= ${LOCALBASE}/lib/libenet.a:${PORTSDIR}/net/enet USE_GMAKE= yes @@ -26,7 +27,7 @@ USE_SDL= image mixer sdl ttf GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-cxxlua \ --with-libintl-prefix="${LOCALBASE}" -CPPFLAGS+= -I${LOCALBASE}/include -I${LUA_INCDIR} +CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15 -I${LUA_INCDIR} LDFLAGS+= -L${LOCALBASE}/lib -L${LUA_LIBDIR} MAKE_JOBS_SAFE= yes diff --git a/games/enigma/files/patch-src_enigma-core_IMG_SavePNG.c b/games/enigma/files/patch-src_enigma-core_IMG_SavePNG.c new file mode 100644 index 000000000000..925b9655d5e9 --- /dev/null +++ b/games/enigma/files/patch-src_enigma-core_IMG_SavePNG.c @@ -0,0 +1,33 @@ +--- lib-src/enigma-core/IMG_SavePNG.c.orig 2007-09-08 14:20:05.000000000 +0200 ++++ lib-src/enigma-core/IMG_SavePNG.c 2012-05-11 17:55:39.000000000 +0200 +@@ -1,13 +1,14 @@ + #include "SDL.h" + #include "IMG_SavePNG.h" + #include "png.h" ++#include "pngpriv.h" + #include <stdlib.h> + #include <setjmp.h> + + #define IMG_SetError(a) SDL_SetError(a) + + /* Save a PNG type image to an SDL datasource */ +-static void png_write_data(png_structp ctx, png_bytep area, png_size_t size) ++static void local_png_write_data(png_structp ctx, png_bytep area, png_size_t size) + { + SDL_RWops *src; + +@@ -84,12 +85,12 @@ + png_bytep *row_pointers = 0; + + /* Set error handling. */ +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_ptr->longjmp_buffer)) { + IMG_SetError("Error writing the PNG file"); + } + else { + int colortype; +- png_set_write_fn(png_ptr, src, png_write_data, png_io_flush); ++ png_set_write_fn(png_ptr, src, local_png_write_data, png_io_flush); + /* Set the image information here. Width and height are up to 2^31, + * bit_depth is one of 1, 2, 4, 8, or 16, but valid values also depend on + * the color_type selected. color_type is one of PNG_COLOR_TYPE_GRAY, diff --git a/games/ensemblist/Makefile b/games/ensemblist/Makefile index 23ea3c82f31e..76d62661088d 100644 --- a/games/ensemblist/Makefile +++ b/games/ensemblist/Makefile @@ -7,7 +7,7 @@ PORTNAME= ensemblist PORTVERSION= 040126 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SAVANNAH} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Assemble given shapes from primitives LIB_DEPENDS= mikmod.2:${PORTSDIR}/audio/libmikmod \ - png.6:${PORTSDIR}/graphics/png + png15:${PORTSDIR}/graphics/png USE_GMAKE= yes USE_GL= glut diff --git a/games/etracer/Makefile b/games/etracer/Makefile index 50bb3edc3eff..94cd8dd98666 100644 --- a/games/etracer/Makefile +++ b/games/etracer/Makefile @@ -7,7 +7,7 @@ PORTNAME= etracer PORTVERSION= 0.4 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games MASTER_SITES= SF/extremetuxracer/extreme-tuxracer/${PORTVERSION} DISTNAME= extremetuxracer-${PORTVERSION} @@ -15,7 +15,7 @@ DISTNAME= extremetuxracer-${PORTVERSION} MAINTAINER= peter_dunning@dsl.pipex.com COMMENT= The latest and greatest fork of the classic Tux Racer -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ freetype.9:${PORTSDIR}/print/freetype2 USE_SDL= mixer sdl @@ -32,7 +32,7 @@ CONFIGURE_ARGS= --with-tcl="${TCL_LIBDIR}" \ --with-gl-inc="${LOCALBASE}/include" post-patch: - ${REINPLACE_CMD} -e 's|libpng12|libpng14|g' \ + ${REINPLACE_CMD} -e 's|libpng12|libpng15|g' \ ${WRKSRC}/configure ${REINPLACE_CMD} -e 's|int_p_NULL|NULL|g' \ -e 's|png_infopp_NULL|NULL|g' \ diff --git a/games/excido/Makefile b/games/excido/Makefile index ffe17d63011f..c897bd06c3a4 100644 --- a/games/excido/Makefile +++ b/games/excido/Makefile @@ -7,7 +7,7 @@ PORTNAME= excido PORTVERSION= 0.1.5c -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= games MASTER_SITES= http://offload2.icculus.org:9090/excido/ \ http://offload1.icculus.org:9090/excido/ diff --git a/games/ezquake/Makefile b/games/ezquake/Makefile index 64c73b8df453..7a00fcb57635 100644 --- a/games/ezquake/Makefile +++ b/games/ezquake/Makefile @@ -7,7 +7,7 @@ PORTNAME= ezquake PORTVERSION= 1.9 -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH= 2 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/stable/${PORTVERSION}:ezquake \ @@ -24,7 +24,7 @@ EXTRACT_DEPENDS=unzip:${PORTSDIR}/archivers/unzip \ 7z:${PORTSDIR}/archivers/p7zip LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 \ pcre.1:${PORTSDIR}/devel/pcre \ - png.6:${PORTSDIR}/graphics/png + png15:${PORTSDIR}/graphics/png USE_DOS2UNIX= *.[ch] Makefile* USE_GMAKE= yes @@ -85,10 +85,6 @@ do-extract: post-patch: @${REINPLACE_CMD} -e 's|libtcl\.so|libtcl${TCL_VER:S/.//}|' \ ${WRKSRC}/embed_tcl.h -# Resolve name collision with jpeg-8 and API png - ${REINPLACE_CMD} -e 's|jpeg_mem_src|local_jpeg_mem_src|' \ - -e 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' \ - ${WRKSRC}/image.c do-install: .for dir in ezquake qw diff --git a/games/ezquake/files/patch-image.c b/games/ezquake/files/patch-image.c new file mode 100644 index 000000000000..ebf71794c41b --- /dev/null +++ b/games/ezquake/files/patch-image.c @@ -0,0 +1,119 @@ +--- image.c.orig 2012-05-03 06:08:56.000000000 +0200 ++++ image.c 2012-05-03 06:20:20.000000000 +0200 +@@ -534,7 +534,7 @@ + static void (*qpng_write_info)(png_structp, png_infop); + static void (*qpng_read_info)(png_structp, png_infop); + static void (*qpng_set_expand)(png_structp); +-static void (*qpng_set_gray_1_2_4_to_8)(png_structp); ++static void (*qpng_set_expand_gray_1_2_4_to_8)(png_structp); + static void (*qpng_set_palette_to_rgb)(png_structp); + static void (*qpng_set_tRNS_to_alpha)(png_structp); + static void (*qpng_set_gray_to_rgb)(png_structp); +@@ -570,7 +570,7 @@ + {"png_write_info", (void **) &qpng_write_info}, + {"png_read_info", (void **) &qpng_read_info}, + {"png_set_expand", (void **) &qpng_set_expand}, +- {"png_set_gray_1_2_4_to_8", (void **) &qpng_set_gray_1_2_4_to_8}, ++ {"png_set_expand_gray_1_2_4_to_8", (void **) &qpng_set_gray_1_2_4_to_8}, + {"png_set_palette_to_rgb", (void **) &qpng_set_palette_to_rgb}, + {"png_set_tRNS_to_alpha", (void **) &qpng_set_tRNS_to_alpha}, + {"png_set_gray_to_rgb", (void **) &qpng_set_gray_to_rgb}, +@@ -734,7 +734,7 @@ + return NULL; + } + +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + qpng_destroy_read_struct(&png_ptr, &pnginfo, NULL); + #ifndef WITH_FTE_VFS + fclose(fin); +@@ -784,7 +784,7 @@ + } + + if (colortype == PNG_COLOR_TYPE_GRAY && bitdepth < 8) +- qpng_set_gray_1_2_4_to_8(png_ptr); ++ qpng_set_expand_gray_1_2_4_to_8(png_ptr); + + if (qpng_get_valid(png_ptr, pnginfo, PNG_INFO_tRNS)) + qpng_set_tRNS_to_alpha(png_ptr); +@@ -888,7 +888,7 @@ + return false; + } + +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + qpng_destroy_write_struct(&png_ptr, &info_ptr); + #ifndef WITH_FTE_VFS + fclose(fp); +@@ -983,7 +983,7 @@ + return false; + } + +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + qpng_destroy_write_struct(&png_ptr, &info_ptr); + #ifndef WITH_FTE_VFS + fclose(fp); +@@ -1158,7 +1158,7 @@ + + // Set the return adress that PNGLib should return to if + // an error occurs during reading. +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + png_destroy_read_struct(&png_ptr, &pnginfo, NULL); + #ifndef WITH_FTE_VFS +@@ -1233,7 +1233,7 @@ + + if (colortype == PNG_COLOR_TYPE_GRAY && bitdepth < 8) + { +- png_set_gray_1_2_4_to_8(png_ptr); ++ png_set_expand_gray_1_2_4_to_8(png_ptr); + } + + if (png_get_valid(png_ptr, pnginfo, PNG_INFO_tRNS)) +@@ -1281,7 +1281,7 @@ + if (!png_get_hIST(png_ptr, pnginfo, &histogram)) + histogram = NULL; + +- png_set_dither(png_ptr, quake_pal, 256, 256, histogram, true); ++ png_set_quantize(png_ptr, quake_pal, 256, 256, histogram, true); + } + #endif // !GLQUAKE + +@@ -1507,7 +1507,7 @@ + return false; + } + +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + png_destroy_write_struct(&png_ptr, &info_ptr); + #ifndef WITH_FTE_VFS + fclose(fp); +@@ -1598,7 +1598,7 @@ + return false; + } + +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + png_destroy_write_struct(&png_ptr, &info_ptr); + #ifndef WITH_FTE_VFS + fclose(fp); +@@ -2360,7 +2360,7 @@ + } + + GLOBAL(void) +-jpeg_mem_src (j_decompress_ptr cinfo, byte * infile, int maxlen) ++local_jpeg_mem_src (j_decompress_ptr cinfo, byte * infile, int maxlen) + { + my_source_mgr *src; + +@@ -2471,7 +2471,7 @@ + + jpeg_create_decompress(&cinfo); + +- jpeg_mem_src(&cinfo, infile, length); ++ local_jpeg_mem_src(&cinfo, infile, length); + + (void) jpeg_read_header(&cinfo, TRUE); + diff --git a/games/f1spirit-remake/Makefile b/games/f1spirit-remake/Makefile index 136bf07cb234..61be95bc1369 100644 --- a/games/f1spirit-remake/Makefile +++ b/games/f1spirit-remake/Makefile @@ -7,7 +7,7 @@ PORTNAME= f1spirit-remake PORTVERSION= 1.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= games # Original braingames site is really slow MASTER_SITES= http://mirror.amdmi3.ru/distfiles/ \ diff --git a/games/farblazer/Makefile b/games/farblazer/Makefile index 78695c58c5e8..3a73e63b458e 100644 --- a/games/farblazer/Makefile +++ b/games/farblazer/Makefile @@ -7,7 +7,7 @@ PORTNAME= farblazer PORTVERSION= 0.7 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games MASTER_SITES= http://www.pygame.org/gamelets/games/ diff --git a/games/fbg2/Makefile b/games/fbg2/Makefile index 1d2c00da0115..306fadae77d3 100644 --- a/games/fbg2/Makefile +++ b/games/fbg2/Makefile @@ -7,6 +7,7 @@ PORTNAME= fbg2 PORTVERSION= 0.4 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF/fbg/ @@ -22,7 +23,7 @@ LICENSE_PERMS_CCbyNCSA3=dist-mirror pkg-mirror auto-accept LIB_DEPENDS= radius:${PORTSDIR}/graphics/radius-engine \ lua-5.1:${PORTSDIR}/lang/lua \ - png:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ physfs.1:${PORTSDIR}/devel/physfs RUN_DEPENDS= zip:${PORTSDIR}/archivers/zip diff --git a/games/fgkicker/Makefile b/games/fgkicker/Makefile index 39f112e440b0..4e42d216be11 100644 --- a/games/fgkicker/Makefile +++ b/games/fgkicker/Makefile @@ -7,7 +7,7 @@ PORTNAME= fgkicker PORTVERSION= 1.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= games MASTER_SITES= http://www.larfeliz.be/projects/files/fgkicker/ EXTRACT_SUFX= .tgz diff --git a/games/fgrun/Makefile b/games/fgrun/Makefile index 118a2307ebd0..12b8e5dd33b3 100644 --- a/games/fgrun/Makefile +++ b/games/fgrun/Makefile @@ -7,7 +7,7 @@ PORTNAME= fgrun PORTVERSION= 1.6.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SF diff --git a/games/fillets-ng/Makefile b/games/fillets-ng/Makefile index b29edea1f590..8e474f37231c 100644 --- a/games/fillets-ng/Makefile +++ b/games/fillets-ng/Makefile @@ -7,7 +7,7 @@ PORTNAME= fillets-ng PORTVERSION= 1.0.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SF/fillets/Fish%20Fillets%20-%20Next%20Generation/${PORTVERSION}:source \ SF/fillets/Fish%20Fillets%20-%20Next%20Generation/${DATAVERSION}:data diff --git a/games/fishsupper/Makefile b/games/fishsupper/Makefile index 5ab3884872aa..69e3dd516a34 100644 --- a/games/fishsupper/Makefile +++ b/games/fishsupper/Makefile @@ -7,7 +7,7 @@ PORTNAME= fishsupper PORTVERSION= 0.1.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SF diff --git a/games/flare/Makefile b/games/flare/Makefile index 30d1fc4b3904..3ffdb58cd345 100644 --- a/games/flare/Makefile +++ b/games/flare/Makefile @@ -7,7 +7,7 @@ PORTNAME= flare DISTVERSION= 015_1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://cloud.github.com/downloads/clintbellanger/flare/ \ http://mirror.amdmi3.ru/files/ diff --git a/games/flightgear-atlas/Makefile b/games/flightgear-atlas/Makefile index 82f3e2634fca..57316c0ebfc5 100644 --- a/games/flightgear-atlas/Makefile +++ b/games/flightgear-atlas/Makefile @@ -7,7 +7,7 @@ PORTNAME= flightgear-atlas PORTVERSION= 0.3.1.20090529 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= games MASTER_SITES= http://contribs.martymac.org/FreeBSD-ports/distfiles/ \ http://freebsd.unixfreunde.de/sources/ @@ -23,7 +23,7 @@ LICENSE= GPLv2 BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \ ${LOCALBASE}/include/simgear/version.h:${PORTSDIR}/devel/simgear -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ jpeg.11:${PORTSDIR}/graphics/jpeg \ curl.6:${PORTSDIR}/ftp/curl RUN_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \ diff --git a/games/flightgear/Makefile b/games/flightgear/Makefile index a871bb91336d..e6c44d3c9fea 100644 --- a/games/flightgear/Makefile +++ b/games/flightgear/Makefile @@ -7,7 +7,7 @@ PORTNAME= flightgear PORTVERSION= 2.6.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games # see http://www.flightgear.org/templates.js MASTER_SITES= http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Source/ \ diff --git a/games/flobopuyo/Makefile b/games/flobopuyo/Makefile index a14e093e33fb..3080cb457d3f 100644 --- a/games/flobopuyo/Makefile +++ b/games/flobopuyo/Makefile @@ -7,7 +7,7 @@ PORTNAME= flobopuyo PORTVERSION= 0.20 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= games MASTER_SITES= http://www.ios-software.com/flobopuyo/ \ http://mirror.amdmi3.ru/distfiles/ diff --git a/games/flyhard/Makefile b/games/flyhard/Makefile index a5b44415fe3b..6bffa7ac500f 100644 --- a/games/flyhard/Makefile +++ b/games/flyhard/Makefile @@ -7,7 +7,7 @@ PORTNAME= flyhard PORTVERSION= 0.42 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= http://www.markboyd.me.uk/games/flyhard/ \ http://mirror.amdmi3.ru/distfiles/ @@ -15,7 +15,7 @@ MASTER_SITES= http://www.markboyd.me.uk/games/flyhard/ \ MAINTAINER= amdmi3@FreeBSD.org COMMENT= Game resembling Thrust, but with lots of shooting and puzzles -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs GNU_CONFIGURE= yes diff --git a/games/foobillard/Makefile b/games/foobillard/Makefile index 23beadfa9d84..b807cf1610b5 100644 --- a/games/foobillard/Makefile +++ b/games/foobillard/Makefile @@ -7,14 +7,14 @@ PORTNAME= foobillard PORTVERSION= 3.0a -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= games MASTER_SITES= http://foobillard.sunsite.dk/dnl/ MAINTAINER= thomas@bsdunix.ch COMMENT= A free OpenGL-billard game -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ freetype.9:${PORTSDIR}/print/freetype2 OPTIONS= SDL "Use SDL instead of glut" off \ diff --git a/games/formido/Makefile b/games/formido/Makefile index ad51b3a32fca..f4c354044d09 100644 --- a/games/formido/Makefile +++ b/games/formido/Makefile @@ -7,7 +7,7 @@ PORTNAME= formido PORTVERSION= 1.0 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= games MASTER_SITES= http://koti.mbnet.fi/lsoft/formido/ \ http://mirror.amdmi3.ru/distfiles/ diff --git a/games/freeciv/Makefile b/games/freeciv/Makefile index b6466580b9bd..a79edb25293d 100644 --- a/games/freeciv/Makefile +++ b/games/freeciv/Makefile @@ -7,6 +7,7 @@ PORTNAME= freeciv PORTVERSION= 2.3.2 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF/freeciv/Freeciv%20${PORTVERSION:R}/${PORTVERSION} @@ -30,7 +31,7 @@ MAN6= freeciv-server.6 freeciv-client.6 \ .ifndef WITHOUT_X11 LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ - png.6:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ ggz.5:${PORTSDIR}/games/libggz \ ggz-gtk.1:${PORTSDIR}/games/ggz-gtk-client \ ggzcore.9:${PORTSDIR}/games/ggz-client-libs \ diff --git a/games/freedink-dfarc/Makefile b/games/freedink-dfarc/Makefile index a52806d5fb2c..10729f86b030 100644 --- a/games/freedink-dfarc/Makefile +++ b/games/freedink-dfarc/Makefile @@ -7,7 +7,7 @@ PORTNAME= freedink-dfarc PORTVERSION= 3.2.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= freedink diff --git a/games/freedink-engine/Makefile b/games/freedink-engine/Makefile index e868c58226ef..b4efeb2f9113 100644 --- a/games/freedink-engine/Makefile +++ b/games/freedink-engine/Makefile @@ -7,7 +7,7 @@ PORTNAME= freedink PORTVERSION= 1.08.${PORTVER} -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= freedink diff --git a/games/freedoko/Makefile b/games/freedoko/Makefile index c90f999da31d..9f1b6321151f 100644 --- a/games/freedoko/Makefile +++ b/games/freedoko/Makefile @@ -7,6 +7,7 @@ PORTNAME= freedoko PORTVERSION= 0.7.11 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF/free-doko/FreeDoko%20source DISTNAME= FreeDoko_${PORTVERSION}.src diff --git a/games/freedroid/Makefile b/games/freedroid/Makefile index b6652a722ab9..4c2fd7f346ad 100644 --- a/games/freedroid/Makefile +++ b/games/freedroid/Makefile @@ -7,7 +7,7 @@ PORTNAME= freedroid PORTVERSION= 1.0.2 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}Classic/FreedroidClassic-${PORTVERSION} diff --git a/games/freedroidrpg/Makefile b/games/freedroidrpg/Makefile index 2249a35bda17..d42f8544d7f6 100644 --- a/games/freedroidrpg/Makefile +++ b/games/freedroidrpg/Makefile @@ -7,7 +7,7 @@ PORTNAME= freedroidrpg PORTVERSION= 0.15 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SF/freedroid/freedroidRPG/freedroidRPG-${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\\1/}/ diff --git a/games/freeorion/Makefile b/games/freeorion/Makefile index 2ba014e4a194..96a5021e01bc 100644 --- a/games/freeorion/Makefile +++ b/games/freeorion/Makefile @@ -7,7 +7,7 @@ PORTNAME= freeorion PORTVERSION= 0.3.13.3795 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= oliver diff --git a/games/freesci/Makefile b/games/freesci/Makefile index ea320bed6c9f..d0650d265095 100644 --- a/games/freesci/Makefile +++ b/games/freesci/Makefile @@ -7,7 +7,7 @@ PORTNAME= freesci PORTVERSION= 0.3.5 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= games emulators MASTER_SITES= http://www-plan.cs.colorado.edu/creichen/${PORTNAME}/ \ http://teksolv.de/~jameson/ diff --git a/games/freesynd/Makefile b/games/freesynd/Makefile index aef6c457527a..3894308802b7 100644 --- a/games/freesynd/Makefile +++ b/games/freesynd/Makefile @@ -7,14 +7,14 @@ PORTNAME= freesynd PORTVERSION= 0.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} MAINTAINER= lme@FreeBSD.org COMMENT= FreeSynd GPLed reimplementation of the classic Bullfrog game Syndicate -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png USE_GMAKE= yes USE_ZIP= yes diff --git a/games/freetennis/Makefile b/games/freetennis/Makefile index 1fdaf206893c..ab868e672af6 100644 --- a/games/freetennis/Makefile +++ b/games/freetennis/Makefile @@ -7,7 +7,7 @@ PORTNAME= freetennis PORTVERSION= 0.4.8 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games MASTER_SITES= SF diff --git a/games/frogatto/Makefile b/games/frogatto/Makefile index 08998014aab5..1e974621533e 100644 --- a/games/frogatto/Makefile +++ b/games/frogatto/Makefile @@ -7,7 +7,7 @@ PORTNAME= frogatto PORTVERSION= 1.1.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= http://www.frogatto.com/files/ @@ -16,7 +16,8 @@ COMMENT= An old-school 2D classic adventure platformer game NO_PACKAGE= Package will be 144M, set FORCE_PACKAGE if you really want it -LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost-libs +LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost-libs \ + png15:${PORTSDIR}/graphics/png USE_BZIP2= yes USE_GMAKE= yes diff --git a/games/frogatto/files/patch-src-IMG_savepng.cpp b/games/frogatto/files/patch-src-IMG_savepng.cpp new file mode 100644 index 000000000000..939b4c614bc0 --- /dev/null +++ b/games/frogatto/files/patch-src-IMG_savepng.cpp @@ -0,0 +1,10 @@ +--- src/IMG_savepng.cpp.orig 2011-04-08 16:11:45.000000000 +0200 ++++ src/IMG_savepng.cpp 2012-05-25 18:51:10.000000000 +0200 +@@ -27,6 +27,7 @@ + + #ifdef IMPLEMENT_SAVE_PNG + #include <png.h> ++#include <zlib.h> + #endif + + #include <stdlib.h> diff --git a/games/frozenbubble/Makefile b/games/frozenbubble/Makefile index 3c376a3cdc47..8d623683f4ca 100644 --- a/games/frozenbubble/Makefile +++ b/games/frozenbubble/Makefile @@ -7,7 +7,7 @@ PORTNAME= frozenbubble PORTVERSION= 2.2.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games MASTER_SITES= http://www.frozen-bubble.org/data/ DISTNAME= frozen-bubble-${PORTVERSION} diff --git a/games/fteqw/Makefile b/games/fteqw/Makefile index 222e9f726fcb..79b5a60ae791 100644 --- a/games/fteqw/Makefile +++ b/games/fteqw/Makefile @@ -7,7 +7,7 @@ PORTNAME= fteqw PORTVERSION= 3343 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/Source/${PORTVERSION} DISTNAME= ftesrc${PORTVERSION}-all @@ -42,8 +42,9 @@ FTE_TARGETS+= fteqw.sv .if !defined(WITHOUT_GL) || !defined(WITHOUT_SDL) LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg \ - png.6:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ vorbis.4:${PORTSDIR}/audio/libvorbis +CFLAGS+= -I${LOCALBASE}/include/libpng15 .endif .if !defined(WITHOUT_GL) @@ -71,11 +72,6 @@ post-patch: ${WRKSRC}/gl/gl_alias.c ${WRKSRC}/common/com_mesh.c @${REINPLACE_CMD} -e 's/__linux__/__unix__/' \ ${WRKSRC}/common/plugin.c ${WRKSRC}/server/svq3_game.c -# Resolve name collision with jpeg-8 and API png14 - ${REINPLACE_CMD} -e 's|jpeg_mem_src|local_jpeg_mem_src|' \ - -e 's|jpeg_mem_dest|local_jpeg_mem_dest|' \ - -e 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' \ - ${WRKSRC}/client/image.c do-install: .for f in ${FTE_TARGETS} diff --git a/games/fteqw/files/patch-client__image.c b/games/fteqw/files/patch-client__image.c new file mode 100644 index 000000000000..60892907796a --- /dev/null +++ b/games/fteqw/files/patch-client__image.c @@ -0,0 +1,74 @@ +--- client/image.c.orig 2012-05-26 14:26:41.000000000 +0200 ++++ client/image.c 2012-05-26 14:27:18.000000000 +0200 +@@ -551,6 +551,8 @@ + #pragma comment(lib, "../libs/libpng.lib") + #else + #include <png.h> ++ #include <pngpriv.h> ++ #include <zlib.h> + #endif + #endif + +@@ -610,7 +612,7 @@ + return (png_rgba = NULL); + } + +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf(png))) + { + error: + if (data) +@@ -636,7 +638,7 @@ + } + + if (colortype == PNG_COLOR_TYPE_GRAY && bitdepth < 8) +- png_set_gray_1_2_4_to_8(png); ++ png_set_expand_gray_1_2_4_to_8(png); + + if (png_get_valid( png, pnginfo, PNG_INFO_tRNS )) + png_set_tRNS_to_alpha(png); +@@ -712,7 +714,7 @@ + return false; + } + +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + png_destroy_write_struct(&png_ptr, &info_ptr); + fclose(fp); + return false; +@@ -879,7 +881,7 @@ + #define GLOBAL(x) x + + GLOBAL(void) +-jpeg_mem_src (j_decompress_ptr cinfo, qbyte * infile, int maxlen) ++local_jpeg_mem_src (j_decompress_ptr cinfo, qbyte * infile, int maxlen) + { + my_source_mgr *src; + +@@ -945,7 +947,7 @@ + } + jpeg_create_decompress(&cinfo); + +- jpeg_mem_src(&cinfo, infile, length); ++ local_jpeg_mem_src(&cinfo, infile, length); + + (void) jpeg_read_header(&cinfo, TRUE); + +@@ -1041,7 +1043,7 @@ + dest->pub.free_in_buffer = OUTPUT_BUF_SIZE; + } + +-void jpeg_mem_dest (j_compress_ptr cinfo, vfsfile_t *vfs) ++void local_jpeg_mem_dest (j_compress_ptr cinfo, vfsfile_t *vfs) + { + my_destination_mgr *dest; + +@@ -1101,7 +1103,7 @@ + + buffer = screendata; + +- jpeg_mem_dest(&cinfo, outfile); ++ local_jpeg_mem_dest(&cinfo, outfile); + cinfo.image_width = screenwidth; + cinfo.image_height = screenheight; + cinfo.input_components = 3; diff --git a/games/fuhquake/Makefile b/games/fuhquake/Makefile index a5367951ea6c..99db1c609e10 100644 --- a/games/fuhquake/Makefile +++ b/games/fuhquake/Makefile @@ -7,7 +7,7 @@ PORTNAME= fuhquake PORTVERSION= 0.31 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= games MASTER_SITES= http://www.fuhquake.net/files/releases/v${PORTVERSION}/ \ ftp://gibbage.mine.nu/clients/fuhquake/releases/v${PORTVERSION}/ \ @@ -45,8 +45,9 @@ IGNORE= needs at least one client (GLX or X11) .if defined(WITH_GLX) USE_GL= yes -LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png \ +LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png \ jpeg.11:${PORTSDIR}/graphics/jpeg +CFLAGS+= -I${LOCALBASE}/include/libpng15 PLIST_SUB+= GLX="" CLIENTS+= glx .else diff --git a/games/fuhquake/files/patch-image.c b/games/fuhquake/files/patch-image.c new file mode 100644 index 000000000000..24084f0116ad --- /dev/null +++ b/games/fuhquake/files/patch-image.c @@ -0,0 +1,38 @@ +--- image.c.orig 2004-01-07 00:43:22.000000000 +0100 ++++ image.c 2012-05-26 15:10:53.000000000 +0200 +@@ -24,6 +24,8 @@ + + #ifdef WITH_PNG + #include "png.h" ++#include "zlib.h" ++#include "pngpriv.h" + #endif + + #ifdef WITH_JPEG +@@ -569,7 +571,7 @@ + return NULL; + } + +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_ptr->longjmp_buffer)) { + qpng_destroy_read_struct(&png_ptr, &pnginfo, NULL); + fclose(fin); + return NULL; +@@ -678,7 +680,7 @@ + return false; + } + +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_ptr->longjmp_buffer)) { + qpng_destroy_write_struct(&png_ptr, &info_ptr); + fclose(fp); + return false; +@@ -743,7 +745,7 @@ + return false; + } + +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_ptr->longjmp_buffer)) { + qpng_destroy_write_struct(&png_ptr, &info_ptr); + fclose(fp); + return false; diff --git a/games/fxsudoku/Makefile b/games/fxsudoku/Makefile index b51852158d9d..3d1c2f8be6ba 100644 --- a/games/fxsudoku/Makefile +++ b/games/fxsudoku/Makefile @@ -7,7 +7,7 @@ PORTNAME= fxsudoku PORTVERSION= 0.5.1 -PORTREVISION= 20 +PORTREVISION= 21 CATEGORIES= games MASTER_SITES= http://www.fifthplanet.net/files/ diff --git a/games/galaxyhack/Makefile b/games/galaxyhack/Makefile index b343dc1fdeae..c59beb7f5c59 100644 --- a/games/galaxyhack/Makefile +++ b/games/galaxyhack/Makefile @@ -7,7 +7,7 @@ PORTNAME= galaxyhack PORTVERSION= 1.74 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= games MASTER_SITES= SF DISTFILES= ${DISTNAME}${EXTRACT_SUFX} diff --git a/games/galaxymage/Makefile b/games/galaxymage/Makefile index 2a42000a75e2..efa115e483bc 100644 --- a/games/galaxymage/Makefile +++ b/games/galaxymage/Makefile @@ -7,7 +7,7 @@ PORTNAME= galaxymage PORTVERSION= 0.3.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games python MASTER_SITES= http://download.gna.org/tactics/ diff --git a/games/gbottler/Makefile b/games/gbottler/Makefile index ae75db557d54..acff49a5c435 100644 --- a/games/gbottler/Makefile +++ b/games/gbottler/Makefile @@ -7,6 +7,7 @@ PORTNAME= gbottler PORTVERSION= 0.1.7 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP} MASTER_SITE_SUBDIR= gbottler/45155 diff --git a/games/gbrainy/Makefile b/games/gbrainy/Makefile index 24c21a6b4408..77552758f1b1 100644 --- a/games/gbrainy/Makefile +++ b/games/gbrainy/Makefile @@ -7,6 +7,7 @@ PORTNAME= gbrainy PORTVERSION= 2.1.3 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= games MASTER_SITES= http://gent.softcatala.org/jmas/gbrainy/ diff --git a/games/gcompris/Makefile b/games/gcompris/Makefile index 33bb0a96e9b6..58b0ed1ac715 100644 --- a/games/gcompris/Makefile +++ b/games/gcompris/Makefile @@ -7,6 +7,7 @@ PORTNAME= gcompris PORTVERSION= 12.01 +PORTREVISION= 1 CATEGORIES= games gnome MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}/ diff --git a/games/gdado/Makefile b/games/gdado/Makefile index cd6c0ccd4ad3..b7aae564efb5 100644 --- a/games/gdado/Makefile +++ b/games/gdado/Makefile @@ -7,7 +7,7 @@ PORTNAME= gdado PORTVERSION= 2.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/souce%20code/${PORTNAME}-${PORTVERSION} diff --git a/games/gemrb/Makefile b/games/gemrb/Makefile index 19418a9fcda5..7046e928d371 100644 --- a/games/gemrb/Makefile +++ b/games/gemrb/Makefile @@ -7,6 +7,7 @@ PORTNAME= gemrb PORTVERSION= 0.7.0 +PORTREVISION= 1 CATEGORIES= games emulators MASTER_SITES= SF/${PORTNAME}/GemRB%20Sources/GemRB%20${PORTVERSION}%20Sources @@ -16,7 +17,7 @@ COMMENT= GemRB (Game engine made with preRendered Background) LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ vorbis.4:${PORTSDIR}/audio/libvorbis USE_CMAKE= yes diff --git a/games/ggz-gtk-client/Makefile b/games/ggz-gtk-client/Makefile index a25c3ee545c7..97f9331ab53e 100644 --- a/games/ggz-gtk-client/Makefile +++ b/games/ggz-gtk-client/Makefile @@ -8,7 +8,7 @@ PORTNAME= ggz-gtk-client PORTVERSION= ${GGZ_VERSION} -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games MAINTAINER= kde@FreeBSD.org diff --git a/games/ggz-gtk-games/Makefile b/games/ggz-gtk-games/Makefile index 688cb521d2ca..79dd92712838 100644 --- a/games/ggz-gtk-games/Makefile +++ b/games/ggz-gtk-games/Makefile @@ -8,7 +8,7 @@ PORTNAME= ggz-gtk-games PORTVERSION= ${GGZ_VERSION} -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games MAINTAINER= kde@FreeBSD.org diff --git a/games/ggz-kde-client/Makefile b/games/ggz-kde-client/Makefile index 4e28414b0d0a..28680e3db894 100644 --- a/games/ggz-kde-client/Makefile +++ b/games/ggz-kde-client/Makefile @@ -7,7 +7,7 @@ PORTNAME= ggz-kde-client PORTVERSION= ${GGZ_VERSION} -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= games MAINTAINER= ports@FreeBSD.org diff --git a/games/ggz-sdl-games/Makefile b/games/ggz-sdl-games/Makefile index 1df210dc2e9c..9923211c6017 100644 --- a/games/ggz-sdl-games/Makefile +++ b/games/ggz-sdl-games/Makefile @@ -8,7 +8,7 @@ PORTNAME= ggz-sdl-games PORTVERSION= ${GGZ_VERSION} -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= games MAINTAINER= kde@FreeBSD.org diff --git a/games/glaxium/Makefile b/games/glaxium/Makefile index 2cbf11c71a99..83c78cf25bd6 100644 --- a/games/glaxium/Makefile +++ b/games/glaxium/Makefile @@ -7,7 +7,7 @@ PORTNAME= glaxium PORTVERSION= 0.5 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= games MASTER_SITES= http://xhosxe.free.fr/glaxium/ DISTNAME= ${PORTNAME}_${PORTVERSION} @@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME}_${PORTVERSION} MAINTAINER= makc@FreeBSD.org COMMENT= An OpenGL based space-ship "shoot-em-up" game -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png USE_SDL= sdl mixer USE_GL= glut diff --git a/games/glchess/Makefile b/games/glchess/Makefile index 4f4bbf2b95f5..2de22cdfaae8 100644 --- a/games/glchess/Makefile +++ b/games/glchess/Makefile @@ -7,7 +7,7 @@ PORTNAME= glchess PORTVERSION= 1.0.6 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games MASTER_SITES= SF diff --git a/games/glife/Makefile b/games/glife/Makefile index 7372a7698b3f..bbe8b81e2b4b 100644 --- a/games/glife/Makefile +++ b/games/glife/Makefile @@ -7,7 +7,7 @@ PORTNAME= glife PORTVERSION= 0.2.1 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= games gnome MASTER_SITES= SF DISTNAME= gLife-${PORTVERSION} diff --git a/games/glob2/Makefile b/games/glob2/Makefile index f6982885dac5..7ab813ca14d4 100644 --- a/games/glob2/Makefile +++ b/games/glob2/Makefile @@ -7,7 +7,7 @@ PORTNAME= glob2 PORTVERSION= 0.9.4.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SAVANNAH} MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTVERSION:R} diff --git a/games/gltron/Makefile b/games/gltron/Makefile index 5a250c7dcc8d..017078b63741 100644 --- a/games/gltron/Makefile +++ b/games/gltron/Makefile @@ -7,7 +7,7 @@ PORTNAME= gltron PORTVERSION= 0.70 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-source/${PORTVERSION} EXTRACT_SUFX= -source.tar.gz @@ -15,7 +15,7 @@ EXTRACT_SUFX= -source.tar.gz MAINTAINER= lx@FreeBSD.org COMMENT= A 3D worm game for two players for X Window System -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png USE_GL= gl USE_SDL= sdl sound diff --git a/games/gnmm/Makefile b/games/gnmm/Makefile index 3d9d869910b4..965be03fde11 100644 --- a/games/gnmm/Makefile +++ b/games/gnmm/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnmm PORTVERSION= 0.1.2 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= games gnome MASTER_SITES= SF DIST_SUBDIR= gnome diff --git a/games/gno3dtet/Makefile b/games/gno3dtet/Makefile index 1e0fc88f31d2..37a29625780a 100644 --- a/games/gno3dtet/Makefile +++ b/games/gno3dtet/Makefile @@ -7,7 +7,7 @@ PORTNAME= gno3dtet PORTVERSION= 1.96.1 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= games gnome MASTER_SITES= http://eseb.net/ftp/gno3dtet/ EXTRACT_SUFX= .tgz diff --git a/games/gnome-games-extra-data/Makefile b/games/gnome-games-extra-data/Makefile index 13e820b9ed6b..c6bb209b7866 100644 --- a/games/gnome-games-extra-data/Makefile +++ b/games/gnome-games-extra-data/Makefile @@ -8,7 +8,7 @@ PORTNAME= gnome-games-extra-data PORTVERSION= 2.30.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile index 25341e53f7c8..98191df11d82 100644 --- a/games/gnome-games/Makefile +++ b/games/gnome-games/Makefile @@ -8,7 +8,7 @@ PORTNAME= gnome-games PORTVERSION= 2.32.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/games/gnomeattacks/Makefile b/games/gnomeattacks/Makefile index 187c2a8776d8..b844d391ac9d 100644 --- a/games/gnomeattacks/Makefile +++ b/games/gnomeattacks/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnomeattacks PORTVERSION= 0.3 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= games gnome MASTER_SITES= SF diff --git a/games/gnomebreakout/Makefile b/games/gnomebreakout/Makefile index 2efb84cd5b08..6a68ed58f4cd 100644 --- a/games/gnomebreakout/Makefile +++ b/games/gnomebreakout/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnomebreakout PORTVERSION= 0.5.3 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= games gnome MASTER_SITES= http://www.users.on.net/~mipearson/ DISTNAME= gnome-breakout-${PORTVERSION} diff --git a/games/gnomechess/Makefile b/games/gnomechess/Makefile index 5dd09be34e51..cab50d6147ee 100644 --- a/games/gnomechess/Makefile +++ b/games/gnomechess/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnomechess PORTVERSION= 0.3.3 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= games gnome MASTER_SITES= GNOME MASTER_SITE_SUBDIR= sources/gnome-chess/0.3 diff --git a/games/gnomekiss/Makefile b/games/gnomekiss/Makefile index 7747603a729f..8704a966a3a6 100644 --- a/games/gnomekiss/Makefile +++ b/games/gnomekiss/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnomekiss PORTVERSION= 2.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games gnome MASTER_SITES= http://devel.tlrmx.org/kiss/source/ diff --git a/games/gnomememoryblocks/Makefile b/games/gnomememoryblocks/Makefile index 9ec8455e9009..3f1b44527ad6 100644 --- a/games/gnomememoryblocks/Makefile +++ b/games/gnomememoryblocks/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnomememoryblocks PORTVERSION= 0.2 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= games gnome MASTER_SITES= SF/gnome-memblocks/gnome-memblocks/${PORTVERSION} DISTNAME= gnome-memblocks-${PORTVERSION} diff --git a/games/gnomermind/Makefile b/games/gnomermind/Makefile index 7ba3702213f4..403bd794c407 100644 --- a/games/gnomermind/Makefile +++ b/games/gnomermind/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnomermind PORTVERSION= 1.0.1 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= games gnome MASTER_SITES= SF/${PORTNAME}/GnomerMind/${PORTVERSION}%20_Dreaming%20clovers_ diff --git a/games/gnomesudoku/Makefile b/games/gnomesudoku/Makefile index 3ca66db4068c..ebd70ab18992 100644 --- a/games/gnomesudoku/Makefile +++ b/games/gnomesudoku/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnomesudoku PORTVERSION= 0.6.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games gnome MASTER_SITES= SF/gnome-sudoku/gnome-sudoku/${PORTVERSION} DISTNAME= gnome-sudoku-${PORTVERSION} diff --git a/games/gnono/Makefile b/games/gnono/Makefile index 800f3abe8c5a..51f4273da4ea 100644 --- a/games/gnono/Makefile +++ b/games/gnono/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnono PORTVERSION= 1.9.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games MASTER_SITES= SF diff --git a/games/gnubg/Makefile b/games/gnubg/Makefile index 26e80e2e16b2..b6b2f8f8ca57 100644 --- a/games/gnubg/Makefile +++ b/games/gnubg/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnubg PORTVERSION= 0.15 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= games MASTER_SITES= http://www.gnubg.org/media/sources/:src \ ${MASTER_SITE_GNU_ALPHA:S/$/:ts/} @@ -22,6 +22,7 @@ COMMENT= GNU Backgammon BUILD_DEPENDS= bison:${PORTSDIR}/devel/bison LIB_DEPENDS= gmp.10:${PORTSDIR}/math/gmp \ gdbm.4:${PORTSDIR}/databases/gdbm \ + png15:${PORTSDIR}/graphics/png \ gtkextra-x11-2.0.1:${PORTSDIR}/x11-toolkits/gtkextra2 \ gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext @@ -72,7 +73,7 @@ post-extract: ${GUNZIP_CMD} --stdout ${DISTDIR}/${DIST_SUBDIR}/gnubg_ts0.bd.gz > ${WRKSRC}/gnubg_ts0.bd post-patch: - ${REINPLACE_CMD} -e 's|libpng12|libpng14|g' ${WRKSRC}/configure.in + ${REINPLACE_CMD} -e 's|libpng12|libpng15|g' ${WRKSRC}/configure.in pre-configure: cd ${WRKSRC} && ./autogen.sh diff --git a/games/gnudoku/Makefile b/games/gnudoku/Makefile index 5d678c0438cd..355a11d49224 100644 --- a/games/gnudoku/Makefile +++ b/games/gnudoku/Makefile @@ -7,7 +7,7 @@ PORTNAME= GNUDoku PORTVERSION= 0.93 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games MASTER_SITES= http://offload2.icculus.org:9090/~jcspray/GNUDoku/ diff --git a/games/gnurobbo/Makefile b/games/gnurobbo/Makefile index 98b7090cb8b6..5fb1b498acb3 100644 --- a/games/gnurobbo/Makefile +++ b/games/gnurobbo/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnurobbo PORTVERSION= 0.66 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION:C/^([0-9]+\.[0-9]+)\..*$/\1/}/ EXTRACT_SUFX= -source.tar.gz diff --git a/games/gnurobots/Makefile b/games/gnurobots/Makefile index 0f6c84a70ec1..b46e02cf64fe 100644 --- a/games/gnurobots/Makefile +++ b/games/gnurobots/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnurobots PORTVERSION= 1.2.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= games MASTER_SITES= GNU diff --git a/games/goonies/Makefile b/games/goonies/Makefile index 5c9928d4ea2f..b3bedbc9d815 100644 --- a/games/goonies/Makefile +++ b/games/goonies/Makefile @@ -7,7 +7,7 @@ PORTNAME= goonies PORTVERSION= 1.0.1 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= games MASTER_SITES= http://goonies.jorito.net/download/ \ http://mirror.amdmi3.ru/distfiles/ diff --git a/games/gracer/Makefile b/games/gracer/Makefile index c9e277333eae..335e07d81df7 100644 --- a/games/gracer/Makefile +++ b/games/gracer/Makefile @@ -7,7 +7,7 @@ PORTNAME= gracer PORTVERSION= 0.1.5 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= games MASTER_SITES= SF @@ -16,14 +16,15 @@ COMMENT= A 3D motor sport simulator BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib LIB_DEPENDS= gif.5:${PORTSDIR}/graphics/giflib \ - png.6:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ jpeg.11:${PORTSDIR}/graphics/jpeg \ tcl84.1:${PORTSDIR}/lang/tcl84 USE_GL= glut USE_PERL5_BUILD=yes USE_AUTOTOOLS= autoconf213 -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" +CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" \ + CPPFLAGS="${CPPFLAGS}" CPPFLAGS+= -I${LOCALBASE}/include \ -I${LOCALBASE}/include/tcl8.4 USE_GMAKE= yes diff --git a/games/gracer/files/patch-gr_texture.c b/games/gracer/files/patch-gr_texture.c index 3b51ba7f4485..7f998b5e9d25 100644 --- a/games/gracer/files/patch-gr_texture.c +++ b/games/gracer/files/patch-gr_texture.c @@ -1,5 +1,5 @@ --- common/gr_texture.c.orig 2000-03-01 05:27:18.000000000 +0100 -+++ common/gr_texture.c 2010-03-30 11:19:05.000000000 +0200 ++++ common/gr_texture.c 2012-05-03 20:29:17.000000000 +0200 @@ -419,7 +419,7 @@ if (fread (header, 1, PNG_BYTES_TO_CHECK, file) != PNG_BYTES_TO_CHECK) { goto ERROR; @@ -9,3 +9,12 @@ goto ERROR; } +@@ -431,7 +431,7 @@ + if (!info_ptr) { + goto ERROR; + } +- if (setjmp (png_ptr->jmpbuf)) { ++ if (setjmp (png_jmpbuf(png_ptr))) { + goto ERROR; + } + png_init_io (png_ptr, file); diff --git a/games/gretools/Makefile b/games/gretools/Makefile index 653b03b39e01..0d5efa0ce6e3 100644 --- a/games/gretools/Makefile +++ b/games/gretools/Makefile @@ -7,7 +7,7 @@ PORTNAME= gretools PORTVERSION= 1.2.4 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= games gnome MASTER_SITES= http://www.cs.utexas.edu/~arvindn/gretools/%SUBDIR%/ MASTER_SITE_SUBDIR= ${PORTVERSION:R} diff --git a/games/grhino/Makefile b/games/grhino/Makefile index c861773e0649..63d863ac9c0b 100644 --- a/games/grhino/Makefile +++ b/games/grhino/Makefile @@ -7,6 +7,7 @@ PORTNAME= grhino PORTVERSION= 0.16.1 +PORTREVISION= 1 CATEGORIES= games gnome MASTER_SITES= SF/rhino/GRhino/${PORTVERSION} diff --git a/games/gtetrinet/Makefile b/games/gtetrinet/Makefile index 6cb47ab2a964..3c3eb84e9f68 100644 --- a/games/gtetrinet/Makefile +++ b/games/gtetrinet/Makefile @@ -6,7 +6,7 @@ PORTNAME= gtetrinet PORTVERSION= 0.7.11 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= games gnome ipv6 MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/games/gtkatlantic/Makefile b/games/gtkatlantic/Makefile index dc5c64874af5..15630839c5e7 100644 --- a/games/gtkatlantic/Makefile +++ b/games/gtkatlantic/Makefile @@ -7,6 +7,7 @@ PORTNAME= gtkatlantic PORTVERSION= 0.4.3 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://download.tuxfamily.org/gtkatlantic/downloads/v0.4/ diff --git a/games/gtkballs/Makefile b/games/gtkballs/Makefile index 33d1e1760721..20a553ce6afa 100644 --- a/games/gtkballs/Makefile +++ b/games/gtkballs/Makefile @@ -7,7 +7,7 @@ PORTNAME= gtkballs PORTVERSION= 3.1.5 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= games MASTER_SITES= http://gtkballs.antex.ru/dist/ diff --git a/games/gtklife/Makefile b/games/gtklife/Makefile index 5035a14b71ea..88797b967eca 100644 --- a/games/gtklife/Makefile +++ b/games/gtklife/Makefile @@ -7,7 +7,7 @@ PORTNAME= gtklife PORTVERSION= 5.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= http://ironphoenix.org/tril/gtklife/ diff --git a/games/gtkpool/Makefile b/games/gtkpool/Makefile index ae7b93b3cac2..4e05e7214422 100644 --- a/games/gtkpool/Makefile +++ b/games/gtkpool/Makefile @@ -7,7 +7,7 @@ PORTNAME= gtkpool PORTVERSION= 0.5.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games MASTER_SITES= ftp://ftp.seul.org/pub/gtkpool/ \ http://www.sourcefiles.org/Games/Sports/Pool/ diff --git a/games/gtkradiant/Makefile b/games/gtkradiant/Makefile index 09f26805dd1c..abee847cc3a9 100644 --- a/games/gtkradiant/Makefile +++ b/games/gtkradiant/Makefile @@ -7,7 +7,7 @@ PORTNAME= gtkradiant PORTVERSION= 1.5.0 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_IDSOFTWARE:S|$|source/:id|} \ http://www.bsd-geek.de/FreeBSD/distfiles/:fb @@ -23,7 +23,7 @@ LICENSE= GPLv2 BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/libsvn/__init__.py:${PORTSDIR}/devel/py-subversion LIB_DEPENDS= gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext \ mhash.2:${PORTSDIR}/security/mhash \ - png.6:${PORTSDIR}/graphics/png + png15:${PORTSDIR}/graphics/png WRKSRC= ${WRKDIR}/GPL/GtkRadiant @@ -38,9 +38,6 @@ DATADIR= ${PREFIX}/lib/${PORTNAME} post-patch: @${REINPLACE_CMD} -e 's/-ldl//' ${WRKSRC}/SConscript - @${REINPLACE_CMD} -e 's/png_infopp_NULL/NULL/' \ - -e 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' \ - ${WRKSRC}/plugins/imagepng/plugin.cpp @${GREP} -Rl 'defined[[:blank:]]*([[:blank:]]*__linux__[[:blank:]]*) || defined[[:blank:]]*([[:blank:]]*__APPLE__[[:blank:]]*)' ${WRKSRC} | \ ${XARGS} ${REINPLACE_CMD} -e \ 's/\(defined[[:blank:]]*([[:blank:]]*__linux__[[:blank:]]*) || defined[[:blank:]]*([[:blank:]]*__APPLE__[[:blank:]]*)\)/\1 || defined (__FreeBSD__)/' diff --git a/games/gtkradiant/files/patch-plugins__imagepng__plugin.cpp b/games/gtkradiant/files/patch-plugins__imagepng__plugin.cpp new file mode 100644 index 000000000000..c06c1abd68ea --- /dev/null +++ b/games/gtkradiant/files/patch-plugins__imagepng__plugin.cpp @@ -0,0 +1,41 @@ +--- plugins/imagepng/plugin.cpp.orig 2006-02-10 23:01:20.000000000 +0100 ++++ plugins/imagepng/plugin.cpp 2012-05-26 20:07:52.000000000 +0200 +@@ -41,7 +41,7 @@ + void user_error_fn(png_structp png_ptr, png_const_charp error_msg) + { + globalErrorStream() << "libpng error: " << error_msg << "\n"; +- longjmp(png_ptr->jmpbuf, 0); ++ longjmp(png_jmpbuf(png_ptr), 0); + } + + void user_read_data(png_structp png_ptr, png_bytep data, png_uint_32 length) +@@ -87,9 +87,9 @@ + } + + // configure the read function +- png_set_read_fn(png_ptr, (voidp)&p_fbuffer, (png_rw_ptr)&user_read_data); ++ png_set_read_fn(png_ptr, &p_fbuffer, (png_rw_ptr)&user_read_data); + +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + png_destroy_read_struct(&png_ptr, &info_ptr, + &end_info); + return 0; +@@ -108,7 +108,7 @@ + png_set_palette_to_rgb(png_ptr); + + if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) +- png_set_gray_1_2_4_to_8(png_ptr); ++ png_set_expand_gray_1_2_4_to_8(png_ptr); + + if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) + png_set_tRNS_to_alpha(png_ptr); +@@ -153,7 +153,7 @@ + png_read_end(png_ptr, info_ptr); + + /* free up the memory structure */ +- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL); ++ png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + + free(row_pointers); + diff --git a/games/gtkradiant/files/patch-tools__quake3__q3map2__image.c b/games/gtkradiant/files/patch-tools__quake3__q3map2__image.c new file mode 100644 index 000000000000..4b5d3d74507f --- /dev/null +++ b/games/gtkradiant/files/patch-tools__quake3__q3map2__image.c @@ -0,0 +1,19 @@ +--- tools/quake3/q3map2/image.c.orig 2006-02-10 23:01:20.000000000 +0100 ++++ tools/quake3/q3map2/image.c 2012-05-26 20:56:51.000000000 +0200 +@@ -35,6 +35,7 @@ + + /* dependencies */ + #include "q3map2.h" ++#include "pngpriv.h" + + + +@@ -180,7 +181,7 @@ + png->io_ptr = &pb; /* hack! */ + + /* set error longjmp */ +- if( setjmp( png->jmpbuf ) ) ++ if( setjmp( png_jmpbuf(png) ) ) + { + Sys_Printf( "WARNING: An error occurred reading PNG image\n" ); + png_destroy_read_struct( &png, &info, &end ); diff --git a/games/gtktetcolor/Makefile b/games/gtktetcolor/Makefile index d3d0a3808dae..4b25adaabf45 100644 --- a/games/gtktetcolor/Makefile +++ b/games/gtktetcolor/Makefile @@ -7,7 +7,7 @@ PORTNAME= gtktetcolor PORTVERSION= 0.6.4 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= games gnome MASTER_SITES= SUNSITE/games \ http://canopus.iacp.dvo.ru/~panov/gtktetcolor/ diff --git a/games/gturing/Makefile b/games/gturing/Makefile index 8c893e898c37..cb61073a5abe 100644 --- a/games/gturing/Makefile +++ b/games/gturing/Makefile @@ -7,7 +7,7 @@ PORTNAME= gturing PORTVERSION= 0.1.1 -PORTREVISION= 17 +PORTREVISION= 18 CATEGORIES= games gnome MASTER_SITES= ftp://ftp.gnome.org/pub/gnome/sources/gturing/0.1/ diff --git a/games/gweled/Makefile b/games/gweled/Makefile index 4320c0f52fbe..1736eac9bcc1 100644 --- a/games/gweled/Makefile +++ b/games/gweled/Makefile @@ -7,7 +7,7 @@ PORTNAME= gweled PORTVERSION= 0.7 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= games gnome MASTER_SITES= http://sebdelestaing.free.fr/gweled/Release/ diff --git a/games/hangman/Makefile b/games/hangman/Makefile index 49b1f6915a6e..3948893612a2 100644 --- a/games/hangman/Makefile +++ b/games/hangman/Makefile @@ -7,7 +7,7 @@ PORTNAME= hangman PORTVERSION= 0.9.2 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= games MASTER_SITES= http://www.shiftygames.com/hangman/ \ http://mirror.amdmi3.ru/distfiles/ diff --git a/games/hedgewars/Makefile b/games/hedgewars/Makefile index 55227ed46920..2c767e6e73f4 100644 --- a/games/hedgewars/Makefile +++ b/games/hedgewars/Makefile @@ -7,7 +7,7 @@ PORTNAME= hedgewars PORTVERSION= 0.9.17 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= http://download.gna.org/hedgewars/ \ http://mirror.amdmi3.ru/distfiles/ diff --git a/games/hex/Makefile b/games/hex/Makefile index a01b5ffc5f83..ba0ca749ff79 100644 --- a/games/hex/Makefile +++ b/games/hex/Makefile @@ -7,7 +7,7 @@ PORTNAME= hex PORTVERSION= 0.0.2 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= games MASTER_SITES= http://www.earth.li/projectpurple/files/ diff --git a/games/hexalate/Makefile b/games/hexalate/Makefile index 2d483d900b35..83da773d3f29 100644 --- a/games/hexalate/Makefile +++ b/games/hexalate/Makefile @@ -7,7 +7,7 @@ PORTNAME= hexalate PORTVERSION= 1.0.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://gottcode.org/${PORTNAME}/ \ http://mirror.amdmi3.ru/distfiles/ diff --git a/games/hexglass/Makefile b/games/hexglass/Makefile index 9242d28b5665..3b34e4bc9ac9 100644 --- a/games/hexglass/Makefile +++ b/games/hexglass/Makefile @@ -7,6 +7,7 @@ PORTNAME= hexglass PORTVERSION= 1.2.1 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= GOOGLE_CODE diff --git a/games/hexxagon/Makefile b/games/hexxagon/Makefile index c7f383f477a5..213ebf25d06b 100644 --- a/games/hexxagon/Makefile +++ b/games/hexxagon/Makefile @@ -7,6 +7,7 @@ PORTNAME= hexxagon PORTVERSION= 1.0.1 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://www.nesqi.se/hexxagon/hexxagon/download/ diff --git a/games/highmoon/Makefile b/games/highmoon/Makefile index 96a14fd74e73..07fdec14a32e 100644 --- a/games/highmoon/Makefile +++ b/games/highmoon/Makefile @@ -7,7 +7,7 @@ PORTNAME= highmoon PORTVERSION= 1.2.4 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= games MASTER_SITES= http://highmoon.gerdsmeier.net/ diff --git a/games/holotz-castle/Makefile b/games/holotz-castle/Makefile index cc8ba5b928c4..50cd24ced347 100644 --- a/games/holotz-castle/Makefile +++ b/games/holotz-castle/Makefile @@ -7,7 +7,7 @@ PORTNAME= holotz-castle PORTVERSION= 1.3.13 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games MASTER_SITES= http://www.mainreactor.net/holotzcastle/download/ DISTNAME= ${PORTNAME}-${PORTVERSION}-src diff --git a/games/instead/Makefile b/games/instead/Makefile index 9d6ca89f613f..cd104c791d69 100644 --- a/games/instead/Makefile +++ b/games/instead/Makefile @@ -6,6 +6,7 @@ PORTNAME= instead PORTVERSION= 1.7.0 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= GOOGLE_CODE \ http://mirror.amdmi3.ru/distfiles/ diff --git a/games/intensityengine/Makefile b/games/intensityengine/Makefile index 9adf6b9f63a3..e06f7cef4ea0 100644 --- a/games/intensityengine/Makefile +++ b/games/intensityengine/Makefile @@ -7,7 +7,7 @@ PORTNAME= intensityengine DISTVERSION= r20100129 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= games MASTER_SITES= http://mirror.amdmi3.ru/distfiles/ diff --git a/games/interlogic/Makefile b/games/interlogic/Makefile index 1566773b98b7..8b18f23e094f 100644 --- a/games/interlogic/Makefile +++ b/games/interlogic/Makefile @@ -7,7 +7,7 @@ PORTNAME= interlogic PORTVERSION= 0.30 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/0.3.0 DISTNAME= interLOGIC-src-${PORTVERSION} diff --git a/games/irrlamb/Makefile b/games/irrlamb/Makefile index 6508b8467d22..6ce8af989226 100644 --- a/games/irrlamb/Makefile +++ b/games/irrlamb/Makefile @@ -7,7 +7,7 @@ PORTNAME= irrlamb PORTVERSION= 0.1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= GOOGLE_CODE DISTNAME= ${PORTNAME}-${PORTVERSION}-src diff --git a/games/jag/Makefile b/games/jag/Makefile index ea51e3cf26ce..bf8e3c20d406 100644 --- a/games/jag/Makefile +++ b/games/jag/Makefile @@ -7,6 +7,7 @@ PORTNAME= jag PORTVERSION= 0.3.2 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://jag.xlabsoft.com/files/ \ http://mirror.amdmi3.ru/distfiles/ diff --git a/games/jfk/Makefile b/games/jfk/Makefile index 1c47d90b0eb7..87d9699e25e3 100644 --- a/games/jfk/Makefile +++ b/games/jfk/Makefile @@ -7,7 +7,7 @@ PORTNAME= jfk PORTVERSION= 0.1.1 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= games MASTER_SITES= http://hop.at/jfk/ diff --git a/games/jfsw/Makefile b/games/jfsw/Makefile index 96daa4335aea..b40c491e1ee3 100644 --- a/games/jfsw/Makefile +++ b/games/jfsw/Makefile @@ -6,7 +6,7 @@ PORTNAME= jfsw PORTVERSION= 20051009 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://users.on.net/~jonof/buildport/ DISTFILES= ${PORTNAME}_src_${PORTVERSION}.zip \ diff --git a/games/jigzo/Makefile b/games/jigzo/Makefile index 3841dc02caa2..89fd75a23a1f 100644 --- a/games/jigzo/Makefile +++ b/games/jigzo/Makefile @@ -7,7 +7,7 @@ PORTNAME= jigzo PORTVERSION= 0.6.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games MASTER_SITES= http://www.iua.upf.es/~mdeboer/resorama/jigzo/ \ http://mirror.amdmi3.ru/distfiles/ @@ -16,7 +16,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= amdmi3@FreeBSD.org COMMENT= An OpenGL jigsaw puzzle game -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ jpeg.11:${PORTSDIR}/graphics/jpeg USE_SDL= sdl mixer diff --git a/games/joequake/Makefile b/games/joequake/Makefile index 63460f5fb1fa..0c2b46676a5a 100644 --- a/games/joequake/Makefile +++ b/games/joequake/Makefile @@ -7,7 +7,7 @@ PORTNAME= joequake PORTVERSION= 0.15b1329 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games MASTER_SITES= http://joequake.runecentral.com/ DISTNAME= ${PORTNAME}-v${PORTVERSION}-source @@ -18,7 +18,7 @@ DIST_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= Improved NQ engine with ZQuake and FuhQuake graphical effects -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png WRKSRC= ${WRKDIR}/src diff --git a/games/jools/Makefile b/games/jools/Makefile index 4ba5d077ae9f..22a44a2b9bb8 100644 --- a/games/jools/Makefile +++ b/games/jools/Makefile @@ -6,7 +6,7 @@ PORTNAME= jools PORTVERSION= 0.20 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games MASTER_SITES= http://pessimization.com/software/jools/ diff --git a/games/kajongg/Makefile b/games/kajongg/Makefile index 6db54fa18e58..52f186af2694 100644 --- a/games/kajongg/Makefile +++ b/games/kajongg/Makefile @@ -6,6 +6,7 @@ PORTNAME= kajongg PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= games kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src diff --git a/games/kamikaze/Makefile b/games/kamikaze/Makefile index d4d02088f742..f51f522b1bad 100644 --- a/games/kamikaze/Makefile +++ b/games/kamikaze/Makefile @@ -6,6 +6,7 @@ PORTNAME= kamikaze PORTVERSION= 0.2.2 +PORTREVISION= 1 CATEGORIES= games kde MASTER_SITES= http://kamikaze.coolprojects.org/download/ diff --git a/games/kanagram/Makefile b/games/kanagram/Makefile index 1baab35fe82c..920faaad84fd 100644 --- a/games/kanagram/Makefile +++ b/games/kanagram/Makefile @@ -7,6 +7,7 @@ PORTNAME= kanagram PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= games kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src diff --git a/games/kanatest/Makefile b/games/kanatest/Makefile index d85ceec6b41a..b0328dbb64b6 100644 --- a/games/kanatest/Makefile +++ b/games/kanatest/Makefile @@ -7,6 +7,7 @@ PORTNAME= kanatest PORTVERSION= 0.4.8 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://clayo.org/kanatest/ diff --git a/games/kardsgt/Makefile b/games/kardsgt/Makefile index ae9531cb9fda..680c3c58a93e 100644 --- a/games/kardsgt/Makefile +++ b/games/kardsgt/Makefile @@ -7,7 +7,7 @@ PORTNAME= kardsgt PORTVERSION= 0.7.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SAVANNAH diff --git a/games/kartofel/Makefile b/games/kartofel/Makefile index 3dcc6c42d6e2..634b17b7bd46 100644 --- a/games/kartofel/Makefile +++ b/games/kartofel/Makefile @@ -7,7 +7,7 @@ PORTNAME= kartofel PORTVERSION= 1.2 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= games MASTER_SITES= http://kartofel.jfedor.org/downloads/ \ http://mirror.amdmi3.ru/distfiles/ diff --git a/games/kcheckers/Makefile b/games/kcheckers/Makefile index 05b3a35f594f..16c4109c4849 100644 --- a/games/kcheckers/Makefile +++ b/games/kcheckers/Makefile @@ -6,6 +6,7 @@ PORTNAME= kcheckers PORTVERSION= 0.8.1 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF/qcheckers/${PORTNAME}/${PORTVERSION} diff --git a/games/kdegames3/Makefile b/games/kdegames3/Makefile index e38a3b90bc80..ae54d0d3c726 100644 --- a/games/kdegames3/Makefile +++ b/games/kdegames3/Makefile @@ -7,7 +7,7 @@ PORTNAME= kdegames PORTVERSION= ${KDE_VERSION} -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src diff --git a/games/kdegames4/Makefile b/games/kdegames4/Makefile index 80190ccd2922..820d2dc58637 100644 --- a/games/kdegames4/Makefile +++ b/games/kdegames4/Makefile @@ -6,6 +6,7 @@ PORTNAME= kdegames PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= games kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src diff --git a/games/kfreerings/Makefile b/games/kfreerings/Makefile index e35d3f35868f..eb0d4f498599 100644 --- a/games/kfreerings/Makefile +++ b/games/kfreerings/Makefile @@ -6,7 +6,7 @@ PORTNAME= kfreerings PORTVERSION= 1.0 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= games kde MASTER_SITES= SF DISTNAME= ${PORTNAME}-${PORTVERSION:S/.b./beta/} diff --git a/games/khangman/Makefile b/games/khangman/Makefile index 9cbf0b3a6fe5..8e7980fdb9e9 100644 --- a/games/khangman/Makefile +++ b/games/khangman/Makefile @@ -7,6 +7,7 @@ PORTNAME= khangman PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= games kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src diff --git a/games/kiki/Makefile b/games/kiki/Makefile index 18bb1cf77a1a..29b8b1d2015d 100644 --- a/games/kiki/Makefile +++ b/games/kiki/Makefile @@ -7,7 +7,7 @@ PORTNAME= kiki PORTVERSION= 1.0.2 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-src/${PORTVERSION} EXTRACT_SUFX= -src.tgz diff --git a/games/klavaro/Makefile b/games/klavaro/Makefile index 6e8a01013922..5743c2ff0d74 100644 --- a/games/klavaro/Makefile +++ b/games/klavaro/Makefile @@ -7,6 +7,7 @@ PORTNAME= klavaro PORTVERSION= 1.9.3 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/ diff --git a/games/kmancala/Makefile b/games/kmancala/Makefile index 7b418e7e9b6f..df415b1f441e 100644 --- a/games/kmancala/Makefile +++ b/games/kmancala/Makefile @@ -7,7 +7,7 @@ PORTNAME= kmancala PORTVERSION= 1.0.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games kde MASTER_SITES= http://horinek.net/~dal/ \ LOCAL/makc diff --git a/games/kmastermind/Makefile b/games/kmastermind/Makefile index f63438226613..faad2cd166fa 100644 --- a/games/kmastermind/Makefile +++ b/games/kmastermind/Makefile @@ -6,7 +6,7 @@ PORTNAME= kmastermind PORTVERSION= 2.2 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= games kde MASTER_SITES= http://www.kde-apps.org/CONTENT/content-files/ DISTNAME= 20292-${PORTNAME}-${PORTVERSION} diff --git a/games/kmquake2/Makefile b/games/kmquake2/Makefile index 320d048fdaec..58956ce485ed 100644 --- a/games/kmquake2/Makefile +++ b/games/kmquake2/Makefile @@ -7,7 +7,7 @@ PORTNAME= kmquake2 PORTVERSION= 0.19 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= games MASTER_SITES= http://qudos.quakedev.com/linux/quake2/engines/KMQuake2/:src \ http://qexpo2005.quakedev.com/uploaded/54/:data \ @@ -88,7 +88,7 @@ MAKE_ENV+= KMQ2_ADDONS="${KMQ2_ADDONS:S/-1${EXTRACT_SUFX}//}" .if !defined(WITHOUT_CLIENT) || !defined(WITHOUT_SDL) LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg \ - png.6:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ vorbis.4:${PORTSDIR}/audio/libvorbis USE_OPENAL= al USE_GL= yes diff --git a/games/knights-kde4/Makefile b/games/knights-kde4/Makefile index 74b750d5261b..15531ebdfdfa 100644 --- a/games/knights-kde4/Makefile +++ b/games/knights-kde4/Makefile @@ -7,7 +7,7 @@ PORTNAME= knights PORTVERSION= 2.3.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games kde MASTER_SITES= http://dl.dropbox.com/u/2888238/Knights/ diff --git a/games/knights/Makefile b/games/knights/Makefile index ee5d12c6747d..ac97b0304451 100644 --- a/games/knights/Makefile +++ b/games/knights/Makefile @@ -7,7 +7,7 @@ PORTNAME= knights PORTVERSION= 0.6 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= games kde MASTER_SITES= SF diff --git a/games/kobodeluxe/Makefile b/games/kobodeluxe/Makefile index 0c03bf89cc28..1ff5f63a37e3 100644 --- a/games/kobodeluxe/Makefile +++ b/games/kobodeluxe/Makefile @@ -7,7 +7,7 @@ PORTNAME= kobodeluxe PORTVERSION= 0.5.1 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= games MASTER_SITES= http://olofson.net/kobodl/download/ \ http://mirror.amdmi3.ru/distfiles/ diff --git a/games/kpicframer/Makefile b/games/kpicframer/Makefile index 980566fff42a..e13ed82f2492 100644 --- a/games/kpicframer/Makefile +++ b/games/kpicframer/Makefile @@ -6,7 +6,7 @@ PORTNAME= kpicframer PORTVERSION= 0.5 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= games kde MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= arved diff --git a/games/kpictorial/Makefile b/games/kpictorial/Makefile index 49a2789917ec..9f6ce4a26e49 100644 --- a/games/kpictorial/Makefile +++ b/games/kpictorial/Makefile @@ -6,7 +6,7 @@ PORTNAME= kpictorial PORTVERSION= 0.9.1 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= games kde MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} diff --git a/games/kpuzzle/Makefile b/games/kpuzzle/Makefile index 0e1aec9706e0..9900250a109e 100644 --- a/games/kpuzzle/Makefile +++ b/games/kpuzzle/Makefile @@ -6,7 +6,7 @@ PORTNAME= kpuzzle PORTVERSION= 0.4 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= games kde MASTER_SITES= SF DISTNAME= ${PORTNAME}-${PORTVERSION}-final diff --git a/games/ksudoku/Makefile b/games/ksudoku/Makefile index 8c782121cf59..2bab12b837a6 100644 --- a/games/ksudoku/Makefile +++ b/games/ksudoku/Makefile @@ -7,7 +7,7 @@ PORTNAME= ksudoku PORTVERSION= 0.4 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games kde MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} diff --git a/games/ktritoc/Makefile b/games/ktritoc/Makefile index 652da9a5ea15..517aa90da3af 100644 --- a/games/ktritoc/Makefile +++ b/games/ktritoc/Makefile @@ -6,7 +6,7 @@ PORTNAME= ktritoc PORTVERSION= 1.0 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= games kde MASTER_SITES= http://www.heni-online.de/files/ diff --git a/games/kwappen/Makefile b/games/kwappen/Makefile index a7b0a44bbdd8..f4b59eaace62 100644 --- a/games/kwappen/Makefile +++ b/games/kwappen/Makefile @@ -6,7 +6,7 @@ PORTNAME= kwappen PORTVERSION= 1.1.5 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= games kde MASTER_SITES= http://www.lcs-chemie.de/ diff --git a/games/lander/Makefile b/games/lander/Makefile index 449cc0615b8d..95c13f8ffdc4 100644 --- a/games/lander/Makefile +++ b/games/lander/Makefile @@ -7,7 +7,7 @@ PORTNAME= lander PORTVERSION= 0.6.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://www.nickg.me.uk/files/ \ http://mirror.amdmi3.ru/distfiles/ diff --git a/games/lbreakout2/Makefile b/games/lbreakout2/Makefile index c94c019e4859..b264f02c75dd 100644 --- a/games/lbreakout2/Makefile +++ b/games/lbreakout2/Makefile @@ -7,14 +7,14 @@ PORTNAME= lbreakout2 PORTVERSION= 2.6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= SF/lgames/${PORTNAME}/${PORTVERSION} MAINTAINER= mmendez@gmail.com COMMENT= The polished successor to LBreakout -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png USE_SDL= mixer net sdl USE_GMAKE= yes @@ -24,7 +24,7 @@ CONFIGURE_ARGS= --enable-sdl-net \ --disable-nls MAKE_JOBS_SAFE= yes -CPPFLAGS+= -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15 LDFLAGS+= -L${LOCALBASE}/lib post-patch: diff --git a/games/lbreakout2/files/patch-stk.c b/games/lbreakout2/files/patch-stk.c new file mode 100644 index 000000000000..c3dace58d2c9 --- /dev/null +++ b/games/lbreakout2/files/patch-stk.c @@ -0,0 +1,35 @@ +--- gui/stk.c.orig 2005-03-28 19:18:42.000000000 +0200 ++++ gui/stk.c 2012-05-03 07:07:35.000000000 +0200 +@@ -19,6 +19,7 @@ + #include <stdarg.h> + #include <stdlib.h> + #include <png.h> ++#include <pngpriv.h> + #include "stk.h" + + //#define STK_DEBUG +@@ -54,7 +55,7 @@ + + /* Load a PNG type image from an SDL datasource */ + #define IMG_SetError SDL_SetError +-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; + +@@ -105,13 +106,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)) ) { + IMG_SetError("Error reading the PNG file."); + goto done; + } + + /* Set up the input control */ +- png_set_read_fn(png_ptr, src, png_read_data); ++ png_set_read_fn(png_ptr, src, local_png_read_data); + + /* Read PNG header info */ + png_read_info(png_ptr, info_ptr); diff --git a/games/legesmotus/Makefile b/games/legesmotus/Makefile index 54bb4cb4ca18..8255799f398f 100644 --- a/games/legesmotus/Makefile +++ b/games/legesmotus/Makefile @@ -7,7 +7,7 @@ PORTNAME= legesmotus PORTVERSION= 0.4.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SF diff --git a/games/lianliankan/Makefile b/games/lianliankan/Makefile index d6ea73b7ef8d..450d98c24452 100644 --- a/games/lianliankan/Makefile +++ b/games/lianliankan/Makefile @@ -7,7 +7,7 @@ PORTNAME= lianliankan DISTVERSION= 2.3beta1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games MASTER_SITES= SF/llk-linux/llk-linux-source/2.3beta1 DISTNAME= llk_linux-${DISTVERSION} diff --git a/games/lincity-ng/Makefile b/games/lincity-ng/Makefile index a455c1ebb9c6..2f2435a41fce 100644 --- a/games/lincity-ng/Makefile +++ b/games/lincity-ng/Makefile @@ -7,7 +7,7 @@ PORTNAME= lincity-ng PORTVERSION= 2.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_BERLIOS} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/games/lincity/Makefile b/games/lincity/Makefile index bd628de2237b..3c46acf3f25f 100644 --- a/games/lincity/Makefile +++ b/games/lincity/Makefile @@ -7,14 +7,14 @@ PORTNAME= lincity PORTVERSION= 1.13.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/Lincity%20Development%20Source/${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Rich city simulation game for X -LIB_DEPENDS= png:${PORTSDIR}/graphics/png +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png .if ${CC} == "clang" USE_CSTD= c89 diff --git a/games/liquidwar/Makefile b/games/liquidwar/Makefile index 812a74c7c0ce..6d3eac7e3696 100644 --- a/games/liquidwar/Makefile +++ b/games/liquidwar/Makefile @@ -7,7 +7,7 @@ PORTNAME= liquidwar PORTVERSION= 5.6.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://liquidwar.sunsite.dk/archive/ \ ${MASTER_SITE_SAVANNAH} \ diff --git a/games/lordsawar/Makefile b/games/lordsawar/Makefile index 5d346e8eabec..f16782627697 100644 --- a/games/lordsawar/Makefile +++ b/games/lordsawar/Makefile @@ -7,7 +7,7 @@ PORTNAME= lordsawar PORTVERSION= 0.1.9 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SAVANNAH} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/games/lucidlife/Makefile b/games/lucidlife/Makefile index 764045b4abd3..32eb8fbfee0a 100644 --- a/games/lucidlife/Makefile +++ b/games/lucidlife/Makefile @@ -7,7 +7,7 @@ PORTNAME= lucidlife PORTVERSION= 0.9.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= http://offload1.icculus.org:9090/~jcspray/LucidLife/ diff --git a/games/luola/Makefile b/games/luola/Makefile index 0c721f8db69e..05e7600d0288 100644 --- a/games/luola/Makefile +++ b/games/luola/Makefile @@ -7,7 +7,7 @@ PORTNAME= luola PORTVERSION= 1.3.0 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= games MASTER_SITES= http://www.luolamies.org/software/luola/ \ http://mirror.amdmi3.ru/distfiles/ diff --git a/games/macopix/Makefile b/games/macopix/Makefile index 7a4120e50177..d36f9e72f62b 100644 --- a/games/macopix/Makefile +++ b/games/macopix/Makefile @@ -7,7 +7,7 @@ PORTNAME= macopix PORTVERSION= 1.7.4 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games MASTER_SITES= http://rosegray.sakura.ne.jp/macopix/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${RESTRICTED_FILES} @@ -15,7 +15,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${RESTRICTED_FILES} MAINTAINER= ports@FreeBSD.org COMMENT= Window sitter for X11 -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ jpeg.11:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff diff --git a/games/madbomber/Makefile b/games/madbomber/Makefile index e6ef599a085a..1116ab354ba2 100644 --- a/games/madbomber/Makefile +++ b/games/madbomber/Makefile @@ -7,7 +7,7 @@ PORTNAME= madbomber PORTVERSION= 0.2.5 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= games MASTER_SITES= ftp://ftp.billsgames.com/unix/x/madbomber/src/ diff --git a/games/mahjong/Makefile b/games/mahjong/Makefile index def0587670ce..4e070e121abb 100644 --- a/games/mahjong/Makefile +++ b/games/mahjong/Makefile @@ -8,6 +8,7 @@ PORTNAME= mahjong PORTVERSION= 1.12.1 +PORTREVISION= 1 CATEGORIES= games net MASTER_SITES= http://mahjong.julianbradfield.org/Source/%SUBDIR%/ MASTER_SITE_SUBDIR= . Old diff --git a/games/marsnomercy/Makefile b/games/marsnomercy/Makefile index b4369f802829..ede1a83261ac 100644 --- a/games/marsnomercy/Makefile +++ b/games/marsnomercy/Makefile @@ -7,7 +7,7 @@ PORTNAME= marsnomercy PORTVERSION= 0.2.1 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= games MASTER_SITES= SF/mars/mars/${PORTVERSION} DISTNAME= mars-${PORTVERSION}-src diff --git a/games/meandmyshadow/Makefile b/games/meandmyshadow/Makefile index 6a3bbe880a47..df7fc7d992af 100644 --- a/games/meandmyshadow/Makefile +++ b/games/meandmyshadow/Makefile @@ -7,6 +7,7 @@ PORTNAME= meandmyshadow PORTVERSION= 0.3 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}/ DISTNAME= ${PORTNAME}-${PORTVERSION}-src diff --git a/games/megaglest/Makefile b/games/megaglest/Makefile index 791e1791cec2..27105060fdab 100644 --- a/games/megaglest/Makefile +++ b/games/megaglest/Makefile @@ -7,7 +7,7 @@ PORTNAME= megaglest PORTVERSION= 3.5.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/current_release/ DISTNAME= ${PORTNAME}-source-${PORTVERSION}.3 @@ -17,7 +17,7 @@ COMMENT= Open source 3D real-time strategy game LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl \ jpeg.11:${PORTSDIR}/graphics/jpeg \ - png.6:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ xerces-c.27:${PORTSDIR}/textproc/xerces-c2 \ vorbis.4:${PORTSDIR}/audio/libvorbis RUN_DEPENDS= ${DATADIR}/tutorials/basic_tutorial/basic_tutorial.xml:${PORTSDIR}/games/megaglest-data @@ -33,6 +33,7 @@ USE_OPENAL= al alut USE_SDL= yes USE_WX= 2.8+ +CFLAGS+= -I${LOCALBASE}/include/libpng15 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} OPTIONS= EDITOR "Install MegaGlest Editor" off diff --git a/games/megaglest/files/patch-PNGReader.cpp b/games/megaglest/files/patch-PNGReader.cpp new file mode 100644 index 000000000000..b05496007b98 --- /dev/null +++ b/games/megaglest/files/patch-PNGReader.cpp @@ -0,0 +1,10 @@ +--- source/shared_lib/sources/graphics/PNGReader.cpp.orig 2012-05-03 20:07:04.000000000 +0200 ++++ source/shared_lib/sources/graphics/PNGReader.cpp 2012-05-03 20:07:48.000000000 +0200 +@@ -15,6 +15,7 @@ + #include "pixmap.h" + #include <stdexcept> + #include <png.h> ++#include <pngpriv.h> + #include <setjmp.h> + + #include "leak_dumper.h" diff --git a/games/memonix/Makefile b/games/memonix/Makefile index 398cac11dcf5..384e2bc4bb69 100644 --- a/games/memonix/Makefile +++ b/games/memonix/Makefile @@ -7,7 +7,7 @@ PORTNAME= memonix PORTVERSION= 1.6.070713 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= games MASTER_SITES= http://www.viewizard.com/download/ \ http://mirror.amdmi3.ru/distfiles/ diff --git a/games/meritous/Makefile b/games/meritous/Makefile index 4e1d08b0b771..c0259d2c43ad 100644 --- a/games/meritous/Makefile +++ b/games/meritous/Makefile @@ -7,7 +7,7 @@ PORTNAME= meritous PORTVERSION= 1.2 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= games MASTER_SITES= http://www.asceai.net/files/ \ http://mirror.amdmi3.ru/distfiles/ diff --git a/games/minetest/Makefile b/games/minetest/Makefile index 812a542ca733..cc20b775ee6f 100644 --- a/games/minetest/Makefile +++ b/games/minetest/Makefile @@ -7,6 +7,7 @@ PORTNAME= minetest DISTVERSION= 0.4.dev-20120122-1 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://mirror.amdmi3.ru/distfiles/ @@ -51,7 +52,7 @@ CXXFLAGS+= -O3 -ffast-math -fomit-frame-pointer -funroll-loops .if !defined(WITHOUT_CLIENT) USE_GL= gl LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg \ - png.6:${PORTSDIR}/graphics/png + png15:${PORTSDIR}/graphics/png CMAKE_ARGS+= -DBUILD_CLIENT=1 PLIST_SUB+= CLIENT="" .else diff --git a/games/mirrormagic/Makefile b/games/mirrormagic/Makefile index 988e46d196fc..7bdad5fe8568 100644 --- a/games/mirrormagic/Makefile +++ b/games/mirrormagic/Makefile @@ -7,7 +7,7 @@ PORTNAME= mirrormagic PORTVERSION= 2.0.2 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= games MASTER_SITES= http://www.artsoft.org/RELEASES/unix/mirrormagic/ \ http://mirror.amdmi3.ru/distfiles/ diff --git a/games/mkhexgrid/Makefile b/games/mkhexgrid/Makefile index 1adcf3960a73..998330a50ba1 100644 --- a/games/mkhexgrid/Makefile +++ b/games/mkhexgrid/Makefile @@ -7,7 +7,7 @@ PORTNAME= mkhexgrid PORTVERSION= 0.1.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games MASTER_SITES= http://www.nomic.net/~uckelman/mkhexgrid/releases/ \ http://aaron.daltons.ca/freebsd/ diff --git a/games/monkeybubble/Makefile b/games/monkeybubble/Makefile index 330cb11a4540..9ec583d75318 100644 --- a/games/monkeybubble/Makefile +++ b/games/monkeybubble/Makefile @@ -7,7 +7,7 @@ PORTNAME= monkeybubble PORTVERSION= 0.4.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games gnome MASTER_SITES= http://home.gna.org/monkeybubble/downloads/ DISTNAME= monkey-bubble-${PORTVERSION} diff --git a/games/monster-masher/Makefile b/games/monster-masher/Makefile index 3f8b626293bc..0d8c9ce18e74 100644 --- a/games/monster-masher/Makefile +++ b/games/monster-masher/Makefile @@ -7,6 +7,7 @@ PORTNAME= monster PORTVERSION= 1.8.1 +PORTREVISION= 1 CATEGORIES= games gnome MASTER_SITES= http://people.iola.dk/olau/monster-masher/source/ PKGNAMESUFFIX= -masher diff --git a/games/monsterz/Makefile b/games/monsterz/Makefile index ab19a1dd33e5..f8d2cf1efb3e 100644 --- a/games/monsterz/Makefile +++ b/games/monsterz/Makefile @@ -7,7 +7,7 @@ PORTNAME= monsterz PORTVERSION= 0.7.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= http://sam.zoy.org/monsterz/ diff --git a/games/moonlander/Makefile b/games/moonlander/Makefile index 5026d3f2d1f1..1697a6f26755 100644 --- a/games/moonlander/Makefile +++ b/games/moonlander/Makefile @@ -7,7 +7,7 @@ PORTNAME= moonlander PORTVERSION= 1.0 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_DEBIAN} MASTER_SITE_SUBDIR=pool/main/m/moon-lander diff --git a/games/motogt/Makefile b/games/motogt/Makefile index 0d501e423ddd..a3182d3bac94 100644 --- a/games/motogt/Makefile +++ b/games/motogt/Makefile @@ -7,7 +7,7 @@ PORTNAME= motogt PORTVERSION= 20110505 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SF/motogt/ DISTNAME= MotoGT-${PORTVERSION} @@ -16,7 +16,7 @@ MAINTAINER= amdmi3@FreeBSD.org COMMENT= 2D top-viewed motorcycle racing game LIB_DEPENDS= sfml-system.1:${PORTSDIR}/devel/sfml \ - png.6:${PORTSDIR}/graphics/png + png15:${PORTSDIR}/graphics/png LICENSE= GPLv2 CCbySA LICENSE_COMB= multi @@ -29,6 +29,7 @@ USE_ZIP= yes BUILD_WRKSRC= ${WRKSRC}/src MAKEFILE= Makefile.lnx MAKE_JOBS_UNSAFE= yes +CFLAGS+= -I${LOCALBASE}/include/libpng15 MAKE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}" SUB_FILES= motogt diff --git a/games/motogt/files/patch-src-MakeData.cpp b/games/motogt/files/patch-src-MakeData.cpp index d9ef4fa1299d..6f5cafff82cd 100644 --- a/games/motogt/files/patch-src-MakeData.cpp +++ b/games/motogt/files/patch-src-MakeData.cpp @@ -1,14 +1,16 @@ ---- src/MakeData.cpp.orig 2011-01-10 20:40:30.000000000 +0300 -+++ src/MakeData.cpp 2011-09-26 23:15:04.000000000 +0400 -@@ -5,6 +5,7 @@ +--- src/MakeData.cpp.orig 2011-01-10 18:40:30.000000000 +0100 ++++ src/MakeData.cpp 2012-05-03 20:21:33.000000000 +0200 +@@ -4,7 +4,9 @@ + #include <cstdio> #define PNG_DEBUG 3 #include <png.h> ++#include <pngpriv.h> #include <fstream> +#include <sys/stat.h> #include "global.h" #include "Config.h" #include "Confirm.h" -@@ -376,7 +377,12 @@ +@@ -376,7 +378,12 @@ } fname[2]='0'+i; fname[1]='0'+j; diff --git a/games/mt_gtk_client/Makefile b/games/mt_gtk_client/Makefile index e6c1a83ab96c..6ef7d2e7e495 100644 --- a/games/mt_gtk_client/Makefile +++ b/games/mt_gtk_client/Makefile @@ -7,7 +7,7 @@ PORTNAME= mt_gtk_client PORTVERSION= 0.1.98 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SAVANNAH} MASTER_SITE_SUBDIR= maitretarot diff --git a/games/mudmagic/Makefile b/games/mudmagic/Makefile index 0d579798f2fb..48d9c7578f56 100644 --- a/games/mudmagic/Makefile +++ b/games/mudmagic/Makefile @@ -7,7 +7,7 @@ PORTNAME= mudmagic PORTVERSION= 1.9 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= games MASTER_SITES= http://www.mudmagic.com/mud-client/downloads/ @@ -16,7 +16,7 @@ COMMENT= A GTK+ based MUD client LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl \ pcre.1:${PORTSDIR}/devel/pcre \ - png.6:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ expat:${PORTSDIR}/textproc/expat2 \ sqlite3.8:${PORTSDIR}/databases/sqlite3 diff --git a/games/naev/Makefile b/games/naev/Makefile index 8e828fbc078b..5a8273f2bc34 100644 --- a/games/naev/Makefile +++ b/games/naev/Makefile @@ -7,6 +7,7 @@ PORTNAME= naev PORTVERSION= 0.5.2 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION} \ ${MASTER_SITE_GOOGLE_CODE} @@ -15,7 +16,7 @@ DIST_SUBDIR= ${PORTNAME} MAINTAINER= acm@FreeBSD.org COMMENT= A 2d action/rpg space game -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ freetype:${PORTSDIR}/print/freetype2 RUN_DEPENDS= ${LOCALBASE}/share/${PORTNAME}/ndata-${PORTVERSION}:${PORTSDIR}/games/naev-data diff --git a/games/nazghul/Makefile b/games/nazghul/Makefile index 48dcf3503fc3..d6eca46a2db5 100644 --- a/games/nazghul/Makefile +++ b/games/nazghul/Makefile @@ -7,14 +7,14 @@ PORTNAME= nazghul PORTVERSION= 0.7.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} MAINTAINER= acm@FreeBSD.org COMMENT= A computer role-playing game engine -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png USE_SDL= sdl image mixer USE_GMAKE= yes diff --git a/games/nethack33/Makefile b/games/nethack33/Makefile index e964ef26f9a1..3ac3fd1790b6 100644 --- a/games/nethack33/Makefile +++ b/games/nethack33/Makefile @@ -7,7 +7,7 @@ PORTNAME= nethack PORTVERSION= 3.3.1 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES?= games MASTER_SITES= SF DISTNAME= ${PORTNAME}-${PORTVERSION:S/.//g} diff --git a/games/nethack34/Makefile b/games/nethack34/Makefile index cef5ba63592a..dfd3a05be614 100644 --- a/games/nethack34/Makefile +++ b/games/nethack34/Makefile @@ -7,7 +7,7 @@ PORTNAME= nethack PORTVERSION= 3.4.3 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES?= games MASTER_SITES= SF DISTNAME= ${PORTNAME}-${PORTVERSION:S/.//g}-src diff --git a/games/netpanzer/Makefile b/games/netpanzer/Makefile index 0b33c4ce2708..b214fe9d2d40 100644 --- a/games/netpanzer/Makefile +++ b/games/netpanzer/Makefile @@ -7,6 +7,7 @@ PORTNAME= netpanzer PORTVERSION= 0.8.4 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= LOCAL/madpilot/netpanzer diff --git a/games/netspades/Makefile b/games/netspades/Makefile index 8cc0fcf6f002..e4d04f5a61ae 100644 --- a/games/netspades/Makefile +++ b/games/netspades/Makefile @@ -7,7 +7,7 @@ PORTNAME= NetSpades PORTVERSION= 4.2.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games MASTER_SITES= http://www.ece.rice.edu/~brentmh/spades/ diff --git a/games/neverball/Makefile b/games/neverball/Makefile index cb26b590f901..d7321fbedfe2 100644 --- a/games/neverball/Makefile +++ b/games/neverball/Makefile @@ -7,7 +7,7 @@ PORTNAME= neverball PORTVERSION= 1.5.4 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games MASTER_SITES= http://offload1.icculus.org:9090/neverball/ \ http://offload2.icculus.org:9090/neverball/ \ @@ -16,7 +16,7 @@ MASTER_SITES= http://offload1.icculus.org:9090/neverball/ \ MAINTAINER= amdmi3@FreeBSD.org COMMENT= Tilt the floor to guide a ball through an obstacle course -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ jpeg.11:${PORTSDIR}/graphics/jpeg \ vorbis.4:${PORTSDIR}/audio/libvorbis \ physfs.1:${PORTSDIR}/devel/physfs diff --git a/games/nexuiz/Makefile b/games/nexuiz/Makefile index 9aff1de1051f..ce7da0c397c7 100644 --- a/games/nexuiz/Makefile +++ b/games/nexuiz/Makefile @@ -7,7 +7,7 @@ PORTNAME= nexuiz PORTVERSION= 2.5.2 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/NexuizRelease/Nexuiz%20${PORTVERSION} \ SF/${PORTNAME}/mappack/nexmappack_r2:mappack @@ -55,7 +55,7 @@ PLIST_SUB+= MAPPACK="@comment " .if defined(WITH_CLIENT) || defined(WITH_SDL_CLIENT) LIB_DEPENDS+= modplug.1:${PORTSDIR}/audio/libmodplug \ - png.6:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ theora.0:${PORTSDIR}/multimedia/libtheora .endif diff --git a/games/nil/Makefile b/games/nil/Makefile index 314a2cb0d0fe..3f79792f03f0 100644 --- a/games/nil/Makefile +++ b/games/nil/Makefile @@ -7,7 +7,7 @@ PORTNAME= nil DISTVERSION= 20050603-1400 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/NiL%20%28old%29/${PORTNAME}-20050603 DISTNAME= ${PORTNAME}-cvs-backup-${DISTVERSION} diff --git a/games/nimuh/Makefile b/games/nimuh/Makefile index 4f68730d6c9e..043ea12d83f5 100644 --- a/games/nimuh/Makefile +++ b/games/nimuh/Makefile @@ -7,7 +7,7 @@ PORTNAME= nimuh PORTVERSION= 1.02 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20${PORTVERSION}/Nimuh%20SRC%20%28Source%20Code%29 DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} ${PORTNAME}-data-${PORTVERSION}${EXTRACT_SUFX} diff --git a/games/ninix-aya/Makefile b/games/ninix-aya/Makefile index 415a1030a086..e250a97a7944 100644 --- a/games/ninix-aya/Makefile +++ b/games/ninix-aya/Makefile @@ -7,6 +7,7 @@ PORTNAME= ninix-aya PORTVERSION= 4.3.9 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP} MASTER_SITE_SUBDIR= ninix-aya/54987 @@ -18,7 +19,7 @@ COMMENT= Ninix-aya is a compatible with desktop mascot program "Ukagaka" LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= png:${PORTSDIR}/graphics/png +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png RUN_DEPENDS= unzip:${PORTSDIR}/archivers/unzip \ ${PYTHON_SITELIBDIR}/chardet/__init__.py:${PORTSDIR}/textproc/py-chardet \ ${PYNUMPY} \ diff --git a/games/njam/Makefile b/games/njam/Makefile index c0f4690e4e35..adb5f711bf61 100644 --- a/games/njam/Makefile +++ b/games/njam/Makefile @@ -7,7 +7,7 @@ PORTNAME= njam PORTVERSION= 1.25 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} DISTNAME= ${PORTNAME}-${PORTVERSION}-src diff --git a/games/noegnud-littlehack/Makefile b/games/noegnud-littlehack/Makefile index 01a529c6ecc9..d2a2e3138435 100644 --- a/games/noegnud-littlehack/Makefile +++ b/games/noegnud-littlehack/Makefile @@ -7,7 +7,7 @@ PORTNAME= noegnud PORTVERSION= 0.8.3 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= games MASTER_SITES= http://www.darkarts.co.za/projects/noegnud/downloads/${PORTVERSION}/:noegnud \ SF/nethack/nethack/3.4.2:nethack diff --git a/games/noegnud-nethack-deet/Makefile b/games/noegnud-nethack-deet/Makefile index 3105da0b4442..94f3e3396e13 100644 --- a/games/noegnud-nethack-deet/Makefile +++ b/games/noegnud-nethack-deet/Makefile @@ -7,7 +7,7 @@ PORTNAME= noegnud PORTVERSION= 0.8.3 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= games MASTER_SITES= http://www.darkarts.co.za/projects/noegnud/downloads/${PORTVERSION}/:noegnud \ SF/nethack/nethack/3.4.2:nethack diff --git a/games/noegnud-nethack/Makefile b/games/noegnud-nethack/Makefile index a9afdb53e314..3c62f8e34845 100644 --- a/games/noegnud-nethack/Makefile +++ b/games/noegnud-nethack/Makefile @@ -7,7 +7,7 @@ PORTNAME= noegnud PORTVERSION= 0.8.3 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= games MASTER_SITES= http://www.darkarts.co.za/projects/noegnud/downloads/${PORTVERSION}/:noegnud \ SF/nethack/nethack/3.4.3:nethack diff --git a/games/noegnud-slashem/Makefile b/games/noegnud-slashem/Makefile index d8b4b7b00b32..28220b0e36ee 100644 --- a/games/noegnud-slashem/Makefile +++ b/games/noegnud-slashem/Makefile @@ -7,7 +7,7 @@ PORTNAME= noegnud PORTVERSION= 0.8.3 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= games MASTER_SITES= http://www.darkarts.co.za/projects/noegnud/downloads/${PORTVERSION}/:noegnud \ SF/slashem/slashem-source/0.0.6E4F8:slashem diff --git a/games/nuclearchess/Makefile b/games/nuclearchess/Makefile index c52042de9769..c76e10db72c6 100644 --- a/games/nuclearchess/Makefile +++ b/games/nuclearchess/Makefile @@ -7,7 +7,7 @@ PORTNAME= nuclearchess PORTVERSION= 1.0.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games MASTER_SITES= http://www.linux-games.com/nuclearchess/ diff --git a/games/numptyphysics/Makefile b/games/numptyphysics/Makefile index 9587eca54cbd..ae9e958fba80 100644 --- a/games/numptyphysics/Makefile +++ b/games/numptyphysics/Makefile @@ -7,7 +7,7 @@ PORTNAME= numptyphysics DISTVERSION= 0.3.r20090104 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games MASTER_SITES= http://mirror.amdmi3.ru/distfiles/ \ ftp://ftp.openbsd.org/pub/OpenBSD/distfiles/ \ diff --git a/games/oolite/Makefile b/games/oolite/Makefile index 8eea3a50063c..3390ff97008b 100644 --- a/games/oolite/Makefile +++ b/games/oolite/Makefile @@ -7,6 +7,7 @@ PORTNAME= oolite PORTVERSION= 1.76 +PORTREVISION= 1 CATEGORIES= games gnustep MASTER_SITES= ${MASTER_SITE_BERLIOS} http://jens.ayton.se/oolite/deps/:js MASTER_SITE_SUBDIR= oolite-linux diff --git a/games/openalchemist/Makefile b/games/openalchemist/Makefile index 8d27a2808a5f..3ea2e38a840f 100644 --- a/games/openalchemist/Makefile +++ b/games/openalchemist/Makefile @@ -7,7 +7,7 @@ PORTNAME= openalchemist PORTVERSION= 0.3 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} DISTNAME= ${PORTNAME}-${PORTVERSION}-src @@ -24,7 +24,7 @@ LICENSE_PERMS_CCbySA= ${_LICENSE_PERMS_DEFAULT} BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip LIB_DEPENDS= clanCore-0.8:${PORTSDIR}/devel/clanlib \ jpeg.11:${PORTSDIR}/graphics/jpeg \ - png.6:${PORTSDIR}/graphics/png + png15:${PORTSDIR}/graphics/png USE_AUTOTOOLS= aclocal automake autoconf # Necessary to find pkg.m4 (PKG_CHECK_MODULES) diff --git a/games/opencity/Makefile b/games/opencity/Makefile index b646b9e754f9..19fa5ce6d945 100644 --- a/games/opencity/Makefile +++ b/games/opencity/Makefile @@ -7,7 +7,7 @@ PORTNAME= opencity PORTVERSION= 0.0.6.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/Stable/${PORTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+)\..*$/\1/}/ DISTNAME= ${PORTNAME}-${PORTVERSION}stable diff --git a/games/openlierox/Makefile b/games/openlierox/Makefile index fb64d10a0a26..8172f8e014fa 100644 --- a/games/openlierox/Makefile +++ b/games/openlierox/Makefile @@ -7,7 +7,7 @@ PORTNAME= openlierox DISTVERSION= 0.59_beta9 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/OpenLieroX%20${DISTVERSION:C/_/%20/} DISTNAME= OpenLieroX_${DISTVERSION}.src diff --git a/games/openmortal/Makefile b/games/openmortal/Makefile index f17c06df4a7b..9b702f4701ed 100644 --- a/games/openmortal/Makefile +++ b/games/openmortal/Makefile @@ -7,7 +7,7 @@ PORTNAME= openmortal PORTVERSION= 0.7 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= games MASTER_SITES= SF diff --git a/games/openpref/Makefile b/games/openpref/Makefile index cbab677e0cd4..825c939a5884 100644 --- a/games/openpref/Makefile +++ b/games/openpref/Makefile @@ -7,6 +7,7 @@ PORTNAME= openpref PORTVERSION= 0.1.3 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/OpenPref-Qt4/${PORTNAME}-${PORTVERSION} diff --git a/games/opensonic/Makefile b/games/opensonic/Makefile index 3aeec8e55dac..cfa63f17b97b 100644 --- a/games/opensonic/Makefile +++ b/games/opensonic/Makefile @@ -7,7 +7,7 @@ PORTNAME= opensonic PORTVERSION= 0.1.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SF/opensnc/Open%20Sonic/${PORTVERSION} DISTNAME= opensnc-src${PORTVERSION} diff --git a/games/openssn/Makefile b/games/openssn/Makefile index 26b31db372a3..d208f9300789 100644 --- a/games/openssn/Makefile +++ b/games/openssn/Makefile @@ -7,7 +7,7 @@ PORTNAME= openssn PORTVERSION= 0.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION} diff --git a/games/openttd/Makefile b/games/openttd/Makefile index 2fecc7656a2d..e1c8cdb03629 100644 --- a/games/openttd/Makefile +++ b/games/openttd/Makefile @@ -7,7 +7,7 @@ PORTNAME= openttd PORTVERSION= 1.1.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://gb.binaries.openttd.org/binaries/releases/${PORTVERSION}/ \ http://ftp.snt.utwente.nl/pub/games/openttd/binaries/releases/${PORTVERSION}/ \ @@ -20,7 +20,7 @@ COMMENT= An open source clone of Microprose Transport Tycoon Deluxe LICENSE= GPLv2 -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ lzo2.2:${PORTSDIR}/archivers/lzo2 USE_XZ= yes diff --git a/games/openyahtzee/Makefile b/games/openyahtzee/Makefile index 6f95983a9b45..192284d0af69 100644 --- a/games/openyahtzee/Makefile +++ b/games/openyahtzee/Makefile @@ -7,6 +7,7 @@ PORTNAME= openyahtzee PORTVERSION= 1.9.1 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/Open%20Yahtzee/Open%20Yahtzee%20${PORTVERSION} diff --git a/games/optimax/Makefile b/games/optimax/Makefile index 689dd6570400..b08e9f458d42 100644 --- a/games/optimax/Makefile +++ b/games/optimax/Makefile @@ -7,7 +7,7 @@ PORTNAME= optimax PORTVERSION= 0.63 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= http://www.corewar.info/optimax/dload/ DISTNAME= ${PORTNAME}${PORTVERSION:S/.//}_unix diff --git a/games/orbital_eunuchs_sniper/Makefile b/games/orbital_eunuchs_sniper/Makefile index 96cd3b4b37b7..7be732f26efe 100644 --- a/games/orbital_eunuchs_sniper/Makefile +++ b/games/orbital_eunuchs_sniper/Makefile @@ -7,7 +7,7 @@ PORTNAME= orbital_eunuchs_sniper PORTVERSION= 1.30 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games MASTER_SITES= http://offload2.icculus.org:9090/oes/ \ http://offload1.icculus.org:9090/oes/ diff --git a/games/osgg/Makefile b/games/osgg/Makefile index 8d85aa4fa7b6..2ba648dc36eb 100644 --- a/games/osgg/Makefile +++ b/games/osgg/Makefile @@ -7,7 +7,7 @@ PORTNAME= osgg PORTVERSION= 0.99 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games MASTER_SITES= SF diff --git a/games/paintown/Makefile b/games/paintown/Makefile index 470a764d6404..bb351fe9d295 100644 --- a/games/paintown/Makefile +++ b/games/paintown/Makefile @@ -7,7 +7,7 @@ PORTNAME= paintown PORTVERSION= 3.5.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SF @@ -18,7 +18,7 @@ LICENSE= BSD LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS+= alleg.42:${PORTSDIR}/devel/allegro \ - png.6:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ freetype:${PORTSDIR}/print/freetype2 USE_SCONS= yes diff --git a/games/paintown/files/patch-IMG_png.c b/games/paintown/files/patch-IMG_png.c new file mode 100644 index 000000000000..fce0773fe601 --- /dev/null +++ b/games/paintown/files/patch-IMG_png.c @@ -0,0 +1,35 @@ +--- 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 new file mode 100644 index 000000000000..b16cb6c054f0 --- /dev/null +++ b/games/paintown/files/patch-IMG_savepng.c @@ -0,0 +1,28 @@ +--- 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/palomino/Makefile b/games/palomino/Makefile index 232b0f6b4287..eeb670e0665e 100644 --- a/games/palomino/Makefile +++ b/games/palomino/Makefile @@ -7,7 +7,7 @@ PORTNAME= palomino PORTVERSION= 20120310 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= ftp://ftp.palomino3d.org/sim/ DISTFILES= ${PORTNAME}_src_${PORTVERSION}.txz \ diff --git a/games/peg-e/Makefile b/games/peg-e/Makefile index 46836245caac..49d063c7b6a1 100644 --- a/games/peg-e/Makefile +++ b/games/peg-e/Makefile @@ -7,7 +7,7 @@ PORTNAME= peg-e PORTVERSION= 1.1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://gottcode.org/peg-e/ \ http://mirror.amdmi3.ru/distfiles/ diff --git a/games/pengpong/Makefile b/games/pengpong/Makefile index edb39ebea069..2844fb42db5a 100644 --- a/games/pengpong/Makefile +++ b/games/pengpong/Makefile @@ -7,7 +7,7 @@ PORTNAME= pengpong PORTVERSION= 0.3 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}-linux diff --git a/games/penguin-command/Makefile b/games/penguin-command/Makefile index db720f8e41c4..f6bd7fa400a5 100644 --- a/games/penguin-command/Makefile +++ b/games/penguin-command/Makefile @@ -7,14 +7,14 @@ PORTNAME= penguin-command PORTVERSION= 1.6.11 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= games MASTER_SITES= SF MAINTAINER= amdmi3@FreeBSD.org COMMENT= A clone of the classic game Missile Command -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ jpeg.11:${PORTSDIR}/graphics/jpeg USE_SDL= mixer image sdl diff --git a/games/pets/Makefile b/games/pets/Makefile index 99a92ba56eb2..4bb752323f74 100644 --- a/games/pets/Makefile +++ b/games/pets/Makefile @@ -8,7 +8,7 @@ PORTNAME= pets PORTVERSION= 1.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games MASTER_SITES= http://www.loria.fr/~rougier/pub/Software/ diff --git a/games/phlipple/Makefile b/games/phlipple/Makefile index fc6522fe67d1..5275f4aa00e7 100644 --- a/games/phlipple/Makefile +++ b/games/phlipple/Makefile @@ -7,7 +7,7 @@ PORTNAME= phlipple PORTVERSION= 0.8.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SF/${PORTNAME} diff --git a/games/pinball/Makefile b/games/pinball/Makefile index dc74c3a674ad..e6f9ed739f76 100644 --- a/games/pinball/Makefile +++ b/games/pinball/Makefile @@ -7,7 +7,7 @@ PORTNAME= pinball PORTVERSION= 0.3.1 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} diff --git a/games/pinedit/Makefile b/games/pinedit/Makefile index b39845b382af..24c39f8ea2a1 100644 --- a/games/pinedit/Makefile +++ b/games/pinedit/Makefile @@ -7,7 +7,7 @@ PORTNAME= pinedit PORTVERSION= 0.3.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SF/pinball/${PORTNAME}/${PORTNAME}-${PORTVERSION} diff --git a/games/pingus/Makefile b/games/pingus/Makefile index 09fa59829eb5..c151dfb8ef0c 100644 --- a/games/pingus/Makefile +++ b/games/pingus/Makefile @@ -7,14 +7,14 @@ PORTNAME= pingus PORTVERSION= 0.7.2 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= games MASTER_SITES= http://pingus.seul.org/files/ MAINTAINER= acm@FreeBSD.org COMMENT= Free Lemmings-like game -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ boost_regex.4:${PORTSDIR}/devel/boost-libs \ physfs.1:${PORTSDIR}/devel/physfs diff --git a/games/pingus/files/patch-src-screenshot.cpp b/games/pingus/files/patch-src-screenshot.cpp new file mode 100644 index 000000000000..4f6cc17dd13e --- /dev/null +++ b/games/pingus/files/patch-src-screenshot.cpp @@ -0,0 +1,11 @@ +--- src/screenshot.cpp.orig 2007-09-30 18:07:08.000000000 +0200 ++++ src/screenshot.cpp 2012-04-29 06:49:26.000000000 +0200 +@@ -159,7 +159,7 @@ + return; + } + +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + // If we get here, we had a problem reading the file + fclose(fp); diff --git a/games/pink-pony/Makefile b/games/pink-pony/Makefile index fd254e969f9f..fd6a35800ded 100644 --- a/games/pink-pony/Makefile +++ b/games/pink-pony/Makefile @@ -7,7 +7,7 @@ PORTNAME= pink-pony PORTVERSION= 1.2.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= games MASTER_SITES= GOOGLE_CODE \ http://mirror.amdmi3.ru/distfiles/ diff --git a/games/pioneers/Makefile b/games/pioneers/Makefile index b07393b37ebe..4a3013afa2a5 100644 --- a/games/pioneers/Makefile +++ b/games/pioneers/Makefile @@ -7,7 +7,7 @@ PORTNAME= pioneers PORTVERSION= 0.12.5 -#PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= games gnome MASTER_SITES= SF/pio/Source/ diff --git a/games/pipenightdreams/Makefile b/games/pipenightdreams/Makefile index b93ee7956ba5..09a2f095ca5d 100644 --- a/games/pipenightdreams/Makefile +++ b/games/pipenightdreams/Makefile @@ -7,7 +7,7 @@ PORTNAME= pipenightdreams PORTVERSION= 0.10.0 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= games MASTER_SITES= http://www.libsdl.org/projects/pipenightdreams/packages/ diff --git a/games/plutocracy/Makefile b/games/plutocracy/Makefile index 7d60a409b670..14d57869dc98 100644 --- a/games/plutocracy/Makefile +++ b/games/plutocracy/Makefile @@ -7,7 +7,7 @@ PORTNAME= plutocracy PORTVERSION= 0.0.20081229 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= http://mirror.amdmi3.ru/distfiles/ @@ -16,6 +16,8 @@ COMMENT= Multiplayer 3D economy/trade-based RTS LICENSE= GPLv2 +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png + USE_BZIP2= yes USE_SDL= sdl pango USE_GL= gl glu diff --git a/games/plutocracy/files/patch-r_surface.c b/games/plutocracy/files/patch-r_surface.c new file mode 100644 index 000000000000..c11b0240c375 --- /dev/null +++ b/games/plutocracy/files/patch-r_surface.c @@ -0,0 +1,20 @@ +--- src/render/r_surface.c.orig 2008-12-26 20:15:17.000000000 +0100 ++++ src/render/r_surface.c 2012-05-09 12:14:42.000000000 +0200 +@@ -269,7 +269,7 @@ + png_set_read_fn(png_ptr, (voidp)&file, (png_rw_ptr)user_png_read); + + /* If an error occurs in libpng, it will longjmp back here */ +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + C_warning("Error loading PNG '%s'", filename); + goto cleanup; + } +@@ -397,7 +397,7 @@ + (png_flush_ptr)user_png_flush); + + /* If an error occurs in libpng, it will longjmp back here */ +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + C_warning("Error saving PNG '%s'", filename); + goto cleanup; + } diff --git a/games/pokerth/Makefile b/games/pokerth/Makefile index 20c0fc8366fd..36034261d3b0 100644 --- a/games/pokerth/Makefile +++ b/games/pokerth/Makefile @@ -7,6 +7,7 @@ PORTNAME= pokerth PORTVERSION= 0.9.4 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R} DISTNAME= PokerTH-${PORTVERSION}-src diff --git a/games/pongix/Makefile b/games/pongix/Makefile index cef77dd07a72..a43ec6ba5b15 100644 --- a/games/pongix/Makefile +++ b/games/pongix/Makefile @@ -7,7 +7,7 @@ PORTNAME= pongix PORTVERSION= 0.4 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= games MASTER_SITES= http://www.losersjuegos.com.ar/_media/juegos/pongix/descargas/ diff --git a/games/pouetchess/Makefile b/games/pouetchess/Makefile index 6b41d1e1b04f..59f9efa4f56c 100644 --- a/games/pouetchess/Makefile +++ b/games/pouetchess/Makefile @@ -7,7 +7,7 @@ PORTNAME= pouetchess PORTVERSION= 0.1.1 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/0.11 DISTNAME= pouetChess_0.11_src diff --git a/games/ppracer/Makefile b/games/ppracer/Makefile index 12bccf610bfd..13c153e1e77c 100644 --- a/games/ppracer/Makefile +++ b/games/ppracer/Makefile @@ -7,7 +7,7 @@ PORTNAME= ppracer DISTVERSION= 0.5alpha -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_BERLIOS} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= 3D downhill racing game... kind of like TuxRacer Improved -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ freetype.9:${PORTSDIR}/print/freetype2 USE_BZIP2= yes @@ -28,7 +28,7 @@ DOS2UNIX_REGEX= .*\.(c|cpp|h) post-patch: @${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},g' \ - -e 's,libpng12,libpng14,g' ${WRKSRC}/configure + -e 's,libpng12,libpng15,g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's,RacingMode::,,' ${WRKSRC}/src/racingmode.h .include <bsd.port.mk> diff --git a/games/pushover/Makefile b/games/pushover/Makefile index 3201bb464144..3ad6bf04b3dc 100644 --- a/games/pushover/Makefile +++ b/games/pushover/Makefile @@ -7,14 +7,14 @@ PORTNAME= pushover PORTVERSION= 0.0.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/Pushover/${PORTVERSION} MAINTAINER= amdmi3@FreeBSD.org COMMENT= A puzzle game where the goal is to push over all dominoes -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/games/py-mnemosyne/Makefile b/games/py-mnemosyne/Makefile index 972d9a00b379..bd9b550ca74b 100644 --- a/games/py-mnemosyne/Makefile +++ b/games/py-mnemosyne/Makefile @@ -8,7 +8,7 @@ PORTNAME= mnemosyne PORTVERSION= 1.2.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games python MASTER_SITES= SF/${PORTNAME}-proj/${PORTNAME}/${PORTNAME:S/^m/M/}-${PORTVERSION} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/games/py-pychess/Makefile b/games/py-pychess/Makefile index e65f4f91c64a..8d1ec5fdf597 100644 --- a/games/py-pychess/Makefile +++ b/games/py-pychess/Makefile @@ -7,7 +7,7 @@ PORTNAME= pychess DISTVERSION= 0.10rc1 -PORTREVISION= 1 +PORTREVISION= 2 #PORTEPOCH= 0 CATEGORIES= games python MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \ diff --git a/games/pyawale/Makefile b/games/pyawale/Makefile index 20ff6ddabbe1..c6d92872eb87 100644 --- a/games/pyawale/Makefile +++ b/games/pyawale/Makefile @@ -7,7 +7,7 @@ PORTNAME= pyawale PORTVERSION= 0.4.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://download.gna.org/pyawale/ diff --git a/games/pydance/Makefile b/games/pydance/Makefile index 8d8e91e0c3c0..09e55c1dc336 100644 --- a/games/pydance/Makefile +++ b/games/pydance/Makefile @@ -7,7 +7,7 @@ PORTNAME= pydance PORTVERSION= 1.1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://people.freebsd.org/~sylvio/pydance/ \ http://icculus.org/pyddr/ \ diff --git a/games/pykawari/Makefile b/games/pykawari/Makefile index da95f9426e29..bebd1a45682f 100644 --- a/games/pykawari/Makefile +++ b/games/pykawari/Makefile @@ -7,7 +7,7 @@ PORTNAME= pykawari PORTVERSION= 8.2.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= SF/kawari/kawari/${PORTVERSION} DISTNAME= kawari-${PORTVERSION:S/.//g} diff --git a/games/pysycache/Makefile b/games/pysycache/Makefile index dd47dd6668ec..250320ecef6e 100644 --- a/games/pysycache/Makefile +++ b/games/pysycache/Makefile @@ -7,7 +7,7 @@ PORTNAME= pysycache PORTVERSION= 2.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= games python MASTER_SITES= http://download.gna.org/py4childs/${PORTNAME}/v${PORTVERSION}/ DIST_SUBDIR= ${PORTNAME} diff --git a/games/q15/Makefile b/games/q15/Makefile index 44a0126e1bf3..ee2e986f4078 100644 --- a/games/q15/Makefile +++ b/games/q15/Makefile @@ -7,7 +7,7 @@ PORTNAME= q15 PORTVERSION= 1.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games MASTER_SITES= http://silversoft.net/src/ diff --git a/games/q2p/Makefile b/games/q2p/Makefile index 29c8a521d984..2fcd66094d23 100644 --- a/games/q2p/Makefile +++ b/games/q2p/Makefile @@ -7,7 +7,7 @@ PORTNAME= q2p PORTVERSION= 0.2.20061231 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= games MASTER_SITES= http://qudos.quakedev.com/linux/quake2/engines/Q2P/ DISTNAME= Q2P-0.2-2006-12-31 @@ -41,7 +41,7 @@ LIBDIR= ${PREFIX}/lib/${PORTNAME} .if !defined(WITHOUT_GLX) || !defined(WITHOUT_SDLGL) USE_GL= glu LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg \ - png.6:${PORTSDIR}/graphics/png + png15:${PORTSDIR}/graphics/png .endif .if !defined(WITHOUT_SDL) || !defined(WITHOUT_SDLGL) diff --git a/games/q2pro/Makefile b/games/q2pro/Makefile index 62388b5f1b54..583e5193606c 100644 --- a/games/q2pro/Makefile +++ b/games/q2pro/Makefile @@ -7,7 +7,7 @@ PORTNAME= q2pro PORTVERSION= ${SVN_REV} -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= alepulver @@ -68,7 +68,7 @@ PLIST_SUB+= GAME="@comment " .if !defined(WITHOUT_GL) USE_GL= yes LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg \ - png.6:${PORTSDIR}/graphics/png + png15:${PORTSDIR}/graphics/png ALL_TARGET+= ref_newgl PLIST_SUB+= GL="" .else diff --git a/games/qgo/Makefile b/games/qgo/Makefile index bc1d6c30f1be..23eb3a689198 100644 --- a/games/qgo/Makefile +++ b/games/qgo/Makefile @@ -8,7 +8,7 @@ PORTNAME= qgo PORTVERSION= 1.5.4.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R} DISTNAME= ${PORTNAME}-${PORTVERSION:R}-r${PORTVERSION:E} diff --git a/games/qnetchess/Makefile b/games/qnetchess/Makefile index 5106010a930e..59d268fe1cb4 100644 --- a/games/qnetchess/Makefile +++ b/games/qnetchess/Makefile @@ -7,7 +7,7 @@ PORTNAME= QNetChess PORTVERSION= 1.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games MASTER_SITES= http://www.silversoft.net/src/ diff --git a/games/qnetwalk/Makefile b/games/qnetwalk/Makefile index 054f027d3cc2..1f33083f2351 100644 --- a/games/qnetwalk/Makefile +++ b/games/qnetwalk/Makefile @@ -6,7 +6,7 @@ PORTNAME= qnetwalk PORTVERSION= 1.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= games MASTER_SITES= http://qt.osdn.org.ua/ \ http://mirror.amdmi3.ru/distfiles/ diff --git a/games/qonk/Makefile b/games/qonk/Makefile index 2698ed2dac74..efdb627388e0 100644 --- a/games/qonk/Makefile +++ b/games/qonk/Makefile @@ -7,7 +7,7 @@ PORTNAME= qonk PORTVERSION= 0.3.1 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} diff --git a/games/quackle/Makefile b/games/quackle/Makefile index 7e33babc0eeb..39390eec9ddb 100644 --- a/games/quackle/Makefile +++ b/games/quackle/Makefile @@ -7,6 +7,7 @@ PORTNAME= quackle PORTVERSION= 0.97 +PORTREVISION= 1 DISTVERSIONSUFFIX= -source CATEGORIES= games MASTER_SITES= http://people.csail.mit.edu/jasonkb/quackle/downloads/%SUBDIR%/ diff --git a/games/quadra/Makefile b/games/quadra/Makefile index 149a73fde0b6..5f89b0e495c6 100644 --- a/games/quadra/Makefile +++ b/games/quadra/Makefile @@ -7,6 +7,7 @@ PORTNAME= quadra PORTVERSION= 1.3.0 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://kbrandt.sdf-eu.org/FreeBSD/distfiles/ \ ftp://ftp.bsdforen.de/pub/BSDForen/distfiles/ \ @@ -15,7 +16,7 @@ MASTER_SITES= http://kbrandt.sdf-eu.org/FreeBSD/distfiles/ \ MAINTAINER= kbrandt@sdf-eu.org COMMENT= A tetris like game with multiplayer support -LIB_DEPENDS= png:${PORTSDIR}/graphics/png +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png USE_BZIP2= yes USE_SDL= sdl @@ -25,7 +26,7 @@ GNU_CONFIGURE= yes USE_GMAKE= yes MAKE_JOBS_SAFE= yes -CPPFLAGS+= -I${LOCALBASE}/include/libpng +CPPFLAGS+= -I${LOCALBASE}/include/libpng15 LDFLAGS+= -L${LOCALBASE}/lib PLIST_FILES= bin/${PORTNAME} \ diff --git a/games/quake2max/Makefile b/games/quake2max/Makefile index f8b499aed7db..c26dcf6b2a16 100644 --- a/games/quake2max/Makefile +++ b/games/quake2max/Makefile @@ -7,7 +7,7 @@ PORTNAME= quake2max PORTVERSION= 0.45 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games MASTER_SITES= http://qudos.quakedev.com/linux/quake2/engines/Quake2MaX/:src \ ${MASTER_SITE_LOCAL:S/$/:data/} @@ -48,7 +48,7 @@ Q2MAX_DATA= ${PORTNAME}.044.rar .if defined(WITH_GLX) || defined(WITH_SDLGL) LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg \ - png.6:${PORTSDIR}/graphics/png + png15:${PORTSDIR}/graphics/png USE_GL= yes .endif diff --git a/games/quake2max/files/patch-ref_gl__sul_png.c b/games/quake2max/files/patch-ref_gl__sul_png.c new file mode 100644 index 000000000000..9061bd5a9a32 --- /dev/null +++ b/games/quake2max/files/patch-ref_gl__sul_png.c @@ -0,0 +1,11 @@ +--- ref_gl/sul_png.c.orig 2005-12-27 10:57:45.000000000 +0100 ++++ ref_gl/sul_png.c 2012-04-29 06:53:31.000000000 +0200 +@@ -177,7 +177,7 @@ + return; + } + +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + png_destroy_write_struct(&png_ptr, &info_ptr); + free(rgbdata); diff --git a/games/qudos/Makefile b/games/qudos/Makefile index 18add39c6e5f..205c7d635b72 100644 --- a/games/qudos/Makefile +++ b/games/qudos/Makefile @@ -7,7 +7,7 @@ PORTNAME= qudos PORTVERSION= 0.40.1 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= games MASTER_SITES= http://qudos.quakedev.com/linux/quake2/engines/QuDos/ DISTNAME= QuDos-${PORTVERSION}-src @@ -68,7 +68,7 @@ PLIST_SUB+= ${mod}="@comment " .if !defined(WITHOUT_GLX) || !defined(WITHOUT_SDLGL) USE_GL= yes LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg \ - png.6:${PORTSDIR}/graphics/png + png15:${PORTSDIR}/graphics/png .endif .if !defined(WITHOUT_SDL) || !defined(WITHOUT_SDLGL) diff --git a/games/qudos/files/patch-src__ref_gl__gl_local.h b/games/qudos/files/patch-src__ref_gl__gl_local.h new file mode 100644 index 000000000000..aa9dce66ef0d --- /dev/null +++ b/games/qudos/files/patch-src__ref_gl__gl_local.h @@ -0,0 +1,10 @@ +--- src/ref_gl/gl_local.h.orig 2006-06-10 12:22:27.000000000 +0200 ++++ src/ref_gl/gl_local.h 2012-04-25 06:13:42.000000000 +0200 +@@ -30,6 +30,7 @@ + #include <GL/glext.h> + + #include <png.h> ++#include <zlib.h> + #include <jpeglib.h> + + #include "../client/ref.h" diff --git a/games/r1q2/Makefile b/games/r1q2/Makefile index 11be16a8ed7a..22c310e989a4 100644 --- a/games/r1q2/Makefile +++ b/games/r1q2/Makefile @@ -7,7 +7,7 @@ PORTNAME= r1q2 PORTVERSION= 7904 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= games MASTER_SITES= http://www.r1ch.net/stuff/r1q2/src/ DISTNAME= ${PORTNAME}-b${PORTVERSION}-src @@ -69,8 +69,9 @@ PLIST_SUB+= GAME="@comment " USE_GL= yes USE_SDL= sdl LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg \ - png.6:${PORTSDIR}/graphics/png + png15:${PORTSDIR}/graphics/png ALL_TARGET+= ref_gl +CFLAGS+= -I${LOCALBASE}/include/libpng15 PLIST_SUB+= REF_GL="" .else PLIST_SUB+= REF_GL="@comment " @@ -83,9 +84,6 @@ BROKEN= Does not compile on sparc64 post-patch: @${REINPLACE_CMD} -e 's|game$$(ARCH)|game|g' \ ${BUILD_WRKSRC}/game/Makefile -# Resolve name collision with jpeg-8 - ${REINPLACE_CMD} -e 's|jpeg_mem_src|local_jpeg_mem_src|' \ - ${WRKSRC}/ref_gl/gl_image.c pre-build: @${FIND} ${BUILD_WRKSRC} -type d -depth 1 -exec ${MKDIR} {}/.depends \; diff --git a/games/r1q2/files/patch-ref_gl__gl_image.c b/games/r1q2/files/patch-ref_gl__gl_image.c new file mode 100644 index 000000000000..7ce3e30e3899 --- /dev/null +++ b/games/r1q2/files/patch-ref_gl__gl_image.c @@ -0,0 +1,28 @@ +--- ref_gl/gl_image.c.orig 2012-04-29 06:56:19.000000000 +0200 ++++ ref_gl/gl_image.c 2012-04-29 06:56:40.000000000 +0200 +@@ -20,6 +20,7 @@ + + #include "gl_local.h" + #include <png.h> ++#include <pngpriv.h> + #include <jpeglib.h> + + image_t gltextures[MAX_GLTEXTURES]; +@@ -1520,7 +1521,7 @@ + cinfo->src->bytes_in_buffer -= (size_t) num_bytes; + } + +-void jpeg_mem_src (j_decompress_ptr cinfo, byte *mem, int len) ++void local_jpeg_mem_src (j_decompress_ptr cinfo, byte *mem, int len) + { + cinfo->src = (struct jpeg_source_mgr *)(*cinfo->mem->alloc_small)((j_common_ptr) cinfo, JPOOL_PERMANENT, sizeof(struct jpeg_source_mgr)); + cinfo->src->init_source = jpg_null; +@@ -1561,7 +1562,7 @@ + + cinfo.err = jpeg_std_error(&jerr); + jpeg_create_decompress(&cinfo); +- jpeg_mem_src(&cinfo, rawdata, rawsize); ++ local_jpeg_mem_src(&cinfo, rawdata, rawsize); + jpeg_read_header(&cinfo, true); + jpeg_start_decompress(&cinfo); + diff --git a/games/railroad-rampage/Makefile b/games/railroad-rampage/Makefile index 1edd1d458a3a..6dd48be8b46d 100644 --- a/games/railroad-rampage/Makefile +++ b/games/railroad-rampage/Makefile @@ -7,7 +7,7 @@ PORTNAME= railroad-rampage PORTVERSION= 1.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://mirror.amdmi3.ru/distfiles/ DISTNAME= RailroadRampage_${PORTVERSION}_Linux diff --git a/games/redeclipse/Makefile b/games/redeclipse/Makefile index 633e05d76c4e..a046dc1b5a7b 100644 --- a/games/redeclipse/Makefile +++ b/games/redeclipse/Makefile @@ -7,7 +7,7 @@ PORTNAME= redeclipse PORTVERSION= 1.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}_${PORTVERSION} DISTNAME= ${PORTNAME}_${PORTVERSION}_linux_bsd diff --git a/games/rockdodger/Makefile b/games/rockdodger/Makefile index 334419d9fb4c..6be5467282ff 100644 --- a/games/rockdodger/Makefile +++ b/games/rockdodger/Makefile @@ -7,7 +7,7 @@ PORTNAME= rockdodger PORTVERSION= 0.6.0a -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games MASTER_SITES= SF/spacerocks/spacerocks/${PORTVERSION} diff --git a/games/rtb/Makefile b/games/rtb/Makefile index 859e4e5ea0ce..9c25a0bf1099 100644 --- a/games/rtb/Makefile +++ b/games/rtb/Makefile @@ -7,7 +7,7 @@ PORTNAME= RealTimeBattle PORTVERSION= 1.0.8 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= games MASTER_SITES= SF${PORTNAME:} DISTNAME= ${PORTNAME}-${PORTVERSION}-Ext diff --git a/games/sauerbraten/Makefile b/games/sauerbraten/Makefile index c15a899d4bce..b4e04d4c8236 100644 --- a/games/sauerbraten/Makefile +++ b/games/sauerbraten/Makefile @@ -7,7 +7,7 @@ PORTNAME= sauerbraten PORTVERSION= 20100728 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/2010_07_19 DISTNAME= ${PORTNAME}_2010_07_28_justice_edition_linux diff --git a/games/scorched3d/Makefile b/games/scorched3d/Makefile index df31fd7f4a67..157ab9541d30 100644 --- a/games/scorched3d/Makefile +++ b/games/scorched3d/Makefile @@ -7,6 +7,7 @@ PORTNAME= scorched3d PORTVERSION= 0.${SCORCH_VERSION}${SCORCH_REVISION} +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Version%20${SCORCH_VERSION} DISTNAME= Scorched3D-${SCORCH_VERSION}-src @@ -19,7 +20,7 @@ LICENSE= GPLv2 LIB_DEPENDS= GLEW.1:${PORTSDIR}/graphics/glew \ vorbis.4:${PORTSDIR}/audio/libvorbis \ jpeg.11:${PORTSDIR}/graphics/jpeg \ - png.6:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ fftw3.6:${PORTSDIR}/math/fftw3 \ fftw3f.6:${PORTSDIR}/math/fftw3-float \ expat.6:${PORTSDIR}/textproc/expat2 diff --git a/games/scourge/Makefile b/games/scourge/Makefile index b045fb6d1981..fe75f126412c 100644 --- a/games/scourge/Makefile +++ b/games/scourge/Makefile @@ -7,7 +7,7 @@ PORTNAME= scourge PORTVERSION= 0.21.1 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= games MASTER_SITES= SF DISTNAME= ${PORTNAME}-${PORTVERSION:S/$/.src/} diff --git a/games/scramble/Makefile b/games/scramble/Makefile index 94c4f2c0aece..f75a3676964d 100644 --- a/games/scramble/Makefile +++ b/games/scramble/Makefile @@ -7,7 +7,7 @@ PORTNAME= scramble PORTVERSION= 0.9.5 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= games MASTER_SITES= http://www.shiftygames.com/scramble/ \ http://mirror.amdmi3.ru/distfiles/ diff --git a/games/scummvm-tools/Makefile b/games/scummvm-tools/Makefile index 8dc97bf5d6cc..11c9979b5661 100644 --- a/games/scummvm-tools/Makefile +++ b/games/scummvm-tools/Makefile @@ -7,7 +7,7 @@ PORTNAME= scummvm-tools DISTVERSION= 1.0.0rc1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games emulators MASTER_SITES= SF/scummvm/${PORTNAME}/${DISTVERSION} @@ -20,7 +20,7 @@ BUILD_DEPENDS= lame:${PORTSDIR}/audio/lame \ oggenc:${PORTSDIR}/audio/vorbis-tools \ oggdec:${PORTSDIR}/audio/vorbis-tools \ -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ vorbis.4:${PORTSDIR}/audio/libvorbis USE_BZIP2= yes @@ -31,7 +31,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} MAKE_JOBS_SAFE= yes LDFLAGS+= -L${LOCALBASE}/lib -CXXFLAGS= -I${LOCALBASE}/include +CXXFLAGS= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15 OPTIONS= WX "Build wxWidgets GUI" On diff --git a/games/scummvm-tools/files/patch-encode_dxa.cpp b/games/scummvm-tools/files/patch-encode_dxa.cpp new file mode 100644 index 000000000000..08dbb53b08d0 --- /dev/null +++ b/games/scummvm-tools/files/patch-encode_dxa.cpp @@ -0,0 +1,10 @@ +--- encode_dxa.cpp.orig 2009-08-23 15:44:34.000000000 +0200 ++++ encode_dxa.cpp 2012-04-29 06:59:57.000000000 +0200 +@@ -25,6 +25,7 @@ + #include "util.h" + + #include <png.h> ++#include <pngpriv.h> + + const uint32 typeDEXA = 0x41584544; + const uint32 typeFRAM = 0x4d415246; diff --git a/games/sdb/Makefile b/games/sdb/Makefile index f053674fbfdd..9902bcc1a328 100644 --- a/games/sdb/Makefile +++ b/games/sdb/Makefile @@ -7,7 +7,7 @@ PORTNAME= sdb PORTVERSION= 1.0.2 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= games MASTER_SITES= http://stage.gamecreation.org/shotgund/ \ http://mirror.amdmi3.ru/distfiles/ diff --git a/games/sdl-ball/Makefile b/games/sdl-ball/Makefile index b82928ad37a2..2039af142292 100644 --- a/games/sdl-ball/Makefile +++ b/games/sdl-ball/Makefile @@ -7,7 +7,7 @@ PORTNAME= sdl-ball PORTVERSION= 1.01 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games MASTER_SITES= SF diff --git a/games/sdlCC/Makefile b/games/sdlCC/Makefile index 717c78952c2c..fa5dfe888909 100644 --- a/games/sdlCC/Makefile +++ b/games/sdlCC/Makefile @@ -7,7 +7,7 @@ PORTNAME= sdlCC PORTVERSION= 0.0.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games MASTER_SITES= http://chinesecheckers.vegard2.no/ \ http://jcatki.no-ip.org/files/ diff --git a/games/sdlquake2/Makefile b/games/sdlquake2/Makefile index beae0fe9c8c7..50fe684b20b7 100644 --- a/games/sdlquake2/Makefile +++ b/games/sdlquake2/Makefile @@ -7,7 +7,7 @@ PORTNAME= sdlquake2 PORTVERSION= 0.1.4 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= games MASTER_SITES= http://koti.mbnet.fi/~turol/sdlquake2/ @@ -33,10 +33,11 @@ PLIST_SUB= LIBDIR=${LIBDIR:S/${PREFIX}\///} .if defined(WITH_CLIENT) LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg \ - png.6:${PORTSDIR}/graphics/png + png15:${PORTSDIR}/graphics/png USE_GL= yes USE_SDL= sdl MAKE_ENV+= BUILD_CLIENT=YES +CFLAGS+= -I${LOCALBASE}/include/libpng15 PLIST_SUB+= CLIENT="" .else PLIST_SUB+= CLIENT="@comment " @@ -56,11 +57,6 @@ PLIST_SUB+= GAME="" PLIST_SUB+= GAME="@comment " .endif -post-patch: -# Resolve name collision with jpeg-8 - ${REINPLACE_CMD} -e 's|jpeg_mem_src|local_jpeg_mem_src|' \ - ${WRKSRC}/gl_image.c - do-install: ${MKDIR} ${LIBDIR}/baseq2 .if defined(WITH_CLIENT) diff --git a/games/sdlquake2/files/patch-gl_image.c b/games/sdlquake2/files/patch-gl_image.c index f5cce181947b..9b4bbeef3e08 100644 --- a/games/sdlquake2/files/patch-gl_image.c +++ b/games/sdlquake2/files/patch-gl_image.c @@ -1,6 +1,14 @@ ---- ./gl_image.c.orig Thu May 19 17:56:13 2005 -+++ ./gl_image.c Sun Feb 26 11:23:56 2006 -@@ -555,7 +555,7 @@ +--- gl_image.c.orig 2005-05-19 22:56:13.000000000 +0200 ++++ gl_image.c 2012-04-29 07:01:09.000000000 +0200 +@@ -20,6 +20,7 @@ + + #include "gl_local.h" + #include <png.h> ++#include <pngpriv.h> + #include <jpeglib.h> + #include "redblack.h" + +@@ -555,7 +556,7 @@ size_t Pos; } TPngFileBuffer; @@ -9,7 +17,7 @@ { TPngFileBuffer *PngFileBuffer=(TPngFileBuffer*)png_get_io_ptr(Png); memcpy(buf,PngFileBuffer->Buffer+PngFileBuffer->Pos,size); -@@ -1007,17 +1007,17 @@ +@@ -1007,24 +1008,24 @@ ================================================================= */ @@ -30,3 +38,20 @@ { cinfo->src->next_input_byte += (size_t) num_bytes; + cinfo->src->bytes_in_buffer -= (size_t) num_bytes; + } + +-void jpeg_mem_src(j_decompress_ptr cinfo, byte *mem, int len) ++void local_jpeg_mem_src(j_decompress_ptr cinfo, byte *mem, int len) + { + cinfo->src = (struct jpeg_source_mgr *)(*cinfo->mem->alloc_small)((j_common_ptr) cinfo, JPOOL_PERMANENT, sizeof(struct jpeg_source_mgr)); + cinfo->src->init_source = jpg_null; +@@ -1065,7 +1066,7 @@ + + cinfo.err = jpeg_std_error(&jerr); + jpeg_create_decompress(&cinfo); +- jpeg_mem_src(&cinfo, rawdata, rawsize); ++ local_jpeg_mem_src(&cinfo, rawdata, rawsize); + jpeg_read_header(&cinfo, true); + jpeg_start_decompress(&cinfo); + diff --git a/games/sea-defender/Makefile b/games/sea-defender/Makefile index 3e554c145448..449bf9c14a4f 100644 --- a/games/sea-defender/Makefile +++ b/games/sea-defender/Makefile @@ -7,7 +7,7 @@ PORTNAME= sea-defender PORTVERSION= r20100723 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= http://mirror.amdmi3.ru/distfiles/ diff --git a/games/secretmaryochronicles/Makefile b/games/secretmaryochronicles/Makefile index 6ad918c14c23..971be053fdfa 100644 --- a/games/secretmaryochronicles/Makefile +++ b/games/secretmaryochronicles/Makefile @@ -7,6 +7,7 @@ PORTNAME= secretmaryochronicles PORTVERSION= 1.10.git20120512 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://mirror.amdmi3.ru/distfiles/ # SF/smclone/Secret%20Maryo%20Chronicles/${PORTVERSION} @@ -17,7 +18,7 @@ COMMENT= Secret Maryo Chronicles two-dimensional platform game LIB_DEPENDS= CEGUIBase-0.7.5.0:${PORTSDIR}/graphics/cegui \ boost_filesystem.4:${PORTSDIR}/devel/boost-libs \ - png.6:${PORTSDIR}/graphics/png + png15:${PORTSDIR}/graphics/png USE_BZIP2= yes USE_AUTOTOOLS= aclocal:env autoheader:env autoconf:env automake:env diff --git a/games/senken/Makefile b/games/senken/Makefile index f1f4bc86b938..a2da624265bc 100644 --- a/games/senken/Makefile +++ b/games/senken/Makefile @@ -6,7 +6,7 @@ PORTNAME= senken PORTVERSION= 0.3.0 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_GENTOO} MASTER_SITE_SUBDIR= distfiles diff --git a/games/shaaft/Makefile b/games/shaaft/Makefile index 4205e0dd8317..2ebd6cffd356 100644 --- a/games/shaaft/Makefile +++ b/games/shaaft/Makefile @@ -7,7 +7,7 @@ PORTNAME= shaaft PORTVERSION= 0.5.0 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= games MASTER_SITES= SF/criticalmass/OldFiles DISTNAME= Shaaft-${PORTVERSION} @@ -15,13 +15,15 @@ DISTNAME= Shaaft-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= An OpenGL 3D falling block game similar to Blockout +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png + CONFLICTS= criticalmass-* USE_BZIP2= yes USE_SDL= mixer image sdl USE_GL= yes GNU_CONFIGURE= yes -CPPFLAGS+= -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15 LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --disable-optimize DATADIR= ${PREFIX}/share/Shaaft diff --git a/games/shaaft/files/patch-PNG.cpp b/games/shaaft/files/patch-PNG.cpp new file mode 100644 index 000000000000..04a62f44fc70 --- /dev/null +++ b/games/shaaft/files/patch-PNG.cpp @@ -0,0 +1,19 @@ +--- utilssdl/PNG.cpp.orig 2003-03-03 03:32:18.000000000 +0100 ++++ utilssdl/PNG.cpp 2012-05-09 12:16:57.000000000 +0200 +@@ -13,6 +13,7 @@ + // FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details + // + #include <PNG.hpp> ++#include <pngpriv.h> + + //Save SDL surface as png + bool PNG::Save( SDL_Surface *img, const string &filename) +@@ -72,7 +73,7 @@ + return false; + } + +- if( setjmp(_png->jmpbuf)) ++ if( setjmp(png_jmpbuf(_png))) + { + fclose( fp); + png_destroy_write_struct(&_png, (png_infopp)NULL); diff --git a/games/shootingstar/Makefile b/games/shootingstar/Makefile index 8e8cef7052e5..e2807981e128 100644 --- a/games/shootingstar/Makefile +++ b/games/shootingstar/Makefile @@ -7,7 +7,7 @@ PORTNAME= shootingstar PORTVERSION= 1.2.0 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= games MASTER_SITES= http://www.2ndpoint.fi/projektit.xml/shootingstar/files/ \ http://mirror.amdmi3.ru/distfiles/ diff --git a/games/simplevaders/Makefile b/games/simplevaders/Makefile index a8e8d85a925a..b477f4335f29 100644 --- a/games/simplevaders/Makefile +++ b/games/simplevaders/Makefile @@ -7,7 +7,7 @@ PORTNAME= simplevaders PORTVERSION= 0.8 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games MASTER_SITES= http://dusted.dk/download/ \ http://mirror.amdmi3.ru/distfiles/ diff --git a/games/six/Makefile b/games/six/Makefile index 062af2adbaa3..28ad7edf2abe 100644 --- a/games/six/Makefile +++ b/games/six/Makefile @@ -6,7 +6,7 @@ PORTNAME= six PORTVERSION= 0.5.3 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games kde MASTER_SITES= http://six.retes.hu/download/ diff --git a/games/solarconquest/Makefile b/games/solarconquest/Makefile index e1c81f3e5252..919e92655623 100644 --- a/games/solarconquest/Makefile +++ b/games/solarconquest/Makefile @@ -7,7 +7,7 @@ PORTNAME= solarconquest PORTVERSION= 0.2 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= games MASTER_SITES= http://games.sajthelper.com/ \ ${MASTER_SITE_LOCAL} \ diff --git a/games/solarwolf/Makefile b/games/solarwolf/Makefile index 92f0b55da833..6c7c1ffb4cb0 100644 --- a/games/solarwolf/Makefile +++ b/games/solarwolf/Makefile @@ -7,7 +7,7 @@ PORTNAME= solarwolf PORTVERSION= 1.5 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= games MASTER_SITES= http://www.pygame.org/shredwheat/solarwolf/ diff --git a/games/sopwith/Makefile b/games/sopwith/Makefile index f9e746ae6aca..18e9435478d3 100644 --- a/games/sopwith/Makefile +++ b/games/sopwith/Makefile @@ -7,7 +7,7 @@ PORTNAME= sopwith PORTVERSION= 1.7.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= SF/sdl-${PORTNAME}/sdl_${PORTNAME}/${PORTVERSION} diff --git a/games/spacehulk/Makefile b/games/spacehulk/Makefile index 2c1073805d3e..6e2081789b2c 100644 --- a/games/spacehulk/Makefile +++ b/games/spacehulk/Makefile @@ -6,7 +6,7 @@ PORTNAME= spacehulk PORTVERSION= 1.5.b1 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= games kde MASTER_SITES= http://r.vinot.free.fr/spacehulk/ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.b1/-beta1/} diff --git a/games/spacejunk/Makefile b/games/spacejunk/Makefile index 5cab92d52094..0871e92961d7 100644 --- a/games/spacejunk/Makefile +++ b/games/spacejunk/Makefile @@ -7,7 +7,7 @@ PORTNAME= spacejunk PORTVERSION= 1.0.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} diff --git a/games/spellathon/Makefile b/games/spellathon/Makefile index abf9bbe85ac6..aa02fed411cb 100644 --- a/games/spellathon/Makefile +++ b/games/spellathon/Makefile @@ -7,6 +7,7 @@ PORTNAME= spellathon PORTVERSION= 5.79 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF diff --git a/games/spring/Makefile b/games/spring/Makefile index 94900d1b98eb..390a6066033c 100644 --- a/games/spring/Makefile +++ b/games/spring/Makefile @@ -7,7 +7,7 @@ PORTNAME= spring PORTVERSION= 0.82.7.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SF/springrts/springrts/${PORTNAME}-${PORTVERSION} DISTNAME= ${PORTNAME}_${PORTVERSION}_src diff --git a/games/springlobby/Makefile b/games/springlobby/Makefile index 83c6bbe4ee9f..cd073da8826b 100644 --- a/games/springlobby/Makefile +++ b/games/springlobby/Makefile @@ -7,6 +7,7 @@ PORTNAME= springlobby PORTVERSION= 0.143 +PORTREVISION= 1 CATEGORIES= games net MASTER_SITES= http://www.springlobby.info/tarballs/ \ http://mirror.amdmi3.ru/distfiles/ diff --git a/games/stepmania-devel/Makefile b/games/stepmania-devel/Makefile index 2af0ff260507..4e82826cd549 100644 --- a/games/stepmania-devel/Makefile +++ b/games/stepmania-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= stepmania PORTVERSION= 20071121 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/OldFiles PKGNAMESUFFIX= -devel @@ -17,7 +17,7 @@ MAINTAINER= braddo@tranceaddict.net COMMENT= Stepmania dance and rhythm game LIB_DEPENDS= mad.2:${PORTSDIR}/audio/libmad \ - png.6:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ jpeg.11:${PORTSDIR}/graphics/jpeg \ m.3:${PORTSDIR}/misc/compat5x BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip \ diff --git a/games/stonesoup/Makefile b/games/stonesoup/Makefile index fbe5fb4ab3b6..a1da99ba4e14 100644 --- a/games/stonesoup/Makefile +++ b/games/stonesoup/Makefile @@ -7,6 +7,7 @@ PORTNAME= stonesoup PORTVERSION= 0.10.2 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF/crawl-ref/Stone%20Soup/${PORTVERSION} DISTNAME= stone_soup-${PORTVERSION}-nodeps @@ -69,7 +70,7 @@ MAKE_ARGS+= TILES=y PLIST_SUB+= SDL="" PKGNAMESUFFIX= -sdl BUILD_DEPENDS+= pkg-config:${PORTSDIR}/devel/pkg-config -LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png \ +LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png \ freetype:${PORTSDIR}/print/freetype2 USE_SDL= sdl image .else diff --git a/games/stransball2/Makefile b/games/stransball2/Makefile index 3edf3c7439fd..0972dbbfe986 100644 --- a/games/stransball2/Makefile +++ b/games/stransball2/Makefile @@ -7,7 +7,7 @@ PORTNAME= stransball2 PORTVERSION= 1.5 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games MASTER_SITES= http://mirror.amdmi3.ru/distfiles/ \ http://braingames.bugreport.nl/stransball2/ diff --git a/games/stratagus/Makefile b/games/stratagus/Makefile index 060d324dd23a..f54275d67301 100644 --- a/games/stratagus/Makefile +++ b/games/stratagus/Makefile @@ -7,7 +7,7 @@ PORTNAME= stratagus PORTVERSION= 2.2.5.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://launchpadlibrarian.net/59493540/ DISTNAME= ${PORTNAME}_${PORTVERSION} @@ -16,7 +16,7 @@ EXTRACT_SUFX= .orig.tar.gz MAINTAINER= ports@FreeBSD.org COMMENT= Free cross-platform real-time strategy gaming engine -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png OPTIONS= MIKMOD "Enable Mikmod support" off \ MNG "Enable MNG support" off \ @@ -32,6 +32,7 @@ USE_AUTOTOOLS= aclocal autoheader autoconf USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-extra-includes=${LUA_INCDIR} \ + --with-extra-includes=${LOCALBASE}/include/libpng15 \ --with-extra-libs=${LUA_LIBDIR} \ --without-gles WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} diff --git a/games/stratagus/files/patch-png.cpp b/games/stratagus/files/patch-png.cpp new file mode 100644 index 000000000000..17e24efaf1c2 --- /dev/null +++ b/games/stratagus/files/patch-png.cpp @@ -0,0 +1,28 @@ +--- src/video/png.cpp.orig 2010-11-20 12:23:28.000000000 +0100 ++++ src/video/png.cpp 2012-04-29 07:12:14.000000000 +0200 +@@ -39,6 +39,7 @@ + #include <stdlib.h> + #include <string.h> + #include <png.h> ++#include <pngpriv.h> + + #include "stratagus.h" + #include "video.h" +@@ -147,7 +148,7 @@ + * 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))) { + fprintf(stderr, "Error reading the PNG file.\n"); + ret = -1; + goto done; +@@ -343,7 +344,7 @@ + return; + } + +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + /* If we get here, we had a problem reading the file */ + fclose(fp); + png_destroy_write_struct(&png_ptr, &info_ptr); diff --git a/games/stroq/Makefile b/games/stroq/Makefile index 4da4273f8b1d..cf8e15679ea3 100644 --- a/games/stroq/Makefile +++ b/games/stroq/Makefile @@ -6,7 +6,7 @@ PORTNAME= stroq PORTVERSION= 0.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20sources diff --git a/games/sumwars/Makefile b/games/sumwars/Makefile index 1266918ec427..e4863b587d86 100644 --- a/games/sumwars/Makefile +++ b/games/sumwars/Makefile @@ -7,7 +7,7 @@ PORTNAME= sumwars PORTVERSION= 0.5.5 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= SF/sumwars/${PORTVERSION} DISTNAME= sumwars-${PORTVERSION}-src diff --git a/games/super_methane_brothers/Makefile b/games/super_methane_brothers/Makefile index cda28335293c..69b8a8e108c8 100644 --- a/games/super_methane_brothers/Makefile +++ b/games/super_methane_brothers/Makefile @@ -8,7 +8,7 @@ PORTNAME= super_methane_brothers PORTVERSION= 1.4.8 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= SF/methane/Methane%20Stable/Methane%20V${PORTVERSION} DISTNAME= methane-${PORTVERSION} diff --git a/games/supertux/Makefile b/games/supertux/Makefile index d4bac0fed27d..aa16169cf435 100644 --- a/games/supertux/Makefile +++ b/games/supertux/Makefile @@ -7,7 +7,7 @@ PORTNAME= supertux PORTVERSION= 0.1.3 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_BERLIOS} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/games/supertuxkart/Makefile b/games/supertuxkart/Makefile index eb50a4ff3c9c..bb93d568505f 100644 --- a/games/supertuxkart/Makefile +++ b/games/supertuxkart/Makefile @@ -7,7 +7,7 @@ PORTNAME= supertuxkart PORTVERSION= 0.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SF/supertuxkart/SuperTuxKart/${PORTVERSION} EXTRACT_SUFX= -src.tar.bz2 diff --git a/games/taxipilot/Makefile b/games/taxipilot/Makefile index 64dac6c21913..6e13a6a7137c 100644 --- a/games/taxipilot/Makefile +++ b/games/taxipilot/Makefile @@ -6,7 +6,7 @@ PORTNAME= taxipilot PORTVERSION= 0.9.2 -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH= 1 CATEGORIES= games kde MASTER_SITES= SF diff --git a/games/tbe/Makefile b/games/tbe/Makefile index bc448fe13042..19f1d6a18e2c 100644 --- a/games/tbe/Makefile +++ b/games/tbe/Makefile @@ -7,6 +7,7 @@ PORTNAME= tbe PORTVERSION= 8.2 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/Milestone%20${PORTVERSION} DISTNAME= TheButterflyEffect-m${PORTVERSION}.src diff --git a/games/tecnoballz/Makefile b/games/tecnoballz/Makefile index b9b28f316065..93620e08a610 100644 --- a/games/tecnoballz/Makefile +++ b/games/tecnoballz/Makefile @@ -7,7 +7,7 @@ PORTNAME= tecnoballz PORTVERSION= 0.92 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= games MASTER_SITES= http://linux.tlk.fr/games/TecnoballZ/download/ \ http://mirror.amdmi3.ru/distfiles/ diff --git a/games/teg/Makefile b/games/teg/Makefile index 8ad932e57207..acf6e00bf6ae 100644 --- a/games/teg/Makefile +++ b/games/teg/Makefile @@ -7,7 +7,7 @@ PORTNAME= teg PORTVERSION= 0.11.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games gnome MASTER_SITES= SF diff --git a/games/tenebrae/Makefile b/games/tenebrae/Makefile index d37f01e52c7d..a548a6a3c500 100644 --- a/games/tenebrae/Makefile +++ b/games/tenebrae/Makefile @@ -7,7 +7,7 @@ PORTNAME= tenebrae PORTVERSION= 1.04 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= games MASTER_SITES= http://tenebrae.sourceforge.net/downloads/ DISTFILES= ${PORTNAME}_src${EXTRACT_SUFX} \ @@ -16,7 +16,7 @@ DISTFILES= ${PORTNAME}_src${EXTRACT_SUFX} \ MAINTAINER= ports@FreeBSD.org COMMENT= Quake 1 source port with advanced graphics -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png USE_ZIP= yes USE_DOS2UNIX= yes diff --git a/games/tetzle/Makefile b/games/tetzle/Makefile index 7a4e24497b94..38184a79b7d5 100644 --- a/games/tetzle/Makefile +++ b/games/tetzle/Makefile @@ -7,6 +7,7 @@ PORTNAME= tetzle PORTVERSION= 2.0.0 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://gottcode.org/tetzle/ \ http://mirror.amdmi3.ru/distfiles/ diff --git a/games/thegrind/Makefile b/games/thegrind/Makefile index cb0f8c78aec4..04e6c18024f8 100644 --- a/games/thegrind/Makefile +++ b/games/thegrind/Makefile @@ -7,6 +7,7 @@ PORTNAME= thegrind PORTVERSION= 0.1.2 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF/radius-engine/ld21/ @@ -17,7 +18,7 @@ LICENSE= GPLv2 LIB_DEPENDS= radius:${PORTSDIR}/graphics/radius-engine \ lua-5.1:${PORTSDIR}/lang/lua \ - png:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ physfs.1:${PORTSDIR}/devel/physfs RUN_DEPENDS= zip:${PORTSDIR}/archivers/zip diff --git a/games/tmw/Makefile b/games/tmw/Makefile index 145ebc7e5a04..28d257d5d0ba 100644 --- a/games/tmw/Makefile +++ b/games/tmw/Makefile @@ -7,7 +7,7 @@ PORTNAME= tmw PORTVERSION= 0.5.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SF/themanaworld/The%20Mana%20World/${PORTVERSION}/:src DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:src @@ -17,7 +17,7 @@ MAINTAINER= mva@FreeBSD.org COMMENT= A free open source 2D MMORPG in development LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2 \ - png.6:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ curl.6:${PORTSDIR}/ftp/curl \ physfs.1:${PORTSDIR}/devel/physfs BUILD_DEPENDS= guichan>=0.8.1:${PORTSDIR}/devel/guichan @@ -26,6 +26,7 @@ RUN_DEPENDS= guichan>=0.8.1:${PORTSDIR}/devel/guichan USE_CMAKE= yes USE_SDL= sdl gfx image mixer net ttf USE_BZIP2= yes +USE_GETTEXT= yes NO_WRKSUBDIR= yes DATADIR= ${PREFIX}/share/mana diff --git a/games/tomatoes/Makefile b/games/tomatoes/Makefile index f882af616f96..3e34f124d5bb 100644 --- a/games/tomatoes/Makefile +++ b/games/tomatoes/Makefile @@ -7,7 +7,7 @@ PORTNAME= tomatoes PORTVERSION= 1.5 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= games MASTER_SITES= SF DISTFILES= ${PORTNAME}-linux-src-${PORTVERSION}5${EXTRACT_SUFX} \ diff --git a/games/torcs/Makefile b/games/torcs/Makefile index 7445281cb412..c873a8c12e4f 100644 --- a/games/torcs/Makefile +++ b/games/torcs/Makefile @@ -7,6 +7,7 @@ PORTNAME= torcs DISTVERSION= 1.3.3 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/all-in-one/${PORTVERSION} @@ -16,7 +17,7 @@ COMMENT= The Open Racing Car Simulator LICENSE= GPLv2 BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ vorbis.4:${PORTSDIR}/audio/libvorbis RUN_DEPENDS= bash:${PORTSDIR}/shells/bash diff --git a/games/torrent/Makefile b/games/torrent/Makefile index 4cc366b6e1c9..7701f5d0c942 100644 --- a/games/torrent/Makefile +++ b/games/torrent/Makefile @@ -7,7 +7,7 @@ PORTNAME= torrent PORTVERSION= 0.8.2 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= games MASTER_SITES= http://www.shiftygames.com/torrent/ \ http://mirror.amdmi3.ru/distfiles/ diff --git a/games/toycars/Makefile b/games/toycars/Makefile index a39009f05144..a688586c36e4 100644 --- a/games/toycars/Makefile +++ b/games/toycars/Makefile @@ -7,7 +7,7 @@ PORTNAME= toycars PORTVERSION= 0.3.10 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= games MASTER_SITES= SF diff --git a/games/trackballs/Makefile b/games/trackballs/Makefile index 7989b12a0f40..fa2ee126d0b9 100644 --- a/games/trackballs/Makefile +++ b/games/trackballs/Makefile @@ -7,7 +7,7 @@ PORTNAME= trackballs PORTVERSION= 1.1.4 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= games MASTER_SITES= SF diff --git a/games/traindirector/Makefile b/games/traindirector/Makefile index efd89dcbdf9d..b8aea5db46fe 100644 --- a/games/traindirector/Makefile +++ b/games/traindirector/Makefile @@ -7,7 +7,7 @@ PORTNAME= traindirector PORTVERSION= 3.6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= http://www.backerstreet.com/traindir/ DISTNAME= tdir36src diff --git a/games/tremor/Makefile b/games/tremor/Makefile index 1af6486edf27..16b7b7893e0e 100644 --- a/games/tremor/Makefile +++ b/games/tremor/Makefile @@ -7,7 +7,7 @@ PORTNAME= tremor PORTVERSION= 3.2.4.1 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= games MASTER_SITES= http://qudos.quakedev.com/linux/quake1/:src \ http://tremor.quakedev.com/:data @@ -21,7 +21,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Enhanced Quake engine based on JoeQuake LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \ - png.6:${PORTSDIR}/graphics/png + png15:${PORTSDIR}/graphics/png EXTRACT_DEPENDS=unzip:${PORTSDIR}/archivers/unzip USE_BZIP2= yes @@ -91,10 +91,6 @@ post-extract: -d ${WRKDIR} .endif -post-patch: - ${REINPLACE_CMD} -e 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' \ - ${WRKSRC}/image.c - do-install: .if !defined(WITHOUT_GLX) ${INSTALL_PROGRAM} ${WRKSRC}/quake/${PORTNAME}-glx ${PREFIX}/bin diff --git a/games/tremor/files/patch-src__image.c b/games/tremor/files/patch-src__image.c new file mode 100644 index 000000000000..ed6eb370bd52 --- /dev/null +++ b/games/tremor/files/patch-src__image.c @@ -0,0 +1,37 @@ +--- image.c.orig 2005-03-25 21:39:36.000000000 +0100 ++++ image.c 2012-05-01 09:41:47.000000000 +0200 +@@ -20,6 +20,7 @@ + // image.c -- handling images + + #include "quakedef.h" ++#include "zlib.h" + + #define IMAGE_MAX_DIMENSIONS 4096 + +@@ -489,7 +490,7 @@ + return NULL; + } + +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + png_destroy_read_struct (&png_ptr, &pnginfo, NULL); + fclose (fin); +@@ -523,7 +524,7 @@ + } + + if (colortype == PNG_COLOR_TYPE_GRAY && bitdepth < 8) +- png_set_gray_1_2_4_to_8 (png_ptr); ++ png_set_expand_gray_1_2_4_to_8 (png_ptr); + + if (png_get_valid(png_ptr, pnginfo, PNG_INFO_tRNS)) + png_set_tRNS_to_alpha (png_ptr); +@@ -609,7 +610,7 @@ + return false; + } + +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + png_destroy_write_struct (&png_ptr, &info_ptr); + fclose (fp); diff --git a/games/trigger/Makefile b/games/trigger/Makefile index b7163880971a..887dac39d47f 100644 --- a/games/trigger/Makefile +++ b/games/trigger/Makefile @@ -7,7 +7,7 @@ PORTNAME= trigger PORTVERSION= 0.5.2.1 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}-rally/${PORTNAME}-rally/${PORTNAME}-${PORTVERSION} DISTFILES= trigger-${PORTVERSION}-src${EXTRACT_SUFX} \ diff --git a/games/trophy/Makefile b/games/trophy/Makefile index f697192802ac..f973d36d0ccf 100644 --- a/games/trophy/Makefile +++ b/games/trophy/Makefile @@ -7,6 +7,7 @@ PORTNAME= trophy PORTVERSION= 2.0.3 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF diff --git a/games/tuxmath/Makefile b/games/tuxmath/Makefile index 407c0806f39f..9f392b41955f 100644 --- a/games/tuxmath/Makefile +++ b/games/tuxmath/Makefile @@ -7,6 +7,7 @@ PORTNAME= tuxmath PORTVERSION= 2.0.3 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= games MASTER_SITES= http://alioth.debian.org/frs/download.php/3571/ \ diff --git a/games/tuxpaint-config/Makefile b/games/tuxpaint-config/Makefile index 9cd12b1e9a23..04642f5e9e28 100644 --- a/games/tuxpaint-config/Makefile +++ b/games/tuxpaint-config/Makefile @@ -7,6 +7,7 @@ PORTNAME= tuxpaint-config PORTVERSION= 0.0.12 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF/tuxpaint/${PORTNAME}/${PORTVERSION} diff --git a/games/tuxpaint/Makefile b/games/tuxpaint/Makefile index b7ed77309f6b..6187d643d274 100644 --- a/games/tuxpaint/Makefile +++ b/games/tuxpaint/Makefile @@ -7,7 +7,7 @@ PORTNAME= tuxpaint PORTVERSION= 0.9.21 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SF diff --git a/games/tuxpaint/files/patch-tuxpaint.c b/games/tuxpaint/files/patch-tuxpaint.c new file mode 100644 index 000000000000..69e26b6152c0 --- /dev/null +++ b/games/tuxpaint/files/patch-tuxpaint.c @@ -0,0 +1,10 @@ +--- src/tuxpaint.c.orig 2009-06-18 22:51:58.000000000 +0200 ++++ src/tuxpaint.c 2012-05-09 12:18:19.000000000 +0200 +@@ -410,6 +410,7 @@ + #endif + + #include <png.h> ++#include <pngpriv.h> + #define FNAME_EXTENSION ".png" + #ifndef PNG_H + #error "---------------------------------------------------" diff --git a/games/tuxpuck/Makefile b/games/tuxpuck/Makefile index 60414c910c03..d539eeede184 100644 --- a/games/tuxpuck/Makefile +++ b/games/tuxpuck/Makefile @@ -8,7 +8,7 @@ PORTNAME= tuxpuck PORTVERSION= 0.8.2 -PORTREVISION= 15 +PORTREVISION= 16 CATEGORIES= games MASTER_SITES= http://www.sourcefiles.org/Games/Sports/Miscellaneous/ @@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Shufflepuck Cafe Clone LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \ - png.6:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ vorbis.4:${PORTSDIR}/audio/libvorbis \ freetype.9:${PORTSDIR}/print/freetype2 @@ -25,6 +25,7 @@ USE_GMAKE= yes ALL_TARGET= tuxpuck MAKE_JOBS_UNSAFE= yes +CFLAGS+= -I${LOCALBASE}/include/libpng15 MANCOMPRESSED= yes MAN6= tuxpuck.6 PLIST_FILES= bin/tuxpuck diff --git a/games/tuxpuck/files/patch-png.c b/games/tuxpuck/files/patch-png.c new file mode 100644 index 000000000000..b548b04b8943 --- /dev/null +++ b/games/tuxpuck/files/patch-png.c @@ -0,0 +1,30 @@ +--- png.c.orig 2002-11-08 11:50:29.000000000 +0100 ++++ png.c 2012-04-30 06:40:16.000000000 +0200 +@@ -10,9 +10,10 @@ + #define MACOS + #endif + #include <png.h> ++#include <pngpriv.h> + + /* png code */ +-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; + +@@ -74,13 +75,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))) { + SDL_SetError("Error reading the PNG file."); + goto done; + } + + /* Set up the input control */ +- png_set_read_fn(png_ptr, src, png_read_data); ++ png_set_read_fn(png_ptr, src, local_png_read_data); + + /* Read PNG header info */ + png_read_info(png_ptr, info_ptr); diff --git a/games/tuxtype/Makefile b/games/tuxtype/Makefile index 4493124f8023..b9d84459d86b 100644 --- a/games/tuxtype/Makefile +++ b/games/tuxtype/Makefile @@ -7,6 +7,7 @@ PORTNAME= tuxtype PORTVERSION= 1.8.1 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://alioth.debian.org/frs/download.php/3270/ \ http://alioth.debian.org/frs/download.php/3540/:t4k_common diff --git a/games/twitch/Makefile b/games/twitch/Makefile index 9183640a2e20..f9b67c49b647 100644 --- a/games/twitch/Makefile +++ b/games/twitch/Makefile @@ -7,7 +7,7 @@ PORTNAME= twitch PORTVERSION= 1.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/Twitch/${PORTVERSION} diff --git a/games/ufoai/Makefile b/games/ufoai/Makefile index a4c41a1663f9..0376d9f91d63 100644 --- a/games/ufoai/Makefile +++ b/games/ufoai/Makefile @@ -7,7 +7,7 @@ PORTNAME= ufoai PORTVERSION= 2.3.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/UFO_AI%202.x/${PORTVERSION} DISTNAME= ${PORTNAME:S/$/-/}${PORTVERSION}-source @@ -18,7 +18,7 @@ COMMENT= A strategy game featuring tactical combat LIB_DEPENDS= vorbis:${PORTSDIR}/audio/libvorbis \ jpeg.11:${PORTSDIR}/graphics/jpeg \ - png.6:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ curl:${PORTSDIR}/ftp/curl \ execinfo:${PORTSDIR}/devel/libexecinfo \ theora.0:${PORTSDIR}/multimedia/libtheora \ diff --git a/games/ufoai/files/patch-images.c b/games/ufoai/files/patch-images.c new file mode 100644 index 000000000000..b2983addf4ba --- /dev/null +++ b/games/ufoai/files/patch-images.c @@ -0,0 +1,10 @@ +--- src/shared/images.c.orig 2010-11-29 17:46:35.000000000 +0100 ++++ src/shared/images.c 2012-04-25 06:15:32.000000000 +0200 +@@ -32,6 +32,7 @@ + + #include <jpeglib.h> + #include <png.h> ++#include <zlib.h> + + /** image formats, tried in this order */ + static char *IMAGE_TYPES[] = { "tga", "png", "jpg", NULL }; diff --git a/games/ultimatestunts/Makefile b/games/ultimatestunts/Makefile index 46e1d5422aac..ba4942934f13 100644 --- a/games/ultimatestunts/Makefile +++ b/games/ultimatestunts/Makefile @@ -7,7 +7,7 @@ PORTNAME= ultimatestunts PORTVERSION= 0.7.6.1 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONPREFIX= srcdata- DISTVERSION= ${PORTVERSION:S/.//g} CATEGORIES= games diff --git a/games/umark/Makefile b/games/umark/Makefile index 634538179eb5..1c131ae1a743 100644 --- a/games/umark/Makefile +++ b/games/umark/Makefile @@ -7,7 +7,7 @@ PORTNAME= umark DISTVERSION= 2.0.0-Beta3 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games benchmarks MASTER_SITES= SF/ut2k3botbench/UMark%20for%20Linux/2.0.0%20Beta%203 DISTNAME= UMark-for-Linux-v${DISTVERSION:S/.//g} diff --git a/games/uqm/Makefile b/games/uqm/Makefile index ffeef41a627c..1165b5ae7cde 100644 --- a/games/uqm/Makefile +++ b/games/uqm/Makefile @@ -14,7 +14,7 @@ PORTNAME= uqm PORTVERSION= 0.6.2 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= games MASTER_SITES= SF/sc2/UQM/${PORTVERSION} DISTFILES= ${PORTNAME}-${PORTVERSION}-source.tgz ${PORTNAME}-${DATAVERSION}-content.uqm diff --git a/games/vamos/Makefile b/games/vamos/Makefile index 43dd245cf415..df7671a70f9c 100644 --- a/games/vamos/Makefile +++ b/games/vamos/Makefile @@ -7,6 +7,7 @@ PORTNAME= vamos PORTVERSION= 0.7.0 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF @@ -16,7 +17,7 @@ COMMENT= An automotive simulation framework LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png USE_OPENAL= al alut USE_GL= glut diff --git a/games/vavoom/Makefile b/games/vavoom/Makefile index f451494cca3a..64e1ad9ff315 100644 --- a/games/vavoom/Makefile +++ b/games/vavoom/Makefile @@ -7,7 +7,7 @@ PORTNAME= vavoom PORTVERSION= 1.33 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/Vavoom-source/${PORTVERSION} @@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Doom, Doom II, Heretic, Hexen and Strife source port LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \ - png.6:${PORTSDIR}/graphics/png + png15:${PORTSDIR}/graphics/png USE_BZIP2= yes USE_CMAKE= yes diff --git a/games/vdrift/Makefile b/games/vdrift/Makefile index dbca88416d0b..f70f0b54a1cd 100644 --- a/games/vdrift/Makefile +++ b/games/vdrift/Makefile @@ -7,7 +7,7 @@ PORTNAME= vdrift PORTVERSION= 20100630 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${DATE_VERSION} DISTNAME= ${PORTNAME}-${DATE_VERSION}-src diff --git a/games/vectoroids/Makefile b/games/vectoroids/Makefile index d32f695b0d22..73683d12277a 100644 --- a/games/vectoroids/Makefile +++ b/games/vectoroids/Makefile @@ -7,7 +7,7 @@ PORTNAME= vectoroids PORTVERSION= 1.1.0 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= games MASTER_SITES= ftp://ftp.billsgames.com/unix/x/vectoroids/src/ diff --git a/games/vegastrike/Makefile b/games/vegastrike/Makefile index 662329ae1208..a473e70129a5 100644 --- a/games/vegastrike/Makefile +++ b/games/vegastrike/Makefile @@ -7,7 +7,7 @@ PORTNAME= vegastrike PORTVERSION= 0.5.0 -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/OldFiles DISTNAME= vegastrike-source-${PORTVERSION} diff --git a/games/violetland/Makefile b/games/violetland/Makefile index 6ab1a1589f02..03f44fca06c8 100644 --- a/games/violetland/Makefile +++ b/games/violetland/Makefile @@ -7,7 +7,7 @@ PORTNAME= violetland PORTVERSION= 0.4.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= GOOGLE_CODE \ http://mirror.amdmi3.ru/distfiles/ diff --git a/games/viruskiller/Makefile b/games/viruskiller/Makefile index a2dfa940bf5e..15c25f188979 100644 --- a/games/viruskiller/Makefile +++ b/games/viruskiller/Makefile @@ -7,7 +7,7 @@ PORTNAME= viruskiller PORTVERSION= 1.03 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= http://www.parallelrealities.co.uk/download/viruskiller/ DISTNAME= ${PORTNAME}-${PORTVERSION}-1 diff --git a/games/volleyball/Makefile b/games/volleyball/Makefile index af313c24a7d0..57af8140eecd 100644 --- a/games/volleyball/Makefile +++ b/games/volleyball/Makefile @@ -7,7 +7,7 @@ PORTNAME= volleyball PORTVERSION= 0.8.6 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= games MASTER_SITES= http://www.losersjuegos.com.ar/_media/juegos/volleyball/descargas/ \ http://mirror.amdmi3.ru/distfiles/ diff --git a/games/vor/Makefile b/games/vor/Makefile index 796378b88956..a44f53af57fa 100644 --- a/games/vor/Makefile +++ b/games/vor/Makefile @@ -7,7 +7,7 @@ PORTNAME= vor PORTVERSION= 0.5.5 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= http://qualdan.com/vor/ \ http://mirror.amdmi3.ru/distfiles/ diff --git a/games/vultures-eye/Makefile b/games/vultures-eye/Makefile index 7d5e5cfdfaab..592382ac358b 100644 --- a/games/vultures-eye/Makefile +++ b/games/vultures-eye/Makefile @@ -7,7 +7,7 @@ PORTNAME= vultures PORTVERSION= 2.1.0 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= games MASTER_SITES= http://www.darkarts.co.za/projects/vultures/attachment/wiki/downloads/${PORTVERSION}/ PKGNAMESUFFIX= -eye @@ -16,7 +16,7 @@ DISTFILES= ${DISTNAME}-full${EXTRACT_SUFX}?format=raw MAINTAINER= llwang@infor.org COMMENT= A graphical interface for NetHack 3.4.3 forked from Falcon's Eye -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png LATEST_LINK= ${PORTNAME}${PKGNAMESUFFIX} @@ -28,14 +28,10 @@ HAS_CONFIGURE= yes CONFIGURE_WRKSRC= ${WRKSRC}/sys/unix CONFIGURE_SCRIPT= setup.sh DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX} -MAKE_ENV+= DATADIR="${DATADIR}" MAKE="${GMAKE}" +CFLAGS+= -I${LOCALBASE}/include/libpng15 +MAKE_ENV+= DATADIR="${DATADIR}" MAKE="${GMAKE}" BASECFLAGS="${CFLAGS}" MAKE_JOBS_UNSAFE= yes -post-patch: - @${REINPLACE_CMD} -e \ - 's|png_infopp_NULL|NULL|g' \ - ${WRKSRC}/win/vultures/util/tiletrans.c - pre-configure: @${CHMOD} 755 ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} diff --git a/games/vultures-eye/files/patch-win-vultures-GNUmakefile b/games/vultures-eye/files/patch-win-vultures-GNUmakefile index 3219b4ebc37f..3cbbee856ce9 100644 --- a/games/vultures-eye/files/patch-win-vultures-GNUmakefile +++ b/games/vultures-eye/files/patch-win-vultures-GNUmakefile @@ -1,5 +1,5 @@ ---- win/vultures/GNUmakefile.orig Thu May 25 01:17:43 2006 -+++ win/vultures/GNUmakefile Thu May 25 01:28:16 2006 +--- win/vultures/GNUmakefile.orig 2006-06-06 21:23:29.000000000 +0200 ++++ win/vultures/GNUmakefile 2012-05-03 21:04:37.000000000 +0200 @@ -12,7 +12,7 @@ ifndef SDL_CONFIG OS := $(shell uname -s) @@ -9,3 +9,12 @@ else SDL_CONFIG := sdl-config endif +@@ -48,7 +48,7 @@ + + # objects and libs for tiletrans + TTOBJ := $(NHSRC)/monst.o $(NHSRC)/objects.o $(BUILDDIR)/util/tiletrans.o $(BUILDDIR)/util/tilespec.o +-TTCFLAGS = -g -O2 -Wall $(SDL_CFLAGS) # tiletrans uses SDL_endian.h to become endian-safe ++TTCFLAGS = -g -O2 -Wall $(BASECFLAGS) $(SDL_CFLAGS) # tiletrans uses SDL_endian.h to become endian-safe + TTLIBS := -L/usr/local/lib -lpng -lm -lz + TILESRC := ./gamedata/graphics/tilesrc + TTOUTPUT := $(BUILDDIR)/vultures_gametiles.c $(BUILDDIR)/vultures_gametiles.h gamedata/graphics/gametiles.bin diff --git a/games/vultures-eye/files/patch-win-vultures-util-tiletrans.c b/games/vultures-eye/files/patch-win-vultures-util-tiletrans.c new file mode 100644 index 000000000000..0304cc186bd6 --- /dev/null +++ b/games/vultures-eye/files/patch-win-vultures-util-tiletrans.c @@ -0,0 +1,37 @@ +--- win/vultures/util/tiletrans.c.orig 2006-06-06 21:23:19.000000000 +0200 ++++ win/vultures/util/tiletrans.c 2012-05-03 20:12:10.000000000 +0200 +@@ -9,6 +9,7 @@ + #include "tiletrans.h" + + #include "png.h" ++#include "pngpriv.h" + #include "SDL_endian.h" + + #include "config.h" +@@ -130,7 +131,7 @@ + if (info_ptr == NULL) + { + fclose(fp); +- png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL); ++ png_destroy_read_struct(&png_ptr, NULL, NULL); + return 1; + } + +@@ -138,7 +139,7 @@ + if (setjmp(png_jmpbuf(png_ptr))) + { + /* Free all of the memory associated with the png_ptr and info_ptr */ +- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL); ++ png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + fclose(fp); + /* If we get here, we had a problem reading the file */ + return 1; +@@ -181,7 +182,7 @@ + /* At this point you have read the entire image */ + + /* clean up after the read, and free any memory allocated */ +- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL); ++ png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + + /* close the file */ + fclose(fp); diff --git a/games/vultures-eye/files/patch-win-vultures-vultures_gfl.c b/games/vultures-eye/files/patch-win-vultures-vultures_gfl.c index 6d10fc13ed8c..53556f084338 100644 --- a/games/vultures-eye/files/patch-win-vultures-vultures_gfl.c +++ b/games/vultures-eye/files/patch-win-vultures-vultures_gfl.c @@ -1,6 +1,6 @@ ---- win/vultures/vultures_gfl.c.orig Tue Jun 6 21:23:28 2006 -+++ win/vultures/vultures_gfl.c Sat Jun 17 00:12:45 2006 -@@ -11,7 +11,7 @@ +--- win/vultures/vultures_gfl.c.orig 2006-06-06 21:23:28.000000000 +0200 ++++ win/vultures/vultures_gfl.c 2012-05-03 22:41:55.000000000 +0200 +@@ -11,9 +11,10 @@ #endif #include <SDL.h> @@ -8,4 +8,16 @@ +/* #include <SDL_image.h> */ #include "png.h" ++#include "pngpriv.h" + #include "vultures_gfl.h" + #include "vultures_gen.h" +@@ -73,7 +74,7 @@ + goto out; + + /* Set up error handling */ +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + goto out; + + png_set_read_fn(png_ptr, (char *)srcbuf, vultures_png_read_callback); diff --git a/games/wargus/Makefile b/games/wargus/Makefile index 0a3625e64353..21b0ff117331 100644 --- a/games/wargus/Makefile +++ b/games/wargus/Makefile @@ -7,6 +7,7 @@ PORTNAME= wargus PORTVERSION= 2.2.5.5 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://launchpadlibrarian.net/59493162/ DISTNAME= ${PORTNAME}_${PORTVERSION} @@ -15,7 +16,7 @@ EXTRACT_SUFX= .orig.tar.gz MAINTAINER= ports@FreeBSD.org COMMENT= Warcraft 2 mod that allows you to play Warcraft 2 with Stratagus -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png RUN_DEPENDS= stratagus:${PORTSDIR}/games/stratagus LICENSE= GPLv2 @@ -23,10 +24,9 @@ NOT_FOR_ARCHS= sparc64 USE_GMAKE= yes USE_GNOME= gtk20 gnomehack WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} - SUB_FILES= ${PORTNAME} pkg-message -MAKE_ARGS+= CFLAGS+=-I${LOCALBASE}/include LDFLAGS+=-L${LOCALBASE}/lib +MAKE_ARGS+= CFLAGS+="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15" LDFLAGS+=-L${LOCALBASE}/lib do-install: ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin diff --git a/games/wargus/files/patch-wartool.c b/games/wargus/files/patch-wartool.c new file mode 100644 index 000000000000..7161df10796a --- /dev/null +++ b/games/wargus/files/patch-wartool.c @@ -0,0 +1,20 @@ +--- wartool.c.orig 2010-11-22 22:44:24.000000000 +0100 ++++ wartool.c 2012-05-05 12:37:53.000000000 +0200 +@@ -62,6 +62,8 @@ + #endif + #include <ctype.h> + #include <png.h> ++#include <zlib.h> ++#include <pngpriv.h> + + #include "endian.h" + #include "xmi2mid.h" +@@ -1876,7 +1878,7 @@ + return 1; + } + +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + // FIXME: must free buffers!! + png_destroy_write_struct(&png_ptr, &info_ptr); + fclose(fp); diff --git a/games/warmux/Makefile b/games/warmux/Makefile index cddfd72e99c0..d5a6efac8153 100644 --- a/games/warmux/Makefile +++ b/games/warmux/Makefile @@ -7,7 +7,7 @@ PORTNAME= warmux DISTVERSION= 11.04.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://download.gna.org/${PORTNAME}/ \ http://download.gna.org/${PORTNAME}/archive/ diff --git a/games/warmux/files/patch-src-graphic.surface.cpp b/games/warmux/files/patch-src-graphic.surface.cpp new file mode 100644 index 000000000000..866d8818c618 --- /dev/null +++ b/games/warmux/files/patch-src-graphic.surface.cpp @@ -0,0 +1,10 @@ +--- src/graphic/surface.cpp.orig 2011-04-28 21:03:06.000000000 +0200 ++++ src/graphic/surface.cpp 2012-05-09 12:06:52.000000000 +0200 +@@ -25,6 +25,7 @@ + #include <SDL_image.h> + #include <SDL_rotozoom.h> + #include <png.h> ++#include <zlib.h> + + #include "graphic/surface.h" + #include "tool/math_tools.h" diff --git a/games/warzone2100/Makefile b/games/warzone2100/Makefile index 30ac894df76d..8397ac7de015 100644 --- a/games/warzone2100/Makefile +++ b/games/warzone2100/Makefile @@ -7,7 +7,7 @@ PORTNAME= warzone2100 PORTVERSION= 2.3.9 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/releases/${PORTVERSION}/ @@ -21,7 +21,7 @@ LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \ mad.2:${PORTSDIR}/audio/libmad \ ogg.7:${PORTSDIR}/audio/libogg \ physfs.1:${PORTSDIR}/devel/physfs \ - png.6:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ vorbis.4:${PORTSDIR}/audio/libvorbis \ GLC.0:${PORTSDIR}/graphics/quesoglc \ theora.0:${PORTSDIR}/multimedia/libtheora \ diff --git a/games/wesnoth/Makefile b/games/wesnoth/Makefile index bde61325e1e3..daab00e17998 100644 --- a/games/wesnoth/Makefile +++ b/games/wesnoth/Makefile @@ -7,7 +7,7 @@ PORTNAME= wesnoth PORTVERSION= 1.8.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}/${PORTNAME}-${PORTVERSION} \ http://files.wesnoth.org/ @@ -15,12 +15,13 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}/${PORTNAME}-${PORTVERS MAINTAINER= philip@FreeBSD.org COMMENT= A fantasy turn-based strategy game -LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost-libs - LICENSE= GPLv2 GPLv3 LICENSE_COMB= dual LICENSE_FILE= ${WRKSRC}/COPYING +LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost-libs \ + png15:${PORTSDIR}/graphics/png + CONFLICTS= wesnoth-devel-[0-9]* USE_SDL= image mixer net ttf diff --git a/games/wesnoth/files/patch-src-tools-exploder_utils.cpp b/games/wesnoth/files/patch-src-tools-exploder_utils.cpp new file mode 100644 index 000000000000..82e3f5397be3 --- /dev/null +++ b/games/wesnoth/files/patch-src-tools-exploder_utils.cpp @@ -0,0 +1,10 @@ +--- src/tools/exploder_utils.cpp.orig 2012-05-09 12:03:45.000000000 +0200 ++++ src/tools/exploder_utils.cpp 2012-05-09 12:04:21.000000000 +0200 +@@ -16,6 +16,7 @@ + #include "game_config.hpp" + #include "serialization/string_utils.hpp" + #include <png.h> ++#include <zlib.h> + + exploder_point::exploder_point(const std::string &s) + : x(0) diff --git a/games/whichwayisup/Makefile b/games/whichwayisup/Makefile index 0f2fc6b06a38..f058ac1ce0da 100644 --- a/games/whichwayisup/Makefile +++ b/games/whichwayisup/Makefile @@ -7,7 +7,7 @@ PORTNAME= whichwayisup PORTVERSION= 0.7.9 -PORTREVISION= 2 +PORTREVISION= 3 DISTVERSION= ${PORTVERSION:S/.//g} CATEGORIES= games MASTER_SITES= http://www.hectigo.net/games/whichwayisup/ diff --git a/games/widelands/Makefile b/games/widelands/Makefile index 8f46dbfef84b..9f1360f16a3f 100644 --- a/games/widelands/Makefile +++ b/games/widelands/Makefile @@ -7,7 +7,7 @@ PORTNAME= widelands DISTVERSION= build16 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= http://launchpadlibrarian.net/69520494/ \ http://mirror.amdmi3.ru/distfiles/ @@ -17,12 +17,13 @@ MAINTAINER= amdmi3@FreeBSD.org COMMENT= Realtime strategy game inspired by Settlers II LIB_DEPENDS= ggzcore.9:${PORTSDIR}/games/ggz-client-libs \ - png.6:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ GLEW.1:${PORTSDIR}/graphics/glew BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs USE_BZIP2= yes USE_CMAKE= yes +USE_GETTEXT= yes CMAKE_OUTSOURCE=yes CMAKE_ARGS= -DWL_INSTALL_PREFIX="${PREFIX}" \ -DWL_INSTALL_DATADIR="share/widelands" \ @@ -31,6 +32,7 @@ CMAKE_ARGS= -DWL_INSTALL_PREFIX="${PREFIX}" \ USE_LUA= 5.1+ USE_SDL= sdl mixer image net ttf gfx USE_PYTHON_BUILD=2.5+ +CFLAGS+= -I${LOCALBASE}/include/libpng15 MAKE_JOBS_SAFE= yes PLIST_FILES= bin/widelands diff --git a/games/widelands/files/patch-src-graphic-SDL_mng.cc b/games/widelands/files/patch-src-graphic-SDL_mng.cc new file mode 100644 index 000000000000..b7abbd1cc1e0 --- /dev/null +++ b/games/widelands/files/patch-src-graphic-SDL_mng.cc @@ -0,0 +1,35 @@ +--- src/graphic/SDL_mng.cc.orig 2011-04-15 20:40:26.000000000 +0200 ++++ src/graphic/SDL_mng.cc 2012-05-03 23:15:20.000000000 +0200 +@@ -26,6 +26,7 @@ + #include <SDL_endian.h> + + #include <png.h> ++#include <pngpriv.h> + + /* Chunk structure */ + struct chunk_t { +@@ -230,7 +231,7 @@ + } + + /* png_read_data callback; return <size> bytes from wherever */ +-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_RWread(static_cast<SDL_RWops *>(png_get_io_ptr(ctx)), area, size, 1); + } +@@ -276,13 +277,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))) { + SDL_SetError("Error reading the PNG file."); + goto done; + } + + /* Set up the input control */ +- png_set_read_fn(png_ptr, src, png_read_data); ++ png_set_read_fn(png_ptr, src, local_png_read_data); + + /* tell PNG not to read the signature */ + png_set_sig_bytes(png_ptr, 8); diff --git a/games/windstille/Makefile b/games/windstille/Makefile index 37fc658589ac..8f93bb96717a 100644 --- a/games/windstille/Makefile +++ b/games/windstille/Makefile @@ -7,7 +7,7 @@ PORTNAME= windstille PORTVERSION= 0.3.0 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= games MASTER_SITES= BERLIOS CENKES @@ -17,7 +17,7 @@ COMMENT= Classic 2D jump-n-shoot game LIB_DEPENDS= physfs.1:${PORTSDIR}/devel/physfs \ ogg.7:${PORTSDIR}/audio/libogg \ vorbis.4:${PORTSDIR}/audio/libvorbis \ - png.6:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ squirrel.0:${PORTSDIR}/lang/squirrel \ freetype.9:${PORTSDIR}/print/freetype2 BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs diff --git a/games/wop/Makefile b/games/wop/Makefile index 4d1db88d030e..6b575b86c538 100644 --- a/games/wop/Makefile +++ b/games/wop/Makefile @@ -7,7 +7,7 @@ PORTNAME= wop PORTVERSION= 0.4.3 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= games MASTER_SITES= http://wormsofprey.org/download/ \ http://mirror.amdmi3.ru/distfiles/ diff --git a/games/xblast/Makefile b/games/xblast/Makefile index 4e68d4abdb95..f3e2779b0fe5 100644 --- a/games/xblast/Makefile +++ b/games/xblast/Makefile @@ -7,7 +7,7 @@ PORTNAME= xblast PORTVERSION= 2.10.4 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/Sources/${PORTVERSION} \ SF/${PORTNAME}/Images/${IMAGES_DATE}:images \ diff --git a/games/xboard/Makefile b/games/xboard/Makefile index 015137b00f63..fc865a5bc700 100644 --- a/games/xboard/Makefile +++ b/games/xboard/Makefile @@ -7,6 +7,7 @@ PORTNAME= xboard PORTVERSION= 4.6.2 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= xboard diff --git a/games/xbubble/Makefile b/games/xbubble/Makefile index f1d384c19261..32942ddc4cb2 100644 --- a/games/xbubble/Makefile +++ b/games/xbubble/Makefile @@ -6,7 +6,7 @@ PORTNAME= xbubble PORTVERSION= 0.5.8 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_GENTOO} MASTER_SITE_SUBDIR= distfiles @@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= distfiles MAINTAINER= ports@FreeBSD.org COMMENT= Puzzle Bobble clone for Unix/X11 platforms -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png MAN6= xbubble.6 @@ -23,7 +23,7 @@ GNU_CONFIGURE= yes USE_GMAKE= yes USE_GETTEXT= yes -CPPFLAGS+= -I${LOCALBASE}/include/libpng +CPPFLAGS+= -I${LOCALBASE}/include/libpng15 LDFLAGS+= -L${LOCALBASE}/lib -lintl .include <bsd.port.mk> diff --git a/games/xbubble/files/patch-src-loadpng.c b/games/xbubble/files/patch-src-loadpng.c index d7bf605ecb2a..3a0c67cf9712 100644 --- a/games/xbubble/files/patch-src-loadpng.c +++ b/games/xbubble/files/patch-src-loadpng.c @@ -1,6 +1,14 @@ --- src/loadpng.c.orig 2003-09-30 14:55:20.000000000 +0200 -+++ src/loadpng.c 2010-03-30 12:09:13.000000000 +0200 -@@ -55,7 +55,7 @@ ++++ src/loadpng.c 2012-04-29 13:39:04.000000000 +0200 +@@ -21,6 +21,7 @@ + #include <stdio.h> + #include <stdlib.h> + #include <png.h> ++#include <pngpriv.h> + + #include "gettext.h" + +@@ -55,7 +56,7 @@ } /* ensure that we opened a PNG file */ fread( header, 1, 8, fd ); @@ -9,3 +17,12 @@ fclose(fd); fprintf(stderr,_("File %s does not have a valid PNG signature.\n"), file); return NULL; +@@ -73,7 +74,7 @@ + return NULL; + } + /* libpng does a longjmp here when it encounters an error */ +- if ( setjmp( png_ptr->jmpbuf ) ) { ++ if ( setjmp( png_jmpbuf(png_ptr) ) ) { + png_destroy_read_struct( &png_ptr, &info_ptr, NULL); + fclose(fd); + return NULL; diff --git a/games/xcowsay/Makefile b/games/xcowsay/Makefile index 23c2342331d9..7bb07cea5c85 100644 --- a/games/xcowsay/Makefile +++ b/games/xcowsay/Makefile @@ -7,6 +7,7 @@ PORTNAME= xcowsay PORTVERSION= 1.3 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://www.nickg.me.uk/files/ \ http://www.predatorlabs.net/dl/ diff --git a/games/xglk/Makefile b/games/xglk/Makefile index 5090c8793faf..f08577920af7 100644 --- a/games/xglk/Makefile +++ b/games/xglk/Makefile @@ -7,7 +7,7 @@ PORTNAME= xglk PORTVERSION= 411 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= games MASTER_SITES= http://www.ifarchive.org/if-archive/programming/glk/implementations/ DISTNAME= ${PORTNAME}-0${PORTVERSION} @@ -18,7 +18,7 @@ COMMENT= X Windows Implementation of the Glk API WRKSRC= ${WRKDIR}/${PORTNAME} -LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg png15:${PORTSDIR}/graphics/png USE_XORG= x11 diff --git a/games/xglk/files/patch-xglk_pict.c b/games/xglk/files/patch-xglk_pict.c new file mode 100644 index 000000000000..4249ca2c01c1 --- /dev/null +++ b/games/xglk/files/patch-xglk_pict.c @@ -0,0 +1,11 @@ +--- xglk_pict.c.orig 1999-08-26 20:42:12.000000000 +0200 ++++ xglk_pict.c 2012-04-29 07:14:20.000000000 +0200 +@@ -385,7 +385,7 @@ + return NULL; + } + +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + /* If we jump here, we had a problem reading the file */ + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + if (rowarray) diff --git a/games/xlogical/Makefile b/games/xlogical/Makefile index b659e7e992f0..4617c9c58459 100644 --- a/games/xlogical/Makefile +++ b/games/xlogical/Makefile @@ -7,7 +7,7 @@ PORTNAME= xlogical PORTVERSION= 1.0p8 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games MASTER_SITES= http://changeling.ixionstudios.com/xlogical/downloads/ \ http://freebsd.portsreview.info/downloads/ diff --git a/games/xmoto/Makefile b/games/xmoto/Makefile index 6f7ff5a86302..c61d8f836bf9 100644 --- a/games/xmoto/Makefile +++ b/games/xmoto/Makefile @@ -7,7 +7,7 @@ PORTNAME= xmoto PORTVERSION= 0.5.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= http://download.tuxfamily.org/xmoto/xmoto/${PORTVERSION}/ \ http://mirror.amdmi3.ru/distfiles/ @@ -16,7 +16,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-src MAINTAINER= amdmi3@FreeBSD.org COMMENT= Challenging 2D motocross platform game -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ jpeg.11:${PORTSDIR}/graphics/jpeg \ curl.6:${PORTSDIR}/ftp/curl \ xdg-basedir.2:${PORTSDIR}/x11/libxdg-basedir diff --git a/games/xmoto/files/patch-tim_png.cpp b/games/xmoto/files/patch-tim_png.cpp new file mode 100644 index 000000000000..b91bbbb515cb --- /dev/null +++ b/games/xmoto/files/patch-tim_png.cpp @@ -0,0 +1,10 @@ +--- src/image/tim_png.cpp.orig 2012-04-25 06:16:33.000000000 +0200 ++++ src/image/tim_png.cpp 2012-04-25 06:16:57.000000000 +0200 +@@ -26,6 +26,7 @@ + #include <string.h> + #include "tim.h" + #include "png.h" ++#include "zlib.h" + + /*============================================================================== + Types diff --git a/games/xonotic/Makefile b/games/xonotic/Makefile index 320fde43edfd..5328490ca053 100644 --- a/games/xonotic/Makefile +++ b/games/xonotic/Makefile @@ -7,6 +7,7 @@ PORTNAME= xonotic PORTVERSION= 0.6.0 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://hagger.rbi.informatik.uni-frankfurt.de/xonotic/ \ http://dl.xonotic.org/ @@ -15,7 +16,7 @@ MAINTAINER= amdmi3@FreeBSD.org COMMENT= A fast-paced, chaotic, and intense multiplayer first person shooter LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl \ - png.6:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ jpeg.11:${PORTSDIR}/graphics/jpeg MANUAL_PACKAGE_BUILD= huge diff --git a/games/xorgramana/Makefile b/games/xorgramana/Makefile index 4a20d9721c18..6ada83aec3d5 100644 --- a/games/xorgramana/Makefile +++ b/games/xorgramana/Makefile @@ -7,7 +7,7 @@ PORTNAME= xorgramana PORTVERSION= 0.0.8 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games MASTER_SITES= http://www.jwm-art.net/XorGramana/ \ http://mirror.amdmi3.ru/distfiles/ diff --git a/games/xpilot-ng-server/Makefile b/games/xpilot-ng-server/Makefile index a2d1d3b44c72..07e8c9a37e7c 100644 --- a/games/xpilot-ng-server/Makefile +++ b/games/xpilot-ng-server/Makefile @@ -7,7 +7,7 @@ PORTNAME= xpilot-ng PORTVERSION= 4.7.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SF/xpilot/xpilot_ng/${PORTNAME}-${PORTVERSION} PKGNAMESUFFIX?= -server diff --git a/games/xpired/Makefile b/games/xpired/Makefile index 1f78fe8c844f..0b6532052693 100644 --- a/games/xpired/Makefile +++ b/games/xpired/Makefile @@ -7,7 +7,7 @@ PORTNAME= xpired PORTVERSION= 1.22 -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-linux/${PORTVERSION} DISTNAME= ${PORTNAME}-${PORTVERSION}-linux_source diff --git a/games/xqf/Makefile b/games/xqf/Makefile index 6294d143a893..05041a02c262 100644 --- a/games/xqf/Makefile +++ b/games/xqf/Makefile @@ -7,7 +7,7 @@ PORTNAME= xqf PORTVERSION= 1.0.5 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} diff --git a/games/xscorch/Makefile b/games/xscorch/Makefile index baf853c50c8d..1db1b9f15b88 100644 --- a/games/xscorch/Makefile +++ b/games/xscorch/Makefile @@ -7,6 +7,7 @@ PORTNAME= xscorch PORTVERSION= 0.2.1 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://www.xscorch.org/releases/ diff --git a/games/xteddy/Makefile b/games/xteddy/Makefile index 6df6f91721c3..f68c3d6bf010 100644 --- a/games/xteddy/Makefile +++ b/games/xteddy/Makefile @@ -7,7 +7,7 @@ PORTNAME= xteddy PORTVERSION= 2.0.2 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= games MASTER_SITES= http://staffwww.itn.liu.se/~stegu/xteddy/ diff --git a/games/xwordpy/Makefile b/games/xwordpy/Makefile index 19a87d023f2a..21a0081f6ac5 100644 --- a/games/xwordpy/Makefile +++ b/games/xwordpy/Makefile @@ -7,7 +7,7 @@ PORTNAME= xwordpy PORTVERSION= 1.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= http://x-word.org/ DISTNAME= xword-${PORTVERSION} diff --git a/games/xye/Makefile b/games/xye/Makefile index e411cfc1c958..b63c50312569 100644 --- a/games/xye/Makefile +++ b/games/xye/Makefile @@ -7,7 +7,7 @@ PORTNAME= xye PORTVERSION= 0.9.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games MASTER_SITES= SF diff --git a/games/zatacka/Makefile b/games/zatacka/Makefile index 830a7a584e96..12104aea1982 100644 --- a/games/zatacka/Makefile +++ b/games/zatacka/Makefile @@ -7,7 +7,7 @@ PORTNAME= zatacka PORTVERSION= 0.1.8 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= games MASTER_SITES= SF DISTNAME= ${PORTNAME}-${PORTVERSION}_src diff --git a/games/zaz/Makefile b/games/zaz/Makefile index 285c1c08f1b1..0d9e766ba2ab 100644 --- a/games/zaz/Makefile +++ b/games/zaz/Makefile @@ -7,7 +7,7 @@ PORTNAME= zaz PORTVERSION= 1.0.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SF/${PORTNAME} diff --git a/games/zoom/Makefile b/games/zoom/Makefile index d20e2b4fa940..eb645a137152 100644 --- a/games/zoom/Makefile +++ b/games/zoom/Makefile @@ -7,6 +7,7 @@ PORTNAME= zoom PORTVERSION= 1.1.5 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://www.logicalshift.co.uk/unix/zoom/ \ http://mirror.4bit.ws/ @@ -15,7 +16,7 @@ MAINTAINER= dhn@FreeBSD.org COMMENT= Z-Interpreter for X with full V6 support LIB_DEPENDS= t1.5:${PORTSDIR}/devel/t1lib \ - png.6:${PORTSDIR}/graphics/png + png15:${PORTSDIR}/graphics/png USE_CSTD= gnu89 USE_PERL5= yes |