schismtracker: Update to 20190805 - switch to github for distfiles.

This gives us a stable source of new releases for future updates.

Sadly it does not use SDL2 yet but the newer release allows us to remove
the local patches and get a .desktop entry.

5 files changed, 16 insertions, 66 deletions

diff --git a/audio/schismtracker/Makefile b/audio/schismtracker/Makefile
index bc02786513a..aca1ce6b1bf 100644
--- a/audio/schismtracker/Makefile
+++ b/audio/schismtracker/Makefile
@@ -1,28 +1,25 @@
-# $NetBSD: Makefile,v 1.2 2019/07/28 18:56:11 nia Exp $
+# $NetBSD: Makefile,v 1.3 2019/09/20 11:22:55 nia Exp $
 
-# The upstream distfile (http://schismtracker.org/hg/archive/default.tar.bz2)
-# is a repository snapshot and as such a moving target.
-# Thus it's repackaged (adding a timestamp) and mirrored.
-DISTNAME=	schismtracker-20150911005204
+DISTNAME=	schismtracker-20190805.source
+PKGNAME=	${DISTNAME:S/.source//}
 CATEGORIES=	audio
-MASTER_SITES=	http://penenen.de/
-EXTRACT_SUFX=	.tgz
+MASTER_SITES=	${MASTER_SITE_GITHUB:=schismtracker/}
+GITHUB_RELEASE=	${PKGVERSION_NOREV}
 
 MAINTAINER=	fstd.lkml@gmail.com
 HOMEPAGE=	http://schismtracker.org/
 COMMENT=	Clone of the good old Impulse Tracker
 LICENSE=	gnu-gpl-v2
 
-USE_TOOLS+=	aclocal autoheader autoconf automake
-
+WRKSRC=		${WRKDIR}/schismtracker
+USE_TOOLS+=	autoreconf automake autoconf
 MAKE_JOBS_SAFE=	no
 GNU_CONFIGURE=	yes
 
 PYTHON_FOR_BUILD_ONLY=	yes
 
 pre-configure:
-	set -e; cd ${WRKSRC}; \
-	aclocal; autoheader; automake -a --foreign -i; autoconf
+	cd ${WRKSRC} && autoreconf -i
 
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../lang/python/pyversion.mk"
diff --git a/audio/schismtracker/PLIST b/audio/schismtracker/PLIST
index 600cfcd690d..5c18728a52f 100644
--- a/audio/schismtracker/PLIST
+++ b/audio/schismtracker/PLIST
@@ -1,3 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2015/09/11 12:35:19 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/09/20 11:22:55 nia Exp $
 bin/schismtracker
 man/man1/schismtracker.1
+share/applications/schism.desktop
+share/pixmaps/schism-icon-128.png
diff --git a/audio/schismtracker/distinfo b/audio/schismtracker/distinfo
index 50531252bba..c5ee86a4c68 100644
--- a/audio/schismtracker/distinfo
+++ b/audio/schismtracker/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.2 2015/11/03 01:12:49 agc Exp $
+$NetBSD: distinfo,v 1.3 2019/09/20 11:22:55 nia Exp $
 
-SHA1 (schismtracker-20150911005204.tgz) = 08d7efeb17341125f0825c16f2879eb278a7db98
-RMD160 (schismtracker-20150911005204.tgz) = 5c74cc835911f6c7fe3dc641dbb034211bf39cdf
-SHA512 (schismtracker-20150911005204.tgz) = f51580836c6de8c02bf07244a55041af4274dd2ed3ae94691e5a77456dabfa87254efaf61bae06b23368bc32266cc87ad74f349650c26e3cb833d4eae9ed6b89
-Size (schismtracker-20150911005204.tgz) = 1066449 bytes
-SHA1 (patch-Makefile.am) = 1b3cd9c9bef15fe8cc8da0bfccf904bd35da188b
-SHA1 (patch-configure.ac) = a0421d4cf44f0a53b6fecf1c7476e3f66b4e188c
+SHA1 (schismtracker-20190805.source.tar.gz) = 87133ebe20689be67284ffb574fc5d845caa1b15
+RMD160 (schismtracker-20190805.source.tar.gz) = e9e1307a54ce24921ef72d57929712326a5647a3
+SHA512 (schismtracker-20190805.source.tar.gz) = 89c5060e96f3cb60aa0a260cf4c71e8e30d77213a675f006bc98abc38f9227ebfb451d030e805b897f7240c897a38a23e4c912bbb95cfde989e26836063da60e
+Size (schismtracker-20190805.source.tar.gz) = 1315705 bytes
diff --git a/audio/schismtracker/patches/patch-Makefile.am b/audio/schismtracker/patches/patch-Makefile.am
deleted file mode 100644
index a9259acbf0a..00000000000
--- a/audio/schismtracker/patches/patch-Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-Makefile.am,v 1.1 2015/09/11 12:35:19 wiz Exp $
-
-=========================================================
-This patch removes the hardwired -ldl which is a Linuxism
-(see also patch-configure.ac)
-
-This patch has been submitted upstream
-http://schismtracker.org/scdev/read/1978/
-=========================================================
-
-
---- Makefile.am.orig	Sun Jul 05 12:54:41 2015 -0400
-+++ Makefile.am	Thu Sep 10 00:35:19 2015 +0200
-@@ -393,8 +393,3 @@
- 
- schismtracker_DEPENDENCIES = $(files_windres)
- schismtracker_LDADD = $(lib_asound) $(lib_win32) $(SDL_LIBS) $(LIBM)
--
--if ! USE_WIN32
--schismtracker_LDADD += -ldl
--endif
--
diff --git a/audio/schismtracker/patches/patch-configure.ac b/audio/schismtracker/patches/patch-configure.ac
deleted file mode 100644
index 5c800b254e1..00000000000
--- a/audio/schismtracker/patches/patch-configure.ac
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-configure.ac,v 1.1 2015/09/11 12:35:19 wiz Exp $
-
-=============================================================
-This patch fixes log2(3) detection which failed because just
-AC_CHECK_FUNCS(log2) fails to use -lm.
-Additionally, libdl is properly checked for so that it can be
-de-hardcoded from Makefile.am (see patch-Makefile.am)
-
-This patch has been submitted upstream
-http://schismtracker.org/scdev/read/1978/
-=============================================================
-
---- configure.ac.orig	Sun Jul 05 12:54:41 2015 -0400
-+++ configure.ac	Thu Sep 10 00:35:19 2015 +0200
-@@ -56,6 +56,10 @@
- dnl Check for SDL libs
- AM_PATH_SDL(1.2.10, , AC_MSG_ERROR([*** SDL version >= 1.2.10 not found.]))
- 
-+dnl Libs
-+AC_CHECK_LIB([m], [log2])
-+AC_CHECK_LIB([dl], [dlopen])
-+
- dnl Functions
- AC_CHECK_FUNCS(strchr memmove strerror strtol strcasecmp strncasecmp strverscmp stricmp strnicmp strcasestr strptime asprintf vasprintf memcmp mmap nice unsetenv dup fnmatch log2 mkstemp)
- AM_CONDITIONAL([NEED_ASPRINTF], [test "$ac_cv_func_asprintf" = "no"])