diff --git graphics/ossim/Makefile graphics/ossim/Makefile
index e3c176913d87..9cf9730893af 100644
--- graphics/ossim/Makefile
+++ graphics/ossim/Makefile
@@ -1,9 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	ossim
-DISTVERSIONPREFIX=	Laguna-
-DISTVERSION=	2.8.0
-PORTREVISION=	2
+DISTVERSIONPREFIX=	Miami-
+DISTVERSION=	2.9.1
 CATEGORIES=	graphics geography
 
 MAINTAINER=	lbartoletti@tuxfamily.org
@@ -33,4 +32,9 @@ CMAKE_ARGS=	-DBUILD_LIBRARY_DIR:STRING=lib \
 		-DINSTALL_LIBRARY_DIR:STRING=lib \
 		-DOSSIM_INCLUDE_DIR:STRING=${WRKSRC}/include
 
+OPTIONS_DEFINE=	TEST
+OPTIONS_SUB=	yes
+
+TEST_CMAKE_BOOL=	BUILD_OSSIM_TESTS
+
 .include <bsd.port.mk>
diff --git graphics/ossim/distinfo graphics/ossim/distinfo
index decf361435a1..f68cdfddb29f 100644
--- graphics/ossim/distinfo
+++ graphics/ossim/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1557462365
-SHA256 (ossimlabs-ossim-Laguna-2.8.0_GH0.tar.gz) = 3a8fb6332083461f388b99f4f174ee6500960574d090bc400c3537af8e563686
-SIZE (ossimlabs-ossim-Laguna-2.8.0_GH0.tar.gz) = 6839012
+TIMESTAMP = 1568317313
+SHA256 (ossimlabs-ossim-Miami-2.9.1_GH0.tar.gz) = 0a053ae81fd4257fc664931bf0ed3380992250a146dc977402d4b759221f520b
+SIZE (ossimlabs-ossim-Miami-2.9.1_GH0.tar.gz) = 6859702
diff --git graphics/ossim/files/patch-cmake_CMakeModules_FindJsonCpp.cmake graphics/ossim/files/patch-cmake_CMakeModules_FindJsonCpp.cmake
deleted file mode 100644
index 4a1206429c09..000000000000
--- graphics/ossim/files/patch-cmake_CMakeModules_FindJsonCpp.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
---- cmake/CMakeModules/FindJsonCpp.cmake.orig	2019-05-10 05:17:01 UTC
-+++ cmake/CMakeModules/FindJsonCpp.cmake
-@@ -16,7 +16,7 @@ set(JSONCPP_FOUND "NO")
- set(OSSIM_HAS_JSONCPP 0)
- 
- find_path( JSONCPP_INCLUDE_DIR json/json.h
--          PATHS "${CMAKE_INSTALL_PREFIX}" "/usr/include/jsoncpp" )
-+          PATHS "${CMAKE_INSTALL_PREFIX}/include/jsoncpp" )
- 
- find_library( JSONCPP_LIBRARY NAMES "jsoncpp")
- 
diff --git graphics/ossim/files/patch-src_projection_ossimRpcModel.cpp graphics/ossim/files/patch-src_projection_ossimRpcModel.cpp
deleted file mode 100644
index 964a92b8001a..000000000000
--- graphics/ossim/files/patch-src_projection_ossimRpcModel.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/projection/ossimRpcModel.cpp.orig	2019-03-28 19:14:59 UTC
-+++ src/projection/ossimRpcModel.cpp
-@@ -920,7 +920,7 @@ bool ossimRpcModel::loadState(const ossimKeywordlist& 
-                                           << std::endl;
-       return false;
-    }
--   thePolyType = (PolynomialType) value[0];
-+   thePolyType = (PolynomialType)value.at(0);
-       
-    keyword = LINE_SCALE_KW;
-    value = kwl.find(prefix, keyword);
diff --git graphics/ossim/pkg-plist graphics/ossim/pkg-plist
index dfcf90d0ee40..b4b26cf9dfdf 100644
--- graphics/ossim/pkg-plist
+++ graphics/ossim/pkg-plist
@@ -1,82 +1,84 @@
-bin/ossim-aux-dot-xml-test
-bin/ossim-band-lut-test
-bin/ossim-batch-test
-bin/ossim-byte-stream-buffer-test
-bin/ossim-chipper-test
-bin/ossim-csv-file-test
-bin/ossim-date-test
-bin/ossim-datum-shift
-bin/ossim-directory-test
-bin/ossim-dms-test
-bin/ossim-dted-handler-test
-bin/ossim-dump-vpf-table
-bin/ossim-duration-test
-bin/ossim-elevation-manager-test
-bin/ossim-envi-hdr-test
-bin/ossim-epsg-factory-test
-bin/ossim-eq-projection-test
-bin/ossim-fft-test
-bin/ossim-fgdc-txt-doc-test
-bin/ossim-filename-test
-bin/ossim-get-pixel-test
-bin/ossim-gpkg-writer-test
-bin/ossim-gpt-test
-bin/ossim-gsd-test
-bin/ossim-histo-compare
-bin/ossim-histogram-test
-bin/ossim-image-chain-test
-bin/ossim-image-elevation-test
-bin/ossim-image-geometry-test
-bin/ossim-image-handler-state-test
-bin/ossim-image-handler-test
-bin/ossim-image-writer-test
-bin/ossim-index-to-rgb-lut-test
-bin/ossim-info-test
-bin/ossim-jobqueue-test
-bin/ossim-keywordlist-test
-bin/ossim-kmeans-clustering-test
-bin/ossim-kmeans-filter-test
-bin/ossim-least-squares-plane-test
-bin/ossim-linear-stretch-remapper-test
-bin/ossim-loadtile-test
-bin/ossim-lsr-space-test
-bin/ossim-mask-filter-test
-bin/ossim-nitf-rsm-model-test
-bin/ossim-notify-test
-bin/ossim-obj-allocate
-bin/ossim-piecewise-remapper-test
-bin/ossim-pixel-flipper-test
-bin/ossim-point-cloud-handler-test
-bin/ossim-point-cloud-image-handler-test
-bin/ossim-point-test
-bin/ossim-projection-factory-test
-bin/ossim-projection-test
-bin/ossim-quickbird-metadata-test
-bin/ossim-range-dome-test
-bin/ossim-read-write-consistency-test
-bin/ossim-rect-test
-bin/ossim-ref-ptr-test
-bin/ossim-remap-table-test
-bin/ossim-shift-filter-test
-bin/ossim-single-image-chain-test
-bin/ossim-single-image-chain-threaded-test
-bin/ossim-srtm-support-data-test
-bin/ossim-stream-factory-test
-bin/ossim-string-test
-bin/ossim-thin-plate-spline-test
-bin/ossim-threaded-chain-test
-bin/ossim-threaded-elevation-test
-bin/ossim-threaded-logfile-test
-bin/ossim-threaded-polyarea2d-test
-bin/ossim-tiff-info-test
-bin/ossim-tiled-elevation-test
-bin/ossim-tools-test
-bin/ossim-viewshed-test
-bin/ossim-visitor-test
-bin/ossim-wavelength-test
-bin/ossim-wkt-proj-factory-test
-bin/ossim-wkt-test
-bin/ossim-xml-test
+%%TEST%%bin/ossim-aux-dot-xml-test
+%%TEST%%bin/ossim-band-lut-test
+%%TEST%%bin/ossim-batch-test
+%%TEST%%bin/ossim-byte-stream-buffer-test
+%%TEST%%bin/ossim-chipper-test
+%%TEST%%bin/ossim-csv-file-test
+%%TEST%%bin/ossim-date-test
+%%TEST%%bin/ossim-datum-shift
+%%TEST%%bin/ossim-directory-test
+%%TEST%%bin/ossim-dms-test
+%%TEST%%bin/ossim-dted-handler-test
+%%TEST%%bin/ossim-dump-vpf-table
+%%TEST%%bin/ossim-duration-test
+%%TEST%%bin/ossim-elevation-manager-test
+%%TEST%%bin/ossim-envi-hdr-test
+%%TEST%%bin/ossim-epsg-factory-test
+%%TEST%%bin/ossim-eq-projection-test
+%%TEST%%bin/ossim-fft-test
+%%TEST%%bin/ossim-fgdc-txt-doc-test
+%%TEST%%bin/ossim-filename-test
+%%TEST%%bin/ossim-get-pixel-test
+%%TEST%%bin/ossim-gpkg-writer-test
+%%TEST%%bin/ossim-gpt-test
+%%TEST%%bin/ossim-gsd-test
+%%TEST%%bin/ossim-histo-compare
+%%TEST%%bin/ossim-histogram-test
+%%TEST%%bin/ossim-image-chain-test
+%%TEST%%bin/ossim-image-elevation-test
+%%TEST%%bin/ossim-image-geometry-test
+%%TEST%%bin/ossim-image-handler-state-test
+%%TEST%%bin/ossim-image-handler-test
+%%TEST%%bin/ossim-image-writer-test
+%%TEST%%bin/ossim-index-to-rgb-lut-test
+%%TEST%%bin/ossim-info-test
+%%TEST%%bin/ossim-irect64-test
+%%TEST%%bin/ossim-jobqueue-test
+%%TEST%%bin/ossim-keywordlist-test
+%%TEST%%bin/ossim-kmeans-clustering-test
+%%TEST%%bin/ossim-kmeans-filter-test
+%%TEST%%bin/ossim-least-squares-plane-test
+%%TEST%%bin/ossim-linear-stretch-remapper-test
+%%TEST%%bin/ossim-loadtile-test
+%%TEST%%bin/ossim-lsr-space-test
+%%TEST%%bin/ossim-mask-filter-test
+%%TEST%%bin/ossim-nitf-rsm-model-test
+%%TEST%%bin/ossim-notify-test
+%%TEST%%bin/ossim-obj-allocate
+%%TEST%%bin/ossim-piecewise-remapper-test
+%%TEST%%bin/ossim-pixel-flipper-test
+%%TEST%%bin/ossim-point-cloud-handler-test
+%%TEST%%bin/ossim-point-cloud-image-handler-test
+%%TEST%%bin/ossim-point-test
+%%TEST%%bin/ossim-projection-factory-test
+%%TEST%%bin/ossim-projection-test
+%%TEST%%bin/ossim-quickbird-metadata-test
+%%TEST%%bin/ossim-range-dome-test
+%%TEST%%bin/ossim-read-write-consistency-test
+%%TEST%%bin/ossim-rect-test
+%%TEST%%bin/ossim-ref-ptr-test
+%%TEST%%bin/ossim-remap-table-test
+%%TEST%%bin/ossim-remap-tool-test
+%%TEST%%bin/ossim-shift-filter-test
+%%TEST%%bin/ossim-single-image-chain-test
+%%TEST%%bin/ossim-single-image-chain-threaded-test
+%%TEST%%bin/ossim-srtm-support-data-test
+%%TEST%%bin/ossim-stream-factory-test
+%%TEST%%bin/ossim-string-test
+%%TEST%%bin/ossim-thin-plate-spline-test
+%%TEST%%bin/ossim-threaded-chain-test
+%%TEST%%bin/ossim-threaded-elevation-test
+%%TEST%%bin/ossim-threaded-logfile-test
+%%TEST%%bin/ossim-threaded-polyarea2d-test
+%%TEST%%bin/ossim-tiff-info-test
+%%TEST%%bin/ossim-tiled-elevation-test
+%%TEST%%bin/ossim-tools-test
+%%TEST%%bin/ossim-viewshed-test
+%%TEST%%bin/ossim-visitor-test
+%%TEST%%bin/ossim-wavelength-test
+%%TEST%%bin/ossim-wkt-proj-factory-test
+%%TEST%%bin/ossim-wkt-test
+%%TEST%%bin/ossim-xml-test
 include/ossim/base/Barrier.h
 include/ossim/base/Block.h
 include/ossim/base/BlockIStream.h
