svn commit: r568877 - in head/net-im/sayaka: . files

[Alexey Dokuchaev]

Author: danfe
Date: Sat Mar 20 17:47:59 2021
New Revision: 568877
URL: https://svnweb.freebsd.org/changeset/ports/568877

Log:
  - Update to version 3.5.1, unbreak, respect CXXFLAGS
  - Written in C++17 and does not need Vala since v3.5.0
  - mbedTLS is used instead of libcurl since v3.3.0
  - Now graphic-wise depends only on jpeg and libpng

Added:
  head/net-im/sayaka/files/patch-src_Makefile   (contents, props changed)
  head/net-im/sayaka/files/patch-src_UString.cpp   (contents, props changed)
Deleted:
  head/net-im/sayaka/files/patch-SixelConverter.vala
  head/net-im/sayaka/files/patch-libcurl.vapi
  head/net-im/sayaka/pkg-plist
Modified:
  head/net-im/sayaka/Makefile
  head/net-im/sayaka/distinfo

Modified: head/net-im/sayaka/Makefile
==============================================================================
--- head/net-im/sayaka/Makefile	Sat Mar 20 17:33:07 2021	(r568876)
+++ head/net-im/sayaka/Makefile	Sat Mar 20 17:47:59 2021	(r568877)
@@ -1,54 +1,32 @@
 # $FreeBSD$
 
 PORTNAME=	sayaka
-PORTVERSION=	3.2.2
+PORTVERSION=	3.5.1
 CATEGORIES=	net-im
 
 MAINTAINER=	sue at iwmt.org
-COMMENT=	Command-line twitter client for SIXEL-supported terminal
+COMMENT=	Twitter client for sixel-capable terminals
 
 LICENSE=	BSD2CLAUSE
 
-BROKEN=		Does not build with recent vala
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libmbedtls.so:security/mbedtls
 
-BUILD_DEPENDS=	valac:lang/vala
-LIB_DEPENDS=	libcurl.so:ftp/curl
-
-USES=		gettext-runtime gnome pkgconfig
-USE_GNOME=	glib20 gdkpixbuf2
-
+USES=		compiler:c++17-lang iconv jpeg pkgconfig
+GNU_CONFIGURE=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	isaki68k
 
+PLIST_FILES=	bin/sayaka
 PORTDOCS=	README.md
 
-WRKSRC_SUBDIR=	vala
+OPTIONS_DEFINE=	DOCS
 
-OPTIONS_DEFINE=	COLORMAP DOCS
-OPTIONS_DEFAULT=COLORMAP
-OPTIONS_SUB=	yes
-
-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 '/^[a-z]/s/:$$/:	vala-make2/' \
-		${WRKSRC}/Makefile
-
-post-patch-COLORMAP-on:
-	@${REINPLACE_CMD} -e '/colormapdir =/s|basedir|"${DATADIR}"|' \
-		${WRKSRC}/sayaka.vala
-
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/sayaka ${STAGEDIR}${PREFIX}/bin
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/../README.md ${STAGEDIR}${DOCSDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/src/sayaka ${STAGEDIR}${PREFIX}/bin
 
-do-install-COLORMAP-on:
-	${MKDIR} ${STAGEDIR}${DATADIR}
-.for f in ${COLORMAP_FILES}
-		${INSTALL_DATA} ${WRKSRC}/../$f ${STAGEDIR}${DATADIR}
-.endfor
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/net-im/sayaka/distinfo
==============================================================================
--- head/net-im/sayaka/distinfo	Sat Mar 20 17:33:07 2021	(r568876)
+++ head/net-im/sayaka/distinfo	Sat Mar 20 17:47:59 2021	(r568877)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1477623954
-SHA256 (isaki68k-sayaka-3.2.2_GH0.tar.gz) = 8a3b74ce93d16e971bf3434775efdb5bb56b59f5451dfc8b9cf6b1c88f39756e
-SIZE (isaki68k-sayaka-3.2.2_GH0.tar.gz) = 104693
+TIMESTAMP = 1616061063
+SHA256 (isaki68k-sayaka-3.5.1_GH0.tar.gz) = b981eb251761790a396b2b9a05739b42978a54993794fa91104f871e1bb92385
+SIZE (isaki68k-sayaka-3.5.1_GH0.tar.gz) = 353515

Added: head/net-im/sayaka/files/patch-src_Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-im/sayaka/files/patch-src_Makefile	Sat Mar 20 17:47:59 2021	(r568877)
@@ -0,0 +1,15 @@
+--- src/Makefile.orig	2021-03-18 09:51:03 UTC
++++ src/Makefile
+@@ -67,11 +67,7 @@ SRCS_all=	\
+ 	${SRCS_sixelv} \
+ 	${SRCS_test} \
+ 
+-CXX+=		-g
+-#CXX+=		-fsanitize=undefined
+-
+-CPPFLAGS+=	-O0
+-CPPFLAGS+=	-Wall -Werror -Wshadow -Wno-sign-compare
++CPPFLAGS+=	${CXXFLAGS} -Wall -Werror -Wshadow -Wno-sign-compare
+ INCLUDES+=	-I..
+ 
+ all:	sayaka test sixelv

Added: head/net-im/sayaka/files/patch-src_UString.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-im/sayaka/files/patch-src_UString.cpp	Sat Mar 20 17:47:59 2021	(r568877)
@@ -0,0 +1,10 @@
+--- src/UString.cpp.orig	2021-03-18 09:51:03 UTC
++++ src/UString.cpp
+@@ -25,6 +25,7 @@
+ 
+ #include "UString.h"
+ #include <array>
++#include <cerrno>
+ #include <cstring>
+ 
+ // 出力文字コードが UTF-8 以外 (iconv による変換が必要) なら true。