From nobody Tue Apr 05 12:31:32 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 3644B1A920F6; Tue, 5 Apr 2022 12:31:33 +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 4KXn7n10VVz3kGY; Tue, 5 Apr 2022 12:31:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649161893; 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=o3BL08mUdmZsxmzvOM/T/UTccM/x42Mnu6oVsRxOlGo=; b=n9sfVa1gnnP5d09hYrMuXrmumCsZjOBCJ5ZahFxxvF7wgaotZgZyIUwZH2NBskUvhEpn5h BCjxqjpqguCQNVBU310W0JMOQ9N9gS7FTkj196HEO1IXrvSz5tX8RGeYUyAGbjmLkNBMDt LBZJ6p1Y8f5guu+BXQsCsvDaHXepfKRNbFFCo2xVyb/PjkBoj0of1o423tivgfV3M2J+7G coFsBR7kg8xg0bzjVwb1BnnS8rXN5BFgSKE8Oflv3HnGbTVqfzjOE8Ayt9SOGgGvqSM/g3 04VXwMHtyBvODWHb3HUmh9YfvUsYDxD0gh2VUduO3FiapuRRxpZHKtUp8m4pBg== 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 EC66B26740; Tue, 5 Apr 2022 12:31:32 +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 235CVW8U054301; Tue, 5 Apr 2022 12:31:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 235CVWWE054300; Tue, 5 Apr 2022 12:31:32 GMT (envelope-from git) Date: Tue, 5 Apr 2022 12:31:32 GMT Message-Id: <202204051231.235CVWWE054300@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rainer Hurling Subject: git: 92e9f56d9a45 - main - graphics/epsonscan2-non-free-plugin: Remove warning, extend pkg-message 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: rhurlin X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 92e9f56d9a45e11a787effb680160fef3b8e2005 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649161893; 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=o3BL08mUdmZsxmzvOM/T/UTccM/x42Mnu6oVsRxOlGo=; b=fDl3XwNRzENMR3L5SOinDAQkYM16xfYxpfPf7fA4nNCNHP2tYCUZkKrWYxh9m7+zTBKKws vTOMizWtdxExszPSeeSlFGC5p1f5lZOQ6B8Z5vGhKyVtCNwst8g/M3oF3rqp/h0h+SvTvU uDW3Wwf4i6CRM3c205mzg+zFQcsEH4ojFAKkvkAHeySbo9KjqtrRqQhulp01nf1fKmmqGR iq5A/40FNMCUSuV4+u9jFpm08jDEm3QTy0JlJOOAwjefQSuzc1+ERYmqDKPALssxGo3MHU QVWXsLp4o2fO8f0t/XhDY+kPuOjIyyfw9Te3JImoF94VTKor1MKwJ9Z76vT8jw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649161893; a=rsa-sha256; cv=none; b=yWkiYXtdPVnl99PCkJEcbQo3ZrLdSL53po/jcOO+30g77iqorpovBEfkYKSTAuDnX3KaRt IY81vLVZE3ng44jY6DwH7Pr6dBtCK1WamMv1Z401GBe+BrzePAw/16BYx/MKsYzRJ2bU1d 4DlTnwI9VCnNf89P0IvzbzpPr68NPfBxeTPynSvIkzqz9tiA4XBqJk/mu+pDLZR+26TRrx Nvkc84z6DY1p19nSgOObMgPq6W5xC//WZwdNekQzjbHh5eJgQ21jpRLuL/jpzR8VmQYKcj thIKg7fJvcdNIZGMgPwtgjobEyt9nn+rxQ7+b2/01tH5w4jm1/mln00nkMvgng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rhurlin: URL: https://cgit.FreeBSD.org/ports/commit/?id=92e9f56d9a45e11a787effb680160fef3b8e2005 commit 92e9f56d9a45e11a787effb680160fef3b8e2005 Author: Yasuhiro Kimura AuthorDate: 2022-04-05 12:24:03 +0000 Commit: Rainer Hurling 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 (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 -.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 } ]