Index: head/devel/stlink/Makefile
===================================================================
--- head/devel/stlink/Makefile	(revision 537616)
+++ head/devel/stlink/Makefile	(revision 537617)
@@ -1,39 +1,45 @@
 # $FreeBSD$
 
 PORTNAME=	stlink
-PORTVERSION=	1.5.0
-PORTREVISION=	2
+PORTVERSION=	1.6.1
+#PORTREVISION=	0
 CATEGORIES=	devel
 
 MAINTAINER=	lev@FreeBSD.org
 COMMENT=	STM32 ST-Link JTAG variant tools
 
 LICENSE=	BSD3CLAUSE
 
 OPTIONS_DEFINE=		GTK3 DOCS
 OPTIONS_SUB=		yes
 GTK3_EXTRA_PATCHES_OFF=	${FILESDIR}/extra-pacth-turn-off-gtk
 GTK3_USES=		gnome
 GTK3_USE=		GNOME=gtk30
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	texane
+GH_TAGNAME=	v${PORTVERSION}
 
 USES=		cmake pkgconfig
 USE_LDCONFIG=	yes
 
-PORTDOCS=	README.md tested-boards.md tutorial.md
+PORTDOCS=	README.md ${ALLDOCS}
 
+ALLDOCS=	compiling.md developer.txt devices_boards.md \
+		flashloaders.md release.md tutorial.md \
+		version_support.md
+
 .include <bsd.port.pre.mk>
 
 .if ! ${ARCH:M*64*}
 EXTRA_PATCHES+=	${FILESDIR}/extra-pacth-32bit
 .endif
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}/README.md
-	${INSTALL_DATA} ${WRKSRC}/doc/tested-boards.md ${STAGEDIR}${DOCSDIR}/tested-boards.md
-	${INSTALL_DATA} ${WRKSRC}/doc/tutorial.md ${STAGEDIR}${DOCSDIR}/tutorial.md
+.for DOC in ${ALLDOCS}
+	${INSTALL_DATA} ${WRKSRC}/doc/${DOC} ${STAGEDIR}${DOCSDIR}/${DOC}
+.endfor
 
 .include <bsd.port.post.mk>
Index: head/devel/stlink/distinfo
===================================================================
--- head/devel/stlink/distinfo	(revision 537616)
+++ head/devel/stlink/distinfo	(revision 537617)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1519129443
-SHA256 (texane-stlink-1.5.0_GH0.tar.gz) = 4f0301edf9e904688ba31cf181653102f367c747e23ad356de1c430d1a654e2e
-SIZE (texane-stlink-1.5.0_GH0.tar.gz) = 140484
+TIMESTAMP = 1591103161
+SHA256 (texane-stlink-1.6.1-v1.6.1_GH0.tar.gz) = ca9a640f84c3e2c9873bd51759594bc05c00cdf6e1f21b434ae2c0e7985433d8
+SIZE (texane-stlink-1.6.1-v1.6.1_GH0.tar.gz) = 295826
Index: head/devel/stlink/files/patch-usr_lib_pkgconfig_CMakeLists.txt
===================================================================
--- head/devel/stlink/files/patch-usr_lib_pkgconfig_CMakeLists.txt	(revision 537616)
+++ head/devel/stlink/files/patch-usr_lib_pkgconfig_CMakeLists.txt	(nonexistent)
@@ -1,9 +0,0 @@
---- usr/lib/pkgconfig/CMakeLists.txt.orig	2017-07-01 17:41:54.000000000 +0300
-+++ usr/lib/pkgconfig/CMakeLists.txt	2017-08-21 18:28:07.997277000 +0300
-@@ -10,5 +10,5 @@ configure_file(
- )
- 
- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc"
--	DESTINATION ${STLINK_LIBRARY_PATH}/pkgconfig/
-+	DESTINATION libdata/pkgconfig/
- )

