Date: Sun, 31 Aug 2014 12:55:19 +0000 (UTC) From: Olli Hauer <ohauer@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r366749 - in head: french/geonext german/geonext math/geonext math/geonext/files Message-ID: <201408311255.s7VCtJrL023170@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ohauer Date: Sun Aug 31 12:55:19 2014 New Revision: 366749 URL: http://svnweb.freebsd.org/changeset/ports/366749 QAT: https://qat.redports.org/buildarchive/r366749/ Log: - update to 1.74 - add stage support - add licence - rework MASTER / SLAVE ports - slave depends now on MASTER port - install only a dedicated start script PR: 190154 Submitted by: ohauer Approved by: maintainer timeout Added: head/math/geonext/files/ head/math/geonext/files/geonext.in (contents, props changed) Modified: head/french/geonext/Makefile head/german/geonext/Makefile head/math/geonext/Makefile head/math/geonext/distinfo head/math/geonext/pkg-plist Modified: head/french/geonext/Makefile ============================================================================== --- head/french/geonext/Makefile Sun Aug 31 12:43:31 2014 (r366748) +++ head/french/geonext/Makefile Sun Aug 31 12:55:19 2014 (r366749) @@ -1,14 +1,14 @@ # Created by: Andreas Fehlner (fehlner@gmx.de) # $FreeBSD$ -PORTREVISION= 1 CATEGORIES= french MAINTAINER= ports@FreeBSD.org COMMENT= Interactive (dynamic) elementary Geometry Software +RUN_DEPENDS= geonext>=0:${PORTSDIR}/math/geonext + WITH_LANG= fr MASTERDIR= ${.CURDIR}/../../math/geonext -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/german/geonext/Makefile ============================================================================== --- head/german/geonext/Makefile Sun Aug 31 12:43:31 2014 (r366748) +++ head/german/geonext/Makefile Sun Aug 31 12:55:19 2014 (r366749) @@ -1,14 +1,14 @@ # Created by: Andreas Fehlner (fehlner@gmx.de) # $FreeBSD$ -PORTREVISION= 1 CATEGORIES= german MAINTAINER= ports@FreeBSD.org COMMENT= Interactive (dynamic) elementary Geometry Software +RUN_DEPENDS= geonext>=0:${PORTSDIR}/math/geonext + WITH_LANG= de MASTERDIR= ${.CURDIR}/../../math/geonext -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/math/geonext/Makefile ============================================================================== --- head/math/geonext/Makefile Sun Aug 31 12:43:31 2014 (r366748) +++ head/math/geonext/Makefile Sun Aug 31 12:55:19 2014 (r366749) @@ -2,46 +2,56 @@ # $FreeBSD$ PORTNAME= geonext -PORTVERSION= 1.71 +PORTVERSION= 1.74 CATEGORIES+= math graphics java -MASTER_SITES= http://geonext.uni-bayreuth.de/data/download/\ - http://home.arcor.de/fehlner/site/download/\ - http://home.arcor.de/teambushido/fbsd_ports/ +MASTER_SITES= http://geonext.uni-bayreuth.de/data/download/${PORTVERSION}/ DISTNAME= geonext.${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Interactive (dynamic) elementary Geometry Software +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/license.txt + WRKSRC= ${WRKDIR}/geonext_install NO_BUILD= yes USES= zip USE_JAVA= yes JAVA_VERSION= 1.6+ -DATA= cacerts didmat.crt geonext.html geonext.jar license.txt index.html\ - geonext-batik.jar help.jar help_fr.jar help_de.jar help_it.jar \ - help_uk.jar - -IMG= geoint.png gxt.gif ubt.gif x.ico -# available languages: al, bg, cz, de, en, es, fr, hu, it, ja, lv, -# pt_BR, ro, ru, sk, sl, uk +DATA= cacerts didmat.crt geonext-batik.jar geonext.html geonext.jar \ + help.jar help_de.jar help_fr.jar help_gr.jar help_it.jar \ + help_uk.jar index.html license.txt + +IMG= geoint.png gxt.gif ubt.gif x.ico xwc.ico + +#available languages: +# al, ar, bg, cz, da, de, en, es, fi, fr, gr, hu, +# it, ja, lv, mk, nb, nn, no, pl, pt_BR, ro, ru, +# sk, sl, uk, vn, zh_CN, zh_TW +# # default: en .if !defined(WITH_LANG) +MASTER= yes +PLIST_SUB+= MASTER="" WITH_LANG= en +.else +PLIST_SUB+= MASTER="@comment " .endif # For the slave ports -LA= language=${WITH_LANG} +LANG= language=${WITH_LANG} .if ${WITH_LANG} != "en" PKGNAMEPREFIX= ${WITH_LANG}- .endif -PLIST_SUB= LANG=${WITH_LANG} -GLOCATE= ${DATADIR}-${WITH_LANG} +PLIST_SUB+= LANG=${WITH_LANG} +SUB_FILES= geonext +SUB_LIST+= JAVA="${LOCALBASE}/bin/java" LANG=${WITH_LANG} -NO_STAGE= yes .include <bsd.port.pre.mk> +.if defined(MASTER) pre-everything:: @${ECHO_MSG} "" @${ECHO_MSG} "N - O - T - E" @@ -49,8 +59,10 @@ pre-everything:: @${ECHO_MSG} "WITH_LANG=lang - Choose language" @${ECHO_MSG} "Default language: en" @${ECHO_MSG} "" - @${ECHO_MSG} "available languages: al, bg, cz, de, en, es, fr, " - @${ECHO_MSG} "hu, it, ja, lv, pt_BR, ro, ru, sk, sl, uk,..." + @${ECHO_MSG} "available languages:" + @${ECHO_MSG} " al, ar, bg, cz, da, de, en, es, fi, fr, gr, hu," + @${ECHO_MSG} " it, ja, lv, mk, nb, nn, no, pl, pt_BR, ro, ru," + @${ECHO_MSG} " sk, sl, uk, vn, zh_CN, zh_TW" @${ECHO_MSG} "-------------------------------------------------" @${ECHO_MSG} "" @${ECHO_MSG} "example: make WITH_LANG=fr install" @@ -59,15 +71,14 @@ pre-everything:: @${ECHO_MSG} "" @${ECHO_MSG} "WITH_LANG=${WITH_LANG}" @${ECHO_MSG} "" +.endif do-install:: - ${MKDIR} ${GLOCATE} - cd ${WRKSRC} && ${INSTALL_DATA} ${DATA} ${GLOCATE} - cd ${WRKSRC} && ${INSTALL_DATA} ${IMG} ${GLOCATE} - @${ECHO_MSG} '#!/bin/sh' > ${GLOCATE}/${PORTNAME}-${WITH_LANG} - @${ECHO_MSG} '${JAVA} -cp ${GLOCATE}/geonext.jar geonext/Geonext ${LA} &' \ - >>${GLOCATE}/${PORTNAME}-${WITH_LANG} - ${CHMOD} a+x ${GLOCATE}/${PORTNAME}-${WITH_LANG} - ${INSTALL_SCRIPT} ${GLOCATE}/geonext-${WITH_LANG} ${PREFIX}/bin +.if defined(MASTER) + @${MKDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${DATA:S|^|${WRKSRC}/|} ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${IMG:S|^|${WRKSRC}/|} ${STAGEDIR}${DATADIR} +.endif + ${INSTALL_SCRIPT} ${WRKDIR}/geonext ${STAGEDIR}${PREFIX}/bin/geonext-${WITH_LANG} .include <bsd.port.post.mk> Modified: head/math/geonext/distinfo ============================================================================== --- head/math/geonext/distinfo Sun Aug 31 12:43:31 2014 (r366748) +++ head/math/geonext/distinfo Sun Aug 31 12:55:19 2014 (r366749) @@ -1,2 +1,2 @@ -SHA256 (geonext.1.71.zip) = 85b300349a00b78b5b20157e40f2f0852d78a3e6d4325350c90168ccba8c1503 -SIZE (geonext.1.71.zip) = 7289634 +SHA256 (geonext.1.74.zip) = 8b22bc1c4e4b199a79db362f0bdc5984917609a18c1f22c9c7c4cc386e0ce2c6 +SIZE (geonext.1.74.zip) = 9376208 Added: head/math/geonext/files/geonext.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/geonext/files/geonext.in Sun Aug 31 12:55:19 2014 (r366749) @@ -0,0 +1,10 @@ +#!/bin/sh + +# available languages: +# al, ar, bg, cz, da, de, en, es, fi, fr, gr, +# hu, it, ja, lv, mk, nb, nn, no, pl, pt_BR, +# ro, ru, sk, sl, uk, vn, zh_CN, zh_TW + +LANG=%%LANG%% +%%JAVA%% -cp %%DATADIR%%/geonext.jar geonext/Geonext language=${LANG} & + Modified: head/math/geonext/pkg-plist ============================================================================== --- head/math/geonext/pkg-plist Sun Aug 31 12:43:31 2014 (r366748) +++ head/math/geonext/pkg-plist Sun Aug 31 12:55:19 2014 (r366749) @@ -1,19 +1,20 @@ bin/geonext-%%LANG%% -share/geonext-%%LANG%%/geonext-%%LANG%% -share/geonext-%%LANG%%/cacerts -share/geonext-%%LANG%%/didmat.crt -share/geonext-%%LANG%%/geonext.html -share/geonext-%%LANG%%/geonext.jar -share/geonext-%%LANG%%/geoint.png -share/geonext-%%LANG%%/gxt.gif -share/geonext-%%LANG%%/index.html -share/geonext-%%LANG%%/license.txt -share/geonext-%%LANG%%/x.ico -share/geonext-%%LANG%%/ubt.gif -share/geonext-%%LANG%%/help_de.jar -share/geonext-%%LANG%%/help_fr.jar -share/geonext-%%LANG%%/help_it.jar -share/geonext-%%LANG%%/help_uk.jar -share/geonext-%%LANG%%/help.jar -share/geonext-%%LANG%%/geonext-batik.jar -@dirrm share/geonext-%%LANG%% +%%MASTER%%%%DATADIR%%/cacerts +%%MASTER%%%%DATADIR%%/didmat.crt +%%MASTER%%%%DATADIR%%/geoint.png +%%MASTER%%%%DATADIR%%/geonext-batik.jar +%%MASTER%%%%DATADIR%%/geonext.html +%%MASTER%%%%DATADIR%%/geonext.jar +%%MASTER%%%%DATADIR%%/gxt.gif +%%MASTER%%%%DATADIR%%/help.jar +%%MASTER%%%%DATADIR%%/help_de.jar +%%MASTER%%%%DATADIR%%/help_fr.jar +%%MASTER%%%%DATADIR%%/help_gr.jar +%%MASTER%%%%DATADIR%%/help_it.jar +%%MASTER%%%%DATADIR%%/help_uk.jar +%%MASTER%%%%DATADIR%%/index.html +%%MASTER%%%%DATADIR%%/license.txt +%%MASTER%%%%DATADIR%%/ubt.gif +%%MASTER%%%%DATADIR%%/x.ico +%%MASTER%%%%DATADIR%%/xwc.ico +%%MASTER%%@dirrmtry %%DATADIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408311255.s7VCtJrL023170>