svn commit: r507007 - in head/deskutils/cfiles: . files
Yuri Victorovich
yuri at FreeBSD.org
Sat Jul 20 17:31:34 UTC 2019
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 at 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"
+
+
+ /*
More information about the svn-ports-head
mailing list