From fd11f3f038b943c7bbd61cdd9e1c580b96ebe94c Mon Sep 17 00:00:00 2001 From: Mathieu Arnold Date: Wed, 20 May 2020 15:49:37 +0000 Subject: [PATCH] Regular USE_GITHUB cleanup. --- archivers/lib1541img/Makefile | 7 ++++--- archivers/lib1541img/distinfo | 4 ++-- archivers/snappy-java/Makefile | 6 +++--- archivers/v1541commander/Makefile | 7 ++++--- archivers/v1541commander/distinfo | 4 ++-- cad/PrusaSlicer/Makefile | 7 +++---- cad/PrusaSlicer/distinfo | 4 ++-- devel/google-cloud-cpp/Makefile | 9 ++++----- devel/google-cloud-cpp/distinfo | 4 ++-- games/crispy-doom/Makefile | 2 +- games/crispy-doom/distinfo | 4 ++-- math/py-gmpy2-devel/Makefile | 9 ++++----- math/py-gmpy2-devel/distinfo | 4 ++-- 13 files changed, 35 insertions(+), 36 deletions(-) diff --git a/archivers/lib1541img/Makefile b/archivers/lib1541img/Makefile index cd85e3769ed4..31d58f7f327c 100644 --- a/archivers/lib1541img/Makefile +++ b/archivers/lib1541img/Makefile @@ -3,6 +3,7 @@ PORTNAME= lib1541img PORTVERSION= 1.1 +DISTVERSIONPREFIX= v CATEGORIES= archivers devel emulators MAINTAINER= felix@palmen-it.de @@ -13,9 +14,9 @@ LICENSE= BSD2CLAUSE USES= compiler:c11 gmake USE_GITHUB= yes -GH_PROJECT= ${PORTNAME} zimk:zimk +GH_PROJECT= zimk:zimk GH_ACCOUNT= excess-c64 Zirias:zimk -GH_TAGNAME= v${PORTVERSION} 31500ca:zimk +GH_TAGNAME= 31500ca:zimk USE_LDCONFIG= yes MAKE_ARGS= pkgconfigdir=${LOCALBASE}/libdata/pkgconfig \ @@ -30,6 +31,6 @@ DOXYGEN_BUILD_DEPENDS= doxygen>0:devel/doxygen DOXYGEN_ALL_TARGET= html post-extract: - @${MV} ${WRKDIR}/zimk-*/* ${WRKSRC}/zimk/ + @${MV} ${WRKSRC_zimk}/* ${WRKSRC}/zimk/ .include diff --git a/archivers/lib1541img/distinfo b/archivers/lib1541img/distinfo index 75a28f3e4490..ae4e2fc1e4bc 100644 --- a/archivers/lib1541img/distinfo +++ b/archivers/lib1541img/distinfo @@ -1,5 +1,5 @@ TIMESTAMP = 1581093812 -SHA256 (excess-c64-lib1541img-1.1-v1.1_GH0.tar.gz) = 360976364c98d64485f8f7aa5630aa7f6f4907e9128bd293c94fbcd2471c0bef -SIZE (excess-c64-lib1541img-1.1-v1.1_GH0.tar.gz) = 73253 +SHA256 (excess-c64-lib1541img-v1.1_GH0.tar.gz) = 360976364c98d64485f8f7aa5630aa7f6f4907e9128bd293c94fbcd2471c0bef +SIZE (excess-c64-lib1541img-v1.1_GH0.tar.gz) = 73253 SHA256 (Zirias-zimk-31500ca_GH0.tar.gz) = e0404e600343460320a41efdec3b432fe7bce76518b08225e01264937b0958ea SIZE (Zirias-zimk-31500ca_GH0.tar.gz) = 12137 diff --git a/archivers/snappy-java/Makefile b/archivers/snappy-java/Makefile index b188a2e2fe66..82076fd1fbab 100644 --- a/archivers/snappy-java/Makefile +++ b/archivers/snappy-java/Makefile @@ -10,7 +10,7 @@ CATEGORIES= archivers java MASTER_SITES= LOCAL/pi:repo PKGNAMESUFFIX= java DISTFILES+= ${PORTNAME}-${PKGNAMESUFFIX}-repository-${PORTVERSION}${EXTRACT_SUFX}:repo -EXTRACT_ONLY= xerial-${PORTNAME}-${PKGNAMESUFFIX}-${PORTVERSION}_GH0${EXTRACT_SUFX} \ +EXTRACT_ONLY= ${DISTFILE_DEFAULT} \ ${PORTNAME}-${PKGNAMESUFFIX}-repository-${PORTVERSION}${EXTRACT_SUFX} MAINTAINER= language.devel@gmail.com @@ -48,8 +48,8 @@ PLIST_FILES= ${JAVAJARDIR}/snappy-java.jar lib/libsnappyjava.so post-extract: @${MKDIR} ${WRKSRC}/target @${RM} ${WRKSRC}/sbt - @${CP} ${DISTDIR}/google-snappy-${PORTVERSION:R}_GH0${EXTRACT_SUFX} ${WRKSRC}/target/snappy-${PORTVERSION:R}${EXTRACT_SUFX} - @${CP} ${DISTDIR}/kiyo-masui-bitshuffle-${BITSHUFFLE_V}_GH0${EXTRACT_SUFX} ${WRKSRC}/target/bitshuffle-${BITSHUFFLE_V}${EXTRACT_SUFX} + @${CP} ${DISTDIR}/${DISTFILE_google} ${WRKSRC}/target/snappy-${PORTVERSION:R}${EXTRACT_SUFX} + @${CP} ${DISTDIR}/${DISTFILE_masui} ${WRKSRC}/target/bitshuffle-${BITSHUFFLE_V}${EXTRACT_SUFX} do-build: cd ${WRKSRC} && ${SETENV} JAVA_HOME=${JAVA_HOME} ${MAKE_ENV} \ diff --git a/archivers/v1541commander/Makefile b/archivers/v1541commander/Makefile index 0c0f61ccdabc..07614a01bc04 100644 --- a/archivers/v1541commander/Makefile +++ b/archivers/v1541commander/Makefile @@ -3,6 +3,7 @@ PORTNAME= v1541commander PORTVERSION= 1.1 +DISTVERSIONPREFIX= v CATEGORIES= archivers emulators MAINTAINER= felix@palmen-it.de @@ -22,9 +23,9 @@ USES= compiler:c++11-lang gmake pkgconfig qt:5 shared-mime-info USE_QT= core gui network widgets buildtools_build linguisttools_build USE_GITHUB= yes -GH_PROJECT= ${PORTNAME} zimk:zimk +GH_PROJECT= zimk:zimk GH_ACCOUNT= excess-c64 Zirias:zimk -GH_TAGNAME= v${PORTVERSION} 31500ca:zimk +GH_TAGNAME= 31500ca:zimk OPTIONS_DEFINE= DOCS @@ -33,6 +34,6 @@ MAKE_ARGS= pkgconfigdir=${LOCALBASE}/libdata/pkgconfig \ ALL_TARGET= strip post-extract: - @${MV} ${WRKDIR}/zimk-*/* ${WRKSRC}/zimk/ + @${MV} ${WRKSRC_zimk}/* ${WRKSRC}/zimk/ .include diff --git a/archivers/v1541commander/distinfo b/archivers/v1541commander/distinfo index 83c09c553577..5926674156aa 100644 --- a/archivers/v1541commander/distinfo +++ b/archivers/v1541commander/distinfo @@ -1,5 +1,5 @@ TIMESTAMP = 1581095322 -SHA256 (excess-c64-v1541commander-1.1-v1.1_GH0.tar.gz) = a8cbe7136923ce186b53718a5910a008420c7762e3741a2efd46cb1d8e927db7 -SIZE (excess-c64-v1541commander-1.1-v1.1_GH0.tar.gz) = 407212 +SHA256 (excess-c64-v1541commander-v1.1_GH0.tar.gz) = a8cbe7136923ce186b53718a5910a008420c7762e3741a2efd46cb1d8e927db7 +SIZE (excess-c64-v1541commander-v1.1_GH0.tar.gz) = 407212 SHA256 (Zirias-zimk-31500ca_GH0.tar.gz) = e0404e600343460320a41efdec3b432fe7bce76518b08225e01264937b0958ea SIZE (Zirias-zimk-31500ca_GH0.tar.gz) = 12137 diff --git a/cad/PrusaSlicer/Makefile b/cad/PrusaSlicer/Makefile index 89469641be9b..a5a9dffb2d3b 100644 --- a/cad/PrusaSlicer/Makefile +++ b/cad/PrusaSlicer/Makefile @@ -5,8 +5,6 @@ DISTVERSIONPREFIX= version_ DISTVERSION= 2.2.0 PORTREVISION= 2 CATEGORIES= cad -MASTER_SITES=https://github.com/CGAL/cgal/archive/releases/:cgal -DISTFILES=CGAL-5.0.2.tar.gz:cgal MAINTAINER= teodorsigaev@gmail.com COMMENT= Slicing application for 3D printers @@ -43,15 +41,16 @@ CMAKE_ARGS+= -DwxWidgets_CONFIG_EXECUTABLE=${LOCALBASE}/bin/wxgtk3u-3.1-config \ CMAKE_INSTALL_PREFIX= ${PREFIX}/${PORTNAME} USE_GITHUB= yes -USE_GL= gl glu glew GH_ACCOUNT= prusa3d +GH_TUPLE= CGAL:cgal:releases/CGAL-5.0.2:cgal +USE_GL= gl glu glew post-patch: ${REINPLACE_CMD} -e 's,%%WRKSRC%%,${WRKSRC},' \ ${WRKSRC}/CMakeLists.txt pre-configure: - cd ${WRKDIR}/cgal-releases-CGAL-5.0.2 && \ + cd ${WRKSRC_cgal} && \ ${CMAKE_BIN} -E remove CGALConfig-installation-dirs.cmake && \ ${MKDIR} build && cd build && \ ${CMAKE_BIN} -DCMAKE_INSTALL_PREFIX=${WRKSRC}/CGAL \ diff --git a/cad/PrusaSlicer/distinfo b/cad/PrusaSlicer/distinfo index aa5901532fb1..94b2a08bee32 100644 --- a/cad/PrusaSlicer/distinfo +++ b/cad/PrusaSlicer/distinfo @@ -1,5 +1,5 @@ TIMESTAMP = 1585766317 SHA256 (prusa3d-PrusaSlicer-version_2.2.0_GH0.tar.gz) = e6e0c83bf92e448ec058fd3063b84caca69f58b8b419e48eace6e8ce534937c0 SIZE (prusa3d-PrusaSlicer-version_2.2.0_GH0.tar.gz) = 30811929 -SHA256 (CGAL-5.0.2.tar.gz) = 7d824efce318fe901fd9d6f233a1f27e2d956d787602621df035a759b587c40c -SIZE (CGAL-5.0.2.tar.gz) = 146441795 +SHA256 (CGAL-cgal-releases-CGAL-5.0.2_GH0.tar.gz) = 7d824efce318fe901fd9d6f233a1f27e2d956d787602621df035a759b587c40c +SIZE (CGAL-cgal-releases-CGAL-5.0.2_GH0.tar.gz) = 146441795 diff --git a/devel/google-cloud-cpp/Makefile b/devel/google-cloud-cpp/Makefile index d898375af7c7..1f2cb85bdc89 100644 --- a/devel/google-cloud-cpp/Makefile +++ b/devel/google-cloud-cpp/Makefile @@ -5,10 +5,8 @@ DISTVERSIONPREFIX= v DISTVERSION= 0.11.0.g20190710 # the upstream master branch is mis-versioned: https://github.com/googleapis/google-cloud-cpp/issues/2871 PORTREVISION= 3 CATEGORIES= devel -MASTER_SITES= https://github.com/googleapis/googleapis/archive/:googleapi \ - https://github.com/nlohmann/json/releases/download/v3.4.0/:json # should use the package: https://github.com/googleapis/google-cloud-cpp/issues/2874 -DISTFILES= a8ee1416f4c588f2ab92da72e7c1f588c784d3e6.tar.gz:googleapi \ - json.hpp:json +MASTER_SITES= https://github.com/nlohmann/json/releases/download/v3.4.0/:json # should use the package: https://github.com/googleapis/google-cloud-cpp/issues/2874 +DISTFILES= json.hpp:json DIST_SUBDIR= ${PORTNAME} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} @@ -29,6 +27,7 @@ USES= cmake compiler:c++11-lang ssl USE_GITHUB= yes GH_TAGNAME= 4dff795ca GH_ACCOUNT= GoogleCloudPlatform +GH_TUPLE= googleapis:googleapis:a8ee1416f4c588f2ab92da72e7c1f588c784d3e6:googleapis USE_LDCONFIG= yes CFLAGS+= -I${BUILD_WRKSRC}/external/googleapis/src/googleapis_project-build @@ -42,7 +41,7 @@ post-extract: @${MKDIR} ${BUILD_WRKSRC}/external/nlohmann_json/src/ @${CP} ${DISTDIR}/${DIST_SUBDIR}/json.hpp ${BUILD_WRKSRC}/external/nlohmann_json/src/json.hpp @${MKDIR} ${BUILD_WRKSRC}/external/googleapis/src/ - @${CP} ${DISTDIR}/${DIST_SUBDIR}/a8ee1416f4c588f2ab92da72e7c1f588c784d3e6.tar.gz \ + @${CP} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILE_googleapis} \ ${BUILD_WRKSRC}/external/googleapis/src/a8ee1416f4c588f2ab92da72e7c1f588c784d3e6.tar.gz post-patch: # workaround for https://github.com/googleapis/google-cloud-cpp/issues/2875, also see files/patch-cmake_external_googleapis.cmake diff --git a/devel/google-cloud-cpp/distinfo b/devel/google-cloud-cpp/distinfo index c5b99949513a..86552eaac132 100644 --- a/devel/google-cloud-cpp/distinfo +++ b/devel/google-cloud-cpp/distinfo @@ -1,6 +1,6 @@ TIMESTAMP = 1563091031 -SHA256 (google-cloud-cpp/a8ee1416f4c588f2ab92da72e7c1f588c784d3e6.tar.gz) = 6b8a9b2bcb4476e9a5a9872869996f0d639c8d5df76dd8a893e79201f211b1cf -SIZE (google-cloud-cpp/a8ee1416f4c588f2ab92da72e7c1f588c784d3e6.tar.gz) = 1493736 +SHA256 (google-cloud-cpp/googleapis-googleapis-a8ee1416f4c588f2ab92da72e7c1f588c784d3e6_GH0.tar.gz) = 6b8a9b2bcb4476e9a5a9872869996f0d639c8d5df76dd8a893e79201f211b1cf +SIZE (google-cloud-cpp/googleapis-googleapis-a8ee1416f4c588f2ab92da72e7c1f588c784d3e6_GH0.tar.gz) = 1493736 SHA256 (google-cloud-cpp/json.hpp) = 63da6d1f22b2a7bb9e4ff7d6b255cf691a161ff49532dcc45d398a53e295835f SIZE (google-cloud-cpp/json.hpp) = 705920 SHA256 (google-cloud-cpp/GoogleCloudPlatform-google-cloud-cpp-v0.11.0.g20190710-4dff795ca_GH0.tar.gz) = 00a6355ae09b9f1708e87747835f8cb2e8de8351a0f836ff6954a6809ef81d73 diff --git a/games/crispy-doom/Makefile b/games/crispy-doom/Makefile index b9ec6d0e3c03..fb67cf401c92 100644 --- a/games/crispy-doom/Makefile +++ b/games/crispy-doom/Makefile @@ -2,6 +2,7 @@ PORTNAME= crispy-doom PORTVERSION= 5.8.0 +DISTVERSIONPREFIX= ${PORTNAME}- CATEGORIES= games MAINTAINER= danilo@FreeBSD.org @@ -21,7 +22,6 @@ OPTIONS_DEFINE= DOCS USE_GITHUB= yes GH_ACCOUNT= fabiangreffrath -GH_TAGNAME= ${PORTNAME}-${PORTVERSION} post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/crispy-* diff --git a/games/crispy-doom/distinfo b/games/crispy-doom/distinfo index 9ba215d5b712..559f16ed1766 100644 --- a/games/crispy-doom/distinfo +++ b/games/crispy-doom/distinfo @@ -1,3 +1,3 @@ TIMESTAMP = 1588371686 -SHA256 (fabiangreffrath-crispy-doom-5.8.0-crispy-doom-5.8.0_GH0.tar.gz) = c485de2c2920b50434f468795ce4025cf6d2c12f3cfcf484464544566b8fa290 -SIZE (fabiangreffrath-crispy-doom-5.8.0-crispy-doom-5.8.0_GH0.tar.gz) = 2627570 +SHA256 (fabiangreffrath-crispy-doom-crispy-doom-5.8.0_GH0.tar.gz) = c485de2c2920b50434f468795ce4025cf6d2c12f3cfcf484464544566b8fa290 +SIZE (fabiangreffrath-crispy-doom-crispy-doom-5.8.0_GH0.tar.gz) = 2627570 diff --git a/math/py-gmpy2-devel/Makefile b/math/py-gmpy2-devel/Makefile index 1b7e241f6317..510312945d33 100644 --- a/math/py-gmpy2-devel/Makefile +++ b/math/py-gmpy2-devel/Makefile @@ -2,9 +2,9 @@ # $FreeBSD$ PORTNAME= gmpy2 +DISTVERSIONPREFIX= gmpy2- DISTVERSION= 2.1.0b4 CATEGORIES= math python -MASTER_SITES= https://github.com/aleaxit/gmpy/archive/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} PKGNAMESUFFIX= -devel @@ -17,9 +17,9 @@ LIB_DEPENDS= libgmp.so:math/gmp \ libmpc.so:math/mpc \ libmpfr.so:math/mpfr -#USE_GITHUB= yes -#GH_ACCOUNT= aleaxit -#GH_PROJECT= gmpy +USE_GITHUB= yes +GH_ACCOUNT= aleaxit +GH_PROJECT= gmpy USES= localbase python:3.7+ USE_PYTHON= distutils @@ -31,7 +31,6 @@ DOCS_BUILD_DEPENDS= ${PY_SPHINX} DOCS_USES= gmake PORTDOCS= * -WRKSRC= ${WRKDIR}/gmpy-${PORTNAME}-${DISTVERSION} PLIST_SUB= VER=${DISTVERSION} do-build-DOCS-on: diff --git a/math/py-gmpy2-devel/distinfo b/math/py-gmpy2-devel/distinfo index 0d0193ba15c5..de4768dea5d5 100644 --- a/math/py-gmpy2-devel/distinfo +++ b/math/py-gmpy2-devel/distinfo @@ -1,3 +1,3 @@ TIMESTAMP = 1589731893 -SHA256 (gmpy2-2.1.0b4.tar.gz) = 83589062bc2b221080d6e32aa197b845be16dcda8aa0f92781854636f17b0a5b -SIZE (gmpy2-2.1.0b4.tar.gz) = 378212 +SHA256 (aleaxit-gmpy-gmpy2-2.1.0b4_GH0.tar.gz) = 83589062bc2b221080d6e32aa197b845be16dcda8aa0f92781854636f17b0a5b +SIZE (aleaxit-gmpy-gmpy2-2.1.0b4_GH0.tar.gz) = 378212