Page MenuHomeFreeBSD

D20140.id57000.diff
No OneTemporary

D20140.id57000.diff

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}
@@ -624,7 +619,7 @@
GL_PROJECT_${_group}?= ${GL_PROJECT_DEFAULT}
_GL_TUPLE_OUT:= ${_GL_TUPLE_OUT} ${GL_SITE_${_group}}:${GL_ACCOUNT_${_group}}:${GL_PROJECT_${_group}}:${GL_COMMIT_${_group}}:${_group}/${GL_SUBDIR_${_group}}
-DISTNAME_${_group}:= ${GL_ACCOUNT}-${GL_PROJECT_${_group}}-${GL_COMMIT_${_group}}_GL${_GITLAB_REV}
+DISTNAME_${_group}:= ${GL_ACCOUNT_${_group}}-${GL_PROJECT_${_group}}-${GL_COMMIT_${_group}}_GL${_GITLAB_REV}
DISTFILE_${_group}:= ${DISTNAME_${_group}}${_GITLAB_EXTRACT_SUFX}
DISTFILES:= ${DISTFILES} ${DISTFILE_${_group}}:${_group}
MASTER_SITES:= ${MASTER_SITES} ${GL_SITE_${_group}}/${GL_ACCOUNT_${_group}}/${GL_PROJECT_${_group}}/repository/${GL_COMMIT_${_group}}/archive.tar.gz?dummy=/:${_group}
Index: audio/lollypop/distinfo
===================================================================
--- audio/lollypop/distinfo
+++ audio/lollypop/distinfo
@@ -1,5 +1,5 @@
TIMESTAMP = 1553544004
SHA256 (World-lollypop-8e6fbe2294bbdfe3c3ee5889c2093d9274618e04_GL0.tar.gz) = 601c71d30cb9d60a076e054808a8801c7232f0886c4e5766dad2c401c34ff99e
SIZE (World-lollypop-8e6fbe2294bbdfe3c3ee5889c2093d9274618e04_GL0.tar.gz) = 371105
-SHA256 (World-lollypop-po-fc5fd94a645b80172e63a59832d22d185ef9d202_GL0.tar.gz) = 99ebb8eb206934c41c014889ef4b0102049b2fe791640204958c83b1624ad416
-SIZE (World-lollypop-po-fc5fd94a645b80172e63a59832d22d185ef9d202_GL0.tar.gz) = 467580
+SHA256 (gnumdk-lollypop-po-fc5fd94a645b80172e63a59832d22d185ef9d202_GL0.tar.gz) = 99ebb8eb206934c41c014889ef4b0102049b2fe791640204958c83b1624ad416
+SIZE (gnumdk-lollypop-po-fc5fd94a645b80172e63a59832d22d185ef9d202_GL0.tar.gz) = 467580
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
+SHA256 (cjcliffe-CubicSDR-0.2.5_GH0.tar.gz) = 5cb44c110fcbbb70a468b7fa402cf35f84d8901b3dd42d471a90ac3f5db00f4d
+SIZE (cjcliffe-CubicSDR-0.2.5_GH0.tar.gz) = 36911106
Index: editors/jucipp/distinfo
===================================================================
--- editors/jucipp/distinfo
+++ editors/jucipp/distinfo
@@ -3,5 +3,5 @@
SIZE (cppit-jucipp-ec182761603fa01fe008f09989b99acdf3466096_GL0.tar.gz) = 578203
SHA256 (cppit-libclangmm-2b2f2ead1f685a9efb28ee2c0ff3cbe452a724dd_GL0.tar.gz) = 538003cc308185a952fbbba7688d4d4e79a7e6707ad9daf62034347c3036a2b4
SIZE (cppit-libclangmm-2b2f2ead1f685a9efb28ee2c0ff3cbe452a724dd_GL0.tar.gz) = 18069
-SHA256 (cppit-tiny-process-library-54b95a21cf35f8467e21038f523fd3342a77de4c_GL0.tar.gz) = dc8e7c0632773a1366f7824b2ede517c333435a281b851cdcb6abcc22dd136ed
-SIZE (cppit-tiny-process-library-54b95a21cf35f8467e21038f523fd3342a77de4c_GL0.tar.gz) = 9756
+SHA256 (eidheim-tiny-process-library-54b95a21cf35f8467e21038f523fd3342a77de4c_GL0.tar.gz) = dc8e7c0632773a1366f7824b2ede517c333435a281b851cdcb6abcc22dd136ed
+SIZE (eidheim-tiny-process-library-54b95a21cf35f8467e21038f523fd3342a77de4c_GL0.tar.gz) = 9756
Index: science/dalton/distinfo
===================================================================
--- science/dalton/distinfo
+++ science/dalton/distinfo
@@ -7,9 +7,9 @@
SIZE (dftlibs-xcint-2d1496f5_GH0.tar.gz) = 77872
SHA256 (dalton-dalton-d16802317e0785578e491e600c73cfb6bfb70ff0_GL0.tar.gz) = b5e22529b5c1ea67c717ba840b8bb1c81926ef7fb4755d2bfede8ccd300b5a1c
SIZE (dalton-dalton-d16802317e0785578e491e600c73cfb6bfb70ff0_GL0.tar.gz) = 38337007
-SHA256 (dalton-gen1int-1e4148ecd676761b3399801acba443925a1fee6b_GL0.tar.gz) = 24af3d6e7408be3efd04aa0ded641110f9dd11aee21ba6a273e21c0c04b266bc
-SIZE (dalton-gen1int-1e4148ecd676761b3399801acba443925a1fee6b_GL0.tar.gz) = 2889905
+SHA256 (bingao-gen1int-1e4148ecd676761b3399801acba443925a1fee6b_GL0.tar.gz) = 24af3d6e7408be3efd04aa0ded641110f9dd11aee21ba6a273e21c0c04b266bc
+SIZE (bingao-gen1int-1e4148ecd676761b3399801acba443925a1fee6b_GL0.tar.gz) = 2889905
SHA256 (dalton-efs-ffc1a2f137fa6e322143bf84be724d9b815e637b_GL0.tar.gz) = 235cf0cc8941f2a739d426885a2fb40e95727f6296203b3cf7c593ae7cf0266f
SIZE (dalton-efs-ffc1a2f137fa6e322143bf84be724d9b815e637b_GL0.tar.gz) = 193905
-SHA256 (dalton-pelib-public-ba0ba35e9d8f5663f320fb3de6010fb66106ed80_GL0.tar.gz) = f8ae7d7ef4aeedb23a71242830f0116772c12844f9cf8e467cf28490ff9b14d6
-SIZE (dalton-pelib-public-ba0ba35e9d8f5663f320fb3de6010fb66106ed80_GL0.tar.gz) = 54928
+SHA256 (pe-software-pelib-public-ba0ba35e9d8f5663f320fb3de6010fb66106ed80_GL0.tar.gz) = f8ae7d7ef4aeedb23a71242830f0116772c12844f9cf8e467cf28490ff9b14d6
+SIZE (pe-software-pelib-public-ba0ba35e9d8f5663f320fb3de6010fb66106ed80_GL0.tar.gz) = 54928
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
+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/obfs4proxy-tor/distinfo
===================================================================
--- security/obfs4proxy-tor/distinfo
+++ security/obfs4proxy-tor/distinfo
@@ -19,5 +19,5 @@
SIZE (golang-sys-b44545b_GH0.tar.gz) = 1265704
SHA256 (Yawning-bsaes-26d1add_GH0.tar.gz) = a6eb5058cc68909cd1bacfc6345ea958187481ef85ef8a30887d4eea7c6eb6af
SIZE (Yawning-bsaes-26d1add_GH0.tar.gz) = 18853
-SHA256 (obfs4proxy-utls-6fb25fe80308b52db645922e9b919fbbe519656b_GL0.tar.gz) = 4d5f534269e67be830361e6e0fab94dd07bb1096e23b7ef5337fce4a7b313efe
-SIZE (obfs4proxy-utls-6fb25fe80308b52db645922e9b919fbbe519656b_GL0.tar.gz) = 533335
+SHA256 (yawning-utls-6fb25fe80308b52db645922e9b919fbbe519656b_GL0.tar.gz) = 4d5f534269e67be830361e6e0fab94dd07bb1096e23b7ef5337fce4a7b313efe
+SIZE (yawning-utls-6fb25fe80308b52db645922e9b919fbbe519656b_GL0.tar.gz) = 533335
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: www/kurly/distinfo
===================================================================
--- www/kurly/distinfo
+++ www/kurly/distinfo
@@ -5,5 +5,5 @@
SIZE (alsm-ioprogress-063c372_GH0.tar.gz) = 4225
SHA256 (urfave-cli-8e01ec4_GH0.tar.gz) = d8654573173cef6b639f00884c146bdb7f9130817e0b2d3f44d86d701428a63d
SIZE (urfave-cli-8e01ec4_GH0.tar.gz) = 64657
-SHA256 (kurly-kurly-369c1998dfbfca7043f8c995c8ef8714496530ea_GL0.tar.gz) = 6c7adc297812147145a0b5da8ae790c17ed7370df7180cc795e4543f6475b696
-SIZE (kurly-kurly-369c1998dfbfca7043f8c995c8ef8714496530ea_GL0.tar.gz) = 20686
+SHA256 (davidjpeacock-kurly-369c1998dfbfca7043f8c995c8ef8714496530ea_GL0.tar.gz) = 6c7adc297812147145a0b5da8ae790c17ed7370df7180cc795e4543f6475b696
+SIZE (davidjpeacock-kurly-369c1998dfbfca7043f8c995c8ef8714496530ea_GL0.tar.gz) = 20686
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

File Metadata

Mime Type
text/plain
Expires
Tue, Mar 10, 11:56 PM (14 h, 46 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29519096
Default Alt Text
D20140.id57000.diff (12 KB)

Event Timeline