freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

deskutils/cfiles: Fix image display feature which was failing due to hardcoded paths

Browse Source
This commit is contained in:
Yuri Victorovich
2019-07-20 17:31:33 +00:00
parent 4752c15df7
commit a2b2c4dd9d
2 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
deskutils/cfiles/Makefile
View File

@@ -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

15
deskutils/cfiles/files/patch-config.h Normal file
View File

@@ -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"
/*