Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 28 Apr 2016 08:41:38 +0000 (UTC)
From:      Kurt Jaeger <pi@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r414161 - in head/math/geogebra: . files
Message-ID:  <201604280841.u3S8fcXo048955@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pi
Date: Thu Apr 28 08:41:38 2016
New Revision: 414161
URL: https://svnweb.freebsd.org/changeset/ports/414161

Log:
  math/geogebra: 5.0.226.0 -> 5.0.231.0
  
  - replace the general scripts so we do not need shell/bash
  - pkg-message about linprocfs requirement
  
  PR:		209105
  Submitted by:	Zsolt Udvari <udvzsolt@gmail.com> (maintainer)

Added:
  head/math/geogebra/files/geogebra.sh.in   (contents, props changed)
  head/math/geogebra/pkg-message   (contents, props changed)
Modified:
  head/math/geogebra/Makefile
  head/math/geogebra/distinfo
  head/math/geogebra/pkg-plist

Modified: head/math/geogebra/Makefile
==============================================================================
--- head/math/geogebra/Makefile	Thu Apr 28 07:28:10 2016	(r414160)
+++ head/math/geogebra/Makefile	Thu Apr 28 08:41:38 2016	(r414161)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	geogebra
-PORTVERSION=	5.0.226.0
+PORTVERSION=	5.0.231.0
 CATEGORIES=	math java
 MASTER_SITES=	http://download.geogebra.org/installers/5.0/ \
 		http://freebsd.uzsolt.hu/src/
@@ -16,8 +16,6 @@ LICENSE_NAME=	GeoGebra Non-Commercial Li
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 LICENSE_PERMS=	dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept
 
-RUN_DEPENDS=	bash:shells/bash
-
 USE_LINUX?=	c6
 
 USE_LINUX_APPS=	xorglibs
@@ -32,14 +30,15 @@ WRKSRC=		${WRKDIR}/${DISTNAME}
 JAVADIR=	jre1.7.0_45-i686
 SHEBANG_FILES=	geogebra-portable geogebra/geogebra
 
+SUB_FILES=	geogebra.desktop geogebra.sh
+SUB_LIST=	JAVADIR=${DATADIR}/${JAVADIR}
+
 post-patch:
 	@${REINPLACE_CMD} -e 's,arch,/compat/linux/bin/arch,' ${WRKSRC}/geogebra-portable
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/${PORTNAME}
-	${INSTALL_SCRIPT} ${WRKSRC}/geogebra/geogebra ${STAGEDIR}${DATADIR}/${PORTNAME}/geogebra
-	${INSTALL_SCRIPT} ${WRKSRC}/geogebra-portable ${STAGEDIR}${DATADIR}
-	${LN} -s ${DATADIR}/geogebra-portable ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+	${INSTALL_SCRIPT} ${WRKDIR}/geogebra.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/geogebra/*.jar ${STAGEDIR}${DATADIR}/${PORTNAME}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} ${JAVADIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/${JAVADIR}/bin/java ${STAGEDIR}${DATADIR}/${JAVADIR}/bin

Modified: head/math/geogebra/distinfo
==============================================================================
--- head/math/geogebra/distinfo	Thu Apr 28 07:28:10 2016	(r414160)
+++ head/math/geogebra/distinfo	Thu Apr 28 08:41:38 2016	(r414161)
@@ -1,2 +1,2 @@
-SHA256 (GeoGebra-Linux-Portable-5.0.226.0.tar.bz2) = b03184633bc440a7495559d3394ab594785c321c7d5ae7c197dd7e265eb44bca
-SIZE (GeoGebra-Linux-Portable-5.0.226.0.tar.bz2) = 100730252
+SHA256 (GeoGebra-Linux-Portable-5.0.231.0.tar.bz2) = e3e1db941bd45ee3c34916bfd7943b6869393ea133f5a95a477896450b197c57
+SIZE (GeoGebra-Linux-Portable-5.0.231.0.tar.bz2) = 100748960

Added: head/math/geogebra/files/geogebra.sh.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/geogebra/files/geogebra.sh.in	Thu Apr 28 08:41:38 2016	(r414161)
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+JAVACMD=%%JAVADIR%%/bin/java
+GG_XMS="32m"
+GG_XMX="1024m"
+GG_SETTINGS_FILE="${HOME}/.config/geogebra/geogebra.properties"
+CLASS=org.geogebra.desktop.GeoGebra3D
+
+JAVA_OPTS="-Xms${GG_XMS} -Xmx${GG_XMX} -Dawt.useSystemAAFontSettings=on"
+
+exec ${JAVACMD} ${JAVA_OPTS} \
+  -cp %%DATADIR%%/geogebra/geogebra.jar \
+  "-Xbootclasspath/a:${JFXRT}" \
+  ${CLASS} \
+  --versionCheckAllow=false --settingsFile=${GG_SETTINGS_FILE} \
+  --logLevel=WARN \
+  $*
+

Added: head/math/geogebra/pkg-message
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/geogebra/pkg-message	Thu Apr 28 08:41:38 2016	(r414161)
@@ -0,0 +1,4 @@
+For proper work you should mount linproc filesystem into /proc or
+/compat/linux/proc.
+
+See more on linprocfs(5).

Modified: head/math/geogebra/pkg-plist
==============================================================================
--- head/math/geogebra/pkg-plist	Thu Apr 28 07:28:10 2016	(r414160)
+++ head/math/geogebra/pkg-plist	Thu Apr 28 08:41:38 2016	(r414161)
@@ -1,8 +1,6 @@
 bin/geogebra
 share/applications/geogebra.desktop
-%%DATADIR%%/geogebra-portable
 %%DATADIR%%/geogebra/OpenGeoProver.jar
-%%DATADIR%%/geogebra/geogebra
 %%DATADIR%%/geogebra/geogebra.jar
 %%DATADIR%%/geogebra/geogebra_3d.jar
 %%DATADIR%%/geogebra/geogebra_algos.jar



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604280841.u3S8fcXo048955>