From nobody Thu Oct 6 07:48:56 2022 X-Original-To: dev-commits-ports-all@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 4Mjk8m4VcBz4fFrB; Thu, 6 Oct 2022 07:48: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 4Mjk8m3sktz3vmK; Thu, 6 Oct 2022 07:48:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665042536; 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=WWDj3yrko+3ORMhhWI1ey9JhgZxNLMUrQYVrUhxgrc0=; b=C72sIN3FUCKRNJ+nG39d7WsYvhBUCF483f/rejFUuMU1MKiNJfOde7P6e7I5+9xO8Mcg5v KWeLiHD0/CJTc/DHTblgnFCI6UZSyv8gfDbrhDYRBSLe+I4+h1CWIoG6DFDZ5naCyZLBzw D0z1mMpaC3D8bMJjW8PTI3+eO112szPAOZCxBZzlapFcNW1dz9VcifUWAfcW1FeOk1h/Bq WSz4pyjqbaVqbDsTIXqFQXLfrJSU2623mf3m60OLnbIsAAMwS8j0CND+uOSw+GgNOq3eAe CErgx1wtcP2i+Nq47/6fyPhVvgWdIIM+IxfmwFwTgsONrqV3T7ErNJAwiLCNpQ== 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 4Mjk8m2Whbz19w1; Thu, 6 Oct 2022 07:48: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 2967muO8083179; Thu, 6 Oct 2022 07:48:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2967mupO083178; Thu, 6 Oct 2022 07:48:56 GMT (envelope-from git) Date: Thu, 6 Oct 2022 07:48:56 GMT Message-Id: <202210060748.2967mupO083178@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Juraj Lutter Subject: git: 2b8ba28871e7 - main - mail/claws: Rework claws-mail-plugins List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: otis X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2b8ba28871e728343bea7769ca373aed4e882ef1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665042536; 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=WWDj3yrko+3ORMhhWI1ey9JhgZxNLMUrQYVrUhxgrc0=; b=scLzA4VKgM8hVcDGYQvUXb2pMQYZH6Dxtp2ie80u34xWtaOVogt6E8toEvvIfBb2LJ2axb K1tdupIvnNDFm97RWeRTv60WQnjRO04s4Ab9zVdAp55xKQNFwfPcX21k5kxKTrrZZ9RiLT kxQ+GxvXurhFlKnfIpwe62SI84b4+tMENyKHDHRAzezvZnAQJtUyottG7IAGSBOI/owrRs yzH4X68zioUuToUaHBwGSyIHH5qduipHkkiMexNF678i9obH9DogphoodoLiKkabjHaJrQ AN4RfVD5zSlHE87c1g9wTaPhSiVQswMmghM4Yd1MEMGJxTsl7Y1bFBahC1JHoA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665042536; a=rsa-sha256; cv=none; b=W/DF5SEabaV5XQnKcVw94VVsm27lH67Z4EVcru7jSFLsLkQ8X/WAGb5XKeTp+32ZYuOkrh yDgA2IdGcoNHEqKWl6R1h9TyIy14J+OCqD1pIy8CVAJawBL0qNQiOXzKmwXb4+i5VOEaxG nHFCs9VnxRmmG+Tl0zaB/J8H51RWrbX5liXqo9kzdBVi+22LYbTzbXwIhwTXyPY/Cxj+3o E/jXMQ2aabZ7ORZfys5JvL9p0lQ5JfdAIzAYvXkz6LB0uyVeBHbkeoucrxi5KfUnmYtjD4 XzZxQlIgvgWeA43t2kANDjCfkkOZ6Q8IYC5u4aDTWR7IgcEmdZBXMckRHHRj5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by otis: URL: https://cgit.FreeBSD.org/ports/commit/?id=2b8ba28871e728343bea7769ca373aed4e882ef1 commit 2b8ba28871e728343bea7769ca373aed4e882ef1 Author: Milan Obuch AuthorDate: 2022-10-06 07:45:00 +0000 Commit: Juraj Lutter CommitDate: 2022-10-06 07:47:22 +0000 mail/claws: Rework claws-mail-plugins Let mail/claws-mail-plugins get PORTVERSION from mail/claws-mail. There is PORTVERSION defined directly in mail/claws-mail-plugins/Makefile at present. Create mail/claws-mail/Makefile.ver to hold this information and use it in both mail/claws-mail-plugins/Makefile and mail/claws-mail/Makefile.claws files. Technically, it is a no change for now, but it makes easier to create new options for both GTK2 and GTK3 (new one) version of Claws Mail and act accordingly in all Claws Mail plugin ports. Approved by: Chris Hutchinson (maintainer) PR: 266092 --- mail/claws-mail-plugins/Makefile | 4 ++-- mail/claws-mail/Makefile.claws | 6 +++--- mail/claws-mail/Makefile.ver | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/mail/claws-mail-plugins/Makefile b/mail/claws-mail-plugins/Makefile index c4e4cc98be8e..c962fee3037d 100644 --- a/mail/claws-mail-plugins/Makefile +++ b/mail/claws-mail-plugins/Makefile @@ -1,5 +1,4 @@ PORTNAME= claws-mail-plugins -PORTVERSION= 3.19.0 CATEGORIES= mail news MAINTAINER= portmaster@BSDforge.com @@ -8,7 +7,8 @@ WWW= https://www.claws-mail.org/plugins.php USES= metaport -.include "../claws-mail/Makefile.claws.plugins" +.include "${.CURDIR}/../claws-mail/Makefile.ver" +.include "${.CURDIR}/../claws-mail/Makefile.claws.plugins" # pgpcore, pgpinline, pgpmime, smime CLAWS_PLUGINS+= pgp diff --git a/mail/claws-mail/Makefile.claws b/mail/claws-mail/Makefile.claws index 2d5520300f3e..dc05c10dedf5 100644 --- a/mail/claws-mail/Makefile.claws +++ b/mail/claws-mail/Makefile.claws @@ -1,4 +1,3 @@ -PORTVERSION= 3.19.0 CATEGORIES?= mail MASTER_SITES= http://www.claws-mail.org/download.php?file=releases/ @@ -11,7 +10,8 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= ${ICONV_CONFIGURE_ARG} --disable-dbus --disable-static -.include "../claws-mail/Makefile.claws.plugins" +.include "${.CURDIR}/../claws-mail/Makefile.ver" +.include "${.CURDIR}/../claws-mail/Makefile.claws.plugins" .for p in ${CLAWS_PLUGINS} CONFIGURE_ARGS+= --disable-${p}-plugin @@ -24,7 +24,7 @@ PKGNAMEPREFIX= claws-mail- BUILD_DEPENDS+= claws-mail>=${PORTVERSION}:mail/claws-mail RUN_DEPENDS+= claws-mail>=${PORTVERSION}:mail/claws-mail -MASTERDIR= ${.CURDIR}/../../mail/claws-mail +MASTERDIR= ${.CURDIR}/../claws-mail DESCR= ${.CURDIR}/pkg-descr FILESDIR= ${.CURDIR}/files PLIST= ${NONEXISTENT} diff --git a/mail/claws-mail/Makefile.ver b/mail/claws-mail/Makefile.ver new file mode 100644 index 000000000000..251cf99d6626 --- /dev/null +++ b/mail/claws-mail/Makefile.ver @@ -0,0 +1 @@ +PORTVERSION= 3.19.0