From f8c0df5130483f09a1d7f2e2fd1314dab1c85898 Mon Sep 17 00:00:00 2001
From: Steve Wills <swills@FreeBSD.org>
Date: Wed, 2 Sep 2020 00:28:50 +0000
Subject: net-im/chatterinto2: update to new snapshot

---
 net-im/chatterino2/Makefile                   | 13 +++----------
 net-im/chatterino2/distinfo                   |  6 +++---
 net-im/chatterino2/files/patch-chatterino.pro | 28 +++++++++++++++++++--------
 3 files changed, 26 insertions(+), 21 deletions(-)

(limited to 'net-im/chatterino2')

diff --git a/net-im/chatterino2/Makefile b/net-im/chatterino2/Makefile
index 101d07db2686..d293c1903905 100644
--- a/net-im/chatterino2/Makefile
+++ b/net-im/chatterino2/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	chatterino2
-PORTVERSION=	g2020083101
+PORTVERSION=	g2020090101
 CATEGORIES=	net-im
 
 MAINTAINER=	swills@FreeBSD.org
@@ -28,7 +28,7 @@ PLIST_FILES=	bin/chatterino \
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	chatterino
-COMMIT_ID=	36b9466f8985769489ed8b05d23fe057bbb75660
+COMMIT_ID=	cbcd5f3863b6edf22b6d6ffb625bd338f3ea112d
 GH_TAGNAME=	${COMMIT_ID:C|(.......).*|\1|}
 GH_TUPLE=	Chatterino:libcommuni:f3e7f97:communi/lib/libcommuni \
 		pajlada:humanize:4e00a03:humanize/lib/humanize \
@@ -40,7 +40,7 @@ GH_TUPLE=	Chatterino:libcommuni:f3e7f97:communi/lib/libcommuni \
 QMAKE_ENV=	GIT_COMMIT=${COMMIT_ID} \
 		GIT_RELEASE=${DISTVERSIONPREFIX}${PORTVERSION}
 QMAKE_ARGS=	INCLUDEPATH+=${LOCALBASE}/include/qt5keychain \
-		LIBS+=-lqt5keychain PREFIX=${STAGEDIR}${PREFIX} \
+		LIBS+=-lqt5keychain \
 		RAPIDJSON_SYSTEM=1
 
 PORTDOCS=	README.md docs/Commands.md docs/ENV.md docs/IMAGEUPLOADER.md \
@@ -48,13 +48,6 @@ PORTDOCS=	README.md docs/Commands.md docs/ENV.md docs/IMAGEUPLOADER.md \
 
 PORTSCOUT=	skipv:v2.1.7,v2.1.0,v2.0.4,v2.0.3,v2.0.2,v2.0.1,v2.0.0
 
-post-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/chatterino ${STAGEDIR}${PREFIX}/bin/
-	${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/256x256/apps/ ${STAGEDIR}${PREFIX}/share/appdata/
-	${INSTALL_DATA} ${WRKSRC}/resources/icon.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/256x256/apps/chatterino.png
-	${INSTALL_DATA} ${WRKSRC}/resources/com.chatterino.chatterino.desktop ${STAGEDIR}${DESKTOPDIR}
-	${INSTALL_DATA} ${WRKSRC}/resources/com.chatterino.chatterino.appdata.xml ${STAGEDIR}${PREFIX}/share/appdata/
-
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/docs
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}/
diff --git a/net-im/chatterino2/distinfo b/net-im/chatterino2/distinfo
index 8c9202f32a8d..684f797c4c46 100644
--- a/net-im/chatterino2/distinfo
+++ b/net-im/chatterino2/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1598902157
-SHA256 (chatterino-chatterino2-g2020083101-36b9466_GH0.tar.gz) = dbabc78fce72617ccc8d7b7e3ff279948cb9388e8f11a98da7631602164b244b
-SIZE (chatterino-chatterino2-g2020083101-36b9466_GH0.tar.gz) = 1444484
+TIMESTAMP = 1598993043
+SHA256 (chatterino-chatterino2-g2020090101-cbcd5f3_GH0.tar.gz) = 8940b4e233368a4a7966962275d26907f5382eeba55d84e6a310bc3705de70e4
+SIZE (chatterino-chatterino2-g2020090101-cbcd5f3_GH0.tar.gz) = 1444819
 SHA256 (Chatterino-libcommuni-f3e7f97_GH0.tar.gz) = 7e01a92269c043004ce5e6ba8a5ad2c1506d6fc9a03bd74426feb2049ccf4917
 SIZE (Chatterino-libcommuni-f3e7f97_GH0.tar.gz) = 646993
 SHA256 (pajlada-humanize-4e00a03_GH0.tar.gz) = 1d74a2300a8991789212099aba6f89cba3a5eddf82bd804ff5ae18f8cbd84049
diff --git a/net-im/chatterino2/files/patch-chatterino.pro b/net-im/chatterino2/files/patch-chatterino.pro
index fedf47e5755f..dd8e9a35d2e7 100644
--- a/net-im/chatterino2/files/patch-chatterino.pro
+++ b/net-im/chatterino2/files/patch-chatterino.pro
@@ -1,12 +1,24 @@
 --- chatterino.pro.orig	2020-08-31 14:42:30 UTC
 +++ chatterino.pro
-@@ -82,7 +82,9 @@ include(lib/settings.pri)
- include(lib/serialize.pri)
- include(lib/winsdk.pri)
- include(lib/rapidjson.pri)
-+!freebsd {
- include(lib/qtkeychain.pri)
+@@ -565,6 +567,21 @@ linux {
+     target.path = $$PREFIX/bin
+ 
+     INSTALLS += desktop build_icons icon target
 +}
++
++freebsd {
++    desktop.path = $$PREFIX/share/applications
++    desktop.files = resources/com.chatterino.chatterino.desktop
++
++    xml.path = $$PREFIX/share/appdata
++    xml.files = resources/com.chatterino.chatterino.appdata.xml
++
++    icon.path = $$PREFIX/share/icons/hicolor/256x256/apps
++    icon.extra = cp $$PWD/resources/icon.png $(INSTALL_ROOT)/$$PREFIX/share/icons/hicolor/256x256/apps/chatterino.png
++
++    target.path = $$PREFIX/bin
++
++    INSTALLS += desktop icon target xml
+ }
  
- exists( $$OUT_PWD/conanbuildinfo.pri ) {
-     message("Using conan packages")
+ git_commit=$$(GIT_COMMIT)
-- 
cgit v1.2.3