4 files changed, 56 insertions, 87 deletions

diff --git a/graphics/openjpeg/Makefile b/graphics/openjpeg/Makefile
index 8ed62e61abab..0d32394db9e2 100644
--- a/graphics/openjpeg/Makefile
+++ b/graphics/openjpeg/Makefile
@@ -2,9 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	openjpeg
-PORTVERSION=	1.5.2
+PORTVERSION=	2.1.0
 CATEGORIES=	graphics
 MASTER_SITES=	SF/openjpeg.mirror/${PORTVERSION}/
+#??
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Open-source JPEG 2000 codec
@@ -15,9 +16,9 @@ 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
+USES=		cmake pkgconfig
 USE_LDCONFIG=	yes
 
+PLIST_SUB=	VER=${PORTVERSION:R}
+
 .include <bsd.port.mk>
diff --git a/graphics/openjpeg/distinfo b/graphics/openjpeg/distinfo
index 375f8d34d575..ee27cf2b5ed6 100644
--- a/graphics/openjpeg/distinfo
+++ b/graphics/openjpeg/distinfo
@@ -1,2 +1,2 @@
-SHA256 (openjpeg-1.5.2.tar.gz) = 15df7b194a5d8dba0052cd21c17a4dc761149a770a907d73fffb972078c28a87
-SIZE (openjpeg-1.5.2.tar.gz) = 1385702
+SHA256 (openjpeg-2.1.0.tar.gz) = 1232bb814fd88d8ed314c94f0bfebb03de8559583a33abbe8c64ef3fc0a8ff03
+SIZE (openjpeg-2.1.0.tar.gz) = 1789675
diff --git a/graphics/openjpeg/files/patch-CMakeLists.txt b/graphics/openjpeg/files/patch-CMakeLists.txt
index 02b9fd8fa31c..49af929acfa5 100644
--- a/graphics/openjpeg/files/patch-CMakeLists.txt
+++ b/graphics/openjpeg/files/patch-CMakeLists.txt
@@ -1,64 +1,37 @@
---- 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
+--- CMakeLists.txt.orig	2014-05-23 22:46:07.000000000 +0200
++++ CMakeLists.txt	2014-05-23 22:48:32.000000000 +0200
+@@ -334,14 +334,14 @@
+   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp2/libopenjp2.pc.cmake.in
+     ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc @ONLY)
+   install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc DESTINATION
+-    ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
++    libdata/pkgconfig )
+ #
+   if(BUILD_JPWL)
+   # install in lib and not share (see multi-arch note above)
+   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjpwl/libopenjpwl.pc.cmake.in
+     ${CMAKE_CURRENT_BINARY_DIR}/libopenjpwl.pc @ONLY)
+   install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjpwl.pc DESTINATION
+-    ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
++    libdata/pkgconfig )
+   endif()
+ #
+   if(BUILD_JPIP)
+@@ -349,7 +349,7 @@
+   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjpip/libopenjpip.pc.cmake.in
+     ${CMAKE_CURRENT_BINARY_DIR}/libopenjpip.pc @ONLY)
+   install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjpip.pc DESTINATION
+-    ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
++    libdata/pkgconfig )
+   endif()
+ #
+   if(BUILD_JP3D)
+@@ -357,7 +357,7 @@
+   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp3d/libopenjp3d.pc.cmake.in
+     ${CMAKE_CURRENT_BINARY_DIR}/libopenjp3d.pc @ONLY)
+   install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjp3d.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)
+   endif()
+ endif()
  
- #-----------------------------------------------------------------------------
-@@ -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/openjpeg/pkg-plist b/graphics/openjpeg/pkg-plist
index caee3d3db0f6..8d0234b7c6f1 100644
--- a/graphics/openjpeg/pkg-plist
+++ b/graphics/openjpeg/pkg-plist
@@ -1,20 +1,15 @@
-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%%
+bin/opj_compress
+bin/opj_decompress
+bin/opj_dump
+include/openjpeg-%%VER%%/openjpeg.h
+include/openjpeg-%%VER%%/opj_config.h
+include/openjpeg-%%VER%%/opj_stdint.h
+lib/libopenjp2.so
+lib/libopenjp2.so.2.1.0
+lib/libopenjp2.so.7
+lib/openjpeg-%%VER%%/OpenJPEGConfig.cmake
+lib/openjpeg-%%VER%%/OpenJPEGTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/openjpeg-%%VER%%/OpenJPEGTargets.cmake
+libdata/pkgconfig/libopenjp2.pc
+@dirrmtry lib/openjpeg-%%VER%%
+@dirrmtry include/openjpeg-%%VER%%