Property changes on: head/devel/stlink/files/patch-usr_lib_pkgconfig_CMakeLists.txt
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/devel/stlink/files/patch-cmake_CFlags.cmake
===================================================================
--- head/devel/stlink/files/patch-cmake_CFlags.cmake	(revision 537616)
+++ head/devel/stlink/files/patch-cmake_CFlags.cmake	(nonexistent)
@@ -1,10 +0,0 @@
---- cmake/CFlags.cmake.orig	2017-07-01 17:41:54.000000000 +0300
-+++ cmake/CFlags.cmake	2017-08-21 18:28:07.994387000 +0300
-@@ -27,6 +27,7 @@ add_cflag_if_supported("-Wmaybe-uninitia
- add_cflag_if_supported("-Wmissing-variable-declarations")
- add_cflag_if_supported("-Wshorten-64-to-32")
- add_cflag_if_supported("-Wimplicit-function-declaration")
-+add_cflag_if_supported("-Wno-string-plus-int")
- 
- ##
- # On OpenBSD the system headers suck so we need to disable redundant declaration check

Property changes on: head/devel/stlink/files/patch-cmake_CFlags.cmake
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/devel/stlink/files/extra-pacth-turn-off-gtk
===================================================================
--- head/devel/stlink/files/extra-pacth-turn-off-gtk	(revision 537616)
+++ head/devel/stlink/files/extra-pacth-turn-off-gtk	(revision 537617)
@@ -1,17 +1,19 @@
---- CMakeLists.txt.orig	2017-07-01 17:41:54.000000000 +0300
-+++ CMakeLists.txt	2017-08-21 18:28:07.992623000 +0300
-@@ -21,10 +21,10 @@ include(cmake/CFlags.cmake)
- # Dependencies
- ###
- find_package(LibUSB REQUIRED)
--if (NOT APPLE AND NOT WIN32 AND NOT CMAKE_CROSSCOMPILING)
--	find_package(PkgConfig)
--	pkg_check_modules(gtk gtk+-3.0)
+--- CMakeLists.txt.orig	2020-06-01 01:00:20.000000000 +0300
++++ CMakeLists.txt	2020-06-02 16:07:00.308748843 +0300
+@@ -48,11 +48,11 @@ endif ()
+ find_package(libusb REQUIRED)
+ 
+ ## Package configuration (pkg-config) on unix-based systems
+-if (NOT WIN32 AND NOT CMAKE_CROSSCOMPILING)
+-    #add_subdirectory(cmake/pkgconfig)
+-    find_package(PkgConfig)
+-    pkg_check_modules(GTK3 gtk+-3.0)
 -endif ()
-+#if (NOT APPLE AND NOT WIN32 AND NOT CMAKE_CROSSCOMPILING)
-+#	find_package(PkgConfig)
-+#	pkg_check_modules(gtk gtk+-3.0)
++#if (NOT WIN32 AND NOT CMAKE_CROSSCOMPILING)
++#    #add_subdirectory(cmake/pkgconfig)
++#    find_package(PkgConfig)
++#    pkg_check_modules(GTK3 gtk+-3.0)
 +#endif ()
  
+ ## Check for system-specific additional header files and libraries
  include(CheckIncludeFile)
- CHECK_INCLUDE_FILE(sys/mman.h STLINK_HAVE_SYS_MMAN_H)
Index: head/devel/stlink/files/patch-CMakeLists.txt
===================================================================
--- head/devel/stlink/files/patch-CMakeLists.txt	(nonexistent)
+++ head/devel/stlink/files/patch-CMakeLists.txt	(revision 537617)
@@ -0,0 +1,23 @@
+--- CMakeLists.txt.orig	2020-05-31 22:00:20 UTC
++++ CMakeLists.txt
+@@ -71,7 +71,11 @@ include(CheckLibraryExists)
+ 
+ CHECK_LIBRARY_EXISTS(ssp __stack_chk_fail "" _stack_chk_fail_exists)
+ if (_stack_chk_fail_exists)
+-    set(SSP_LIB -static ssp)
++    if(WIN32)
++        set(SSP_LIB -static ssp)
++    else()
++        set(SSP_LIB ssp)
++    endif()
+ else ()
+     set(SSP_LIB "")
+ endif ()
+@@ -278,6 +282,7 @@ add_subdirectory(include) # contains subordinate CMake
+ add_subdirectory(src/stlink-gui)  # contains subordinate CMakeLists to build GUI
+ add_subdirectory(tests)           # contains subordinate CMakeLists to build test executables
+ add_subdirectory(cmake/packaging) # contains subordinate CMakeLists to build packages
++add_subdirectory(cmake/pkgconfig) # contains subordinate CMakeLists to build pkgconfig file
+ 
+ option(STLINK_GENERATE_MANPAGES "Generate manpages with pandoc" OFF)
+ add_subdirectory(doc/man)         # contains subordinate CMakeLists to generate manpages

Property changes on: head/devel/stlink/files/patch-CMakeLists.txt
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/devel/stlink/files/patch-cmake_modules_c__flags.cmake
===================================================================
--- head/devel/stlink/files/patch-cmake_modules_c__flags.cmake	(nonexistent)
+++ head/devel/stlink/files/patch-cmake_modules_c__flags.cmake	(revision 537617)
@@ -0,0 +1,10 @@
+--- cmake/modules/c_flags.cmake.orig	2020-05-31 22:00:20 UTC
++++ cmake/modules/c_flags.cmake
+@@ -30,6 +30,7 @@ add_cflag_if_supported("-Wmaybe-uninitialized")
+ add_cflag_if_supported("-Wmissing-variable-declarations")
+ add_cflag_if_supported("-Wshorten-64-to-32")
+ add_cflag_if_supported("-Wimplicit-function-declaration")
++add_cflag_if_supported("-Wno-string-plus-int")
+ 
+ ##
+ # On OpenBSD the system headers suck so we need to disable redundant declaration check

Property changes on: head/devel/stlink/files/patch-cmake_modules_c__flags.cmake
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/devel/stlink/files/patch-cmake_pkgconfig_CMakeLists.txt
===================================================================
--- head/devel/stlink/files/patch-cmake_pkgconfig_CMakeLists.txt	(nonexistent)
+++ head/devel/stlink/files/patch-cmake_pkgconfig_CMakeLists.txt	(revision 537617)
@@ -0,0 +1,9 @@
+--- cmake/pkgconfig/CMakeLists.txt.orig	2020-05-31 22:00:20 UTC
++++ cmake/pkgconfig/CMakeLists.txt
+@@ -11,5 +11,5 @@ configure_file(
+ 
+ install(
+     FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc"
+-    DESTINATION ${STLINK_LIBRARY_PATH}/pkgconfig
++    DESTINATION libdata/pkgconfig/
+     )

Property changes on: head/devel/stlink/files/patch-cmake_pkgconfig_CMakeLists.txt
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/devel/stlink/files/patch-doc_man_CMakeLists.txt
===================================================================
--- head/devel/stlink/files/patch-doc_man_CMakeLists.txt	(revision 537616)
+++ head/devel/stlink/files/patch-doc_man_CMakeLists.txt	(revision 537617)
@@ -1,11 +1,11 @@
---- doc/man/CMakeLists.txt.orig	2017-07-01 17:41:54.000000000 +0300
-+++ doc/man/CMakeLists.txt	2017-08-21 18:28:07.995838000 +0300
-@@ -31,7 +31,7 @@ foreach(manpage ${MANPAGES})
- 	endif()
+--- doc/man/CMakeLists.txt.orig	2020-05-31 22:00:20 UTC
++++ doc/man/CMakeLists.txt
+@@ -30,7 +30,7 @@ foreach (manpage ${MANPAGES})
+     endif ()
  
- 	if (f AND NOT WIN32)
--		install(FILES ${f} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1)
-+		install(FILES ${f} DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man1)
- 		unset(f)
- 	endif()
- endforeach()
+     if (f AND NOT WIN32)
+-        install(FILES ${f} DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/man/man1)
++        install(FILES ${f} DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man1)
+         unset(f)
+     endif ()
+ endforeach ()
Index: head/devel/stlink/pkg-plist
===================================================================
--- head/devel/stlink/pkg-plist	(revision 537616)
+++ head/devel/stlink/pkg-plist	(revision 537617)
@@ -1,24 +1,21 @@
 bin/st-flash
 bin/st-info
 bin/st-util
 include/stlink.h
+include/stm32.h
 include/stlink/backend.h
 include/stlink/chipid.h
 include/stlink/commands.h
 include/stlink/flash_loader.h
-include/stlink/logging.h
-include/stlink/mmap.h
 include/stlink/reg.h
-include/stlink/sg.h
-include/stlink/usb.h
 include/stlink/version.h
-lib/libstlink-shared.so
-lib/libstlink-shared.so.1
-lib/libstlink-shared.so.1.5.0
+lib/libstlink.so
+lib/libstlink.so.1
+lib/libstlink.so.1.6.1
 lib/libstlink.a
 libdata/pkgconfig/stlink.pc
 man/man1/st-flash.1.gz
 man/man1/st-info.1.gz
 man/man1/st-util.1.gz
 %%GTK3%%bin/stlink-gui
 %%GTK3%%%%DATADIR%%/stlink-gui.ui