povray needs old png-1.2, use it now that we have it again.

9 files changed, 40 insertions, 45 deletions

diff --git a/graphics/povray/Makefile b/graphics/povray/Makefile
index 338b9e134dd..0a7fd71883b 100644
--- a/graphics/povray/Makefile
+++ b/graphics/povray/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.47 2011/01/13 13:38:15 wiz Exp $
+# $NetBSD: Makefile,v 1.48 2011/07/31 17:58:09 jakllsch Exp $
 
 DISTNAME=	povray-3.6.1
-PKGREVISION=	9
+PKGREVISION=	10
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.povray.org/ftp/pub/povray/Official/Unix/ \
 		ftp://ftp.povray.org/pub/povray/Official/Unix/
@@ -22,6 +22,7 @@ CONFIGURE_ARGS+=	--disable-optimiz
 CONFIGURE_ARGS+=	--enable-strip
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ENV+=		COMPILED_BY="The NetBSD Packages Collection"
+CPPFLAGS+=		-I${BUILDLINK_PREFIX.png12}/include/libpng12
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -41,7 +42,7 @@ BUILDLINK_DEPMETHOD.libXt?=	build
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/png12/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
diff --git a/graphics/povray/distinfo b/graphics/povray/distinfo
index 77f8ebf97f4..ef0f5170fce 100644
--- a/graphics/povray/distinfo
+++ b/graphics/povray/distinfo
@@ -1,12 +1,13 @@
-$NetBSD: distinfo,v 1.16 2010/06/20 19:05:10 wiz Exp $
+$NetBSD: distinfo,v 1.17 2011/07/31 17:58:09 jakllsch Exp $
 
 SHA1 (povray-3.6.1.tar.bz2) = 1fab3ccbdedafbf77e3a66087709bbdf60bc643d
 RMD160 (povray-3.6.1.tar.bz2) = 84ba679da66089f192cc1bfcf8bdd498e736a9a3
 Size (povray-3.6.1.tar.bz2) = 8200160 bytes
 SHA1 (patch-aa) = 351e2eb509cdb3e95c788de5f9ff41c993d4363d
-SHA1 (patch-ad) = fa4056ca956cb2872960fcb649e259aad1f065e4
-SHA1 (patch-af) = 59889bbc4e126b645b45f45c026e9ecadc9ac76b
-SHA1 (patch-ag) = 67ad332366614e60b0842572d7d07debe8b6e8f2
-SHA1 (patch-ah) = b8184166d1641d5147f2d532a3e5433f2a686ede
-SHA1 (patch-ai) = 4d6d1f7fa38f5d2bf5511f54b1743f734753672d
-SHA1 (patch-aj) = d826197d0d0deb6bf83c784820ada951418b46ab
+SHA1 (patch-ad) = 55a7e057f622bc825fbd2f3e5f44c7042af5df91
+SHA1 (patch-af) = b941ffe6f1f54b5bc6139ec2b7fba480f6393bf1
+SHA1 (patch-ag) = 78b354c06e237003a88fc2c62a58a578dbd54c07
+SHA1 (patch-ah) = 50df63dc098525f51a0c902a530a41aeff9ad507
+SHA1 (patch-ai) = 52c132db3cdb9ed342fd1c96ffed7b7e2bd44109
+SHA1 (patch-aj) = c217b0bfa1ef57e16628c847ba2235639e852f33
+SHA1 (patch-configure) = 778f901bc2b29bfc82730000f928248fb189b731
diff --git a/graphics/povray/patches/patch-ad b/graphics/povray/patches/patch-ad
index 6b059ffc653..498c22545ef 100644
--- a/graphics/povray/patches/patch-ad
+++ b/graphics/povray/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.4 2006/09/08 08:28:06 joerg Exp $
+$NetBSD: patch-ad,v 1.5 2011/07/31 17:58:09 jakllsch Exp $
 
---- Makefile.in.orig	2004-08-03 01:20:09.000000000 +0200
+--- Makefile.in.orig	2004-08-02 23:20:09.000000000 +0000
 +++ Makefile.in
 @@ -169,7 +169,7 @@ program_transform_name = @program_transf
  sbindir = @sbindir@
diff --git a/graphics/povray/patches/patch-af b/graphics/povray/patches/patch-af
index 1da49732360..d4fcf943bc5 100644
--- a/graphics/povray/patches/patch-af
+++ b/graphics/povray/patches/patch-af
@@ -1,6 +1,4 @@
-$NetBSD: patch-af,v 1.3 2010/06/20 19:05:11 wiz Exp $
-
-http://bugs.povray.org/task/144
+$NetBSD: patch-af,v 1.4 2011/07/31 17:58:09 jakllsch Exp $
 
 --- source/png_pov.cpp.orig	2004-08-02 23:11:37.000000000 +0000
 +++ source/png_pov.cpp
@@ -22,21 +20,3 @@ http://bugs.povray.org/task/144
        }
  
  #ifdef POV_COMMENTS // temporarily skip comment writing code 
