Index: head/devel/stlink/Makefile =================================================================== --- head/devel/stlink/Makefile (revision 448477) +++ head/devel/stlink/Makefile (revision 448478) @@ -1,32 +1,32 @@ # $FreeBSD$ PORTNAME= stlink -PORTVERSION= 1.3.1 +PORTVERSION= 1.4.0 PORTREVISION= 0 CATEGORIES= devel MAINTAINER= lev@FreeBSD.org COMMENT= STM32 ST-Link JTAG variant tools LICENSE= BSD3CLAUSE OPTIONS_DEFINE= GTK3 OPTIONS_SUB= GTK3 GTK3_EXTRA_PATCHES_OFF= ${FILESDIR}/extra-pacth-turn-off-gtk GTK3_USE= GNOME=gtk30 USE_GITHUB= yes GH_ACCOUNT= texane USES= cmake pkgconfig USE_LDCONFIG= yes PORTDOCS= README.md tested-boards.md tutorial.md 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 .include Index: head/devel/stlink/distinfo =================================================================== --- head/devel/stlink/distinfo (revision 448477) +++ head/devel/stlink/distinfo (revision 448478) @@ -1,3 +1,3 @@ -TIMESTAMP = 1488203800 -SHA256 (texane-stlink-1.3.1_GH0.tar.gz) = 5d346b884b5cf1f7f9bb7fd7ee049b3b2e880785c7a15774d0b1a6574823e63b -SIZE (texane-stlink-1.3.1_GH0.tar.gz) = 130587 +TIMESTAMP = 1503328091 +SHA256 (texane-stlink-1.4.0_GH0.tar.gz) = d99b8385cce8071d5e58de21b6c8866058af20a8dd46ecf01e1c1dc3aa038cc9 +SIZE (texane-stlink-1.4.0_GH0.tar.gz) = 138765 Index: head/devel/stlink/files/extra-pacth-turn-off-gtk =================================================================== --- head/devel/stlink/files/extra-pacth-turn-off-gtk (revision 448477) +++ head/devel/stlink/files/extra-pacth-turn-off-gtk (revision 448478) @@ -1,17 +1,17 @@ ---- CMakeLists.txt.orig 2017-01-31 16:20:32.995425000 +0300 -+++ CMakeLists.txt 2017-01-31 16:20:46.354608000 +0300 -@@ -19,10 +19,10 @@ +--- 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) +-if (NOT APPLE AND NOT WIN32 AND NOT CMAKE_CROSSCOMPILING) - find_package(PkgConfig) - pkg_check_modules(gtk gtk+-3.0) -endif () -+#if (NOT APPLE AND NOT WIN32) ++#if (NOT APPLE AND NOT WIN32 AND NOT CMAKE_CROSSCOMPILING) +# find_package(PkgConfig) +# pkg_check_modules(gtk gtk+-3.0) +#endif () include(CheckIncludeFile) CHECK_INCLUDE_FILE(sys/mman.h STLINK_HAVE_SYS_MMAN_H) Index: head/devel/stlink/files/patch-cmake_CFlags.cmake =================================================================== --- head/devel/stlink/files/patch-cmake_CFlags.cmake (nonexistent) +++ head/devel/stlink/files/patch-cmake_CFlags.cmake (revision 448478) @@ -0,0 +1,10 @@ +--- 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 ___________________________________________________________________ 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 448477) +++ head/devel/stlink/files/patch-doc_man_CMakeLists.txt (revision 448478) @@ -1,11 +1,11 @@ ---- doc/man/CMakeLists.txt.orig 2017-01-30 06:06:25 UTC -+++ doc/man/CMakeLists.txt +--- 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() 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() Index: head/devel/stlink/files/patch-usr_lib_pkgconfig_CMakeLists.txt =================================================================== --- head/devel/stlink/files/patch-usr_lib_pkgconfig_CMakeLists.txt (revision 448477) +++ head/devel/stlink/files/patch-usr_lib_pkgconfig_CMakeLists.txt (revision 448478) @@ -1,9 +1,9 @@ ---- usr/lib/pkgconfig/CMakeLists.txt.orig 2017-01-30 06:06:25 UTC -+++ usr/lib/pkgconfig/CMakeLists.txt +--- 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 lib/${CMAKE_LIBRARY_PATH}/pkgconfig/ +- DESTINATION ${STLINK_LIBRARY_PATH}/pkgconfig/ + DESTINATION libdata/pkgconfig/ ) Index: head/devel/stlink/pkg-plist =================================================================== --- head/devel/stlink/pkg-plist (revision 448477) +++ head/devel/stlink/pkg-plist (revision 448478) @@ -1,24 +1,24 @@ bin/st-flash bin/st-info bin/st-util include/stlink.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.3.1 +lib/libstlink-shared.so.1.4.0 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