Update to 1.5.2.

Fixes a number of vulnabilies.

Security:	02db20d7-e34a-11e3-bd92-bcaec565249c

8 files changed, 36 insertions, 67 deletions

diff --git a/graphics/openjpeg/Makefile b/graphics/openjpeg/Makefile
index 4ab1fafa6142..8ed62e61abab 100644
--- a/graphics/openjpeg/Makefile
+++ b/graphics/openjpeg/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	openjpeg
-PORTVERSION=	1.5.0
-PORTREVISION=	2
+PORTVERSION=	1.5.2
 CATEGORIES=	graphics
-MASTER_SITES=	GOOGLE_CODE
+MASTER_SITES=	SF/openjpeg.mirror/${PORTVERSION}/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Open-source JPEG 2000 codec
diff --git a/graphics/openjpeg/distinfo b/graphics/openjpeg/distinfo
index 7568ac6949e6..375f8d34d575 100644
--- a/graphics/openjpeg/distinfo
+++ b/graphics/openjpeg/distinfo
@@ -1,2 +1,2 @@
-SHA256 (openjpeg-1.5.0.tar.gz) = c9908fab44432a2ed2550c457cb7e736da6d7c326f1203d23d1082d992364ace
-SIZE (openjpeg-1.5.0.tar.gz) = 2117572
+SHA256 (openjpeg-1.5.2.tar.gz) = 15df7b194a5d8dba0052cd21c17a4dc761149a770a907d73fffb972078c28a87
+SIZE (openjpeg-1.5.2.tar.gz) = 1385702
diff --git a/graphics/openjpeg/files/patch-CMakeLists.txt b/graphics/openjpeg/files/patch-CMakeLists.txt
index b8501066c5fe..02b9fd8fa31c 100644
--- a/graphics/openjpeg/files/patch-CMakeLists.txt
+++ b/graphics/openjpeg/files/patch-CMakeLists.txt
@@ -1,15 +1,15 @@
---- CMakeLists.txt.orig	2012-02-07 11:49:55.000000000 +0100
-+++ CMakeLists.txt	2012-06-03 14:26:55.000000000 +0200
-@@ -36,7 +36,7 @@
-   "${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}.${OPENJPEG_VERSION_BUILD}")
+--- 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_VERSION_MAJOR}"
-+  SOVERSION "2"
+-  SOVERSION "${OPENJPEG_SOVERSION}"
++  SOVERSION 2
  )
  
  # --------------------------------------------------------------------------
-@@ -76,7 +76,7 @@
+@@ -94,7 +94,7 @@
  # Install directories
  
  STRING(TOLOWER ${PROJECT_NAME} projectname)
@@ -18,7 +18,12 @@
  
  IF(NOT OPENJPEG_INSTALL_BIN_DIR)
    SET(OPENJPEG_INSTALL_BIN_DIR "bin")
-@@ -99,7 +99,7 @@
+@@ -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)
@@ -27,16 +32,29 @@
  ENDIF(NOT OPENJPEG_INSTALL_MAN_DIR)
  
  IF(NOT OPENJPEG_INSTALL_DOC_DIR)
