Update: net/wireless v4 -> v5

classic Classic list List threaded Threaded
8 messages Options
Reply | Threaded
Open this post in threaded view
|

Update: net/wireless v4 -> v5

Gregor Best-2
Hi people,

the recent move to background-only scanning for wireless networks made a
hack that I introduced into net/wireless a while ago fall flat on its
face. This is an update to a release I made today that makes scanning
work again.

--
        Gregor

Index: Makefile
===================================================================
RCS file: /home/cvs/ports/net/wireless/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile 3 Jan 2018 23:27:01 -0000 1.3
+++ Makefile 2 May 2018 21:32:32 -0000
@@ -3,7 +3,7 @@
 COMMENT = automatically scan for and configure wireless networks
 GH_ACCOUNT = farhaven
 GH_PROJECT = wireless
-GH_TAGNAME = v4
+GH_TAGNAME = v5
 
 CATEGORIES = net
 
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/net/wireless/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 3 Jan 2018 23:27:01 -0000 1.2
+++ distinfo 2 May 2018 21:32:44 -0000
@@ -1,2 +1,2 @@
-SHA256 (wireless-4.tar.gz) = HXWoFCCVh2O+ykHfDHdsDjc/iBh9iQs9Rj1v3NYry1s=
-SIZE (wireless-4.tar.gz) = 9117
+SHA256 (wireless-5.tar.gz) = 9rz1YkU/l3Go7v916SWBPJHBSLaPuoYpHaNvPA74INY=
+SIZE (wireless-5.tar.gz) = 9160

Reply | Threaded
Open this post in threaded view
|

Re: Update: net/wireless v4 -> v5

Josh Grosse-3
On Wed, May 02, 2018 at 11:54:40PM +0200, Gregor Best wrote:
> Hi people,
>
> the recent move to background-only scanning for wireless networks made a
> hack that I introduced into net/wireless a while ago fall flat on its
> face. This is an update to a release I made today that makes scanning
> work again.
>
> --
> Gregor

Working fine for me on amd64.  Thanks, Gregor!!

Reply | Threaded
Open this post in threaded view
|

Re: Update: net/wireless v4 -> v5

Gregor Best-2
In reply to this post by Gregor Best-2
Hi,

Klemens asked me to provide the tarball as a release asset, so that it
won't get randomly re-created by Github's infrastructure.

The attached patch moves to an asset as the distfile. I used the weird
DISTFILE/DISTNAME split because otherwise the version of the port would
change from 4 to v5, and I'm not sure how that'd be handled by the ports
infrastructure. If that'd indeed be okay, I'll provide an updated,
smaller patch.

--
        Gregor


Index: net/wireless/Makefile
===================================================================
RCS file: /home/cvs/ports/net/wireless/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- net/wireless/Makefile 3 Jan 2018 23:27:01 -0000 1.3
+++ net/wireless/Makefile 6 May 2018 11:06:54 -0000
@@ -1,9 +1,14 @@
 # $OpenBSD: Makefile,v 1.3 2018/01/03 23:27:01 danj Exp $
 
 COMMENT = automatically scan for and configure wireless networks
-GH_ACCOUNT = farhaven
-GH_PROJECT = wireless
-GH_TAGNAME = v4
+
+HOMEPAGE = https://github.com/farhaven/wireless
+
+V = 5
+
+MASTER_SITES = https://github.com/farhaven/wireless/releases/download/v$V/
+DISTFILES = wireless-v$V.tar.gz
+DISTNAME = wireless-$V
 
 CATEGORIES = net
 
Index: net/wireless/distinfo
===================================================================
RCS file: /home/cvs/ports/net/wireless/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- net/wireless/distinfo 3 Jan 2018 23:27:01 -0000 1.2
+++ net/wireless/distinfo 6 May 2018 11:03:51 -0000
@@ -1,2 +1,2 @@
-SHA256 (wireless-4.tar.gz) = HXWoFCCVh2O+ykHfDHdsDjc/iBh9iQs9Rj1v3NYry1s=
-SIZE (wireless-4.tar.gz) = 9117
+SHA256 (wireless-v5.tar.gz) = 9rz1YkU/l3Go7v916SWBPJHBSLaPuoYpHaNvPA74INY=
+SIZE (wireless-v5.tar.gz) = 9160

