Update sayaka to 3.3.0.

Upstream changes:

* 3.3.0 (2016/11/25)
 * switch to using mbedTLS rather than libcurl
 * implement --full-url and --progress options
 * remove --sixel-cmd option
 * remove support of PHP version
 * add support characters that cannot be converted to EUC-JP/JIS
 * improve image quality and speed etc.

4 files changed, 11 insertions, 46 deletions

diff --git a/net/sayaka/Makefile b/net/sayaka/Makefile
index 4af929c7c33..b09d87362d9 100644
--- a/net/sayaka/Makefile
+++ b/net/sayaka/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2016/10/09 17:15:18 tsutsui Exp $
+# $NetBSD: Makefile,v 1.7 2016/11/26 10:02:27 tsutsui Exp $
 
-DISTNAME=	sayaka-3.2.2
+DISTNAME=	sayaka-3.3.0
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GITHUB:=isaki68k/}
 GITHUB_PROJECT=	${DISTNAME:S/-${PKGVERSION_NOREV}//}
@@ -9,9 +9,9 @@ GITHUB_TAG=	${PKGVERSION_NOREV}
 MAINTAINER=	tsutsui@NetBSD.org
 HOMEPAGE=	https://github.com/isaki68k/sayaka
 COMMENT=	Terminal specific Twitter client
-LICENSE=	modified-bsd
+LICENSE=	modified-bsd AND apache-2.0
 
-USE_TOOLS+=	pax pkg-config
+USE_TOOLS+=	gmake pax pkg-config
 
 INSTALLATION_DIRS+=	bin share/sayaka
 
@@ -23,18 +23,13 @@ SUBST_STAGE.prefix=	pre-configure
 SUBST_FILES.prefix=	vala/sayaka.vala
 SUBST_SED.prefix=	-e 's,@PREFIX@,${PREFIX},g'
 
-do-build:
-	cd ${WRKSRC}/vala && ${MAKE} vala-make2 && ${MAKE} sayaka
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/vala/sayaka ${DESTDIR}${PREFIX}/bin
-	cd ${WRKSRC} && pax -rwpp -s '/.*\.orig//' \
-		*.png ${DESTDIR}${PREFIX}/share/sayaka
 
 BUILDLINK_DEPMETHOD.vala= build
 BUILDLINK_API_DEPENDS.vala+=    vala>=0.28.0
 .include "../../lang/vala/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../graphics/gdk-pixbuf2/buildlink3.mk"
-.include "../../www/curl/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/sayaka/PLIST b/net/sayaka/PLIST
index 9e06ec95356..4cd31e2da86 100644
--- a/net/sayaka/PLIST
+++ b/net/sayaka/PLIST
@@ -1,5 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2016/02/27 14:30:58 tsutsui Exp $
+@comment $NetBSD: PLIST,v 1.2 2016/11/26 10:02:27 tsutsui Exp $
 bin/sayaka
-share/sayaka/colormap16.png
-share/sayaka/colormap8.png
-share/sayaka/colormapx68k16.png
diff --git a/net/sayaka/distinfo b/net/sayaka/distinfo
index f88947b6b73..c472ea468e6 100644
--- a/net/sayaka/distinfo
+++ b/net/sayaka/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.2 2016/10/09 17:15:18 tsutsui Exp $
+$NetBSD: distinfo,v 1.3 2016/11/26 10:02:27 tsutsui Exp $
 
-SHA1 (sayaka-3.2.2.tar.gz) = 897bd4f4bdb20d859c31ca34519b9686cd2b1f3b
-RMD160 (sayaka-3.2.2.tar.gz) = f78fb30306e6c7c01391edc9fbfc873561abe8ba
-SHA512 (sayaka-3.2.2.tar.gz) = 6418e2a54562163c691a0c71d9f5221295fbdf9af139a42cc3bbf1dc3ac480a870e5fc7efe8a59a7db58c43b7102d31603d1b4bf9b622abf159fb5eb66ce6454
-Size (sayaka-3.2.2.tar.gz) = 104693 bytes
-SHA1 (patch-vala_sayaka.vala) = ad1010da1f9c75f2cad669cf419beba5ea46f59f
+SHA1 (sayaka-3.3.0.tar.gz) = 6bf7710bfb72f5295a5224096a2edf0f644b7932
+RMD160 (sayaka-3.3.0.tar.gz) = 28d72195af2208762f9d34d9d62e97b6348c481a
+SHA512 (sayaka-3.3.0.tar.gz) = 3653a47d4b3889c7958a421a902f47b2732a6864f5883a0d17ba15857813421deb8933d826d95c211fe6f2029eb80d2bc330ea9f56d25b74f70bbf6866603231
+Size (sayaka-3.3.0.tar.gz) = 1953671 bytes
diff --git a/net/sayaka/patches/patch-vala_sayaka.vala b/net/sayaka/patches/patch-vala_sayaka.vala
deleted file mode 100644
index 32299350473..00000000000
--- a/net/sayaka/patches/patch-vala_sayaka.vala
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-vala_sayaka.vala,v 1.2 2016/10/09 17:15:18 tsutsui Exp $
-
-- use colormap files installed into pkgsrc dir
-- pull upstream fix:
- https://github.com/isaki68k/sayaka/commit/c2b2974d75cc63cfd51f57253b112257ee912f6e
-
---- vala/sayaka.vala.orig	2016-09-25 11:53:37.000000000 +0000
-+++ vala/sayaka.vala
-@@ -170,7 +170,7 @@ public class SayakaMain
- 		cachedir    = basedir + "cache";
- 		tokenfile   = basedir + "token.json";
- 		ngwordfile  = basedir + "ngword.json";
--		colormapdir = basedir;
-+		colormapdir = "@PREFIX@/share/sayaka";
- 
- 		address_family = SocketFamily.INVALID;	// UNSPEC がないので代用
- 		color_mode = 256;
-@@ -1445,7 +1445,7 @@ public class SayakaMain
- 		}
- 
- 		// メディア情報を展開
--		if (media_entities != null) {
-+		if (media_entities != null && media_entities.Has("media")) {
- 			var media = media_entities.GetArray("media");
- 			for (var i = 0; i < media.length; i++) {
- 				var m = media.index(i);