Date: Fri, 20 Mar 2015 20:34:30 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r381780 - in head: Mk x11-fonts/sourcesanspro-ttf Message-ID: <201503202034.t2KKYUm8043985@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Fri Mar 20 20:34:29 2015 New Revision: 381780 URL: https://svnweb.freebsd.org/changeset/ports/381780 QAT: https://qat.redports.org/buildarchive/r381780/ Log: USE_GITHUB: Strip slashes from GH_TAGNAME which impacts WRKSRC and DISTNAME. The DISTNAME setting in bsd.sites.mk was moved lower due to GH_TAGNAME using := and DISTNAME depending on GH_TAGNAME. With hat: portmgr Modified: head/Mk/bsd.sites.mk head/x11-fonts/sourcesanspro-ttf/Makefile head/x11-fonts/sourcesanspro-ttf/distinfo Modified: head/Mk/bsd.sites.mk ============================================================================== --- head/Mk/bsd.sites.mk Fri Mar 20 20:22:07 2015 (r381779) +++ head/Mk/bsd.sites.mk Fri Mar 20 20:34:29 2015 (r381780) @@ -549,13 +549,6 @@ MASTER_SITES+= GHL . if !defined(MASTER_SITES) || !${MASTER_SITES:MGH} && !${MASTER_SITES:MGHC} MASTER_SITES+= GH . endif -# This new scheme rerolls distfiles. Also ensure they are renamed to avoid -# conflicts. Use _GITHUB_REV in case github changes their zipping or structure -# which has happened before. -_GITHUB_REV= 0 -. if ${MASTER_SITES:MGH} -DISTNAME:= ${DISTNAME}_GH${_GITHUB_REV} -. endif . endif GH_ACCOUNT?= ${PORTNAME} GH_PROJECT?= ${PORTNAME} @@ -565,6 +558,14 @@ GH_TAGNAME?= ${DISTVERSION} . else # Use full PREFIX/SUFFIX and converted DISTVERSION GH_TAGNAME?= ${DISTVERSIONFULL} +GH_TAGNAME:= ${GH_TAGNAME:S,/,-,} +# This new scheme rerolls distfiles. Also ensure they are renamed to avoid +# conflicts. Use _GITHUB_REV in case github changes their zipping or structure +# which has happened before. +_GITHUB_REV= 0 +. if ${MASTER_SITES:MGH} +DISTNAME:= ${DISTNAME}_GH${_GITHUB_REV} +. endif . endif .endif .endif Modified: head/x11-fonts/sourcesanspro-ttf/Makefile ============================================================================== --- head/x11-fonts/sourcesanspro-ttf/Makefile Fri Mar 20 20:22:07 2015 (r381779) +++ head/x11-fonts/sourcesanspro-ttf/Makefile Fri Mar 20 20:34:29 2015 (r381780) @@ -14,7 +14,6 @@ USE_GITHUB= yes GH_ACCOUNT= adobe-fonts GH_PROJECT= source-sans-pro GH_TAGNAME= 2.010R-ro/1.065R-it -WRKSRC= ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME:S,/,-,} NO_BUILD= yes USES= fonts Modified: head/x11-fonts/sourcesanspro-ttf/distinfo ============================================================================== --- head/x11-fonts/sourcesanspro-ttf/distinfo Fri Mar 20 20:22:07 2015 (r381779) +++ head/x11-fonts/sourcesanspro-ttf/distinfo Fri Mar 20 20:34:29 2015 (r381780) @@ -1,2 +1,2 @@ -SHA256 (adobe-fonts-source-sans-pro-1.065-2.010R-ro/1.065R-it_GH0.tar.gz) = e29660947d1a77bc2682b6036cfa4d644d9cdf00a272baaf60dda56e547c79e8 -SIZE (adobe-fonts-source-sans-pro-1.065-2.010R-ro/1.065R-it_GH0.tar.gz) = 5503301 +SHA256 (adobe-fonts-source-sans-pro-1.065-2.010R-ro-1.065R-it_GH0.tar.gz) = e29660947d1a77bc2682b6036cfa4d644d9cdf00a272baaf60dda56e547c79e8 +SIZE (adobe-fonts-source-sans-pro-1.065-2.010R-ro-1.065R-it_GH0.tar.gz) = 5503301
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503202034.t2KKYUm8043985>