Date: Thu, 6 Oct 2022 07:48:56 GMT From: Juraj Lutter <otis@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 2b8ba28871e7 - main - mail/claws: Rework claws-mail-plugins Message-ID: <202210060748.2967mupO083178@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by otis: URL: https://cgit.FreeBSD.org/ports/commit/?id=2b8ba28871e728343bea7769ca373aed4e882ef1 commit 2b8ba28871e728343bea7769ca373aed4e882ef1 Author: Milan Obuch <bsd@dino.sk> AuthorDate: 2022-10-06 07:45:00 +0000 Commit: Juraj Lutter <otis@FreeBSD.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202210060748.2967mupO083178>