-@@ -1428,7 +1424,7 @@ void Read_Png_Image(IMAGE *Image, char *
- 		if(r_info_ptr->valid & PNG_INFO_tRNS)
- 		{
- 			for (index = 0; index < r_info_ptr->num_trans; index++)
--				cmap[index].Transmit = 255 - r_info_ptr->trans[index];
-+				cmap[index].Transmit = 255 - r_info_ptr->trans_alpha[index];
- 		}
- 
- 		Image->data.map_lines = (unsigned char **)POV_MALLOC(height * sizeof(unsigned char *), "PNG image");
-@@ -1461,7 +1457,7 @@ void Read_Png_Image(IMAGE *Image, char *
- 		if(r_info_ptr->valid & PNG_INFO_tRNS)
- 		{
- 			for (index = 0; index < r_info_ptr->num_trans; index++)
--				cmap[index].Transmit = 255 - r_info_ptr->trans[index];
-+				cmap[index].Transmit = 255 - r_info_ptr->trans_alpha[index];
- 		}
- 
- 		Image->data.map_lines = (unsigned char **)POV_MALLOC(height * sizeof(unsigned char *), "PNG image");
diff --git a/graphics/povray/patches/patch-ag b/graphics/povray/patches/patch-ag
index 9848324fd2e..3f167674223 100644
--- a/graphics/povray/patches/patch-ag
+++ b/graphics/povray/patches/patch-ag
@@ -1,11 +1,11 @@
-$NetBSD: patch-ag,v 1.1 2006/09/17 22:33:36 rillig Exp $
+$NetBSD: patch-ag,v 1.2 2011/07/31 17:58:09 jakllsch Exp $
 
 SunPro is a little picky about the places in which the "const" qualifier
 is significant, so make sure that the function prototypes match their
 declarations in the header file.
 
---- unix/unix.cpp.orig	2006-09-18 00:17:03.513608780 +0200
-+++ unix/unix.cpp	2006-09-18 00:20:40.589099772 +0200
+--- unix/unix.cpp.orig	2004-08-02 23:14:17.000000000 +0000
++++ unix/unix.cpp
 @@ -1892,7 +1892,7 @@ static bool unix_subdir (const char *Fil
  *
  ******************************************************************************/
diff --git a/graphics/povray/patches/patch-ah b/graphics/povray/patches/patch-ah
index 8eacdb10150..b0c1289e1b3 100644
--- a/graphics/povray/patches/patch-ah
+++ b/graphics/povray/patches/patch-ah
@@ -1,7 +1,7 @@
-$NetBSD: patch-ah,v 1.1 2006/10/19 23:46:01 rillig Exp $
+$NetBSD: patch-ah,v 1.2 2011/07/31 17:58:09 jakllsch Exp $
 
---- scripts/allanim.sh.orig	2004-08-03 01:16:20.000000000 +0200
-+++ scripts/allanim.sh	2006-10-20 01:22:43.000000000 +0200
+--- scripts/allanim.sh.orig	2004-08-02 23:16:20.000000000 +0000
++++ scripts/allanim.sh
 @@ -57,12 +57,12 @@ case "$OPTIONS" in
      ;;
  esac
diff --git a/graphics/povray/patches/patch-ai b/graphics/povray/patches/patch-ai
index 5e2a2c574c3..0d0094433c6 100644
--- a/graphics/povray/patches/patch-ai
+++ b/graphics/povray/patches/patch-ai
@@ -1,7 +1,7 @@
-$NetBSD: patch-ai,v 1.1 2006/10/19 23:46:01 rillig Exp $
+$NetBSD: patch-ai,v 1.2 2011/07/31 17:58:09 jakllsch Exp $
 
---- scripts/allscene.sh.orig	2004-08-03 01:16:20.000000000 +0200
-+++ scripts/allscene.sh	2006-10-20 01:23:23.000000000 +0200
+--- scripts/allscene.sh.orig	2004-08-02 23:16:20.000000000 +0000
++++ scripts/allscene.sh
 @@ -64,11 +64,11 @@ case "$OPTIONS" in
      ;;
  esac
diff --git a/graphics/povray/patches/patch-aj b/graphics/povray/patches/patch-aj
index a05395fc185..f51ddf3605b 100644
--- a/graphics/povray/patches/patch-aj
+++ b/graphics/povray/patches/patch-aj
@@ -1,7 +1,7 @@
-$NetBSD: patch-aj,v 1.1 2006/10/19 23:46:01 rillig Exp $
+$NetBSD: patch-aj,v 1.2 2011/07/31 17:58:09 jakllsch Exp $
 
---- scripts/portfolio.sh.orig	2004-08-03 01:16:20.000000000 +0200
-+++ scripts/portfolio.sh	2006-10-20 01:23:33.000000000 +0200
+--- scripts/portfolio.sh.orig	2004-08-02 23:16:20.000000000 +0000
++++ scripts/portfolio.sh
 @@ -56,10 +56,10 @@ case "$OPTIONS" in
      ;;
  esac
diff --git a/graphics/povray/patches/patch-configure b/graphics/povray/patches/patch-configure
new file mode 100644
index 00000000000..3347a4cfc85
--- /dev/null
+++ b/graphics/povray/patches/patch-configure
@@ -0,0 +1,13 @@
+$NetBSD: patch-configure,v 1.1 2011/07/31 17:58:09 jakllsch Exp $
+
+--- configure.orig	2004-08-02 23:20:13.000000000 +0000
++++ configure
+@@ -1385,7 +1385,7 @@ ac_configure="$SHELL $ac_aux_dir/configu
+ # Required versions of the supporting libraries.
+ # Must be declared after AC_INIT.
+ required_libz_version="1.2.1"
+-required_libpng_version="1.2.5"
++required_libpng_version="1.2.44"
+ required_libjpeg_version="6b"
+ required_libtiff_version="3.6.1"
+