Date: Wed, 23 Oct 2013 19:18:01 +0000 (UTC) From: Matthias Andree <mandree@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r331416 - head/deskutils/docear Message-ID: <201310231918.r9NJI1gi009379@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mandree Date: Wed Oct 23 19:18:01 2013 New Revision: 331416 URL: http://svnweb.freebsd.org/changeset/ports/331416 Log: Upgrade to first stable release. Support staging. Misc conversions to USES=... Modified: head/deskutils/docear/Makefile head/deskutils/docear/distinfo head/deskutils/docear/pkg-plist Modified: head/deskutils/docear/Makefile ============================================================================== --- head/deskutils/docear/Makefile Wed Oct 23 19:11:11 2013 (r331415) +++ head/deskutils/docear/Makefile Wed Oct 23 19:18:01 2013 (r331416) @@ -2,34 +2,31 @@ # $FreeBSD$ PORTNAME= docear -PORTVERSION= 1.0.0.r4 +PORTVERSION= 1.0.0 +_suffix= _stable CATEGORIES= deskutils java -MASTER_SITES= http://downloads.docear.org/${PORTVERSION:S/.r/_rc/}/ \ +MASTER_SITES= http://downloads.docear.org/${PORTVERSION}${_suffix}/ \ + SF/docear/1.x/${PORTVERSION}${_suffix} \ LOCAL/mandree/${DIST_SUBDIR}/ -# SF/docear/1.x/${PORTVERSION:S/.b/_beta/} DISTNAME= docear_linux -DIST_SUBDIR= ${PORTNAME}-${PORTVERSION} +DIST_SUBDIR= ${PORTNAME}-${PORTVERSION}${_suffix} MAINTAINER= mandree@FreeBSD.org COMMENT= Mind Mapping tool with Reference, Library, and PDF Management LICENSE= GPLv2 -BUILD_DEPENDS= update-mime-database:${PORTSDIR}/misc/shared-mime-info -RUN_DEPENDS= update-mime-database:${PORTSDIR}/misc/shared-mime-info - +USES= desktop-file-utils shared-mime-info USE_JAVA= yes -USE_GNOME= desktopfileutils JAVA_VENDOR= openjdk JAVA_VERSION= 1.6 NO_BUILD= yes JDATADIR= ${JAVASHAREDIR}/${PORTNAME} icon= ${DATADIR}/${PORTNAME}-icon48x48.png -WRKSRC= ${WRKDIR}/docear-1.0.0.15_rc_build213 +WRKSRC= ${WRKDIR}/docear-1.0.0.15_stable_build214 SUB_FILES= docear.desktop -NO_STAGE= yes post-patch: ${REINPLACE_CMD} -e 's/readlink -mn/readlink -n/g' \ -e 's,#!/bin/bash,#!/bin/sh,' \ @@ -42,22 +39,18 @@ do-install: # 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} ${JDATADIR} - (cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${JDATADIR}) + ${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' \ - >${PREFIX}/bin/${PORTNAME} - ${CHMOD} a=rx ${JDATADIR}/docear.sh \ - ${PREFIX}/bin/${PORTNAME} - ${MKDIR} ${DATADIR} - ${INSTALL_DATA} ${FILESDIR}/docear48.png "${icon}" - ${MKDIR} ${DESKTOPDIR} - ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${DESKTOPDIR} - ${MKDIR} ${PREFIX}/share/mime/packages - ${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.xml ${PREFIX}/share/mime/packages/ - -post-install: - -update-desktop-database > /dev/null - -update-mime-database ${PREFIX}/share/mime > /dev/null + >${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/ .include <bsd.port.mk> Modified: head/deskutils/docear/distinfo ============================================================================== --- head/deskutils/docear/distinfo Wed Oct 23 19:11:11 2013 (r331415) +++ head/deskutils/docear/distinfo Wed Oct 23 19:18:01 2013 (r331416) @@ -1,2 +1,2 @@ -SHA256 (docear-1.0.0.r4/docear_linux.tar.gz) = 050a60efa921b3b455971b2e58acaaca750f0811e7bc2f1af8bf27616a510175 -SIZE (docear-1.0.0.r4/docear_linux.tar.gz) = 56964953 +SHA256 (docear-1.0.0/docear_linux.tar.gz) = a56fc87174cb44e8a5b04db89973c1af7dfcd825d9f1019ae3b41dee0893c028 +SIZE (docear-1.0.0/docear_linux.tar.gz) = 56961890 Modified: head/deskutils/docear/pkg-plist ============================================================================== --- head/deskutils/docear/pkg-plist Wed Oct 23 19:11:11 2013 (r331415) +++ head/deskutils/docear/pkg-plist Wed Oct 23 19:18:01 2013 (r331416) @@ -3,8 +3,6 @@ bin/docear share/applications/docear.desktop share/docear/docear-icon48x48.png @dirrm share/docear -@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || : -@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime share/java/docear/core/org.freeplane.core/lib/commons-io-2.4.jar share/java/docear/core/org.freeplane.core/lib/commons-lang-2.0.jar share/java/docear/core/org.freeplane.core/lib/flamingo-6.3-javadoc.jar @@ -104,7 +102,6 @@ share/java/docear/docear.sh share/java/docear/docearConsole.exe share/java/docear/framework.jar share/java/docear/freeplanelauncher.jar -share/java/docear/gitinfo.txt share/java/docear/init.xargs share/java/docear/license.txt share/java/docear/plugins/org.docear.plugin.bibtex/lib/JabRef-2.7.1.jar @@ -195,7 +192,6 @@ share/java/docear/plugins/org.freeplane. share/java/docear/plugins/org.freeplane.plugin.workspace/lib/plugin.jar share/java/docear/plugins/org.freeplane.plugin.workspace/META-INF/MANIFEST.MF share/java/docear/props.xargs -share/java/docear/resources/gitinfo.properties share/java/docear/resources/ortho/dictionary_de.ortho share/java/docear/resources/ortho/dictionary_en.ortho share/java/docear/resources/ortho/dictionary_fr.ortho @@ -225,7 +221,8 @@ share/java/docear/scripts/apiGenerator.g share/java/docear/scripts/freeplane.dsld share/java/docear/scripts/installScriptAddOn.groovy share/mime/packages/docear.xml -share/mime/text/x-docear.xml +@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || : +@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime @dirrm share/java/docear/scripts @dirrm share/java/docear/resources/xslt @dirrm share/java/docear/resources/templates @@ -281,5 +278,3 @@ share/mime/text/x-docear.xml @dirrm share/java/docear/core/org.freeplane.core @dirrm share/java/docear/core @dirrm share/java/docear -@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || : -@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310231918.r9NJI1gi009379>