ports/190154: [patch] math/geonext update to 1.74, add stage support
Olli Hauer
ohauer at FreeBSD.org
Fri May 23 20:10:00 UTC 2014
>Number: 190154
>Category: ports
>Synopsis: [patch] math/geonext update to 1.74, add stage support
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri May 23 20:10:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: Olli Hauer
>Release:
>Organization:
>Environment:
>Description:
- update to 1.74
- add stage support
- cleanup MASTER_SITE
- add LICENSE
- install geonext-$lang start scrip only in $LOCALBASE/bin
- adjust slave ports
Changes:
- add support for java7
patch can be found here:
http://people.freebsd.org/~ohauer/diffs/stage/stage_geonext-1.74.diff
>How-To-Repeat:
>Fix:
--- geonext-1.74.diff begins here ---
Index: french/geonext/Makefile
===================================================================
--- french/geonext/Makefile (revision 354953)
+++ french/geonext/Makefile (working copy)
@@ -1,7 +1,6 @@
# Created by: Andreas Fehlner (fehlner at gmx.de)
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= french
MAINTAINER= fehlner at gmx.de
@@ -10,5 +9,4 @@
WITH_LANG= fr
MASTERDIR= ${.CURDIR}/../../math/geonext
-NO_STAGE= yes
.include "${MASTERDIR}/Makefile"
Index: german/geonext/Makefile
===================================================================
--- german/geonext/Makefile (revision 354953)
+++ german/geonext/Makefile (working copy)
@@ -1,7 +1,6 @@
# Created by: Andreas Fehlner (fehlner at gmx.de)
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= german
MAINTAINER= fehlner at gmx.de
@@ -10,5 +9,4 @@
WITH_LANG= de
MASTERDIR= ${.CURDIR}/../../math/geonext
-NO_STAGE= yes
.include "${MASTERDIR}/Makefile"
Index: math/geonext/Makefile
===================================================================
--- math/geonext/Makefile (revision 354953)
+++ math/geonext/Makefile (working copy)
@@ -2,27 +2,29 @@
# $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= fehlner at gmx.de
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
+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, bg, cz, de, en, es, fr, hu, it, ja, lv,
# pt_BR, ro, ru, sk, sl, uk
# default: en
@@ -39,7 +41,6 @@
PLIST_SUB= LANG=${WITH_LANG}
GLOCATE= ${DATADIR}-${WITH_LANG}
-NO_STAGE= yes
.include <bsd.port.pre.mk>
pre-everything::
@@ -61,13 +62,12 @@
@${ECHO_MSG} ""
do-install::
- ${MKDIR} ${GLOCATE}
- cd ${WRKSRC} && ${INSTALL_DATA} ${DATA} ${GLOCATE}
- cd ${WRKSRC} && ${INSTALL_DATA} ${IMG} ${GLOCATE}
- @${ECHO_MSG} '#!/bin/sh' > ${GLOCATE}/${PORTNAME}-${WITH_LANG}
+ @${MKDIR} ${STAGEDIR}${GLOCATE}
+ ${INSTALL_DATA} ${DATA:S|^|${WRKSRC}/|} ${STAGEDIR}${GLOCATE}
+ ${INSTALL_DATA} ${IMG:S|^|${WRKSRC}/|} ${STAGEDIR}${GLOCATE}
+ @${ECHO_MSG} '#!/bin/sh' > ${WRKDIR}/${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
+ >> ${WRKDIR}/${PORTNAME}-${WITH_LANG}
+ ${INSTALL_SCRIPT} ${WRKDIR}/geonext-${WITH_LANG} ${STAGEDIR}${PREFIX}/bin
.include <bsd.port.post.mk>
Index: math/geonext/distinfo
===================================================================
--- math/geonext/distinfo (revision 354953)
+++ math/geonext/distinfo (working copy)
@@ -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
Index: math/geonext/pkg-plist
===================================================================
--- math/geonext/pkg-plist (revision 354953)
+++ math/geonext/pkg-plist (working copy)
@@ -1,19 +1,20 @@
bin/geonext-%%LANG%%
-share/geonext-%%LANG%%/geonext-%%LANG%%
share/geonext-%%LANG%%/cacerts
share/geonext-%%LANG%%/didmat.crt
+share/geonext-%%LANG%%/geoint.png
+share/geonext-%%LANG%%/geonext-batik.jar
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.jar
share/geonext-%%LANG%%/help_de.jar
share/geonext-%%LANG%%/help_fr.jar
+share/geonext-%%LANG%%/help_gr.jar
share/geonext-%%LANG%%/help_it.jar
share/geonext-%%LANG%%/help_uk.jar
-share/geonext-%%LANG%%/help.jar
-share/geonext-%%LANG%%/geonext-batik.jar
+share/geonext-%%LANG%%/index.html
+share/geonext-%%LANG%%/license.txt
+share/geonext-%%LANG%%/ubt.gif
+share/geonext-%%LANG%%/x.ico
+share/geonext-%%LANG%%/xwc.ico
@dirrm share/geonext-%%LANG%%
--- geonext-1.74.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list