svn commit: r375458 - in head/games/shaaft: . files

[Antoine Brodin]

Author: antoine
Date: Wed Dec 24 13:51:30 2014
New Revision: 375458
URL: https://svnweb.freebsd.org/changeset/ports/375458
QAT: https://qat.redports.org/buildarchive/r375458/

Log:
  Properly support png 1.5
  
  Obtained from:	Gentoo

Modified:
  head/games/shaaft/Makefile
  head/games/shaaft/files/patch-PNG.cpp

Modified: head/games/shaaft/Makefile
==============================================================================
--- head/games/shaaft/Makefile	Wed Dec 24 13:24:01 2014	(r375457)
+++ head/games/shaaft/Makefile	Wed Dec 24 13:51:30 2014	(r375458)
@@ -11,7 +11,7 @@ DISTNAME=	Shaaft-${PORTVERSION}
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	OpenGL 3D falling block game similar to Blockout
 
-LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
 
 CONFLICTS=	criticalmass-*
 

Modified: head/games/shaaft/files/patch-PNG.cpp
==============================================================================
--- head/games/shaaft/files/patch-PNG.cpp	Wed Dec 24 13:24:01 2014	(r375457)
+++ head/games/shaaft/files/patch-PNG.cpp	Wed Dec 24 13:51:30 2014	(r375458)
@@ -1,14 +1,15 @@
---- 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>
+--- utilssdl/PNG.cpp.orig	2003-03-03 02:32:18 UTC
++++ utilssdl/PNG.cpp
+@@ -45,7 +45,7 @@ void PNG::writeData( png_structp png, pn
+ {
+     png_uint_32 check;
  
- //Save SDL surface as png
- bool PNG::Save( SDL_Surface *img, const string &filename)
-@@ -72,7 +73,7 @@
+-    check = fwrite( data, 1, length, (FILE *)(png->io_ptr));
++    check = fwrite( data, 1, length, (FILE *)(png_get_io_ptr(png)));
+     if( check != length)
+     {
+ 	png_error( png, "Write Error");
+@@ -72,7 +72,7 @@ bool PNG::init( FILE *fp, int width, int
  	return false;
      }