Re: update misc/blink1
On Thu, Jan 18, 2018 at 11:29:38PM +, Stuart Henderson wrote: > On 2018/01/18 18:40, Joerg Jung wrote: > > > > > > > Am 18.01.2018 um 14:31 schrieb Alexander Bluhm : > > > > > >> On Tue, Jan 09, 2018 at 09:19:45PM +0100, Joerg Jung wrote: > > >> +SHA256 (blink1-1.98a.tar.gz) = > > >> sMsN8zlejocXA2OUII+tKCW9GmmAJCuULjKR6fv5DP4= > > >> +SIZE (blink1-1.98a.tar.gz) = 29503155 > > > > > > Github has recreated the tgz. Now I get > > > > > > SHA256 (blink1-1.98a.tar.gz) = > > > u0ZTJeCG2Ket9Y57Y+RcjggBSafnj1Y2KLFsxqCJTPE= > > > SIZE (blink1-1.98a.tar.gz) = 29503156 > > > > Uhhm... anyone an idea why they did this? > > Does this happen often? > > Sometimes it's due to an upstream commit on the tag. Sometimes it's due > to github upgrading something (these files are generated on-the-fly). > If you have old and new files around, diffing them might give clues. > > (I don't think I really want to know why the distfile is 28MB...) Unfortunately, there is no distfile for the command line tool we build and install. The distfile just contains everything from their repo, various libraries for python, ruby, go, nodejs, java, ... GUI tools, Windows programs, and docs, etc.
Re: update misc/blink1
On 2018/01/18 18:40, Joerg Jung wrote: > > > > Am 18.01.2018 um 14:31 schrieb Alexander Bluhm : > > > >> On Tue, Jan 09, 2018 at 09:19:45PM +0100, Joerg Jung wrote: > >> +SHA256 (blink1-1.98a.tar.gz) = > >> sMsN8zlejocXA2OUII+tKCW9GmmAJCuULjKR6fv5DP4= > >> +SIZE (blink1-1.98a.tar.gz) = 29503155 > > > > Github has recreated the tgz. Now I get > > > > SHA256 (blink1-1.98a.tar.gz) = u0ZTJeCG2Ket9Y57Y+RcjggBSafnj1Y2KLFsxqCJTPE= > > SIZE (blink1-1.98a.tar.gz) = 29503156 > > Uhhm... anyone an idea why they did this? > Does this happen often? Sometimes it's due to an upstream commit on the tag. Sometimes it's due to github upgrading something (these files are generated on-the-fly). If you have old and new files around, diffing them might give clues. (I don't think I really want to know why the distfile is 28MB...)
Re: update misc/blink1
> Am 18.01.2018 um 14:31 schrieb Alexander Bluhm : > >> On Tue, Jan 09, 2018 at 09:19:45PM +0100, Joerg Jung wrote: >> +SHA256 (blink1-1.98a.tar.gz) = sMsN8zlejocXA2OUII+tKCW9GmmAJCuULjKR6fv5DP4= >> +SIZE (blink1-1.98a.tar.gz) = 29503155 > > Github has recreated the tgz. Now I get > > SHA256 (blink1-1.98a.tar.gz) = u0ZTJeCG2Ket9Y57Y+RcjggBSafnj1Y2KLFsxqCJTPE= > SIZE (blink1-1.98a.tar.gz) = 29503156 Uhhm... anyone an idea why they did this? Does this happen often? > Apart from that, it works with my blink1 stick. > > OK bluhm@ >
Re: update misc/blink1
On Tue, Jan 09, 2018 at 09:19:45PM +0100, Joerg Jung wrote: > +SHA256 (blink1-1.98a.tar.gz) = sMsN8zlejocXA2OUII+tKCW9GmmAJCuULjKR6fv5DP4= > +SIZE (blink1-1.98a.tar.gz) = 29503155 Github has recreated the tgz. Now I get SHA256 (blink1-1.98a.tar.gz) = u0ZTJeCG2Ket9Y57Y+RcjggBSafnj1Y2KLFsxqCJTPE= SIZE (blink1-1.98a.tar.gz) = 29503156 Apart from that, it works with my blink1 stick. OK bluhm@
Re: update misc/blink1
On Tue, Jan 09, 2018 at 09:19:45PM +0100, Joerg Jung wrote:
> please find below an update to blink-0.98a. This drops most of the
> patches as upstreamed (thanks to bluhm).
Looks good to me portwise, couldn't run-test it, though.
Updated diff below dropping unneeded V and DISTNAME due to GH_*.
HOMEPAGE has HTTPS.
diff --git a/misc/blink1/Makefile b/misc/blink1/Makefile
index 177de02761c..537d8d8ecb9 100644
--- a/misc/blink1/Makefile
+++ b/misc/blink1/Makefile
@@ -2,15 +2,16 @@
COMMENT = software tools for blink(1) LED notification light
-V =1.98
-DISTNAME = ${GH_PROJECT}-${V}
+GH_ACCOUNT = todbot
+GH_PROJECT = blink1
+GH_TAGNAME = v1.98a
SO_V = 0.1
SHARED_LIBS = blink1 ${SO_V}
CATEGORIES = misc
-HOMEPAGE = http://blink1.thingm.com/
+HOMEPAGE = https://blink1.thingm.com/
MAINTAINER = Joerg Jung
@@ -19,10 +20,6 @@ PERMIT_PACKAGE_CDROM = Yes
WANTLIB += c pthread usb
-GH_ACCOUNT = todbot
-GH_PROJECT = blink1
-GH_TAGNAME = v${V}
-
LIB_DEPENDS = devel/libusb-compat
MAKE_FLAGS = CC="${CC}" USBLIB_TYPE=HIDDATA \
diff --git a/misc/blink1/distinfo b/misc/blink1/distinfo
index e93930819cb..7f137927225 100644
--- a/misc/blink1/distinfo
+++ b/misc/blink1/distinfo
@@ -1,2 +1,2 @@
-SHA256 (blink1-1.98.tar.gz) = K7+ISMPGVquPsBA1/TEQOjIfvuIBZGkc9n43BsS1CxY=
-SIZE (blink1-1.98.tar.gz) = 29439933
+SHA256 (blink1-1.98a.tar.gz) = sMsN8zlejocXA2OUII+tKCW9GmmAJCuULjKR6fv5DP4=
+SIZE (blink1-1.98a.tar.gz) = 29503155
diff --git a/misc/blink1/patches/patch-commandline_Makefile
b/misc/blink1/patches/patch-commandline_Makefile
index bf323912116..7c15530161b 100644
--- a/misc/blink1/patches/patch-commandline_Makefile
+++ b/misc/blink1/patches/patch-commandline_Makefile
@@ -1,90 +1,46 @@
$OpenBSD: patch-commandline_Makefile,v 1.2 2015/12/23 10:53:53 bluhm Exp $
-
-todo: submit to upstream
-
commandline/Makefile.orig Wed Sep 9 03:06:56 2015
-+++ commandline/Makefile Wed Dec 23 11:33:08 2015
-@@ -113,9 +113,13 @@ ifeq "$(UNAME)" "FreeBSD"
- OS=freebsd
- endif
-
-+ifeq "$(UNAME)" "OpenBSD"
-+ OS=openbsd
-+endif
+Index: commandline/Makefile
+--- commandline/Makefile.orig
commandline/Makefile
+@@ -124,7 +124,8 @@ endif
+ # allow overriding of GIT_TAG & BLINK1_VERSION on commandline for automated
builds
MACH_TYPE:="$(strip $(shell uname -m))"
--GIT_TAG:="$(strip $(shell git tag 2>&1 | tail -1 | cut -f1 -d' '))"
-+#GIT_TAG:="$(strip $(shell git tag 2>&1 | tail -1 | cut -f1 -d' '))"
+-GIT_TAG?="$(strip $(shell git tag 2>&1 | tail -1 | cut -f1 -d' '))"
++#GIT_TAG?="$(strip $(shell git tag 2>&1 | tail -1 | cut -f1 -d' '))"
+GIT_TAG:=${GH_TAGNAME}
# deal with case of no git or no git tags, check for presence of "v" (i.e.
"v1.93")
ifneq ($(findstring v,$(GIT_TAG)), v)
GIT_TAG:="v0"
-@@ -278,6 +282,37 @@ INCLOCATION ?= $(PREFIX)/include
-
- endif
+@@ -289,7 +290,7 @@ endif
-+# OpenBSD
###
-+ifeq "$(OS)" "openbsd"
+ # OpenBSD
###
+ ifeq "$(OS)" "openbsd"
+-LIBTARGET = libblink1.so
+LIBTARGET = libblink1.so.${SO_V}
-+# was blink1-lib.so
-+
-+ifeq "$(USBLIB_TYPE)" "HIDAPI"
-+CFLAGS += -DUSE_HIDAPI
-+CFLAGS += -I./hidapi/hidapi
-+OBJS = ./hidapi/libusb/hid.o
-+CFLAGS += `pkg-config libusb-1.0 --cflags` -I/usr/local/include -fPIC
-+LIBS += `pkg-config libusb-1.0 --libs` -L/usr/local/lib -lpthread -liconv
-+endif
-+
-+ifeq "$(USBLIB_TYPE)" "HIDDATA"
-+CFLAGS += -DUSE_HIDDATA
-+OBJS = ./hiddata.o
-+CFLAGS += `pkg-config libusb --cflags` -fPIC
-+LIBS += `pkg-config libusb --libs`
-+endif
-+
-+LIBFLAGS = -shared -o $(LIBTARGET) $(LIBS)
-+EXE=
-+
-+#INSTALL = install
-+PREFIX ?= /usr/local
-+EXELOCATION ?= $(PREFIX)/bin
-+LIBLOCATION ?= $(PREFIX)/lib
-+INCLOCATION ?= $(PREFIX)/include
-+
-+endif
-+
- # WRT Linux
- ifeq "$(OS)" "wrtlinux"
- LIBTARGET = libblink1.so
-@@ -371,7 +406,7 @@ endif
+ # was blink1-lib.so
+
+ ifeq "$(USBLIB_TYPE)" "HIDAPI"
+@@ -411,7 +412,7 @@ endif
- #CFLAGS += -O -Wall -std=gnu99 -I ../hardware/firmware
- CFLAGS += -std=gnu99
+ #CFLAGS += -O -Wall -std=gnu99 -I ../hardware/firmware
+ CFLAGS += -std=gnu99
-CFLAGS += -g
+#CFLAGS += -g
CFLAGS += -DBLINK1_VERSION=\"$(BLINK1_VERSION)\"
- OBJS += blink1-lib.o
-@@ -389,6 +424,7 @@ help:
- @echo "make OS=windows ... build Windows blink1-lib and blink1-tool"
- @echo "make OS=linux ... build Linuxblink1-lib and blink1-tool"
- @echo "make OS=freebsd ... build FreeBSDblink1-lib and blink1-tool"
-+ @echo "make OS=openbsd ... build OpenBSDblink1-lib and blink1-tool"
- @echo "make OS=macosx ... build Mac OS X blink1-lib and blink1-tool"
-
Re: update misc/blink1
Ping.
On Tue, Jan 09, 2018 at 09:19:45PM +0100, Joerg Jung wrote:
> Hi,
>
> please find below an update to blink-0.98a. This drops most of the
> patches as upstreamed (thanks to bluhm).
>
> OK?
>
> Regards,
> Joerg
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/misc/blink1/Makefile,v
> retrieving revision 1.5
> diff -u -p -r1.5 Makefile
> --- Makefile 16 Mar 2016 16:46:32 - 1.5
> +++ Makefile 9 Jan 2018 20:18:16 -
> @@ -2,7 +2,7 @@
>
> COMMENT =software tools for blink(1) LED notification light
>
> -V = 1.98
> +V = 1.98a
> DISTNAME = ${GH_PROJECT}-${V}
>
> SO_V = 0.1
> Index: distinfo
> ===
> RCS file: /cvs/ports/misc/blink1/distinfo,v
> retrieving revision 1.2
> diff -u -p -r1.2 distinfo
> --- distinfo 23 Dec 2015 10:53:53 - 1.2
> +++ distinfo 9 Jan 2018 20:18:16 -
> @@ -1,2 +1,2 @@
> -SHA256 (blink1-1.98.tar.gz) = K7+ISMPGVquPsBA1/TEQOjIfvuIBZGkc9n43BsS1CxY=
> -SIZE (blink1-1.98.tar.gz) = 29439933
> +SHA256 (blink1-1.98a.tar.gz) = sMsN8zlejocXA2OUII+tKCW9GmmAJCuULjKR6fv5DP4=
> +SIZE (blink1-1.98a.tar.gz) = 29503155
> Index: patches/patch-commandline_Makefile
> ===
> RCS file: /cvs/ports/misc/blink1/patches/patch-commandline_Makefile,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-commandline_Makefile
> --- patches/patch-commandline_Makefile23 Dec 2015 10:53:53 -
> 1.2
> +++ patches/patch-commandline_Makefile9 Jan 2018 20:18:16 -
> @@ -1,90 +1,46 @@
> $OpenBSD: patch-commandline_Makefile,v 1.2 2015/12/23 10:53:53 bluhm Exp $
> -
> -todo: submit to upstream
> -
> commandline/Makefile.origWed Sep 9 03:06:56 2015
> -+++ commandline/Makefile Wed Dec 23 11:33:08 2015
> -@@ -113,9 +113,13 @@ ifeq "$(UNAME)" "FreeBSD"
> - OS=freebsd
> - endif
> -
> -+ifeq "$(UNAME)" "OpenBSD"
> -+OS=openbsd
> -+endif
> +Index: commandline/Makefile
> +--- commandline/Makefile.orig
> commandline/Makefile
> +@@ -124,7 +124,8 @@ endif
> + # allow overriding of GIT_TAG & BLINK1_VERSION on commandline for automated
> builds
>
> MACH_TYPE:="$(strip $(shell uname -m))"
> --GIT_TAG:="$(strip $(shell git tag 2>&1 | tail -1 | cut -f1 -d' '))"
> -+#GIT_TAG:="$(strip $(shell git tag 2>&1 | tail -1 | cut -f1 -d' '))"
> +-GIT_TAG?="$(strip $(shell git tag 2>&1 | tail -1 | cut -f1 -d' '))"
> ++#GIT_TAG?="$(strip $(shell git tag 2>&1 | tail -1 | cut -f1 -d' '))"
> +GIT_TAG:=${GH_TAGNAME}
> # deal with case of no git or no git tags, check for presence of "v" (i.e.
> "v1.93")
> ifneq ($(findstring v,$(GIT_TAG)), v)
> GIT_TAG:="v0"
> -@@ -278,6 +282,37 @@ INCLOCATION ?= $(PREFIX)/include
> +@@ -289,7 +290,7 @@ endif
>
> - endif
> -
> -+# OpenBSD
> ###
> -+ifeq "$(OS)" "openbsd"
> + # OpenBSD
> ###
> + ifeq "$(OS)" "openbsd"
> +-LIBTARGET = libblink1.so
> +LIBTARGET = libblink1.so.${SO_V}
> -+# was blink1-lib.so
> -+
> -+ifeq "$(USBLIB_TYPE)" "HIDAPI"
> -+CFLAGS += -DUSE_HIDAPI
> -+CFLAGS += -I./hidapi/hidapi
> -+OBJS = ./hidapi/libusb/hid.o
> -+CFLAGS += `pkg-config libusb-1.0 --cflags` -I/usr/local/include -fPIC
> -+LIBS += `pkg-config libusb-1.0 --libs` -L/usr/local/lib -lpthread -liconv
> -+endif
> -+
> -+ifeq "$(USBLIB_TYPE)" "HIDDATA"
> -+CFLAGS += -DUSE_HIDDATA
> -+OBJS = ./hiddata.o
> -+CFLAGS += `pkg-config libusb --cflags` -fPIC
> -+LIBS += `pkg-config libusb --libs`
> -+endif
> -+
> -+LIBFLAGS = -shared -o $(LIBTARGET) $(LIBS)
> -+EXE=
> -+
> -+#INSTALL = install
> -+PREFIX ?= /usr/local
> -+EXELOCATION ?= $(PREFIX)/bin
> -+LIBLOCATION ?= $(PREFIX)/lib
> -+INCLOCATION ?= $(PREFIX)/include
> -+
> -+endif
> -+
> - # WRT Linux
>
> - ifeq "$(OS)" "wrtlinux"
> - LIBTARGET = libblink1.so
> -@@ -371,7 +406,7 @@ endif
> + # was blink1-lib.so
> +
> + ifeq "$(USBLIB_TYPE)" "HIDAPI"
> +@@ -411,7 +412,7 @@ endif
>
> - #CFLAGS += -O -Wall -std=gnu99 -I ../hardware/firmware
> - CFLAGS += -std=gnu99
> + #CFLAGS += -O -Wall -std=gnu99 -I ../hardware/firmware
> + CFLAGS += -std=gnu99
> -CFLAGS += -g
> +#CFLAGS += -g
> CFLAGS += -DBLINK1_VERSION=\"$(BLINK1_VERSION)\"
>
> - OBJS += blink1-lib.o
> -@@ -389,6 +424,7 @@ help:
> - @echo "make OS=windows ... build Windows blink1-lib and blink1-tool"
> - @echo "make OS=linux ... build Linuxblink1-lib and blink1-tool"
> - @echo "make OS=freebsd ... build FreeBSDblink1-lib and blink1-tool"
> -+@echo "make OS=openbsd ... build OpenBSDblink1-lib and blink1-tool"
> - @echo "make OS=macosx ... build Mac OS X blink1-lib and blink1-tool"
> - @echo "make OS=wr
update misc/blink1
Hi,
please find below an update to blink-0.98a. This drops most of the
patches as upstreamed (thanks to bluhm).
OK?
Regards,
Joerg
Index: Makefile
===
RCS file: /cvs/ports/misc/blink1/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile16 Mar 2016 16:46:32 - 1.5
+++ Makefile9 Jan 2018 20:18:16 -
@@ -2,7 +2,7 @@
COMMENT = software tools for blink(1) LED notification light
-V =1.98
+V =1.98a
DISTNAME = ${GH_PROJECT}-${V}
SO_V = 0.1
Index: distinfo
===
RCS file: /cvs/ports/misc/blink1/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo23 Dec 2015 10:53:53 - 1.2
+++ distinfo9 Jan 2018 20:18:16 -
@@ -1,2 +1,2 @@
-SHA256 (blink1-1.98.tar.gz) = K7+ISMPGVquPsBA1/TEQOjIfvuIBZGkc9n43BsS1CxY=
-SIZE (blink1-1.98.tar.gz) = 29439933
+SHA256 (blink1-1.98a.tar.gz) = sMsN8zlejocXA2OUII+tKCW9GmmAJCuULjKR6fv5DP4=
+SIZE (blink1-1.98a.tar.gz) = 29503155
Index: patches/patch-commandline_Makefile
===
RCS file: /cvs/ports/misc/blink1/patches/patch-commandline_Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 patch-commandline_Makefile
--- patches/patch-commandline_Makefile 23 Dec 2015 10:53:53 - 1.2
+++ patches/patch-commandline_Makefile 9 Jan 2018 20:18:16 -
@@ -1,90 +1,46 @@
$OpenBSD: patch-commandline_Makefile,v 1.2 2015/12/23 10:53:53 bluhm Exp $
-
-todo: submit to upstream
-
commandline/Makefile.orig Wed Sep 9 03:06:56 2015
-+++ commandline/Makefile Wed Dec 23 11:33:08 2015
-@@ -113,9 +113,13 @@ ifeq "$(UNAME)" "FreeBSD"
- OS=freebsd
- endif
-
-+ifeq "$(UNAME)" "OpenBSD"
-+ OS=openbsd
-+endif
+Index: commandline/Makefile
+--- commandline/Makefile.orig
commandline/Makefile
+@@ -124,7 +124,8 @@ endif
+ # allow overriding of GIT_TAG & BLINK1_VERSION on commandline for automated
builds
MACH_TYPE:="$(strip $(shell uname -m))"
--GIT_TAG:="$(strip $(shell git tag 2>&1 | tail -1 | cut -f1 -d' '))"
-+#GIT_TAG:="$(strip $(shell git tag 2>&1 | tail -1 | cut -f1 -d' '))"
+-GIT_TAG?="$(strip $(shell git tag 2>&1 | tail -1 | cut -f1 -d' '))"
++#GIT_TAG?="$(strip $(shell git tag 2>&1 | tail -1 | cut -f1 -d' '))"
+GIT_TAG:=${GH_TAGNAME}
# deal with case of no git or no git tags, check for presence of "v" (i.e.
"v1.93")
ifneq ($(findstring v,$(GIT_TAG)), v)
GIT_TAG:="v0"
-@@ -278,6 +282,37 @@ INCLOCATION ?= $(PREFIX)/include
+@@ -289,7 +290,7 @@ endif
- endif
-
-+# OpenBSD
###
-+ifeq "$(OS)" "openbsd"
+ # OpenBSD
###
+ ifeq "$(OS)" "openbsd"
+-LIBTARGET = libblink1.so
+LIBTARGET = libblink1.so.${SO_V}
-+# was blink1-lib.so
-+
-+ifeq "$(USBLIB_TYPE)" "HIDAPI"
-+CFLAGS += -DUSE_HIDAPI
-+CFLAGS += -I./hidapi/hidapi
-+OBJS = ./hidapi/libusb/hid.o
-+CFLAGS += `pkg-config libusb-1.0 --cflags` -I/usr/local/include -fPIC
-+LIBS += `pkg-config libusb-1.0 --libs` -L/usr/local/lib -lpthread -liconv
-+endif
-+
-+ifeq "$(USBLIB_TYPE)" "HIDDATA"
-+CFLAGS += -DUSE_HIDDATA
-+OBJS = ./hiddata.o
-+CFLAGS += `pkg-config libusb --cflags` -fPIC
-+LIBS += `pkg-config libusb --libs`
-+endif
-+
-+LIBFLAGS = -shared -o $(LIBTARGET) $(LIBS)
-+EXE=
-+
-+#INSTALL = install
-+PREFIX ?= /usr/local
-+EXELOCATION ?= $(PREFIX)/bin
-+LIBLOCATION ?= $(PREFIX)/lib
-+INCLOCATION ?= $(PREFIX)/include
-+
-+endif
-+
- # WRT Linux
- ifeq "$(OS)" "wrtlinux"
- LIBTARGET = libblink1.so
-@@ -371,7 +406,7 @@ endif
+ # was blink1-lib.so
+
+ ifeq "$(USBLIB_TYPE)" "HIDAPI"
+@@ -411,7 +412,7 @@ endif
- #CFLAGS += -O -Wall -std=gnu99 -I ../hardware/firmware
- CFLAGS += -std=gnu99
+ #CFLAGS += -O -Wall -std=gnu99 -I ../hardware/firmware
+ CFLAGS += -std=gnu99
-CFLAGS += -g
+#CFLAGS += -g
CFLAGS += -DBLINK1_VERSION=\"$(BLINK1_VERSION)\"
- OBJS += blink1-lib.o
-@@ -389,6 +424,7 @@ help:
- @echo "make OS=windows ... build Windows blink1-lib and blink1-tool"
- @echo "make OS=linux ... build Linuxblink1-lib and blink1-tool"
- @echo "make OS=freebsd ... build FreeBSDblink1-lib and blink1-tool"
-+ @echo "make OS=openbsd ... build OpenBSDblink1-lib and blink1-tool"
- @echo "make OS=macosx ... build Mac OS X blink1-lib and blink1-tool"
- @echo "make OS=wrt ... build OpenWrt blink1-lib and blink1-tool"
- @echo "make OS=wrtcross... build for OpenWrt using cross-compiler"
-@@ -409,7 +445,7 @@ $(OBJS): %.o: %.c
+ OBJS += blink1-lib.o
+@@ -451,7 +452,7 @@ $(OBJS): %.o: %.c
blink1-tool: $(OBJS) blink1-tool.o
$(CC) $(CFLAGS) -c blink1-tool.c -o blink1-tool.o
-- $(CC) $(CFLAGS
