Skip to content

Commit

Permalink
- Update to 4.2.13.0
Browse files Browse the repository at this point in the history
- Add files/patch-geogebra.desktop
- New download site
- Add shells/bash to RUN_DEPENDS
- Remove post-patch target
- Fix format of pkg-descr


git-svn-id: svn+ssh://svn.freebsd.org/ports/head@309963 aed309b6-a8cd-e111-996c-001c23d10e55
  • Loading branch information
nivit committed Jan 5, 2013
1 parent cda9106 commit feb4297
Show file tree
Hide file tree
Showing 6 changed files with 68 additions and 72 deletions.
25 changes: 10 additions & 15 deletions math/geogebra-i18n/Makefile
@@ -1,18 +1,19 @@
# Created by: Nicola Vitale <nivit@email.it>
# $FreeBSD$

PORTNAME= geogebra-i18n
DISTVERSION= 3-2-47-0
PORTREVISION= 0
PORTNAME= geogebra
PORTVERSION= 4.2.13.0
#PORTREVISION= 0
CATEGORIES= math java
MASTER_SITES= http://nivi.interfree.it/distfiles/${PORTNAME}/
#PKGNAMESUFFIX= -i18n
DISTNAME= GeoGebra-FreeBSD-Installer-${DISTVERSION}
MASTER_SITES= GOOGLE_CODE
PKGNAMESUFFIX= -i18n
DISTNAME= GeoGebra-Unixlike-Installer-${PORTVERSION}

MAINTAINER= nivit@FreeBSD.org
COMMENT= Dynamic software that joins geometry, algebra, and calculus

RUN_DEPENDS= ${LOCALBASE}/bin/update-mime-database:${PORTSDIR}/misc/shared-mime-info
RUN_DEPENDS= bash:${PORTSDIR}/shells/bash \
${LOCALBASE}/bin/update-mime-database:${PORTSDIR}/misc/shared-mime-info

DATADIR= ${JAVASHAREDIR}/${PORTNAME}

Expand All @@ -22,24 +23,18 @@ JAVA_VERSION= 1.6+

NO_BUILD= yes

USE_DOS2UNIX= geogebra geogebra.desktop
USE_GNOME= desktopfileutils
USE_JAVA= yes

WRKSRC= ${WRKDIR}/geogebra-${PORTVERSION}

FIND_JARS= -type f -name "*.jar" -maxdepth 1 -print0

JARFILE= ${PORTNAME:S,-i18n,,}.jar

post-patch:
${REINPLACE_CMD} -e 's,%%DATADIR%%,${DATADIR},g' ${WRKSRC}/${PORTNAME:S,-i18n,,}

do-install:
${INSTALL_SCRIPT} ${WRKSRC}/geogebra ${PREFIX}/bin/
cd ${WRKSRC} && ${MKDIR} ${DATADIR} && \
${INSTALL_SCRIPT} ${WRKSRC}/geogebra ${DATADIR} && \
${LN} -s ${DATADIR}/${PORTNAME} ${PREFIX}/bin/${PORTNAME} && \
${FIND} . ${FIND_JARS} | ${XARGS} -0 -J % ${INSTALL_DATA} % ${DATADIR} && \
${COPYTREE_SHARE} unsigned ${DATADIR} && \
${COPYTREE_SHARE} icons ${PREFIX}/share && \
${MKDIR} ${PREFIX}/share/mime/packages && \
${MKDIR} ${PREFIX}/share/applications && \
Expand Down
4 changes: 2 additions & 2 deletions math/geogebra-i18n/distinfo
@@ -1,2 +1,2 @@
SHA256 (GeoGebra-FreeBSD-Installer-3-2-47-0.tar.gz) = 88f32d575ac07756766b163514a6f3eeb8d74667c0edbe10659e32352dd00575
SIZE (GeoGebra-FreeBSD-Installer-3-2-47-0.tar.gz) = 7706759
SHA256 (GeoGebra-Unixlike-Installer-4.2.13.0.tar.gz) = e06148485d4dc15169210b548f682d448feac0ce4b748a381843c6a20e53fa3f
SIZE (GeoGebra-Unixlike-Installer-4.2.13.0.tar.gz) = 9103015
71 changes: 33 additions & 38 deletions math/geogebra-i18n/files/patch-geogebra
@@ -1,38 +1,33 @@
$FreeBSD$
--- ./geogebra.orig 2011-08-12 11:30:50.000000000 +0200
+++ ./geogebra 2011-08-12 11:31:39.000000000 +0200
@@ -34,7 +34,7 @@
--help | --hel | --he | --h )
func_usage; exit 0 ;;
esac
- if [ $(expr match "$i" '.*-Xm') -ne 0 ]; then
+ if [ $(expr -- "$i" : '.*-Xm') -ne 0 ]; then
if [ -z "$JAVA_OPTS" ]; then
JAVA_OPTS="$i"
else
@@ -42,7 +42,7 @@
fi
shift $((1))
else
- if [ $(expr match "$i" '.*--') -ne 0 ]; then
+ if [ $(expr -- "$i" : '.*--') -ne 0 ]; then
if [ -z "$GG_OPTS" ]; then
GG_OPTS="$i"
else
@@ -54,13 +54,13 @@
done

