summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2013-02-16 11:40:37 +0000
committerwiz <wiz@pkgsrc.org>2013-02-16 11:40:37 +0000
commita807204f48e668a6551c807e44de27ab2226f43b (patch)
treed6b9e68982dd939126d70ada7463ab6f045fdaf6 /devel
parenta96f4900ac951c1bb62cfab03e095e81439bb8bf (diff)
downloadpkgsrc-a807204f48e668a6551c807e44de27ab2226f43b.tar.gz
Detect png-1.6. Bump PKGREVISION.
Diffstat (limited to 'devel')
-rw-r--r--devel/cmake/Makefile4
-rw-r--r--devel/cmake/distinfo3
-rw-r--r--devel/cmake/patches/patch-Modules_FindPNG.cmake15
3 files changed, 19 insertions, 3 deletions
diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile
index 092164ca4bf..1a74128aa0f 100644
--- a/devel/cmake/Makefile
+++ b/devel/cmake/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.68 2013/02/06 23:22:03 jperkin Exp $
+# $NetBSD: Makefile,v 1.69 2013/02/16 11:40:37 wiz Exp $
DISTNAME= cmake-${CMAKE_API}.10
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= devel
MASTER_SITES= http://www.cmake.org/files/v${CMAKE_API}/
diff --git a/devel/cmake/distinfo b/devel/cmake/distinfo
index 5422253b589..fd8696d3315 100644
--- a/devel/cmake/distinfo
+++ b/devel/cmake/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.42 2012/11/15 19:31:54 adam Exp $
+$NetBSD: distinfo,v 1.43 2013/02/16 11:40:37 wiz Exp $
SHA1 (cmake-2.8.10.tar.gz) = 6384f2295d01f04d017e2701447378598b4c7223
RMD160 (cmake-2.8.10.tar.gz) = 9af9e3f26f0f3d827ef566f99050fe6a2721dd25
Size (cmake-2.8.10.tar.gz) = 5766728 bytes
+SHA1 (patch-Modules_FindPNG.cmake) = 55de08bb7882bc98c78dcad0d1aa7016b4b03564
SHA1 (patch-Modules_FindX11.cmake) = e5c9f5fd382effb85ae75fe603de00e5e58d788a
SHA1 (patch-Modules_Platform_SunOS.cmake) = 7a53ae3c902dd69ee22ef9fe0ae2a022d5284f16
SHA1 (patch-Utilities_KWIML_ABI.h.in) = 4642d13c6bdfce92c452a4cf3876a9dd244da891
diff --git a/devel/cmake/patches/patch-Modules_FindPNG.cmake b/devel/cmake/patches/patch-Modules_FindPNG.cmake
new file mode 100644
index 00000000000..2854388c405
--- /dev/null
+++ b/devel/cmake/patches/patch-Modules_FindPNG.cmake
@@ -0,0 +1,15 @@
+$NetBSD: patch-Modules_FindPNG.cmake,v 1.1 2013/02/16 11:40:37 wiz Exp $
+
+Support png-1.6.
+
+--- Modules/FindPNG.cmake.orig 2012-10-31 15:32:05.000000000 +0000
++++ Modules/FindPNG.cmake
+@@ -38,7 +38,7 @@ if(ZLIB_FOUND)
+ /usr/local/include/libpng # OpenBSD
+ )
+
+- set(PNG_NAMES ${PNG_NAMES} png libpng png15 libpng15 png15d libpng15d png14 libpng14 png14d libpng14d png12 libpng12 png12d libpng12d)
++ set(PNG_NAMES ${PNG_NAMES} png libpng png16 libpng16 png15 libpng15 png15d libpng15d png14 libpng14 png14d libpng14d png12 libpng12 png12d libpng12d)
+ find_library(PNG_LIBRARY NAMES ${PNG_NAMES} )
+
+ if (PNG_LIBRARY AND PNG_PNG_INCLUDE_DIR)