Update audio/glyr to glyr-1.0.10

Changes:
The license of glyr changed from GPLv3 to LGPLv3 (See also #82).
Additionally the lyricswiki provider was fixed (thanks @bugdone)
and quite some typos were fixed (thanks @emillon).

There are more broken providers, but sadly I lack the time/motivation to
maintain glyr on a regular base.
Therefore I would happily pass the development of glyr to a new maintainer.
Please mail me if you are interested.

3 files changed, 8 insertions, 50 deletions

diff --git a/audio/glyr/Makefile b/audio/glyr/Makefile
index 26fb4f49aa6..a66b897ee87 100644
--- a/audio/glyr/Makefile
+++ b/audio/glyr/Makefile
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.13 2016/11/07 15:12:33 leot Exp $
+# $NetBSD: Makefile,v 1.14 2016/11/12 17:12:22 leot Exp $
 #
 
-DISTNAME=	glyr-1.0.9
-PKGREVISION=	2
+DISTNAME=	glyr-1.0.10
 CATEGORIES=	audio
 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
+LICENSE=	gnu-lgpl-v3
 
 USE_TOOLS+=	pkg-config
 USE_CMAKE=	yes
diff --git a/audio/glyr/distinfo b/audio/glyr/distinfo
index c3a829549a0..dabcbceabd1 100644
--- a/audio/glyr/distinfo
+++ b/audio/glyr/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.8 2016/11/07 15:12:33 leot Exp $
+$NetBSD: distinfo,v 1.9 2016/11/12 17:12:22 leot Exp $
 
-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
-SHA1 (patch-lib_intern_lyrics_lyricswiki.c) = b4eb47fbb9ef10e84561d87e0d230f4ef81e5bc0
+SHA1 (glyr-1.0.10.tar.gz) = 8ab1dcd03a120e56bda716cc36db6a4d73886321
+RMD160 (glyr-1.0.10.tar.gz) = aed1d05f7fb74e65829d66b3e6c392086ccc1eab
+SHA512 (glyr-1.0.10.tar.gz) = dc5a579c84c321de7c28861e42196d42ef73bbdbe86b5d662d7ace1d79efe8d6d8d0a8086092ed9c32af9651db8cb11bf1678c5582b17192b23e20a66812bb21
+Size (glyr-1.0.10.tar.gz) = 416414 bytes
diff --git a/audio/glyr/patches/patch-lib_intern_lyrics_lyricswiki.c b/audio/glyr/patches/patch-lib_intern_lyrics_lyricswiki.c
deleted file mode 100644
index 922d1805eba..00000000000
--- a/audio/glyr/patches/patch-lib_intern_lyrics_lyricswiki.c
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-lib_intern_lyrics_lyricswiki.c,v 1.1 2016/11/07 15:12:33 leot Exp $
-
-Fix lyricswiki provider (from upstream and pull request #80).
-
---- lib/intern/lyrics/lyricswiki.c.orig	2016-05-17 11:39:52.000000000 +0000
-+++ lib/intern/lyrics/lyricswiki.c
-@@ -66,6 +66,8 @@ static gboolean lv_cmp_content (const gc
- #define LYR_NODE  "<div class='lyricbox"
- #define LYR_BEGIN ">"
- #define LYR_ENDIN "<!--"
-+#define LYR_FOOTER "<div id=\"songfooter"
-+#define LYR_CREDITS "<table"
- #define LYR_INSTRUMENTAL "/Category:Instrumental"
- #define LYR_SCRIPT_TAG "</script"
- 
-@@ -78,13 +80,23 @@ GList * parse_result_page (GlyrQuery * q
-         node += (sizeof LYR_NODE);
-         char *script_tag = strstr(node, LYR_SCRIPT_TAG);
-         char *end_tag = strstr(node, LYR_ENDIN);
-+        char *footer_tag = strstr(node, LYR_FOOTER);
-+        char *credits_tag = strstr(node, LYR_CREDITS);
-+        char *ending_tag = LYR_ENDIN;
-+
-+        if (footer_tag && footer_tag < end_tag) {
-+            ending_tag = LYR_FOOTER;
-+        }
-+        if (credits_tag && credits_tag < end_tag) {
-+            ending_tag = LYR_CREDITS;
-+        }
- 
-         if(script_tag && script_tag < end_tag) {
-             node = script_tag + sizeof(LYR_SCRIPT_TAG) - 1;
-         }
- 
-         bool is_instrumental = strstr(node, LYR_INSTRUMENTAL) != NULL;
--        gchar * lyr = get_search_value (node,LYR_BEGIN,LYR_ENDIN);
-+        gchar * lyr = get_search_value (node,LYR_BEGIN,ending_tag);
-         gchar * beautiness_test = beautify_string (lyr);
- 
-         if (is_instrumental || (beautiness_test != NULL && beautiness_test[0]))