Reply | Threaded
Open this post in threaded view
|

Re: Update: net/wireless v4 -> v5

Stuart Henderson
On 2018/05/06 13:13, Gregor Best wrote:

> Hi,
>
> Klemens asked me to provide the tarball as a release asset, so that it
> won't get randomly re-created by Github's infrastructure.
>
> The attached patch moves to an asset as the distfile. I used the weird
> DISTFILE/DISTNAME split because otherwise the version of the port would
> change from 4 to v5, and I'm not sure how that'd be handled by the ports
> infrastructure. If that'd indeed be okay, I'll provide an updated,
> smaller patch.
>
> --
> Gregor
>
>
> Index: net/wireless/Makefile
> ===================================================================
> RCS file: /home/cvs/ports/net/wireless/Makefile,v
> retrieving revision 1.3
> diff -u -p -r1.3 Makefile
> --- net/wireless/Makefile 3 Jan 2018 23:27:01 -0000 1.3
> +++ net/wireless/Makefile 6 May 2018 11:06:54 -0000
> @@ -1,9 +1,14 @@
>  # $OpenBSD: Makefile,v 1.3 2018/01/03 23:27:01 danj Exp $
>  
>  COMMENT = automatically scan for and configure wireless networks
> -GH_ACCOUNT = farhaven
> -GH_PROJECT = wireless
> -GH_TAGNAME = v4
> +
> +HOMEPAGE = https://github.com/farhaven/wireless
> +
> +V = 5
> +
> +MASTER_SITES = https://github.com/farhaven/wireless/releases/download/v$V/
> +DISTFILES = wireless-v$V.tar.gz
> +DISTNAME = wireless-$V
>  
>  CATEGORIES = net
>  
> Index: net/wireless/distinfo
> ===================================================================
> RCS file: /home/cvs/ports/net/wireless/distinfo,v
> retrieving revision 1.2
> diff -u -p -r1.2 distinfo
> --- net/wireless/distinfo 3 Jan 2018 23:27:01 -0000 1.2
> +++ net/wireless/distinfo 6 May 2018 11:03:51 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (wireless-4.tar.gz) = HXWoFCCVh2O+ykHfDHdsDjc/iBh9iQs9Rj1v3NYry1s=
> -SIZE (wireless-4.tar.gz) = 9117
> +SHA256 (wireless-v5.tar.gz) = 9rz1YkU/l3Go7v916SWBPJHBSLaPuoYpHaNvPA74INY=
> +SIZE (wireless-v5.tar.gz) = 9160
>

This is the way to do it:

v= 4
DISTNAME= wireless-v$V
PKGNAME= wireless-$V

Reply | Threaded
Open this post in threaded view
|

Re: Update: net/wireless v4 -> v5

Gregor Best-2
Hi,

On Sun, May 06, 2018 at 12:19:09PM +0100, Stuart Henderson wrote:
> [...]
> This is the way to do it:
>
> v= 4
> DISTNAME= wireless-v$V
> PKGNAME= wireless-$V
> [...]

sthen to the rescue. This looks much better. I've also reshuffled a few
things so the variables follow the order in Makefile.template.

--
        Gregor

Index: net/wireless/Makefile
===================================================================
RCS file: /home/cvs/ports/net/wireless/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- net/wireless/Makefile 3 Jan 2018 23:27:01 -0000 1.3
+++ net/wireless/Makefile 6 May 2018 12:45:48 -0000
@@ -1,12 +1,15 @@
 # $OpenBSD: Makefile,v 1.3 2018/01/03 23:27:01 danj Exp $
 
 COMMENT = automatically scan for and configure wireless networks
-GH_ACCOUNT = farhaven
-GH_PROJECT = wireless
-GH_TAGNAME = v4
+
+V = 5
+DISTNAME = wireless-v$V
+PKGNAME = wireless-$V
 
 CATEGORIES = net
 
+HOMEPAGE = https://github.com/farhaven/wireless
+
 MAINTAINER = Gregor Best <[hidden email]>
 
 # BSD
@@ -14,6 +17,8 @@ PERMIT_PACKAGE_CDROM = Yes
 
 # uses pledge
 WANTLIB = c
