4 files changed, 57 insertions, 67 deletions
diff --git a/graphics/openjpeg/Makefile b/graphics/openjpeg/Makefile
index 696132108ed..65f2cab5584 100644
--- a/graphics/openjpeg/Makefile
+++ b/graphics/openjpeg/Makefile
@@ -1,20 +1,20 @@
-# $NetBSD: Makefile,v 1.5 2012/10/25 11:33:40 drochner Exp $
-#
+# $NetBSD: Makefile,v 1.6 2012/12/06 17:09:18 adam Exp $
 
-DISTNAME=		openjpeg-1.5.0
-PKGREVISION=		2
-CATEGORIES=		graphics
-MASTER_SITES=		http://openjpeg.googlecode.com/files/
+DISTNAME=	openjpeg-2.0.0
+CATEGORIES=	graphics
+MASTER_SITES=	http://openjpeg.googlecode.com/files/
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.openjpeg.org/
-COMMENT=		JPEG 2000 library
-LICENSE=		2-clause-bsd
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://www.openjpeg.org/
+COMMENT=	JPEG 2000 library
+LICENSE=	2-clause-bsd
 
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--disable-doc
-USE_LIBTOOL=		yes
+USE_CMAKE=		yes
 
 CFLAGS+=	-DHAVE_POSIX_MEMALIGN
 
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/lcms2/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/openjpeg/PLIST b/graphics/openjpeg/PLIST
index e8983344b71..ff0cdb1beac 100644
--- a/graphics/openjpeg/PLIST
+++ b/graphics/openjpeg/PLIST
@@ -1,18 +1,19 @@
-@comment $NetBSD: PLIST,v 1.2 2012/03/24 13:25:01 drochner Exp $
-bin/image_to_j2k
-bin/j2k_dump
-bin/j2k_to_image
-include/openjpeg-1.5/openjpeg.h
-include/openjpeg.h
-lib/libopenjpeg.la
-lib/pkgconfig/libopenjpeg.pc
-lib/pkgconfig/libopenjpeg1.pc
-man/man1/image_to_j2k.1
-man/man1/j2k_dump.1
-man/man1/j2k_to_image.1
-man/man1/jpwl_image_to_j2k.1
-man/man1/jpwl_j2k_to_image.1
-man/man3/jpwl_libopenjpeg.3
-man/man3/libopenjpeg.3
-share/doc/openjpeg-1.5/CHANGES
-share/doc/openjpeg-1.5/LICENSE
+@comment $NetBSD: PLIST,v 1.3 2012/12/06 17:09:18 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
+lib/libopenjp2.so
+lib/libopenjp2.so.2.0.0
+lib/libopenjp2.so.6
+lib/openjpeg-2.0/OpenJPEGConfig.cmake
+lib/openjpeg-2.0/OpenJPEGTargets-noconfig.cmake
+lib/openjpeg-2.0/OpenJPEGTargets.cmake
+share/doc/openjpeg-2.0/CHANGES
+share/doc/openjpeg-2.0/LICENSE
+share/man/man1/opj_compress.1
+share/man/man1/opj_decompress.1
+share/man/man1/opj_dump.1
+share/man/man3/libopenjp2.3
diff --git a/graphics/openjpeg/distinfo b/graphics/openjpeg/distinfo
index 3c744c7990a..20707fa1ec0 100644
--- a/graphics/openjpeg/distinfo
+++ b/graphics/openjpeg/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.4 2012/10/25 11:33:41 drochner Exp $
+$NetBSD: distinfo,v 1.5 2012/12/06 17:09:18 adam Exp $
 
-SHA1 (openjpeg-1.5.0.tar.gz) = dce705ae45f137e4698a8cf39d1fbf22bc434fa8
-RMD160 (openjpeg-1.5.0.tar.gz) = ffa85dbb0a3ba1545bc6974f4950f466789c04ef
-Size (openjpeg-1.5.0.tar.gz) = 2117572 bytes
-SHA1 (patch-aa) = 503b565958dc74a17b68f968a44c5c861d84b343
-SHA1 (patch-libopenjpeg_j2k.c) = 4660bb06d2655879ea7b479b024ca5cd978c4a01
+SHA1 (openjpeg-2.0.0.tar.gz) = 0af78ab2283b43421458f80373422d8029a9f7a7
+RMD160 (openjpeg-2.0.0.tar.gz) = 08905cc6c81be25e61f8c87e606d946060db0b81
+Size (openjpeg-2.0.0.tar.gz) = 1770392 bytes
+SHA1 (patch-aa) = 29025aa1db85cfaf483ca92fdfba7343a9a1b84f
diff --git a/graphics/openjpeg/patches/patch-aa b/graphics/openjpeg/patches/patch-aa
index 33c3a3eb81e..9aaf212b492 100644
--- a/graphics/openjpeg/patches/patch-aa
+++ b/graphics/openjpeg/patches/patch-aa
@@ -1,31 +1,21 @@
-$NetBSD: patch-aa,v 1.2 2012/03/24 13:25:01 drochner Exp $
+$NetBSD: patch-aa,v 1.3 2012/12/06 17:09:18 adam Exp $
 
---- libopenjpeg/opj_malloc.h.orig	2012-02-07 10:49:55.000000000 +0000
-+++ libopenjpeg/opj_malloc.h
-@@ -69,26 +69,6 @@ Allocate memory aligned to a 16 byte bou
- @return Returns a void pointer to the allocated space, or NULL if there is insufficient memory available
- */
- /* FIXME: These should be set with cmake tests, but we're currently not requiring use of cmake */
--#ifdef _WIN32
--	/* Someone should tell the mingw people that their malloc.h ought to provide _mm_malloc() */
--	#ifdef __GNUC__
--		#include <mm_malloc.h>
--		#define HAVE_MM_MALLOC
--	#else /* MSVC, Intel C++ */
--		#include <malloc.h>
--		#ifdef _mm_malloc
--			#define HAVE_MM_MALLOC
--		#endif
--	#endif
--#else /* Not _WIN32 */
--	#if defined(__sun)
--		#define HAVE_MEMALIGN
--	/* Linux x86_64 and OSX always align allocations to 16 bytes */
--	#elif !defined(__amd64__) && !defined(__APPLE__)	
--		#define HAVE_MEMALIGN
--		#include <malloc.h>			
--	#endif
--#endif
- 
- #define opj_aligned_malloc(size) malloc(size)
- #define opj_aligned_free(m) free(m)
+--- src/lib/openjp2/opj_malloc.h.orig	2012-11-19 14:26:08.000000000 +0000
++++ src/lib/openjp2/opj_malloc.h
+@@ -80,16 +80,6 @@ Allocate memory aligned to a 16 byte bou
+ 			#define HAVE_MM_MALLOC
+ 		#endif
+ 	#endif
+-#else /* Not _WIN32 */
+-	#if defined(__sun)
+-		#define HAVE_MEMALIGN
+-  #elif defined(__FreeBSD__)
+-    #define HAVE_POSIX_MEMALIGN
+-	/* Linux x86_64 and OSX always align allocations to 16 bytes */
+-	#elif !defined(__amd64__) && !defined(__APPLE__) && !defined(_AIX)
+-		#define HAVE_MEMALIGN
+-		#include <malloc.h>			
+-	#endif
+ #endif
+ 
+ #define opj_aligned_malloc(size) malloc(size)