Update openjpeg to 2.1.0.

Version 2.x is incompatible with openjpeg 1.5. Preserve it as openjpeg15
and update users.

Approved by:	portmgr (implicit) for NO_STAGE ports

5 files changed, 120 insertions, 0 deletions

diff --git a/graphics/openjpeg15/Makefile b/graphics/openjpeg15/Makefile
new file mode 100644
index 000000000000..802583191dd7
--- /dev/null
+++ b/graphics/openjpeg15/Makefile
@@ -0,0 +1,24 @@
+# Created by: trasz <trasz@pin.if.uz.zgora.pl>
+# $FreeBSD$
+
+PORTNAME=	openjpeg
+PORTVERSION=	1.5.2
+CATEGORIES=	graphics
+MASTER_SITES=	SF/openjpeg.mirror/${PORTVERSION}/
+PKGNAMESUFFIX=	15
+
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Open-source JPEG 2000 codec
+
+LICENSE=	BSD2CLAUSE
+
+LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff \
+		libpng15.so:${PORTSDIR}/graphics/png \
+		liblcms2.so:${PORTSDIR}/graphics/lcms2
+
+USES=		cmake dos2unix
+DOS2UNIX_FILES=	libopenjpeg/opj_malloc.h
+GNU_CONFIGURE=	yes
+USE_LDCONFIG=	yes
+
+.include <bsd.port.mk>
diff --git a/graphics/openjpeg15/distinfo b/graphics/openjpeg15/distinfo
new file mode 100644
index 000000000000..375f8d34d575
--- /dev/null
+++ b/graphics/openjpeg15/distinfo
@@ -0,0 +1,2 @@
+SHA256 (openjpeg-1.5.2.tar.gz) = 15df7b194a5d8dba0052cd21c17a4dc761149a770a907d73fffb972078c28a87
+SIZE (openjpeg-1.5.2.tar.gz) = 1385702
diff --git a/graphics/openjpeg15/files/patch-CMakeLists.txt b/graphics/openjpeg15/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..02b9fd8fa31c
--- /dev/null
+++ b/graphics/openjpeg15/files/patch-CMakeLists.txt
@@ -0,0 +1,64 @@
+--- CMakeLists.txt.orig	2014-03-27 11:58:08.000000000 +0100
++++ CMakeLists.txt	2014-05-24 11:24:37.000000000 +0200
+@@ -54,7 +54,7 @@
+ endif(NOT OPENJPEG_SOVERSION)
+ SET(OPENJPEG_LIBRARY_PROPERTIES
+   VERSION   "${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}.${OPENJPEG_VERSION_BUILD}"
+-  SOVERSION "${OPENJPEG_SOVERSION}"
++  SOVERSION 2
+ )
+ 
+ # --------------------------------------------------------------------------
+@@ -94,7 +94,7 @@
+ # Install directories
+ 
+ STRING(TOLOWER ${PROJECT_NAME} projectname)
+-SET(OPENJPEG_INSTALL_SUBDIR "${projectname}-${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}")
++SET(OPENJPEG_INSTALL_SUBDIR "${projectname}")
+ 
+ IF(NOT OPENJPEG_INSTALL_BIN_DIR)
+   SET(OPENJPEG_INSTALL_BIN_DIR "bin")
+@@ -125,11 +125,11 @@
+ ENDIF(NOT OPENJPEG_INSTALL_DATA_DIR)
+ 
+ IF(NOT OPENJPEG_INSTALL_INCLUDE_DIR)
+-  SET(OPENJPEG_INSTALL_INCLUDE_DIR "include/${OPENJPEG_INSTALL_SUBDIR}")
++  SET(OPENJPEG_INSTALL_INCLUDE_DIR "include/")
+ ENDIF(NOT OPENJPEG_INSTALL_INCLUDE_DIR)
+ 
+ IF(NOT OPENJPEG_INSTALL_MAN_DIR)
+-  SET(OPENJPEG_INSTALL_MAN_DIR "share/man/")
++  SET(OPENJPEG_INSTALL_MAN_DIR "man/")
+ ENDIF(NOT OPENJPEG_INSTALL_MAN_DIR)
+ 
+ IF(NOT OPENJPEG_INSTALL_DOC_DIR)
+@@ -148,7 +148,7 @@
+   # We could install *.cmake files in share/ however those files contains
+   # hardcoded path to libraries on a multi-arch system (fedora/debian) those
+   # path will be different (lib/i386-linux-gnu vs lib/x86_64-linux-gnu)
+-  SET(OPENJPEG_INSTALL_PACKAGE_DIR "${OPENJPEG_INSTALL_LIB_DIR}/${OPENJPEG_INSTALL_SUBDIR}")
++  SET(OPENJPEG_INSTALL_PACKAGE_DIR "${OPENJPEG_INSTALL_SHARE_DIR}/${OPENJPEG_INSTALL_SUBDIR}")
+ ENDIF(NOT OPENJPEG_INSTALL_PACKAGE_DIR)
+ 
+ #-----------------------------------------------------------------------------
+@@ -188,10 +188,10 @@
+   CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libopenjpeg1.pc.cmake
+     ${CMAKE_CURRENT_BINARY_DIR}/libopenjpeg1.pc @ONLY)
+   INSTALL( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjpeg1.pc DESTINATION
+-    ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
++    libdata/pkgconfig )
+   INSTALL( CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink
+   \"libopenjpeg1.pc\"
+-  \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_SHARE_DIR}/pkgconfig/libopenjpeg.pc\")")
++  \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig/libopenjpeg.pc\")")
+ ENDIF(UNIX)
+ 
+ #-----------------------------------------------------------------------------
+@@ -288,6 +288,7 @@
+ #-----------------------------------------------------------------------------
+ # install all targets referenced as OPENJPEGTargets
+ INSTALL(EXPORT OpenJPEGTargets DESTINATION ${OPENJPEG_INSTALL_PACKAGE_DIR})
++SET(OPENJPEG_LIBRARIES "${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_LIB_DIR}/lib${OPENJPEG_LIBRARY_NAME}.so")
+ CONFIGURE_FILE( ${OPENJPEG_SOURCE_DIR}/CMake/OpenJPEGConfig.cmake.in
+   ${OPENJPEG_BINARY_DIR}/OpenJPEGConfig.cmake
+   @ONLY
diff --git a/graphics/openjpeg15/pkg-descr b/graphics/openjpeg15/pkg-descr
new file mode 100644
index 000000000000..ce3b146262d8
--- /dev/null
+++ b/graphics/openjpeg15/pkg-descr
@@ -0,0 +1,10 @@
+The OpenJPEG library is an open-source JPEG 2000 codec written in
+C language.  It has been developed in order to promote the use of
+JPEG 2000, the new still-image compression standard from the Joint
+Photographic Experts Group (JPEG).  In addition to the basic codec,
+various other features are under development, among them the JP2
+and MJ2 (Motion JPEG 2000) file formats, an indexing tool useful
+for the JPIP protocol, JPWL-tools for error-resilience, a Java-viewer
+for j2k-images, ...
+
+WWW: http://code.google.com/p/openjpeg/
diff --git a/graphics/openjpeg15/pkg-plist b/graphics/openjpeg15/pkg-plist
new file mode 100644
index 000000000000..caee3d3db0f6
--- /dev/null
+++ b/graphics/openjpeg15/pkg-plist
@@ -0,0 +1,20 @@
+bin/image_to_j2k
+bin/j2k_dump
+bin/j2k_to_image
+include/openjpeg.h
+lib/libopenjpeg.so
+lib/libopenjpeg.so.1.5.2
+lib/libopenjpeg.so.2
+man/man1/image_to_j2k.1.gz
+man/man1/j2k_dump.1.gz
+man/man1/j2k_to_image.1.gz
+man/man3/libopenjpeg.3.gz
+%%DOCSDIR%%/CHANGES
+%%DOCSDIR%%/LICENSE
+%%DATADIR%%/OpenJPEGConfig.cmake
+%%DATADIR%%/OpenJPEGTargets-%%CMAKE_BUILD_TYPE%%.cmake
+%%DATADIR%%/OpenJPEGTargets.cmake
+libdata/pkgconfig/libopenjpeg.pc
+libdata/pkgconfig/libopenjpeg1.pc
+@dirrm %%DATADIR%%
+@dirrm %%DOCSDIR%%