git: 3e09e0f98f7b - main - irc/srain: Update to 1.3.1

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Ashish SHUKLA <ashish_at_FreeBSD.org>
Date: Sat, 15 Jan 2022 21:32:56 UTC
The branch main has been updated by ashish:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3e09e0f98f7bc594c5361bbe84ad64c614acc332

commit 3e09e0f98f7bc594c5361bbe84ad64c614acc332
Author:     Ashish SHUKLA <ashish@FreeBSD.org>
AuthorDate: 2022-01-15 18:23:05 +0000
Commit:     Ashish SHUKLA <ashish@FreeBSD.org>
CommitDate: 2022-01-15 21:32:42 +0000

    irc/srain: Update to 1.3.1
    
    - Add DOCS option for documentation
    - Switch to meson for building
    - Remove the Makefile patch not needed anymore
---
 irc/srain/Makefile                 | 27 ++++++++-----
 irc/srain/distinfo                 |  6 +--
 irc/srain/files/patch-src_Makefile | 18 ---------
 irc/srain/pkg-plist                | 82 ++++++++++++++++++++++++++++++++++++++
 4 files changed, 103 insertions(+), 30 deletions(-)

diff --git a/irc/srain/Makefile b/irc/srain/Makefile
index cc8ff4a30bab..ea24a3a2f871 100644
--- a/irc/srain/Makefile
+++ b/irc/srain/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	srain
-DISTVERSION=	1.1.0
+DISTVERSION=	1.3.1
 CATEGORIES=	irc
 
 MAINTAINER=	ashish@FreeBSD.org
@@ -12,19 +12,28 @@ LIB_DEPENDS=	libconfig.so:devel/libconfig \
 		libsecret-1.so:security/libsecret \
 		libsoup-2.4.so:devel/libsoup
 
-USES=		compiler:c11 gettext-tools gmake gnome pkgconfig ssl
+USES=		compiler:c11 gettext-tools gnome meson pkgconfig ssl
 USE_GNOME=	cairo gdkpixbuf2 glib20 gtk30 pango
 
+OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFAULT=	DOCS
+
 USE_GITHUB=		yes
 GH_ACCOUNT=		SrainApp
-GNU_CONFIGURE=		yes
-MAKE_FLAGS+=		MAKE_PROGRAM=${MAKE_CMD}
-CONFIGURE_ARGS+=	--disable-debug
-ALL_TARGET=		default
+
+DOCS_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
+DOCS_MESON_ON=		-Ddoc_builders=html,man
+DOCS_MESON_OFF=		-Ddoc_builders=
+
+.include <bsd.port.pre.mk>
+
+.if ${SSL_DEFAULT} == base
+LDFLAGS+=	-lcrypto
 
 post-patch:
-	${REINPLACE_CMD} -e '/^MAKE =/s/make/${MAKE_CMD}/' \
-		${WRKSRC}/Makefile.in
+	${REINPLACE_CMD} -e "/dependency('openssl'),/d" \
+		${WRKSRC}/src/meson.build
+.endif
 
 pre-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/${PORTNAME} \
