svn commit: r411835 - head/math/geogebra

[Dmitry Marakasov]

Author: amdmi3
Date: Fri Mar 25 12:34:46 2016
New Revision: 411835
URL: https://svnweb.freebsd.org/changeset/ports/411835

Log:
  - Update to 5.0.218.0 and add mirror, fixing fetch
  - Fix LICENSE
  - Simplify installation
  
  PR:		208249
  Submitted by:	udvzsolt at gmail.com (maintainer)

Modified:
  head/math/geogebra/Makefile
  head/math/geogebra/distinfo

Modified: head/math/geogebra/Makefile
==============================================================================
--- head/math/geogebra/Makefile	Fri Mar 25 11:42:13 2016	(r411834)
+++ head/math/geogebra/Makefile	Fri Mar 25 12:34:46 2016	(r411835)
@@ -2,9 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	geogebra
-PORTVERSION=	5.0.212.0
+PORTVERSION=	5.0.218.0
 CATEGORIES=	math java
-MASTER_SITES=	http://download.geogebra.org/installers/5.0/
+MASTER_SITES=	http://download.geogebra.org/installers/5.0/ \
+		http://freebsd.uzsolt.hu/src/
 DISTNAME=	GeoGebra-Linux-Portable-${PORTVERSION}
 
 MAINTAINER=	udvzsolt at gmail.com
@@ -12,8 +13,8 @@ COMMENT=	Dynamic software that joins geo
 
 LICENSE=	GEOGEBRA
 LICENSE_NAME=	GeoGebra Non-Commercial License Agreement
-LICENSE_TEXT=   See on http://www.geogebra.org/license
-LICENSE_PERMS=	dist-sell pkg-sell auto-accept
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
+LICENSE_PERMS=	dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept
 
 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
@@ -21,27 +22,28 @@ USE_LINUX?=	c6
 
 USE_LINUX_APPS=	xorglibs
 
-ONLY_FOR_ARCHS=i386 amd64
+ONLY_FOR_ARCHS=	i386 amd64
 
-SUB_FILES=  geogebra.desktop
-CONFLICTS=  math/geogebra-i18n-[0-9]*
+SUB_FILES=	geogebra.desktop
+CONFLICTS=	math/geogebra-i18n-[0-9]*
 NO_BUILD=	yes
 USES=		tar:bzip2 desktop-file-utils shared-mime-info shebangfix
 WRKSRC=		${WRKDIR}/${DISTNAME}
-FIND_JARS=	-type f -name "*.jar" -maxdepth 1 -print0
-JAVADIR=    jre1.7.0_45-i686
-SHEBANG_FILES=	geogebra-portable
+JAVADIR=	jre1.7.0_45-i686
+SHEBANG_FILES=	geogebra-portable geogebra/geogebra
+
+post-patch:
+	@${REINPLACE_CMD} -e 's,arch,/compat/linux/bin/arch,' ${WRKSRC}/geogebra-portable
 
 do-install:
-	cd ${WRKSRC} && ${MKDIR} ${STAGEDIR}${DATADIR}/${PORTNAME} && \
-    ${REINPLACE_CMD} -e 's,arch,/compat/linux/bin/arch,' ${WRKSRC}/geogebra-portable && \
-	${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} && \
-	${FIND} geogebra ${FIND_JARS} | ${XARGS} -0 -J % ${INSTALL_DATA} % ${STAGEDIR}${DATADIR}/${PORTNAME} && \
-    ${COPYTREE_SHARE} ${JAVADIR} ${STAGEDIR}${DATADIR} && \
-    ${INSTALL_PROGRAM} ${JAVADIR}/bin/java ${STAGEDIR}${DATADIR}/${JAVADIR}/bin && \
-	${MKDIR} ${STAGEDIR}${PREFIX}/share/mime/packages && \
+	@${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_DATA} ${WRKSRC}/geogebra/*.jar ${STAGEDIR}${DATADIR}/${PORTNAME}
+	cd ${WRKSRC} && ${COPYTREE_SHARE} ${JAVADIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/${JAVADIR}/bin/java ${STAGEDIR}${DATADIR}/${JAVADIR}/bin
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/mime/packages
 	${INSTALL_DATA} ${WRKDIR}/geogebra.desktop ${STAGEDIR}${DESKTOPDIR}
 
 .include <bsd.port.mk>

Modified: head/math/geogebra/distinfo
==============================================================================
--- head/math/geogebra/distinfo	Fri Mar 25 11:42:13 2016	(r411834)
+++ head/math/geogebra/distinfo	Fri Mar 25 12:34:46 2016	(r411835)
@@ -1,2 +1,2 @@
-SHA256 (GeoGebra-Linux-Portable-5.0.212.0.tar.bz2) = 388d27883d821ad0be7a534effbe1281e8775d84cbe5c6626e4d345b63494109
-SIZE (GeoGebra-Linux-Portable-5.0.212.0.tar.bz2) = 100702015
+SHA256 (GeoGebra-Linux-Portable-5.0.218.0.tar.bz2) = a377f4fa859764c9bf7ffb6ada45eda9501bc2e1a3cdb909ea59dab9bf1464ac
+SIZE (GeoGebra-Linux-Portable-5.0.218.0.tar.bz2) = 100754642