Date: Sat, 16 Apr 2016 08:47:00 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413419 - in head/deskutils/docear: . files Message-ID: <201604160847.u3G8l0wF099149@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Sat Apr 16 08:47:00 2016 New Revision: 413419 URL: https://svnweb.freebsd.org/changeset/ports/413419 Log: - 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 Modified: head/deskutils/docear/Makefile head/deskutils/docear/files/patch-docear.sh head/deskutils/docear/pkg-descr Modified: head/deskutils/docear/Makefile ============================================================================== --- head/deskutils/docear/Makefile Sat Apr 16 08:02:20 2016 (r413418) +++ head/deskutils/docear/Makefile Sat Apr 16 08:47:00 2016 (r413419) @@ -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. 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> Modified: head/deskutils/docear/files/patch-docear.sh ============================================================================== --- head/deskutils/docear/files/patch-docear.sh Sat Apr 16 08:02:20 2016 (r413418) +++ head/deskutils/docear/files/patch-docear.sh Sat Apr 16 08:47:00 2016 (r413419) @@ -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\ Modified: head/deskutils/docear/pkg-descr ============================================================================== --- head/deskutils/docear/pkg-descr Sat Apr 16 08:02:20 2016 (r413418) +++ head/deskutils/docear/pkg-descr Sat Apr 16 08:47:00 2016 (r413419) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604160847.u3G8l0wF099149>