Date: Tue, 5 Apr 2022 12:31:32 GMT From: Rainer Hurling <rhurlin@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 92e9f56d9a45 - main - graphics/epsonscan2-non-free-plugin: Remove warning, extend pkg-message Message-ID: <202204051231.235CVWWE054300@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by rhurlin: URL: https://cgit.FreeBSD.org/ports/commit/?id=92e9f56d9a45e11a787effb680160fef3b8e2005 commit 92e9f56d9a45e11a787effb680160fef3b8e2005 Author: Yasuhiro Kimura <yasu@freebsd.org> AuthorDate: 2022-04-05 12:24:03 +0000 Commit: Rainer Hurling <rhurlin@FreeBSD.org> CommitDate: 2022-04-05 12:31:27 +0000 graphics/epsonscan2-non-free-plugin: Remove warning, extend pkg-message There are two problems about using .warning in Makefile. 1. It is evaluated only when make(1) is invoked. So user of binary package never see the message. 2. It is not related to specific target. So the message is displayed with improper case such as `make index`. So add a message to pkg-message rather than using .warning in Makefile. PR: 263056 Approved by: J.R. Oldroyd <fbsd@opal.com> (maintainer) --- graphics/epsonscan2-non-free-plugin/Makefile | 9 +-------- graphics/epsonscan2-non-free-plugin/files/pkg-message.in | 4 ++++ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/graphics/epsonscan2-non-free-plugin/Makefile b/graphics/epsonscan2-non-free-plugin/Makefile index a7f0c8a2956e..5f00f6ca1c70 100644 --- a/graphics/epsonscan2-non-free-plugin/Makefile +++ b/graphics/epsonscan2-non-free-plugin/Makefile @@ -1,5 +1,6 @@ PORTNAME= epsonscan2-non-free-plugin DISTVERSION= 6.6.40.0 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= https://download2.ebz.epson.net/${EPSONSCAN2}/common/rpm/x64/:amd64 \ https://download2.ebz.epson.net/${EPSONSCAN2}/common/deb/arm/:armv7 \ @@ -52,14 +53,6 @@ PLIST_SUB+= LINUX_LIB=${LINUX_LIB} \ .include <bsd.port.pre.mk> -.if ((${OSVERSION} >= 1400000 && ${OSVERSION} <= 1400053) || \ - (${OSVERSION} >= 1300000 && ${OSVERSION} <= 1300526) || \ - ${OSVERSION} < 1300000) -.warning epsonscan2-non-free-plugin's es2intif requires FreeBSD 13.x or 14.x -.warning kernel later than 2022/03/05 for operation with scanners shown with -.warning [*] in ${PREFIX}/lib/epsonscan2/Read_me.FreeBSD. -.endif - .if ${ARCH} == amd64 DIST_FMT= rpm DIST_SUFX= x86_64.${DIST_FMT} diff --git a/graphics/epsonscan2-non-free-plugin/files/pkg-message.in b/graphics/epsonscan2-non-free-plugin/files/pkg-message.in index a2f77a596d3a..0a5608f80ba0 100644 --- a/graphics/epsonscan2-non-free-plugin/files/pkg-message.in +++ b/graphics/epsonscan2-non-free-plugin/files/pkg-message.in @@ -11,6 +11,10 @@ Linux emulator. Please read %%PREFIX%%/lib/epsonscan2/Read_me.FreeBSD for further details of how to configure and use this software. + +Note that es2intif requires FreeBSD 13.x or 14.x kernel later than 2022/03/05 +for operation with scanner models shown with [*] in +%%PREFIX%%/lib/epsonscan2/Read_me.FreeBSD. EOM } ]
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202204051231.235CVWWE054300>