On Thu, Apr 23, 2015 at 04:58:10PM -0400, Brandon Mercer wrote:
> Hello, this diff updates the teensy loader to the current 2.1 version.
> I'm also working to get the loader so it can flash the newer teensy 3.1
> devices. OK?
>
Here is an updated diff with feedback from abieber@ and bcallah@
The changes include setting the version to a variable because it's
in there twice, and referencing the zip. OK?
Index: Makefile
===================================================================
RCS file: /home/bmercer/cvs/ports/devel/teensyloader/Makefile,v
retrieving revision 1.8
diff -u -p -u -r1.8 Makefile
--- Makefile 10 Oct 2013 02:08:22 -0000 1.8
+++ Makefile 30 Apr 2015 14:20:48 -0000
@@ -1,12 +1,11 @@
# $OpenBSD: Makefile,v 1.8 2013/10/10 02:08:22 brad Exp $
COMMENT= in-system programmer for Teensy boards
-
-DISTNAME= teensy_loader_cli.2.0
-PKGNAME= teensyloader-2.0
-REVISION= 1
+V= 2.1
+DISTNAME= teensy_loader_cli.${V}
+PKGNAME= teensyloader-${V}
CATEGORIES= devel
-
+EXTRACT_SUFX= .zip
HOMEPAGE= http://www.pjrc.com/teensy/
# GPLv3
@@ -19,7 +18,6 @@ MASTER_SITES= ${HOMEPAGE}
CONFIGURE_STYLE= None
WRKDIST= ${WRKDIR}/teensy_loader_cli
MAKE_FILE= Makefile.bsd
-
NO_TEST= Yes
do-install:
Index: distinfo
===================================================================
RCS file: /home/bmercer/cvs/ports/devel/teensyloader/distinfo,v
retrieving revision 1.4
diff -u -p -u -r1.4 distinfo
--- distinfo 18 Jan 2015 03:13:48 -0000 1.4
+++ distinfo 30 Apr 2015 14:26:53 -0000
@@ -1,2 +1,2 @@
-SHA256 (teensy_loader_cli.2.0.tar.gz) =
D/1NS2X+PCvOfvc89ZmwtSebMQH7hDBUzXmw324GepY=
-SIZE (teensy_loader_cli.2.0.tar.gz) = 27044
+SHA256 (teensy_loader_cli.2.1.zip) =
2v0EDWdItS4NSgGEbUE28zVMon3cNqVe0A0KCvCQLUY=
+SIZE (teensy_loader_cli.2.1.zip) = 36241
Index: patches/patch-Makefile_bsd
===================================================================
RCS file:
/home/bmercer/cvs/ports/devel/teensyloader/patches/patch-Makefile_bsd,v
retrieving revision 1.1
diff -u -p -u -r1.1 patch-Makefile_bsd
--- patches/patch-Makefile_bsd 26 Jun 2010 21:22:00 -0000 1.1
+++ patches/patch-Makefile_bsd 23 Apr 2015 20:53:20 -0000
@@ -1,6 +1,6 @@
-$OpenBSD: patch-Makefile_bsd,v 1.1 2010/06/26 21:22:00 ckuethe Exp $
---- Makefile.bsd.orig Mon Feb 15 18:27:15 2010
-+++ Makefile.bsd Mon Feb 15 18:28:31 2010
+$OpenBSD$
+--- Makefile.bsd.orig Sun Apr 19 21:29:46 2015
++++ Makefile.bsd Thu Apr 23 16:53:05 2015
@@ -1,6 +1,6 @@
-OS ?= FreeBSD
+#OS ?= FreeBSD
@@ -10,17 +10,17 @@ $OpenBSD: patch-Makefile_bsd,v 1.1 2010/
CFLAGS ?= -O2 -Wall
CC ?= gcc
-@@ -14,8 +14,10 @@ LIBS =
+@@ -13,9 +13,9 @@ CFLAGS += -DUSE_UHID
+ LIBS =
.endif
-
--teensy_loader_cli: teensy_loader_cli.c
-- $(CC) $(CFLAGS) -s -o teensy_loader_cli teensy_loader_cli.c $(LIBS)
+all: teensyloader
-
+teensyloader: teensy_loader_cli.c
+ $(CC) $(CFLAGS) -s -o teensyloader teensy_loader_cli.c $(LIBS)
-+
+
+-teensy_loader_cli: teensy_loader_cli.c
+- $(CC) $(CFLAGS) -s -o teensy_loader_cli teensy_loader_cli.c $(LIBS)
+-
clean:
- rm -f teensy_loader_cli
+ rm -f teensyloader
Index: pkg/PLIST
===================================================================
RCS file: /home/bmercer/cvs/ports/devel/teensyloader/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -r1.2 PLIST
--- pkg/PLIST 26 Jun 2010 21:22:00 -0000 1.2
+++ pkg/PLIST 30 Apr 2015 14:27:20 -0000
@@ -1,8 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.2 2010/06/26 21:22:00 ckuethe Exp $
+@comment $OpenBSD$
@bin bin/teensyloader
share/examples/teensy/
-share/examples/teensy/blink_fast.hex
-share/examples/teensy/blink_slow.hex
share/examples/teensy/blinky-at90usb1286.hex
share/examples/teensy/blinky-at90usb162.hex
share/examples/teensy/blinky-at90usb646.hex
