From owner-svn-ports-head@freebsd.org Mon Apr 13 15:25:54 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B01192C1106; Mon, 13 Apr 2020 15:25:54 +0000 (UTC) (envelope-from mandree@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 491CBB3wqmz3Frd; Mon, 13 Apr 2020 15:25:54 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 81F861D74C; Mon, 13 Apr 2020 15:25:54 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 03DFPsaF048722; Mon, 13 Apr 2020 15:25:54 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03DFPsQn048721; Mon, 13 Apr 2020 15:25:54 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <202004131525.03DFPsQn048721@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Mon, 13 Apr 2020 15:25:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r531610 - head/graphics/rawtherapee X-SVN-Group: ports-head X-SVN-Commit-Author: mandree X-SVN-Commit-Paths: head/graphics/rawtherapee X-SVN-Commit-Revision: 531610 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Apr 2020 15:25:54 -0000 Author: mandree Date: Mon Apr 13 15:25:53 2020 New Revision: 531610 URL: https://svnweb.freebsd.org/changeset/ports/531610 Log: graphics/rawtherapee: avoid 2>&1 in test, UCL conversion of pkg-message - in the smoke tests post-install, don't fold stderr into stdout, remove the 2>&1. Version is emitted on stdout, because there are sporadic reports of one rawtherapee-cli test not proceeding to the echo, and we don't want to mask stderr to see what's up. [1] - while here, after figuring out that make create-manifest and the porter's handbook are inconsistent [2], convert pkg-message to UCL, and make sure it's printed on install and on upgrade. (Bump PORTREVISION so that pkg-message is shown on upgrade.) [2] see https://reviews.freebsd.org/D24379 PR: 245592 Reported by: tech-lists@zyxst.net Modified: head/graphics/rawtherapee/Makefile head/graphics/rawtherapee/pkg-message Modified: head/graphics/rawtherapee/Makefile ============================================================================== --- head/graphics/rawtherapee/Makefile Mon Apr 13 14:51:25 2020 (r531609) +++ head/graphics/rawtherapee/Makefile Mon Apr 13 15:25:53 2020 (r531610) @@ -3,7 +3,7 @@ PORTNAME= rawtherapee PORTVERSION= 5.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= https://rawtherapee.com/shared/source/ \ LOCAL/mandree/ @@ -173,9 +173,9 @@ post-install: ${CP} ${WRKSRC}/rtdata/options/options.lin ${WRKDIR}/rt-config/options (cd ${WRKSRC}/rtdata/ && ${COPYTREE_SHARE} "profiles dcpprofiles" ${WRKDIR}/rt-config ) @(set -x ; TMP=$$(${MKTEMP} -d -t ${PORTNAME}) && trap "rc=$$? ; ${RM} -rf \"$$TMP\" ; exit \$$rc" 0 && \ - ( ${SETENV} ${_env} ${STAGEDIR}${PREFIX}/bin/rawtherapee -v 2>&1 ; \ + ( ${SETENV} ${_env} ${STAGEDIR}${PREFIX}/bin/rawtherapee -v ; \ echo $$? >&3 ) 3>&3 | ${EGREP} -q "RawTherapee, version ${_check_version:C/_.*//:C/,.*//}|cannot open display:" && \ - ( ${SETENV} ${_env} ${STAGEDIR}${PREFIX}/bin/rawtherapee-cli 2>&1 ; \ + ( ${SETENV} ${_env} ${STAGEDIR}${PREFIX}/bin/rawtherapee-cli ; \ echo $$? >&3 ) 3>&3 | ${EGREP} -q "RawTherapee, version ${_check_version:C/_.*//:C/,.*//}" && \ expect='0\n0\n' && \ onefile=$$(ls "${TESTIMAGES}"/* | head -1) && \ Modified: head/graphics/rawtherapee/pkg-message ============================================================================== --- head/graphics/rawtherapee/pkg-message Mon Apr 13 14:51:25 2020 (r531609) +++ head/graphics/rawtherapee/pkg-message Mon Apr 13 15:25:53 2020 (r531610) @@ -1,3 +1,5 @@ +[ +{type: [install, upgrade], message=<