cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to geogebra-4.2.60.0.

Browse Source
This commit is contained in:
ajacoutot 2013-12-20 07:58:09 +00:00
parent aa6c8be85e
commit aae9a5a103
6 changed files with 182 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
math/geogebra/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.3 2013/08/07 21:32:10 naddy Exp $
# $OpenBSD: Makefile,v 1.4 2013/12/20 07:58:09 ajacoutot Exp $
COMMENT= educational mathematical software
V= 4.0.38.0
V= 4.2.60.0
DISTNAME= GeoGebra-Unixlike-Installer-${V}
PKGNAME= geogebra-${V}
@ -10,11 +10,14 @@ CATEGORIES= math java
HOMEPAGE= http://www.geogebra.org
# GeoGebra Source: GPLv3
# Language Files and Documentation:
# Creative Commons Attribution-Share Alike 3.0
# Apache Software License
# GPLv3, LGPLv3, BSD, Public Domain
# GeoGebra Non-Commercial License
# Creative Commons Attribution-Share Alike 3.0
# See: http://www.geogebra.org/download/license.txt
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_CDROM= No
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILE_FTP= Yes
MASTER_SITES= https://geogebra.googlecode.com/files/

4
math/geogebra/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (GeoGebra-Unixlike-Installer-4.0.38.0.tar.gz) = jvWKF8/Wb/ntGK+iJzj2aY4N9cd02bCaCfutC7RLOmM=
SIZE (GeoGebra-Unixlike-Installer-4.0.38.0.tar.gz) = 14868843
SHA256 (GeoGebra-Unixlike-Installer-4.2.60.0.tar.gz) = FCOi3Br0DGfFzVF/J1zaupftja+sK/FPwcruNJdVA7k=
SIZE (GeoGebra-Unixlike-Installer-4.2.60.0.tar.gz) = 9328026

168
math/geogebra/patches/patch-geogebra Normal file
View File

