net-im/sayaka: update to 3.2.2

Changes:	https://github.com/isaki68k/sayaka/compare/3.1.0...3.2.2
PR:		213967
Submitted by:	IWAMOTO Kouichi <sue@iwmt.org> (maintainer)

4 files changed, 33 insertions, 62 deletions

diff --git a/net-im/sayaka/Makefile b/net-im/sayaka/Makefile
index e6a307142c96..f306d326d848 100644
--- a/net-im/sayaka/Makefile
+++ b/net-im/sayaka/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	sayaka
-PORTVERSION=	3.1.0
+PORTVERSION=	3.2.2
 CATEGORIES=	net-im
 
 MAINTAINER=	sue@iwmt.org
@@ -9,44 +9,44 @@ COMMENT=	Command-line twitter client for SIXEL-supported terminal
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	curl:ftp/curl \
-		img2sixel:graphics/libsixel
+BUILD_DEPENDS=	valac:lang/vala
+LIB_DEPENDS=	libcurl.so:ftp/curl
+
+USES=		gettext-runtime pkgconfig
+USE_GNOME=	glib20 gdkpixbuf2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	isaki68k
 
-PLIST_FILES=	bin/sayaka bin/cellsize
+PORTDOCS=	README.md
 
-USE_PHP=	curl filter hash json mbstring pcntl pdo pdo_sqlite sqlite3
-WANT_PHP_CLI=	yes
+WRKSRC_SUBDIR=	vala
 
-PORTDOCS=	README.md
-PORTDATA=	OAuth.php \
-		TwistOAuth.php \
-		colormap16.png \
-		colormap8.png \
-		config.php \
-		sayaka.php \
-		subr.php \
-		twitteroauth.php
+OPTIONS_DEFINE=	COLORMAP
+OPTIONS_DEFAULT=COLORMAP
+OPTIONS_SUB=	yes
 
-ALL_TARGET=	cellsize
+COLORMAP_DESC=	Install colormap data for external sixel command
+COLORMAP_RUN_DEPENDS=	img2sixel:graphics/libsixel
+COLORMAP_FILES=	colormap16.png colormap8.png
 
 post-patch:
-	@${REINPLACE_CMD} -e \
-		's|@@DATADIR@@|${DATADIR}|g ; \
-		 s|@@BINDIR@@|${PREFIX}/bin|g' \
-		${WRKSRC}/sayaka.sh
-	@${REINPLACE_CMD} 's|-O2|${CFLAGS}|' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e '/^[a-z]/s/:$$/:	vala-make2/' \
+		${WRKSRC}/Makefile
+
+post-patch-COLORMAP-on:
+	@${REINPLACE_CMD} -e '/colormapdir =/s|basedir|"${DATADIR}"|' \
+		${WRKSRC}/sayaka.vala
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/sayaka.sh ${STAGEDIR}${PREFIX}/bin/sayaka
-	${INSTALL_PROGRAM} ${WRKSRC}/cellsize ${STAGEDIR}${PREFIX}/bin/cellsize
+	${INSTALL_PROGRAM} ${WRKSRC}/sayaka ${STAGEDIR}${PREFIX}/bin
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/../README.md ${STAGEDIR}${DOCSDIR}
+
+do-install-COLORMAP-on:
 	${MKDIR} ${STAGEDIR}${DATADIR}
-.for f in ${PORTDATA}
-		${INSTALL_DATA} ${WRKSRC}/$f ${STAGEDIR}${DATADIR}
+.for f in ${COLORMAP_FILES}
+		${INSTALL_DATA} ${WRKSRC}/../$f ${STAGEDIR}${DATADIR}
 .endfor
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/net-im/sayaka/distinfo b/net-im/sayaka/distinfo
index 76b6a9ab3212..888b1768693c 100644
--- a/net-im/sayaka/distinfo
+++ b/net-im/sayaka/distinfo
@@ -1,2 +1,3 @@
-SHA256 (isaki68k-sayaka-3.1.0_GH0.tar.gz) = 662237cc2d06ba46f4c1e80488274cd80b26f44a6582e2773f83d3ac55674401
-SIZE (isaki68k-sayaka-3.1.0_GH0.tar.gz) = 42303
+TIMESTAMP = 1477623954
+SHA256 (isaki68k-sayaka-3.2.2_GH0.tar.gz) = 8a3b74ce93d16e971bf3434775efdb5bb56b59f5451dfc8b9cf6b1c88f39756e
+SIZE (isaki68k-sayaka-3.2.2_GH0.tar.gz) = 104693
diff --git a/net-im/sayaka/files/patch-sayaka.sh b/net-im/sayaka/files/patch-sayaka.sh
deleted file mode 100644
index 9a953c86804d..000000000000
--- a/net-im/sayaka/files/patch-sayaka.sh
+++ /dev/null
@@ -1,33 +0,0 @@
---- sayaka.sh.orig	2015-07-26 15:58:13.000000000 +0900
-+++ sayaka.sh	2015-07-28 14:15:42.646976000 +0900
-@@ -27,11 +27,29 @@
- # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- # SUCH DAMAGE.
- 
--SAYAKA_HOME=${HOME}/.sayaka
-+: ${SAYAKA_HOME:=${HOME}/.sayaka}
- #SAYAKA_HOME=.
- 
-+BINDIR=@@BINDIR@@
-+DATADIR=@@DATADIR@@
-+
-+die() {
-+	echo "$@"
-+	exit 1
-+}
-+
-+checklinks() {
-+	for f in ${BINDIR}/cellsize ${DATADIR}/*.php ${DATADIR}/*.png; do
-+		[ -L ${f##*/} ] || ln -s $f .
-+	done
-+}
-+
-+[ -d $SAYAKA_HOME ] || mkdir $SAYAKA_HOME || die "Can't create ${SAYAKA_HOME}."
-+
- cd $SAYAKA_HOME
- 
-+checklinks
-+
- cmd=$1
- [ $# -ne 0 ] && shift
- case $cmd in
diff --git a/net-im/sayaka/pkg-plist b/net-im/sayaka/pkg-plist
new file mode 100644
index 000000000000..b1e2d7c12a4a
--- /dev/null
+++ b/net-im/sayaka/pkg-plist
@@ -0,0 +1,3 @@
+bin/sayaka
+%%COLORMAP%%%%DATADIR%%/colormap16.png
+%%COLORMAP%%%%DATADIR%%/colormap8.png