Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 21 Nov 2016 15:05:04 +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: r426727 - in head/devel/msp430-debug-stack: . files
Message-ID:  <201611211505.uALF54bN008901@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: lev
Date: Mon Nov 21 15:05:03 2016
New Revision: 426727
URL: https://svnweb.freebsd.org/changeset/ports/426727

Log:
   Update to latest version 3.8.1.0 (link on site contains mistake).

Added:
  head/devel/msp430-debug-stack/files/patch-DLL430__v3_src_TI_DLL430_OldApiV3.cpp   (contents, props changed)
Modified:
  head/devel/msp430-debug-stack/Makefile
  head/devel/msp430-debug-stack/distinfo
  head/devel/msp430-debug-stack/files/patch-DLL430__v3_src_TI_DLL430_UsbCdcIoChannel.cpp
  head/devel/msp430-debug-stack/files/patch-Makefile
  head/devel/msp430-debug-stack/pkg-plist

Modified: head/devel/msp430-debug-stack/Makefile
==============================================================================
--- head/devel/msp430-debug-stack/Makefile	Mon Nov 21 15:01:18 2016	(r426726)
+++ head/devel/msp430-debug-stack/Makefile	Mon Nov 21 15:05:03 2016	(r426727)
@@ -1,17 +1,17 @@
 # $FreeBSD$
 
 PORTNAME=	msp430-debug-stack
-PORTVERSION=	3.05.01.01
-PORTREVISION=	3
+PORTVERSION=	3.8.0.1
+PORTREVISION=	0
 CATEGORIES=	devel
-MASTER_SITES=	http://www.ti.com/lit/sw/slac460n/ \
-		http://www.ti.com/lit/ug/slau320v/:doc1 \
-		http://www.ti.com/lit/ug/slau656/:doc2
-DISTFILES=	slac460n.zip \
-		slau320v.pdf:doc1 \
-		slau656.pdf:doc2
+MASTER_SITES=	http://www.ti.com/lit/sw/slac460r/ \
+		http://www.ti.com/lit/ug/slau320x/:doc1 \
+		http://www.ti.com/lit/ug/slau656b/:doc2
+DISTFILES=	slac460r.zip \
+		slau320x.pdf:doc1 \
+		slau656b.pdf:doc2
 DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
-EXTRACT_ONLY=	slac460n.zip
+EXTRACT_ONLY=	slac460r.zip
 
 MAINTAINER=	lev@FreeBSD.org
 COMMENT=	TI MSP430 debugging interface library