+
+MASTER_SITES = https://github.com/farhaven/wireless/releases/download/v$V/
 
 NO_TEST = Yes
 
Index: net/wireless/distinfo
===================================================================
RCS file: /home/cvs/ports/net/wireless/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- net/wireless/distinfo 3 Jan 2018 23:27:01 -0000 1.2
+++ net/wireless/distinfo 6 May 2018 12:43:35 -0000
@@ -1,2 +1,2 @@
-SHA256 (wireless-4.tar.gz) = HXWoFCCVh2O+ykHfDHdsDjc/iBh9iQs9Rj1v3NYry1s=
-SIZE (wireless-4.tar.gz) = 9117
+SHA256 (wireless-v5.tar.gz) = DbW6RVSyQvstKemJO57yARkGpYzpNzjuL0PCTipUabA=
+SIZE (wireless-v5.tar.gz) = 9100

Reply | Threaded
Open this post in threaded view
|

Re: Update: net/wireless v4 -> v5

Klemens Nanni-2
On Sun, May 06, 2018 at 02:48:55PM +0200, Gregor Best wrote:
> sthen to the rescue. This looks much better. I've also reshuffled a few
> things so the variables follow the order in Makefile.template.
Works for me (again), OK kn with ${V} instead of $V.

Reply | Threaded
Open this post in threaded view
|

Re: Update: net/wireless v4 -> v5

Gregor Best-2
On Sun, May 06, 2018 at 03:10:19PM +0200, Klemens Nanni wrote:
> On Sun, May 06, 2018 at 02:48:55PM +0200, Gregor Best wrote:
> > sthen to the rescue. This looks much better. I've also reshuffled a few
> > things so the variables follow the order in Makefile.template.
> Works for me (again), OK kn with ${V} instead of $V.
> [...]

Thy will be done :)

--
        Gregor

Index: net/wireless/Makefile
===================================================================
RCS file: /home/cvs/ports/net/wireless/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- net/wireless/Makefile 3 Jan 2018 23:27:01 -0000 1.3
+++ net/wireless/Makefile 6 May 2018 13:21:48 -0000
@@ -1,12 +1,15 @@
 # $OpenBSD: Makefile,v 1.3 2018/01/03 23:27:01 danj Exp $
 
 COMMENT = automatically scan for and configure wireless networks
-GH_ACCOUNT = farhaven
-GH_PROJECT = wireless
-GH_TAGNAME = v4
+
+V = 5
+DISTNAME = wireless-v${V}
+PKGNAME = wireless-${V}
 
 CATEGORIES = net
 
+HOMEPAGE = https://github.com/farhaven/wireless
+
 MAINTAINER = Gregor Best <[hidden email]>
 
 # BSD
@@ -14,6 +17,8 @@ PERMIT_PACKAGE_CDROM = Yes
 
 # uses pledge
 WANTLIB = c
+
+MASTER_SITES = https://github.com/farhaven/wireless/releases/download/v${V}/
 
 NO_TEST = Yes
 
Index: net/wireless/distinfo
===================================================================
RCS file: /home/cvs/ports/net/wireless/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- net/wireless/distinfo 3 Jan 2018 23:27:01 -0000 1.2
+++ net/wireless/distinfo 6 May 2018 12:43:35 -0000
@@ -1,2 +1,2 @@
-SHA256 (wireless-4.tar.gz) = HXWoFCCVh2O+ykHfDHdsDjc/iBh9iQs9Rj1v3NYry1s=
-SIZE (wireless-4.tar.gz) = 9117
+SHA256 (wireless-v5.tar.gz) = DbW6RVSyQvstKemJO57yARkGpYzpNzjuL0PCTipUabA=
+SIZE (wireless-v5.tar.gz) = 9100

Reply | Threaded
Open this post in threaded view
|

Re: Update: net/wireless v4 -> v5

Stuart Henderson
In reply to this post by Klemens Nanni-2
On 2018/05/06 15:10, Klemens Nanni wrote:
> On Sun, May 06, 2018 at 02:48:55PM +0200, Gregor Best wrote:
> > sthen to the rescue. This looks much better. I've also reshuffled a few
> > things so the variables follow the order in Makefile.template.
> Works for me (again), OK kn with ${V} instead of $V.
>

Huh?