diff --git a/graphics/openjpeg15/Makefile b/graphics/openjpeg15/Makefile
index d39b14389e15..87757d480914 100644
--- a/graphics/openjpeg15/Makefile
+++ b/graphics/openjpeg15/Makefile
@@ -1,35 +1,35 @@
 PORTNAME=	openjpeg
 PORTVERSION=	1.5.2
 DISTVERSIONPREFIX=	version.
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 PKGNAMESUFFIX=	15
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Open-source JPEG 2000 codec
 WWW=		https://www.openjpeg.org/
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	liblcms2.so:graphics/lcms2 \
 		libpng.so:graphics/png \
 		libtiff.so:graphics/tiff
 
 USES=		cmake cpe
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
 PORTDOCS=	CHANGES LICENSE
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION} VER=${PORTVERSION:R}
 
 GH_ACCOUNT=	uclouvain
 USE_GITHUB=	yes
 
 CPE_VENDOR=	uclouvain
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.mk>
diff --git a/graphics/openjpeg15/files/patch-CMakeLists.txt b/graphics/openjpeg15/files/patch-CMakeLists.txt
index 4c7246a15f2b..a0e0dba42fe2 100644
--- a/graphics/openjpeg15/files/patch-CMakeLists.txt
+++ b/graphics/openjpeg15/files/patch-CMakeLists.txt
@@ -1,46 +1,41 @@
 --- CMakeLists.txt.orig	2014-03-28 08:20:25 UTC
 +++ CMakeLists.txt
-@@ -54,7 +54,7 @@ if(NOT OPENJPEG_SOVERSION)
+@@ -54,7 +54,7 @@ SET(OPENJPEG_LIBRARY_PROPERTIES
  endif(NOT OPENJPEG_SOVERSION)
  SET(OPENJPEG_LIBRARY_PROPERTIES
    VERSION   "${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}.${OPENJPEG_VERSION_BUILD}"
 -  SOVERSION "${OPENJPEG_SOVERSION}"
 +  SOVERSION 2
  )
  
  # --------------------------------------------------------------------------
-@@ -129,11 +129,11 @@ IF(NOT OPENJPEG_INSTALL_INCLUDE_DIR)
- 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/")
+@@ -133,7 +133,7 @@ IF(NOT OPENJPEG_INSTALL_DOC_DIR)
  ENDIF(NOT OPENJPEG_INSTALL_MAN_DIR)
  
  IF(NOT OPENJPEG_INSTALL_DOC_DIR)
 -  SET(OPENJPEG_INSTALL_DOC_DIR "share/doc/${OPENJPEG_INSTALL_SUBDIR}")
 +  SET(OPENJPEG_INSTALL_DOC_DIR "share/doc/${projectname}")
  ENDIF(NOT OPENJPEG_INSTALL_DOC_DIR)
  
  if(NOT OPENJPEG_INSTALL_JNI_DIR)
 @@ -188,10 +188,10 @@ IF(UNIX)
    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 @@ ENDIF(BUILD_TESTING)
+@@ -288,6 +288,7 @@ INSTALL(EXPORT OpenJPEGTargets DESTINATION ${OPENJPEG_
  #-----------------------------------------------------------------------------
  # 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-plist b/graphics/openjpeg15/pkg-plist
index aa513fabf73a..9316ca85de27 100644
--- a/graphics/openjpeg15/pkg-plist
+++ b/graphics/openjpeg15/pkg-plist
@@ -1,16 +1,16 @@
 bin/image_to_j2k
 bin/j2k_dump
 bin/j2k_to_image
 include/openjpeg-%%VER%%/openjpeg.h
 lib/openjpeg-%%VER%%/OpenJPEGConfig.cmake
 lib/openjpeg-%%VER%%/OpenJPEGTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/openjpeg-%%VER%%/OpenJPEGTargets.cmake
 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
+share/man/man1/image_to_j2k.1.gz
+share/man/man1/j2k_dump.1.gz
+share/man/man1/j2k_to_image.1.gz
+share/man/man3/libopenjpeg.3.gz
 libdata/pkgconfig/libopenjpeg.pc
 libdata/pkgconfig/libopenjpeg1.pc