On Sat, November 14, 2020 10:32, Stuart Henderson wrote: > The new distfile names with just the version number are bogus, if you're > going to do it that way rather than host a tarball then use the > DISTFILES=...{...} facility to give them proper names. > Also just allow the > normal ports extract to take place and move the files afterwards rather than > hand rolling a tar xzf target. But really > the tarball is preferable. > I've attached a diff with appropriate changes. I don't have any hosting capability and it will just be excess work every release. {Build,Run} tested on amd64
OK? Index: Makefile =================================================================== RCS file: /cvs/ports/audio/lmms/Makefile,v retrieving revision 1.23 diff -u -p -r1.23 Makefile --- Makefile 30 Jan 2020 14:13:47 -0000 1.23 +++ Makefile 14 Nov 2020 13:40:00 -0000 @@ -2,17 +2,22 @@ COMMENT = music studio with tracking, sampling and MIDI -# rolled from git; requires submodules -# git clone --recurse-submodules -b v1.2.0 https://github.com/lmms/lmms -DISTNAME = lmms-1.2.0 -REVISION = 0 -EXTRACT_SUFX = .tar.xz +V = 1.2.2 +RPMALLOC_VER = 1.4.1 +GH_ACCOUNT = LMMS +GH_PROJECT = lmms +GH_TAGNAME = v${V} CATEGORIES = audio HOMEPAGE = https://lmms.io/ -MASTER_SITES = https://spacehopper.org/mirrors/ +MASTER_SITES0 = https://github.com/mjansson/rpmalloc/archive/ + +MAINTAINER = Dimitri Karamazov <deserter...@danwin1210.me> + +DISTFILES += lmms-{v}${V}.tar.gz \ + rpmalloc-{${RPMALLOC_VER}/}${RPMALLOC_VER}.tar.gz:0 # GPLv2 PERMIT_PACKAGE = Yes @@ -61,5 +66,8 @@ CONFIGURE_ARGS += -DWANT_CALF=OFF \ -DWANT_VST=OFF NO_TEST = Yes + +post-extract: + cp -r ${WRKDIR}/rpmalloc-${RPMALLOC_VER}/rpmalloc ${WRKSRC}/src/3rdparty/rpmalloc/rpmalloc/ .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/audio/lmms/distinfo,v retrieving revision 1.4 diff -u -p -r1.4 distinfo --- distinfo 14 Jun 2019 13:51:01 -0000 1.4 +++ distinfo 14 Nov 2020 13:40:00 -0000 @@ -1,2 +1,4 @@ -SHA256 (lmms-1.2.0.tar.xz) = Fom6xh4Zaysl7e85lcu+HoKj39qtQZY/ahz57NeiBnY= -SIZE (lmms-1.2.0.tar.xz) = 14545260 +SHA256 (lmms-1.2.2.tar.gz) = QeFeqo7glotByYMnWl0uPqV8NIHeZDhpWE/A0c4JLvY= +SHA256 (rpmalloc-1.4.1.tar.gz) = 6KlEgdygJLz/8KyqJGKz9fsdV5QPxEnasNp0NJMt5hA= +SIZE (lmms-1.2.2.tar.gz) = 16501132 +SIZE (rpmalloc-1.4.1.tar.gz) = 81530
diff
Description: Binary data