endif()
-+            if(NOT JP2K)
-+                find_path(JP2K_INCLUDE_DIR /openjpeg-2.5/openjpeg.h)
-+                find_library(JP2K_LIBRARY NAMES openjp2)
-+                if (JP2K_INCLUDE_DIR AND JP2K_LIBRARY)
-+                    set(JP2K 1)
-+                    set(JP2K_FOUND TRUE)
-+                    set(JP2K_LIBRARIES ${JP2K_LIBRARY})
-+                    set(JP2K_INCLUDE_DIRS ${JP2K_INCLUDE_DIR})
-+                    set(HAVE_LIBJP2K 1)
-+                endif()
-+            endif()
-             set(libs_private "${libs_private} -lopenjp2")
-         endif()
-     endif()
-diff -u cmake/Configure.cmake.orig cmake/Configure.cmake
---- cmake/Configure.cmake.orig
-+++ cmake/Configure.cmake
-@@ -69,6 +69,7 @@
-     openjpeg-2.2/openjpeg.h
-     openjpeg-2.3/openjpeg.h
-     openjpeg-2.4/openjpeg.h
-+    openjpeg-2.5/openjpeg.h
- )
- check_includes(include_files_list)
- 
-@@ -146,7 +147,9 @@
- /* Define to 1 if you have zlib. */
- #cmakedefine HAVE_LIBZ 1
- 
--#if defined(HAVE_OPENJPEG_2_4_OPENJPEG_H)
-+#if defined(HAVE_OPENJPEG_2_5_OPENJPEG_H)
-+#define LIBJP2K_HEADER <openjpeg-2.5/openjpeg.h>
-+#elif defined(HAVE_OPENJPEG_2_4_OPENJPEG_H)
- #define LIBJP2K_HEADER <openjpeg-2.4/openjpeg.h>
- #elif defined(HAVE_OPENJPEG_2_3_OPENJPEG_H)
- #define LIBJP2K_HEADER <openjpeg-2.3/openjpeg.h>
-diff -u config/config.h.in.orig config/config.h.in
---- config/config.h.in.orig
-+++ config/config.h.in
-@@ -51,6 +51,12 @@
- /* Define to 1 if you have the <openjpeg-2.3/openjpeg.h> header file. */
- #undef HAVE_OPENJPEG_2_3_OPENJPEG_H
- 
-+/* Define to 1 if you have the <openjpeg-2.4/openjpeg.h> header file. */
-+#undef HAVE_OPENJPEG_2_4_OPENJPEG_H
-+
-+/* Define to 1 if you have the <openjpeg-2.5/openjpeg.h> header file. */
-+#undef HAVE_OPENJPEG_2_5_OPENJPEG_H
-+
- /* Define to 1 if you have the <stdint.h> header file. */
- #undef HAVE_STDINT_H
- 
diff --git a/graphics/leptonica/pkg-plist b/graphics/leptonica/pkg-plist
index b4f431a774dc..558d7268cea7 100644
--- a/graphics/leptonica/pkg-plist
+++ b/graphics/leptonica/pkg-plist
@@ -11,6 +11,7 @@
 include/leptonica/allheaders.h
 include/leptonica/alltypes.h
 include/leptonica/array.h
+include/leptonica/array_internal.h
 include/leptonica/arrayaccess.h
 include/leptonica/bbuffer.h
 include/leptonica/bilateral.h
@@ -18,6 +19,7 @@ include/leptonica/bmf.h
 include/leptonica/bmfdata.h
 include/leptonica/bmp.h
 include/leptonica/ccbord.h
+include/leptonica/ccbord_internal.h
 include/leptonica/colorfill.h
 include/leptonica/dewarp.h
 include/leptonica/endianness.h
@@ -31,6 +33,7 @@ include/leptonica/leptwin.h
 include/leptonica/list.h
 include/leptonica/morph.h
 include/leptonica/pix.h
+include/leptonica/pix_internal.h
 include/leptonica/ptra.h
 include/leptonica/queue.h
 include/leptonica/rbtree.h
@@ -46,10 +49,10 @@ lib/cmake/leptonica/LeptonicaConfig.cmake
 lib/cmake/leptonica/LeptonicaTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/leptonica/LeptonicaTargets.cmake
 lib/liblept.so
-lib/liblept.so.5
-lib/liblept.so.5.4.0
+lib/liblept.so.6
+lib/liblept.so.6.0.0
 lib/libleptonica.so
-lib/libleptonica.so.5
-lib/libleptonica.so.5.4.0
+lib/libleptonica.so.6
+lib/libleptonica.so.6.0.0
 libdata/pkgconfig/lept.pc
 share/cmake/Modules/FindLeptonica.cmake