6 files changed, 57 insertions, 19 deletions
diff --git a/graphics/openjpeg/Makefile b/graphics/openjpeg/Makefile
index a026226899b..f4b41c3e663 100644
--- a/graphics/openjpeg/Makefile
+++ b/graphics/openjpeg/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2014/04/24 19:39:05 adam Exp $
+# $NetBSD: Makefile,v 1.10 2014/05/15 14:14:54 adam Exp $
 
-DISTNAME=	openjpeg-2.0.1
+DISTNAME=	openjpeg-2.1.0
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=openjpeg.mirror/}
 
diff --git a/graphics/openjpeg/PLIST b/graphics/openjpeg/PLIST
index 20b2b095e80..3a41db98651 100644
--- a/graphics/openjpeg/PLIST
+++ b/graphics/openjpeg/PLIST
@@ -1,20 +1,18 @@
-@comment $NetBSD: PLIST,v 1.4 2014/04/24 19:39:05 adam Exp $
+@comment $NetBSD: PLIST,v 1.5 2014/05/15 14:14:54 adam Exp $
 bin/opj_compress
 bin/opj_decompress
 bin/opj_dump
-include/openjpeg-2.0/openjpeg.h
-include/openjpeg-2.0/opj_config.h
-include/openjpeg-2.0/opj_stdint.h
+include/openjpeg-2.1/openjpeg.h
+include/openjpeg-2.1/opj_config.h
+include/openjpeg-2.1/opj_stdint.h
 lib/libopenjp2.so
-lib/libopenjp2.so.2.0.1
+lib/libopenjp2.so.${PKGVERSION}
 lib/libopenjp2.so.7
-lib/openjpeg-2.0/OpenJPEGConfig.cmake
-lib/openjpeg-2.0/OpenJPEGTargets-noconfig.cmake
-lib/openjpeg-2.0/OpenJPEGTargets.cmake
+lib/openjpeg-2.1/OpenJPEGConfig.cmake
+lib/openjpeg-2.1/OpenJPEGTargets-noconfig.cmake
+lib/openjpeg-2.1/OpenJPEGTargets.cmake
 lib/pkgconfig/libopenjp2.pc
 man/man1/opj_compress.1
 man/man1/opj_decompress.1
 man/man1/opj_dump.1
 man/man3/libopenjp2.3
-share/doc/openjpeg-2.0/CHANGES
-share/doc/openjpeg-2.0/LICENSE
diff --git a/graphics/openjpeg/buildlink3.mk b/graphics/openjpeg/buildlink3.mk
index 5f74738dcdc..f2727847323 100644
--- a/graphics/openjpeg/buildlink3.mk
+++ b/graphics/openjpeg/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.3 2012/12/09 15:25:42 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2014/05/15 14:14:54 adam Exp $
 
 BUILDLINK_TREE+=	openjpeg
 
 .if !defined(OPENJPEG_BUILDLINK3_MK)
 OPENJPEG_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.openjpeg+=	openjpeg>=2.0.0
-BUILDLINK_ABI_DEPENDS.openjpeg+=	openjpeg>=2.0.0
+BUILDLINK_API_DEPENDS.openjpeg+=	openjpeg>=2.1.0
+BUILDLINK_ABI_DEPENDS.openjpeg+=	openjpeg>=2.1.0
 BUILDLINK_PKGSRCDIR.openjpeg?=	../../graphics/openjpeg
 .endif	# OPENJPEG_BUILDLINK3_MK
 
diff --git a/graphics/openjpeg/distinfo b/graphics/openjpeg/distinfo
index 266e42d6a8b..7636d0438fe 100644
--- a/graphics/openjpeg/distinfo
+++ b/graphics/openjpeg/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.6 2014/04/24 19:39:05 adam Exp $
+$NetBSD: distinfo,v 1.7 2014/05/15 14:14:54 adam Exp $
 
-SHA1 (openjpeg-2.0.1.tar.gz) = b2f917acd01b6e6fdc397cf5ef0c0e50e2ab7d19
-RMD160 (openjpeg-2.0.1.tar.gz) = 41e84459de4c83892cdd68362947493af5a3d5e1
-Size (openjpeg-2.0.1.tar.gz) = 1777334 bytes
+SHA1 (openjpeg-2.1.0.tar.gz) = c2a255f6b51ca96dc85cd6e85c89d300018cb1cb
+RMD160 (openjpeg-2.1.0.tar.gz) = dc6e77a2539ab4071cf1a1b62f653fea13707b54
+Size (openjpeg-2.1.0.tar.gz) = 1789675 bytes
 SHA1 (patch-aa) = 29025aa1db85cfaf483ca92fdfba7343a9a1b84f
+SHA1 (patch-src_bin_jp2_CMakeLists.txt) = cbb8e9f33fe781af54a1b7e44694413220d114a2
+SHA1 (patch-src_lib_openjp2_CMakeLists.txt) = 85d7729bdebbc5ce520c69df7541575547b49708
diff --git a/graphics/openjpeg/patches/patch-src_bin_jp2_CMakeLists.txt b/graphics/openjpeg/patches/patch-src_bin_jp2_CMakeLists.txt
new file mode 100644
index 00000000000..7deea1e6855
--- /dev/null
+++ b/graphics/openjpeg/patches/patch-src_bin_jp2_CMakeLists.txt
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_bin_jp2_CMakeLists.txt,v 1.1 2014/05/15 14:14:54 adam Exp $
+
+Install man pages without building other docs.
+
+--- src/bin/jp2/CMakeLists.txt.orig	2014-05-15 11:05:39.000000000 +0000
++++ src/bin/jp2/CMakeLists.txt
+@@ -52,7 +52,6 @@ foreach(exe opj_decompress opj_compress 
+   )
+ endforeach()
+ 
+-if(BUILD_DOC)
+ # Install man pages
+ install(
+   FILES       ${OPENJPEG_SOURCE_DIR}/doc/man/man1/opj_compress.1
+@@ -60,4 +59,3 @@ install(
+               ${OPENJPEG_SOURCE_DIR}/doc/man/man1/opj_dump.1
+   DESTINATION ${OPENJPEG_INSTALL_MAN_DIR}/man1)
+ #
+-endif()
diff --git a/graphics/openjpeg/patches/patch-src_lib_openjp2_CMakeLists.txt b/graphics/openjpeg/patches/patch-src_lib_openjp2_CMakeLists.txt
new file mode 100644
index 00000000000..91d1b98f5d3
--- /dev/null
+++ b/graphics/openjpeg/patches/patch-src_lib_openjp2_CMakeLists.txt
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_lib_openjp2_CMakeLists.txt,v 1.1 2014/05/15 14:14:54 adam Exp $
+
+Install man pages without building other docs.
+
+--- src/lib/openjp2/CMakeLists.txt.orig	2014-05-15 11:14:06.000000000 +0000
++++ src/lib/openjp2/CMakeLists.txt
+@@ -68,12 +68,10 @@ install(FILES openjpeg.h opj_stdint.h
+   DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR} COMPONENT Headers
+ )
+ 
+-if(BUILD_DOC)
+ # install man page of the library
+ install(
+   FILES       ${OPENJPEG_SOURCE_DIR}/doc/man/man3/libopenjp2.3
+   DESTINATION ${OPENJPEG_INSTALL_MAN_DIR}/man3)
+-endif()
+ 
+ # internal utilities to generate t1_luts.h (part of the jp2 lib)
+ # no need to install: