- Convert in-place patching with sed(1) into already existing patch file

- Do not attempt to create ${STAGEDIR}${DESKTOPDIR}: `share/applications'
  was added to mtree (Templates/BSD.local.dist) in r331266 2.5 years ago
- Turn the first line of pkg-descr into a COMMENT and fix weird Makefile
  formatting while here

3 files changed, 34 insertions, 27 deletions

diff --git a/deskutils/docear/Makefile b/deskutils/docear/Makefile
index 11d4d33bff2a..09b562485436 100644
--- a/deskutils/docear/Makefile
+++ b/deskutils/docear/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	docear_linux
 DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}${_suffix}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Mind Mapping tool with Reference, Library, and PDF Management
+COMMENT=	Academic literature suite
 
 LICENSE=	GPLv2
 
@@ -27,30 +27,23 @@ icon=		${DATADIR}/${PORTNAME}-icon48x48.png
 WRKSRC=		${WRKDIR}/docear-1.2.0.0_stable_build291
 SUB_FILES=	docear.desktop
 
-post-patch:
-		${REINPLACE_CMD} -e 's/readlink -mn/readlink -n/g' \
-		    -e 's,#!/bin/bash,#!/bin/sh,' \
-		    ${WRKSRC}/docear.sh
-
 do-install:
-		@${RM} -f ${WRKSRC}/docear.bat \
-			${WRKSRC}/docear.exe \
-			${WRKSRC}/*.bak
+	@${RM} -f ${WRKSRC}/docear.bat ${WRKSRC}/docear.exe ${WRKSRC}/*.bak
 # We can't install into $DOCSDIR or support disabling a DOCS option
 # since the documentation is an integral part of the installation,
 # such as online help via the program menus.
-		${MKDIR} ${STAGEDIR}${JDATADIR}
-		(cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}${JDATADIR})
-		${PRINTF} '#!/bin/sh\nset -eu\nexport JAVA_HOME="%s"\ncd "%s"\nexec "%s" "$$@"\n' \
-		    '${JAVA_HOME}' '${JDATADIR}' '${JDATADIR}/docear.sh' \
-		    >${STAGEDIR}${PREFIX}/bin/${PORTNAME}
-		${CHMOD} a=rx ${STAGEDIR}${JDATADIR}/docear.sh \
-		    ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
-		${MKDIR} ${STAGEDIR}${DATADIR}
-		${INSTALL_DATA} ${FILESDIR}/docear48.png "${STAGEDIR}${icon}"
-		${MKDIR} ${STAGEDIR}${DESKTOPDIR}
-		${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR}
-		${MKDIR} ${STAGEDIR}${PREFIX}/share/mime/packages
-		${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.xml ${STAGEDIR}${PREFIX}/share/mime/packages/
+	@${MKDIR} ${STAGEDIR}${JDATADIR}
+	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${JDATADIR}
+	${PRINTF} '#!/bin/sh\nset -eu\nexport JAVA_HOME="%s"\ncd "%s"\nexec "%s" "$$@"\n' \
+		'${JAVA_HOME}' '${JDATADIR}' '${JDATADIR}/docear.sh' \
+		> ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+	${CHMOD} a=rx ${STAGEDIR}${JDATADIR}/docear.sh \
+		${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${FILESDIR}/docear48.png ${STAGEDIR}${icon}
+	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/mime/packages
+	${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.xml \
+		${STAGEDIR}${PREFIX}/share/mime/packages
 
 .include <bsd.port.mk>
diff --git a/deskutils/docear/files/patch-docear.sh b/deskutils/docear/files/patch-docear.sh
index ab023b53d50e..8afe4a0e2dab 100644
--- a/deskutils/docear/files/patch-docear.sh
+++ b/deskutils/docear/files/patch-docear.sh
@@ -1,6 +1,21 @@
---- docear.sh	2015-06-10 19:42:49.000000000 +0200
-+++ /tmp/docear.sh.new	2015-06-10 19:41:56.000000000 +0200
-@@ -190,6 +190,7 @@
+--- docear.sh.orig	2015-10-26 17:10:56 UTC
++++ docear.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" )
+@@ -137,7 +137,7 @@ if [ -x $(which readlink) ] && [ "`echo 
+ then # 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")
+ 	_debug "Link '$0' resolved to '${freefile}'."
+ else
+ 	freefile="$0"
+@@ -190,6 +190,7 @@ then # non-Sun environments don't work c
  fi
  _debug "Calling: "\
  "${JAVACMD}" -Xmx512m\
@@ -8,7 +23,7 @@
   "-Dorg.freeplane.param1=$1"\
   "-Dorg.freeplane.param2=$2"\
   "-Dorg.freeplane.param3=$3"\
-@@ -204,6 +205,7 @@
+@@ -204,6 +205,7 @@ _debug "Calling: "\
   -xargs "${freedir}/init.xargs"
  ( echo "${DEBUG}" | grep -qe "exit" ) && exit 0 # do not start Freeplane
  "${JAVACMD}" -Xmx512m\
diff --git a/deskutils/docear/pkg-descr b/deskutils/docear/pkg-descr
index f4e077bd9f99..6a495da17466 100644
--- a/deskutils/docear/pkg-descr
+++ b/deskutils/docear/pkg-descr
@@ -1,4 +1,3 @@
-Docear - The Academic Literature Suite
 Docear (pronounced dog-ear) integrates everything you need to search,
 organize and create academic literature in a single application: a
 digital library, reference manager, PDF and file manager, note taking