-@@ -146,7 +146,7 @@
+@@ -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_SHARE_DIR}/pkgconfig )
+-    ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
 +    libdata/pkgconfig )
    INSTALL( CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink
    \"libopenjpeg1.pc\"
-   \"\$ENV{DESTDIR}${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig/libopenjpeg.pc\")")
-@@ -244,6 +241,7 @@ ENDIF(BUILD_TESTING)
+-  \"\$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})
diff --git a/graphics/openjpeg/files/patch-CMake_OpenJPEGConfig.cmake.in b/graphics/openjpeg/files/patch-CMake_OpenJPEGConfig.cmake.in
deleted file mode 100644
index 1a8fc1f0118c..000000000000
--- a/graphics/openjpeg/files/patch-CMake_OpenJPEGConfig.cmake.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- CMake/OpenJPEGConfig.cmake.in~	2012-02-07 04:49:55.000000000 -0600
-+++ CMake/OpenJPEGConfig.cmake.in	2012-04-09 05:05:46.024519656 -0500
-@@ -17,7 +17,7 @@ SET(OPENJPEG_LIBRARIES "@OPENJPEG_LIBRAR
- SET(OPENJPEG_CMAKE_DIR "@OPENJPEG_CMAKE_DIR_CONFIG@")
- 
- # The configuration options.
--SET(OPENJPEG_BUILD_SHARED_LIBS "@OPENJPEG_BUILD_SHARED_LIBS@")
-+SET(OPENJPEG_BUILD_SHARED_LIBS @BUILD_SHARED_LIBS@)
- 
- # The "use" file.
- SET(OPENJPEG_USE_FILE "@OPENJPEG_USE_FILE_CONFIG@")
diff --git a/graphics/openjpeg/files/patch-libopenjpeg-CMakeLists.txt b/graphics/openjpeg/files/patch-libopenjpeg-CMakeLists.txt
deleted file mode 100644
index 37fd08ce52be..000000000000
--- a/graphics/openjpeg/files/patch-libopenjpeg-CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- libopenjpeg/CMakeLists.txt.orig	2012-02-07 11:49:55.000000000 +0100
-+++ libopenjpeg/CMakeLists.txt	2012-06-03 14:29:44.000000000 +0200
-@@ -55,7 +55,7 @@
- 
- # Install includes files
- INSTALL(FILES openjpeg.h
--  DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR}/${OPENJPEG_INSTALL_SUBDIR} COMPONENT Headers
-+  DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR} COMPONENT Headers
- )
- 
- # install man page of the library
diff --git a/graphics/openjpeg/files/patch-libopenjpeg1.pc.cmake b/graphics/openjpeg/files/patch-libopenjpeg1.pc.cmake
deleted file mode 100644
index 674e19bc3e4d..000000000000
--- a/graphics/openjpeg/files/patch-libopenjpeg1.pc.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
---- libopenjpeg1.pc.cmake~	2012-02-07 04:49:55.000000000 -0600
-+++ libopenjpeg1.pc.cmake	2012-04-07 17:13:24.589503254 -0500
-@@ -1,8 +1,8 @@
- prefix=@CMAKE_INSTALL_PREFIX@
--bindir=@OPENJPEG_INSTALL_BIN_DIR@
--datadir=@OPENJPEG_INSTALL_DATA_DIR@
--libdir=@OPENJPEG_INSTALL_LIB_DIR@
--includedir=@OPENJPEG_INSTALL_INCLUDE_DIR@
-+bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@
-+datadir=${prefix}/@OPENJPEG_INSTALL_DATA_DIR@
-+libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@
-+includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@
- 
- Name: openjpeg
- Description: JPEG2000 files library
diff --git a/graphics/openjpeg/files/patch-opj_malloc.h b/graphics/openjpeg/files/patch-opj_malloc.h
deleted file mode 100644
index 0f61562b49a8..000000000000
--- a/graphics/openjpeg/files/patch-opj_malloc.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- libopenjpeg/opj_malloc.h.orig	2013-10-08 17:19:09.755013928 +0200
-+++ libopenjpeg/opj_malloc.h	2013-10-08 17:20:11.403012744 +0200
-@@ -85,8 +85,7 @@
- 		#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>			
-+		#include <stdlib.h>
- 	#endif
- #endif
- 
diff --git a/graphics/openjpeg/pkg-plist b/graphics/openjpeg/pkg-plist
index 2b5167388318..caee3d3db0f6 100644
--- a/graphics/openjpeg/pkg-plist
+++ b/graphics/openjpeg/pkg-plist
@@ -3,7 +3,7 @@ bin/j2k_dump
 bin/j2k_to_image
 include/openjpeg.h
 lib/libopenjpeg.so
-lib/libopenjpeg.so.1.5.0
+lib/libopenjpeg.so.1.5.2
 lib/libopenjpeg.so.2
 man/man1/image_to_j2k.1.gz
 man/man1/j2k_dump.1.gz
@@ -14,6 +14,7 @@ man/man3/libopenjpeg.3.gz
 %%DATADIR%%/OpenJPEGConfig.cmake
 %%DATADIR%%/OpenJPEGTargets-%%CMAKE_BUILD_TYPE%%.cmake
 %%DATADIR%%/OpenJPEGTargets.cmake
+libdata/pkgconfig/libopenjpeg.pc
 libdata/pkgconfig/libopenjpeg1.pc
 @dirrm %%DATADIR%%
 @dirrm %%DOCSDIR%%