Date: Sat, 23 Nov 2019 15:55:50 +0100 From: Mateusz Piotrowski <0mp@FreeBSD.org> To: Tobias Kortkamp <tobik@freebsd.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r514890 - in head/www/quark: . files Message-ID: <b8201a58-e4b1-27f4-ae83-f52f275d9713@FreeBSD.org> In-Reply-To: <20191020125556.GA22298@urd.tobik.me> References: <201910201210.x9KCAqYa083092@repo.freebsd.org> <20191020125556.GA22298@urd.tobik.me>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?b8201a58-e4b1-27f4-ae83-f52f275d9713>