Index: Mk/bsd.port.mk =================================================================== --- Mk/bsd.port.mk +++ Mk/bsd.port.mk @@ -1341,15 +1341,7 @@ PKGVERSION= ${PORTVERSION:C/[-_,]/./g}${_SUF1}${_SUF2} PKGNAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-${PKGVERSION} DISTVERSIONFULL= ${DISTVERSIONPREFIX}${DISTVERSION:C/:(.)/\1/g}${DISTVERSIONSUFFIX} -.if defined(USE_GITHUB) && empty(MASTER_SITES:MGHC) && empty(USE_GITHUB:Mnodefault) -. if empty(DISTNAME) -_GITHUB_MUST_SET_DISTNAME= yes -. else -DEV_WARNING+= "You are using USE_GITHUB and DISTNAME is set which is wrong. Set GH_ACCOUNT/GH_PROJECT/GH_TAGNAME correctly and remove WRKSRC entirely." -. endif -.else DISTNAME?= ${PORTNAME}-${DISTVERSIONFULL} -.endif INDEXFILE?= INDEX-${OSVERSION:C/([0-9]*)[0-9]{5}/\1/} Index: Mk/bsd.sites.mk =================================================================== --- Mk/bsd.sites.mk +++ Mk/bsd.sites.mk @@ -443,26 +443,22 @@ # and extraction directory. It also replaces + with -. GH_TAGNAME_EXTRACT= ${GH_TAGNAME_SANITIZED:C/^[vV]([0-9])/\1/:S/+/-/g} . endif -. if defined(_GITHUB_MUST_SET_DISTNAME) -# GH_TAGNAME defaults to DISTVERSIONFULL; Avoid adding DISTVERSIONFULL in twice -. if ${GH_TAGNAME} != ${DISTVERSIONFULL} -DISTNAME= ${GH_ACCOUNT}-${GH_PROJECT}-${DISTVERSIONFULL}-${GH_TAGNAME_SANITIZED} -. else -DISTNAME= ${GH_ACCOUNT}-${GH_PROJECT}-${GH_TAGNAME_SANITIZED} -. endif -. 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 _GITHUB_EXTRACT_SUFX= .tar.gz # Put the DEFAULT distfile first _GITHUB_CLONE_DIR?= ${WRKDIR}/git-clone _PORTS_DIRECTORIES+= ${_GITHUB_CLONE_DIR} -. if !${USE_GITHUB:Mnodefault} && defined(_GITHUB_MUST_SET_DISTNAME) +. if !${USE_GITHUB:Mnodefault} && empty(MASTER_SITES:MGHC) +# GH_TAGNAME defaults to DISTVERSIONFULL; Avoid adding DISTVERSIONFULL in twice +. if ${GH_TAGNAME} != ${DISTVERSIONFULL} +DISTNAME= ${GH_ACCOUNT}-${GH_PROJECT}-${DISTVERSIONFULL}-${GH_TAGNAME_SANITIZED} +. else +DISTNAME= ${GH_ACCOUNT}-${GH_PROJECT}-${GH_TAGNAME_SANITIZED} +. endif +DISTNAME:= ${DISTNAME}_GH${_GITHUB_REV} DISTFILES+= ${DISTNAME}${_GITHUB_EXTRACT_SUFX} git-clone: git-clone-DEFAULT git-clone-DEFAULT: ${_GITHUB_CLONE_DIR} @@ -592,15 +588,14 @@ GL_COMMIT:= ${GL_COMMIT_DEFAULT} GL_SUBDIR:= ${GL_SUBDIR_DEFAULT} - _GITLAB_REV= 0 -DISTNAME:= ${GL_ACCOUNT}-${GL_PROJECT}-${GL_COMMIT}_GL${_GITLAB_REV} _GITLAB_EXTRACT_SUFX= .tar.gz _GITLAB_CLONE_DIR?= ${WRKDIR}/git-clone _PORTS_DIRECTORIES+= ${_GITLAB_CLONE_DIR} . if !${USE_GITLAB:Mnodefault} +DISTNAME:= ${GL_ACCOUNT}-${GL_PROJECT}-${GL_COMMIT}_GL${_GITLAB_REV} DISTFILES+= ${DISTNAME}${_GITLAB_EXTRACT_SUFX} git-clone: git-clone-DEFAULT git-clone-DEFAULT: ${_GITLAB_CLONE_DIR} Index: comms/cubicsdr/distinfo =================================================================== --- comms/cubicsdr/distinfo +++ comms/cubicsdr/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1551114984 -SHA256 (cubicsdr-0.2.5_GH0.tar.gz) = 5cb44c110fcbbb70a468b7fa402cf35f84d8901b3dd42d471a90ac3f5db00f4d -SIZE (cubicsdr-0.2.5_GH0.tar.gz) = 36911106 +TIMESTAMP = 1556806794 +SHA256 (cjcliffe-CubicSDR-0.2.5_GH0.tar.gz) = 5cb44c110fcbbb70a468b7fa402cf35f84d8901b3dd42d471a90ac3f5db00f4d +SIZE (cjcliffe-CubicSDR-0.2.5_GH0.tar.gz) = 36911106 Index: security/maia/Makefile =================================================================== --- security/maia/Makefile +++ security/maia/Makefile @@ -5,7 +5,6 @@ DISTVERSION= 1.0.4 PORTREVISION= 4 CATEGORIES= security -DISTNAME= maia_mailguard MAINTAINER= ek@purplehat.org COMMENT= Web-based management system based on amavisd-new and SpamAssassin @@ -35,7 +34,6 @@ GH_TAGNAME= 09eb7e5 USE_PERL5= run NO_BUILD= yes -WRKSRC= ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME} DOCS= LICENSE.txt README.md maiad.conf.dist maia-mysql.sql maia-pgsql.sql maia.conf.dist USERS= vscan GROUPS= vscan Index: security/maia/distinfo =================================================================== --- security/maia/distinfo +++ security/maia/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1546121679 -SHA256 (maia_mailguard_GH0.tar.gz) = 15789ad4b7e00efdfe115bd7688e02d7b456c015ef4d061a2425ff8a1d4b818f -SIZE (maia_mailguard_GH0.tar.gz) = 2298436 +TIMESTAMP = 1556867467 +SHA256 (technion-maia_mailguard-1.0.4-09eb7e5_GH0.tar.gz) = 15789ad4b7e00efdfe115bd7688e02d7b456c015ef4d061a2425ff8a1d4b818f +SIZE (technion-maia_mailguard-1.0.4-09eb7e5_GH0.tar.gz) = 2298436 Index: security/vuls/distinfo =================================================================== --- security/vuls/distinfo +++ security/vuls/distinfo @@ -23,8 +23,6 @@ SIZE (cheggaaa-pb-v1.0.26_GH0.tar.gz) = 11851 SHA256 (cheggaaa-pb-v2.0.6_GH0.tar.gz) = 01096a5c51d226a127a0625bb97ec2b97a4c1105235e28fe46f8e49f4bde618b SIZE (cheggaaa-pb-v2.0.6_GH0.tar.gz) = 17892 -SHA256 (cheggaaa-pb-v2.0.6_GH0.tar.gz) = 01096a5c51d226a127a0625bb97ec2b97a4c1105235e28fe46f8e49f4bde618b -SIZE (cheggaaa-pb-v2.0.6_GH0.tar.gz) = 17892 SHA256 (census-ecosystem-opencensus-go-exporter-ocagent-00af367_GH0.tar.gz) = c12023862959d0d099019458a78382cb99ae767baffd11be2f6b87b8172b4f41 SIZE (census-ecosystem-opencensus-go-exporter-ocagent-00af367_GH0.tar.gz) = 17653 SHA256 (census-instrumentation-opencensus-go-v0.18.0_GH0.tar.gz) = 70d7d584fa4b450fe1b266175a9ddf7868bf008d98292ee224c55cae2f5918a9 Index: x11-fonts/fntsample/Makefile =================================================================== --- x11-fonts/fntsample/Makefile +++ x11-fonts/fntsample/Makefile @@ -6,8 +6,7 @@ DISTVERSIONPREFIX= release/ CATEGORIES= x11-fonts MASTER_SITES= https://unicode.org/Public/12.0.0/ucd/:unidata -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ - Blocks-12.0.0d1.txt:unidata +DISTFILES= Blocks-12.0.0d1.txt:unidata EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= sunpoet@FreeBSD.org Index: x11-fonts/fntsample/distinfo =================================================================== --- x11-fonts/fntsample/distinfo +++ x11-fonts/fntsample/distinfo @@ -1,6 +1,4 @@ TIMESTAMP = 1547659022 -SHA256 (eugmes-fntsample-release-5.3_GH0.tar.gz) = e4e8b50b0a5e984cfdaa32b7d133bd3bf0c62edb14f752f7df1190176023972b -SIZE (eugmes-fntsample-release-5.3_GH0.tar.gz) = 56508 SHA256 (Blocks-12.0.0d1.txt) = a1a3ca4381eb91f7b65afe7cb7df615cdcf67993fef4b486585f66b349993a10 SIZE (Blocks-12.0.0d1.txt) = 10086 SHA256 (eugmes-fntsample-release-5.3_GH0.tar.gz) = e4e8b50b0a5e984cfdaa32b7d133bd3bf0c62edb14f752f7df1190176023972b