From owner-svn-ports-all@freebsd.org Mon Sep 14 10:44:50 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6F02C3D230E; Mon, 14 Sep 2020 10:44:50 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bqjfp2Jdlz4XDP; Mon, 14 Sep 2020 10:44:50 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2E65215A42; Mon, 14 Sep 2020 10:44:50 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08EAio2V045186; Mon, 14 Sep 2020 10:44:50 GMT (envelope-from adridg@FreeBSD.org) Received: (from adridg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08EAindO045185; Mon, 14 Sep 2020 10:44:49 GMT (envelope-from adridg@FreeBSD.org) Message-Id: <202009141044.08EAindO045185@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adridg set sender to adridg@FreeBSD.org using -f From: Adriaan de Groot Date: Mon, 14 Sep 2020 10:44:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r548604 - head/graphics/gmic-qt X-SVN-Group: ports-head X-SVN-Commit-Author: adridg X-SVN-Commit-Paths: head/graphics/gmic-qt X-SVN-Commit-Revision: 548604 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Sep 2020 10:44:50 -0000 Author: adridg Date: Mon Sep 14 10:44:49 2020 New Revision: 548604 URL: https://svnweb.freebsd.org/changeset/ports/548604 Log: Fix fetch of graphics/gmic-qt distfile "gmic_stdlib.h" gmic has had a versioned "stdlib" data file since 2018, as described in https://github.com/dtschump/gmic/issues/61 , but the port always referred to an unversioned source; this leads to fetch failures when the unversioned header is updated on the development server (upstream). The copy tcberner@ hangs on to is also whatever-happened-to-be- unversioned at the time the port updates. So r547673 updated the checksum, but to whatever-was-dev at the time, and without updating tcberner@'s distcache. This has meant fetch-failures since then, since the dev header has updated again. The *previous* version of the checksum, and the copy tcberner@ has, is actually for gmic 2.4.0. So hit the whole dang thing with a hammer again, fetch the **versioned** header, copy it into its unversioned destination, and reset the checksum. Bump PORTREVISION because the package -- the bundled standard library -- has changed. Reported by: fallout Modified: head/graphics/gmic-qt/Makefile head/graphics/gmic-qt/distinfo Modified: head/graphics/gmic-qt/Makefile ============================================================================== --- head/graphics/gmic-qt/Makefile Mon Sep 14 10:33:55 2020 (r548603) +++ head/graphics/gmic-qt/Makefile Mon Sep 14 10:44:49 2020 (r548604) @@ -3,12 +3,12 @@ PORTNAME= gmic-qt DISTVERSIONPREFIX= v. DISTVERSION= 2.3.6 -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH= 1 CATEGORIES= graphics kde MASTER_SITES= http://gmic.eu/:stdlib \ LOCAL/tcberner/${PORTNAME}/${PORTVERSION}:stdlib -DISTFILES= gmic_stdlib.h:stdlib +DISTFILES= gmic_stdlib${DISTVERSION:S/.//g}.h:stdlib DIST_SUBDIR= KDE/${PORTNAME}/${PORTVERSION} EXTRACT_ONLY= ${DISTNAME}.tar.gz ${DISTFILE_gmic} ${DISTFILE_cimg} @@ -61,7 +61,7 @@ USE_GNOME= cairo gdkpixbuf2 glib20 pre-configure: # Copy the necessary files ${CP} ${WRKSRC_cimg}/CImg.h ${WRKSRC_gmic}/src - ${CP} ${DISTDIR}/${DIST_SUBDIR}/gmic_stdlib.h ${WRKSRC_gmic}/src + ${CP} ${DISTDIR}/${DIST_SUBDIR}/gmic_stdlib${DISTVERSION:S/.//g}.h ${WRKSRC_gmic}/src/gmic_stdlib.h do-install: ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/gmic_${FLAVOR:S/$/_/:S/none_//}qt ${STAGEDIR}${PREFIX}/bin Modified: head/graphics/gmic-qt/distinfo ============================================================================== --- head/graphics/gmic-qt/distinfo Mon Sep 14 10:33:55 2020 (r548603) +++ head/graphics/gmic-qt/distinfo Mon Sep 14 10:44:49 2020 (r548604) @@ -1,6 +1,6 @@ -TIMESTAMP = 1599330680 -SHA256 (KDE/gmic-qt/2.3.6/gmic_stdlib.h) = bd03c763238a053301597a51abc418601c496bf43da7517eeea3445555b70a68 -SIZE (KDE/gmic-qt/2.3.6/gmic_stdlib.h) = 2482755 +TIMESTAMP = 1600079781 +SHA256 (KDE/gmic-qt/2.3.6/gmic_stdlib236.h) = 98a8bfb0e877b32c017b820e5d0ad8382df79ece3d298db1687e25abdb41af60 +SIZE (KDE/gmic-qt/2.3.6/gmic_stdlib236.h) = 1882725 SHA256 (KDE/gmic-qt/2.3.6/c-koi-gmic-qt-v.2.3.6_GH0.tar.gz) = 51bc054ea9029bd79a3ba1919b535ec9135fe2013b77a73bf92ccd7a07ae9179 SIZE (KDE/gmic-qt/2.3.6/c-koi-gmic-qt-v.2.3.6_GH0.tar.gz) = 538479 SHA256 (KDE/gmic-qt/2.3.6/dtschump-gmic-v.2.3.6_GH0.tar.gz) = 2a9e0859f4d6900b22b00a82a396dd0b344cae4cda2d18ee9cd1566e952216f3