Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 31 Jan 2017 13:30:24 +0000 (UTC)
From:      "Lev A. Serebryakov" <lev@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r432914 - in head/devel/stlink: . files
Message-ID:  <201701311330.v0VDUOxh067560@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: lev
Date: Tue Jan 31 13:30:23 2017
New Revision: 432914
URL: https://svnweb.freebsd.org/changeset/ports/432914

Log:
   Update to latest commit after 1.3.0 release

Added:
  head/devel/stlink/files/
  head/devel/stlink/files/extra-pacth-turn-off-gtk   (contents, props changed)
  head/devel/stlink/files/patch-doc_man_CMakeLists.txt   (contents, props changed)
  head/devel/stlink/files/patch-usr_lib_pkgconfig_CMakeLists.txt   (contents, props changed)
Modified:
  head/devel/stlink/Makefile
  head/devel/stlink/distinfo
  head/devel/stlink/pkg-plist

Modified: head/devel/stlink/Makefile
==============================================================================
--- head/devel/stlink/Makefile	Tue Jan 31 13:03:00 2017	(r432913)
+++ head/devel/stlink/Makefile	Tue Jan 31 13:30:23 2017	(r432914)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	stlink
-PORTVERSION=	1.2.0.20160506
+PORTVERSION=	1.3.0.20170131
 CATEGORIES=	devel
 
 MAINTAINER=	lev@FreeBSD.org
@@ -11,21 +11,22 @@ LICENSE=	BSD3CLAUSE
 
 OPTIONS_DEFINE=		GTK3
 OPTIONS_SUB=		GTK3
-GTK3_CONFIGURE_ON=	--with-gtk
+GTK3_EXTRA_PATCHES_OFF=	${FILESDIR}/extra-pacth-turn-off-gtk
 GTK3_USE=		GNOME=gtk30
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	texane
-GH_TAGNAME=	e454fe9
+GH_TAGNAME=	f62895b
 
-USES=		autoreconf gmake pkgconfig
-GNU_CONFIGURE=	yes
+USES=		cmake pkgconfig
+USE_LDCONFIG=	yes
 
-PORTDOCS=	README tutorial.md
+PORTDOCS=	README.md tested-boards.md tutorial.md
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/README
+	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}/README
+	${INSTALL_DATA} ${WRKSRC}/doc/tested-boards.md ${STAGEDIR}${DOCSDIR}/tested-boards.md
 	${INSTALL_DATA} ${WRKSRC}/doc/tutorial.md ${STAGEDIR}${DOCSDIR}/tutorial.md
 
 .include <bsd.port.mk>

Modified: head/devel/stlink/distinfo
==============================================================================
--- head/devel/stlink/distinfo	Tue Jan 31 13:03:00 2017	(r432913)
+++ head/devel/stlink/distinfo	Tue Jan 31 13:30:23 2017	(r432914)
@@ -1,2 +1,3 @@
-SHA256 (texane-stlink-1.2.0.20160506-e454fe9_GH0.tar.gz) = ebd6203d8b89a836e02cfc48447e3d94550b8acd659ded8e4e17e76f86a13f1d
-SIZE (texane-stlink-1.2.0.20160506-e454fe9_GH0.tar.gz) = 108952
+TIMESTAMP = 1485868262
+SHA256 (texane-stlink-1.3.0.20170131-f62895b_GH0.tar.gz) = d84c5da8c1a726a0170886b055dfab17524df1a7812c8277eedfaa9c249cd67e
+SIZE (texane-stlink-1.3.0.20170131-f62895b_GH0.tar.gz) = 130217

Added: head/devel/stlink/files/extra-pacth-turn-off-gtk
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/stlink/files/extra-pacth-turn-off-gtk	Tue Jan 31 13:30:23 2017	(r432914)
@@ -0,0 +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 @@
+ # Dependencies
+ ###
+ find_package(LibUSB REQUIRED)
+-if (NOT APPLE AND NOT WIN32)
+-	find_package(PkgConfig)
+-	pkg_check_modules(gtk gtk+-3.0)
+-endif ()
++#if (NOT APPLE AND NOT WIN32)
++#	find_package(PkgConfig)
++#	pkg_check_modules(gtk gtk+-3.0)
++#endif ()
+ 
+ include(CheckIncludeFile)
+ CHECK_INCLUDE_FILE(sys/mman.h STLINK_HAVE_SYS_MMAN_H)

Added: head/devel/stlink/files/patch-doc_man_CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/stlink/files/patch-doc_man_CMakeLists.txt	Tue Jan 31 13:30:23 2017	(r432914)
@@ -0,0 +1,11 @@
+--- doc/man/CMakeLists.txt.orig	2017-01-30 06:06:25 UTC
++++ doc/man/CMakeLists.txt
+@@ -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()

Added: head/devel/stlink/files/patch-usr_lib_pkgconfig_CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/stlink/files/patch-usr_lib_pkgconfig_CMakeLists.txt	Tue Jan 31 13:30:23 2017	(r432914)
@@ -0,0 +1,9 @@
+--- usr/lib/pkgconfig/CMakeLists.txt.orig	2017-01-30 06:06:25 UTC
++++ usr/lib/pkgconfig/CMakeLists.txt
+@@ -10,5 +10,5 @@ configure_file(
+ )
+ 
+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc"
+-	DESTINATION lib/${CMAKE_LIBRARY_PATH}/pkgconfig/
++	DESTINATION libdata/pkgconfig/
+ )

Modified: head/devel/stlink/pkg-plist
==============================================================================
--- head/devel/stlink/pkg-plist	Tue Jan 31 13:03:00 2017	(r432913)
+++ head/devel/stlink/pkg-plist	Tue Jan 31 13:30:23 2017	(r432914)
@@ -1,6 +1,24 @@
 bin/st-flash
 bin/st-info
-bin/st-term
 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.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%%/ui/stlink-gui.ui
+%%GTK3%%%%DATADIR%%/stlink-gui.ui



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701311330.v0VDUOxh067560>