svn commit: r459033 - in head: Mk net/boinc-client

[Mathieu Arnold]

Author: mat
Date: Mon Jan 15 11:34:53 2018
New Revision: 459033
URL: https://svnweb.freebsd.org/changeset/ports/459033

Log:
  Fix a bug in USE_GITHUB code where a version with more than one / was
  not sanitized properly.
  
  Sponsored by:	Absolight

Modified:
  head/Mk/bsd.sites.mk   (contents, props changed)
  head/net/boinc-client/Makefile   (contents, props changed)
  head/net/boinc-client/distinfo   (contents, props changed)

Modified: head/Mk/bsd.sites.mk
==============================================================================
--- head/Mk/bsd.sites.mk	Mon Jan 15 10:56:31 2018	(r459032)
+++ head/Mk/bsd.sites.mk	Mon Jan 15 11:34:53 2018	(r459033)
@@ -429,7 +429,7 @@ GH_PROJECT:=	${GH_PROJECT_DEFAULT}
 GH_TAGNAME:=	${GH_TAGNAME_DEFAULT}
 GH_SUBDIR:=	${GH_SUBDIR_DEFAULT}
 .  if defined(GH_TAGNAME)
-GH_TAGNAME_SANITIZED=	${GH_TAGNAME:S,/,-,}
+GH_TAGNAME_SANITIZED=	${GH_TAGNAME:S,/,-,g}
 # GitHub silently converts tags starting with v to not have v in the filename
 # and extraction directory.  It also replaces + with -.
 GH_TAGNAME_EXTRACT=	${GH_TAGNAME_SANITIZED:C/^[vV]([0-9])/\1/:S/+/-/g}

Modified: head/net/boinc-client/Makefile
==============================================================================
--- head/net/boinc-client/Makefile	Mon Jan 15 10:56:31 2018	(r459032)
+++ head/net/boinc-client/Makefile	Mon Jan 15 11:34:53 2018	(r459033)
@@ -3,6 +3,7 @@
 
 PORTNAME=	boinc-client
 PORTVERSION=	7.8.6
+DISTVERSIONPREFIX=	client_release/7.8/
 PORTREVISION=	1
 CATEGORIES=	net
 
@@ -20,11 +21,8 @@ GNU_CONFIGURE=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	BOINC
 GH_PROJECT=	boinc
-GH_TAGNAME=	client_release/7.8/${PORTVERSION}
 USE_LDCONFIG=	yes
 DOS2UNIX_GLOB=	*.xpm
-NO_WRKSUBDIR=	yes
-WRKSRC_SUBDIR=	boinc-client_release-7.8-${PORTVERSION}
 
 USERS=		boinc
 GROUPS=		boinc

Modified: head/net/boinc-client/distinfo
==============================================================================
--- head/net/boinc-client/distinfo	Mon Jan 15 10:56:31 2018	(r459032)
+++ head/net/boinc-client/distinfo	Mon Jan 15 11:34:53 2018	(r459033)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1515941947
-SHA256 (BOINC-boinc-7.8.6-client_release-7.8/7.8.6_GH0.tar.gz) = ed5f3dcdc8d1cc5277529afb701377e77d1ff89711368a7456553bf249940bad
-SIZE (BOINC-boinc-7.8.6-client_release-7.8/7.8.6_GH0.tar.gz) = 52037690
+TIMESTAMP = 1516015415
+SHA256 (BOINC-boinc-client_release-7.8-7.8.6_GH0.tar.gz) = ed5f3dcdc8d1cc5277529afb701377e77d1ff89711368a7456553bf249940bad
+SIZE (BOINC-boinc-client_release-7.8-7.8.6_GH0.tar.gz) = 52037690