@@ -32,4 +41,4 @@ pre-install:
 		${STAGEDIR}${PREFIX}/share/metainfo \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/128x128/apps
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/irc/srain/distinfo b/irc/srain/distinfo
index 93db38e08a95..d5550a05ee76 100644
--- a/irc/srain/distinfo
+++ b/irc/srain/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1591214080
-SHA256 (SrainApp-srain-1.1.0_GH0.tar.gz) = cba8bf195933669c36d712c358504a0da271f65e36ff768c3ca7eb4172a54023
-SIZE (SrainApp-srain-1.1.0_GH0.tar.gz) = 941873
+TIMESTAMP = 1642252075
+SHA256 (SrainApp-srain-1.3.1_GH0.tar.gz) = 30a2e9958084a83e3841b6d5730052fb76e80b32f4499aecc0b822c4a650bdd5
+SIZE (SrainApp-srain-1.3.1_GH0.tar.gz) = 1924236
diff --git a/irc/srain/files/patch-src_Makefile b/irc/srain/files/patch-src_Makefile
deleted file mode 100644
index 48048d5f1d9c..000000000000
--- a/irc/srain/files/patch-src_Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/Makefile.orig	2020-05-24 04:53:14 UTC
-+++ src/Makefile
-@@ -24,12 +24,12 @@ LIBCONFIGFLAGS = $(shell pkg-config --cflags libconfig
- LIBCONFIGLIBS = $(shell pkg-config --libs libconfig)
- LIBSOUPFLAGS = $(shell pkg-config --cflags libsoup-2.4)
- LIBSOUPLIBS = $(shell pkg-config --libs libsoup-2.4)
--LIBSSLFLAGS = $(shell pkg-config --cflags openssl)
--LIBSSLLIBS = $(shell pkg-config --libs openssl)
-+LIBSSLFLAGS = -I$(OPENSSLINC)
-+LIBSSLLIBS = -L$(OPENSSLLIB) -lssl -lcrypto
- LIBSECRETFLAGS =$(shell pkg-config --cflags libsecret-1)
- LIBSECRETLIBS =$(shell pkg-config --libs libsecret-1)
- 
--CFLAGS += -std=gnu99 -O2 -Wall -Iinc -Wno-deprecated-declarations \
-+CFLAGS += -Wall -Iinc -Wno-deprecated-declarations \
- 		  $(DEFS) \
- 		  $(DBGFLAGS) \
- 		  $(GTK3FLAGS) \
diff --git a/irc/srain/pkg-plist b/irc/srain/pkg-plist
index 3789437835c7..1b562b8b9aad 100644
--- a/irc/srain/pkg-plist
+++ b/irc/srain/pkg-plist
@@ -1,9 +1,12 @@
 bin/srain
 %%ETCDIR%%/builtin.cfg
+%%PORTDOCS%%man/man1/srain.1.gz
 share/applications/im.srain.Srain.desktop
 share/icons/hicolor/128x128/apps/im.srain.Srain.png
+share/icons/hicolor/128x128/apps/im.srain.Srain.Red.png
 share/locale/nl/LC_MESSAGES/srain.mo
 share/locale/ru/LC_MESSAGES/srain.mo
+share/locale/uk/LC_MESSAGES/srain.mo
 share/locale/zh_CN/LC_MESSAGES/srain.mo
 share/metainfo/im.srain.Srain.metainfo.xml
 %%DATADIR%%/themes/bubble.css
@@ -11,3 +14,82 @@ share/metainfo/im.srain.Srain.metainfo.xml
 %%DATADIR%%/themes/default-bubble.css
 %%DATADIR%%/themes/default-min.css
 %%DATADIR%%/themes/reset.css
+%%PORTDOCS%%%%DOCSDIR%%/html/.buildinfo
+%%PORTDOCS%%%%DOCSDIR%%/html/.doctrees/changelog.doctree
+%%PORTDOCS%%%%DOCSDIR%%/html/.doctrees/commands.doctree
+%%PORTDOCS%%%%DOCSDIR%%/html/.doctrees/config.doctree
+%%PORTDOCS%%%%DOCSDIR%%/html/.doctrees/develop.doctree
+%%PORTDOCS%%%%DOCSDIR%%/html/.doctrees/environment.pickle
+%%PORTDOCS%%%%DOCSDIR%%/html/.doctrees/faq.doctree
+%%PORTDOCS%%%%DOCSDIR%%/html/.doctrees/index.doctree
+%%PORTDOCS%%%%DOCSDIR%%/html/.doctrees/install.doctree
+%%PORTDOCS%%%%DOCSDIR%%/html/.doctrees/intro.doctree
+%%PORTDOCS%%%%DOCSDIR%%/html/.doctrees/misc.doctree
+%%PORTDOCS%%%%DOCSDIR%%/html/.doctrees/prefs.doctree
+%%PORTDOCS%%%%DOCSDIR%%/html/.doctrees/start.doctree
+%%PORTDOCS%%%%DOCSDIR%%/html/.doctrees/support.doctree
+%%PORTDOCS%%%%DOCSDIR%%/html/.nojekyll
+%%PORTDOCS%%%%DOCSDIR%%/html/_images/srain-connect-custom-server.png
+%%PORTDOCS%%%%DOCSDIR%%/html/_images/srain-connect-predefined-server.png
+%%PORTDOCS%%%%DOCSDIR%%/html/_images/srain-connected-server.png
+%%PORTDOCS%%%%DOCSDIR%%/html/_images/srain-emoji-buttton.png
+%%PORTDOCS%%%%DOCSDIR%%/html/_images/srain-join-channel.png
+%%PORTDOCS%%%%DOCSDIR%%/html/_images/srain-joined-channel.png
+%%PORTDOCS%%%%DOCSDIR%%/html/_images/srain-render-message-after.png
+%%PORTDOCS%%%%DOCSDIR%%/html/_images/srain-render-message-before.png
+%%PORTDOCS%%%%DOCSDIR%%/html/_images/srain-search-channel.png
+%%PORTDOCS%%%%DOCSDIR%%/html/_images/srain-startup.png
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/changelog.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/commands.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/config.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/develop.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/faq.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/index.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/install.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/intro.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/misc.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/prefs.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/start.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/support.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/alabaster.css
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/basic.css
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/custom.css
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/doctools.js
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/documentation_options.js
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/file.png
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/im.srain.Srain.png
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/jquery-3.5.1.js
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/jquery.js
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/language_data.js
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/minus.png
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/plus.png
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/pygments.css
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/searchtools.js
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/srain-connect-custom-server.png
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/srain-connect-predefined-server.png
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/srain-connected-server.png
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/srain-emoji-buttton.png
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/srain-join-channel.png
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/srain-joined-channel.png
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/srain-render-message-after.png
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/srain-render-message-before.png
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/srain-search-channel.png
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/srain-startup.png
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/underscore-1.13.1.js
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/underscore.js
+%%PORTDOCS%%%%DOCSDIR%%/html/changelog.html
+%%PORTDOCS%%%%DOCSDIR%%/html/commands.html
+%%PORTDOCS%%%%DOCSDIR%%/html/config.html
+%%PORTDOCS%%%%DOCSDIR%%/html/develop.html
+%%PORTDOCS%%%%DOCSDIR%%/html/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/html/genindex.html
+%%PORTDOCS%%%%DOCSDIR%%/html/index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/install.html
+%%PORTDOCS%%%%DOCSDIR%%/html/intro.html
+%%PORTDOCS%%%%DOCSDIR%%/html/misc.html
+%%PORTDOCS%%%%DOCSDIR%%/html/objects.inv
+%%PORTDOCS%%%%DOCSDIR%%/html/prefs.html
+%%PORTDOCS%%%%DOCSDIR%%/html/search.html
+%%PORTDOCS%%%%DOCSDIR%%/html/searchindex.js
+%%PORTDOCS%%%%DOCSDIR%%/html/start.html
+%%PORTDOCS%%%%DOCSDIR%%/html/support.html