From nobody Sat Jan 15 21:32:56 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id BC59C195FABE; Sat, 15 Jan 2022 21:32:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JbrxN3z8qz3wNw; Sat, 15 Jan 2022 21:32:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642282376; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=njJ2Xkeah1lbY9aM68sId3JO8juV+l+VAvMV+wskiMQ=; b=MqZAR+4FRwo8opf2sF1yCTfpXH/WmBU44EhZLzU6fvl0SCFCPiD7kbwftWRdpMX9+UTb/I MUsVxWlqG6PTuWUIKdjbbemFy4NSVgLuOJxFtLLriN0IXEQkB8eD05Il8GY0CkCE5v26oL HUBbZJlDzLPqplcx99bjYkfjM97J4siY4jGCu9AuQPVu0LoW4UzO/sRiLWWZgmglSa8FPx hNwPavrqkeeroyqGZyfpv/LrHzei56PKmOZ7Y6p03Hrg0C5dwJACWXPOurLorngSodYvgy RL+0rsYAsZzm5QQ6phhMK+RKiMsZPzy9GiFmMj3FDMOZIpNH/EkcBy8XZUbAkg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5D87F6652; Sat, 15 Jan 2022 21:32:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20FLWuBV088058; Sat, 15 Jan 2022 21:32:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20FLWu0s088057; Sat, 15 Jan 2022 21:32:56 GMT (envelope-from git) Date: Sat, 15 Jan 2022 21:32:56 GMT Message-Id: <202201152132.20FLWu0s088057@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ashish SHUKLA Subject: git: 3e09e0f98f7b - main - irc/srain: Update to 1.3.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ashish X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3e09e0f98f7bc594c5361bbe84ad64c614acc332 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642282376; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=njJ2Xkeah1lbY9aM68sId3JO8juV+l+VAvMV+wskiMQ=; b=hnAK0GSiFDH3Eia8OLtnfCuRecACNjYmdNnkTIHsvc1t3z5Kr7KwL+AftWwt9muBNQDlcD EUcrwOJX6W4kl3aU45IOUFXqfW+FbixoCgdAlHP7279d6/LkgjUabBlyDAhHi/qKB+2KcD MStWM8ROKsqTpFC1dFt+jVuHxI+/inUUUbpkm35xuT4x4xq4oVh7eJ4I+H33XSP2lTFg7N zQFMK32e745Jyi/IojYHf2Ih2lZHQFyjpsVqDzdW/oTvsC2Nynk4SRBFzXr4ocfJuB00OY HFrD8zpytL/3Y1ePtbMH8TytDYhntHujprQDL7+pGaPCRehiI+q5HY6DSjY2cQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642282376; a=rsa-sha256; cv=none; b=Ayt473RCKK7wRuoP8tnFRrB4wWt/MfBLc9+rue717NFGzL96hLqAdzidMlo4CwBKFJzLPj sF4xr/FpOxBFnu1N1qD/mp1eENaS4rvg3tktqRLPhWfOCjPB3fP8KeyYhrObMvO7jqCCMV AeSEiVF5s4nl3vXntWtA1hR+1lEQqeYy5ac6xzDHs5zii/xaXeCwGmJddHhMgPtcfxzzRO QKw9th25uDOuyAclW/Hb39Q9HQjCeKaD/kNRac8PXq171RzO5dDGRcRVgS9wqs11BUe1FW G3APIwUPD56hLh+xLe2TU+X2ZaTgBy7Q5skgqrGl85VWDAlSNcq3iKHXdFDc3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ashish: URL: https://cgit.FreeBSD.org/ports/commit/?id=3e09e0f98f7bc594c5361bbe84ad64c614acc332 commit 3e09e0f98f7bc594c5361bbe84ad64c614acc332 Author: Ashish SHUKLA AuthorDate: 2022-01-15 18:23:05 +0000 Commit: Ashish SHUKLA 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 + +.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 +.include 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