# if memory not set, change to GeoGebra defaults
-if [ $(expr match "$JAVA_OPTS" ".*-Xmx") -eq 0 ]; then
+if [ $(expr -- "$JAVA_OPTS" : ".*-Xmx") -eq 0 ]; then
JAVA_OPTS="$JAVA_OPTS -Xmx512m"
fi

-if [ $(expr match "$JAVA_OPTS" ".*-Xms") -eq 0 ]; then
+if [ $(expr -- "$JAVA_OPTS" : ".*-Xms") -eq 0 ]; then
JAVA_OPTS="$JAVA_OPTS -Xms32m"
fi

# run
-exec $JAVACMD $JAVA_OPTS -jar /usr/share/geogebra/geogebra.jar $GG_OPTS "$@"
+exec $JAVACMD $JAVA_OPTS -jar %%DATADIR%%/geogebra.jar $GG_OPTS "$@"
--- ./geogebra.orig 2012-10-07 13:54:43.000000000 +0200
+++ ./geogebra 2012-10-07 13:56:32.000000000 +0200
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#---------------------------------------------
# Script to start GeoGebra
#---------------------------------------------
@@ -184,19 +184,19 @@
--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 ]; 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" '.*-JavaCMD') -ne 0 ]; then
+ elif [ $(expr -- "$i" : '.*-JavaCMD') -ne 0 ]; then
JAVACMD=${i:9}
shift $((1))
fi
9 changes: 9 additions & 0 deletions math/geogebra-i18n/files/patch-geogebra.desktop
@@ -0,0 +1,9 @@
--- ./geogebra.desktop.orig 2012-10-07 14:22:36.000000000 +0200
+++ ./geogebra.desktop 2012-10-07 14:22:43.000000000 +0200
@@ -27,5 +27,5 @@
Type=Application
StartupNotify=true
StartupWMClass=geogebra-GeoGebra
-Categories=Education;Math;
+Categories=Education;Math;Science;
MimeType=application/vnd.geogebra.file;application/vnd.geogebra.tool;
3 changes: 1 addition & 2 deletions math/geogebra-i18n/pkg-descr
Expand Up @@ -12,5 +12,4 @@ and offers commands like Root or Extremum.
GeoGebra received several international awards including the European
and German educational software award.

Author: Markus Hohenwarter <Markus.Hohenwarter@sbg.ac.at>
WWW: http://www.geogebra.at/
WWW: http://www.geogebra.at/
28 changes: 13 additions & 15 deletions math/geogebra-i18n/pkg-plist
Expand Up @@ -40,22 +40,20 @@ share/icons/hicolor/96x96/mimetypes/application-vnd.geogebra.tool.png
share/icons/hicolor/scalable/apps/geogebra.svgz
share/icons/hicolor/scalable/mimetypes/application-vnd.geogebra.file.svgz
share/icons/hicolor/scalable/mimetypes/application-vnd.geogebra.tool.svgz
share/java/geogebra-i18n/geogebra.jar
share/java/geogebra-i18n/geogebra_cas.jar
share/java/geogebra-i18n/geogebra_export.jar
share/java/geogebra-i18n/geogebra_gui.jar
share/java/geogebra-i18n/geogebra_main.jar
share/java/geogebra-i18n/geogebra_properties.jar
share/java/geogebra-i18n/unsigned/geogebra.jar
share/java/geogebra-i18n/unsigned/geogebra_cas.jar
share/java/geogebra-i18n/unsigned/geogebra_export.jar
share/java/geogebra-i18n/unsigned/geogebra_gui.jar
share/java/geogebra-i18n/unsigned/geogebra_main.jar
share/java/geogebra-i18n/unsigned/geogebra_properties.jar
share/java/geogebra-i18n/unsigned/number_of_degs_in_straight_angle.ggb
%%DATADIR%%/geogebra
%%DATADIR%%/geogebra.jar
%%DATADIR%%/geogebra_algos.jar
%%DATADIR%%/geogebra_cas.jar
%%DATADIR%%/geogebra_export.jar
%%DATADIR%%/geogebra_gui.jar
%%DATADIR%%/geogebra_javascript.jar
%%DATADIR%%/geogebra_main.jar
%%DATADIR%%/geogebra_properties.jar
%%DATADIR%%/jlatexmath.jar
%%DATADIR%%/jlm_cyrillic.jar
%%DATADIR%%/jlm_greek.jar
share/mime/packages/geogebra.xml
@dirrm share/java/geogebra-i18n/unsigned
@dirrm share/java/geogebra-i18n
@dirrm %%DATADIR%%
@exec %%LOCALBASE%%/bin/update-desktop-database || /usr/bin/true
@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime || /usr/bin/true
@unexec %%LOCALBASE%%/bin/update-desktop-database || /usr/bin/true
Expand Down

0 comments on commit feb4297

Please sign in to comment.