From owner-svn-ports-head@FreeBSD.ORG Sun Apr 21 20:05:29 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 6A185AE7; Sun, 21 Apr 2013 20:05:29 +0000 (UTC) (envelope-from nivit@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 5C7921117; Sun, 21 Apr 2013 20:05:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3LK5T2K030301; Sun, 21 Apr 2013 20:05:29 GMT (envelope-from nivit@svn.freebsd.org) Received: (from nivit@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3LK5TVw030300; Sun, 21 Apr 2013 20:05:29 GMT (envelope-from nivit@svn.freebsd.org) Message-Id: <201304212005.r3LK5TVw030300@svn.freebsd.org> From: Nicola Vitale Date: Sun, 21 Apr 2013 20:05:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r316213 - head/math/geogebra-i18n/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Apr 2013 20:05:29 -0000 Author: nivit Date: Sun Apr 21 20:05:28 2013 New Revision: 316213 URL: http://svnweb.freebsd.org/changeset/ports/316213 Log: - Update to 4.2.31.0 - Add LICENSE (GeoGebra Non-Commercial License Agreement) - USES desktop-file-utils, shared-mime-info - Remove files/patch-geogebra.desktop - Update WWW URL in pkg-descr Feature safe: yes Deleted: head/math/geogebra-i18n/files/patch-geogebra.desktop Modified: head/math/geogebra-i18n/files/patch-geogebra Modified: head/math/geogebra-i18n/files/patch-geogebra ============================================================================== --- head/math/geogebra-i18n/files/patch-geogebra Sun Apr 21 20:04:58 2013 (r316212) +++ head/math/geogebra-i18n/files/patch-geogebra Sun Apr 21 20:05:28 2013 (r316213) @@ -1,33 +1,63 @@ ---- ./geogebra.orig 2012-10-07 13:54:43.000000000 +0200 -+++ ./geogebra 2012-10-07 13:56:32.000000000 +0200 +--- ./geogebra.orig 2013-04-21 14:18:22.000000000 +0200 ++++ ./geogebra 2013-04-21 14:19:26.000000000 +0200 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash #--------------------------------------------- # Script to start GeoGebra #--------------------------------------------- -@@ -184,19 +184,19 @@ +@@ -330,42 +330,42 @@ --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)) +- 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 ++ 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 ++ 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 +- 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 +- 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