Date: Tue, 23 Jan 2018 15:45:58 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r459780 - in head/deskutils/freeplane: . files Message-ID: <201801231545.w0NFjwHL025392@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Tue Jan 23 15:45:58 2018 New Revision: 459780 URL: https://svnweb.freebsd.org/changeset/ports/459780 Log: deskutils/freeplane: Use a relative symlink for the launcher script PR: 225399 Requested by: danfe Modified: head/deskutils/freeplane/Makefile head/deskutils/freeplane/files/patch-freeplane.sh Modified: head/deskutils/freeplane/Makefile ============================================================================== --- head/deskutils/freeplane/Makefile Tue Jan 23 15:45:26 2018 (r459779) +++ head/deskutils/freeplane/Makefile Tue Jan 23 15:45:58 2018 (r459780) @@ -3,6 +3,7 @@ PORTNAME= freeplane PORTVERSION= 1.6.12 +PORTREVISION= 1 CATEGORIES= deskutils editors java MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20stable DISTNAME= ${PORTNAME}_bin-${PORTVERSION} @@ -26,10 +27,8 @@ do-install: @cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR} \ "! ( -name freeplane\.sh* -or -name license\.txt -or -name *\.bat -or -name *\.exe )" # Install freeplane.sh with the right permission, link to it to bin/ -# and let it resolve the path to DATADIR automatically to avoid -# patching it further. For this to work it has to be a link to an -# absolute path. +# and let it resolve the path to DATADIR automatically. ${INSTALL_SCRIPT} ${WRKSRC}/freeplane.sh ${STAGEDIR}${DATADIR} - ${LN} -s ${DATADIR}/freeplane.sh ${STAGEDIR}${PREFIX}/bin/freeplane + ${RLN} ${STAGEDIR}${DATADIR}/freeplane.sh ${STAGEDIR}${PREFIX}/bin/freeplane .include <bsd.port.mk> Modified: head/deskutils/freeplane/files/patch-freeplane.sh ============================================================================== --- head/deskutils/freeplane/files/patch-freeplane.sh Tue Jan 23 15:45:26 2018 (r459779) +++ head/deskutils/freeplane/files/patch-freeplane.sh Tue Jan 23 15:45:58 2018 (r459780) @@ -11,7 +11,7 @@ # -m should be faster and link does always resolve, else this script # wouldn't be called, would it? - freefile=$(readlink -mn "$0") -+ freefile=$(readlink -n "$0") ++ freefile=$(readlink -fn "$0") _debug "Link '$0' resolved to '${freefile}'." else freefile="$0"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801231545.w0NFjwHL025392>