@@ -26,7 +26,7 @@ BROKEN_FreeBSD_9=	does not build (intern
 USES=		compiler:c++11-lib dos2unix gmake zip:infozip
 USE_LDCONFIG=	yes
 
-WRKSRC=		${WRKDIR}/MSPDebugStack_OS_Package
+WRKSRC=		${WRKDIR}
 DOS2UNIX_REGEX=	.*\.(cpp|h)
 
 MAKE_ARGS+=	BOOST_DIR=${LOCALBASE} \
@@ -45,11 +45,12 @@ post-patch:
 
 do-install:
 	${INSTALL_LIB} ${WRKSRC}/libmsp430.so ${STAGEDIR}${PREFIX}/lib/libmsp430.so
+	${INSTALL_DATA} ${WRKSRC}/libmsp430.a ${STAGEDIR}${PREFIX}/lib/libmsp430.a
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/libmsp430
 	${INSTALL_DATA} ${WRKSRC}/DLL430_v3/include/* ${STAGEDIR}${PREFIX}/include/libmsp430/
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/slau320v.pdf ${STAGEDIR}${DOCSDIR}/
-	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/slau656.pdf ${STAGEDIR}${DOCSDIR}/
+	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/slau320x.pdf ${STAGEDIR}${DOCSDIR}/
+	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/slau656b.pdf ${STAGEDIR}${DOCSDIR}/
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/devd
 	${INSTALL_DATA} ${FILESDIR}/mspfet.conf ${STAGEDIR}${PREFIX}/etc/devd
 

Modified: head/devel/msp430-debug-stack/distinfo
==============================================================================
--- head/devel/msp430-debug-stack/distinfo	Mon Nov 21 15:01:18 2016	(r426726)
+++ head/devel/msp430-debug-stack/distinfo	Mon Nov 21 15:05:03 2016	(r426727)
@@ -1,6 +1,7 @@
-SHA256 (msp430-debug-stack-3.05.01.01/slac460n.zip) = 181418a33400567fa19e411f16df340a2869dd87e941e517732280004ee0fed7
-SIZE (msp430-debug-stack-3.05.01.01/slac460n.zip) = 2016397
-SHA256 (msp430-debug-stack-3.05.01.01/slau320v.pdf) = 6ffb31c5325abeca893cf2bbae8d6b5f56f26c1fd61863f0fbb9fe983adc3020
-SIZE (msp430-debug-stack-3.05.01.01/slau320v.pdf) = 828169
-SHA256 (msp430-debug-stack-3.05.01.01/slau656.pdf) = bce7331403362b57a262273e6de53d6d0cde3648b64c29554f5f19e8e269d4be
-SIZE (msp430-debug-stack-3.05.01.01/slau656.pdf) = 503140
+TIMESTAMP = 1479739619
+SHA256 (msp430-debug-stack-3.8.0.1/slac460r.zip) = f51dd2d1032b1f9f12e4a24ea02224ac2037aa7bbff66d3fa685db5c5905ac64
+SIZE (msp430-debug-stack-3.8.0.1/slac460r.zip) = 2055673
+SHA256 (msp430-debug-stack-3.8.0.1/slau320x.pdf) = bea0f4efd29bd8f8cff58a77903f8234ddf31a5cf195f016e01c00dc68574c0c
+SIZE (msp430-debug-stack-3.8.0.1/slau320x.pdf) = 829163
+SHA256 (msp430-debug-stack-3.8.0.1/slau656b.pdf) = a27303bf1060a598bab53481cdee05642dbb3cde7804786c5ab31cb1e911df0c
+SIZE (msp430-debug-stack-3.8.0.1/slau656b.pdf) = 487655

Added: head/devel/msp430-debug-stack/files/patch-DLL430__v3_src_TI_DLL430_OldApiV3.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/msp430-debug-stack/files/patch-DLL430__v3_src_TI_DLL430_OldApiV3.cpp	Mon Nov 21 15:05:03 2016	(r426727)
@@ -0,0 +1,11 @@
+--- DLL430_v3/src/DLL430_OldApiV3.cpp.orig	2016-11-21 17:51:22.765156000 +0300
++++ DLL430_v3/src/DLL430_OldApiV3.cpp	2016-11-21 17:53:00.428191000 +0300
+@@ -958,7 +958,7 @@
+ 				}
+ 				else
+ 				{
+-					cm->reset(false, true, 0, NULL);
++					cm->reset(false, true, 0, 0);
+ 					cm->setJtagMode(SWD_MSP432);
+ 					selectedMode = SWD_MSP432;
+ 					cm->start();

Modified: head/devel/msp430-debug-stack/files/patch-DLL430__v3_src_TI_DLL430_UsbCdcIoChannel.cpp
==============================================================================
--- head/devel/msp430-debug-stack/files/patch-DLL430__v3_src_TI_DLL430_UsbCdcIoChannel.cpp	Mon Nov 21 15:01:18 2016	(r426726)
+++ head/devel/msp430-debug-stack/files/patch-DLL430__v3_src_TI_DLL430_UsbCdcIoChannel.cpp	Mon Nov 21 15:05:03 2016	(r426727)
@@ -1,6 +1,6 @@
---- DLL430_v3/src/TI/DLL430/UsbCdcIoChannel.cpp.orig	2016-03-12 13:23:34 UTC
-+++ DLL430_v3/src/TI/DLL430/UsbCdcIoChannel.cpp
-@@ -303,6 +303,22 @@ void UsbCdcIoChannel::createCdcPortList(
+--- DLL430_v3/src/TI/DLL430/UsbCdcIoChannel.cpp.orig	2016-05-02 09:51:53.763023000 +0200
++++ DLL430_v3/src/TI/DLL430/UsbCdcIoChannel.cpp	2016-05-02 09:53:56.332580000 +0200
+@@ -303,6 +303,22 @@
  	}
  #else
  	stringstream cdcIdStream;
@@ -23,16 +23,7 @@
  	cdcIdStream << hex << setfill('0') << "usb:v" << setw(4) << vendorId << "p" << setw(4) << productId;
  
  	path p("/sys/class/tty/");
-@@ -317,13 +333,14 @@ void UsbCdcIoChannel::createCdcPortList(
- 				string modalias;
- 				int interfaceNumber = -1;
- 
--				ifstream modAliasStream((it->path()/"device/modalias").string().c_str());
-+				std::ifstream modAliasStream((it->path()/"device/modalias").string().c_str());
- 				modAliasStream >> modalias;
- 
--				ifstream ifNumStream((it->path()/"device/bInterfaceNumber").string().c_str());
-+				std::ifstream ifNumStream((it->path()/"device/bInterfaceNumber").string().c_str());
+@@ -324,6 +340,7 @@
  				ifNumStream >> interfaceNumber;
  				if (modalias.find(cdcIdStream.str()) == 0 && interfaceNumber == 0)
  				{

Modified: head/devel/msp430-debug-stack/files/patch-Makefile
==============================================================================
--- head/devel/msp430-debug-stack/files/patch-Makefile	Mon Nov 21 15:01:18 2016	(r426726)
+++ head/devel/msp430-debug-stack/files/patch-Makefile	Mon Nov 21 15:05:03 2016	(r426727)
@@ -1,6 +1,6 @@
---- Makefile.orig	2015-04-22 11:58:28 UTC
-+++ Makefile
-@@ -16,6 +16,7 @@ MAKE_PCH += -x c++-header
+--- Makefile.orig	2016-04-11 14:08:50.000000000 +0200
++++ Makefile	2016-05-02 09:51:27.848060000 +0200
+@@ -16,6 +16,7 @@
  USE_PCH += -include $(PCH_HEADER)
  
  export BOOST_DIR
@@ -8,7 +8,7 @@
  export BIT32
  export STATIC
  export DEBUG
-@@ -73,14 +74,14 @@ ifeq ($(PLATFORM),Linux)
+@@ -76,15 +77,15 @@
  
  	HIDOBJ := $(LIBTHIRD)/hid-libusb.o
  else
@@ -16,7 +16,9 @@
 +#	CXX:= clang++
  
 -	OUTPUT := libmsp430.dylib
+-	STATICOUTPUT := mac64
 +	OUTPUT := libmsp430.so
++	STATICOUTPUT := libmsp430
  
  	ifdef STATIC
 -	STATIC_LIBS += -framework CoreFoundation -framework IOKit -lhidapi
@@ -27,7 +29,7 @@
  	endif
  
  	ifdef BOOST_DIR
-@@ -88,9 +89,14 @@ else
+@@ -92,9 +93,14 @@
  	LIBDIRS += -L$(BOOST_DIR)/lib
  	endif
  

Modified: head/devel/msp430-debug-stack/pkg-plist
==============================================================================
--- head/devel/msp430-debug-stack/pkg-plist	Mon Nov 21 15:01:18 2016	(r426726)
+++ head/devel/msp430-debug-stack/pkg-plist	Mon Nov 21 15:05:03 2016	(r426727)
@@ -6,6 +6,7 @@ include/libmsp430/MSP430_EnergyTrace.h
 include/libmsp430/MSP430_FET.h
 include/libmsp430/MSP430_HIL.h
 lib/libmsp430.so
-%%PORTDOCS%%%%DOCSDIR%%/slau320v.pdf
-%%PORTDOCS%%%%DOCSDIR%%/slau656.pdf
+lib/libmsp430.a
+%%PORTDOCS%%%%DOCSDIR%%/slau320x.pdf
+%%PORTDOCS%%%%DOCSDIR%%/slau656b.pdf
 etc/devd/mspfet.conf



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