@ -0,0 +1,168 @@
$OpenBSD: patch-geogebra,v 1.1 2013/12/20 07:58:09 ajacoutot Exp $
--- geogebra.orig Fri Oct 4 16:11:17 2013
+++ geogebra Fri Dec 20 08:55:47 2013
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
#---------------------------------------------
# Script to start GeoGebra
#---------------------------------------------
@@ -9,7 +9,7 @@
# GG_SCRIPTNAME=<name of originally called script to start GeoGebra> # If unset, name of this script will be used.
#
# GG_PATH=<path of directory containing geogebra.jar> # If unset, path of this script will be used.
-# In this case if the path of script does not contain the geogebra.jar file, /usr/share/geogebra will be used.
+# In this case if the path of script does not contain the geogebra.jar file, ${TRUEPREFIX}/share/geogebra will be used.
#
# GG_SYS_CONFIG_PATH=<path of system directory containing geogebra.conf>
#
@@ -19,7 +19,7 @@
#
# GG_XMS=<initial Java heap size> # If unset, 32m will be used.
#
-# GG_XMX=<maximum Java heap size> # If unset, 1024m will be used.
+# GG_XMX=<maximum Java heap size> # If unset, 256m will be used.
#
# GG_DJAVA_LIBRARY_PATH=<native library path>
#
@@ -45,19 +45,7 @@ fi
#---------------------------------------------
# If $GG_PATH not set, use path of this script.
-if [ -z "$GG_PATH" ]; then
- GG_PATH="${BASH_SOURCE[0]}"
- if [ -h "${GG_PATH}" ]; then
- while [ -h "${GG_PATH}" ]; do
- GG_PATH=`readlink "${GG_PATH}"`
- done
- fi
- pushd . > /dev/null
- cd `dirname ${GG_PATH}` > /dev/null
- GG_PATH=`pwd`
- popd > /dev/null
- test -r "${GG_PATH}/geogebra_main.jar" || GG_PATH='/usr/share/geogebra'
-fi
+GG_PATH='${TRUEPREFIX}/share/geogebra'
#---------------------------------------------
# If $GG_CONFIG_PATH not set, use $HOME.
@@ -70,7 +58,7 @@ fi
# If $JAVACMD not set, use java.
if [ -z "$JAVACMD" ]; then
- JAVACMD='java'
+ JAVACMD=`javaPathHelper -c geogebra`
fi
#---------------------------------------------
@@ -81,10 +69,10 @@ if [ -z "$GG_XMS" ]; then
fi
#---------------------------------------------
-# If $GG_XMX not set, use 1024m.
+# If $GG_XMX not set, use 256m.
if [ -z "$GG_XMX" ]; then
- GG_XMX='1024m'
+ GG_XMX='256m'
fi
#---------------------------------------------
@@ -193,7 +181,7 @@ if [ -w "$GG_CONFIG_FILE" ]; then
#
`if [ ! -n "$DEFAULT_GG_XMS" ]; then echo "#DEFAULT_GG_XMS='$GG_XMS'"; else echo "DEFAULT_GG_XMS='$DEFAULT_GG_XMS'"; fi`
-# Set maximum Java heap size, e.g '512m'.
+# Set maximum Java heap size, e.g '256m'.
#
`if [ ! -n "$DEFAULT_GG_XMX" ]; then echo "#DEFAULT_GG_XMX='$GG_XMX'"; else echo "DEFAULT_GG_XMX='$DEFAULT_GG_XMX'"; fi`
@@ -282,7 +270,7 @@ fi
#---------------------------------------------
# Define usage function.
-function func_usage()
+func_usage()
{
cat << _USAGE
Usage: $GG_SCRIPTNAME [Java-options] [GeoGebra-options] [FILE]
@@ -324,48 +312,48 @@ _USAGE
#---------------------------------------------
# Check for option --help and pass Java options to Java, others to GeoGebra.
-GG_OPTS=()
+GG_OPTS=""
for i in "$@"; do
case "$i" in
--help | --hel | --he | --h )
func_usage; exit 0 ;;
esac
- if [ $(expr match "$i" '.*--') -ne 0 ]; then
- if [ $(expr match "$i" '.*--showSplash=') -ne 0 ]; then
+ if [ $(expr -- "$i" : '.*--') -ne 0 ]; then
+ if [ $(expr -- "$i" : '.*--showSplash=') -ne 0 ]; then
GG_SHOWSPLASH=${i:13}
shift $((1))
- elif [ $(expr match "$i" '.*--enableUndo=') -ne 0 ]; then
+ elif [ $(expr -- "$i" : '.*--enableUndo=') -ne 0 ]; then
GG_ENABLEUNDO=${i:13}
shift $((1))
- elif [ $(expr match "$i" '.*--antiAliasing=') -ne 0 ]; then
+ elif [ $(expr -- "$i" : '.*--antiAliasing=') -ne 0 ]; then
GG_ANTIALIASING=${i:15}
shift $((1))
- elif [ $(expr match "$i" '.*--versionCheckAllow=') -ne 0 ]; then
+ elif [ $(expr -- "$i" : '.*--versionCheckAllow=') -ne 0 ]; then
GG_VERSIONCHECKALLOW=${i:20}
shift $((1))
- elif [ $(expr match "$i" '.*--settingsfile=') -ne 0 ]; then
+ elif [ $(expr -- "$i" : '.*--settingsfile=') -ne 0 ]; then
GG_SETTINGS_FILE=${i:15}
shift $((1))
else
GG_OPTS[${#GG_OPTS[*]}]="$i"
shift $((1))
fi
- elif [ $(expr match "$i" '.*-Xms') -ne 0 ]; then
+ elif [ $(expr -- "$i" : '.*-Xms') -ne 0 ]; then
GG_XMS=${i:4}
shift $((1))
- elif [ $(expr match "$i" '.*-Xmx') -ne 0 ]; then
+ elif [ $(expr -- "$i" : '.*-Xmx') -ne 0 ]; then
GG_XMX=${i:4}
shift $((1))
- elif [ $(expr match "$i" '.*-Djava.library.path=') -ne 0 ]; then
+ elif [ $(expr -- "$i" : '.*-Djava.library.path=') -ne 0 ]; then
GG_DJAVA_LIBRARY_PATH=${i:20}
shift $((1))
- elif [ $(expr match "$i" '.*-Dsun.java2d.xrender=') -ne 0 ]; then
+ elif [ $(expr -- "$i" : '.*-Dsun.java2d.xrender=') -ne 0 ]; then
GG_DSUN_JAVA2D_XRENDER=${i:21}
shift $((1))
- elif [ $(expr match "$i" '.*-Dsun.java2d.opengl=') -ne 0 ]; then
+ elif [ $(expr -- "$i" : '.*-Dsun.java2d.opengl=') -ne 0 ]; then
GG_DSUN_JAVA2D_OPENGL=${i:20}
shift $((1))
- elif [ $(expr match "$i" '.*-JavaCMD=') -ne 0 ]; then
+ elif [ $(expr -- "$i" : '.*-JavaCMD=') -ne 0 ]; then
JAVACMD=${i:9}
shift $((1))
fi
@@ -381,9 +369,9 @@ if [ -n "$GG_VERSIONCHECKALLOW" ]; then
GG_OPTS[${#GG_OPTS[*]}]="--versionCheckAllow=$GG_VERSIONCHECKALLOW"
fi
GG_OPTS[${#GG_OPTS[*]}]="--settingsfile=$GG_SETTINGS_FILE"
-JAVA_OPTS=("-Xms$GG_XMS" "-Xmx$GG_XMX")
+JAVA_OPTS="-Xms$GG_XMS -Xmx$GG_XMX"
if [ -n "$GG_DJAVA_LIBRARY_PATH" ]; then
- JAVA_OPTS[${#JAVA_OPTS[*]}]="-Djava.library.path=$GG_DJAVA_LIBRARY_PATH"
+ JAVA_OPTS="-Djava.library.path=$GG_DJAVA_LIBRARY_PATH"
fi
if [ -n "$GG_DSUN_JAVA2D_XRENDER" ]; then
JAVA_OPTS[${#JAVA_OPTS[*]}]="-Dsun.java2d.xrender=$GG_DSUN_JAVA2D_XRENDER"
@@ -395,4 +383,4 @@ fi
#---------------------------------------------
# Run
-exec "$JAVACMD" "${JAVA_OPTS[@]}" -jar "$GG_PATH/geogebra.jar" "${GG_OPTS[@]}" "$@"
+exec $JAVACMD ${JAVA_OPTS[@]} -jar $GG_PATH/geogebra.jar ${GG_OPTS[@]} $@

99
math/geogebra/patches/patch-geogebra-4_0_38_0_geogebra
View File

@ -1,99 +0,0 @@
$OpenBSD: patch-geogebra-4_0_38_0_geogebra,v 1.1.1.1 2012/08/21 07:18:17 ajacoutot Exp $
--- geogebra.orig Sat Jul 14 10:33:41 2012
+++ geogebra Mon Aug 20 12:33:10 2012
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
#---------------------------------------------
# Script to start GeoGebra
#---------------------------------------------
@@ -9,13 +9,13 @@
# GG_SCRIPTNAME=<name of originally called script to start GeoGebra> # If unset, name of this script will be used
#
# GG_PATH=<path of directory containing geogebra.jar> # If unset, path of this script will be used.
-# In this case if the path of script does not contain the geogebra.jar file, /usr/share/geogebra will be used.
+# In this case if the path of script does not contain the geogebra.jar file, ${TRUEPREFIX}/share/geogebra will be used.
#
# JAVACMD=<Java command> # If unset, java will be used
#
# GG_XMS=<initial Java heap size> # If unset, 32m will be used.
#
-# GG_XMX=<maximum Java heap size> # If unset, 512m will be used.
+# GG_XMX=<maximum Java heap size> # If unset, 256m will be used.
#
# GG_DJAVA_LIBRARY_PATH=<native library path>
@@ -34,24 +34,23 @@ if [ -z "$GG_XMS" ]; then
fi
#---------------------------------------------
-# If GG_XMX not set, set to 512m
+# If GG_XMX not set, set to 256m
if [ -z "$GG_XMX" ]; then
- GG_XMX='512m'
+ GG_XMX='256m'
fi
#---------------------------------------------
# Set Java default options
-JAVA_OPTS=("-Xms$GG_XMS" "-Xmx$GG_XMX")
if [ -n "$GG_DJAVA_LIBRARY_PATH" ]; then
- JAVA_OPTS[${#JAVA_OPTS[*]}]="-Djava.library.path=$GG_DJAVA_LIBRARY_PATH"
+ JAVA_OPTS="-Djava.library.path=$GG_DJAVA_LIBRARY_PATH"
fi
#---------------------------------------------
# Set GeoGebra default options
-GG_OPTS=()
+GG_OPTS=""
#---------------------------------------------
# Define usage function
@@ -93,7 +92,7 @@ _USAGE
# If JAVACMD not set, use java
if [ -z "$JAVACMD" ]; then
- JAVACMD='java'
+ JAVACMD=`javaPathHelper -c geogebra`
fi
#---------------------------------------------
@@ -104,10 +103,10 @@ for i in "$@"; do
--help | --hel | --he | --h )
func_usage; exit 0 ;;
esac
- if [ $(expr match "$i" '.*--') -ne 0 ]; then
+ if [ $(expr -- "$i" : '.*--') -ne 0 ]; then
GG_OPTS[${#GG_OPTS[*]}]="$i"
shift $((1))
- elif [ $(expr match "$i" '.*-Xms') -ne 0 -o $(expr match "$i" '.*-Xmx') -ne 0 -o $(expr match "$i" '.*-Djava.library.path') -ne 0 ]; then
+ elif [ $(expr -- "$i" : '.*-Xms') -ne 0 -o $(expr -- "$i" : '.*-Xmx') -ne 0 -o $(expr -- "$i" : '.*-Djava.library.path') -ne 0 ]; then
JAVA_OPTS[${#JAVA_OPTS[*]}]="$i"
shift $((1))
fi
@@ -117,20 +116,10 @@ done
# If GG_PATH not set, use path of this script
if [ -z "$GG_PATH" ]; then
- GG_PATH="${BASH_SOURCE[0]}"
- if [ -h "${GG_PATH}" ]; then
- while [ -h "${GG_PATH}" ]; do
- GG_PATH=`readlink "${GG_PATH}"`
- done
- fi
- pushd . > /dev/null
- cd `dirname ${GG_PATH}` > /dev/null
- GG_PATH=`pwd`
- popd > /dev/null
- test -r "${GG_PATH}/geogebra.jar" || GG_PATH='/usr/share/geogebra'
+ GG_PATH='${TRUEPREFIX}/share/geogebra'
fi
#---------------------------------------------
# Run
-exec "$JAVACMD" "${JAVA_OPTS[@]}" -jar "$GG_PATH/geogebra.jar" "${GG_OPTS[@]}" "$@"
+exec "$JAVACMD" "-Xms$GG_XMS" "-Xmx$GG_XMX" "${JAVA_OPTS[@]}" -jar "$GG_PATH/geogebra.jar" "${GG_OPTS[@]}" "$@"

5
math/geogebra/pkg/DESCR
View File

@ -1,3 +1,2 @@
GeoGebra is free and multi-platform dynamic mathematics software for
learning and teaching. It has received several educational software
awards in Europe and the USA.
GeoGebra is a dynamic mathematics & science for learning and teaching
from elementary school to university level.

14
math/geogebra/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2012/08/21 07:18:17 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.2 2013/12/20 07:58:09 ajacoutot Exp $
bin/geogebra
share/applications/geogebra.desktop
share/geogebra/
@ -13,18 +13,6 @@ share/geogebra/geogebra_properties.jar
share/geogebra/jlatexmath.jar
share/geogebra/jlm_cyrillic.jar
share/geogebra/jlm_greek.jar
share/geogebra/unsigned/
share/geogebra/unsigned/geogebra.jar
share/geogebra/unsigned/geogebra_algos.jar
share/geogebra/unsigned/geogebra_cas.jar
share/geogebra/unsigned/geogebra_export.jar
share/geogebra/unsigned/geogebra_gui.jar
share/geogebra/unsigned/geogebra_javascript.jar
share/geogebra/unsigned/geogebra_main.jar
share/geogebra/unsigned/geogebra_properties.jar
share/geogebra/unsigned/jlatexmath.jar
share/geogebra/unsigned/jlm_cyrillic.jar
share/geogebra/unsigned/jlm_greek.jar
share/icons/hicolor/128x128/apps/geogebra.png
share/icons/hicolor/128x128/mimetypes/application-vnd.geogebra.file.png
share/icons/hicolor/128x128/mimetypes/application-vnd.geogebra.tool.png