Date: Thu, 19 Mar 2009 16:17:27 +0300 (MSK) From: Gleb Smirnoff <glebius@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/132809: [update] astro/josm to new version Message-ID: <200903191317.n2JDHR9b034048@cell.glebius.int.ru> Resent-Message-ID: <200903191320.n2JDK1vr032746@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 132809 >Category: ports >Synopsis: [update] astro/josm to new version >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Mar 19 13:20:01 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Gleb Smirnoff >Release: FreeBSD 7.1-STABLE i386 >Organization: Rambler Internet Holding >Environment: System: FreeBSD cell.glebius.int.ru 7.1-STABLE FreeBSD 7.1-STABLE #0: Thu Feb 26 13:01:21 MSK 2009 glebius@cell.glebius.int.ru:/usr/obj/usr/src/sys/NUCLEUS i386 >Description: The patch updates astro/josm: - new stable snapshot 1504 - increase java heap size in the JOSM start script - build a binary that fetches images from Yahoo. The binary is required by wmsplugin, that is used by 99.99% :) users of JOSM. The binary brings depends on some Qt components. >How-To-Repeat: >Fix: diff -Nur josm.bak/Makefile josm/Makefile --- josm.bak/Makefile 2009-03-19 13:35:10.000000000 +0300 +++ josm/Makefile 2009-03-19 16:07:20.000000000 +0300 @@ -6,30 +6,41 @@ # PORTNAME= josm -PORTVERSION= 1437 +PORTVERSION= 1504 CATEGORIES= astro java -MASTER_SITES= http://josm.openstreetmap.de/download/ -DISTNAME= ${PORTNAME}-snapshot-${PORTVERSION} -EXTRACT_SUFX= .jar +MASTER_SITES= http://josm.openstreetmap.de/download/:josm http://svn.openstreetmap.org/applications/editors/josm/plugins/wmsplugin/:wmsplugin +DISTNAME= ${PORTNAME}-snapshot-${PORTVERSION}.jar +DISTFILES= ${DISTNAME}:josm ${WEBKITIMG_SRC}:wmsplugin EXTRACT_ONLY= MAINTAINER= glebius@FreeBSD.org COMMENT= A comprehensive editor for OpenStreetMap.org database NO_WRKSUBDIR= yes -NO_BUILD= yes + +USE_QT_VER= 4 +QT_COMPONENTS= corelib gui network webkit USE_JAVA= YES JAVA_VERSION= 1.5+ SUB_FILES= josm.sh -SUB_LIST= JARNAME=${DISTFILES} +SUB_LIST= JARNAME=${DISTNAME} + +WEBKITIMG= webkit-image +WEBKITIMG_SRC= ${WEBKITIMG}.cpp + +PLIST_FILES= bin/josm ${JAVAJARDIR:S,${PREFIX}/,,}/${DISTNAME} bin/webkit-image -PLIST_FILES= bin/josm ${DISTFILES:S,^,${JAVAJARDIR}/,:C,${PREFIX}/?,,} +do-build: + cd ${WRKSRC} && \ + ${MOC} ${DISTDIR}/${WEBKITIMG_SRC} > ${WEBKITIMG}.h && \ + ${CXX} ${CFLAGS} ${PTHREAD_LIBS} -I. -I${QT_INCDIR} -L${QT_LIBDIR} ${DISTDIR}/${WEBKITIMG_SRC} -o ${WEBKITIMG} -lQtCore -lQtWebKit -lQtGui do-install: @${MKDIR} ${JAVAJARDIR}/ - ${INSTALL_DATA} ${DISTDIR}/${DISTFILES} ${JAVAJARDIR}/ + ${INSTALL_DATA} ${DISTDIR}/${DISTNAME} ${JAVAJARDIR}/ ${INSTALL_SCRIPT} ${WRKDIR}/josm.sh ${PREFIX}/bin/josm + ${INSTALL_PROGRAM} ${WRKDIR}/${WEBKITIMG} ${PREFIX}/bin .include <bsd.port.mk> diff -Nur josm.bak/distinfo josm/distinfo --- josm.bak/distinfo 2009-03-19 13:35:10.000000000 +0300 +++ josm/distinfo 2009-03-19 13:53:27.000000000 +0300 @@ -1,3 +1,6 @@ -MD5 (josm-snapshot-1437.jar) = 4a9af47a1b09b9ce8b88efc4a7a702b1 -SHA256 (josm-snapshot-1437.jar) = 248c187ca68ab36ff0e3a04b5a37fe70200fb7359965c3681f909acd5a81401a -SIZE (josm-snapshot-1437.jar) = 4205579 +MD5 (josm-snapshot-1504.jar) = b98d1c8ab935c8ff237963f9c3730c8d +SHA256 (josm-snapshot-1504.jar) = 53d2aba8f04d615e0634f141c18e951ef82a8a7f719cf7cfc056891fd4234518 +SIZE (josm-snapshot-1504.jar) = 4494453 +MD5 (webkit-image.cpp) = b96ec14ffce19b977129cf07679e655c +SHA256 (webkit-image.cpp) = 431f5b956c0e3d1615289dd6cb64effb988b30ace7c80f5a51f9546aa80d300d +SIZE (webkit-image.cpp) = 2718 diff -Nur josm.bak/files/josm.sh.in josm/files/josm.sh.in --- josm.bak/files/josm.sh.in 2009-03-19 13:35:10.000000000 +0300 +++ josm/files/josm.sh.in 2009-03-19 13:35:34.000000000 +0300 @@ -6,4 +6,4 @@ JARPATH="%%JAVALIBDIR%%" export JAVA_VERSION="%%JAVA_VERSION%%" -exec "${JAVA}" -jar "${JARPATH}/%%JARNAME%%" "$@" +exec "${JAVA}" -Xmx256m -jar "${JARPATH}/%%JARNAME%%" "$@" >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200903191317.n2JDHR9b034048>