- Update to new stable snapshot 1504.

- Increase java heap size in the JOSM start script.
- Add a binary that fetches images from Yahoo.

PR:		ports/132809
Submitted by:	Gleb Smirnoff <glebius@freebsd.org> (maintainer)

astro/josm/Makefile

@@ -6,30 +6,45 @@
 #
 
 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}
 
-PLIST_FILES=	bin/josm ${DISTFILES:S,^,${JAVAJARDIR}/,:C,${PREFIX}/?,,}
+WEBKITIMG=	webkit-image
+WEBKITIMG_SRC=	${WEBKITIMG}.cpp
+
+PLIST_FILES=	bin/josm ${JAVAJARDIR:C,${PREFIX}/?,,}/${DISTNAME} \
+		bin/webkit-image
+
+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>

astro/josm/distinfo

@@ -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

astro/josm/files/josm.sh.in

@@ -6,4 +6,4 @@ JAVA="%%LOCALBASE%%/bin/java"
 JARPATH="%%JAVALIBDIR%%"
 export JAVA_VERSION="%%JAVA_VERSION%%"
 
-exec "${JAVA}" -jar "${JARPATH}/%%JARNAME%%" "$@"
+exec "${JAVA}" -Xmx256m -jar "${JARPATH}/%%JARNAME%%" "$@"