Index: head/devel/msp430-debug-stack/Makefile =================================================================== --- head/devel/msp430-debug-stack/Makefile (revision 426726) +++ head/devel/msp430-debug-stack/Makefile (revision 426727) @@ -1,56 +1,57 @@ # $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 LICENSE= BSD3CLAUSE LIB_DEPENDS= libboost_filesystem.so:devel/boost-libs \ libhidapi.so:comms/hidapi BROKEN_FreeBSD_9= does not build (internal compiler error) 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} \ HIDAPI_DIR=${LOCALBASE} MAKE_JOBS_UNSAFE= yes SUB_FILES+= pkg-message REINPLACE_ARGS= -i "" post-patch: @${FIND} ${WRKSRC}/DLL430_v3/src/TI/DLL430 \ \( -name '*.cpp' -o -name '*.h' \) -print0 | ${XARGS} -0 \ ${REINPLACE_CMD} -e 's|[io]fstream|std::&|; s|std::std::|std::|' 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 .include Index: head/devel/msp430-debug-stack/distinfo =================================================================== --- head/devel/msp430-debug-stack/distinfo (revision 426726) +++ head/devel/msp430-debug-stack/distinfo (revision 426727) @@ -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 Index: head/devel/msp430-debug-stack/files/patch-DLL430__v3_src_TI_DLL430_OldApiV3.cpp =================================================================== --- head/devel/msp430-debug-stack/files/patch-DLL430__v3_src_TI_DLL430_OldApiV3.cpp (nonexistent) +++ head/devel/msp430-debug-stack/files/patch-DLL430__v3_src_TI_DLL430_OldApiV3.cpp (revision 426727) @@ -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(); Property changes on: head/devel/msp430-debug-stack/files/patch-DLL430__v3_src_TI_DLL430_OldApiV3.cpp ___________________________________________________________________ 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/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 (revision 426726) +++ head/devel/msp430-debug-stack/files/patch-DLL430__v3_src_TI_DLL430_UsbCdcIoChannel.cpp (revision 426727) @@ -1,42 +1,33 @@ ---- 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; + +#ifdef __FreeBSD__ + + path p( "/dev" ); + if( exists(p) && is_directory(p) ) { + + cdcIdStream << hex << setfill('0') << "mspfet" << setw(4) << productId; + + const directory_iterator end; + for( directory_iterator it(p); it != end; ++it ) { + + string dir = it->path().string(); + if( dir.find( cdcIdStream.str() ) != string::npos ) { + { + +#else 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) { +#endif const string filename = it->path().filename().string(); const string portPath = string("/dev/") + filename; Index: head/devel/msp430-debug-stack/files/patch-Makefile =================================================================== --- head/devel/msp430-debug-stack/files/patch-Makefile (revision 426726) +++ head/devel/msp430-debug-stack/files/patch-Makefile (revision 426727) @@ -1,47 +1,49 @@ ---- 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 +export HIDAPI_DIR export BIT32 export STATIC export DEBUG -@@ -73,14 +74,14 @@ ifeq ($(PLATFORM),Linux) +@@ -76,15 +77,15 @@ HIDOBJ := $(LIBTHIRD)/hid-libusb.o else - CXX:= clang++ +# CXX:= clang++ - OUTPUT := libmsp430.dylib +- STATICOUTPUT := mac64 + OUTPUT := libmsp430.so ++ STATICOUTPUT := libmsp430 ifdef STATIC - STATIC_LIBS += -framework CoreFoundation -framework IOKit -lhidapi + STATIC_LIBS += -lhidapi else - LIBS += -framework CoreFoundation -framework IOKit -lhidapi + LIBS += -lhidapi endif ifdef BOOST_DIR -@@ -88,9 +89,14 @@ else +@@ -92,9 +93,14 @@ LIBDIRS += -L$(BOOST_DIR)/lib endif - OUTNAME := -install_name - BSTATIC := - BDYNAMIC := + ifdef HIDAPI_DIR + INCLUDES += -I$(HIDAPI_DIR)/include/hidapi + LIBDIRS += -L$(HIDAPI_DIR)/lib + endif + + OUTNAME := -Wl,-soname, + BSTATIC := -Wl,-Bstatic + BDYNAMIC := -Wl,-Bdynamic HIDOBJ := endif Index: head/devel/msp430-debug-stack/pkg-plist =================================================================== --- head/devel/msp430-debug-stack/pkg-plist (revision 426726) +++ head/devel/msp430-debug-stack/pkg-plist (revision 426727) @@ -1,11 +1,12 @@ include/libmsp430/DLL430_SYMBOL.h include/libmsp430/MSP430.h include/libmsp430/MSP430_Debug.h include/libmsp430/MSP430_EEM.h 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