From owner-svn-ports-all@freebsd.org Sat Jul 20 17:31:34 2019 Return-Path: Delivered-To: svn-ports-all@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 6A9E4C3425; Sat, 20 Jul 2019 17:31:34 +0000 (UTC) (envelope-from yuri@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 49CD789B07; Sat, 20 Jul 2019 17:31:34 +0000 (UTC) (envelope-from yuri@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 F17C4DBE0; Sat, 20 Jul 2019 17:31:33 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x6KHVX9q090285; Sat, 20 Jul 2019 17:31:33 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x6KHVXD0090283; Sat, 20 Jul 2019 17:31:33 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <201907201731.x6KHVXD0090283@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Sat, 20 Jul 2019 17:31:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r507007 - in head/deskutils/cfiles: . files X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: in head/deskutils/cfiles: . files X-SVN-Commit-Revision: 507007 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 49CD789B07 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.95)[-0.949,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Jul 2019 17:31:34 -0000 Author: yuri Date: Sat Jul 20 17:31:33 2019 New Revision: 507007 URL: https://svnweb.freebsd.org/changeset/ports/507007 Log: deskutils/cfiles: Fix image display feature which was failing due to hardcoded paths Added: head/deskutils/cfiles/files/ head/deskutils/cfiles/files/patch-config.h (contents, props changed) Modified: head/deskutils/cfiles/Makefile Modified: head/deskutils/cfiles/Makefile ============================================================================== --- head/deskutils/cfiles/Makefile Sat Jul 20 17:19:41 2019 (r507006) +++ head/deskutils/cfiles/Makefile Sat Jul 20 17:31:33 2019 (r507007) @@ -3,7 +3,7 @@ PORTNAME= cfiles DISTVERSIONPREFIX= v DISTVERSION= 1.7.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= deskutils MAINTAINER= yuri@FreeBSD.org @@ -28,20 +28,27 @@ MAKE_ARGS= CC=${CC} PLIST_FILES= bin/${PORTNAME} \ man/man1/${PORTNAME}.1.gz \ ${DATADIR}/scripts/clearimg \ - ${DATADIR}/scripts/clearimg_uberzug \ - ${DATADIR}/scripts/displayimg \ - ${DATADIR}/scripts/displayimg_uberzug + ${DATADIR}/scripts/displayimg post-patch: - @${REINPLACE_CMD} -E 's,"(atool|fzf|pdftoppm)","${LOCALBASE}/bin/\1",g; s|"/bin/bash"|"${LOCALBASE}/bin/bash"|' \ + @${REINPLACE_CMD} -E '\ + s,"(atool|fzf|pdftoppm)","${LOCALBASE}/bin/\1",g; \ + s|"/bin/bash"|"${LOCALBASE}/bin/bash"|; \ + s|CLEARIMG|"${DATADIR}/scripts/clearimg"|g; \ + s|DISPLAYIMG|"${DATADIR}/scripts/displayimg"|g' \ ${WRKSRC}/cf.c - @${REINPLACE_CMD} -E 's|W3MIMGDISPLAY="/usr/lib/w3m/w3mimgdisplay"|W3MIMGDISPLAY="${LOCALBASE}/libexec/w3m/w3mimgdisplay"|' \ + @${REINPLACE_CMD} -E '\ + s|IMG "/usr/share|IMG "${PREFIX}/share|; \ + s|W3MIMGDISPLAY="/usr/lib/w3m/w3mimgdisplay"|W3MIMGDISPLAY="${LOCALBASE}/libexec/w3m/w3mimgdisplay"|' \ ${WRKSRC}/scripts/displayimg ${WRKSRC}/scripts/clearimg + @${REINPLACE_CMD} -E '\ + s|IMG "/usr/share|IMG "${PREFIX}/share|' \ + ${WRKSRC}/config.h do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin ${MKDIR} ${STAGEDIR}${PREFIX}/share/cfiles/scripts -.for s in clearimg displayimg displayimg_uberzug clearimg_uberzug +.for s in clearimg displayimg ${INSTALL_SCRIPT} ${WRKSRC}/scripts/${s} ${STAGEDIR}${DATADIR}/scripts .endfor ${INSTALL_MAN} ${WRKSRC}/cfiles.1 ${STAGEDIR}${MAN5PREFIX}/man/man1 Added: head/deskutils/cfiles/files/patch-config.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/cfiles/files/patch-config.h Sat Jul 20 17:31:33 2019 (r507007) @@ -0,0 +1,15 @@ +--- config.h.orig 2019-07-20 17:07:18 UTC ++++ config.h +@@ -22,10 +22,10 @@ + #define FILE_OPENER "xdg-open" + + // Display Image Script +-#define DISPLAYIMG "/usr/share/cfiles/scripts/displayimg_uberzug" ++#define DISPLAYIMG "/usr/share/cfiles/scripts/displayimg" + + // Clear Image Preview Script +-#define CLEARIMG "/usr/share/cfiles/scripts/clearimg_uberzug" ++#define CLEARIMG "/usr/share/cfiles/scripts/clearimg" + + + /*