Index: head/deskutils/freeplane/Makefile =================================================================== --- head/deskutils/freeplane/Makefile (revision 459779) +++ head/deskutils/freeplane/Makefile (revision 459780) @@ -1,35 +1,34 @@ # Created by: Loïc Bartoletti # $FreeBSD$ PORTNAME= freeplane PORTVERSION= 1.6.12 +PORTREVISION= 1 CATEGORIES= deskutils editors java MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20stable DISTNAME= ${PORTNAME}_bin-${PORTVERSION} MAINTAINER= lbartoletti@tuxfamily.org COMMENT= Free mind mapping and knowledge management software LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/license.txt USES= cpe zip USE_JAVA= yes JAVA_VERSION= 1.6+ NO_ARCH= yes NO_BUILD= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} 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 Index: head/deskutils/freeplane/files/patch-freeplane.sh =================================================================== --- head/deskutils/freeplane/files/patch-freeplane.sh (revision 459779) +++ head/deskutils/freeplane/files/patch-freeplane.sh (revision 459780) @@ -1,17 +1,17 @@ --- freeplane.sh.orig 2018-01-07 18:16:56 UTC +++ freeplane.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # we only want to test the script, not Freeplane itself if ( echo "${DEBUG}" | grep -qe "script" ); then @@ -123,7 +123,7 @@ if [ -x $(which readlink) ] && [ "`echo $OSTYPE | cut # if we have 'readlink' we can use it to get an absolute path # -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"