@@ -91,6 +93,7 @@ include/ossim/base/Thread.h
 include/ossim/base/datum.h
 include/ossim/base/ossim2dBilinearTransform.h
 include/ossim/base/ossim2dLinearRegression.h
+include/ossim/base/ossim2dTo2dCompositeTransform.h
 include/ossim/base/ossim2dTo2dIdentityTransform.h
 include/ossim/base/ossim2dTo2dMatrixTransform.h
 include/ossim/base/ossim2dTo2dShiftTransform.h
@@ -222,7 +225,9 @@ include/ossim/base/ossimInterleaveTypeLut.h
 include/ossim/base/ossimIoStream.h
 include/ossim/base/ossimIosFwd.h
 include/ossim/base/ossimIpt.h
+include/ossim/base/ossimIpt64.h
 include/ossim/base/ossimIrect.h
+include/ossim/base/ossimIrect64.h
 include/ossim/base/ossimJpegYCbCrVector.h
 include/ossim/base/ossimKMeansClustering.h
 include/ossim/base/ossimKeyword.h
@@ -1009,6 +1014,7 @@ include/ossim/util/ossimInfo.h
 include/ossim/util/ossimOrthoIgen.h
 include/ossim/util/ossimOrthoTool.h
 include/ossim/util/ossimPointCloudTool.h
+include/ossim/util/ossimRemapTool.h
 include/ossim/util/ossimRpfUtil.h
 include/ossim/util/ossimShorelineTool.h
 include/ossim/util/ossimSlopeTool.h