From owner-svn-ports-all@freebsd.org  Tue Jan 23 15:46:00 2018
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 14BCEEB409F;
 Tue, 23 Jan 2018 15:46:00 +0000 (UTC)
 (envelope-from tobik@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id E265882D9C;
 Tue, 23 Jan 2018 15:45:59 +0000 (UTC)
 (envelope-from tobik@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 30F59108AF;
 Tue, 23 Jan 2018 15:45:59 +0000 (UTC)
 (envelope-from tobik@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0NFjwT8025394;
 Tue, 23 Jan 2018 15:45:58 GMT (envelope-from tobik@FreeBSD.org)
Received: (from tobik@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0NFjwHL025392;
 Tue, 23 Jan 2018 15:45:58 GMT (envelope-from tobik@FreeBSD.org)
Message-Id: <201801231545.w0NFjwHL025392@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: tobik set sender to
 tobik@FreeBSD.org using -f
From: Tobias Kortkamp <tobik@FreeBSD.org>
Date: Tue, 23 Jan 2018 15:45:58 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r459780 - in head/deskutils/freeplane: . files
X-SVN-Group: ports-head
X-SVN-Commit-Author: tobik
X-SVN-Commit-Paths: in head/deskutils/freeplane: . files
X-SVN-Commit-Revision: 459780
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 23 Jan 2018 15:46:00 -0000

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"