Date: Sun, 15 Nov 2015 10:48:47 +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: r401687 - in head/devel/mspdebug: . files Message-ID: <201511151048.tAFAml9Y006403@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: lev Date: Sun Nov 15 10:48:47 2015 New Revision: 401687 URL: https://svnweb.freebsd.org/changeset/ports/401687 Log: Update to latest version from GitHub PR: 204188 Submitted by: lev@FreeBSD.org Approved by: peterjeremy@acm.org (maintainer) Modified: head/devel/mspdebug/Makefile head/devel/mspdebug/distinfo head/devel/mspdebug/files/patch-Makefile Modified: head/devel/mspdebug/Makefile ============================================================================== --- head/devel/mspdebug/Makefile Sun Nov 15 10:46:14 2015 (r401686) +++ head/devel/mspdebug/Makefile Sun Nov 15 10:48:47 2015 (r401687) @@ -2,22 +2,34 @@ # $FreeBSD$ PORTNAME= mspdebug -PORTVERSION= 0.22 +PORTVERSION= 0.23.20151024 CATEGORIES= devel -MASTER_SITES= SF/${PORTNAME} MAINTAINER= peterjeremy@acm.org COMMENT= Debugger for use with MSP 430 MCUs LICENSE= GPLv2 -USES= gmake readline - -PLIST_FILES= bin/mspdebug man/man1/mspdebug.1.gz - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/mspdebug ${STAGEDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/mspdebug.man \ - ${STAGEDIR}${MANPREFIX}/man/man1/mspdebug.1 +USE_GITHUB= yes +GH_ACCOUNT= dlbeer +GH_TAGNAME= 38ea614 + +OPTIONS_DEFINE= READLINE LIBMSP430 +OPTIONS_DEFAULT= READLINE LIBMSP430 +LIBMSP430_DESC= Use TI libmsp430 USB driver + +READLINE_USES= readline +READLINE_MAKE_ARGS_OFF= WITHOUT_READLINE=1 + +LIBMSP430_LIB_DEPENDS= libmsp430.so:${PORTSDIR}/devel/msp430-debug-stack + +USES= gmake + +PLIST_FILES= bin/mspdebug \ + man/man1/mspdebug.1.gz \ + share/mspdebug/ti_3410.fw.ihex \ + share/mspdebug/ti_3410.fw.txt \ + share/doc/mspdebug/EmbeddedMode.txt \ + share/doc/mspdebug/README .include <bsd.port.mk> Modified: head/devel/mspdebug/distinfo ============================================================================== --- head/devel/mspdebug/distinfo Sun Nov 15 10:46:14 2015 (r401686) +++ head/devel/mspdebug/distinfo Sun Nov 15 10:48:47 2015 (r401687) @@ -1,2 +1,2 @@ -SHA256 (mspdebug-0.22.tar.gz) = 9a0550f3c7911bcc4e3231fff652c8f14763eb6a945609ce715db7164bf76c55 -SIZE (mspdebug-0.22.tar.gz) = 230959 +SHA256 (dlbeer-mspdebug-0.23.20151024-38ea614_GH0.tar.gz) = 2978e3628064d57a0b834bce87cd63e99f6e9d074c5584aee8f008e944c732fb +SIZE (dlbeer-mspdebug-0.23.20151024-38ea614_GH0.tar.gz) = 327235 Modified: head/devel/mspdebug/files/patch-Makefile ============================================================================== --- head/devel/mspdebug/files/patch-Makefile Sun Nov 15 10:46:14 2015 (r401686) +++ head/devel/mspdebug/files/patch-Makefile Sun Nov 15 10:48:47 2015 (r401687) @@ -1,17 +1,49 @@ ---- Makefile.orig 2012-11-26 10:27:48.000000000 +1100 -+++ Makefile 2012-12-16 15:13:34.359453238 +1100 -@@ -45,8 +45,14 @@ +--- Makefile.orig 2015-10-16 19:45:43 UTC ++++ Makefile +@@ -22,8 +22,9 @@ PREFIX ?= /usr/local + LDFLAGS ?= -s + + BINDIR = ${PREFIX}/bin/ +-MANDIR = ${PREFIX}/share/man/man1 +-LIBDIR = ${PREFIX}/lib/ ++MANDIR = ${PREFIX}/man/man1 ++DATDIR = ${PREFIX}/share ++DOCDIR = ${PREFIX}/share/doc/mspdebug + + ifdef WITHOUT_READLINE + READLINE_CFLAGS = +@@ -70,6 +71,9 @@ else + else ifneq ($(filter $(UNAME_S),OpenBSD NetBSD DragonFly),) PORTS_CFLAGS := $(shell pkg-config --cflags libusb) PORTS_LDFLAGS := $(shell pkg-config --libs libusb) -ltermcap -pthread - else -+ ifeq ($(UNAME_S),FreeBSD) # FreeBSD Ports stuff -+# This is only needed prior to FreeBSD 8.x to find libusb -+ PORTS_CFLAGS := -I${LOCALBASE}/include -+ PORTS_LDFLAGS := -L${LOCALBASE}/lib -+ else ++ else ifeq ($(UNAME_S),FreeBSD) ++ PORTS_CFLAGS := -I${PREFIX}/include ++ PORTS_LDFLAGS := -L${PREFIX}/lib + else PORTS_CFLAGS := PORTS_LDFLAGS := -+ endif - endif - endif +@@ -78,7 +82,7 @@ endif + + INCLUDES = -I. -Isimio -Iformats -Itransport -Idrivers -Iutil -Iui + GCC_CFLAGS = -O1 -Wall -Wno-char-subscripts -ggdb +-CONFIG_CFLAGS = -DLIB_DIR=\"$(LIBDIR)\" ++CONFIG_CFLAGS = -DLIB_DIR=\"$(DATDIR)\" + + MSPDEBUG_LDFLAGS = $(LDFLAGS) $(PORTS_LDFLAGS) + MSPDEBUG_LIBS = -lusb $(READLINE_LIBS) $(OS_LIBS) +@@ -108,9 +112,12 @@ install: $(BINARY) mspdebug.man + $(INSTALL) -m 0755 $(BINARY) $(DESTDIR)$(BINDIR) + mkdir -p $(DESTDIR)$(MANDIR) + $(INSTALL) -m 0644 mspdebug.man $(DESTDIR)$(MANDIR)/mspdebug.1 +- mkdir -p $(DESTDIR)$(LIBDIR)/mspdebug +- $(INSTALL) -m 0644 ti_3410.fw.ihex \ +- $(DESTDIR)$(LIBDIR)/mspdebug/ti_3410.fw.ihex ++ mkdir -p $(DESTDIR)$(DATDIR)/mspdebug ++ $(INSTALL) -m 0644 ti_3410.fw.ihex ti_3410.fw.txt \ ++ $(DESTDIR)$(DATDIR)/mspdebug/ ++ mkdir -p $(DESTDIR)$(DOCDIR) ++ $(INSTALL) -m 0644 README EmbeddedMode.txt \ ++ $(DESTDIR)$(DOCDIR)/ + + .SUFFIXES: .c .o
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511151048.tAFAml9Y006403>