- update png to 1.5.10

2 files changed, 107 insertions, 9 deletions

diff --git a/graphics/megapov/Makefile b/graphics/megapov/Makefile
index efa41f528a10..a3e962e9729b 100644
--- a/graphics/megapov/Makefile
+++ b/graphics/megapov/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	megapov
 PORTVERSION=	1.2.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	graphics
 MASTER_SITES=	http://megapov.inetart.net/packages/unix/
 
@@ -15,7 +15,7 @@ MAINTAINER=	maho@FreeBSD.org
 COMMENT=	Unofficial extensions of POV-Ray
 
 RUN_DEPENDS=	povray:${PORTSDIR}/graphics/povray-meta
-LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
 		jpeg:${PORTSDIR}/graphics/jpeg \
 		tiff:${PORTSDIR}/graphics/tiff
 
@@ -26,9 +26,9 @@ GNU_CONFIGURE=	yes
 ALL_TARGET=	# empty
 CONFIGURE_ARGS+=	COMPILED_BY="ports@FreeBSD.org"
 LDFLAGS+= -L${LOCALBASE}/lib -L${LOCALBASE}/lib
-CFLAGS+= -I${LOCALBASE}/include
-CXXFLAGS+= -I${LOCALBASE}/include
-CPPFLAGS+= -I${LOCALBASE}/include
+CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15
+CXXFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15
+CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15
 
 .include <bsd.port.pre.mk>
 
diff --git a/graphics/megapov/files/patch-png_pov.cpp b/graphics/megapov/files/patch-png_pov.cpp
index 11ea26f73c34..e3d97aeaf664 100644
--- a/graphics/megapov/files/patch-png_pov.cpp
+++ b/graphics/megapov/files/patch-png_pov.cpp
@@ -1,6 +1,104 @@
---- source/png_pov.cpp.orig	2005-08-23 20:20:33.000000000 +0100
-+++ source/png_pov.cpp	2010-11-24 10:15:11.000000000 +0000
-@@ -1437,7 +1437,7 @@
+--- source/png_pov.cpp.orig	2005-08-23 21:20:33.000000000 +0200
++++ source/png_pov.cpp	2012-05-06 19:21:51.000000000 +0200
+@@ -54,6 +54,7 @@
+ #include "povray.h"
+ #include "optout.h"
+ #include "png.h"
++#include "pngpriv.h"
+ #include "png_pov.h"
+ #include "pov_util.h"
+ #include "povmsend.h"
+@@ -172,7 +173,7 @@
+ 	  if (png_get_error_ptr(png_ptr))
+ 	   PossibleError("libpng: %s",msg);
+ 
+-	  longjmp(png_ptr->jmpbuf,1);
++	  longjmp(png_jmpbuf(png_ptr),1);
+ 	}
+ 
+ 
+@@ -392,7 +393,7 @@
+         Error("Cannot allocate PNG data structures");
+       }
+ 
+-      if (setjmp(o_png_ptr->jmpbuf))
++      if (setjmp(png_jmpbuf(o_png_ptr)))
+       {
+         // If we get here, we had a problem reading the file 
+         png_destroy_read_struct(&o_png_ptr, &info_ptr, (png_infopp)NULL);
+@@ -442,7 +443,7 @@
+         Error("Cannot allocate PNG data structures");
+       }
+ 
+-      if (setjmp(png_ptr->jmpbuf))
++      if (setjmp(png_jmpbuf(png_ptr)))
+       {
+         // If we get here, we had a problem writing the file 
+         png_destroy_read_struct(&o_png_ptr, &info_ptr, (png_infopp)NULL);
+@@ -538,7 +539,7 @@
+         Error("Cannot allocate PNG data structures");
+       }
+ 
+-      if (setjmp(png_ptr->jmpbuf))
++      if (setjmp(png_jmpbuf(png_ptr)))
+       {
+         // If we get here, we had a problem writing the file 
+         png_destroy_write_struct(&png_ptr, &info_ptr);
+@@ -656,7 +657,7 @@
+     case APPEND_MODE:
+ 
+ #if defined(PNG_WRITE_FLUSH_SUPPORTED)
+-      if (setjmp(png_ptr->jmpbuf))
++      if (setjmp(png_jmpbuf(png_ptr)))
+       {
+         // If we get here, we had a problem writing the file 
+ 
+@@ -765,7 +766,7 @@
+ 
+     if (png_ptr != NULL)
+     {
+-      if (setjmp(png_ptr->jmpbuf))
++      if (setjmp(png_jmpbuf(png_ptr)))
+       {
+         // If we get here, we had a problem writing the file 
+ 
+@@ -1213,7 +1214,7 @@
+       }
+   }
+ 
+-  if (setjmp(png_ptr->jmpbuf))
++  if (setjmp(png_jmpbuf(png_ptr)))
+   {
+     // If we get here, we had a problem writing the file 
+     delete out_file;
+@@ -1261,7 +1262,7 @@
+ 
+   register int col, j, step;
+ 
+-  if (setjmp(o_png_ptr->jmpbuf))
++  if (setjmp(png_jmpbuf(o_png_ptr)))
+   {
+     /* If we get here, we had a problem reading the file, which probably
+      * means that we have read all the available data, rather than a real
+@@ -1270,7 +1271,7 @@
+     return 0;
+   }
+ 
+-  if (setjmp(png_ptr->jmpbuf))
++  if (setjmp(png_jmpbuf(png_ptr)))
+   {
+     // If we get here, we had a problem writing the new file 
+     delete in_file;
+@@ -1386,7 +1387,7 @@
+ 	   ((r_info_ptr = png_create_info_struct(r_png_ptr)) == NULL))
+ 		Error("Cannot allocate PNG data structures");
+ 
+-	if(setjmp(r_png_ptr->jmpbuf))
++	if(setjmp(png_jmpbuf(r_png_ptr)))
+ 	{
+ 		// If we get here, we had a problem reading the file 
+ 		png_destroy_read_struct(&r_png_ptr, &r_info_ptr, (png_infopp)NULL);
+@@ -1437,7 +1438,7 @@
  		if(r_info_ptr->valid & PNG_INFO_tRNS)
  		{
  			for (index = 0; index < r_info_ptr->num_trans; index++)
@@ -9,7 +107,7 @@
  		}
  
  		Image->data.map_lines = (unsigned char **)POV_MALLOC(height * sizeof(unsigned char *), "PNG image");
-@@ -1470,7 +1470,7 @@
+@@ -1470,7 +1471,7 @@
  		if(r_info_ptr->valid & PNG_INFO_tRNS)
  		{
  			for (index = 0; index < r_info_ptr->num_trans; index++)