diff --git a/gis/gpscorrelate/Portfile b/gis/gpscorrelate/Portfile
index b6af63ece6f..67dde3fed25 100644
--- a/gis/gpscorrelate/Portfile
+++ b/gis/gpscorrelate/Portfile
@@ -4,10 +4,9 @@ PortSystem           1.0
 PortGroup            active_variants 1.1
 PortGroup            github 1.0
 
-github.setup         dfandrich gpscorrelate 2.0
-revision             1
-# Change github.tarball_from to 'releases' or 'archive' next update
-github.tarball_from  tarball
+github.setup         dfandrich gpscorrelate 2.3
+revision             0
+github.tarball_from  archive
 categories           gis graphics
 license              GPL-2
 maintainers          {@sikmir gmail.com:sikmir} openmaintainer
@@ -15,14 +14,11 @@ description          GPS Photo Correlation
 long_description     Writes location data to EXIF tags using GPX files.
 homepage             https://dfandrich.github.io/gpscorrelate/
 
-checksums            rmd160  0c5c7eeeacb6d22dc6cf24e2935eb9e405089440 \
-                     sha256  ae768f00b4f3d7cac91809c6e3f80903bd6406c45cca77afae7ad12eba15d5af \
-                     size    270590
+checksums            rmd160  d2bd5c1db9477bac2ccd984d696ae4295b0d1db0 \
+                     sha256  5bea121473ee320ac326fcd817c2666bb0d2b68ec9cff18651b51ab506dd513c \
+                     size    412993
 
-depends_build-append bin:xsltproc:libxslt \
-                     port:docbook-xml-4.2 \
-                     port:docbook-xsl-nons \
-                     port:pkgconfig
+depends_build-append port:pkgconfig
 
 depends_lib-append   port:exiv2 \
                      port:gettext \
@@ -31,12 +27,28 @@ depends_lib-append   port:exiv2 \
 
 require_active_variants gtk3 x11
 
+compiler.cxx_standard   2011
+
 use_configure          no
 
 build.args-append      prefix=${prefix} \
-                       CFLAGS="-Wall -O2 -DENABLE_NLS" \
-                       LDFLAGS="-Wall -O2 -lm -lintl" \
-                       XSLTPROC="--nonet"
+                       CFLAGS="-Wall -Wextra -Werror -Wno-error=deprecated-declarations -O3 -DENABLE_NLS=1" \
+                       CXXFLAGS="-Wall -Wextra -Werror -Wno-error=deprecated-declarations -O3 -DENABLE_NLS=1 -std=c++11" \
+                       LDFLAGS="-O3 -lintl"
+
+patchfiles             man.patch
+compiler.cxx_standard  2011
 
 destroot.args-append   prefix=${prefix}
 destroot.target-append install-po
+
+post-destroot {
+    set docdir ${prefix}/share/doc/${name}
+    xinstall -d ${destroot}${docdir}
+    xinstall -m 0444 {*}[glob ${worksrcpath}/doc/*.html] \
+    ${destroot}${docdir}
+    xinstall -m 0444 {*}[glob ${worksrcpath}/doc/*.png] \
+    ${destroot}${docdir}
+    xinstall -m 0644 -W ${worksrcpath} README.md gpscorrelate-gui.svg \
+    ${destroot}${docdir}
+}
diff --git a/gis/gpscorrelate/files/man.patch b/gis/gpscorrelate/files/man.patch
new file mode 100644
index 00000000000..1b10be0cbde
--- /dev/null
+++ b/gis/gpscorrelate/files/man.patch
@@ -0,0 +1,57 @@
+--- Makefile_orig	2026-04-04 19:53:49
++++ Makefile	2026-04-04 19:55:21
+@@ -38,7 +38,7 @@
+ 
+ DEFS = -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\" -DPACKAGE_LOCALE_DIR=\"$(localedir)\" -DPACKAGE_DOC_DIR=\"$(docdir)\"
+ 
+-TARGETS = gpscorrelate-gui$(EXEEXT) gpscorrelate$(EXEEXT) doc/gpscorrelate.1 doc/gpscorrelate.html
++TARGETS = gpscorrelate-gui$(EXEEXT) gpscorrelate$(EXEEXT)
+ 
+ all:	$(TARGETS)
+ 
+@@ -61,7 +61,7 @@
+ 	(cd tests && ./testsuite $(CHECK_OPTIONS))
+ 
+ clean:
+-	rm -f *.o gpscorrelate$(EXEEXT) gpscorrelate-gui$(EXEEXT) doc/gpscorrelate-manpage.xml tests/log/* io.github.dfandrich.gpscorrelate.metainfo.xml $(TARGETS)
++	rm -f *.o gpscorrelate$(EXEEXT) gpscorrelate-gui$(EXEEXT) tests/log/* io.github.dfandrich.gpscorrelate.metainfo.xml $(TARGETS)
+ 
+ distclean: clean clean-po
+ 	rm -f AUTHORS
+@@ -69,31 +69,14 @@
+ install: all
+ 	install -d $(DESTDIR)$(bindir)
+ 	install -m 0755 gpscorrelate$(EXEEXT) gpscorrelate-gui$(EXEEXT) $(DESTDIR)$(bindir)
+-	install -d $(DESTDIR)$(mandir)/man1
+-	install -m 0644 doc/gpscorrelate.1 $(DESTDIR)$(mandir)/man1
+-	install -d $(DESTDIR)$(docdir)
+-	install -p -m 0644 doc/*.html doc/*.png README.md $(DESTDIR)$(docdir)
+-	install -m 0644 gpscorrelate-gui.svg $(DESTDIR)$(docdir)
+-	install -d $(DESTDIR)$(docdir)/fr
+-	install -p -m 0644 doc/fr/*.html doc/fr/*.png $(DESTDIR)$(docdir)/fr
+ 
+ install-desktop-file:
+ 	desktop-file-install --vendor="" --dir="$(DESTDIR)$(applicationsdir)" gpscorrelate.desktop
+ 	install -d $(DESTDIR)$(datadir)/icons/hicolor/scalable/apps
+ 	install -p -m 0644 gpscorrelate-gui.svg $(DESTDIR)$(datadir)/icons/hicolor/scalable/apps/gpscorrelate-gui.svg
+ 
+-docs: doc/gpscorrelate.1 doc/gpscorrelate.html
+ 
+-# BSD make doesn't work with $< as the prerequisite in the following rules but $? is fine
+-doc/gpscorrelate-manpage.xml: doc/gpscorrelate-manpage.xml.in
+-	sed -e 's,@DOCDIR@,$(docdir),g' -e 's,@PACKAGE_VERSION@,$(PACKAGE_VERSION),g' $? > $@
+ 
+-doc/gpscorrelate.1: doc/gpscorrelate-manpage.xml
+-	xsltproc $(XSLTFLAGS) -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $?
+-
+-doc/gpscorrelate.html: doc/gpscorrelate-manpage.xml
+-	xsltproc $(XSLTFLAGS) -o $@ http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl $?
+-
+ # This is intended to be used only by the maintainer
+ io.github.dfandrich.gpscorrelate.metainfo.xml: io.github.dfandrich.gpscorrelate.metainfo.xml.in
+ 	intltool-merge -x po $< $@
+@@ -129,3 +112,4 @@
+ 	-rm gpscorrelate-$(PACKAGE_VERSION).tar.gz
+ 	gzip -9 gpscorrelate-$(PACKAGE_VERSION).tar
+ 	rm -r gpscorrelate-$(PACKAGE_VERSION)
++