svn commit: r531610 - head/graphics/rawtherapee

[Matthias Andree]

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 at 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=<<EOD
 LENSFUN INFORMATION:
 
 This package uses lensfun to correct lens aberrations. In case
@@ -13,3 +15,6 @@ remove older cache directories.
 
 Also, after configurations have been moved to the new version's
 directory, older $HOME/.config/RawTherapee* directories may be removed.
+EOD
+},
+]