Update audio/glyr to 1.0.9

pkgsrc changes:
 - GITHUBify the package (and simplify the Makefile where possible)

Changes:
1.0.9
-----
This release fixes a few bugs and some of the broken providers.

General bugfixes:
 - Support reproducible builds (thanks @emillon, c5fe020)
 - Build problems.
 - Spelling errors.

Fixed providers:
 - lyrics/lyricswikia (thanks Pavel Vasin, @rat4)
 - cover/slothradio
 - cover/discogs

Thanks to the people doing pull request, while I don't have much time to work
on glyr.

3 files changed, 9 insertions, 67 deletions

diff --git a/audio/glyr/Makefile b/audio/glyr/Makefile
index 5c4d691b9fb..790c4dbc516 100644
--- a/audio/glyr/Makefile
+++ b/audio/glyr/Makefile
@@ -1,23 +1,19 @@
-# $NetBSD: Makefile,v 1.10 2016/04/11 19:01:42 ryoon Exp $
+# $NetBSD: Makefile,v 1.11 2016/05/17 13:47:17 leot Exp $
 #
 
-DISTNAME=	1.0.8
-PKGNAME=	glyr-${DISTNAME}
-PKGREVISION=	4
+DISTNAME=	glyr-1.0.9
 CATEGORIES=	audio
-MASTER_SITES=	https://github.com/sahib/glyr/archive/
-DIST_SUBDIR=	${PKGBASE}
+MASTER_SITES=	${MASTER_SITE_GITHUB:=sahib/}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	https://github.com/sahib/glyr/
 COMMENT=	Music related metadata search engine with CLI and C API
 LICENSE=	gnu-gpl-v3
 
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 USE_TOOLS+=	pkg-config
 USE_CMAKE=	yes
 
-PKGCONFIG_OVERRIDE+=	glyr/libglyr.pc.in
+PKGCONFIG_OVERRIDE+=	libglyr.pc.in
 
 .include "../../devel/libgetopt/buildlink3.mk"
 .include "../../devel/libexecinfo/buildlink3.mk"
diff --git a/audio/glyr/distinfo b/audio/glyr/distinfo
index d73c61ad356..520e60277e1 100644
--- a/audio/glyr/distinfo
+++ b/audio/glyr/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.6 2015/11/03 01:12:32 agc Exp $
+$NetBSD: distinfo,v 1.7 2016/05/17 13:47:17 leot Exp $
 
-SHA1 (glyr/1.0.8.tar.gz) = e39ff25bea823f8a65df6b6e6b10347b0886b71b
-RMD160 (glyr/1.0.8.tar.gz) = 63aceb30e021a39fb7778a7b2a68a92d1b642d26
-SHA512 (glyr/1.0.8.tar.gz) = 71417aa116a10c6ee778ebf215b92cb03c06b9683de3c9b1d9a2b1d7f5d42c21eddc34b7cc2d16befcc80f41113e3fbab5a23926af007c7dbeb2e9327ed9b6d7
-Size (glyr/1.0.8.tar.gz) = 425073 bytes
-SHA1 (patch-lib_stringlib.c) = 98cdef23e473915a1710391a75dbc2573ed07d52
+SHA1 (glyr-1.0.9.tar.gz) = 28c6f5ffaaa568149762400cf0c8ebaf134cb3c0
+RMD160 (glyr-1.0.9.tar.gz) = b244631677a44d3fdb444bffac3c32d475413347
+SHA512 (glyr-1.0.9.tar.gz) = 77144202c99c6e429c8800a7d89d27de5376627194945116b7166d920375a59048d3e3102cf63646b1b57d795999f057977d7b13490e4ca3af44b8ddb3207652
+Size (glyr-1.0.9.tar.gz) = 425175 bytes
diff --git a/audio/glyr/patches/patch-lib_stringlib.c b/audio/glyr/patches/patch-lib_stringlib.c
deleted file mode 100644
index 646b5409ddb..00000000000
--- a/audio/glyr/patches/patch-lib_stringlib.c
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD: patch-lib_stringlib.c,v 1.2 2015/03/11 08:40:31 wiz Exp $
-
-Use <ctype.h> correctly.
-https://github.com/sahib/glyr/issues/61
-
---- lib/stringlib.c~	2014-02-08 11:06:45.000000000 +0000
-+++ lib/stringlib.c
-@@ -927,8 +927,8 @@ static gchar * trim_in_text (gchar * str
- 
-         for (gsize it = 0; it < str_len; it++)
-         {
--            gboolean is_space = isspace (string[it]);
--            gboolean is_lfeed = !isblank (string[it]) && is_space;
-+            gboolean is_space = isspace ((unsigned char)string[it]);
-+            gboolean is_lfeed = !isblank ((unsigned char)string[it]) && is_space;
- 
-             lfeed_ctr = (is_lfeed) ? lfeed_ctr + 1 : 0;
-             space_ctr = (is_space) ? space_ctr + 1 : 0;
-@@ -1011,7 +1011,7 @@ void trim_copy (gchar *input, gchar *out
-     gchar c;
- 
-     /* skip spaces at start */
--    while (input[0] && isspace (*input) )
-+    while (input[0] && isspace ((unsigned char)*input) )
-     {
-         ++input;
-     }
-@@ -1023,7 +1023,7 @@ void trim_copy (gchar *input, gchar *out
-         c = * (output++) = * (input++);
- 
-         /* if its not a whitespace, this *could* be the last character */
--        if ( !isspace (c) )
-+        if ( !isspace ((unsigned char)c) )
-         {
-             end = output;
-         }
-@@ -1050,14 +1050,14 @@ gchar * trim_nocopy (gchar * s)
-     gchar * end = NULL;
- 
-     /* skip spaces at start */
--    while (*start && isspace (*start) )
-+    while (*start && isspace ((unsigned char)*start) )
-         ++start;
- 
-     /* iterate over the rest remebering last non-whitespace */
-     char *i = start;
-     while (*i)
-     {
--        if ( !isspace (* (i++) ) )
-+        if ( !isspace ((unsigned char) * (i++) ) )
-             end = i;
-     }
-