From owner-svn-ports-all@freebsd.org Sat Nov 23 14:55:58 2019 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 4D3A31B7CE9; Sat, 23 Nov 2019 14:55:58 +0000 (UTC) (envelope-from mpp302@gmail.com) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47KxF6554cz48gM; Sat, 23 Nov 2019 14:55:54 +0000 (UTC) (envelope-from mpp302@gmail.com) Received: by mail-wr1-f68.google.com with SMTP id z3so12132515wru.3; Sat, 23 Nov 2019 06:55:54 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding :content-language; bh=SVsvCUBM7wALAQ6QZWeGwI41+bfCdZMu+1qHx9pEQkY=; b=dM+USFHLkn8dhbZTJSytBl3WL5M0Kqdvq76RPzFZM5RygVKGz9TzsmVLsJWlPpGS2W ILvRByAhjTQoyQjU38mni7ARUhIMBFT11YCjKK/gqvO/x7bhGZlkfgzTLW1p6GUaNCWL epZKok1BaY1lQtZfnLkdU8ANOr15QPjuQOCchW7JGT6+5GbDjOcy8/+WwDPge+1bKSPt osKQ3AUYH962HhP3M0qNu6fhnL9/0jsMkFZWB3v/Cl26ddpvfozU35SF58JJr7XjaaGG rrXWJtlFq381EVQjfCo5V2e7Q4lB9HzisO48OiSejU4GTP+ybhyhzMpuh4TcVpJkiyaA mWpQ== X-Gm-Message-State: APjAAAW2YKc1qNefHYWFMu84Sd4ak6T1YkNqJznpYUjrx7V2QAVjOBvY BM09HVSVdzJnQiXFLtpQ9GVhmjc7F25Awg== X-Google-Smtp-Source: APXvYqw7UgFGUiay0dUQT53JghvcxOjlMtlLtJxmpEfXFvcJhV90Qs362a2J200LV610YiuB3hSi5Q== X-Received: by 2002:adf:ecca:: with SMTP id s10mr23402524wro.22.1574520952867; Sat, 23 Nov 2019 06:55:52 -0800 (PST) Received: from [192.168.178.113] (ip5f5bd707.dynamic.kabel-deutschland.de. [95.91.215.7]) by smtp.gmail.com with ESMTPSA id b186sm2071399wmb.21.2019.11.23.06.55.51 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 23 Nov 2019 06:55:52 -0800 (PST) Subject: Re: svn commit: r514890 - in head/www/quark: . files To: Tobias Kortkamp Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org References: <201910201210.x9KCAqYa083092@repo.freebsd.org> <20191020125556.GA22298@urd.tobik.me> From: Mateusz Piotrowski <0mp@FreeBSD.org> Message-ID: Date: Sat, 23 Nov 2019 15:55:50 +0100 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:68.0) Gecko/20100101 Thunderbird/68.2.2 MIME-Version: 1.0 In-Reply-To: <20191020125556.GA22298@urd.tobik.me> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US X-Rspamd-Queue-Id: 47KxF6554cz48gM X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of mpp302@gmail.com designates 209.85.221.68 as permitted sender) smtp.mailfrom=mpp302@gmail.com X-Spamd-Result: default: False [-4.88 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[FreeBSD.org]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; TO_DN_SOME(0.00)[]; RCVD_TLS_ALL(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; IP_SCORE(-2.88)[ip: (-9.22), ipnet: 209.85.128.0/17(-3.17), asn: 15169(-1.96), country: US(-0.05)]; RCVD_IN_DNSWL_NONE(0.00)[68.221.85.209.list.dnswl.org : 127.0.5.0]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; FORGED_SENDER(0.30)[0mp@FreeBSD.org,mpp302@gmail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[68.221.85.209.rep.mailspike.net : 127.0.0.17]; MIME_TRACE(0.00)[0:+]; R_DKIM_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_NEQ_ENVFROM(0.00)[0mp@FreeBSD.org,mpp302@gmail.com]; RECEIVED_SPAMHAUS_PBL(0.00)[7.215.91.95.khpj7ygk5idzvmvt5x4ziurxhy.zen.dq.spamhaus.net : 127.0.0.11] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 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: Sat, 23 Nov 2019 14:55:58 -0000 Hi, On 10/20/19 2:55 PM, Tobias Kortkamp wrote: > On Sun, Oct 20, 2019 at 12:10:52PM +0000, Mateusz Piotrowski wrote: >> Author: 0mp >> Date: Sun Oct 20 12:10:52 2019 >> New Revision: 514890 >> URL: https://svnweb.freebsd.org/changeset/ports/514890 >> >> Log: >> Update to the latest commit >> >> - Point MASTER_SITES to FreeBSD's servers as we seem to have to host the >> distfile on our own (I wasn't able to find a way to get a tarball from >> upstream servers). Also, add a "regenerate-distfile" target to ease >> the process of updating the distfile in the future. >> - Update MAKE_ARGS: setting CC there is no longer needed. >> - Remove config.mk patches: it is sufficient for the sake of the port to >> just remove the include statement from the Makefile. >> >> Changelog: >> https://git.suckless.org/quark/log.html >> >> Reported by: BieHDC >> >> Deleted: >> head/www/quark/files/ >> Modified: >> head/www/quark/Makefile >> head/www/quark/distinfo >> >> Modified: head/www/quark/Makefile >> ============================================================================== >> --- head/www/quark/Makefile Sun Oct 20 11:38:29 2019 (r514889) >> +++ head/www/quark/Makefile Sun Oct 20 12:10:52 2019 (r514890) >> @@ -1,11 +1,11 @@ >> # $FreeBSD$ >> >> PORTNAME= quark >> -DISTVERSION= g20180403 >> +DISTVERSION= g20190923 >> CATEGORIES= www >> -MASTER_SITES= https://git.suckless.org/quark/snapshot/ >> +MASTER_SITES= https://people.freebsd.org/~0mp/distfiles/ > This should be LOCAL/0mp instead. You will need to copy the distfile > into your ~/public_distfiles and wait for a bit for that to work. > >> +do-patch: >> + ${REINPLACE_CMD} -e '/^include config.mk$$/d' ${WRKSRC}/Makefile > There is no reason to overwrite the default do-patch here. It will > just make putting new patches under files/ in the future harder and > breaks stuff like EXTRA_PATCH_TREE etc. Please move this to > post-patch. > >> +regenerate-distfile: >> + ${RM} -r -- ${PKGNAME} >> + git clone -n https://git.suckless.org/quark ${PKGNAME} >> + git -C ${PKGNAME} checkout ${COMMIT_HASH} >> + ${RM} -r -- ${PKGNAME}/.git >> + ${TAR} -czf ${PKGNAME}.tar.gz ${PKGNAME} > Try using git-archive(1) instead. Thanks a lot for the comments! I've posted a patch for those on Phabricator: https://reviews.freebsd.org/D22518 Cheers, Mateusz