On 2020/11/14 14:16, Dimitri Karamazov wrote:
> 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.
A little extra work, but it's also extra work to deal with the multiple
distfiles and making sure that it uses the correct version of the submodule
(LMMS is specifically holding it at b5bdc18051b),
Anyway LMMS provide their own full tar.xz now so let's use that. Does this
work for you?
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 18:46:47 -0000
@@ -2,17 +2,19 @@
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
+V = 1.2.2
+DISTNAME = lmms_$V
+PKGNAME = lmms-$V
+WRKDIST = ${WRKDIR}/lmms
EXTRACT_SUFX = .tar.xz
CATEGORIES = audio
HOMEPAGE = https://lmms.io/
-MASTER_SITES = https://spacehopper.org/mirrors/
+MASTER_SITES = https://github.com/LMMS/lmms/releases/download/v$V/
+
+MAINTAINER = Dimitri Karamazov <deserter...@danwin1210.me>
# GPLv2
PERMIT_PACKAGE = Yes
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 18:46:47 -0000
@@ -1,2 +1,2 @@
-SHA256 (lmms-1.2.0.tar.xz) = Fom6xh4Zaysl7e85lcu+HoKj39qtQZY/ahz57NeiBnY=
-SIZE (lmms-1.2.0.tar.xz) = 14545260
+SHA256 (lmms_1.2.2.tar.xz) = sYVQf7ZOz9jjEUUTW1irJEtjf578CcQXbK9wqjy6rh4=
+SIZE (lmms_1.2.2.tar.xz) = 22733960
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/audio/lmms/patches/patch-CMakeLists_txt,v
retrieving revision 1.4
diff -u -p -r1.4 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt 14 Jun 2019 13:51:01 -0000 1.4
+++ patches/patch-CMakeLists_txt 14 Nov 2020 18:46:47 -0000
@@ -5,7 +5,7 @@ don't link deprecated ossaudio on OpenBS
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -354,12 +354,12 @@ ENDIF(WANT_OGGVORBIS)
+@@ -366,12 +366,12 @@ ENDIF(WANT_OGGVORBIS)
# check whether to enable OSS-support
